[updatecli] Bump elastic stack version to 8.11.3-dce3355e (#12168)

* chore: Update k8s stack yaml files Made with ❤️️ by updatecli * chore: Update docker-compose.yml Made with ❤️️ by updatecli * chore: Update k8s stack yaml files Made with ❤️️ by updatecli * chore: Update docker-compose.yml Made with ❤️️ by updatecli * chore: Update k8s stack yaml files Made with ❤️️ by updatecli * chore: Update docker-compose.yml Made with ❤️️ by updatecli * systemtest: Update approvals and ignore client.geo --------- Co-authored-by: apmmachine <[email protected]> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: Carson Ip <[email protected]>
elastic · Dec 13, 2023 · 5c658fd · 5c658fd
1 parent cba21e8
commit 5c658fd
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 11 deletions.
diff --git 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.11.2-9debce77-SNAPSHOT
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.11.3-dce3355e-SNAPSHOT
     ports:
       - 9200:9200
     healthcheck:
@@ -41,7 +41,7 @@ services:
     logging: *default-logging
 
   kibana:
-    image: docker.elastic.co/kibana/kibana:8.11.2-9debce77-SNAPSHOT
+    image: docker.elastic.co/kibana/kibana:8.11.3-dce3355e-SNAPSHOT
     ports:
       - 5601:5601
     healthcheck:
@@ -60,7 +60,7 @@ services:
     logging: *default-logging
 
   metricbeat:
-    image: docker.elastic.co/beats/metricbeat:8.11.2-9debce77-SNAPSHOT
+    image: docker.elastic.co/beats/metricbeat:8.11.3-dce3355e-SNAPSHOT
     environment:
       ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]'
       ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}"

diff --git a/systemtest/approvals/TestOTLPGRPCLogsClientIP.approved.json b/systemtest/approvals/TestOTLPGRPCLogsClientIP.approved.json
@@ -8,16 +8,13 @@
             },
             "client": {
                 "geo": {
-                    "city_name": "Berlin",
                     "continent_name": "Europe",
                     "country_iso_code": "DE",
                     "country_name": "Germany",
                     "location": {
                         "lat": "dynamic",
                         "lon": "dynamic"
-                    },
-                    "region_iso_code": "DE-BE",
-                    "region_name": "Land Berlin"
+                    }
                 },
                 "ip": "178.162.206.244"
             },

diff --git a/systemtest/otlp_test.go b/systemtest/otlp_test.go
@@ -478,7 +478,8 @@ func TestOTLPGRPCLogsClientIP(t *testing.T) {
 	require.NoError(t, err)
 
 	result := estest.ExpectDocs(t, systemtest.Elasticsearch, "logs-apm*", nil)
-	approvaltest.ApproveEvents(t, t.Name(), result.Hits.Hits, "client.geo.location.lat", "client.geo.location.lon")
+	approvaltest.ApproveEvents(t, t.Name(), result.Hits.Hits, "client.geo.city_name",
+		"client.geo.location.lat", "client.geo.location.lon", "client.geo.region_iso_code", "client.geo.region_name")
 }
 
 func newMobileLogs(body interface{}) plog.Logs {

diff --git 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.11.2-9debce77-SNAPSHOT
+  version: 8.11.3-dce3355e-SNAPSHOT
   count: 1
   http:
     tls:

diff --git 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.11.2-9debce77-SNAPSHOT
+  version: 8.11.3-dce3355e-SNAPSHOT
   auth:
     fileRealm:
       - secretName: elasticsearch-admin

diff --git 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.11.2-9debce77-SNAPSHOT
+  version: 8.11.3-dce3355e-SNAPSHOT
   count: 1
   elasticsearchRef:
     name: elasticsearch