[APM] Ensure telemetry data matches SO/telemetry mapping (#61957)

* [APM] Ensure telemetry data matches SO/telemetry mapping Closes #61802. * Correct mapping for dotnet data
elastic · Apr 2, 2020 · feadf19 · feadf19
1 parent 866dc65
commit feadf19
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/x-pack/legacy/plugins/apm/mappings.json b/x-pack/legacy/plugins/apm/mappings.json
@@ -33,9 +33,17 @@
                   },
                   "language": {
                     "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 1024
+                      },
                       "name": {
                         "type": "keyword",
                         "ignore_above": 1024
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 1024
                       }
                     }
                   },

diff --git a/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts b/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts
@@ -236,7 +236,7 @@ export const tasks: TelemetryTask[] = [
         .map(part => Number(part));
 
       return {
-        versions: {
+        version: {
           apm_server: {
             major,
             minor,

diff --git a/x-pack/plugins/apm/server/lib/apm_telemetry/types.ts b/x-pack/plugins/apm/server/lib/apm_telemetry/types.ts
@@ -18,7 +18,7 @@ export type TimeframeMapAll = Pick<TimeframeMap, 'all'>;
 export type APMDataTelemetry = DeepPartial<{
   has_any_services: boolean;
   services_per_agent: Record<AgentName, number>;
-  versions: {
+  version: {
     apm_server: {
       minor: number;
       major: number;