Merge 4.7.1 into master (#5918)

Merge 4.7.1 into master
wazuh · Sep 22, 2023 · beb982e · beb982e
2 parents 672373d + 2f308aa
commit beb982e
Show file tree

Hide file tree

Showing 14 changed files with 1,106 additions and 550 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,12 @@ All notable changes to the Wazuh app project will be documented in this file.
 
 - Support for Wazuh 4.8.0
 
+## Wazuh v4.7.1 - OpenSearch Dashboards 2.9.0 - Revision 00
+
+### Added
+
+- Support for Wazuh 4.7.1
+
 ## Wazuh v4.7.0 - OpenSearch Dashboards 2.9.0 - Revision 00
 
 ### Added
@@ -71,6 +77,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
 

diff --git a/docker/images/kbn-7.17.13-dev.Dockerfile b/docker/images/kbn-7.17.13-dev.Dockerfile
@@ -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
diff --git a/docker/imposter/api-info/api_info.json b/docker/imposter/api-info/api_info.json
@@ -9,4 +9,4 @@
     "timestamp": "2022-06-13T17:20:03Z"
   },
   "error": 0
-}
+}
diff --git a/docker/kbn-dev/dev.sh b/docker/kbn-dev/dev.sh
@@ -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'

diff --git a/plugins/main/common/constants.ts b/plugins/main/common/constants.ts
@@ -321,7 +321,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 = {
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,4 +9,4 @@ @@
         "timestamp": "2022-06-13T17:20:03Z"
       },
       "error": 0
-    }
+    }