review comments

elastic · Jun 10, 2021 · be2e6f0 · be2e6f0
1 parent eb20cf8
commit be2e6f0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/x-pack/plugins/osquery/server/usage/collector.ts b/x-pack/plugins/osquery/server/usage/collector.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup, SavedObjectsClientContract } from '../../../../../src/core/server';
+import { CoreSetup, SavedObjectsClient } from '../../../../../src/core/server';
 import { CollectorFetchContext } from '../../../../../src/plugins/usage_collection/server';
 import { createMetricObjects } from '../routes/usage';
 import { getBeatUsage, getLiveQueryUsage, getPolicyLevelUsage } from './fetchers';
@@ -26,13 +26,11 @@ export const registerCollector: RegisterCollector = ({ core, osqueryContext, usa
     type: 'osquery',
     schema: usageSchema,
     isReady: async () => {
-      const internalSavedObjectsClient = await getInternalSavedObjectsClient(core);
-      const savedObjectsClient = (internalSavedObjectsClient as unknown) as SavedObjectsClientContract;
+      const savedObjectsClient = new SavedObjectsClient(await getInternalSavedObjectsClient(core));
       return await createMetricObjects(savedObjectsClient);
     },
     fetch: async ({ esClient }: CollectorFetchContext): Promise<UsageData> => {
-      const internalSavedObjectsClient = await getInternalSavedObjectsClient(core);
-      const savedObjectsClient = (internalSavedObjectsClient as unknown) as SavedObjectsClientContract;
+      const savedObjectsClient = new SavedObjectsClient(await getInternalSavedObjectsClient(core));
       return {
         beat_metrics: {
           usage: await getBeatUsage(esClient),

diff --git a/x-pack/plugins/osquery/server/usage/fetchers.ts b/x-pack/plugins/osquery/server/usage/fetchers.ts
@@ -213,8 +213,10 @@ export async function getBeatUsage(esClient: ElasticsearchClient) {
   if ('latest' in lastDayAggs) {
     const latest = (lastDayAggs.latest as TopHitsAggregate).hits.hits[0]?._source?.monitoring
       .metrics.beat;
-    result.cpu.latest = latest.cpu.total.time.ms;
-    result.memory.rss.latest = latest.memstats.rss;
+    if (latest) {
+      result.cpu.latest = latest.cpu.total.time.ms;
+      result.memory.rss.latest = latest.memstats.rss;
+    }
   }
 
   return result;