From 671e922d8cd02bd94abd30bbd7a978ea0bc85bc4 Mon Sep 17 00:00:00 2001 From: "elastic-observability-automation[bot]" <180520183+elastic-observability-automation[bot]@users.noreply.github.com> Date: Mon, 23 Sep 2024 11:23:20 +0000 Subject: [PATCH] [updatecli] Bump elastic stack version to 9.0.0-1c009f6c (#14131) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update docker-compose.yml Made with ❤️️ by updatecli * Update approvals Signed-off-by: Marc Lopez Rubio --------- Signed-off-by: Marc Lopez Rubio Co-authored-by: elastic-observability-automation[bot] <180520183+elastic-observability-automation[bot]@users.noreply.github.com> Co-authored-by: Marc Lopez Rubio --- docker-compose.yml | 6 +-- .../approvals/TestIntake/Errors.approved.json | 20 +++------- .../TestIntake/ErrorsTxID.approved.json | 20 +++------- .../approvals/TestIntake/Events.approved.json | 40 +++++-------------- .../TestIntake/Transactions.approved.json | 16 ++------ .../TransactionsHugeTraces.approved.json | 16 ++------ .../TestIntake/UnknownSpanType.approved.json | 20 +++------- .../TestRUMRoutingIntegration.approved.json | 8 +--- 8 files changed, 38 insertions(+), 108 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index c905fe39b8..ea2ec6e6be 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ x-logging: &default-logging services: elasticsearch: # TODO: replace with a pinned version such as 9.0.0-aaaaaaaa-SNAPSHOT - image: docker.elastic.co/elasticsearch/elasticsearch:9.0.0-d56464e5-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:9.0.0-1c009f6c-SNAPSHOT ports: - 9200:9200 healthcheck: @@ -43,7 +43,7 @@ services: kibana: # TODO: replace with a pinned version such as 9.0.0-aaaaaaaa-SNAPSHOT - image: docker.elastic.co/kibana/kibana:9.0.0-d56464e5-SNAPSHOT + image: docker.elastic.co/kibana/kibana:9.0.0-1c009f6c-SNAPSHOT ports: - 5601:5601 healthcheck: @@ -63,7 +63,7 @@ services: metricbeat: # TODO: replace with a pinned version such as 9.0.0-aaaaaaaa-SNAPSHOT - image: docker.elastic.co/beats/metricbeat:9.0.0-d56464e5-SNAPSHOT + image: docker.elastic.co/beats/metricbeat:9.0.0-1c009f6c-SNAPSHOT environment: ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]' ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}" diff --git a/systemtest/approvals/TestIntake/Errors.approved.json b/systemtest/approvals/TestIntake/Errors.approved.json index f34d403c73..3e1e159693 100644 --- a/systemtest/approvals/TestIntake/Errors.approved.json +++ b/systemtest/approvals/TestIntake/Errors.approved.json @@ -169,18 +169,10 @@ "bar", "baz" ], - "Content-Type": [ - "text/html" - ], - "Cookie": [ - "c1=v1,c2=v2" - ], - "Some-Other-Header": [ - "foo" - ], - "User-Agent": [ - "Mozilla Chrome Edge" - ] + "Content-Type": "text/html", + "Cookie": "c1=v1,c2=v2", + "Some-Other-Header": "foo", + "User-Agent": "Mozilla Chrome Edge" } ], "http.request.method": [ @@ -194,9 +186,7 @@ ], "http.response.headers": [ { - "Content-Type": [ - "application/json" - ] + "Content-Type": "application/json" } ], "http.response.headers_sent": [ diff --git a/systemtest/approvals/TestIntake/ErrorsTxID.approved.json b/systemtest/approvals/TestIntake/ErrorsTxID.approved.json index dc21fa8e33..79c6cd3834 100644 --- a/systemtest/approvals/TestIntake/ErrorsTxID.approved.json +++ b/systemtest/approvals/TestIntake/ErrorsTxID.approved.json @@ -104,22 +104,14 @@ ], "http.request.headers": [ { - "Content-Length": [ - "0" - ], + "Content-Length": "0", "Cookie": [ "c1=v1", "c2=v2" ], - "Elastic-Apm-Traceparent": [ - "00-8c21b4b556467a0b17ae5da959b5f388-31301f1fb2998121-01" - ], - "Forwarded": [ - "for=192.168.0.1" - ], - "Host": [ - "opbeans-java:3000" - ] + "Elastic-Apm-Traceparent": "00-8c21b4b556467a0b17ae5da959b5f388-31301f1fb2998121-01", + "Forwarded": "for=192.168.0.1", + "Host": "opbeans-java:3000" } ], "http.request.method": [ @@ -130,9 +122,7 @@ ], "http.response.headers": [ { - "Content-Type": [ - "application/json" - ] + "Content-Type": "application/json" } ], "http.response.headers_sent": [ diff --git a/systemtest/approvals/TestIntake/Events.approved.json b/systemtest/approvals/TestIntake/Events.approved.json index e1d4848c82..9ccf5a3a4b 100644 --- a/systemtest/approvals/TestIntake/Events.approved.json +++ b/systemtest/approvals/TestIntake/Events.approved.json @@ -107,22 +107,14 @@ ], "http.request.headers": [ { - "Content-Length": [ - "0" - ], + "Content-Length": "0", "Cookie": [ "c1=v1", "c2=v2" ], - "Elastic-Apm-Traceparent": [ - "00-8c21b4b556467a0b17ae5da959b5f388-31301f1fb2998121-01" - ], - "Forwarded": [ - "for=192.168.0.1" - ], - "Host": [ - "opbeans-java:3000" - ] + "Elastic-Apm-Traceparent": "00-8c21b4b556467a0b17ae5da959b5f388-31301f1fb2998121-01", + "Forwarded": "for=192.168.0.1", + "Host": "opbeans-java:3000" } ], "http.request.method": [ @@ -133,9 +125,7 @@ ], "http.response.headers": [ { - "Content-Type": [ - "application/json" - ] + "Content-Type": "application/json" } ], "http.response.headers_sent": [ @@ -567,9 +557,7 @@ ], "http.response.headers": [ { - "Content-Type": [ - "application/json" - ] + "Content-Type": "application/json" } ], "http.response.status_code": [ @@ -816,15 +804,9 @@ ], "http.request.headers": [ { - "Content-Type": [ - "text/html" - ], - "Cookie": [ - "c1=v1,c2=v2" - ], - "Elastic-Apm-Traceparent": [ - "00-33a0bd4cceff0370a7c57d807032688e-69feaabc5b88d7e8-01" - ], + "Content-Type": "text/html", + "Cookie": "c1=v1,c2=v2", + "Elastic-Apm-Traceparent": "00-33a0bd4cceff0370a7c57d807032688e-69feaabc5b88d7e8-01", "User-Agent": [ "Mozilla/5.0(Macintosh;IntelMacOSX10_10_5)AppleWebKit/537.36(KHTML,likeGecko)Chrome/51.0.2704.103Safari/537.36", "MozillaChromeEdge" @@ -845,9 +827,7 @@ ], "http.response.headers": [ { - "Content-Type": [ - "application/json" - ] + "Content-Type": "application/json" } ], "http.response.headers_sent": [ diff --git a/systemtest/approvals/TestIntake/Transactions.approved.json b/systemtest/approvals/TestIntake/Transactions.approved.json index d760321633..65368d51fe 100644 --- a/systemtest/approvals/TestIntake/Transactions.approved.json +++ b/systemtest/approvals/TestIntake/Transactions.approved.json @@ -640,15 +640,9 @@ "bar", "baz" ], - "Content-Type": [ - "text/html" - ], - "Cookie": [ - "c1=v1, c2=v2" - ], - "Some-Other-Header": [ - "foo" - ], + "Content-Type": "text/html", + "Cookie": "c1=v1, c2=v2", + "Some-Other-Header": "foo", "User-Agent": [ "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36", "Mozilla Chrome Edge" @@ -672,9 +666,7 @@ ], "http.response.headers": [ { - "Content-Type": [ - "application/json" - ] + "Content-Type": "application/json" } ], "http.response.headers_sent": [ diff --git a/systemtest/approvals/TestIntake/TransactionsHugeTraces.approved.json b/systemtest/approvals/TestIntake/TransactionsHugeTraces.approved.json index e37a512635..8507cd1c33 100644 --- a/systemtest/approvals/TestIntake/TransactionsHugeTraces.approved.json +++ b/systemtest/approvals/TestIntake/TransactionsHugeTraces.approved.json @@ -124,15 +124,9 @@ "bar", "baz" ], - "Content-Type": [ - "text/html" - ], - "Cookie": [ - "c1=v1, c2=v2" - ], - "Some-Other-Header": [ - "foo" - ], + "Content-Type": "text/html", + "Cookie": "c1=v1, c2=v2", + "Some-Other-Header": "foo", "User-Agent": [ "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36", "Mozilla Chrome Edge" @@ -156,9 +150,7 @@ ], "http.response.headers": [ { - "Content-Type": [ - "application/json" - ] + "Content-Type": "application/json" } ], "http.response.headers_sent": [ diff --git a/systemtest/approvals/TestIntake/UnknownSpanType.approved.json b/systemtest/approvals/TestIntake/UnknownSpanType.approved.json index 78b5df3636..5f32c25652 100644 --- a/systemtest/approvals/TestIntake/UnknownSpanType.approved.json +++ b/systemtest/approvals/TestIntake/UnknownSpanType.approved.json @@ -253,18 +253,10 @@ "bar", "baz" ], - "Content-Type": [ - "text/html" - ], - "Cookie": [ - "c1=v1,c2=v2" - ], - "Some-Other-Header": [ - "foo" - ], - "User-Agent": [ - "Mozilla Chrome Edge" - ] + "Content-Type": "text/html", + "Cookie": "c1=v1,c2=v2", + "Some-Other-Header": "foo", + "User-Agent": "Mozilla Chrome Edge" } ], "http.request.method": [ @@ -278,9 +270,7 @@ ], "http.response.headers": [ { - "Content-Type": [ - "application/json" - ] + "Content-Type": "application/json" } ], "http.response.headers_sent": [ diff --git a/systemtest/approvals/TestRUMRoutingIntegration.approved.json b/systemtest/approvals/TestRUMRoutingIntegration.approved.json index 4f3e5090cb..f65562fbe8 100644 --- a/systemtest/approvals/TestRUMRoutingIntegration.approved.json +++ b/systemtest/approvals/TestRUMRoutingIntegration.approved.json @@ -1416,9 +1416,7 @@ ], "http.request.headers": [ { - "Accept": [ - "application/json" - ] + "Accept": "application/json" } ], "http.request.method": [ @@ -1435,9 +1433,7 @@ ], "http.response.headers": [ { - "Content-Type": [ - "application/json" - ] + "Content-Type": "application/json" } ], "http.response.status_code": [