[Backport 4.5.0-7.10] Update test snapshots for 4.5 (#5603)

Update test snapshots for 4.5 (#5601) * Add missing supported versions to the Docker environments (#5584) feat(environments): add latest versions to Docker environments - Add Kibana versions: 7.17.7, 7.17.8, 7.17.9 and 7.17.10 - Add OpenSearch: 2.6.0 - Add OpenSearch Dashboards: 2.6.0 - Add Wazuh 4.4.1, 4.4.2, 4.4.3 and 4.4.4 * Update test snapshost * Update API data to 4.5 * Update branch patterns for GH Actions --------- Co-authored-by: Antonio <34042064+Desvelao@users.noreply.github.com> (cherry picked from commit 1ae5f19) Co-authored-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com>
wazuh · Jun 27, 2023 · 731b97d · 731b97d
1 parent 9f8d3bf
commit 731b97d
Show file tree

Hide file tree

Showing 13 changed files with 332 additions and 281 deletions.
diff --git a/.github/workflows/eslint.yml b/.github/workflows/eslint.yml
@@ -10,11 +10,12 @@
 name: ESLint
 
 on:
-  push:
-    branches: [ "master", "*.*-*.*", "*.*-*.*-wzd", "[0-9].[0-9]+" ]
   pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ "*.*-*.*", "*.*-*.*-wzd", "[0-9].[0-9]+" ]
+    branches:
+      - 'master'
+      - '[345].[0-9]+'                    # Minor branches
+      - '[345].[0-9]+.[0-9]+'             # Patch branches
+      - '[345].[0-9]+.[0-9]+-7.[0-9]+'    # Minor branches - Kibana
 
 jobs:
   eslint:

diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -26,9 +26,9 @@ on:
   pull_request:
     branches:
       - 'master'
-      - '*.*-*.*'
-      - '*.*-*.*-wzd'
-      - '[0-9].[0-9]+'
+      - '[345].[0-9]+'                    # Minor branches
+      - '[345].[0-9]+.[0-9]+'             # Patch branches
+      - '[345].[0-9]+.[0-9]+-7.[0-9]+'    # Minor branches - Kibana
 
 jobs:
   # Run unit tests with Jest

diff --git a/common/api-info/endpoints.json b/common/api-info/endpoints.json
diff --git a/common/services/web_documentation.test.ts b/common/services/web_documentation.test.ts
@@ -10,5 +10,5 @@ test(`Generate a web documentation URL to the base URL using to the plugin short
 });
 
 test(`Generate a web documentation URL using a specific version`, () => {
-    expect(webDocumentationLink('user-manual/agent-enrollment/index.html', '4.4')).toBe(`${DOCUMENTATION_WEB_BASE_URL}/4.4/user-manual/agent-enrollment/index.html`);
+    expect(webDocumentationLink('user-manual/agent-enrollment/index.html', '4.5')).toBe(`${DOCUMENTATION_WEB_BASE_URL}/4.5/user-manual/agent-enrollment/index.html`);
 });
diff --git a/docker/kbn-dev/dev.sh b/docker/kbn-dev/dev.sh
@@ -11,6 +11,10 @@ elastic_versions=(
 	'7.17.4'
 	'7.17.5'
 	'7.17.6'
+  '7.17.7'
+  '7.17.8'
+  '7.17.9'
+  '7.17.10'
 	'8.0.0'
 	'8.1.0'
 	'8.2.1'

diff --git a/docker/osd-dev/dev.sh b/docker/osd-dev/dev.sh
@@ -8,6 +8,7 @@ os_versions=(
   '2.3.0'
   '2.4.0'
   '2.4.1'
+  '2.6.0'
 )
 
 osd_versions=(
@@ -18,6 +19,7 @@ osd_versions=(
   '2.3.0'
   '2.4.0'
   '2.4.1'
+  '2.6.0'
 )
 
 usage() {

diff --git a/docker/wazuh-4.4-wz/pre.sh b/docker/wazuh-4.4-wz/pre.sh
@@ -2,6 +2,10 @@
 
 versions=(
 	"4.4.0"
+  "4.4.1"
+  "4.4.2"
+  "4.4.3"
+  "4.4.4"
 )
 
 wazuh_api_version=(

diff --git a/docker/wazuh-4.4-wz/rel.sh b/docker/wazuh-4.4-wz/rel.sh
@@ -2,6 +2,10 @@
 
 versions=(
 	"4.4.0"
+  "4.4.1"
+  "4.4.2"
+  "4.4.3"
+  "4.4.4"
 )
 
 usage() {

diff --git a/docker/wazuh-4.x-es/pre.sh b/docker/wazuh-4.x-es/pre.sh
@@ -12,6 +12,10 @@ elastic_versions=(
 	"7.17.4"
 	"7.17.5"
 	"7.17.6"
+  "7.17.7"
+  "7.17.8"
+  "7.17.9"
+  "7.17.10"
 )
 
 wazuh_api_version=(
@@ -28,6 +32,9 @@ wazuh_api_version=(
 	"4.3.10"
 	"4.4.0"
 	"4.4.1"
+  "4.4.2"
+  "4.4.3"
+  "4.4.4"
 )
 
 usage() {

diff --git a/docker/wazuh-4.x-es/rel.sh b/docker/wazuh-4.x-es/rel.sh
@@ -12,6 +12,10 @@ elastic_versions=(
 	"7.17.4"
 	"7.17.5"
 	"7.17.6"
+  "7.17.7"
+  "7.17.8"
+  "7.17.9"
+  "7.17.10"
 )
 
 wazuh_versions=(
@@ -27,6 +31,10 @@ wazuh_versions=(
   "4.3.9"
   "4.3.10"
   "4.4.0"
+  "4.4.1"
+  "4.4.2"
+  "4.4.3"
+  "4.4.4"
 )
 
 usage() {

diff --git a/...guration/office365/components/SubscriptionTab/__snapshots__/SubscriptionTab.test.tsx.snap b/...guration/office365/components/SubscriptionTab/__snapshots__/SubscriptionTab.test.tsx.snap
@@ -60,11 +60,11 @@ exports[`SubscriptionTab component renders correctly to match the snapshot 1`] =
     helpLinks={
       Array [
         Object {
-          "href": "https://documentation.wazuh.com/4.4/office365/index.html",
+          "href": "https://documentation.wazuh.com/4.5/office365/index.html",
           "text": "Using Wazuh to monitor Office 365",
         },
         Object {
-          "href": "https://documentation.wazuh.com/4.4/user-manual/reference/ossec-conf/office365-module.html",
+          "href": "https://documentation.wazuh.com/4.5/user-manual/reference/ossec-conf/office365-module.html",
           "text": "Configuration options for the module",
         },
       ]
@@ -76,11 +76,11 @@ exports[`SubscriptionTab component renders correctly to match the snapshot 1`] =
       help={
         Array [
           Object {
-            "href": "https://documentation.wazuh.com/4.4/office365/index.html",
+            "href": "https://documentation.wazuh.com/4.5/office365/index.html",
             "text": "Using Wazuh to monitor Office 365",
           },
           Object {
-            "href": "https://documentation.wazuh.com/4.4/user-manual/reference/ossec-conf/office365-module.html",
+            "href": "https://documentation.wazuh.com/4.5/user-manual/reference/ossec-conf/office365-module.html",
             "text": "Configuration options for the module",
           },
         ]
@@ -238,11 +238,11 @@ exports[`SubscriptionTab component renders correctly to match the snapshot 1`] =
                       links={
                         Array [
                           Object {
-                            "href": "https://documentation.wazuh.com/4.4/office365/index.html",
+                            "href": "https://documentation.wazuh.com/4.5/office365/index.html",
                             "text": "Using Wazuh to monitor Office 365",
                           },
                           Object {
-                            "href": "https://documentation.wazuh.com/4.4/user-manual/reference/ossec-conf/office365-module.html",
+                            "href": "https://documentation.wazuh.com/4.5/user-manual/reference/ossec-conf/office365-module.html",
                             "text": "Configuration options for the module",
                           },
                         ]

diff --git a/.../configuration/office365/components/api-auth-tab/__snapshots__/api-auth-tab.test.tsx.snap b/.../configuration/office365/components/api-auth-tab/__snapshots__/api-auth-tab.test.tsx.snap
@@ -70,11 +70,11 @@ exports[`ApiAuthTab component renders correctly to match the snapshot 1`] = `
     helpLinks={
       Array [
         Object {
-          "href": "https://documentation.wazuh.com/4.4/office365/index.html",
+          "href": "https://documentation.wazuh.com/4.5/office365/index.html",
           "text": "Using Wazuh to monitor Office 365",
         },
         Object {
-          "href": "https://documentation.wazuh.com/4.4/user-manual/reference/ossec-conf/office365-module.html",
+          "href": "https://documentation.wazuh.com/4.5/user-manual/reference/ossec-conf/office365-module.html",
           "text": "Configuration options for the module",
         },
       ]
@@ -86,11 +86,11 @@ exports[`ApiAuthTab component renders correctly to match the snapshot 1`] = `
       help={
         Array [
           Object {
-            "href": "https://documentation.wazuh.com/4.4/office365/index.html",
+            "href": "https://documentation.wazuh.com/4.5/office365/index.html",
             "text": "Using Wazuh to monitor Office 365",
           },
           Object {
-            "href": "https://documentation.wazuh.com/4.4/user-manual/reference/ossec-conf/office365-module.html",
+            "href": "https://documentation.wazuh.com/4.5/user-manual/reference/ossec-conf/office365-module.html",
             "text": "Configuration options for the module",
           },
         ]
@@ -248,11 +248,11 @@ exports[`ApiAuthTab component renders correctly to match the snapshot 1`] = `
                       links={
                         Array [
                           Object {
-                            "href": "https://documentation.wazuh.com/4.4/office365/index.html",
+                            "href": "https://documentation.wazuh.com/4.5/office365/index.html",
                             "text": "Using Wazuh to monitor Office 365",
                           },
                           Object {
-                            "href": "https://documentation.wazuh.com/4.4/user-manual/reference/ossec-conf/office365-module.html",
+                            "href": "https://documentation.wazuh.com/4.5/user-manual/reference/ossec-conf/office365-module.html",
                             "text": "Configuration options for the module",
                           },
                         ]

diff --git a/...nt/configuration/office365/components/general-tab/__snapshots__/general-tab.test.tsx.snap b/...nt/configuration/office365/components/general-tab/__snapshots__/general-tab.test.tsx.snap
@@ -61,11 +61,11 @@ exports[`GeneralTab component renders correctly to match the snapshot 1`] = `
     helpLinks={
       Array [
         Object {
-          "href": "https://documentation.wazuh.com/4.4/office365/index.html",
+          "href": "https://documentation.wazuh.com/4.5/office365/index.html",
           "text": "Using Wazuh to monitor Office 365",
         },
         Object {
-          "href": "https://documentation.wazuh.com/4.4/user-manual/reference/ossec-conf/office365-module.html",
+          "href": "https://documentation.wazuh.com/4.5/user-manual/reference/ossec-conf/office365-module.html",
           "text": "Configuration options for the module",
         },
       ]
@@ -78,11 +78,11 @@ exports[`GeneralTab component renders correctly to match the snapshot 1`] = `
       help={
         Array [
           Object {
-            "href": "https://documentation.wazuh.com/4.4/office365/index.html",
+            "href": "https://documentation.wazuh.com/4.5/office365/index.html",
             "text": "Using Wazuh to monitor Office 365",
           },
           Object {
-            "href": "https://documentation.wazuh.com/4.4/user-manual/reference/ossec-conf/office365-module.html",
+            "href": "https://documentation.wazuh.com/4.5/user-manual/reference/ossec-conf/office365-module.html",
             "text": "Configuration options for the module",
           },
         ]
@@ -258,11 +258,11 @@ exports[`GeneralTab component renders correctly to match the snapshot 1`] = `
                       links={
                         Array [
                           Object {
-                            "href": "https://documentation.wazuh.com/4.4/office365/index.html",
+                            "href": "https://documentation.wazuh.com/4.5/office365/index.html",
                             "text": "Using Wazuh to monitor Office 365",
                           },
                           Object {
-                            "href": "https://documentation.wazuh.com/4.4/user-manual/reference/ossec-conf/office365-module.html",
+                            "href": "https://documentation.wazuh.com/4.5/user-manual/reference/ossec-conf/office365-module.html",
                             "text": "Configuration options for the module",
                           },
                         ]
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,7 @@ os_versions=( @@
       '2.3.0'
       '2.4.0'
       '2.4.1'
+      '2.6.0'
     )
     osd_versions=(
@@ Expand All / @@ -18,6 +19,7 @@ osd_versions=( @@
       '2.3.0'
       '2.4.0'
       '2.4.1'
+      '2.6.0'
     )
     usage() {
@@ Expand Down @@