merge: merge 4.7.0 into master

wazuh · Sep 7, 2023 · 73d2521 · 73d2521
2 parents c42568c + a80a2a0
commit 73d2521
Show file tree

Hide file tree

Showing 41 changed files with 2,256 additions and 2,477 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,13 +2,13 @@
 
 All notable changes to the Wazuh app project will be documented in this file.
 
-## Wazuh v4.8.0 - OpenSearch Dashboards 2.6.0 - Revision 01
+## Wazuh v4.8.0 - OpenSearch Dashboards 2.9.0 - Revision 00
 
 ### Added
 
 - Support for Wazuh 4.8.0
 
-## Wazuh v4.7.0 - OpenSearch Dashboards 2.6.0 - Revision 01
+## Wazuh v4.7.0 - OpenSearch Dashboards 2.9.0 - Revision 00
 
 ### Added
 
@@ -33,7 +33,7 @@ All notable changes to the Wazuh app project will be documented in this file.
 
 - Removed views in JSON and XML formats from management settings. [#5747](https://github.com/wazuh/wazuh-kibana-app/pull/5747)
 
-## Wazuh v4.6.0 - OpenSearch Dashboards 2.6.0 - Revision 01
+## Wazuh v4.6.0 - OpenSearch Dashboards 2.8.0 - Revision 00
 
 ### Added
 
@@ -53,7 +53,7 @@ All notable changes to the Wazuh app project will be documented in this file.
 - Changed the query to search for an agent in `management/configuration`. [#5485](https://github.com/wazuh/wazuh-kibana-app/pull/5485)
 - Changed the search bar in management/log to the one used in the rest of the app. [#5476](https://github.com/wazuh/wazuh-kibana-app/pull/5476)
 - Changed the design of the wizard to add agents. [#5457](https://github.com/wazuh/wazuh-kibana-app/pull/5457)
-- Changed the search bar in Management (Rules, Decoders, CDB List, Groups, Cluster > Nodes) and Modules (Vulnerabilities > Inventory, Security Configuration Assessment > Inventory > {Policy ID} > Checks, MITRE ATT&CK > Intelligence > {Resource}, Integrity monitoring > Inventory > Files, Integrity monitoring > Inventory > Registry), Agent Inventory data, Explore agent modal, Agents [#5363](https://github.com/wazuh/wazuh-kibana-app/pull/5363) [#5442](https://github.com/wazuh/wazuh-kibana-app/pull/5442) [#5443](https://github.com/wazuh/wazuh-kibana-app/pull/5443) [#5444](https://github.com/wazuh/wazuh-kibana-app/pull/5444) [#5445](https://github.com/wazuh/wazuh-kibana-app/pull/5445) [#5447](https://github.com/wazuh/wazuh-kibana-app/pull/5447) [#5452](https://github.com/wazuh/wazuh-kibana-app/pull/5452) [#5491](https://github.com/wazuh/wazuh-kibana-app/pull/5491) [#5785](https://github.com/wazuh/wazuh-kibana-app/pull/5785)
+- Changed the search bar in Management (Rules, Decoders, CDB List, Groups, Cluster > Nodes) and Modules (Vulnerabilities > Inventory, Security Configuration Assessment > Inventory > {Policy ID} > Checks, MITRE ATT&CK > Intelligence > {Resource}, Integrity monitoring > Inventory > Files, Integrity monitoring > Inventory > Registry), Agent Inventory data, Explore agent modal, Agents [#5363](https://github.com/wazuh/wazuh-kibana-app/pull/5363) [#5442](https://github.com/wazuh/wazuh-kibana-app/pull/5442) [#5443](https://github.com/wazuh/wazuh-kibana-app/pull/5443) [#5444](https://github.com/wazuh/wazuh-kibana-app/pull/5444) [#5445](https://github.com/wazuh/wazuh-kibana-app/pull/5445) [#5447](https://github.com/wazuh/wazuh-kibana-app/pull/5447) [#5452](https://github.com/wazuh/wazuh-kibana-app/pull/5452) [#5491](https://github.com/wazuh/wazuh-kibana-app/pull/5491) [#5785](https://github.com/wazuh/wazuh-kibana-app/pull/5785) [#5813](https://github.com/wazuh/wazuh-kibana-app/pull/5813)
 
 ### Fixed
 
@@ -83,7 +83,13 @@ All notable changes to the Wazuh app project will be documented in this file.
 - Removed obsolete code that caused duplicate requests to the api in `Management`. [#5485](https://github.com/wazuh/wazuh-kibana-app/pull/5485)
 - Removed unused embedded jquery-ui [#5592](https://github.com/wazuh/wazuh-kibana-app/pull/5592)
 
-## Wazuh v4.5.2 - OpenSearch Dashboards 2.6.0 - Revision 01
+## Wazuh v4.5.3 - OpenSearch Dashboards 2.6.0 - Revision 01
+
+### Added
+
+- Support for Wazuh 4.5.3
+
+## Wazuh v4.5.2 - OpenSearch Dashboards 2.6.0 - Revision 02
 
 ### Added
 

diff --git a/docker/README.md b/docker/README.md
@@ -1,6 +1,6 @@
 # Frontend development environments
 
-Install [Docker Desktop][0] as per its instructions, available for Windows, Mac 
+Install [Docker Desktop][0] as per its instructions (make sure that the docker compose version is 2.20.2 or higher), available for Windows, Mac 
 and Linux (Ubuntu, Debian & Fedora).
 This ensures that the development experience between Linux, Mac and Windows is as
 similar as possible.
@@ -289,4 +289,4 @@ error getting credentials - err: exit status 1, out: `error getting credentials
 [2]: <https://grafana.com/oss/loki/> "Loki"
 [3]: <https://prometheus.io/docs/visualization/grafana/> "Prometheus"
 [4]: <https://quay.io/organization/wazuh> "quay.io/wazuh"
-[5]: <https://github.com/wazuh/wazuh-kibana-app/issues/3872#issuecomment-1305507626> "App permissions"
+[5]: <https://github.com/wazuh/wazuh-kibana-app/issues/3872#issuecomment-1305507626> "App permissions"
diff --git a/docker/osd-dev/dev.yml b/docker/osd-dev/dev.yml
@@ -1,26 +1,26 @@
-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-osd-${OS_VERSION}
     profiles:
-      - "saml"
-      - "standard"
+      - 'saml'
+      - 'standard'
     networks:
       - os-dev
       - mon
     command:
-      - "--es.uri=https://admin:${PASSWORD}@os1:9200"
-      - "--es.ssl-skip-verify"
-      - "--es.all"
+      - '--es.uri=https://admin:${PASSWORD}@os1:9200'
+      - '--es.ssl-skip-verify'
+      - '--es.all'
 
   imposter:
     image: outofcoffee/imposter
@@ -39,8 +39,8 @@ services:
     image: cfssl/cfssl
     <<: *logging
     profiles:
-      - "saml"
-      - "standard"
+      - 'saml'
+      - 'standard'
     volumes:
       - wi_certs:/certs/wi
       - wd_certs:/certs/wd
@@ -117,7 +117,7 @@ services:
           sleep 300
       '
     healthcheck:
-      test: ["CMD-SHELL", "[ -r /certs/wi/os1.pem ]"]
+      test: ['CMD-SHELL', '[ -r /certs/wi/os1.pem ]']
       interval: 2s
       timeout: 5s
       retries: 10
@@ -126,18 +126,19 @@ services:
     depends_on:
       idpsetup:
         condition: service_completed_successfully
+        required: false
     image: opensearchproject/opensearch:${OS_VERSION}
     <<: *logging
     profiles:
-      - "saml"
-      - "standard"
+      - 'saml'
+      - 'standard'
     environment:
       - cluster.name=os-dev-cluster
       - node.name=os1
       - discovery.seed_hosts=os1
       - cluster.initial_master_nodes=os1
       - bootstrap.memory_lock=true # along with the memlock settings below, disables swapping
-      - "OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m" # minimum and maximum Java heap size, recommend setting both to 50% of system RAM
+      - 'OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m' # minimum and maximum Java heap size, recommend setting both to 50% of system RAM
       - OPENSEARCH_PATH_CONF=/usr/share/opensearch/config/
     ulimits:
       memlock:
@@ -162,7 +163,7 @@ services:
     healthcheck:
       test:
         [
-          "CMD-SHELL",
+          'CMD-SHELL',
           "curl -v --cacert config/certs/ca.pem https://os1:9200 2>&1 | grep -q '401 Unauthorized'",
         ]
       interval: 1s
@@ -175,17 +176,17 @@ services:
         condition: service_healthy
     image: elastic/filebeat:7.10.2
     profiles:
-      - "saml"
-      - "standard"
+      - 'saml'
+      - 'standard'
     hostname: filebeat
-    user: "0:0"
+    user: '0:0'
     networks:
       - os-dev
       - mon
     <<: *logging
     # restart: always
     entrypoint:
-      - "/bin/bash"
+      - '/bin/bash'
     command: >
       -c '
         mkdir -p /etc/filebeat
@@ -211,23 +212,23 @@ services:
         condition: service_healthy
     image: quay.io/wazuh/osd-dev:${OSD_VERSION}
     profiles:
-      - "saml"
-      - "standard"
+      - 'saml'
+      - 'standard'
     hostname: osd
     networks:
       - os-dev
       - devel
       - mon
-    user: "1000:1000"
+    user: '1000:1000'
     <<: *logging
     ports:
       - ${OSD_PORT}:5601
     environment:
-      - "LOGS=/proc/1/fd/1"
-    entrypoint: ["tail", "-f", "/dev/null"]
+      - 'LOGS=/proc/1/fd/1'
+    entrypoint: ['tail', '-f', '/dev/null']
     volumes:
       - osd_cache:/home/node/.cache
-      - "${SRC}:/home/node/kbn/plugins/wazuh"
+      - '${SRC}:/home/node/kbn/plugins/wazuh'
       - wd_certs:/home/node/kbn/certs/
       - ${WAZUH_DASHBOARD_CONF}:/home/node/kbn/config/opensearch_dashboards.yml
       - ./config/${OSD_MAJOR}/osd/wazuh.yml:/home/node/kbn/data/wazuh/config/wazuh.yml
@@ -238,7 +239,7 @@ services:
       generator:
         condition: service_healthy
     profiles:
-      - "saml"
+      - 'saml'
     volumes:
       - wi_certs:/certs/wi
       - wd_certs:/certs/wd
@@ -258,7 +259,7 @@ services:
         sleep 300
       '
     healthcheck:
-      test: ["CMD-SHELL", "[ -r /certs/idp/truststore.jks ]"]
+      test: ['CMD-SHELL', '[ -r /certs/idp/truststore.jks ]']
       interval: 2s
       timeout: 5s
       retries: 10
@@ -269,14 +270,14 @@ services:
       idpsec:
         condition: service_healthy
     profiles:
-      - "saml"
+      - 'saml'
     hostname: idp
     <<: *logging
     networks:
       - os-dev
       - mon
     ports:
-      - "8080:8080"
+      - '8080:8080'
     environment:
       - KEYCLOAK_ADMIN=admin
       - KEYCLOAK_ADMIN_PASSWORD=admin
@@ -298,7 +299,7 @@ services:
       idp:
         condition: service_healthy
     profiles:
-      - "saml"
+      - 'saml'
     hostname: idpsetup
     <<: *logging
     networks: