Merge 4.5.2 into 4.6.0 (#5775)

* Change windows agent service name (#5538) * Change windows agent service name to Wazuh Change windows agent service name to Wazuh * Add CHANGELOG * Remove agent name in agent info ribbon (#5497) * remove: agent name in agent info ribbon * changelog: add pull request entry --------- Co-authored-by: Álex Ruiz <[email protected]> * Fix IPV6 visualizations (#5471) * add ipv6 service * add test for service * Fix issue in agents-table * fix issue in agents-info * fix groups agents issue * Fix width in groups agents * use mapResponseItem * Add copy button to groups * Add copy button to info * fix for node list * Optimize code * Fix styles * Edit changelog * Edit changelog * Add imposter changes to test ipv6 * Replace onMouseDown with onClick * Move copy buttons to the left * fix: removed compressipv6 property of TableWzAPI * feat: add tableLayout property to some tables and remove IPv6 address compression add tableLayout=auto property to some tables: - Agents/{agent_id}/Inventory data - Management/Cluster/Nodes - Agents - Management/Configuration/Client - Management/Global configuration/Remote remove IPv6 address compression * remove: remove unused service to IPv6 compression * revert: revert changes in TableWzAPI component * add: add mocked responses to some syscollector endpoints * remove: unwanted table columns properties * changelog: add pull request entry * Fix imposter --------- Co-authored-by: Antonio David Gutiérrez <[email protected]> Co-authored-by: Álex Ruiz <[email protected]> Co-authored-by: yenienserrano <[email protected]> Co-authored-by: Antonio <[email protected]> * Bump v4.4.4-2.6.0-rc2 * Add Apple Silicon architecture to the register Agent wizard (#5478) * Add Apple Silicon architecture * Add changelog * Change macOS environment variables * Revert "Change macOS environment variables" This reverts commit 108e866. * Change macOS architecture ids * 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 * Bump 4.5.1 * Change the method to make the redirect (#5539) * Change the metod to make the redirect * Remove unused code * Add changelog --------- Co-authored-by: Álex Ruiz <[email protected]> * Fix agents active coverage stat as NaN (#5490) * fix: agents active coverate stat as NaN Ensure the values used to calculate have the expected types and the total count is greater than 0. * remove: unused openRegistrationDocs method * changelog: add entry * fix: check if agents active coverage is a NaN * changelog: fix entry --------- Co-authored-by: Álex Ruiz <[email protected]> * [Backport 4.5.1] Update test snapshots for 4.5 (#5607) * 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 <[email protected]> (cherry picked from commit 1ae5f19) * Fix API reference links in endpoints.json * Add kbn-dev 7.17.11 (#5628) * Merge 4.5.0 into 4.5.1 (#5670) * 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 <[email protected]> * Fix API reference links in endpoints.json * Merge 4.4 into 4.5.0 (#5669) Merge v4.4.5-2.6.0 into 4.4 (#5665) * Bump Wazuh and platform versions for v4.4.5 (#5639) * Update changelog * Update opensearch_dashboards.json * Update package.json * Update readme * Update tag script * Change tag.py version value * Empty tag suffix * Prepare tag.py for v4.4.5-rc1 (#5645) Add -rc1 tag suffix * Fix incompatible version of triple-beam subdependency (#5652) fix: add yarn.lock file and set version of triple-beam in yarn.lock * Update unit-test.yml (#5655) * Add support for Wazuh 4.4.5-rc2 (#5659) * Update revision of v4.4.5 in the Changelog * Bump v4.4.5-2.6.0-rc2 --------- Co-authored-by: Nicolas Agustin Guevara Pihen <[email protected]> Co-authored-by: Federico Rodriguez <[email protected]> Co-authored-by: Álex Ruiz <[email protected]> Co-authored-by: Antonio <[email protected]> --------- Co-authored-by: Álex Ruiz <[email protected]> Co-authored-by: Antonio <[email protected]> Co-authored-by: Nicolas Agustin Guevara Pihen <[email protected]> Co-authored-by: Federico Rodriguez <[email protected]> * Bump Wazuh version 4.5.2 (#5702) Bump 4.5.2 * Merge 4.5.1 into 4.5.2 (#5720) Merge 4.5.0 into 4.5.1 (#5719) * 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 --------- * Fix API reference links in endpoints.json * Merge 4.4 into 4.5.0 (#5669) Merge v4.4.5-2.6.0 into 4.4 (#5665) * Bump Wazuh and platform versions for v4.4.5 (#5639) * Update changelog * Update opensearch_dashboards.json * Update package.json * Update readme * Update tag script * Change tag.py version value * Empty tag suffix * Prepare tag.py for v4.4.5-rc1 (#5645) Add -rc1 tag suffix * Fix incompatible version of triple-beam subdependency (#5652) fix: add yarn.lock file and set version of triple-beam in yarn.lock * Update unit-test.yml (#5655) * Add support for Wazuh 4.4.5-rc2 (#5659) * Update revision of v4.4.5 in the Changelog * Bump v4.4.5-2.6.0-rc2 --------- * Update release utilities (#5677) * feat: update release utilities to current process - Add new bump script - Port tag.py to NodeJS and allow receive parameters from stdin - Add RELEASING.md file with information about the release process related to the usage of the included scripts - Add release:bump and release:tag package scripts to run these process * remove: remove scripts/tag.py and reference in the Makefile * fix: fix help text in bump and tag scripts * remove: remove stage and commit properties from the package.json * remove: test related to stage property in the package.json * fix: check if there are changes to commit in the tag script - Code formatting - Fix variable name --------- Co-authored-by: Álex Ruiz <[email protected]> Co-authored-by: Ian Yenien Serrano <[email protected]> Co-authored-by: Nicolas Agustin Guevara Pihen <[email protected]> Co-authored-by: Federico Rodriguez <[email protected]> * Merge 4.5.1 into 4.5.2 (#5774) * Merge 4.5.0 into 4.5.1 (#5719) * 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 <[email protected]> * Fix API reference links in endpoints.json * Merge 4.4 into 4.5.0 (#5669) Merge v4.4.5-2.6.0 into 4.4 (#5665) * Bump Wazuh and platform versions for v4.4.5 (#5639) * Update changelog * Update opensearch_dashboards.json * Update package.json * Update readme * Update tag script * Change tag.py version value * Empty tag suffix * Prepare tag.py for v4.4.5-rc1 (#5645) Add -rc1 tag suffix * Fix incompatible version of triple-beam subdependency (#5652) fix: add yarn.lock file and set version of triple-beam in yarn.lock * Update unit-test.yml (#5655) * Add support for Wazuh 4.4.5-rc2 (#5659) * Update revision of v4.4.5 in the Changelog * Bump v4.4.5-2.6.0-rc2 --------- Co-authored-by: Nicolas Agustin Guevara Pihen <[email protected]> Co-authored-by: Federico Rodriguez <[email protected]> Co-authored-by: Álex Ruiz <[email protected]> Co-authored-by: Antonio <[email protected]> * Update release utilities (#5677) * feat: update release utilities to current process - Add new bump script - Port tag.py to NodeJS and allow receive parameters from stdin - Add RELEASING.md file with information about the release process related to the usage of the included scripts - Add release:bump and release:tag package scripts to run these process * remove: remove scripts/tag.py and reference in the Makefile * fix: fix help text in bump and tag scripts * remove: remove stage and commit properties from the package.json * remove: test related to stage property in the package.json * fix: check if there are changes to commit in the tag script - Code formatting - Fix variable name --------- Co-authored-by: Álex Ruiz <[email protected]> Co-authored-by: Ian Yenien Serrano <[email protected]> Co-authored-by: Nicolas Agustin Guevara Pihen <[email protected]> Co-authored-by: Federico Rodriguez <[email protected]> * Fix API request to get the manager labels and broken documentation link (#5687) * fix: broken documentation link * changelog: add pull request entry * fix: changed API endpoint to get the manager labels and managing the data to render * changelog: add pull request entry * changelog: fix entry * changelog: fix entry * Add response to imposter --------- Co-authored-by: yenienserrano <[email protected]> * Fix server side query in pdf report filter (#5714) * Add server side query * Fix reporting unit test * Remove duplicated allowed agents filter and gdpr-pci-tsc filters * Code cleaning * Added Changelog * Fix deep clone filters * Fix server side requirement query * Fix rootkit filter * Update API data for 4.5.1 (#5758) update: API data * Fix outdated year in PDF report footer (#5766) * Fix year in PDF footer * Modify changelog * Change tests to match the new value * Change md5 in reporting test * Change md5 in reporting test * Revert accidental change * Revert accidental change * Fix md5 in test * Change md5 in test * Change md5 in test * Merge 4.5 into 4.5.1 (#5773) * 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 <[email protected]> * Fix API reference links in endpoints.json * Merge 4.4 into 4.5.0 (#5669) Merge v4.4.5-2.6.0 into 4.4 (#5665) * Bump Wazuh and platform versions for v4.4.5 (#5639) * Update changelog * Update opensearch_dashboards.json * Update package.json * Update readme * Update tag script * Change tag.py version value * Empty tag suffix * Prepare tag.py for v4.4.5-rc1 (#5645) Add -rc1 tag suffix * Fix incompatible version of triple-beam subdependency (#5652) fix: add yarn.lock file and set version of triple-beam in yarn.lock * Update unit-test.yml (#5655) * Add support for Wazuh 4.4.5-rc2 (#5659) * Update revision of v4.4.5 in the Changelog * Bump v4.4.5-2.6.0-rc2 --------- Co-authored-by: Nicolas Agustin Guevara Pihen <[email protected]> Co-authored-by: Federico Rodriguez <[email protected]> Co-authored-by: Álex Ruiz <[email protected]> Co-authored-by: Antonio <[email protected]> * Update release utilities (#5677) * feat: update release utilities to current process - Add new bump script - Port tag.py to NodeJS and allow receive parameters from stdin - Add RELEASING.md file with information about the release process related to the usage of the included scripts - Add release:bump and release:tag package scripts to run these process * remove: remove scripts/tag.py and reference in the Makefile * fix: fix help text in bump and tag scripts * remove: remove stage and commit properties from the package.json * remove: test related to stage property in the package.json * fix: check if there are changes to commit in the tag script - Code formatting - Fix variable name * Bump v4.5.0-2.6.0-alpha1 * Update README.md --------- Co-authored-by: Álex Ruiz <[email protected]> Co-authored-by: Antonio <[email protected]> Co-authored-by: Nicolas Agustin Guevara Pihen <[email protected]> Co-authored-by: Federico Rodriguez <[email protected]> --------- Co-authored-by: Antonio <[email protected]> Co-authored-by: Álex Ruiz <[email protected]> Co-authored-by: Nicolas Agustin Guevara Pihen <[email protected]> Co-authored-by: Federico Rodriguez <[email protected]> * Remove files * Remove console.log --------- Co-authored-by: Julio César Biset <[email protected]> Co-authored-by: Antonio <[email protected]> Co-authored-by: Álex Ruiz <[email protected]> Co-authored-by: Nicolas Agustin Guevara Pihen <[email protected]> Co-authored-by: Antonio David Gutiérrez <[email protected]> Co-authored-by: Federico Rodriguez <[email protected]>
wazuh · Aug 11, 2023 · afc2b3b · afc2b3b
1 parent 4833f59
commit afc2b3b
Show file tree

Hide file tree

Showing 26 changed files with 590 additions and 409 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -64,6 +64,9 @@ All notable changes to the Wazuh app project will be documented in this file.
 
 - Fixed the rendering of tables that contains IPs and agent overview [#5471](https://github.com/wazuh/wazuh-kibana-app/pull/5471)
 - Fixed the agents active coverage stat as NaN in Details panel of Agents section [#5490](https://github.com/wazuh/wazuh-kibana-app/pull/5490)
+- Fixed a broken documentation link to agent labels [#5687](https://github.com/wazuh/wazuh-kibana-app/pull/5687)
+- Fixed the PDF report filters applied to tables [#5714](https://github.com/wazuh/wazuh-kibana-app/pull/5714)
+- Fixed outdated year in the PDF report footer [#5766](https://github.com/wazuh/wazuh-kibana-app/pull/5766)
 
 ### Removed
 
@@ -73,6 +76,7 @@ All notable changes to the Wazuh app project will be documented in this file.
 
 - Changed method to perform redirection on agent table buttons [#5539](https://github.com/wazuh/wazuh-kibana-app/pull/5539)
 - Changed windows agent service name in the deploy agent wizard [#5538](https://github.com/wazuh/wazuh-kibana-app/pull/5538)
+- Changed the requests to get the agent labels for the managers [#5687](https://github.com/wazuh/wazuh-kibana-app/pull/5687)
 
 ## Wazuh v4.5.0 - OpenSearch Dashboards 2.6.0 - Revision 01
 

diff --git a/docker/imposter/agents/configuration.js b/docker/imposter/agents/configuration.js
@@ -0,0 +1,15 @@
+var path = context.request.path;
+var pathConfiguration = path.split('/');
+pathConfiguration.splice(0, 5);
+console.log(pathConfiguration);
+switch (pathConfiguration[0]) {
+  case 'labels':
+    respond()
+      .withStatusCode(200)
+      .withFile('agents/configuration/agent_labels.json');
+
+    break;
+  default:
+    respond().withStatusCode(200).withFile('agents/configuration/default.json');
+    break;
+}
diff --git a/docker/imposter/agents/configuration/agent_labels.json b/docker/imposter/agents/configuration/agent_labels.json
@@ -0,0 +1,12 @@
+{
+  "data": {
+    "labels": [
+      {
+        "value": "customLabel",
+        "key": "custom",
+        "hidden": "no"
+      }
+    ]
+  },
+  "error": 0
+}
diff --git a/docker/imposter/agents/configuration/default.json b/docker/imposter/agents/configuration/default.json
@@ -0,0 +1,33 @@
+{
+  "data": {
+    "client": {
+      "config-profile": "ubuntu, ubuntu20, ubuntu20.04",
+      "notify_time": 10,
+      "time-reconnect": 60,
+      "force_reconnect_interval": 0,
+      "ip_update_interval": 0,
+      "auto_restart": "yes",
+      "remote_conf": "yes",
+      "crypto_method": "aes",
+      "server": [
+        {
+          "address": "nginx-lb/172.25.0.4",
+          "port": 1514,
+          "max_retries": 5,
+          "retry_interval": 10,
+          "protocol": "tcp"
+        }
+      ],
+      "enrollment": [
+        {
+          "enabled": "yes",
+          "delay_after_enrollment": 20,
+          "port": 1515,
+          "ssl_cipher": "HIGH:!ADH:!EXP:!MD5:!RC4:!3DES:!CAMELLIA:@STRENGTH",
+          "auto_method": "no"
+        }
+      ]
+    }
+  },
+  "error": 0
+}
diff --git a/docker/imposter/cluster/configuration/agent_labels.json b/docker/imposter/cluster/configuration/agent_labels.json
@@ -0,0 +1,20 @@
+{
+  "data": {
+    "affected_items": [
+      {
+        "labels": [
+          {
+            "value": "customLabel",
+            "key": "custom",
+            "hidden": "no"
+          }
+        ]
+      }
+    ],
+    "total_affected_items": 1,
+    "total_failed_items": 0,
+    "failed_items": []
+  },
+  "message": "Active configuration was successfully read in specified node.",
+  "error": 0
+}
diff --git a/docker/imposter/manager/configuration.js b/docker/imposter/manager/configuration.js
@@ -0,0 +1,22 @@
+var path = context.request.path;
+var pathConfiguration = path.split('/');
+pathConfiguration.splice(0, 4);
+switch (pathConfiguration[0]) {
+  case 'labels':
+    respond()
+      .withStatusCode(200)
+      .withFile('manager/configuration/agent_labels.json');
+
+    break;
+  case 'reports':
+    respond()
+      .withStatusCode(200)
+      .withFile('manager/configuration/monitor_reports.json');
+
+    break;
+  default:
+    respond()
+      .withStatusCode(200)
+      .withFile('manager/configuration/default.json');
+    break;
+}
diff --git a/docker/imposter/manager/configuration/agent_labels.json b/docker/imposter/manager/configuration/agent_labels.json
@@ -0,0 +1,20 @@
+{
+  "data": {
+    "affected_items": [
+      {
+        "labels": [
+          {
+            "value": "customLabel",
+            "key": "custom",
+            "hidden": "no"
+          }
+        ]
+      }
+    ],
+    "total_affected_items": 1,
+    "total_failed_items": 0,
+    "failed_items": []
+  },
+  "message": "Active configuration was successfully read in specified node.",
+  "error": 0
+}
diff --git a/docker/imposter/manager/configuration/default.json b/docker/imposter/manager/configuration/default.json
@@ -0,0 +1,35 @@
+{
+  "data": {
+    "affected_items": [
+      {
+        "global": {
+          "email_notification": "no",
+          "logall": "no",
+          "logall_json": "no",
+          "integrity_checking": 8,
+          "rootkit_detection": 8,
+          "host_information": 8,
+          "prelude_output": "no",
+          "zeromq_output": "no",
+          "jsonout_output": "yes",
+          "alerts_log": "yes",
+          "stats": 4,
+          "memory_size": 8192,
+          "white_list": [
+            "127.0.0.1",
+            "80.58.61.250",
+            "80.58.61.254",
+            "localhost.localdomain"
+          ],
+          "rotate_interval": 0,
+          "max_output_size": 0
+        }
+      }
+    ],
+    "total_affected_items": 1,
+    "total_failed_items": 0,
+    "failed_items": []
+  },
+  "message": "Active configuration was successfully read in specified node",
+  "error": 0
+}
diff --git a/docker/imposter/manager/configuration/monitor_reports.json b/docker/imposter/manager/configuration/monitor_reports.json
@@ -0,0 +1,16 @@
+{
+    "data": {
+        "affected_items": [{
+            "reports": [{
+                "category": "syscheck",
+                "title": "Daily report: File changes",
+                "email_to": "[email protected]"
+            }]
+        }],
+        "total_affected_items": 1,
+        "total_failed_items": 0,
+        "failed_items": []
+    },
+    "message": "Could not read active configuration in specified node",
+    "error": 0
+}
diff --git a/docker/imposter/wazuh-config.yml b/docker/imposter/wazuh-config.yml
@@ -507,6 +507,9 @@ resources:
   # Get active configuration
   - method: GET
     path: /manager/configuration/{component}/{configuration}
+    response:
+      statusCode: 200
+      scriptFile: manager/configuration.js
 
   # ===================================================== #
   #   MITRE