Skip to content

Commit

Permalink
[updatecli] Bump elastic stack version to 9.0.0-1c009f6c (#14131)
Browse files Browse the repository at this point in the history 
* chore: Update docker-compose.yml

Made with ❤️️ by updatecli

* Update approvals

Signed-off-by: Marc Lopez Rubio <[email protected]>

---------

Signed-off-by: Marc Lopez Rubio <[email protected]>
Co-authored-by: elastic-observability-automation[bot] <180520183+elastic-observability-automation[bot]@users.noreply.github.com>
Co-authored-by: Marc Lopez Rubio <[email protected]>
  • Loading branch information
@elastic-observability-automation @marclop
elastic-observability-automation[bot] and marclop authored Sep 23, 2024
1 parent fa3219c commit 671e922
Show file tree
Hide file tree
Showing 8 changed files with 38 additions and 108 deletions.
6 changes: 3 additions & 3 deletions docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand All @@ -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}"
Expand Down
20 changes: 5 additions & 15 deletions systemtest/approvals/TestIntake/Errors.approved.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand All @@ -194,9 +186,7 @@
],
"http.response.headers": [
{
"Content-Type": [
"application/json"
]
"Content-Type": "application/json"
}
],
"http.response.headers_sent": [
Expand Down
20 changes: 5 additions & 15 deletions systemtest/approvals/TestIntake/ErrorsTxID.approved.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand All @@ -130,9 +122,7 @@
],
"http.response.headers": [
{
"Content-Type": [
"application/json"
]
"Content-Type": "application/json"
}
],
"http.response.headers_sent": [
Expand Down
40 changes: 10 additions & 30 deletions systemtest/approvals/TestIntake/Events.approved.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand All @@ -133,9 +125,7 @@
],
"http.response.headers": [
{
"Content-Type": [
"application/json"
]
"Content-Type": "application/json"
}
],
"http.response.headers_sent": [
Expand Down Expand Up @@ -567,9 +557,7 @@
],
"http.response.headers": [
{
"Content-Type": [
"application/json"
]
"Content-Type": "application/json"
}
],
"http.response.status_code": [
Expand Down Expand Up @@ -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"
Expand All @@ -845,9 +827,7 @@
],
"http.response.headers": [
{
"Content-Type": [
"application/json"
]
"Content-Type": "application/json"
}
],
"http.response.headers_sent": [
Expand Down
16 changes: 4 additions & 12 deletions systemtest/approvals/TestIntake/Transactions.approved.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -672,9 +666,7 @@
],
"http.response.headers": [
{
"Content-Type": [
"application/json"
]
"Content-Type": "application/json"
}
],
"http.response.headers_sent": [
Expand Down
16 changes: 4 additions & 12 deletions systemtest/approvals/TestIntake/TransactionsHugeTraces.approved.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -156,9 +150,7 @@
],
"http.response.headers": [
{
"Content-Type": [
"application/json"
]
"Content-Type": "application/json"
}
],
"http.response.headers_sent": [
Expand Down
20 changes: 5 additions & 15 deletions systemtest/approvals/TestIntake/UnknownSpanType.approved.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand All @@ -278,9 +270,7 @@
],
"http.response.headers": [
{
"Content-Type": [
"application/json"
]
"Content-Type": "application/json"
}
],
"http.response.headers_sent": [
Expand Down
8 changes: 2 additions & 6 deletions systemtest/approvals/TestRUMRoutingIntegration.approved.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1416,9 +1416,7 @@
],
"http.request.headers": [
{
"Accept": [
"application/json"
]
"Accept": "application/json"
}
],
"http.request.method": [
Expand All @@ -1435,9 +1433,7 @@
],
"http.response.headers": [
{
"Content-Type": [
"application/json"
]
"Content-Type": "application/json"
}
],
"http.response.status_code": [
Expand Down

0 comments on commit 671e922

Please sign in to comment.