Merge branch '4.3-7.10-RC2' of https://github.com/wazuh/wazuh-kibana-app into 4.3-7.16

Author: Desvelao

CHANGELOG.md

@@ -50,6 +50,7 @@ All notable changes to the Wazuh app project will be documented in this file.
 - Added columns selector in agents table [#3691](https://github.com/wazuh/wazuh-kibana-app/pull/3691)
 - Added a new workflow for create wazuh packages [#3742](https://github.com/wazuh/wazuh-kibana-app/pull/3742)
 - Run `template` and `fields` checks in the health check depends on the app configuration [#3783](https://github.com/wazuh/wazuh-kibana-app/pull/3783)
+- Added a toast message when there is an error creating a new group [#3804](https://github.com/wazuh/wazuh-kibana-app/pull/3804)
 
 ### Changed
 
@@ -59,14 +60,16 @@ All notable changes to the Wazuh app project will be documented in this file.
 - Moved the filterManager subscription to the hook useFilterManager [#3517](https://github.com/wazuh/wazuh-kibana-app/pull/3517)
 - Change filter from is to is one of in custom searchbar [#3529](https://github.com/wazuh/wazuh-kibana-app/pull/3529)
 - Refactored as module tabs and buttons are rendered [#3494](https://github.com/wazuh/wazuh-kibana-app/pull/3494)
-- Updated depracated and new references authd [#3663](https://github.com/wazuh/wazuh-kibana-app/pull/3663)
+- Updated the deprecated and added new references authd [#3663](https://github.com/wazuh/wazuh-kibana-app/pull/3663) [#3806](https://github.com/wazuh/wazuh-kibana-app/pull/3806)
 - Added time subscription to Discover component [#3549](https://github.com/wazuh/wazuh-kibana-app/pull/3549)
 - Refactored as module tabs and buttons are rendered [#3494](https://github.com/wazuh/wazuh-kibana-app/pull/3494)
 - Testing logs using the Ruletest Test don't display the rule information if not matching a rule. [#3446](https://github.com/wazuh/wazuh-kibana-app/pull/3446)
 - Changed format permissions in FIM inventory [#3649](https://github.com/wazuh/wazuh-kibana-app/pull/3649)
 - Changed of request for one that does not return data that is not necessary to optimize times. [#3686](https://github.com/wazuh/wazuh-kibana-app/pull/3686) [#3728](https://github.com/wazuh/wazuh-kibana-app/pull/3728)
+- Rebranding. Replaced the brand logos, set module icons with brand colors [#3788](https://github.com/wazuh/wazuh-kibana-app/pull/3788)
 - Changed user for sample data management [#3795](https://github.com/wazuh/wazuh-kibana-app/pull/3795)
 - Changed agent install codeblock copy button and powershell terminal warning [#3792](https://github.com/wazuh/wazuh-kibana-app/pull/3792)
+- Refactored as the plugin platform name and references is managed [#3811](https://github.com/wazuh/wazuh-kibana-app/pull/3811)
 
 ### Fixed
 
@@ -114,19 +117,22 @@ All notable changes to the Wazuh app project will be documented in this file.
 - Fixed `Maximum call stack size exceeded` error exporting key-value pairs of a CDB List [#3738](https://github.com/wazuh/wazuh-kibana-app/pull/3738)
 - Fixed regex lookahead and lookbehind for safari [#3741](https://github.com/wazuh/wazuh-kibana-app/pull/3741)
 - Fixed Vulnerabilities Inventory flyout details filters [#3744](https://github.com/wazuh/wazuh-kibana-app/pull/3744)
+- Removed api selector toggle from settings menu since it performed no useful function [#3604](https://github.com/wazuh/wazuh-kibana-app/pull/3604)
+- Fixed the requests get [#3661](https://github.com/wazuh/wazuh-kibana-app/pull/3661)
+- Fixed Dashboard PDF report error when switching pinned agent state [#3748](https://github.com/wazuh/wazuh-kibana-app/pull/3748)
+- Fixed the rendering of the command to deploy new Windows agent not working in some Kibana versions [#3753](https://github.com/wazuh/wazuh-kibana-app/pull/3753)
+- Fixed action buttons overlaying to the request text in Tools/API Console [#3772](https://github.com/wazuh/wazuh-kibana-app/pull/3772)
+- Fix `Rule ID` value in reporting tables related to top results [#3774](https://github.com/wazuh/wazuh-kibana-app/issues/3774)
+- Fixed github/office365 multi-select filters suggested values [#3787](https://github.com/wazuh/wazuh-kibana-app/pull/3787)
+- Fix updating the aggregation data of Panel section when changing the time filter [#3790](https://github.com/wazuh/wazuh-kibana-app/pull/3790)
+- Removed the button to remove an agent for a group in the agents' table when it is the default group [#3804](https://github.com/wazuh/wazuh-kibana-app/pull/3804)
 - Fixed add single agent to group [#3776](https://github.com/wazuh/wazuh-kibana-app/pull/3776)
 - Fix the implicit filters from the search bar can be removables [#3777](https://github.com/wazuh/wazuh-kibana-app/pull/3777)
 - Fixed Office365/Github module the side panel tab [#3778](https://github.com/wazuh/wazuh-kibana-app/pull/3778)
 - Fixed no wrap text in MITRE ATT&CK intelligence table [#3780](https://github.com/wazuh/wazuh-kibana-app/pull/3780)
 - Fixed visualization tooltip position [#3781](https://github.com/wazuh/wazuh-kibana-app/pull/3781)
 - Fixed github/office365 multi-select filters suggested values [#3787](https://github.com/wazuh/wazuh-kibana-app/pull/3787)
 - Fixed the styles on the evolution card [#3796](https://github.com/wazuh/wazuh-kibana-app/pull/3796)
-- Fixed Dashboard PDF report error when switching pinned agent state [#3748](https://github.com/wazuh/wazuh-kibana-app/pull/3748)
-- Fixed the rendering of the command to deploy new Windows agent not working in some Kibana versions [#3753](https://github.com/wazuh/wazuh-kibana-app/pull/3753)
-- Fixed action buttons overlaying to the request text in Tools/API Console [#3772](https://github.com/wazuh/wazuh-kibana-app/pull/3772)
-- Fix `Rule ID` value in reporting tables related to top results [#3774](https://github.com/wazuh/wazuh-kibana-app/issues/3774)
-- Fixed github/office365 multi-select filters suggested values [#3787](https://github.com/wazuh/wazuh-kibana-app/pull/3787)
-- Fix updating the aggregation data of Panel section when changing the time filter [#3790](https://github.com/wazuh/wazuh-kibana-app/pull/3790)
 
 ## Wazuh v4.2.5 - Kibana 7.10.2, 7.11.2, 7.12.1, 7.13.4, 7.14.2 - Revision 4206
 
@@ -223,7 +229,6 @@ All notable changes to the Wazuh app project will be documented in this file.
 - Fixed Wazuh main menu and breadcrumb render issues [#3347](https://github.com/wazuh/wazuh-kibana-app/pull/3347)
 - Fixed generation of huge logs from backend errors [#3397](https://github.com/wazuh/wazuh-kibana-app/pull/3397)
 - Fixed vulnerabilities flyout not showing alerts if the vulnerability had a field missing [#3593](https://github.com/wazuh/wazuh-kibana-app/pull/3593)
-- Removed api selector toggle from settings menu since it performed no useful function [#3604](https://github.com/wazuh/wazuh-kibana-app/pull/3604)
 
 ## Wazuh v4.2.1 - Kibana 7.10.2 , 7.11.2 - Revision 4202
 

README.md

@@ -56,31 +56,31 @@ This plugin for Kibana allows you to visualize and analyze Wazuh alerts stored i
 
 **Modules overview**
 
-![Overview](/public/assets/app.png)
+![Overview](screenshots/app.png)
 
 **Security events**
 
-![Overview](/public/assets/app2.png)
+![Overview](screenshots/app2.png)
 
 **Integrity monitoring**
 
-![Overview](/public/assets/app3.png)
+![Overview](screenshots/app3.png)
 
 **Vulnerability detection**
 
-![Overview](/public/assets/app4.png)
+![Overview](screenshots/app4.png)
 
 **Regulatory compliance**
 
-![Overview](/public/assets/app5.png)
+![Overview](screenshots/app5.png)
 
 **Agents overview**
 
-![Overview](/public/assets/app6.png)
+![Overview](screenshots/app6.png)
 
 **Agent summary**
 
-![Overview](/public/assets/app7.png)
+![Overview](screenshots/app7.png)
 
 ## Branches
 

common/constants.ts

@@ -46,7 +46,7 @@ export const WAZUH_STATISTICS_DEFAULT_CRON_FREQ = '0 */5 * * * *';
 // Job - Wazuh initialize
 export const WAZUH_INDEX = '.wazuh';
 export const WAZUH_VERSION_INDEX = '.wazuh-version';
-export const WAZUH_KIBANA_TEMPLATE_NAME = 'wazuh-kibana';
+export const WAZUH_PLUGIN_PLATFORM_TEMPLATE_NAME = 'wazuh-kibana';
 
 // Permissions
 export const WAZUH_ROLE_ADMINISTRATOR_ID = 1;
@@ -223,10 +223,10 @@ export const WAZUH_DEFAULT_APP_CONFIG = {
   hideManagerAlerts: false,
   'logs.level': 'info',
   'enrollment.dns': '',
-  'customization.logo.app':'logotype.svg',
-  'customization.logo.sidebar':'icon_blue.png',
-  'customization.logo.healthcheck':'icon_blue.svg',
-  'customization.logo.reports':'logo.png'
+  'customization.logo.app': '',
+  'customization.logo.sidebar': '',
+  'customization.logo.healthcheck':'',
+  'customization.logo.reports': ''
 };
 
 // Wazuh errors
@@ -318,21 +318,21 @@ export const HEALTH_CHECK = 'health-check';
 // Health check
 export const HEALTH_CHECK_REDIRECTION_TIME = 300; //ms
 
-// Kibana settings
+// Plugin platform settings
 // Default timeFilter set by the app
-export const WAZUH_KIBANA_SETTING_TIME_FILTER = {
+export const WAZUH_PLUGIN_PLATFORM_SETTING_TIME_FILTER = {
   from: 'now-24h',
   to: 'now',
 };
-export const KIBANA_SETTING_NAME_TIME_FILTER = 'timepicker:timeDefaults';
+export const PLUGIN_PLATFORM_SETTING_NAME_TIME_FILTER = 'timepicker:timeDefaults';
 
 // Default maxBuckets set by the app
-export const WAZUH_KIBANA_SETTING_MAX_BUCKETS = 200000;
-export const KIBANA_SETTING_NAME_MAX_BUCKETS = 'timelion:max_buckets';
+export const WAZUH_PLUGIN_PLATFORM_SETTING_MAX_BUCKETS = 200000;
+export const PLUGIN_PLATFORM_SETTING_NAME_MAX_BUCKETS = 'timelion:max_buckets';
 
-// Default metaFields Kibana setting set by the app
-export const WAZUH_KIBANA_SETTING_METAFIELDS = ['_source', '_index'];
-export const KIBANA_SETTING_NAME_METAFIELDS = 'metaFields';
+// Default metaFields set by the app
+export const WAZUH_PLUGIN_PLATFORM_SETTING_METAFIELDS = ['_source', '_index'];
+export const PLUGIN_PLATFORM_SETTING_NAME_METAFIELDS = 'metaFields';
 
 // Logger
 export const UI_LOGGER_LEVELS = {
@@ -347,3 +347,24 @@ export const UI_TOAST_COLOR = {
   DANGER: 'danger',
 };
 
+// Assets
+export const ASSETS_BASE_URL_PREFIX = '/plugins/wazuh/assets/';
+
+// Reports
+export const REPORTS_LOGO_IMAGE_ASSETS_RELATIVE_PATH = 'images/logo_reports.png';
+export const REPORTS_PRIMARY_COLOR = '#256BD1';
+
+// Plugin platform
+export const PLUGIN_PLATFORM_NAME = 'Kibana';
+export const PLUGIN_PLATFORM_BASE_INSTALLATION_PATH = '/usr/share/kibana/data/wazuh/';
+export const PLUGIN_PLATFORM_BASE_REDIRECTION_PATH = 'kibana';
+export const PLUGIN_PLATFORM_INSTALLATION_USER = 'kibana';
+export const PLUGIN_PLATFORM_INSTALLATION_USER_GROUP = 'kibana';
+export const PLUGIN_PLATFORM_WAZUH_DOCUMENTATION_URL_UPGRADE_PLATFORM = 'https://documentation.wazuh.com/current/upgrade-guide/elasticsearch-kibana-filebeat/index.html#upgrade-elasticsearch-filebeat-kibana';
+export const PLUGIN_PLATFORM_WAZUH_DOCUMENTATION_URL_TROUBLESHOOTING = 'https://documentation.wazuh.com/current/user-manual/kibana-app/troubleshooting.html';
+export const PLUGIN_PLATFORM_WAZUH_DOCUMENTATION_URL_APP_CONFIGURATION = 'https://documentation.wazuh.com/current/user-manual/kibana-app/reference/config-file.html';
+export const PLUGIN_PLATFORM_URL_GUIDE = 'https://www.elastic.co/guide/en/elasticsearch/reference/current/index.html';
+export const PLUGIN_PLATFORM_URL_GUIDE_TITLE = 'Elastic guide';
+export const PLUGIN_PLATFORM_REQUEST_HEADERS = {
+  'kbn-xsrf': 'kibana'
+};

common/plugin.ts

@@ -0,0 +1,8 @@
+import { PLUGIN_PLATFORM_BASE_INSTALLATION_PATH } from "./constants";
+
+/**
+ * 
+ * @param path Path to file or directory
+ * @returns Absolute path to the file or directory with the prefix path of app data path
+ */
+export const getPluginDataPath = (path: string = ''): string => `${PLUGIN_PLATFORM_BASE_INSTALLATION_PATH}${path}`;

common/semver.ts

@@ -1,5 +1,5 @@
 /*
- * Wazuh app - Utils related to Kibana and app versions
+ * Wazuh app - Utils related to plugin platform and app versions
  *
  * Copyright (C) 2015-2021 Wazuh, Inc.
  *
@@ -11,7 +11,12 @@
  * Find more information about this on the LICENSE file.
  *
  */
-import { kibana as appPackageKibana } from '../package.json';
+import { pluginPlatform as appPackagePluginPlatform } from '../package.json';
 import semver from 'semver';
 
-export const satisfyKibanaVersion = (requiredKibanaVersion: string) => semver.satisfies(appPackageKibana.version, requiredKibanaVersion);
+/**
+ * 
+ * @param requiredPluginPlatformVersion semver condition that should fulfill the plugin platform version
+ * @returns if validation is true or false
+ */
+export const satisfyPluginPlatformVersion = (requiredPluginPlatformVersion: string): boolean => semver.satisfies(appPackagePluginPlatform.version, requiredPluginPlatformVersion);

common/utils.ts

@@ -0,0 +1,6 @@
+/**
+ * 
+ * @param timeMs Time in milliseconds
+ * @returns Promise
+ */
+export const delayAsPromise = (timeMs: number) => new Promise(resolve => setTimeout(resolve, timeMs));

package.json

@@ -3,8 +3,8 @@
   "version": "4.3.0",
   "revision": "4301-0",
   "code": "4301-0",
-  "kibana": {
-    "version": "7.16.2"
+  "pluginPlatform": {
+    "version": "7.10.2"
   },
   "description": "Wazuh app",
   "keywords": [

public/app.js

@@ -23,7 +23,7 @@ import './components';
 // angular-charts.js
 import 'angular-chart.js';
 
-// Font Awesome, Kibana UI framework and others
+// Font Awesome, plugin platform framework and others
 import './utils/fontawesome/scss/font-awesome.scss';
 
 // Dev tools
@@ -104,7 +104,7 @@ app.run(['$rootElement', function ($rootElement) {
       <react-component name="ToastNotificationsModal" props=""></react-component>
     </div>`);
 
-  // Add plugin help links as extension to Kibana help menu
+  // Add plugin help links as extension to plugin platform help menu
   addHelpMenuToAppChrome();