From ac2c9ee565115ec5c0f6d2af87e352d021ccf1e7 Mon Sep 17 00:00:00 2001
From: Nicolas Agustin Guevara Pihen <42900763+Tostti@users.noreply.github.com>
Date: Mon, 15 Jul 2024 06:42:07 -0300
Subject: [PATCH 1/5] Bump revision 03 for 4.8.1 RC 3 (#6822)
* Bump revision 03
* Fix formatting
---
CHANGELOG.md | 2 +-
plugins/main/opensearch_dashboards.json | 2 +-
plugins/main/package.json | 2 +-
plugins/wazuh-check-updates/opensearch_dashboards.json | 2 +-
plugins/wazuh-check-updates/package.json | 2 +-
plugins/wazuh-core/opensearch_dashboards.json | 2 +-
plugins/wazuh-core/package.json | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4285a0b3b5..ddc27b2b02 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
All notable changes to the Wazuh app project will be documented in this file.
-## Wazuh v4.8.1 - OpenSearch Dashboards 2.10.0 - Revision 02
+## Wazuh v4.8.1 - OpenSearch Dashboards 2.10.0 - Revision 03
### Added
diff --git a/plugins/main/opensearch_dashboards.json b/plugins/main/opensearch_dashboards.json
index ac31b16774..7f4e9b529b 100644
--- a/plugins/main/opensearch_dashboards.json
+++ b/plugins/main/opensearch_dashboards.json
@@ -1,6 +1,6 @@
{
"id": "wazuh",
- "version": "4.8.1-02",
+ "version": "4.8.1-03",
"opensearchDashboardsVersion": "opensearchDashboards",
"configPath": ["wazuh"],
"requiredPlugins": [
diff --git a/plugins/main/package.json b/plugins/main/package.json
index 5299e523ac..cbb71ba127 100644
--- a/plugins/main/package.json
+++ b/plugins/main/package.json
@@ -1,7 +1,7 @@
{
"name": "wazuh",
"version": "4.8.1",
- "revision": "02",
+ "revision": "03",
"pluginPlatform": {
"version": "2.10.0"
},
diff --git a/plugins/wazuh-check-updates/opensearch_dashboards.json b/plugins/wazuh-check-updates/opensearch_dashboards.json
index c5c922be3d..85ddc1469a 100644
--- a/plugins/wazuh-check-updates/opensearch_dashboards.json
+++ b/plugins/wazuh-check-updates/opensearch_dashboards.json
@@ -1,6 +1,6 @@
{
"id": "wazuhCheckUpdates",
- "version": "4.8.1-02",
+ "version": "4.8.1-03",
"opensearchDashboardsVersion": "opensearchDashboards",
"server": true,
"ui": true,
diff --git a/plugins/wazuh-check-updates/package.json b/plugins/wazuh-check-updates/package.json
index 5561a720c7..1ea5c7e168 100644
--- a/plugins/wazuh-check-updates/package.json
+++ b/plugins/wazuh-check-updates/package.json
@@ -1,7 +1,7 @@
{
"name": "wazuh-check-updates",
"version": "4.8.1",
- "revision": "02",
+ "revision": "03",
"pluginPlatform": {
"version": "2.10.0"
},
diff --git a/plugins/wazuh-core/opensearch_dashboards.json b/plugins/wazuh-core/opensearch_dashboards.json
index 8fc262745c..e121e9bead 100644
--- a/plugins/wazuh-core/opensearch_dashboards.json
+++ b/plugins/wazuh-core/opensearch_dashboards.json
@@ -1,6 +1,6 @@
{
"id": "wazuhCore",
- "version": "4.8.1-02",
+ "version": "4.8.1-03",
"opensearchDashboardsVersion": "opensearchDashboards",
"server": true,
"ui": true,
diff --git a/plugins/wazuh-core/package.json b/plugins/wazuh-core/package.json
index 57d1888d58..1eb7cc1f38 100644
--- a/plugins/wazuh-core/package.json
+++ b/plugins/wazuh-core/package.json
@@ -1,7 +1,7 @@
{
"name": "wazuh-core",
"version": "4.8.1",
- "revision": "02",
+ "revision": "03",
"pluginPlatform": {
"version": "2.10.0"
},
From 6eaec17391047cf89eb9cd645efdc0905c99286f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julio=20C=C3=A9sar=20Biset?=
<43619595+jbiset@users.noreply.github.com>
Date: Tue, 16 Jul 2024 12:44:25 -0300
Subject: [PATCH 2/5] Fixed error when pinned agent in vulnerabilities (#6827)
* Fixed error when pinned agent in vulnerabilities
* Added CHANGELOG
* Changed CHANGELOG
---
CHANGELOG.md | 1 +
.../common/vulnerability_detector_adapters.tsx | 7 +++----
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ddc27b2b02..ad9203fb6f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ All notable changes to the Wazuh app project will be documented in this file.
- Removed the unexpected `delay` parameter on the server API requests [#6778](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6778)
- Fixed home KPI links with custom or index pattern whose title is different to the id [#6777](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6777)
- Fixed colors related to vulnerability severity levels on Vulnerability Detection dashboard [#6793](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6793)
+- Fixed pinned agent error in vulnerabilities events tab [#6827](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6827)
## Wazuh v4.8.0 - OpenSearch Dashboards 2.10.0 - Revision 12
diff --git a/plugins/main/public/components/overview/vulnerabilities/common/vulnerability_detector_adapters.tsx b/plugins/main/public/components/overview/vulnerabilities/common/vulnerability_detector_adapters.tsx
index 58687502c5..aeffad1bd0 100644
--- a/plugins/main/public/components/overview/vulnerabilities/common/vulnerability_detector_adapters.tsx
+++ b/plugins/main/public/components/overview/vulnerabilities/common/vulnerability_detector_adapters.tsx
@@ -1,7 +1,6 @@
import {
AUTHORIZED_AGENTS,
VULNERABILITY_IMPLICIT_CLUSTER_MODE_FILTER,
- WAZUH_ALERTS_PATTERN,
} from '../../../../../common/constants';
import { AppState } from '../../../../react-services';
import { FilterHandler } from '../../../../utils/filter-handler';
@@ -113,7 +112,7 @@ export const restorePrevIndexFiltersAdapter = (
cleanedFilters.unshift(managerFilter);
const implicitPinnedAgent = getImplicitPinnedAgent(
previousFilters,
- toIndexPattern ?? WAZUH_ALERTS_PATTERN,
+ toIndexPattern ?? AppState.getCurrentPattern(),
);
if (implicitPinnedAgent) {
const cleanedFiltersWithoutNormalAgents = cleanedFilters.filter(x => {
@@ -143,7 +142,7 @@ export const onUpdateAdapter = (
*/
const cleanedFilters = cleanFilters(
filters,
- prevStoragePattern ?? WAZUH_ALERTS_PATTERN,
+ prevStoragePattern ?? AppState.getCurrentPattern(),
);
if (storagePreviousFilters) {
const previousFilters = JSON.parse(storagePreviousFilters);
@@ -152,7 +151,7 @@ export const onUpdateAdapter = (
);
const cleanedPreviousImplicitFilters = cleanFilters(
previousImplicitFilters,
- prevStoragePattern ?? WAZUH_ALERTS_PATTERN,
+ prevStoragePattern ?? AppState.getCurrentPattern(),
);
/* Normal filters added to storagePreviousFilters are added to keep them between dashboard and inventory tab */
const newFilters = filters.filter(
From daddf2ca30bb4a398d88aa2bc7ded09e93e6926c Mon Sep 17 00:00:00 2001
From: Nicolas Agustin Guevara Pihen <42900763+Tostti@users.noreply.github.com>
Date: Wed, 17 Jul 2024 07:14:40 -0300
Subject: [PATCH 3/5] Bump revision 04 for 4.8.1 RC 4 (#6836)
Bump revision 04
---
CHANGELOG.md | 2 +-
plugins/main/opensearch_dashboards.json | 2 +-
plugins/main/package.json | 2 +-
plugins/wazuh-check-updates/opensearch_dashboards.json | 2 +-
plugins/wazuh-check-updates/package.json | 2 +-
plugins/wazuh-core/opensearch_dashboards.json | 2 +-
plugins/wazuh-core/package.json | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad9203fb6f..78d0768c88 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
All notable changes to the Wazuh app project will be documented in this file.
-## Wazuh v4.8.1 - OpenSearch Dashboards 2.10.0 - Revision 03
+## Wazuh v4.8.1 - OpenSearch Dashboards 2.10.0 - Revision 04
### Added
diff --git a/plugins/main/opensearch_dashboards.json b/plugins/main/opensearch_dashboards.json
index 7f4e9b529b..ce55feeac5 100644
--- a/plugins/main/opensearch_dashboards.json
+++ b/plugins/main/opensearch_dashboards.json
@@ -1,6 +1,6 @@
{
"id": "wazuh",
- "version": "4.8.1-03",
+ "version": "4.8.1-04",
"opensearchDashboardsVersion": "opensearchDashboards",
"configPath": ["wazuh"],
"requiredPlugins": [
diff --git a/plugins/main/package.json b/plugins/main/package.json
index cbb71ba127..152668646b 100644
--- a/plugins/main/package.json
+++ b/plugins/main/package.json
@@ -1,7 +1,7 @@
{
"name": "wazuh",
"version": "4.8.1",
- "revision": "03",
+ "revision": "04",
"pluginPlatform": {
"version": "2.10.0"
},
diff --git a/plugins/wazuh-check-updates/opensearch_dashboards.json b/plugins/wazuh-check-updates/opensearch_dashboards.json
index 85ddc1469a..2de8339bb0 100644
--- a/plugins/wazuh-check-updates/opensearch_dashboards.json
+++ b/plugins/wazuh-check-updates/opensearch_dashboards.json
@@ -1,6 +1,6 @@
{
"id": "wazuhCheckUpdates",
- "version": "4.8.1-03",
+ "version": "4.8.1-04",
"opensearchDashboardsVersion": "opensearchDashboards",
"server": true,
"ui": true,
diff --git a/plugins/wazuh-check-updates/package.json b/plugins/wazuh-check-updates/package.json
index 1ea5c7e168..e3e5d2fdfe 100644
--- a/plugins/wazuh-check-updates/package.json
+++ b/plugins/wazuh-check-updates/package.json
@@ -1,7 +1,7 @@
{
"name": "wazuh-check-updates",
"version": "4.8.1",
- "revision": "03",
+ "revision": "04",
"pluginPlatform": {
"version": "2.10.0"
},
diff --git a/plugins/wazuh-core/opensearch_dashboards.json b/plugins/wazuh-core/opensearch_dashboards.json
index e121e9bead..dc85daeb3e 100644
--- a/plugins/wazuh-core/opensearch_dashboards.json
+++ b/plugins/wazuh-core/opensearch_dashboards.json
@@ -1,6 +1,6 @@
{
"id": "wazuhCore",
- "version": "4.8.1-03",
+ "version": "4.8.1-04",
"opensearchDashboardsVersion": "opensearchDashboards",
"server": true,
"ui": true,
diff --git a/plugins/wazuh-core/package.json b/plugins/wazuh-core/package.json
index 1eb7cc1f38..a6813593c5 100644
--- a/plugins/wazuh-core/package.json
+++ b/plugins/wazuh-core/package.json
@@ -1,7 +1,7 @@
{
"name": "wazuh-core",
"version": "4.8.1",
- "revision": "03",
+ "revision": "04",
"pluginPlatform": {
"version": "2.10.0"
},
From 471203aa242eeb7309a4ce4909acc9abd985646c Mon Sep 17 00:00:00 2001
From: Ian Yenien Serrano <63758389+yenienserrano@users.noreply.github.com>
Date: Thu, 18 Jul 2024 16:55:00 +0200
Subject: [PATCH 4/5] Add saved queries button to search bar (#6833)
* Add saved queries button
* Add changelog
---
CHANGELOG.md | 2 +-
.../components/common/search-bar/search-bar.scss | 10 ++++++++++
.../components/common/search-bar/search-bar.tsx | 14 ++++++--------
3 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c3aa28869..8635e4b88b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -42,7 +42,7 @@ All notable changes to the Wazuh app project will be documented in this file.
- Upgraded versions of `follow-redirects` and `es5-ext` [#6626](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6626)
- Changed agent log collector socket API response controller component [#6660](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6660)
- Improve margins and paddings in the Events, Inventory and Control tabs [#6708](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6708)
-- Refactored the search bar to correctly handle fixed and user-added filters [#6716](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6716) [#6755](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6755)
+- Refactored the search bar to correctly handle fixed and user-added filters [#6716](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6716) [#6755](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6755) [#6833](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6833)
- Generate URL with predefined filters [#6745](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6745)
- Migrated AngularJS routing to ReactJS [#6689](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6689) [#6775](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6775) [#6790](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6790
- Improvement of the filter management system by implementing new standard modules [#6534](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6534) [#6772](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6772)
diff --git a/plugins/main/public/components/common/search-bar/search-bar.scss b/plugins/main/public/components/common/search-bar/search-bar.scss
index a952bea825..f45d922c38 100644
--- a/plugins/main/public/components/common/search-bar/search-bar.scss
+++ b/plugins/main/public/components/common/search-bar/search-bar.scss
@@ -1,3 +1,13 @@
.wz-search-bar-no-padding .globalQueryBar:not(:empty) {
padding: 0px !important;
}
+
+.wz-search-bar {
+ > .euiFlexGroup {
+ &:first-child {
+ #GlobalFilterGroup {
+ display: none;
+ }
+ }
+ }
+}
diff --git a/plugins/main/public/components/common/search-bar/search-bar.tsx b/plugins/main/public/components/common/search-bar/search-bar.tsx
index dcc46a3f22..4dd1a6c8d4 100644
--- a/plugins/main/public/components/common/search-bar/search-bar.tsx
+++ b/plugins/main/public/components/common/search-bar/search-bar.tsx
@@ -6,7 +6,6 @@ import {
SearchBarProps,
Filter,
} from '../../../../../../src/plugins/data/public';
-import useSearchBar from './use-search-bar';
export interface WzSearchBarProps extends SearchBarProps {
fixedFilters?: Filter[];
@@ -49,9 +48,7 @@ export const WzSearchBar = ({
>
{preQueryBar ? {preQueryBar} : null}
-
+
) : null}
@@ -68,10 +65,11 @@ export const WzSearchBar = ({
{fixedFilters?.map((filter, idx) => (
- {`${filter.meta.key}: ${typeof filter.meta.value === 'function'
- ? filter.meta.value()
- : filter.meta.value
- }`}
+ {`${filter.meta.key}: ${
+ typeof filter.meta.value === 'function'
+ ? filter.meta.value()
+ : filter.meta.value
+ }`}
))}
From 1e621054fbd87b01678ed8382cdae7a3318c9e9a Mon Sep 17 00:00:00 2001
From: Nicolas
Date: Fri, 19 Jul 2024 07:20:52 -0300
Subject: [PATCH 5/5] Fix format
---
plugins/main/opensearch_dashboards.json | 6 ++----
plugins/main/package.json | 2 +-
.../wazuh-check-updates/opensearch_dashboards.json | 6 ++----
plugins/wazuh-check-updates/package.json | 2 +-
plugins/wazuh-core/opensearch_dashboards.json | 11 +++--------
plugins/wazuh-core/package.json | 2 +-
6 files changed, 10 insertions(+), 19 deletions(-)
diff --git a/plugins/main/opensearch_dashboards.json b/plugins/main/opensearch_dashboards.json
index dc4a898ab1..98c28c7a3e 100644
--- a/plugins/main/opensearch_dashboards.json
+++ b/plugins/main/opensearch_dashboards.json
@@ -2,9 +2,7 @@
"id": "wazuh",
"version": "4.9.0-02",
"opensearchDashboardsVersion": "opensearchDashboards",
- "configPath": [
- "wazuh"
- ],
+ "configPath": ["wazuh"],
"requiredPlugins": [
"navigation",
"data",
@@ -30,4 +28,4 @@
],
"server": true,
"ui": true
-}
\ No newline at end of file
+}
diff --git a/plugins/main/package.json b/plugins/main/package.json
index 20422569d3..3130bcffab 100644
--- a/plugins/main/package.json
+++ b/plugins/main/package.json
@@ -88,4 +88,4 @@
"swagger-client": "^3.19.11",
"typescript": "^5.5.2"
}
-}
\ No newline at end of file
+}
diff --git a/plugins/wazuh-check-updates/opensearch_dashboards.json b/plugins/wazuh-check-updates/opensearch_dashboards.json
index 9cd7b80a59..531c209840 100644
--- a/plugins/wazuh-check-updates/opensearch_dashboards.json
+++ b/plugins/wazuh-check-updates/opensearch_dashboards.json
@@ -10,7 +10,5 @@
"opensearchDashboardsReact",
"wazuhCore"
],
- "optionalPlugins": [
- "securityDashboards"
- ]
-}
\ No newline at end of file
+ "optionalPlugins": ["securityDashboards"]
+}
diff --git a/plugins/wazuh-check-updates/package.json b/plugins/wazuh-check-updates/package.json
index d2f22133cb..f9f8e11db0 100644
--- a/plugins/wazuh-check-updates/package.json
+++ b/plugins/wazuh-check-updates/package.json
@@ -45,4 +45,4 @@
"prettier": "^2.7.1",
"typescript": "^5.5.2"
}
-}
\ No newline at end of file
+}
diff --git a/plugins/wazuh-core/opensearch_dashboards.json b/plugins/wazuh-core/opensearch_dashboards.json
index 2120e3347c..b7f006f822 100644
--- a/plugins/wazuh-core/opensearch_dashboards.json
+++ b/plugins/wazuh-core/opensearch_dashboards.json
@@ -4,11 +4,6 @@
"opensearchDashboardsVersion": "opensearchDashboards",
"server": true,
"ui": true,
- "requiredPlugins": [
- "navigation",
- "opensearchDashboardsUtils"
- ],
- "optionalPlugins": [
- "securityDashboards"
- ]
-}
\ No newline at end of file
+ "requiredPlugins": ["navigation", "opensearchDashboardsUtils"],
+ "optionalPlugins": ["securityDashboards"]
+}
diff --git a/plugins/wazuh-core/package.json b/plugins/wazuh-core/package.json
index 709fc2d84e..8483947858 100644
--- a/plugins/wazuh-core/package.json
+++ b/plugins/wazuh-core/package.json
@@ -46,4 +46,4 @@
"prettier": "^2.7.1",
"typescript": "^5.5.2"
}
-}
\ No newline at end of file
+}