From c7ae3c3c1832c01b4beafd788a90ce36833644d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Fern=C3=A1ndez=20Haro?=
 <alejandro.haro@elastic.co>
Date: Thu, 1 Oct 2020 15:13:11 +0100
Subject: [PATCH] [7.x] [Usage Collection] [schema] `infra` (#78581) (#79108)

---
 x-pack/.telemetryrc.json                      |  1 -
 .../infra/server/usage/usage_collector.ts     | 23 +++++++++++++++++-
 .../schema/xpack_plugins.json                 | 24 +++++++++++++++++++
 3 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/x-pack/.telemetryrc.json b/x-pack/.telemetryrc.json
index 9140dbdaf00ae..d0e56bbed9f47 100644
--- a/x-pack/.telemetryrc.json
+++ b/x-pack/.telemetryrc.json
@@ -5,7 +5,6 @@
     "plugins/actions/server/usage/actions_usage_collector.ts",
     "plugins/alerts/server/usage/alerts_usage_collector.ts",
     "plugins/apm/server/lib/apm_telemetry/index.ts",
-    "plugins/infra/server/usage/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
index 598ee21e6f273..54f6d2f6121db 100644
--- a/x-pack/plugins/infra/server/usage/usage_collector.ts
+++ b/x-pack/plugins/infra/server/usage/usage_collector.ts
@@ -14,6 +14,17 @@ 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);
@@ -21,12 +32,22 @@ export class UsageCollector {
   }
 
   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
index 9acffa1f6c78e..816d6828381ee 100644
--- a/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json
+++ b/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json
@@ -242,6 +242,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": {