From 6ce56b291539948e63b902e8d04b76dd0757ff5c Mon Sep 17 00:00:00 2001 From: "elastic-observability-automation[bot]" <180520183+elastic-observability-automation[bot]@users.noreply.github.com> Date: Tue, 24 Dec 2024 16:40:44 +0000 Subject: [PATCH] [updatecli] Bump elastic stack version to 8.17.1-974cd5da (#15043) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update docker-compose.yml Made with ❤️️ by updatecli * chore: Update k8s stack yaml files Made with ❤️️ by updatecli * test: update approval docs --------- Co-authored-by: elastic-observability-automation[bot] <180520183+elastic-observability-automation[bot]@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: kruskal <99559985+kruskall@users.noreply.github.com> --- docker-compose.yml | 6 +-- .../approvals/TestAgentConfig.approved.json | 6 +++ .../TestApprovedMetrics.approved.json | 18 +++++++ .../TestCompressedSpans.approved.json | 6 +++ .../approvals/TestDropUnsampled.approved.json | 6 +++ .../approvals/TestErrorIngest.approved.json | 3 ++ .../approvals/TestIntake/Errors.approved.json | 15 ++++++ .../TestIntake/ErrorsTxID.approved.json | 3 ++ .../approvals/TestIntake/Events.approved.json | 12 +++++ .../TestIntake/Metricsets.approved.json | 18 +++++++ .../TestIntake/MinimalEvents.approved.json | 21 ++++++++ .../approvals/TestIntake/Spans.approved.json | 30 +++++++++++ .../TestIntake/Transactions.approved.json | 15 ++++++ .../TransactionsHugeTraces.approved.json | 3 ++ .../TestIntake/UnknownSpanType.approved.json | 6 +++ .../TestIntakeLog/with_faas.approved.json | 3 ++ .../with_flat_ecs_fields.approved.json | 3 ++ .../with_nested_ecs_fields.approved.json | 3 ++ ...fields_overrides_flat_fields.approved.json | 3 ++ .../with_timestamp.approved.json | 3 ++ .../with_timestamp_as_str.approved.json | 3 ++ .../without_timestamp.approved.json | 3 ++ .../TestJaeger/batch_0.approved.json | 21 ++++++++ .../TestJaeger/batch_1.approved.json | 54 +++++++++++++++++++ .../TestNoMatchingSourcemap.approved.json | 3 ++ .../approvals/TestOTLPGRPCLogs.approved.json | 3 ++ .../TestOTLPGRPCLogsClientIP.approved.json | 3 ++ .../TestOTLPGRPCMetrics_counter.approved.json | 3 ++ ...estOTLPGRPCMetrics_histogram.approved.json | 3 ++ .../TestOTLPGRPCMetrics_summary.approved.json | 3 ++ .../TestOTLPGRPCTraces.approved.json | 9 ++++ .../standalone.approved.json | 3 ++ .../standalone.approved.json | 3 ++ .../TestRUMRoutingIntegration.approved.json | 27 ++++++++++ .../TestRUMSpanSourcemapping.approved.json | 3 ++ .../TestRUMXForwardedFor.approved.json | 6 +++ ...erviceDestinationAggregation.approved.json | 9 ++++ ...iceSummaryMetricsAggregation.approved.json | 9 ++++ ...ryMetricsAggregationOverflow.approved.json | 27 ++++++++++ ...ransactionMetricsAggregation.approved.json | 18 +++++++ .../TestTransactionAggregation.approved.json | 27 ++++++++++ ...ansactionAggregationShutdown.approved.json | 9 ++++ ...tionDroppedSpansStatsMetrics.approved.json | 18 +++++++ ...DroppedSpansStatsTransaction.approved.json | 3 ++ testing/infra/k8s/base/stack/apm-server.yaml | 2 +- .../infra/k8s/base/stack/elasticsearch.yaml | 2 +- testing/infra/k8s/base/stack/kibana.yaml | 2 +- 47 files changed, 453 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 5b772ff3c9b..6bdc483c213 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ x-logging: &default-logging max-size: "1g" services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.17.1-2fc1da84-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:8.17.1-974cd5da-SNAPSHOT ports: - 9200:9200 healthcheck: @@ -41,7 +41,7 @@ services: logging: *default-logging kibana: - image: docker.elastic.co/kibana/kibana:8.17.1-2fc1da84-SNAPSHOT + image: docker.elastic.co/kibana/kibana:8.17.1-974cd5da-SNAPSHOT ports: - 5601:5601 healthcheck: @@ -60,7 +60,7 @@ services: logging: *default-logging metricbeat: - image: docker.elastic.co/beats/metricbeat:8.17.1-2fc1da84-SNAPSHOT + image: docker.elastic.co/beats/metricbeat:8.17.1-974cd5da-SNAPSHOT environment: ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]' ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}" diff --git a/systemtest/approvals/TestAgentConfig.approved.json b/systemtest/approvals/TestAgentConfig.approved.json index 7594040f587..ba793d263d4 100644 --- a/systemtest/approvals/TestAgentConfig.approved.json +++ b/systemtest/approvals/TestAgentConfig.approved.json @@ -15,6 +15,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "labels.etag": [ "dynamic" ], @@ -53,6 +56,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "labels.etag": [ "dynamic" ], diff --git a/systemtest/approvals/TestApprovedMetrics.approved.json b/systemtest/approvals/TestApprovedMetrics.approved.json index e2e0622a7dd..c2b6e1d06e9 100644 --- a/systemtest/approvals/TestApprovedMetrics.approved.json +++ b/systemtest/approvals/TestApprovedMetrics.approved.json @@ -24,6 +24,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "go.memstats.heap.sys.bytes": [ 6520832 ], @@ -113,6 +116,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "host.ip": [ "127.0.0.1" ], @@ -205,6 +211,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "host.ip": [ "127.0.0.1" ], @@ -315,6 +324,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "host.ip": [ "127.0.0.1" ], @@ -415,6 +427,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "faas.billed_duration": [ 183 ], @@ -528,6 +543,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "host.ip": [ "127.0.0.1" ], diff --git a/systemtest/approvals/TestCompressedSpans.approved.json b/systemtest/approvals/TestCompressedSpans.approved.json index 9dfdea38e64..f26112cdd00 100644 --- a/systemtest/approvals/TestCompressedSpans.approved.json +++ b/systemtest/approvals/TestCompressedSpans.approved.json @@ -21,6 +21,9 @@ "data_stream.type": [ "traces" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "success" ], @@ -167,6 +170,9 @@ "data_stream.type": [ "traces" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "success" ], diff --git a/systemtest/approvals/TestDropUnsampled.approved.json b/systemtest/approvals/TestDropUnsampled.approved.json index f05c2295fd3..70c90d49891 100644 --- a/systemtest/approvals/TestDropUnsampled.approved.json +++ b/systemtest/approvals/TestDropUnsampled.approved.json @@ -24,6 +24,9 @@ "data_stream.type": [ "traces" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "unknown" ], @@ -119,6 +122,9 @@ "data_stream.type": [ "traces" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "success" ], diff --git a/systemtest/approvals/TestErrorIngest.approved.json b/systemtest/approvals/TestErrorIngest.approved.json index c542da40e12..f14bee9bdd2 100644 --- a/systemtest/approvals/TestErrorIngest.approved.json +++ b/systemtest/approvals/TestErrorIngest.approved.json @@ -90,6 +90,9 @@ "error.log.message": [ "Cannot read property 'baz' of undefined" ], + "event.ingested": [ + "dynamic" + ], "host.architecture": [ "x64" ], diff --git a/systemtest/approvals/TestIntake/Errors.approved.json b/systemtest/approvals/TestIntake/Errors.approved.json index 5095c5696fe..615ace257bc 100644 --- a/systemtest/approvals/TestIntake/Errors.approved.json +++ b/systemtest/approvals/TestIntake/Errors.approved.json @@ -138,6 +138,9 @@ "error.log.param_message": [ "My service could not talk to the database named %s" ], + "event.ingested": [ + "dynamic" + ], "host.architecture": [ "x64" ], @@ -447,6 +450,9 @@ "error.id": [ "cdefab0123456789" ], + "event.ingested": [ + "dynamic" + ], "host.architecture": [ "x64" ], @@ -669,6 +675,9 @@ "error.log.message": [ "no user found" ], + "event.ingested": [ + "dynamic" + ], "host.architecture": [ "x64" ], @@ -885,6 +894,9 @@ "error.id": [ "cdefab0123456780" ], + "event.ingested": [ + "dynamic" + ], "host.architecture": [ "x64" ], @@ -1110,6 +1122,9 @@ "error.log.message": [ "Cannot read property 'baz' of undefined" ], + "event.ingested": [ + "dynamic" + ], "host.architecture": [ "x64" ], diff --git a/systemtest/approvals/TestIntake/ErrorsTxID.approved.json b/systemtest/approvals/TestIntake/ErrorsTxID.approved.json index 79c6cd3834d..4f7f7a6ffce 100644 --- a/systemtest/approvals/TestIntake/ErrorsTxID.approved.json +++ b/systemtest/approvals/TestIntake/ErrorsTxID.approved.json @@ -78,6 +78,9 @@ "error.log.param_message": [ "Request method 'POST' /events/:event not supported" ], + "event.ingested": [ + "dynamic" + ], "host.architecture": [ "amd64" ], diff --git a/systemtest/approvals/TestIntake/Events.approved.json b/systemtest/approvals/TestIntake/Events.approved.json index 9ccf5a3a4be..d5577447912 100644 --- a/systemtest/approvals/TestIntake/Events.approved.json +++ b/systemtest/approvals/TestIntake/Events.approved.json @@ -81,6 +81,9 @@ "error.log.param_message": [ "Request method 'POST' /events/:event not supported" ], + "event.ingested": [ + "dynamic" + ], "host.architecture": [ "amd64" ], @@ -340,6 +343,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "host.architecture": [ "amd64" ], @@ -522,6 +528,9 @@ "data_stream.type": [ "traces" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "success" ], @@ -772,6 +781,9 @@ "data_stream.type": [ "traces" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "success" ], diff --git a/systemtest/approvals/TestIntake/Metricsets.approved.json b/systemtest/approvals/TestIntake/Metricsets.approved.json index e2e0622a7dd..c2b6e1d06e9 100644 --- a/systemtest/approvals/TestIntake/Metricsets.approved.json +++ b/systemtest/approvals/TestIntake/Metricsets.approved.json @@ -24,6 +24,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "go.memstats.heap.sys.bytes": [ 6520832 ], @@ -113,6 +116,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "host.ip": [ "127.0.0.1" ], @@ -205,6 +211,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "host.ip": [ "127.0.0.1" ], @@ -315,6 +324,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "host.ip": [ "127.0.0.1" ], @@ -415,6 +427,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "faas.billed_duration": [ 183 ], @@ -528,6 +543,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "host.ip": [ "127.0.0.1" ], diff --git a/systemtest/approvals/TestIntake/MinimalEvents.approved.json b/systemtest/approvals/TestIntake/MinimalEvents.approved.json index 838dcb8a7ac..7e6c5600de1 100644 --- a/systemtest/approvals/TestIntake/MinimalEvents.approved.json +++ b/systemtest/approvals/TestIntake/MinimalEvents.approved.json @@ -36,6 +36,9 @@ "error.log.message": [ "error log message" ], + "event.ingested": [ + "dynamic" + ], "host.ip": [ "127.0.0.1" ], @@ -98,6 +101,9 @@ "error.id": [ "abcdef0123456790" ], + "event.ingested": [ + "dynamic" + ], "host.ip": [ "127.0.0.1" ], @@ -157,6 +163,9 @@ "error.id": [ "abcdef0123456791" ], + "event.ingested": [ + "dynamic" + ], "host.ip": [ "127.0.0.1" ], @@ -207,6 +216,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "host.ip": [ "127.0.0.1" ], @@ -257,6 +269,9 @@ "data_stream.type": [ "traces" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "unknown" ], @@ -331,6 +346,9 @@ "data_stream.type": [ "traces" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "unknown" ], @@ -405,6 +423,9 @@ "data_stream.type": [ "traces" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "unknown" ], diff --git a/systemtest/approvals/TestIntake/Spans.approved.json b/systemtest/approvals/TestIntake/Spans.approved.json index 8de4e79fb7e..eaa68599a5d 100644 --- a/systemtest/approvals/TestIntake/Spans.approved.json +++ b/systemtest/approvals/TestIntake/Spans.approved.json @@ -84,6 +84,9 @@ "destination.port": [ 5432 ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "success" ], @@ -387,6 +390,9 @@ "data_stream.type": [ "traces" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "unknown" ], @@ -627,6 +633,9 @@ "data_stream.type": [ "traces" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "unknown" ], @@ -873,6 +882,9 @@ "data_stream.type": [ "traces" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "unknown" ], @@ -1107,6 +1119,9 @@ "data_stream.type": [ "traces" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "success" ], @@ -1371,6 +1386,9 @@ "destination.port": [ 5432 ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "success" ], @@ -1680,6 +1698,9 @@ "destination.ip": [ "::1" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "unknown" ], @@ -1935,6 +1956,9 @@ "data_stream.type": [ "traces" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "success" ], @@ -2187,6 +2211,9 @@ "destination.port": [ 8080 ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "success" ], @@ -2463,6 +2490,9 @@ "destination.port": [ 5432 ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "success" ], diff --git a/systemtest/approvals/TestIntake/Transactions.approved.json b/systemtest/approvals/TestIntake/Transactions.approved.json index 65368d51fe4..9ba058a9f91 100644 --- a/systemtest/approvals/TestIntake/Transactions.approved.json +++ b/systemtest/approvals/TestIntake/Transactions.approved.json @@ -72,6 +72,9 @@ "data_stream.type": [ "traces" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "unknown" ], @@ -340,6 +343,9 @@ "data_stream.type": [ "traces" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "success" ], @@ -603,6 +609,9 @@ "data_stream.type": [ "traces" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "success" ], @@ -981,6 +990,9 @@ "data_stream.type": [ "traces" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "unknown" ], @@ -1263,6 +1275,9 @@ "data_stream.type": [ "traces" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "unknown" ], diff --git a/systemtest/approvals/TestIntake/TransactionsHugeTraces.approved.json b/systemtest/approvals/TestIntake/TransactionsHugeTraces.approved.json index 8507cd1c33f..5886918e61b 100644 --- a/systemtest/approvals/TestIntake/TransactionsHugeTraces.approved.json +++ b/systemtest/approvals/TestIntake/TransactionsHugeTraces.approved.json @@ -87,6 +87,9 @@ "data_stream.type": [ "traces" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "success" ], diff --git a/systemtest/approvals/TestIntake/UnknownSpanType.approved.json b/systemtest/approvals/TestIntake/UnknownSpanType.approved.json index 5f32c256529..e0becb73bd2 100644 --- a/systemtest/approvals/TestIntake/UnknownSpanType.approved.json +++ b/systemtest/approvals/TestIntake/UnknownSpanType.approved.json @@ -24,6 +24,9 @@ "data_stream.type": [ "traces" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "success" ], @@ -225,6 +228,9 @@ "data_stream.type": [ "traces" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "success" ], diff --git a/systemtest/approvals/TestIntakeLog/with_faas.approved.json b/systemtest/approvals/TestIntakeLog/with_faas.approved.json index 0ad648c5e2e..8ffd2f8e3bb 100644 --- a/systemtest/approvals/TestIntakeLog/with_faas.approved.json +++ b/systemtest/approvals/TestIntakeLog/with_faas.approved.json @@ -30,6 +30,9 @@ "data_stream.type": [ "logs" ], + "event.ingested": [ + "dynamic" + ], "event.kind": [ "event" ], diff --git a/systemtest/approvals/TestIntakeLog/with_flat_ecs_fields.approved.json b/systemtest/approvals/TestIntakeLog/with_flat_ecs_fields.approved.json index 6b64465c20e..7795b94ea8b 100644 --- a/systemtest/approvals/TestIntakeLog/with_flat_ecs_fields.approved.json +++ b/systemtest/approvals/TestIntakeLog/with_flat_ecs_fields.approved.json @@ -33,6 +33,9 @@ "event.dataset": [ "accesslog" ], + "event.ingested": [ + "dynamic" + ], "event.kind": [ "event" ], diff --git a/systemtest/approvals/TestIntakeLog/with_nested_ecs_fields.approved.json b/systemtest/approvals/TestIntakeLog/with_nested_ecs_fields.approved.json index 2371bb723f8..08088eda720 100644 --- a/systemtest/approvals/TestIntakeLog/with_nested_ecs_fields.approved.json +++ b/systemtest/approvals/TestIntakeLog/with_nested_ecs_fields.approved.json @@ -33,6 +33,9 @@ "event.dataset": [ "accesslog" ], + "event.ingested": [ + "dynamic" + ], "event.kind": [ "event" ], diff --git a/systemtest/approvals/TestIntakeLog/with_nested_ecs_fields_overrides_flat_fields.approved.json b/systemtest/approvals/TestIntakeLog/with_nested_ecs_fields_overrides_flat_fields.approved.json index d75e63da7a7..296870269cb 100644 --- a/systemtest/approvals/TestIntakeLog/with_nested_ecs_fields_overrides_flat_fields.approved.json +++ b/systemtest/approvals/TestIntakeLog/with_nested_ecs_fields_overrides_flat_fields.approved.json @@ -33,6 +33,9 @@ "event.dataset": [ "accesslog" ], + "event.ingested": [ + "dynamic" + ], "event.kind": [ "event" ], diff --git a/systemtest/approvals/TestIntakeLog/with_timestamp.approved.json b/systemtest/approvals/TestIntakeLog/with_timestamp.approved.json index be07910b78b..3ed098ceb0e 100644 --- a/systemtest/approvals/TestIntakeLog/with_timestamp.approved.json +++ b/systemtest/approvals/TestIntakeLog/with_timestamp.approved.json @@ -30,6 +30,9 @@ "data_stream.type": [ "logs" ], + "event.ingested": [ + "dynamic" + ], "event.kind": [ "event" ], diff --git a/systemtest/approvals/TestIntakeLog/with_timestamp_as_str.approved.json b/systemtest/approvals/TestIntakeLog/with_timestamp_as_str.approved.json index 18871753bdb..cd34f55b82f 100644 --- a/systemtest/approvals/TestIntakeLog/with_timestamp_as_str.approved.json +++ b/systemtest/approvals/TestIntakeLog/with_timestamp_as_str.approved.json @@ -30,6 +30,9 @@ "data_stream.type": [ "logs" ], + "event.ingested": [ + "dynamic" + ], "event.kind": [ "event" ], diff --git a/systemtest/approvals/TestIntakeLog/without_timestamp.approved.json b/systemtest/approvals/TestIntakeLog/without_timestamp.approved.json index 24f22e3a21c..fc510b2a794 100644 --- a/systemtest/approvals/TestIntakeLog/without_timestamp.approved.json +++ b/systemtest/approvals/TestIntakeLog/without_timestamp.approved.json @@ -30,6 +30,9 @@ "data_stream.type": [ "logs" ], + "event.ingested": [ + "dynamic" + ], "event.kind": [ "event" ], diff --git a/systemtest/approvals/TestJaeger/batch_0.approved.json b/systemtest/approvals/TestJaeger/batch_0.approved.json index 61880ba7325..233c47a9348 100644 --- a/systemtest/approvals/TestJaeger/batch_0.approved.json +++ b/systemtest/approvals/TestJaeger/batch_0.approved.json @@ -39,6 +39,9 @@ "error.log.message": [ "Retrying GetDriver after error" ], + "event.ingested": [ + "dynamic" + ], "host.hostname": [ "host01" ], @@ -146,6 +149,9 @@ "error.log.message": [ "Retrying GetDriver after error" ], + "event.ingested": [ + "dynamic" + ], "host.hostname": [ "host01" ], @@ -253,6 +259,9 @@ "error.log.message": [ "Retrying GetDriver after error" ], + "event.ingested": [ + "dynamic" + ], "host.hostname": [ "host01" ], @@ -345,6 +354,9 @@ "data_stream.type": [ "logs" ], + "event.ingested": [ + "dynamic" + ], "event.kind": [ "event" ], @@ -431,6 +443,9 @@ "data_stream.type": [ "logs" ], + "event.ingested": [ + "dynamic" + ], "event.kind": [ "event" ], @@ -517,6 +532,9 @@ "data_stream.type": [ "logs" ], + "event.ingested": [ + "dynamic" + ], "event.kind": [ "event" ], @@ -603,6 +621,9 @@ "data_stream.type": [ "traces" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "success" ], diff --git a/systemtest/approvals/TestJaeger/batch_1.approved.json b/systemtest/approvals/TestJaeger/batch_1.approved.json index a0ec63bef0a..924857619d3 100644 --- a/systemtest/approvals/TestJaeger/batch_1.approved.json +++ b/systemtest/approvals/TestJaeger/batch_1.approved.json @@ -39,6 +39,9 @@ "error.log.message": [ "redis timeout" ], + "event.ingested": [ + "dynamic" + ], "host.hostname": [ "host01" ], @@ -137,6 +140,9 @@ "error.log.message": [ "redis timeout" ], + "event.ingested": [ + "dynamic" + ], "host.hostname": [ "host01" ], @@ -235,6 +241,9 @@ "error.log.message": [ "redis timeout" ], + "event.ingested": [ + "dynamic" + ], "host.hostname": [ "host01" ], @@ -318,6 +327,9 @@ "data_stream.type": [ "logs" ], + "event.ingested": [ + "dynamic" + ], "event.kind": [ "event" ], @@ -398,6 +410,9 @@ "data_stream.type": [ "traces" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "failure" ], @@ -502,6 +517,9 @@ "data_stream.type": [ "traces" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "success" ], @@ -606,6 +624,9 @@ "data_stream.type": [ "traces" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "success" ], @@ -710,6 +731,9 @@ "data_stream.type": [ "traces" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "success" ], @@ -814,6 +838,9 @@ "data_stream.type": [ "traces" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "failure" ], @@ -918,6 +945,9 @@ "data_stream.type": [ "traces" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "success" ], @@ -1022,6 +1052,9 @@ "data_stream.type": [ "traces" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "failure" ], @@ -1126,6 +1159,9 @@ "data_stream.type": [ "traces" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "success" ], @@ -1230,6 +1266,9 @@ "data_stream.type": [ "traces" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "success" ], @@ -1334,6 +1373,9 @@ "data_stream.type": [ "traces" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "success" ], @@ -1438,6 +1480,9 @@ "data_stream.type": [ "traces" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "success" ], @@ -1542,6 +1587,9 @@ "data_stream.type": [ "traces" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "success" ], @@ -1646,6 +1694,9 @@ "data_stream.type": [ "traces" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "success" ], @@ -1750,6 +1801,9 @@ "data_stream.type": [ "traces" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "success" ], diff --git a/systemtest/approvals/TestNoMatchingSourcemap.approved.json b/systemtest/approvals/TestNoMatchingSourcemap.approved.json index deab65b210c..8bafe6f83e7 100644 --- a/systemtest/approvals/TestNoMatchingSourcemap.approved.json +++ b/systemtest/approvals/TestNoMatchingSourcemap.approved.json @@ -24,6 +24,9 @@ "data_stream.type": [ "traces" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "unknown" ], diff --git a/systemtest/approvals/TestOTLPGRPCLogs.approved.json b/systemtest/approvals/TestOTLPGRPCLogs.approved.json index 13ca1da74f9..83f96a5ac48 100644 --- a/systemtest/approvals/TestOTLPGRPCLogs.approved.json +++ b/systemtest/approvals/TestOTLPGRPCLogs.approved.json @@ -21,6 +21,9 @@ "data_stream.type": [ "logs" ], + "event.ingested": [ + "dynamic" + ], "event.severity": [ 9 ], diff --git a/systemtest/approvals/TestOTLPGRPCLogsClientIP.approved.json b/systemtest/approvals/TestOTLPGRPCLogsClientIP.approved.json index b7294fb9d0e..ecc8a3ae627 100644 --- a/systemtest/approvals/TestOTLPGRPCLogsClientIP.approved.json +++ b/systemtest/approvals/TestOTLPGRPCLogsClientIP.approved.json @@ -36,6 +36,9 @@ "data_stream.type": [ "logs" ], + "event.ingested": [ + "dynamic" + ], "event.severity": [ 9 ], diff --git a/systemtest/approvals/TestOTLPGRPCMetrics_counter.approved.json b/systemtest/approvals/TestOTLPGRPCMetrics_counter.approved.json index 94092eb2af2..c70ec45a022 100644 --- a/systemtest/approvals/TestOTLPGRPCMetrics_counter.approved.json +++ b/systemtest/approvals/TestOTLPGRPCMetrics_counter.approved.json @@ -24,6 +24,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "metricset.name": [ "app" ], diff --git a/systemtest/approvals/TestOTLPGRPCMetrics_histogram.approved.json b/systemtest/approvals/TestOTLPGRPCMetrics_histogram.approved.json index f5d0b69e636..ea0fee8fbe1 100644 --- a/systemtest/approvals/TestOTLPGRPCMetrics_histogram.approved.json +++ b/systemtest/approvals/TestOTLPGRPCMetrics_histogram.approved.json @@ -21,6 +21,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "histogram": [ { "counts": [ diff --git a/systemtest/approvals/TestOTLPGRPCMetrics_summary.approved.json b/systemtest/approvals/TestOTLPGRPCMetrics_summary.approved.json index 74331909ff3..f48467058f1 100644 --- a/systemtest/approvals/TestOTLPGRPCMetrics_summary.approved.json +++ b/systemtest/approvals/TestOTLPGRPCMetrics_summary.approved.json @@ -21,6 +21,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "metricset.name": [ "app" ], diff --git a/systemtest/approvals/TestOTLPGRPCTraces.approved.json b/systemtest/approvals/TestOTLPGRPCTraces.approved.json index cbff9278129..183980c4c42 100644 --- a/systemtest/approvals/TestOTLPGRPCTraces.approved.json +++ b/systemtest/approvals/TestOTLPGRPCTraces.approved.json @@ -45,6 +45,9 @@ "error.stack_trace.text": [ "not an actual real stack trace" ], + "event.ingested": [ + "dynamic" + ], "labels.resource_attribute_array": [ "a", "b" @@ -143,6 +146,9 @@ "data_stream.type": [ "logs" ], + "event.ingested": [ + "dynamic" + ], "event.kind": [ "event" ], @@ -229,6 +235,9 @@ "data_stream.type": [ "traces" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "success" ], diff --git a/systemtest/approvals/TestRUMErrorSourcemapping/absolute_bundle_filepath/standalone.approved.json b/systemtest/approvals/TestRUMErrorSourcemapping/absolute_bundle_filepath/standalone.approved.json index 7a25a9756a6..73e5d03c1db 100644 --- a/systemtest/approvals/TestRUMErrorSourcemapping/absolute_bundle_filepath/standalone.approved.json +++ b/systemtest/approvals/TestRUMErrorSourcemapping/absolute_bundle_filepath/standalone.approved.json @@ -48,6 +48,9 @@ "error.log.message": [ "Uncaught Error: log timeout test error" ], + "event.ingested": [ + "dynamic" + ], "http.request.referrer": [ "http://localhost:8000/test/e2e/" ], diff --git a/systemtest/approvals/TestRUMErrorSourcemapping/relative_bundle_filepath/standalone.approved.json b/systemtest/approvals/TestRUMErrorSourcemapping/relative_bundle_filepath/standalone.approved.json index 7a25a9756a6..73e5d03c1db 100644 --- a/systemtest/approvals/TestRUMErrorSourcemapping/relative_bundle_filepath/standalone.approved.json +++ b/systemtest/approvals/TestRUMErrorSourcemapping/relative_bundle_filepath/standalone.approved.json @@ -48,6 +48,9 @@ "error.log.message": [ "Uncaught Error: log timeout test error" ], + "event.ingested": [ + "dynamic" + ], "http.request.referrer": [ "http://localhost:8000/test/e2e/" ], diff --git a/systemtest/approvals/TestRUMRoutingIntegration.approved.json b/systemtest/approvals/TestRUMRoutingIntegration.approved.json index f65562fbe8a..d7d4cc3e97c 100644 --- a/systemtest/approvals/TestRUMRoutingIntegration.approved.json +++ b/systemtest/approvals/TestRUMRoutingIntegration.approved.json @@ -30,6 +30,9 @@ "destination.port": [ 8003 ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "success" ], @@ -221,6 +224,9 @@ "destination.port": [ 8000 ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "success" ], @@ -406,6 +412,9 @@ "data_stream.type": [ "traces" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "unknown" ], @@ -564,6 +573,9 @@ "destination.port": [ 8003 ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "success" ], @@ -752,6 +764,9 @@ "data_stream.type": [ "traces" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "unknown" ], @@ -907,6 +922,9 @@ "data_stream.type": [ "traces" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "success" ], @@ -1071,6 +1089,9 @@ "destination.port": [ 8000 ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "unknown" ], @@ -1253,6 +1274,9 @@ "data_stream.type": [ "traces" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "unknown" ], @@ -1408,6 +1432,9 @@ "data_stream.type": [ "traces" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "success" ], diff --git a/systemtest/approvals/TestRUMSpanSourcemapping.approved.json b/systemtest/approvals/TestRUMSpanSourcemapping.approved.json index deab65b210c..8bafe6f83e7 100644 --- a/systemtest/approvals/TestRUMSpanSourcemapping.approved.json +++ b/systemtest/approvals/TestRUMSpanSourcemapping.approved.json @@ -24,6 +24,9 @@ "data_stream.type": [ "traces" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "unknown" ], diff --git a/systemtest/approvals/TestRUMXForwardedFor.approved.json b/systemtest/approvals/TestRUMXForwardedFor.approved.json index f1b96a8c854..a6157395a47 100644 --- a/systemtest/approvals/TestRUMXForwardedFor.approved.json +++ b/systemtest/approvals/TestRUMXForwardedFor.approved.json @@ -45,6 +45,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "metricset.name": [ "span_breakdown" ], @@ -164,6 +167,9 @@ "data_stream.type": [ "traces" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "unknown" ], diff --git a/systemtest/approvals/TestServiceDestinationAggregation.approved.json b/systemtest/approvals/TestServiceDestinationAggregation.approved.json index 3f8b3010a31..80653609a45 100644 --- a/systemtest/approvals/TestServiceDestinationAggregation.approved.json +++ b/systemtest/approvals/TestServiceDestinationAggregation.approved.json @@ -18,6 +18,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "success" ], @@ -98,6 +101,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "success" ], @@ -178,6 +184,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "success" ], diff --git a/systemtest/approvals/TestServiceSummaryMetricsAggregation.approved.json b/systemtest/approvals/TestServiceSummaryMetricsAggregation.approved.json index c9997c600af..ad8a26bd365 100644 --- a/systemtest/approvals/TestServiceSummaryMetricsAggregation.approved.json +++ b/systemtest/approvals/TestServiceSummaryMetricsAggregation.approved.json @@ -18,6 +18,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "metricset.interval": [ "10m" ], @@ -68,6 +71,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "metricset.interval": [ "1m" ], @@ -118,6 +124,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "metricset.interval": [ "60m" ], diff --git a/systemtest/approvals/TestServiceSummaryMetricsAggregationOverflow.approved.json b/systemtest/approvals/TestServiceSummaryMetricsAggregationOverflow.approved.json index 90e3d2be8ab..3efc3233948 100644 --- a/systemtest/approvals/TestServiceSummaryMetricsAggregationOverflow.approved.json +++ b/systemtest/approvals/TestServiceSummaryMetricsAggregationOverflow.approved.json @@ -12,6 +12,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "metricset.interval": [ "10m" ], @@ -53,6 +56,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "metricset.interval": [ "1m" ], @@ -94,6 +100,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "metricset.interval": [ "60m" ], @@ -141,6 +150,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "metricset.interval": [ "10m" ], @@ -194,6 +206,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "metricset.interval": [ "1m" ], @@ -247,6 +262,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "metricset.interval": [ "60m" ], @@ -300,6 +318,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "metricset.interval": [ "10m" ], @@ -353,6 +374,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "metricset.interval": [ "1m" ], @@ -406,6 +430,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "metricset.interval": [ "60m" ], diff --git a/systemtest/approvals/TestServiceTransactionMetricsAggregation.approved.json b/systemtest/approvals/TestServiceTransactionMetricsAggregation.approved.json index c09b5be6abb..ee853b00e10 100644 --- a/systemtest/approvals/TestServiceTransactionMetricsAggregation.approved.json +++ b/systemtest/approvals/TestServiceTransactionMetricsAggregation.approved.json @@ -18,6 +18,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "event.success_count": [ { "sum": 2, @@ -93,6 +96,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "event.success_count": [ { "sum": 2, @@ -168,6 +174,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "event.success_count": [ { "sum": 2, @@ -243,6 +252,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "event.success_count": [ { "sum": 2, @@ -318,6 +330,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "event.success_count": [ { "sum": 2, @@ -393,6 +408,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "event.success_count": [ { "sum": 2, diff --git a/systemtest/approvals/TestTransactionAggregation.approved.json b/systemtest/approvals/TestTransactionAggregation.approved.json index 1c9107c47ae..b2a7f7e304b 100644 --- a/systemtest/approvals/TestTransactionAggregation.approved.json +++ b/systemtest/approvals/TestTransactionAggregation.approved.json @@ -18,6 +18,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "success" ], @@ -135,6 +138,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "success" ], @@ -252,6 +258,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "success" ], @@ -369,6 +378,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "success" ], @@ -486,6 +498,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "success" ], @@ -603,6 +618,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "success" ], @@ -759,6 +777,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "unknown" ], @@ -936,6 +957,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "unknown" ], @@ -1113,6 +1137,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "unknown" ], diff --git a/systemtest/approvals/TestTransactionAggregationShutdown.approved.json b/systemtest/approvals/TestTransactionAggregationShutdown.approved.json index 163880e72bc..73b12fe76d7 100644 --- a/systemtest/approvals/TestTransactionAggregationShutdown.approved.json +++ b/systemtest/approvals/TestTransactionAggregationShutdown.approved.json @@ -18,6 +18,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "success" ], @@ -135,6 +138,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "success" ], @@ -252,6 +258,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "success" ], diff --git a/systemtest/approvals/TestTransactionDroppedSpansStatsMetrics.approved.json b/systemtest/approvals/TestTransactionDroppedSpansStatsMetrics.approved.json index 33382beded6..81ee9ff4a20 100644 --- a/systemtest/approvals/TestTransactionDroppedSpansStatsMetrics.approved.json +++ b/systemtest/approvals/TestTransactionDroppedSpansStatsMetrics.approved.json @@ -18,6 +18,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "success" ], @@ -83,6 +86,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "success" ], @@ -148,6 +154,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "success" ], @@ -213,6 +222,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "success" ], @@ -278,6 +290,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "success" ], @@ -343,6 +358,9 @@ "data_stream.type": [ "metrics" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "success" ], diff --git a/systemtest/approvals/TestTransactionDroppedSpansStatsTransaction.approved.json b/systemtest/approvals/TestTransactionDroppedSpansStatsTransaction.approved.json index 84bb0883fa6..6e900903e6f 100644 --- a/systemtest/approvals/TestTransactionDroppedSpansStatsTransaction.approved.json +++ b/systemtest/approvals/TestTransactionDroppedSpansStatsTransaction.approved.json @@ -21,6 +21,9 @@ "data_stream.type": [ "traces" ], + "event.ingested": [ + "dynamic" + ], "event.outcome": [ "success" ], diff --git a/testing/infra/k8s/base/stack/apm-server.yaml b/testing/infra/k8s/base/stack/apm-server.yaml index cab2f2fdf5a..089cd7314a9 100644 --- a/testing/infra/k8s/base/stack/apm-server.yaml +++ b/testing/infra/k8s/base/stack/apm-server.yaml @@ -3,7 +3,7 @@ kind: ApmServer metadata: name: apm-server spec: - version: 8.17.1-2fc1da84-SNAPSHOT + version: 8.17.1-974cd5da-SNAPSHOT count: 1 http: tls: diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml index 24997cec39e..86bd59d924e 100644 --- a/testing/infra/k8s/base/stack/elasticsearch.yaml +++ b/testing/infra/k8s/base/stack/elasticsearch.yaml @@ -3,7 +3,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 8.17.1-2fc1da84-SNAPSHOT + version: 8.17.1-974cd5da-SNAPSHOT auth: fileRealm: - secretName: elasticsearch-admin diff --git a/testing/infra/k8s/base/stack/kibana.yaml b/testing/infra/k8s/base/stack/kibana.yaml index 716f7abbd62..6dc0a4a7f0a 100644 --- a/testing/infra/k8s/base/stack/kibana.yaml +++ b/testing/infra/k8s/base/stack/kibana.yaml @@ -3,7 +3,7 @@ kind: Kibana metadata: name: kibana spec: - version: 8.17.1-2fc1da84-SNAPSHOT + version: 8.17.1-974cd5da-SNAPSHOT count: 1 elasticsearchRef: name: elasticsearch