Backport apmpackage upgrade (#6319)

elastic · Oct 12, 2021 · 2330bb2 · 2330bb2
1 parent ada91c1
commit 2330bb2
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 31 deletions.
diff --git a/apmpackage/apm/changelog.yml b/apmpackage/apm/changelog.yml
@@ -1,6 +1,11 @@
 # newer versions go on top
 #
 # change type can be one of: enhancement, bugfix, breaking-change
+- version: "7.16.0"
+  changes:
+    - description: version bump to align package version with stack version
+      type: enhancement
+      link: https://github.com/elastic/apm-server/issues/4898
 - version: "0.5.0"
   changes:
     - description: define index sorting for internal metrics

diff --git a/apmpackage/apm/data_stream/app_metrics/elasticsearch/ingest_pipeline/default.json b/apmpackage/apm/data_stream/app_metrics/elasticsearch/ingest_pipeline/default.json
@@ -3,33 +3,33 @@
   "processors": [
     {
       "pipeline": {
-        "name": "metrics-apm.app-0.5.0-apm_ingest_timestamp"
+        "name": "metrics-apm.app-7.16.0-apm_ingest_timestamp"
       }
     },
     {
       "pipeline": {
-        "name": "metrics-apm.app-0.5.0-apm_user_agent"
+        "name": "metrics-apm.app-7.16.0-apm_user_agent"
       }
     },
     {
       "pipeline": {
-        "name": "metrics-apm.app-0.5.0-apm_user_geo"
+        "name": "metrics-apm.app-7.16.0-apm_user_geo"
       }
     },
     {
       "pipeline": {
-        "name": "metrics-apm.app-0.5.0-apm_remove_span_metadata"
+        "name": "metrics-apm.app-7.16.0-apm_remove_span_metadata"
       }
     },
     {
       "pipeline": {
-        "name": "metrics-apm.app-0.5.0-apm_error_grouping_name",
+        "name": "metrics-apm.app-7.16.0-apm_error_grouping_name",
         "if": "ctx.processor?.event == 'error'"
       }
     },
     {
       "pipeline": {
-        "name": "metrics-apm.app-0.5.0-apm_metrics_dynamic_template",
+        "name": "metrics-apm.app-7.16.0-apm_metrics_dynamic_template",
         "if": "ctx.processor?.event == 'metric'"
       }
     }

diff --git a/apmpackage/apm/data_stream/error_logs/elasticsearch/ingest_pipeline/default.json b/apmpackage/apm/data_stream/error_logs/elasticsearch/ingest_pipeline/default.json
@@ -3,33 +3,33 @@
   "processors": [
     {
       "pipeline": {
-        "name": "logs-apm.error-0.5.0-apm_ingest_timestamp"
+        "name": "logs-apm.error-7.16.0-apm_ingest_timestamp"
       }
     },
     {
       "pipeline": {
-        "name": "logs-apm.error-0.5.0-apm_user_agent"
+        "name": "logs-apm.error-7.16.0-apm_user_agent"
       }
     },
     {
       "pipeline": {
-        "name": "logs-apm.error-0.5.0-apm_user_geo"
+        "name": "logs-apm.error-7.16.0-apm_user_geo"
       }
     },
     {
       "pipeline": {
-        "name": "logs-apm.error-0.5.0-apm_remove_span_metadata"
+        "name": "logs-apm.error-7.16.0-apm_remove_span_metadata"
       }
     },
     {
       "pipeline": {
-        "name": "logs-apm.error-0.5.0-apm_error_grouping_name",
+        "name": "logs-apm.error-7.16.0-apm_error_grouping_name",
         "if": "ctx.processor?.event == 'error'"
       }
     },
     {
       "pipeline": {
-        "name": "logs-apm.error-0.5.0-apm_metrics_dynamic_template",
+        "name": "logs-apm.error-7.16.0-apm_metrics_dynamic_template",
         "if": "ctx.processor?.event == 'metric'"
       }
     }

diff --git a/apmpackage/apm/data_stream/internal_metrics/elasticsearch/ingest_pipeline/default.json b/apmpackage/apm/data_stream/internal_metrics/elasticsearch/ingest_pipeline/default.json
@@ -3,33 +3,33 @@
   "processors": [
     {
       "pipeline": {
-        "name": "metrics-apm.internal-0.5.0-apm_ingest_timestamp"
+        "name": "metrics-apm.internal-7.16.0-apm_ingest_timestamp"
       }
     },
     {
       "pipeline": {
-        "name": "metrics-apm.internal-0.5.0-apm_user_agent"
+        "name": "metrics-apm.internal-7.16.0-apm_user_agent"
       }
     },
     {
       "pipeline": {
-        "name": "metrics-apm.internal-0.5.0-apm_user_geo"
+        "name": "metrics-apm.internal-7.16.0-apm_user_geo"
       }
     },
     {
       "pipeline": {
-        "name": "metrics-apm.internal-0.5.0-apm_remove_span_metadata"
+        "name": "metrics-apm.internal-7.16.0-apm_remove_span_metadata"
       }
     },
     {
       "pipeline": {
-        "name": "metrics-apm.internal-0.5.0-apm_error_grouping_name",
+        "name": "metrics-apm.internal-7.16.0-apm_error_grouping_name",
         "if": "ctx.processor?.event == 'error'"
       }
     },
     {
       "pipeline": {
-        "name": "metrics-apm.internal-0.5.0-apm_metrics_dynamic_template",
+        "name": "metrics-apm.internal-7.16.0-apm_metrics_dynamic_template",
         "if": "ctx.processor?.event == 'metric'"
       }
     }

diff --git a/apmpackage/apm/data_stream/profile_metrics/elasticsearch/ingest_pipeline/default.json b/apmpackage/apm/data_stream/profile_metrics/elasticsearch/ingest_pipeline/default.json
@@ -3,33 +3,33 @@
   "processors": [
     {
       "pipeline": {
-        "name": "metrics-apm.profiling-0.5.0-apm_ingest_timestamp"
+        "name": "metrics-apm.profiling-7.16.0-apm_ingest_timestamp"
       }
     },
     {
       "pipeline": {
-        "name": "metrics-apm.profiling-0.5.0-apm_user_agent"
+        "name": "metrics-apm.profiling-7.16.0-apm_user_agent"
       }
     },
     {
       "pipeline": {
-        "name": "metrics-apm.profiling-0.5.0-apm_user_geo"
+        "name": "metrics-apm.profiling-7.16.0-apm_user_geo"
       }
     },
     {
       "pipeline": {
-        "name": "metrics-apm.profiling-0.5.0-apm_remove_span_metadata"
+        "name": "metrics-apm.profiling-7.16.0-apm_remove_span_metadata"
       }
     },
     {
       "pipeline": {
-        "name": "metrics-apm.profiling-0.5.0-apm_error_grouping_name",
+        "name": "metrics-apm.profiling-7.16.0-apm_error_grouping_name",
         "if": "ctx.processor?.event == 'error'"
       }
     },
     {
       "pipeline": {
-        "name": "metrics-apm.profiling-0.5.0-apm_metrics_dynamic_template",
+        "name": "metrics-apm.profiling-7.16.0-apm_metrics_dynamic_template",
         "if": "ctx.processor?.event == 'metric'"
       }
     }

diff --git a/apmpackage/apm/data_stream/traces/elasticsearch/ingest_pipeline/default.json b/apmpackage/apm/data_stream/traces/elasticsearch/ingest_pipeline/default.json
@@ -3,33 +3,33 @@
   "processors": [
     {
       "pipeline": {
-        "name": "traces-apm-0.5.0-apm_ingest_timestamp"
+        "name": "traces-apm-7.16.0-apm_ingest_timestamp"
       }
     },
     {
       "pipeline": {
-        "name": "traces-apm-0.5.0-apm_user_agent"
+        "name": "traces-apm-7.16.0-apm_user_agent"
       }
     },
     {
       "pipeline": {
-        "name": "traces-apm-0.5.0-apm_user_geo"
+        "name": "traces-apm-7.16.0-apm_user_geo"
       }
     },
     {
       "pipeline": {
-        "name": "traces-apm-0.5.0-apm_remove_span_metadata"
+        "name": "traces-apm-7.16.0-apm_remove_span_metadata"
       }
     },
     {
       "pipeline": {
-        "name": "traces-apm-0.5.0-apm_error_grouping_name",
+        "name": "traces-apm-7.16.0-apm_error_grouping_name",
         "if": "ctx.processor?.event == 'error'"
       }
     },
     {
       "pipeline": {
-        "name": "traces-apm-0.5.0-apm_metrics_dynamic_template",
+        "name": "traces-apm-7.16.0-apm_metrics_dynamic_template",
         "if": "ctx.processor?.event == 'metric'"
       }
     }

diff --git a/apmpackage/apm/manifest.yml b/apmpackage/apm/manifest.yml
@@ -1,7 +1,7 @@
 format_version: 1.0.0
 name: apm
 title: Elastic APM
-version: 0.5.0
+version: 7.16.0
 license: basic
 description: Ingest APM data
 type: integration