From 2197df89d7613064dc5d8b02e256466e0a85d4e3 Mon Sep 17 00:00:00 2001
From: Dario Gieselaar <dario.gieselaar@elastic.co>
Date: Wed, 18 Mar 2020 20:40:28 +0100
Subject: [PATCH] Make saved objects mapping non-dynamic; make sure telemetry
 is properly stored

---
 x-pack/legacy/plugins/apm/mappings.json       | 735 +++++++++++++++++-
 .../collect_data_telemetry/tasks.ts           |   6 +-
 .../apm/server/lib/apm_telemetry/index.ts     |   2 +-
 3 files changed, 737 insertions(+), 6 deletions(-)

diff --git a/x-pack/legacy/plugins/apm/mappings.json b/x-pack/legacy/plugins/apm/mappings.json
index 03987003398c02f..c2531e9163c2772 100644
--- a/x-pack/legacy/plugins/apm/mappings.json
+++ b/x-pack/legacy/plugins/apm/mappings.json
@@ -1,7 +1,738 @@
 {
   "apm-telemetry": {
-    "properties": {},
-    "dynamic": true
+    "properties": {
+      "agents": {
+        "properties": {
+          "dotnet": {
+            "properties": {
+              "agent": {
+                "properties": {
+                  "version": {
+                    "type": "keyword",
+                    "ignore_above": 256
+                  }
+                }
+              },
+              "service": {
+                "properties": {
+                  "framework": {
+                    "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
+                  },
+                  "language": {
+                    "properties": {
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
+                  },
+                  "runtime": {
+                    "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "go": {
+            "properties": {
+              "agent": {
+                "properties": {
+                  "version": {
+                    "type": "keyword",
+                    "ignore_above": 256
+                  }
+                }
+              },
+              "service": {
+                "properties": {
+                  "framework": {
+                    "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
+                  },
+                  "language": {
+                    "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
+                  },
+                  "runtime": {
+                    "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "java": {
+            "properties": {
+              "agent": {
+                "properties": {
+                  "version": {
+                    "type": "keyword",
+                    "ignore_above": 256
+                  }
+                }
+              },
+              "service": {
+                "properties": {
+                  "framework": {
+                    "type": "object"
+                  },
+                  "language": {
+                    "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
+                  },
+                  "runtime": {
+                    "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "js-base": {
+            "properties": {
+              "agent": {
+                "properties": {
+                  "version": {
+                    "type": "keyword",
+                    "ignore_above": 256
+                  }
+                }
+              },
+              "service": {
+                "properties": {
+                  "framework": {
+                    "type": "object"
+                  },
+                  "language": {
+                    "properties": {
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
+                  },
+                  "runtime": {
+                    "type": "object"
+                  }
+                }
+              }
+            }
+          },
+          "nodejs": {
+            "properties": {
+              "agent": {
+                "properties": {
+                  "version": {
+                    "type": "keyword",
+                    "ignore_above": 256
+                  }
+                }
+              },
+              "service": {
+                "properties": {
+                  "framework": {
+                    "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
+                  },
+                  "language": {
+                    "properties": {
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
+                  },
+                  "runtime": {
+                    "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "python": {
+            "properties": {
+              "agent": {
+                "properties": {
+                  "version": {
+                    "type": "keyword",
+                    "ignore_above": 256
+                  }
+                }
+              },
+              "service": {
+                "properties": {
+                  "framework": {
+                    "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
+                  },
+                  "language": {
+                    "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
+                  },
+                  "runtime": {
+                    "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "ruby": {
+            "properties": {
+              "agent": {
+                "properties": {
+                  "version": {
+                    "type": "keyword",
+                    "ignore_above": 256
+                  }
+                }
+              },
+              "service": {
+                "properties": {
+                  "framework": {
+                    "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
+                  },
+                  "language": {
+                    "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
+                  },
+                  "runtime": {
+                    "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "rum-js": {
+            "properties": {
+              "agent": {
+                "type": "object"
+              },
+              "service": {
+                "properties": {
+                  "framework": {
+                    "type": "object"
+                  },
+                  "language": {
+                    "type": "object"
+                  },
+                  "runtime": {
+                    "type": "object"
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      "counts": {
+        "properties": {
+          "agent_configuration": {
+            "properties": {
+              "all": {
+                "type": "long"
+              }
+            }
+          },
+          "error": {
+            "properties": {
+              "1d": {
+                "type": "long"
+              },
+              "all": {
+                "type": "long"
+              }
+            }
+          },
+          "max_error_groups_per_service": {
+            "properties": {
+              "1d": {
+                "type": "long"
+              }
+            }
+          },
+          "max_transaction_groups_per_service": {
+            "properties": {
+              "1d": {
+                "type": "long"
+              }
+            }
+          },
+          "metric": {
+            "properties": {
+              "1d": {
+                "type": "long"
+              },
+              "all": {
+                "type": "long"
+              }
+            }
+          },
+          "onboarding": {
+            "properties": {
+              "1d": {
+                "type": "long"
+              },
+              "all": {
+                "type": "long"
+              }
+            }
+          },
+          "services": {
+            "properties": {
+              "1d": {
+                "type": "long"
+              }
+            }
+          },
+          "sourcemap": {
+            "properties": {
+              "1d": {
+                "type": "long"
+              },
+              "all": {
+                "type": "long"
+              }
+            }
+          },
+          "span": {
+            "properties": {
+              "1d": {
+                "type": "long"
+              },
+              "all": {
+                "type": "long"
+              }
+            }
+          },
+          "traces": {
+            "properties": {
+              "1d": {
+                "type": "long"
+              }
+            }
+          },
+          "transaction": {
+            "properties": {
+              "1d": {
+                "type": "long"
+              },
+              "all": {
+                "type": "long"
+              }
+            }
+          }
+        }
+      },
+      "has_any_services": {
+        "type": "boolean"
+      },
+      "indices": {
+        "properties": {
+          "all": {
+            "properties": {
+              "total": {
+                "properties": {
+                  "docs": {
+                    "properties": {
+                      "count": {
+                        "type": "long"
+                      }
+                    }
+                  },
+                  "store": {
+                    "properties": {
+                      "size_in_bytes": {
+                        "type": "long"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "shards": {
+            "properties": {
+              "total": {
+                "type": "long"
+              }
+            }
+          }
+        }
+      },
+      "integrations": {
+        "properties": {
+          "ml": {
+            "properties": {
+              "all_jobs_count": {
+                "type": "long"
+              }
+            }
+          }
+        }
+      },
+      "retainment": {
+        "properties": {
+          "error": {
+            "properties": {
+              "ms": {
+                "type": "long"
+              }
+            }
+          },
+          "metric": {
+            "properties": {
+              "ms": {
+                "type": "long"
+              }
+            }
+          },
+          "onboarding": {
+            "properties": {
+              "ms": {
+                "type": "long"
+              }
+            }
+          },
+          "span": {
+            "properties": {
+              "ms": {
+                "type": "long"
+              }
+            }
+          },
+          "transaction": {
+            "properties": {
+              "ms": {
+                "type": "long"
+              }
+            }
+          }
+        }
+      },
+      "services_per_agent": {
+        "properties": {
+          "dotnet": {
+            "type": "long"
+          },
+          "go": {
+            "type": "long"
+          },
+          "java": {
+            "type": "long"
+          },
+          "js-base": {
+            "type": "long"
+          },
+          "nodejs": {
+            "type": "long"
+          },
+          "python": {
+            "type": "long"
+          },
+          "ruby": {
+            "type": "long"
+          },
+          "rum-js": {
+            "type": "long"
+          }
+        }
+      },
+      "tasks": {
+        "properties": {
+          "agent_configuration": {
+            "properties": {
+              "took": {
+                "properties": {
+                  "ms": {
+                    "type": "long"
+                  }
+                }
+              }
+            }
+          },
+          "agents": {
+            "properties": {
+              "took": {
+                "properties": {
+                  "ms": {
+                    "type": "long"
+                  }
+                }
+              }
+            }
+          },
+          "groupings": {
+            "properties": {
+              "took": {
+                "properties": {
+                  "ms": {
+                    "type": "long"
+                  }
+                }
+              }
+            }
+          },
+          "indices_stats": {
+            "properties": {
+              "took": {
+                "properties": {
+                  "ms": {
+                    "type": "long"
+                  }
+                }
+              }
+            }
+          },
+          "integrations": {
+            "properties": {
+              "took": {
+                "properties": {
+                  "ms": {
+                    "type": "long"
+                  }
+                }
+              }
+            }
+          },
+          "processor_events": {
+            "properties": {
+              "took": {
+                "properties": {
+                  "ms": {
+                    "type": "long"
+                  }
+                }
+              }
+            }
+          },
+          "services": {
+            "properties": {
+              "took": {
+                "properties": {
+                  "ms": {
+                    "type": "long"
+                  }
+                }
+              }
+            }
+          },
+          "versions": {
+            "properties": {
+              "took": {
+                "properties": {
+                  "ms": {
+                    "type": "long"
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      "version": {
+        "properties": {
+          "apm_server": {
+            "properties": {
+              "major": {
+                "type": "long"
+              },
+              "minor": {
+                "type": "long"
+              },
+              "patch": {
+                "type": "long"
+              }
+            }
+          }
+        }
+      }
+    }
   },
   "apm-indices": {
     "properties": {
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
index 66419352d80a34a..dcee42782df65a7 100644
--- 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
@@ -520,7 +520,7 @@ export const tasks: TelemetryTask[] = [
                 name: aggregations[SERVICE_FRAMEWORK_NAME].buckets
                   .map(bucket => bucket.key as string)
                   .slice(0, size),
-                versions: aggregations[SERVICE_FRAMEWORK_VERSION].buckets
+                version: aggregations[SERVICE_FRAMEWORK_VERSION].buckets
                   .map(bucket => bucket.key as string)
                   .slice(0, size),
                 composite: sortBy(
@@ -544,7 +544,7 @@ export const tasks: TelemetryTask[] = [
                 name: aggregations[SERVICE_LANGUAGE_NAME].buckets
                   .map(bucket => bucket.key as string)
                   .slice(0, size),
-                versions: aggregations[SERVICE_LANGUAGE_VERSION].buckets
+                version: aggregations[SERVICE_LANGUAGE_VERSION].buckets
                   .map(bucket => bucket.key as string)
                   .slice(0, size),
                 composite: sortBy(
@@ -568,7 +568,7 @@ export const tasks: TelemetryTask[] = [
                 name: aggregations[SERVICE_RUNTIME_NAME].buckets
                   .map(bucket => bucket.key as string)
                   .slice(0, size),
-                versions: aggregations[SERVICE_RUNTIME_VERSION].buckets
+                version: aggregations[SERVICE_RUNTIME_VERSION].buckets
                   .map(bucket => bucket.key as string)
                   .slice(0, size),
                 composite: sortBy(
diff --git a/x-pack/plugins/apm/server/lib/apm_telemetry/index.ts b/x-pack/plugins/apm/server/lib/apm_telemetry/index.ts
index 8502fe25e4b83fc..967383c6de9f359 100644
--- a/x-pack/plugins/apm/server/lib/apm_telemetry/index.ts
+++ b/x-pack/plugins/apm/server/lib/apm_telemetry/index.ts
@@ -116,7 +116,7 @@ export function scheduleApmTelemetryTasks(
     id: APM_TELEMETRY_TASK_NAME,
     taskType: APM_TELEMETRY_TASK_NAME,
     schedule: {
-      interval: '1m'
+      interval: '1d'
     },
     scope: ['apm'],
     params: {},