run telemetry concurrently

elastic · Jul 28, 2020 · ab764a7 · ab764a7
1 parent 4b2ea32
commit ab764a7
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 34 deletions.
diff --git a/x-pack/plugins/security_solution/server/usage/collector.ts b/x-pack/plugins/security_solution/server/usage/collector.ts
@@ -6,7 +6,7 @@
 
 import { LegacyAPICaller, CoreSetup } from '../../../../../src/core/server';
 import { CollectorDependencies } from './types';
-import { DetectionsUsage, fetchDetectionsUsage } from './detections';
+import { DetectionsUsage, fetchDetectionsUsage, defaultDetectionsUsage } from './detections';
 import { EndpointUsage, getEndpointTelemetryFromFleet } from './endpoints';
 
 export type RegisterCollector = (deps: CollectorDependencies) => void;
@@ -82,7 +82,7 @@ export const registerCollector: RegisterCollector = ({
       ]);
 
       return {
-        detections: detections.status === 'fulfilled' ? detections.value : {},
+        detections: detections.status === 'fulfilled' ? detections.value : defaultDetectionsUsage,
         endpoints: endpoints.status === 'fulfilled' ? endpoints.value : {},
       };
     },

diff --git a/x-pack/plugins/security_solution/server/usage/detections/detections_helpers.ts b/x-pack/plugins/security_solution/server/usage/detections/detections_helpers.ts
@@ -23,7 +23,7 @@ interface DetectionsMetric {
 
 const isElasticRule = (tags: string[]) => tags.includes(`${INTERNAL_IMMUTABLE_KEY}:true`);
 
-const initialRulesUsage: DetectionRulesUsage = {
+export const initialRulesUsage: DetectionRulesUsage = {
   custom: {
     enabled: 0,
     disabled: 0,
@@ -34,7 +34,7 @@ const initialRulesUsage: DetectionRulesUsage = {
   },
 };
 
-const initialMlJobsUsage: MlJobsUsage = {
+export const initialMlJobsUsage: MlJobsUsage = {
   custom: {
     enabled: 0,
     disabled: 0,

diff --git a/x-pack/plugins/security_solution/server/usage/detections/index.ts b/x-pack/plugins/security_solution/server/usage/detections/index.ts
@@ -5,7 +5,12 @@
  */
 
 import { LegacyAPICaller } from '../../../../../../src/core/server';
-import { getMlJobsUsage, getRulesUsage } from './detections_helpers';
+import {
+  getMlJobsUsage,
+  getRulesUsage,
+  initialRulesUsage,
+  initialMlJobsUsage,
+} from './detections_helpers';
 import { MlPluginSetup } from '../../../../ml/server';
 
 interface FeatureUsage {
@@ -28,12 +33,23 @@ export interface DetectionsUsage {
   ml_jobs: MlJobsUsage;
 }
 
+export const defaultDetectionsUsage = {
+  detection_rules: initialRulesUsage,
+  ml_jobs: initialMlJobsUsage,
+};
+
 export const fetchDetectionsUsage = async (
   kibanaIndex: string,
   callCluster: LegacyAPICaller,
   ml: MlPluginSetup | undefined
 ): Promise<DetectionsUsage> => {
-  const rulesUsage = await getRulesUsage(kibanaIndex, callCluster);
-  const mlJobsUsage = await getMlJobsUsage(ml);
-  return { detection_rules: rulesUsage, ml_jobs: mlJobsUsage };
+  const [rulesUsage, mlJobsUsage] = await Promise.allSettled([
+    getRulesUsage(kibanaIndex, callCluster),
+    getMlJobsUsage(ml),
+  ]);
+
+  return {
+    detection_rules: rulesUsage.status === 'fulfilled' ? rulesUsage.value : initialRulesUsage,
+    ml_jobs: mlJobsUsage.status === 'fulfilled' ? mlJobsUsage.value : initialMlJobsUsage,
+  };
 };
diff --git a/x-pack/plugins/security_solution/server/usage/endpoints/index.ts b/x-pack/plugins/security_solution/server/usage/endpoints/index.ts
@@ -217,35 +217,37 @@ export const getEndpointTelemetryFromFleet = async (
   let policyTracker: PoliciesTelemetry = { malware: { active: 0, inactive: 0, failure: 0 } };
 
   for (let i = 0; i < endpointAgentsCount; i += 1) {
-    const { attributes: metadataAttributes } = endpointAgents[i];
-    const { last_checkin: lastCheckin, local_metadata: localMetadata } = metadataAttributes;
-    const { host, os, elastic } = localMetadata as AgentLocalMetadata; // AgentMetadata is just an empty blob, casting for our  use case
-
-    if (!uniqueHostIds.has(host.id)) {
-      uniqueHostIds.add(host.id);
-      const agentId = elastic?.agent?.id;
-      osTracker = updateEndpointOSTelemetry(os, osTracker);
-
-      if (agentId) {
-        let agentEvents;
-        try {
-          const response = await getLatestFleetEndpointEvent(soClient, agentId);
-          agentEvents = response.saved_objects;
-        } catch (error) {
-          // If the request fails we do not obtain `active within last 24 hours for this agent` or policy specifics
-        }
-
-        // AgentEvents will have a max length of 1
-        if (agentEvents && agentEvents.length > 0) {
-          const latestEndpointEvent = agentEvents[0];
-          dailyActiveCount = updateEndpointDailyActiveCount(
-            latestEndpointEvent,
-            lastCheckin,
-            dailyActiveCount
+    try {
+      const { attributes: metadataAttributes } = endpointAgents[i];
+      const { last_checkin: lastCheckin, local_metadata: localMetadata } = metadataAttributes;
+      const { host, os, elastic } = localMetadata as AgentLocalMetadata; // AgentMetadata is just an empty blob, casting for our  use case
+
+      if (!uniqueHostIds.has(host.id)) {
+        uniqueHostIds.add(host.id);
+        const agentId = elastic?.agent?.id;
+        osTracker = updateEndpointOSTelemetry(os, osTracker);
+
+        if (agentId) {
+          const { saved_objects: agentEvents } = await getLatestFleetEndpointEvent(
+            soClient,
+            agentId
           );
-          policyTracker = updateEndpointPolicyTelemetry(latestEndpointEvent, policyTracker);
+
+          // AgentEvents will have a max length of 1
+          if (agentEvents && agentEvents.length > 0) {
+            const latestEndpointEvent = agentEvents[0];
+            dailyActiveCount = updateEndpointDailyActiveCount(
+              latestEndpointEvent,
+              lastCheckin,
+              dailyActiveCount
+            );
+            policyTracker = updateEndpointPolicyTelemetry(latestEndpointEvent, policyTracker);
+          }
         }
       }
+    } catch (error) {
+      // continue with the loop if any unexpected errors happen
+      // We will not get policy specifics or 24 hour activity for this iteration of the loop
     }
   }