Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 4.7.0 into 4.7.1 #5917

Merged
merged 25 commits into from
Sep 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
3de6a64
Bump 4.5.3 (#5824)
asteriscos Aug 29, 2023
4c8b9e8
Merge 4.5.2 into 4.5.3 (#5856)
Desvelao Sep 7, 2023
5101388
Fix package URLs in aarch64 commands
Machi3mfl Sep 11, 2023
f5a1a85
Update CHANGELOG
Machi3mfl Sep 11, 2023
85c1434
[Register Agent ] Fixed package URLs in aarch64 commands (#5879)
Tostti Sep 11, 2023
f6eb579
Update OpenSearch's documentation link (#5884)
AlexRuiz7 Sep 12, 2023
95122c7
Remove -e and separation chars in command
Machi3mfl Sep 12, 2023
9560de3
Fix get optional parameters filled when have array
Machi3mfl Sep 12, 2023
96aa7f6
Update CHANGELOG
Machi3mfl Sep 12, 2023
9f4fce2
fix: replace the WQL documentation link
Desvelao Sep 13, 2023
3566037
fix: update test snapshot
Desvelao Sep 13, 2023
6d271af
Fix documentation link of manager address in the Deploy new agent gui…
Desvelao Sep 13, 2023
d02b9ed
Fix error parsing manager configuration to XML (#5881)
Desvelao Sep 13, 2023
d5f3d2c
Change params union method
Machi3mfl Sep 13, 2023
a63293b
Merge branch '4.6.0' into fix/5886-wrong-macos-installation-command
Machi3mfl Sep 13, 2023
153e81e
Fix syntax error on API Console (#5885)
Desvelao Sep 13, 2023
6046d48
Merge branch '4.6.0' into fix/5886-wrong-macos-installation-command
Machi3mfl Sep 13, 2023
03b6350
Fixed install macOS agent commands (#5888)
Tostti Sep 13, 2023
d24e037
Fix WQL documentation link (#5889)
Tostti Sep 13, 2023
0eac862
[Backport 4.5.3] Add kbn-dev 7.17.13 and bump node version and depend…
JuanGarriuz Sep 20, 2023
1463ea0
merge: merge 4.5.3 into 4.6.0
Desvelao Sep 22, 2023
4eb70a9
Merge 4.5.3 into 4.6.0 (#5915)
Desvelao Sep 22, 2023
8bd65df
merge: merge 4.6.0 into 4.7.0
Desvelao Sep 22, 2023
450603d
Merge 4.6.0 into 4.7.0 (#5916)
Desvelao Sep 22, 2023
221a725
merge: merge 4.7.0 into 4.7.1
Desvelao Sep 22, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ All notable changes to the Wazuh app project will be documented in this file.
- Fixed repeated requests in the group table when adding a group or refreshing the table [#5465](https://github.com/wazuh/wazuh-kibana-app/pull/5465)
- Fixed an error in the request body suggestions of API Console [#5521](https://github.com/wazuh/wazuh-kibana-app/pull/5521)
- Fixed some errors related to relative dirname of rule and decoder files [#5734](https://github.com/wazuh/wazuh-kibana-app/pull/5734)
- Fixed package URLs in aarch64 commands [#5879](https://github.com/wazuh/wazuh-kibana-app/pull/5879)
- Fixed install macOS agent commands [5888](https://github.com/wazuh/wazuh-kibana-app/pull/5888)

### Removed

Expand Down
17 changes: 17 additions & 0 deletions docker/images/kbn-7.17.13-dev.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
FROM node:18.17.1 AS builder-kbn-7.17.13
RUN npm install --global @bazel/[email protected]
USER node
RUN git clone --depth 1 --branch v7.17.13 https://github.com/elastic/kibana /home/node/kbn
RUN chown node.node /home/node/kbn

WORKDIR /home/node/kbn
RUN yarn kbn bootstrap
RUN yarn config set registry http://host.docker.internal:4873 && \
sed -i 's/https:\/\/registry.yarnpkg.com/http:\/\/host.docker.internal:4873/g' yarn.lock
RUN rm -rf /home/node/.cache/yarn && rm -rf /home/node/.cache/Cypress && rm -rf /home/node/.cache/ms-playwright
RUN mkdir -p /home/node/kbn/data/wazuh/config

FROM node:18.17.1
USER node
COPY --from=builder-kbn-7.17.13 /home/node/ /home/node/
WORKDIR /home/node/kbn
1 change: 1 addition & 0 deletions docker/kbn-dev/dev.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ elastic_versions=(
'7.17.10'
'7.17.11'
'7.17.12'
'7.17.13'
'8.0.0'
'8.1.0'
'8.2.1'
Expand Down
2 changes: 1 addition & 1 deletion plugins/main/common/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ export const PLUGIN_PLATFORM_WAZUH_DOCUMENTATION_URL_PATH_TROUBLESHOOTING =
export const PLUGIN_PLATFORM_WAZUH_DOCUMENTATION_URL_PATH_APP_CONFIGURATION =
'user-manual/wazuh-dashboard/config-file.html';
export const PLUGIN_PLATFORM_URL_GUIDE =
'https://opensearch.org/docs/1.2/opensearch/index/';
'https://opensearch.org/docs/2.8/about';
export const PLUGIN_PLATFORM_URL_GUIDE_TITLE = 'OpenSearch guide';

export const PLUGIN_PLATFORM_REQUEST_HEADERS = {
Expand Down
Loading
Loading