[Usage Collection] [schema] infra

elastic · Sep 28, 2020 · eff68f5 · eff68f5
1 parent 88df93b
commit eff68f5
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 2 deletions.
diff --git a/x-pack/.telemetryrc.json b/x-pack/.telemetryrc.json
@@ -6,7 +6,6 @@
     "plugins/alerts/server/usage/alerts_usage_collector.ts",
     "plugins/apm/server/lib/apm_telemetry/index.ts",
     "plugins/canvas/server/collectors/collector.ts",
-    "plugins/infra/server/usage/usage_collector.ts",
     "plugins/reporting/server/usage/reporting_usage_collector.ts",
     "plugins/maps/server/maps_telemetry/collectors/register.ts"
   ]

diff --git a/x-pack/plugins/infra/server/usage/usage_collector.ts b/x-pack/plugins/infra/server/usage/usage_collector.ts
@@ -14,19 +14,40 @@ interface InfraopsSum {
   logs: number;
 }
 
+interface Usage {
+  last_24_hours: {
+    hits: {
+      infraops_hosts: number;
+      infraops_docker: number;
+      infraops_kubernetes: number;
+      logs: number;
+    };
+  };
+}
+
 export class UsageCollector {
   public static registerUsageCollector(usageCollection: UsageCollectionSetup): void {
     const collector = UsageCollector.getUsageCollector(usageCollection);
     usageCollection.registerCollector(collector);
   }
 
   public static getUsageCollector(usageCollection: UsageCollectionSetup) {
-    return usageCollection.makeUsageCollector({
+    return usageCollection.makeUsageCollector<Usage>({
       type: 'infraops',
       isReady: () => true,
       fetch: async () => {
         return this.getReport();
       },
+      schema: {
+        last_24_hours: {
+          hits: {
+            infraops_hosts: { type: 'long' },
+            infraops_docker: { type: 'long' },
+            infraops_kubernetes: { type: 'long' },
+            logs: { type: 'long' },
+          },
+        },
+      },
     });
   }
 

diff --git a/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json b/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json
@@ -119,6 +119,30 @@
         }
       }
     },
+    "infraops": {
+      "properties": {
+        "last_24_hours": {
+          "properties": {
+            "hits": {
+              "properties": {
+                "infraops_hosts": {
+                  "type": "long"
+                },
+                "infraops_docker": {
+                  "type": "long"
+                },
+                "infraops_kubernetes": {
+                  "type": "long"
+                },
+                "logs": {
+                  "type": "long"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "ingest_manager": {
       "properties": {
         "fleet_enabled": {