Bump integration to 0.4.0, use apm-server.auth config (#5691)

* apmpackage: bump to 0.4.0, use apm-server.auth config * systemtest: refactor and fix Fleet tests Split some of the Fleet/Elastic Agent setup out of TestFleetIntegration, into a separate function which can be reused. Fix the package policy creation to set defaults correctly.
elastic · Jul 14, 2021 · 166ebbb · 166ebbb
1 parent 6d1427e
commit 166ebbb
Show file tree

Hide file tree

Showing 12 changed files with 153 additions and 94 deletions.
diff --git a/apmpackage/apm/agent/input/template.yml.hbs b/apmpackage/apm/agent/input/template.yml.hbs
@@ -1,7 +1,9 @@
 apm-server:
-    api_key:
-        enabled: {{api_key_enabled}}
-        limit: {{api_key_limit}}
+    auth:
+        api_key:
+            enabled: {{api_key_enabled}}
+            limit: {{api_key_limit}}
+        secret_token: {{secret_token}}
     capture_personal_data: {{capture_personal_data}}
     idle_timeout: {{idle_timeout}}
     default_service_environment: {{default_service_environment}}
@@ -12,6 +14,7 @@ apm-server:
     max_header_size: {{max_header_bytes}}
     read_timeout: {{read_timeout}}
     response_headers: {{response_headers}}
+    {{#if enable_rum}}
     rum:
         allow_headers:
         {{#each rum_allow_headers}}
@@ -31,7 +34,7 @@ apm-server:
         exclude_from_grouping: {{rum_exclude_from_grouping}}
         library_pattern: {{rum_library_pattern}}
         response_headers: {{rum_response_headers}}
-    secret_token: {{secret_token}}
+    {{/if}}
     shutdown_timeout: {{shutdown_timeout}}
     {{#if tls_enabled}}
     ssl:

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: "0.4.0"
+  changes:
+    - description: use new apm-server.auth config
+      type: breaking-change
+      link: https://github.com/elastic/apm-server/pull/5691
 - version: "0.3.0"
   changes:
     - description: added apm-server.url config

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.3.0-apm_ingest_timestamp"
+        "name": "metrics-apm.app-0.4.0-apm_ingest_timestamp"
       }
     },
     {
       "pipeline": {
-        "name": "metrics-apm.app-0.3.0-apm_user_agent"
+        "name": "metrics-apm.app-0.4.0-apm_user_agent"
       }
     },
     {
       "pipeline": {
-        "name": "metrics-apm.app-0.3.0-apm_user_geo"
+        "name": "metrics-apm.app-0.4.0-apm_user_geo"
       }
     },
     {
       "pipeline": {
-        "name": "metrics-apm.app-0.3.0-apm_remove_span_metadata"
+        "name": "metrics-apm.app-0.4.0-apm_remove_span_metadata"
       }
     },
     {
       "pipeline": {
-        "name": "metrics-apm.app-0.3.0-apm_error_grouping_name",
+        "name": "metrics-apm.app-0.4.0-apm_error_grouping_name",
         "if": "ctx.processor?.event == 'error'"
       }
     },
     {
       "pipeline": {
-        "name": "metrics-apm.app-0.3.0-apm_metrics_dynamic_template",
+        "name": "metrics-apm.app-0.4.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.3.0-apm_ingest_timestamp"
+        "name": "logs-apm.error-0.4.0-apm_ingest_timestamp"
       }
     },
     {
       "pipeline": {
-        "name": "logs-apm.error-0.3.0-apm_user_agent"
+        "name": "logs-apm.error-0.4.0-apm_user_agent"
       }
     },
     {
       "pipeline": {
-        "name": "logs-apm.error-0.3.0-apm_user_geo"
+        "name": "logs-apm.error-0.4.0-apm_user_geo"
       }
     },
     {
       "pipeline": {
-        "name": "logs-apm.error-0.3.0-apm_remove_span_metadata"
+        "name": "logs-apm.error-0.4.0-apm_remove_span_metadata"
       }
     },
     {
       "pipeline": {
-        "name": "logs-apm.error-0.3.0-apm_error_grouping_name",
+        "name": "logs-apm.error-0.4.0-apm_error_grouping_name",
         "if": "ctx.processor?.event == 'error'"
       }
     },
     {
       "pipeline": {
-        "name": "logs-apm.error-0.3.0-apm_metrics_dynamic_template",
+        "name": "logs-apm.error-0.4.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.3.0-apm_ingest_timestamp"
+        "name": "metrics-apm.internal-0.4.0-apm_ingest_timestamp"
       }
     },
     {
       "pipeline": {
-        "name": "metrics-apm.internal-0.3.0-apm_user_agent"
+        "name": "metrics-apm.internal-0.4.0-apm_user_agent"
       }
     },
     {
       "pipeline": {
-        "name": "metrics-apm.internal-0.3.0-apm_user_geo"
+        "name": "metrics-apm.internal-0.4.0-apm_user_geo"
       }
     },
     {
       "pipeline": {
-        "name": "metrics-apm.internal-0.3.0-apm_remove_span_metadata"
+        "name": "metrics-apm.internal-0.4.0-apm_remove_span_metadata"
       }
     },
     {
       "pipeline": {
-        "name": "metrics-apm.internal-0.3.0-apm_error_grouping_name",
+        "name": "metrics-apm.internal-0.4.0-apm_error_grouping_name",
         "if": "ctx.processor?.event == 'error'"
       }
     },
     {
       "pipeline": {
-        "name": "metrics-apm.internal-0.3.0-apm_metrics_dynamic_template",
+        "name": "metrics-apm.internal-0.4.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.3.0-apm_ingest_timestamp"
+        "name": "metrics-apm.profiling-0.4.0-apm_ingest_timestamp"
       }
     },
     {
       "pipeline": {
-        "name": "metrics-apm.profiling-0.3.0-apm_user_agent"
+        "name": "metrics-apm.profiling-0.4.0-apm_user_agent"
       }
     },
     {
       "pipeline": {
-        "name": "metrics-apm.profiling-0.3.0-apm_user_geo"
+        "name": "metrics-apm.profiling-0.4.0-apm_user_geo"
       }
     },
     {
       "pipeline": {
-        "name": "metrics-apm.profiling-0.3.0-apm_remove_span_metadata"
+        "name": "metrics-apm.profiling-0.4.0-apm_remove_span_metadata"
       }
     },
     {
       "pipeline": {
-        "name": "metrics-apm.profiling-0.3.0-apm_error_grouping_name",
+        "name": "metrics-apm.profiling-0.4.0-apm_error_grouping_name",
         "if": "ctx.processor?.event == 'error'"
       }
     },
     {
       "pipeline": {
-        "name": "metrics-apm.profiling-0.3.0-apm_metrics_dynamic_template",
+        "name": "metrics-apm.profiling-0.4.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.3.0-apm_ingest_timestamp"
+        "name": "traces-apm-0.4.0-apm_ingest_timestamp"
       }
     },
     {
       "pipeline": {
-        "name": "traces-apm-0.3.0-apm_user_agent"
+        "name": "traces-apm-0.4.0-apm_user_agent"
       }
     },
     {
       "pipeline": {
-        "name": "traces-apm-0.3.0-apm_user_geo"
+        "name": "traces-apm-0.4.0-apm_user_geo"
       }
     },
     {
       "pipeline": {
-        "name": "traces-apm-0.3.0-apm_remove_span_metadata"
+        "name": "traces-apm-0.4.0-apm_remove_span_metadata"
       }
     },
     {
       "pipeline": {
-        "name": "traces-apm-0.3.0-apm_error_grouping_name",
+        "name": "traces-apm-0.4.0-apm_error_grouping_name",
         "if": "ctx.processor?.event == 'error'"
       }
     },
     {
       "pipeline": {
-        "name": "traces-apm-0.3.0-apm_metrics_dynamic_template",
+        "name": "traces-apm-0.4.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.3.0
+version: 0.4.0
 license: basic
 description: Ingest APM data
 type: integration