[Reporting/Telemetry] Include counts for each deprecated job type (#1…

…08614) * add isDeprecated to report meta for telemetry * test clean up * update snapshots * Update x-pack/plugins/reporting/server/usage/decorate_range_stats.ts Co-authored-by: Michael Dokolin <[email protected]> Co-authored-by: Kibana Machine <[email protected]> Co-authored-by: Michael Dokolin <[email protected]>
elastic · Aug 20, 2021 · 91630c6 · 91630c6
1 parent 5f9193d
commit 91630c6
Show file tree

Hide file tree

Showing 14 changed files with 1,153 additions and 913 deletions.
diff --git a/x-pack/plugins/reporting/common/constants.ts b/x-pack/plugins/reporting/common/constants.ts
@@ -79,6 +79,8 @@ export const CSV_JOB_TYPE_DEPRECATED = 'csv';
 
 export const USES_HEADLESS_JOB_TYPES = [PDF_JOB_TYPE, PNG_JOB_TYPE];
 
+export const DEPRECATED_JOB_TYPES = [CSV_JOB_TYPE_DEPRECATED];
+
 // Licenses
 export const LICENSE_TYPE_TRIAL = 'trial';
 export const LICENSE_TYPE_BASIC = 'basic';

diff --git a/x-pack/plugins/reporting/common/types.ts b/x-pack/plugins/reporting/common/types.ts
@@ -73,7 +73,12 @@ export interface ReportSource {
   jobtype: string; // refers to `ExportTypeDefinition.jobType`
   created_by: string | false; // username or `false` if security is disabled. Used for ensuring users can only access the reports they've created.
   payload: BasePayload;
-  meta: { objectType: string; layout?: string }; // for telemetry
+  meta: {
+    // for telemetry
+    objectType: string;
+    layout?: string;
+    isDeprecated?: boolean;
+  };
   migration_version: string; // for reminding the user to update their POST URL
   attempts: number; // initially populated as 0
   created_at: string; // timestamp in UTC

diff --git a/x-pack/plugins/reporting/server/lib/enqueue_job.test.ts b/x-pack/plugins/reporting/server/lib/enqueue_job.test.ts
@@ -97,6 +97,7 @@ describe('Enqueue Job', () => {
         "kibana_name": undefined,
         "max_attempts": undefined,
         "meta": Object {
+          "isDeprecated": undefined,
           "layout": undefined,
           "objectType": "cool_object_type",
         },

diff --git a/x-pack/plugins/reporting/server/lib/enqueue_job.ts b/x-pack/plugins/reporting/server/lib/enqueue_job.ts
@@ -47,8 +47,10 @@ export async function enqueueJob(
       created_by: user ? user.username : false,
       payload: job,
       meta: {
+        // telemetry fields
         objectType: jobParams.objectType,
         layout: jobParams.layout?.id,
+        isDeprecated: job.isDeprecated,
       },
     })
   );

diff --git a/x-pack/plugins/reporting/server/lib/store/mapping.ts b/x-pack/plugins/reporting/server/lib/store/mapping.ts
@@ -29,6 +29,9 @@ export const mapping = {
           },
         },
       },
+      isDeprecated: {
+        type: 'boolean',
+      },
     },
   },
   browser_type: { type: 'keyword' },
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,6 +29,9 @@ export const mapping = { @@
               },
             },
           },
+          isDeprecated: {
+            type: 'boolean',
+          },
         },
       },
       browser_type: { type: 'keyword' },
@@ Expand Down @@