Merge branch '4.8.0' into 6209-fix-health-check-error-when-there-is-n…

…o-vulnerabilities-indices
wazuh · Dec 20, 2023 · 5aeb51f · 5aeb51f
2 parents 619db4d + 3e200d2
commit 5aeb51f
Show file tree

Hide file tree

Showing 79 changed files with 5,209 additions and 443 deletions.
diff --git a/.github/workflows/wazuh-build-push-docker-action.yml b/.github/workflows/wazuh-build-push-docker-action.yml
@@ -55,63 +55,63 @@ jobs:
     name: Run build and push manager image
     runs-on: ubuntu-latest
     steps:
-     - name: Step 01 - Download wazuh-kibana-app
-       uses: actions/checkout@v2
-       with:
+      - name: Step 01 - Download wazuh-kibana-app
+        uses: actions/checkout@v2
+        with:
           path: wazuh-kibana-app
-     - name: Step 02 - Login to quay.io
-       run: |
-        docker login -u=${{ secrets.QUAYIO_USERNAME }} -p=${{ secrets.QUAYIO_TOKEN }} quay.io
-     - name: Step 03 - Build image
-       run: |
-        cd ${{ github.workspace }}/wazuh-kibana-app/test/cypress/images/wazuh_manager_filebeat_sources_cmake
-        docker build -t quay.io/wazuh/wazuh-manager-image:${{ github.event.inputs.wazuh-manager-version }}-${{ github.event.inputs.elastic-manager-version }} \
-        --build-arg WAZUH_VERSION=${{ github.event.inputs.wazuh-manager-version }} \
-        --build-arg FILEBEAT_VERSION=${{ github.event.inputs.elastic-manager-version }} \
-        --build-arg FILEBEAT_WAZUH_TEMPLATE_URL=https://raw.githubusercontent.com/wazuh/wazuh/4.0/extensions/elasticsearch/7.x/wazuh-template.json \
-        --build-arg FILEBEAT_WAZUH_MODULE_URL=https://packages.wazuh.com/4.x/filebeat/wazuh-filebeat-0.3.tar.gz .
-     - name: Step 04 - Push image to quay.io
-       run: |
-        docker push quay.io/wazuh/wazuh-manager-image:${{ github.event.inputs.wazuh-manager-version }}-${{ github.event.inputs.elastic-manager-version }}
+      - name: Step 02 - Login to quay.io
+        run: |
+          docker login -u=${{ secrets.QUAYIO_USERNAME }} -p=${{ secrets.QUAYIO_TOKEN }} quay.io
+      - name: Step 03 - Build image
+        run: |
+          cd ${{ github.workspace }}/wazuh-kibana-app/test/cypress/images/wazuh_manager_filebeat_sources_cmake
+          docker build -t quay.io/wazuh/wazuh-manager-image:${{ github.event.inputs.wazuh-manager-version }}-${{ github.event.inputs.elastic-manager-version }} \
+          --build-arg WAZUH_VERSION=${{ github.event.inputs.wazuh-manager-version }} \
+          --build-arg FILEBEAT_VERSION=${{ github.event.inputs.elastic-manager-version }} \
+          --build-arg FILEBEAT_WAZUH_TEMPLATE_URL=https://raw.githubusercontent.com/wazuh/wazuh/4.0/extensions/elasticsearch/7.x/wazuh-template.json \
+          --build-arg FILEBEAT_WAZUH_MODULE_URL=https://packages.wazuh.com/4.x/filebeat/wazuh-filebeat-0.4.tar.gz .
+      - name: Step 04 - Push image to quay.io
+        run: |
+          docker push quay.io/wazuh/wazuh-manager-image:${{ github.event.inputs.wazuh-manager-version }}-${{ github.event.inputs.elastic-manager-version }}
 
   job-build-agent-image:
     if: ${{ github.event.inputs.build-agent-image == 'true' }}
     name: Run build and push agent image
     runs-on: ubuntu-latest
     steps:
-     - name: Step 01 - Download wazuh-kibana-app
-       uses: actions/checkout@v2
-       with:
+      - name: Step 01 - Download wazuh-kibana-app
+        uses: actions/checkout@v2
+        with:
           path: wazuh-kibana-app
-     - name: Step 02 - Login to quay.io
-       run: |
-        docker login -u=${{ secrets.QUAYIO_USERNAME }} -p=${{ secrets.QUAYIO_TOKEN }} quay.io
-     - name: Step 03 - Build image
-       run: |
-        cd ${{ github.workspace }}/wazuh-kibana-app/test/cypress/images/wazuh_agent_ubuntu_sources_cmake
-        docker build -t quay.io/wazuh/wazuh-agent-image:${{ github.event.inputs.wazuh-agent-version }} \
-        --build-arg WAZUH_VERSION=${{ github.event.inputs.wazuh-agent-version }} .
-     - name: Step 04 - Push image to quay.io
-       run: |
-        docker push quay.io/wazuh/wazuh-agent-image:${{ github.event.inputs.wazuh-agent-version }}
+      - name: Step 02 - Login to quay.io
+        run: |
+          docker login -u=${{ secrets.QUAYIO_USERNAME }} -p=${{ secrets.QUAYIO_TOKEN }} quay.io
+      - name: Step 03 - Build image
+        run: |
+          cd ${{ github.workspace }}/wazuh-kibana-app/test/cypress/images/wazuh_agent_ubuntu_sources_cmake
+          docker build -t quay.io/wazuh/wazuh-agent-image:${{ github.event.inputs.wazuh-agent-version }} \
+          --build-arg WAZUH_VERSION=${{ github.event.inputs.wazuh-agent-version }} .
+      - name: Step 04 - Push image to quay.io
+        run: |
+          docker push quay.io/wazuh/wazuh-agent-image:${{ github.event.inputs.wazuh-agent-version }}
 
   job-build-cypress-image:
     if: ${{ github.event.inputs.build-cypress-image == 'true' }}
     name: Run build and push cypress image
     runs-on: ubuntu-latest
     steps:
-     - name: Step 01 - Download wazuh-kibana-app
-       uses: actions/checkout@v2
-       with:
+      - name: Step 01 - Download wazuh-kibana-app
+        uses: actions/checkout@v2
+        with:
           path: wazuh-kibana-app
-     - name: Step 02 - Login to quay.io
-       run: |
-        docker login -u=${{ secrets.QUAYIO_USERNAME }} -p=${{ secrets.QUAYIO_TOKEN }} quay.io
-     - name: Step 03 - Build image
-       run: |
-        cd ${{ github.workspace }}/wazuh-kibana-app/test/cypress/images/ubuntu-cypress
-        docker build -t quay.io/wazuh/wazuh-ubuntu-cypress:${{ github.event.inputs.image-cypress-version }} \
-        --build-arg UBUNTU_CYPRESS_BRANCH=${{ github.event.inputs.ubuntu-cypress-branch }} .
-     - name: Step 04 - Push image to quay.io
-       run: |
-        docker push quay.io/wazuh/wazuh-ubuntu-cypress:${{ github.event.inputs.image-cypress-version }}
+      - name: Step 02 - Login to quay.io
+        run: |
+          docker login -u=${{ secrets.QUAYIO_USERNAME }} -p=${{ secrets.QUAYIO_TOKEN }} quay.io
+      - name: Step 03 - Build image
+        run: |
+          cd ${{ github.workspace }}/wazuh-kibana-app/test/cypress/images/ubuntu-cypress
+          docker build -t quay.io/wazuh/wazuh-ubuntu-cypress:${{ github.event.inputs.image-cypress-version }} \
+          --build-arg UBUNTU_CYPRESS_BRANCH=${{ github.event.inputs.ubuntu-cypress-branch }} .
+      - name: Step 04 - Push image to quay.io
+        run: |
+          docker push quay.io/wazuh/wazuh-ubuntu-cypress:${{ github.event.inputs.image-cypress-version }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -38,7 +38,21 @@ All notable changes to the Wazuh app project will be documented in this file.
 - Removed the application menu in the IT Hygiene application [#6176](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6176)
 - Removed the implicit filter of WQL language of the search bar UI [#6174](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6174)
 
-## Wazuh v4.7.1 - OpenSearch Dashboards 2.8.0 - Revision 01
+## Wazuh v4.7.2 - OpenSearch Dashboards 2.8.0 - Revision 00
+
+### Added
+
+- Support for Wazuh 4.7.2
+- Added contextual information in the register agent commands [#6208](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6208)
+- Added host name and board serial information to Agents > Inventory data [#6191](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6191)
+
+### Fixed
+
+- Fixed Agents preview page load when there are no registered agents [#6185](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6185)
+- Fixed the endpoint to get Wazuh server auth configuration [#6206](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6206) [#6213](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6213)
+- Fixed error navigating back to agent in some scenarios [#6224](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6224)
+
+## Wazuh v4.7.1 - OpenSearch Dashboards 2.8.0 - Revision 03
 
 ### Added
 
@@ -49,6 +63,7 @@ All notable changes to the Wazuh app project will be documented in this file.
 - Fixed problem when using non latin characters in the username [#6076](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6076)
 - Fixed UI crash on retrieving log collection configuration for macos agent. [#6104](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6104)
 - Fixed incorrect validation of the agent name on the Deploy new agent window [#6105](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6105)
+- Fixed missing columns in the agents table of Groups [#6184](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6184)
 
 ## Wazuh v4.7.0 - OpenSearch Dashboards 2.8.0 - Revision 04
 

diff --git a/docker/kbn-dev/dev.yml b/docker/kbn-dev/dev.yml
@@ -1,16 +1,16 @@
-version: "2.2"
+version: '2.2'
 
 x-logging: &logging
   logging:
     driver: loki
     options:
-      loki-url: "http://host.docker.internal:3100/loki/api/v1/push"
+      loki-url: 'http://host.docker.internal:3100/loki/api/v1/push'
 
 services:
   exporter:
     image: quay.io/prometheuscommunity/elasticsearch-exporter:latest
     <<: *logging
-    hostname: "exporter-kbn-${ES_VERSION}"
+    hostname: 'exporter-kbn-${ES_VERSION}'
     networks:
       - es-dev
       - mon
@@ -21,7 +21,7 @@ services:
 
   imposter:
     image: outofcoffee/imposter
-    hostname: "imposter-kbn-${ES_VERSION}"
+    hostname: 'imposter-kbn-${ES_VERSION}'
     networks:
       - es-dev
       - mon
@@ -32,15 +32,15 @@ services:
     volumes:
       - ../imposter:/opt/imposter/config
     ports:
-       - ${IMPOSTER_PORT}:8080
+      - ${IMPOSTER_PORT}:8080
 
   filebeat:
     depends_on:
       es01:
         condition: service_healthy
     image: elastic/filebeat:7.10.2
     hostname: filebeat
-    user: "0:0"
+    user: '0:0'
     networks:
       - es-dev
       - mon
@@ -54,7 +54,7 @@ services:
         echo admin | filebeat keystore add username --stdin --force
         echo ${ELASTIC_PASSWORD}| filebeat keystore add password --stdin --force
         curl -so /etc/filebeat/wazuh-template.json https://raw.githubusercontent.com/wazuh/wazuh/4.3/extensions/elasticsearch/7.x/wazuh-template.json
-        curl -s https://packages.wazuh.com/4.x/filebeat/wazuh-filebeat-0.3.tar.gz | tar -xvz -C /usr/share/filebeat/module
+        curl -s https://packages.wazuh.com/4.x/filebeat/wazuh-filebeat-0.4.tar.gz | tar -xvz -C /usr/share/filebeat/module
         # copy filebeat to preserve correct permissions without
         # affecting host filesystem
         cp /tmp/filebeat.yml /usr/share/filebeat/filebeat.yml
@@ -69,7 +69,7 @@ services:
 
   setup:
     hostname: setup
-    user: "0"
+    user: '0'
     image: docker.elastic.co/elasticsearch/elasticsearch:${ES_VERSION}
     volumes:
       - certs:/usr/share/elasticsearch/config/certs
@@ -120,7 +120,7 @@ services:
         echo "All done!";
       '
     healthcheck:
-      test: ["CMD-SHELL", "[ -f config/certs/es01/es01.crt ]"]
+      test: ['CMD-SHELL', '[ -f config/certs/es01/es01.crt ]']
       interval: 1s
       timeout: 5s
       retries: 120
@@ -140,7 +140,7 @@ services:
       - certs:/usr/share/elasticsearch/config/certs
       - esdata01:/usr/share/elasticsearch/data
     environment:
-      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
+      - 'ES_JAVA_OPTS=-Xms512m -Xmx512m'
       - node.name=es01
       - discovery.type=single-node
       - discovery.seed_hosts=es01
@@ -166,7 +166,7 @@ services:
     healthcheck:
       test:
         [
-          "CMD-SHELL",
+          'CMD-SHELL',
           "curl -s --cacert config/certs/ca/ca.crt https://localhost:9200 | grep -q 'missing authentication credentials'",
         ]
       interval: 10s
@@ -186,7 +186,7 @@ services:
       - mon
     <<: *logging
     volumes:
-      - "${SRC}:/home/node/kbn/plugins/wazuh"
+      - '${SRC}:/home/node/kbn/plugins/wazuh'
       - certs:/home/node/kbn/config/certs
       - kibana_cache:/home/node/.cache
       - ./config/kibana/kibana.yml:/home/node/kbn/config/kibana.yml
@@ -198,7 +198,7 @@ services:
       # Kibana configuration is in the mounted config file, as the entrypoint
       # does not generate the config file from the envirtonment
       - LOGS=/proc/1/fd/1
-    entrypoint: ["tail", "-f", "/dev/null"]
+    entrypoint: ['tail', '-f', '/dev/null']
     healthcheck:
       test: sh /home/node/setup_permissions.sh es01
       interval: 5s

diff --git a/docker/osd-dev/config/1.x/osd/wazuh.yml b/docker/osd-dev/config/1.x/osd/wazuh.yml
@@ -1,18 +1,18 @@
 hosts:
   - manager:
-      url: "https://wazuh.manager"
+      url: 'https://wazuh.manager'
       port: 55000
       username: wazuh-wui
       password: MyS3cr37P450r.*-
       run_as: false
   - imposter:
-      url: "http://imposter"
+      url: 'http://imposter'
       port: 8080
       username: wazuh-wui
       password: MyS3cr37P450r.*-
       run_as: false
   - imposter-cli:
-      url: "http://<ip-local>"
+      url: 'http://<ip-local>'
       port: 8080
       username: wazuh-wui
       password: MyS3cr37P450r.*-

diff --git a/docker/osd-dev/config/2.x/osd/wazuh.yml b/docker/osd-dev/config/2.x/osd/wazuh.yml
@@ -1,18 +1,18 @@
 hosts:
   - manager:
-      url: "https://wazuh.manager"
+      url: 'https://wazuh.manager'
       port: 55000
       username: wazuh-wui
       password: MyS3cr37P450r.*-
       run_as: false
   - imposter:
-      url: "http://imposter"
+      url: 'http://imposter'
       port: 8080
       username: wazuh-wui
       password: MyS3cr37P450r.*-
       run_as: false
   - imposter-cli:
-      url: "http://<ip-local>"
+      url: 'http://<ip-local>'
       port: 8080
       username: wazuh-wui
       password: MyS3cr37P450r.*-