[Ingest Manager] Add schema to usageCollector. (#71219) (#71325)

* Add schema to Ingest Manager usageCollector. * Use long for counters. Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com> Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
elastic · Jul 9, 2020 · 4cd68f5 · 4cd68f5
1 parent f60a3f4
commit 4cd68f5
Show file tree

Hide file tree

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

diff --git a/x-pack/plugins/ingest_manager/server/collectors/register.ts b/x-pack/plugins/ingest_manager/server/collectors/register.ts
@@ -41,20 +41,20 @@ export function registerIngestManagerUsageCollector(
         packages: await getPackageUsage(soClient),
       };
     },
-    // schema: { // temporarily disabled because of type errors
-    //   fleet_enabled: { type: 'boolean' },
-    //   agents: {
-    //    total: { type: 'number' },
-    //    online: { type: 'number' },
-    //    error: { type: 'number' },
-    //    offline: { type: 'number' },
-    //   },
-    //   packages: {
-    //     name: { type: 'keyword' },
-    //     version: { type: 'keyword' },
-    //     enabled: { type: boolean },
-    //   },
-    // },
+    schema: {
+      fleet_enabled: { type: 'boolean' },
+      agents: {
+        total: { type: 'long' },
+        online: { type: 'long' },
+        error: { type: 'long' },
+        offline: { type: 'long' },
+      },
+      packages: {
+        name: { type: 'keyword' },
+        version: { type: 'keyword' },
+        enabled: { type: 'boolean' },
+      },
+    },
   });
 
   // register usage collector

diff --git a/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json b/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json
@@ -48,6 +48,42 @@
         }
       }
     },
+    "ingest_manager": {
+      "properties": {
+        "fleet_enabled": {
+          "type": "boolean"
+        },
+        "agents": {
+          "properties": {
+            "total": {
+              "type": "long"
+            },
+            "online": {
+              "type": "long"
+            },
+            "error": {
+              "type": "long"
+            },
+            "offline": {
+              "type": "long"
+            }
+          }
+        },
+        "packages": {
+          "properties": {
+            "name": {
+              "type": "keyword"
+            },
+            "version": {
+              "type": "keyword"
+            },
+            "enabled": {
+              "type": "boolean"
+            }
+          }
+        }
+      }
+    },
     "mlTelemetry": {
       "properties": {
         "file_data_visualizer": {