Merge last changes into cloud/4.0-7.9

CHANGELOG.md

@@ -2,18 +2,39 @@
 
 All notable changes to the Wazuh app project will be documented in this file.
 
+## Wazuh v4.0.3 - Kibana v7.9.1, v7.9.2, v7.9.3 - Revision 4015
+
+### Added
+
+- Show the wui_ rules belong to wazuh-wui API user [#2702](https://github.com/wazuh/wazuh-kibana-app/issues/2702)
+- Modified agent registration adding groups and architecture [#2666](https://github.com/wazuh/wazuh-kibana-app/issues/2666)[#2652](https://github.com/wazuh/wazuh-kibana-app/issues/2652)
+
+### Fixed
+
+- Create index pattern even if there aren´t available indices [#2620](https://github.com/wazuh/wazuh-kibana-app/issues/2620)
+- Top bar overlayed over expanded visualizations [#2667](https://github.com/wazuh/wazuh-kibana-app/issues/2667)
+- Empty inventory data in Solaris agents [#2680](https://github.com/wazuh/wazuh-kibana-app/pull/2680)
+- Wrong parameters in the dev-tools autocomplete section [#2675](https://github.com/wazuh/wazuh-kibana-app/issues/2675)
+- Wrong permissions on edit CDB list [#2665](https://github.com/wazuh/wazuh-kibana-app/pull/2665)
+- fix(frontend): add the metafields when refreshing the index pattern [#2681](https://github.com/wazuh/wazuh-kibana-app/pull/2681)
+- Error toast is showing about Elasticsearch users for environments without security [#2713](https://github.com/wazuh/wazuh-kibana-app/issues/2713)
+- Error about Handler.error in Role Mapping fixed [#2702](https://github.com/wazuh/wazuh-kibana-app/issues/2702)
+- Fixed message in reserved users actions [#2702](https://github.com/wazuh/wazuh-kibana-app/issues/2702)
+- Error 500 on Export formatted CDB list [#2692](https://github.com/wazuh/wazuh-kibana-app/pull/2692)
+
 ## Wazuh v4.0.3 - Kibana v7.9.1, v7.9.2, v7.9.3 - Revision 4014
 
 ### Added
 
-- Improved management of index-pattern fields [#2630] (https://github.com/wazuh/wazuh-kibana-app/issues/2630)
+- Improved management of index-pattern fields [#2630](https://github.com/wazuh/wazuh-kibana-app/issues/2630)
 
 ### Fixed
 
 - fix(fronted): fixed the check of API and APP version in health check [#2655](https://github.com/wazuh/wazuh-kibana-app/pull/2655)
 - Replace user by username key in the monitoring logic [#2654](https://github.com/wazuh/wazuh-kibana-app/pull/2654)
 - Security alerts and reporting issues when using private tenants [#2639](https://github.com/wazuh/wazuh-kibana-app/issues/2639)
 - Manager restart in rule editor does not work with Wazuh cluster enabled [#2640](https://github.com/wazuh/wazuh-kibana-app/issues/2640)
+- fix(frontend): Empty inventory data in Solaris agents [#2680](https://github.com/wazuh/wazuh-kibana-app/pull/2680)
 
 ## Wazuh v4.0.3 - Kibana v7.9.1, v7.9.2, v7.9.3 - Revision 4013
 
@@ -1760,4 +1781,4 @@ All notable changes to the Wazuh app project will be documented in this file.
 ### Fixed
 
 - Search bar across panels now support parenthesis grouping
-- Several CSS fixes for IE browser
+- Several CSS fixes for IE browser

public/components/agents/syscollector/components/syscollector-metrics.tsx

@@ -1,9 +1,9 @@
 import React, {  useState } from "react";
 import {EuiPanel, EuiFlexGroup, EuiFlexItem, EuiText, EuiLoadingSpinner, EuiIcon} from "@elastic/eui";
+import mapValues from 'lodash';
 import {useGenericRequest} from '../../../common/hooks/useGenericRequest';
 import { TimeService } from '../../../../react-services/time-service';
 
-
 export function InventoryMetrics({agent}) {
     const [params, setParams] = useState({});
     const offsetTimestamp = (text, time) => {
@@ -14,13 +14,18 @@ export function InventoryMetrics({agent}) {
         }
       }
     const syscollector = useGenericRequest('GET', `/api/syscollector/${agent.id}`, params, (result) => {return (result || {}).data || {};});
-
-    if(!syscollector.isLoading && (!syscollector.data.hardware || !syscollector.data.os)){
-        return <EuiPanel paddingSize="s" style={{margin: 16, textAlign: "center"}}>
-           <EuiIcon type="iInCircle" /> Not enough hardware or operating system information
-        </EuiPanel>
-    }
-
+
+  if (
+    !syscollector.isLoading &&
+    (mapValues.isEmpty(syscollector.data.hardware) || mapValues.isEmpty(syscollector.data.os))
+  ) {
+    return (
+      <EuiPanel paddingSize="s" style={{ margin: 16, textAlign: 'center' }}>
+        <EuiIcon type="iInCircle" /> Not enough hardware or operating system information
+      </EuiPanel>
+    );
+  }
+
     return (
         <EuiPanel paddingSize="s" style={{margin: 16}}>
             <EuiFlexGroup>
@@ -45,6 +50,6 @@ export function InventoryMetrics({agent}) {
             </EuiFlexGroup>
         </EuiPanel>
         );
-    
-    
+
+
 }

public/components/agents/syscollector/components/syscollector-table.tsx

@@ -36,16 +36,15 @@ export function SyscollectorTable({ tableParams }) {
   };
 
   const buildColumns = () => {
-    const columns = tableParams.columns.map(item => {
+    return (tableParams.columns || []).map(item => {
       return {
         field: item.id,
         name: KeyEquivalence[item.id] || item.id,
         sortable: typeof item.sortable !== 'undefined' ? item.sortable : true,
         width: item.width || undefined,
-      }
+      };
     });
-    return columns;
-  }
+  };
 
   const columns = buildColumns();
 
@@ -82,6 +81,13 @@ export function SyscollectorTable({ tableParams }) {
       return `(${data.total_affected_items})`;
   }
 
+  const downloadCsv = async () => {
+    await AppState.downloadCsv(
+      tableParams.path,
+      tableParams.exportFormatted,
+      !!params.search ? [{ name: 'search', value: params.search }] : []
+    )
+  }
 
   return (
     <EuiPanel paddingSize="m" style={{ margin: '12px 16px 12px 16px' }}>
@@ -117,19 +123,19 @@ export function SyscollectorTable({ tableParams }) {
           />
         </EuiFlexItem>
       </EuiFlexGroup>
-      {tableParams.exportFormatted &&
-        <EuiFlexGroup >
-          <EuiFlexItem grow={true} > </EuiFlexItem>
-          <EuiFlexItem grow={false} >
+      {tableParams.exportFormatted && tableParams.columns && (
+        <EuiFlexGroup>
+          <EuiFlexItem grow={true} />
+          <EuiFlexItem grow={false}>
             <EuiButtonEmpty
-              onClick={async () => await AppState.downloadCsv(tableParams.path, tableParams.exportFormatted, !!params.search ? [{ name: 'search', value: params.search }] : [])}
-              iconType="importAction">
+              onClick={downloadCsv}
+              iconType="importAction"
+            >
               Download CSV
             </EuiButtonEmpty>
           </EuiFlexItem>
         </EuiFlexGroup>
-      }
-
+      )}
     </EuiPanel>
   );
 }

public/components/security/roles-mapping/components/roles-mapping-table.tsx

@@ -1,5 +1,7 @@
 import React from 'react';
 import {
+  EuiSpacer,
+  EuiToolTip,
   EuiInMemoryTable,
   EuiBadge,
   EuiFlexItem,
@@ -58,10 +60,23 @@ export const RolesMappingTable = ({ rolesEquivalences, rules, loading, editRule,
     {
       field: 'id',
       name: 'Status',
-      render: item => {
-        return WzAPIUtils.isReservedID(item) && <EuiBadge color="primary">Reserved</EuiBadge>;
+      render (item, obj){
+        if(WzAPIUtils.isReservedID(item)){
+          if( (obj.id === 1 || obj.id === 2)){
+            return(
+              <EuiFlexGroup>
+              <EuiBadge color="primary">Reserved</EuiBadge>
+                <EuiToolTip position="top" content="wui_ rules belong to wazuh-wui API user">
+                  <EuiBadge color="accent" style={{ marginLeft: 10 }}>wazuh-wui</EuiBadge>
+                </EuiToolTip>
+              </EuiFlexGroup>
+            );
+          }
+          else
+            return <EuiBadge color="primary">Reserved</EuiBadge>;
+        }
       },
-      width: '150',
+      width: '300',
       sortable: false,
     },
     {

public/components/security/roles-mapping/roles-mapping.tsx

@@ -44,7 +44,7 @@ export const RolesMapping = () => {
       setRolesEquivalences(_rolesObject);
     }
     if (rolesError) {
-      ErrorHandler.error('There was an error loading roles');
+      ErrorHandler.handle('There was an error loading roles');
     }
   }, [rolesLoading]);
 
@@ -63,7 +63,7 @@ export const RolesMapping = () => {
       }).sort((a, b) => (a.user > b.user) ? 1 : (a.user < b.user) ? -1 : 0);      
       setInternalUsers(_users);
     } catch (error) {
-      ErrorHandler.error('There was an error loading internal users');
+      ErrorHandler.handle('There was an error loading internal users');
     }
   };
 
@@ -72,14 +72,16 @@ export const RolesMapping = () => {
       const _rules = await RulesServices.GetRules();
       setRules(_rules);
     } catch (error) {
-      ErrorHandler.error('There was an error loading rules');
+      ErrorHandler.handle('There was an error loading rules');
     }
   };
 
   const initData = async () => {
     setLoadingTable(true);
     await getRules();
-    await getInternalUsers();
+    if(currentPlatform !== "elastic"){
+      await getInternalUsers();
+    }
     setLoadingTable(false);
   };
 

public/components/security/users/components/users-table.tsx

@@ -68,7 +68,7 @@ export const UsersTable = ({ users, editUserFlyover, rolesLoading, roles, onSave
           <WzButtonModalConfirm
             buttonType="icon"
             tooltip={{
-              content: WzAPIUtils.isReservedID(item.id) ? "Reserved users mapping can't be deleted" : 'Delete user',
+              content: WzAPIUtils.isReservedID(item.id) ? "Reserved users can't be deleted" : 'Delete user',
               position: 'left',
             }}
             isDisabled={WzAPIUtils.isReservedID(item.id)}