Merge branch '4.4-2.4-wzd' into 4928-Fix-the-agent-graph-in-opensearc…

…h-dashboard

CHANGELOG.md

@@ -30,7 +30,7 @@ All notable changes to the Wazuh app project will be documented in this file.
 - Independently load each dashboard from the `Agents Overview` page [#4363](https:/wazuh/wazuh-kibana-app/pull/4363)
 - The endpoint `/agents/summary/status` response was adapted. [#3874](https:/wazuh/wazuh-kibana-app/pull/3874)
 - Updated and added operating systems, versions, architectures commands of Install and enroll the agent and commands of Start the agent in the deploy new agent section [#4458](https:/wazuh/wazuh-kibana-app/pull/4458)
-- Added cluster's IP and protocol as suggestions in the agent deployment wizard. [#4776](https:/wazuh/wazuh-kibana-app/pull/4776)
+- Added cluster's IP and protocol as suggestions in the agent deployment wizard. [#4776](https:/wazuh/wazuh-kibana-app/pull/4776) [#4954](https:/wazuh/wazuh-kibana-app/pull/4954)
 - Show OS name and OS version in the agent installation wizard. [#4851](https:/wazuh/wazuh-kibana-app/pull/4851)
 - Changed the endpoint that updates the plugin configuration to support multiple settings. [#4501](https:/wazuh/wazuh-kibana-app/pull/4501)
 - The button to export the app logs is now disabled when there are no results, instead of showing an error toast [#4992](https:/wazuh/wazuh-kibana-app/pull/4992)
@@ -48,6 +48,7 @@ All notable changes to the Wazuh app project will be documented in this file.
 - Raspbian OS, Ubuntu, Amazon Linux and Amazon Linux 2 commands in the wizard deploy agent now change when a different architecture is selected [#4876](https:/wazuh/wazuh-kibana-app/pull/4876) [#4880](https:/wazuh/wazuh-kibana-app/pull/4880)
 - Fixed a bug that caused the flyouts to close when clicking inside them [#4638](https:/wazuh/wazuh-kibana-app/pull/4638)
 - Fixed agent graph in opensearch dashboard [#4942] (https:/wazuh/wazuh-kibana-app/pull/4942)
+- Fixed agent installation command for macOS in the deploy new agent section. [#4968](https:/wazuh/wazuh-kibana-app/pull/4968)
 - Fixed vulnerabilities default last scan date formatter [#4975](https:/wazuh/wazuh-kibana-app/pull/4975)
 
 ### Removed

docker/images/osd-2.4.0-dev.Dockerfile

@@ -0,0 +1,21 @@
+FROM node:14.20.0 AS builder-osd-2.4.0
+USER node
+RUN git clone --depth 1 --branch 2.4.0 https:/opensearch-project/OpenSearch-Dashboards.git /home/node/kbn
+RUN chown node.node /home/node/kbn
+
+WORKDIR /home/node/kbn
+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 && \
+ yarn osd bootstrap --production
+
+WORKDIR /home/node/kbn/plugins
+RUN git clone --depth 1 --branch 2.4.0.0 https:/opensearch-project/security-dashboards-plugin.git
+WORKDIR /home/node/kbn/plugins/security-dashboards-plugin
+RUN yarn install
+
+RUN mkdir -p /home/node/kbn/data/wazuh/config
+
+FROM node:14.20.0
+USER node
+COPY --from=builder-osd-2.4.0 /home/node/kbn /home/node/kbn
+WORKDIR /home/node/kbn

docker/images/osd-2.4.1-dev.Dockerfile

@@ -0,0 +1,22 @@
+FROM node:14.20.0 AS builder-osd-2.4.1
+USER node
+RUN git clone --depth 1 --branch 2.4.1 https:/opensearch-project/OpenSearch-Dashboards.git /home/node/kbn
+RUN chown node.node /home/node/kbn
+
+WORKDIR /home/node/kbn
+RUN yarn osd bootstrap --production
+
+WORKDIR /home/node/kbn/plugins
+RUN git clone --depth 1 --branch 2.4.1.0 https:/opensearch-project/security-dashboards-plugin.git
+WORKDIR /home/node/kbn/plugins/security-dashboards-plugin
+RUN yarn install
+
+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 mkdir -p /home/node/kbn/data/wazuh/config
+
+FROM node:14.20.0
+USER node
+COPY --from=builder-osd-2.4.1 /home/node/kbn /home/node/kbn
+WORKDIR /home/node/kbn

docker/osd-dev/README.md

@@ -44,11 +44,15 @@ version.
 
 `OpenSearch` supported versions:
 - 1.2.4
+- 2.3.0
 - 2.4.0
+- 2.4.1
 
 `OpenSearch Dashboards` supported versions:
 - 1.2.0
+- 2.3.0
 - 2.4.0
+- 2.4.1
 
 We must use official `Wazuh Indexer` and `Wazuh Dashboard` images for
 testing!

docker/osd-dev/dev.sh

@@ -7,6 +7,7 @@ os_versions=(
  '2.2.1'
  '2.3.0'
  '2.4.0'
+ '2.4.1'
 )
 
 osd_versions=(
@@ -16,6 +17,7 @@ osd_versions=(
  '2.2.1'
  '2.3.0'
  '2.4.0'
+ '2.4.1'
 )
 
 usage() {

public/controllers/agent/components/register-agent-service.ts

@@ -78,10 +78,11 @@ function getRemoteProtocol(protocols: Protocol[]) {
  */
 async function getConnectionConfig(nodeSelected: ServerAddressOptions, defaultServerAddress?: string) {
  const nodeName = nodeSelected?.label;
+ const nodeIp = nodeSelected?.value;
  if(!defaultServerAddress){
  if(nodeSelected.nodetype !== 'custom'){
  const remoteConfig = await getRemoteConfiguration(nodeName);
- return { serverAddress: remoteConfig.name, udpProtocol: remoteConfig.isUdp, connectionSecure: remoteConfig.haveSecureConnection };
+ return { serverAddress: nodeIp, udpProtocol: remoteConfig.isUdp, connectionSecure: remoteConfig.haveSecureConnection };
  }else{
  return { serverAddress: nodeName, udpProtocol: false, connectionSecure: true };
  }