Merge branch '4.9.0' into fix/6693-cannot-perform-a-react-state-updat…

…e-on-an-unmounted-component
wazuh · May 30, 2024 · cbf7c78 · cbf7c78
2 parents e4266c7 + 42ca330
commit cbf7c78
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 48 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -22,7 +22,6 @@ All notable changes to the Wazuh app project will be documented in this file.
 ### Changed
 
 - Removed embedded discover [#6120](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6120) [#6235](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6235) [#6254](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6254) [#6285](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6285) [#6288](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6288) [#6290](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6290) [#6289](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6289) [#6286](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6286) [#6275](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6275) [#6287](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6287) [#6297](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6297) [#6291](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6287) [#6459](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6459) [#6434](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6434) [#6504](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6504) [#6649](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6649) [#6506](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6506) [#6537](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6537) [#6528](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6528) [#6675](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6675) [#6674](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6674) [#6558](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6558) [#6685](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6685) [#6691](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6691)
-- Develop logic of a new index for the fim module [#6227](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6227)
 - Allow editing groups for an agent from Endpoints Summary [#6250](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6250)
 - Change how the configuration is managed in the backend side [#6337](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6337) [#6519](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6519) [#6573](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6573)
 - Change the view of API is down and check connection to Server APIs application [#6337](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6337)
@@ -48,6 +47,7 @@ All notable changes to the Wazuh app project will be documented in this file.
 - Fixed the scripted fields disappear when the fields of the events index pattern was refreshed [#6237](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6237)
 - Fixed an error of malformed table row on the generation of PDF reports [#6558](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6558)
 - Fixed the sample alerts scripts to generate valid IP ranges and file hashes [#6667](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6667)
+- Fixed cronjob max seconds interval validation [#6730](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6730)
 
 ### Removed
 

diff --git a/plugins/main/public/components/common/wazuh-discover/render-columns.tsx b/plugins/main/public/components/common/wazuh-discover/render-columns.tsx
@@ -12,70 +12,81 @@ const navigateTo = (ev, section, params) => {
   AppNavigate.navigateToModule(ev, section, params);
 };
 
-const renderMitreTechnique = (technique: string) => <EuiLink
-  onClick={e =>
-    navigateTo(e, 'overview', {
-      tab: 'mitre',
-      tabView: 'intelligence',
-      tabRedirect: 'techniques',
-      idToRedirect: technique,
-    })
-  }
->
-  {technique}
-</EuiLink>
+const renderMitreTechnique = (technique: string) => (
+  <EuiLink
+    onClick={e =>
+      navigateTo(e, 'overview', {
+        tab: 'mitre',
+        tabView: 'intelligence',
+        tabRedirect: 'techniques',
+        idToRedirect: technique,
+      })
+    }
+  >
+    {technique}
+  </EuiLink>
+);
 
 export const wzDiscoverRenderColumns: tDataGridRenderColumn[] = [
   {
     id: 'agent.id',
-    render: (value) => {
-      if (value === '000') return value
+    render: value => {
+      if (value === '000') return value;
 
-      return <RedirectAppLinks application={getCore().application}>
-        <EuiLink
-          href={`${endpointSummary.id}#/agents?tab=welcome&agent=${value}`}
-        >
-          {value}
-        </EuiLink>
-      </RedirectAppLinks>
-    }
+      return (
+        <RedirectAppLinks application={getCore().application}>
+          <EuiLink
+            href={`${endpointSummary.id}#/agents?tab=welcome&agent=${value}`}
+          >
+            {value}
+          </EuiLink>
+        </RedirectAppLinks>
+      );
+    },
   },
   {
     id: 'agent.name',
     render: (value, row) => {
-      if (row.agent.id === '000') return value
+      if (row.agent.id === '000') return value;
 
-      return <RedirectAppLinks application={getCore().application}>
-        <EuiLink
-          href={`${endpointSummary.id}#/agents?tab=welcome&agent=${row.agent.id}`}
-        >
-          {value}
-        </EuiLink>
-      </RedirectAppLinks>
-    }
+      return (
+        <RedirectAppLinks application={getCore().application}>
+          <EuiLink
+            href={`${endpointSummary.id}#/agents?tab=welcome&agent=${row.agent.id}`}
+          >
+            {value}
+          </EuiLink>
+        </RedirectAppLinks>
+      );
+    },
   },
   {
     id: 'rule.id',
-    render: (value) => <RedirectAppLinks application={getCore().application}>
-      <EuiLink href={`${rules.id}#/manager/?tab=rules&redirectRule=${value}`}>
-        {value}
-      </EuiLink>
-    </RedirectAppLinks>
+    render: value => (
+      <RedirectAppLinks application={getCore().application}>
+        <EuiLink href={`${rules.id}#/manager/?tab=rules&redirectRule=${value}`}>
+          {value}
+        </EuiLink>
+      </RedirectAppLinks>
+    ),
   },
   {
     id: 'rule.mitre.id',
-    render: (value) => Array.isArray(value) ? <div style={{ display: 'flex', gap: 10 }}>
-      {value?.map(technique => (
-        <div key={technique}>
-          {renderMitreTechnique(technique)}
+    render: value =>
+      Array.isArray(value) ? (
+        <div style={{ display: 'flex', gap: 10 }}>
+          {value?.map((technique, index) => (
+            <div key={`${technique}-${index}`}>
+              {renderMitreTechnique(technique)}
+            </div>
+          ))}
         </div>
-      ))}
-    </div> : <div>
-      {renderMitreTechnique(value)}
-    </div>
+      ) : (
+        <div>{renderMitreTechnique(value)}</div>
+      ),
   },
   {
     id: 'timestamp',
-    render: (value) => formatUIDate(value)
+    render: value => formatUIDate(value),
   },
-]
+];
diff --git a/plugins/main/server/lib/parse-cron.ts b/plugins/main/server/lib/parse-cron.ts
@@ -25,7 +25,7 @@ export function parseCron(interval: string) {
       // 60 seconds / 1 minute
       throw new Error('Interval too low');
     }
-    if (intervalToNumber >= 84600) {
+    if (intervalToNumber >= 86400) {
       throw new Error('Interval too high');
     }