[7.x] [Usage Collection] [schema] actions (#78832) (#79304)

afharo · web-flow · commit 6f57cc1893b7 · 2020-10-02T17:42:15.000+01:00
diff --git a/x-pack/.telemetryrc.json b/x-pack/.telemetryrc.json
@@ -2,7 +2,6 @@
   "output": "plugins/telemetry_collection_xpack/schema/xpack_plugins.json",
   "root": "plugins/",
   "exclude": [
-    "plugins/actions/server/usage/actions_usage_collector.ts",
     "plugins/alerts/server/usage/alerts_usage_collector.ts",
     "plugins/apm/server/lib/apm_telemetry/index.ts"
   ]
diff --git a/x-pack/plugins/actions/server/usage/actions_usage_collector.ts b/x-pack/plugins/actions/server/usage/actions_usage_collector.ts
@@ -4,18 +4,39 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { MakeSchemaFrom, UsageCollectionSetup } from 'src/plugins/usage_collection/server';
 import { get } from 'lodash';
 import { TaskManagerStartContract } from '../../../task_manager/server';
 import { ActionsUsage } from './types';
 
+const byTypeSchema: MakeSchemaFrom<ActionsUsage>['count_by_type'] = {
+  // TODO: Find out an automated way to populate the keys or reformat these into an array (and change the Remote Telemetry indexer accordingly)
+  DYNAMIC_KEY: { type: 'long' },
+  // Known actions:
+  __email: { type: 'long' },
+  __index: { type: 'long' },
+  __pagerduty: { type: 'long' },
+  '__server-log': { type: 'long' },
+  __slack: { type: 'long' },
+  __webhook: { type: 'long' },
+  __servicenow: { type: 'long' },
+  __jira: { type: 'long' },
+  __resilient: { type: 'long' },
+};
+
 export function createActionsUsageCollector(
   usageCollection: UsageCollectionSetup,
   taskManager: TaskManagerStartContract
 ) {
   return usageCollection.makeUsageCollector<ActionsUsage>({
     type: 'actions',
     isReady: () => true,
+    schema: {
+      count_total: { type: 'long' },
+      count_active_total: { type: 'long' },
+      count_by_type: byTypeSchema,
+      count_active_by_type: byTypeSchema,
+    },
     fetch: async () => {
       try {
         const doc = await getLatestTaskState(await taskManager);
diff --git a/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json b/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json
@@ -1,5 +1,83 @@
 {
   "properties": {
+    "actions": {
+      "properties": {
+        "count_total": {
+          "type": "long"
+        },
+        "count_active_total": {
+          "type": "long"
+        },
+        "count_by_type": {
+          "properties": {
+            "DYNAMIC_KEY": {
+              "type": "long"
+            },
+            "__email": {
+              "type": "long"
+            },
+            "__index": {
+              "type": "long"
+            },
+            "__pagerduty": {
+              "type": "long"
+            },
+            "__server-log": {
+              "type": "long"
+            },
+            "__slack": {
+              "type": "long"
+            },
+            "__webhook": {
+              "type": "long"
+            },
+            "__servicenow": {
+              "type": "long"
+            },
+            "__jira": {
+              "type": "long"
+            },
+            "__resilient": {
+              "type": "long"
+            }
+          }
+        },
+        "count_active_by_type": {
+          "properties": {
+            "DYNAMIC_KEY": {
+              "type": "long"
+            },
+            "__email": {
+              "type": "long"
+            },
+            "__index": {
+              "type": "long"
+            },
+            "__pagerduty": {
+              "type": "long"
+            },
+            "__server-log": {
+              "type": "long"
+            },
+            "__slack": {
+              "type": "long"
+            },
+            "__webhook": {
+              "type": "long"
+            },
+            "__servicenow": {
+              "type": "long"
+            },
+            "__jira": {
+              "type": "long"
+            },
+            "__resilient": {
+              "type": "long"
+            }
+          }
+        }
+      }
+    },
     "canvas": {
       "properties": {
         "workpads": {

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`"output": "plugins/telemetry_collection_xpack/schema/xpack_plugins.json",`
`3`	`3`	`"root": "plugins/",`
`4`	`4`	`"exclude": [`
`5`		`- "plugins/actions/server/usage/actions_usage_collector.ts",`
`6`	`5`	`"plugins/alerts/server/usage/alerts_usage_collector.ts",`
`7`	`6`	`"plugins/apm/server/lib/apm_telemetry/index.ts"`
`8`	`7`	`]`