Merge branch 'main' into perf/idle-max-request

elastic · Nov 13, 2023 · bd127ae · bd127ae
2 parents 20f07a8 + 3889c0e
commit bd127ae
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 21 deletions.
diff --git a/NOTICE.txt b/NOTICE.txt
@@ -573,11 +573,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected]
 
 --------------------------------------------------------------------------------
 Dependency : github.com/elastic/beats/v7
-Version: v7.0.0-alpha2.0.20231106191710-475eaf5784b4
+Version: v7.0.0-alpha2.0.20231113120716-9f93f932e9ae
 Licence type (autodetected): Elastic
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20231106191710-475eaf5784b4/LICENSE.txt:
+Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20231113120716-9f93f932e9ae/LICENSE.txt:
 
 Source code in this repository is variously licensed under the Apache License
 Version 2.0, an Apache compatible license, or the Elastic License. Outside of

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.12.0-0fcb9daf-SNAPSHOT
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.12.0-9a986274-SNAPSHOT
     ports:
       - 9200:9200
     healthcheck:
@@ -41,7 +41,7 @@ services:
     logging: *default-logging
 
   kibana:
-    image: docker.elastic.co/kibana/kibana:8.12.0-0fcb9daf-SNAPSHOT
+    image: docker.elastic.co/kibana/kibana:8.12.0-9a986274-SNAPSHOT
     ports:
       - 5601:5601
     healthcheck:
@@ -60,7 +60,7 @@ services:
     logging: *default-logging
 
   metricbeat:
-    image: docker.elastic.co/beats/metricbeat:8.12.0-0fcb9daf-SNAPSHOT
+    image: docker.elastic.co/beats/metricbeat:8.12.0-9a986274-SNAPSHOT
     environment:
       ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]'
       ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}"

diff --git a/go.mod b/go.mod
@@ -10,7 +10,7 @@ require (
 	github.com/dustin/go-humanize v1.0.1
 	github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6
 	github.com/elastic/apm-data v0.1.1-0.20231019084040-a0f7950e9775
-	github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231106191710-475eaf5784b4
+	github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231113120716-9f93f932e9ae
 	github.com/elastic/elastic-agent-client/v7 v7.4.0
 	github.com/elastic/elastic-agent-libs v0.6.2
 	github.com/elastic/elastic-agent-system-metrics v0.7.0

diff --git a/go.sum b/go.sum
@@ -134,8 +134,8 @@ github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 h1:Js+C3HE
 github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6/go.mod h1:ba3gaJCuhxXN/O5AuiI56xxd6DukQdVOK0NfpzBntNo=
 github.com/elastic/apm-data v0.1.1-0.20231019084040-a0f7950e9775 h1:IPo/osxNyRxn8akP082O51YyEtrPiUjkB7yxZV57AKQ=
 github.com/elastic/apm-data v0.1.1-0.20231019084040-a0f7950e9775/go.mod h1:z4iJVl8vyQa5v5o7UapWGHTsycBKsKfJfILuf2TZpYo=
-github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231106191710-475eaf5784b4 h1:YfjFpr3qO9mBhNyiWmt+04biFXvT4nHcFnx0G5P50Dc=
-github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231106191710-475eaf5784b4/go.mod h1:lHmvjDNRv+ZZUW1j0OnvunpHDG77jP//HAz70s/B1wI=
+github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231113120716-9f93f932e9ae h1:UHHEEnVslbc0XXkU79JVTAkVHo6vJkKMqby4Sh93mmU=
+github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231113120716-9f93f932e9ae/go.mod h1:lHmvjDNRv+ZZUW1j0OnvunpHDG77jP//HAz70s/B1wI=
 github.com/elastic/elastic-agent-autodiscover v0.6.4 h1:K+xC7OGgcy4fLXVuGgOGLs+eXCqRnRg2SQQinxP+KsA=
 github.com/elastic/elastic-agent-autodiscover v0.6.4/go.mod h1:5+7NIBAILc0GkgxYW3ckXncu5wRZfltZhTY4aZAYP4M=
 github.com/elastic/elastic-agent-client/v7 v7.4.0 h1:h75oTkkvIjgiKVm61NpvTZP4cy6QbQ3zrIpXKGigyjo=

diff --git a/systemtest/approvals/TestOTLPGRPCLogsClientIP.approved.json b/systemtest/approvals/TestOTLPGRPCLogsClientIP.approved.json
@@ -8,18 +8,15 @@
             },
             "client": {
                 "geo": {
-                    "city_name": "dynamic",
                     "continent_name": "Europe",
-                    "country_iso_code": "ES",
-                    "country_name": "Spain",
+                    "country_iso_code": "DE",
+                    "country_name": "Germany",
                     "location": {
                         "lat": "dynamic",
                         "lon": "dynamic"
-                    },
-                    "region_iso_code": "dynamic",
-                    "region_name": "dynamic"
+                    }
                 },
-                "ip": "195.55.79.118"
+                "ip": "178.162.206.244"
             },
             "data_stream": {
                 "dataset": "apm.app.unknown",
@@ -51,7 +48,7 @@
                 "name": "unknown"
             },
             "source": {
-                "ip": "195.55.79.118",
+                "ip": "178.162.206.244",
                 "nat": {
                     "ip": "127.0.0.1"
                 }

diff --git a/systemtest/otlp_test.go b/systemtest/otlp_test.go
@@ -464,7 +464,7 @@ func TestOTLPGRPCLogsClientIP(t *testing.T) {
 	defer cancel()
 
 	// Override local IP address to be found in "GeoLite2-City.mmdb".
-	md := metadata.New(map[string]string{"X-Forwarded-For": "195.55.79.118"})
+	md := metadata.New(map[string]string{"X-Forwarded-For": "178.162.206.244"})
 	ctx = metadata.NewOutgoingContext(ctx, md)
 
 	conn, err := grpc.Dial(serverAddr(srv), grpc.WithInsecure(), grpc.WithBlock(), grpc.WithDefaultCallOptions(grpc.UseCompressor("gzip")))
@@ -478,7 +478,7 @@ 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.city_name", "client.geo.location.lat", "client.geo.location.lon", "client.geo.region_iso_code", "client.geo.region_name")
+	approvaltest.ApproveEvents(t, t.Name(), result.Hits.Hits, "client.geo.location.lat", "client.geo.location.lon")
 }
 
 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.12.0-0fcb9daf-SNAPSHOT
+  version: 8.12.0-9a986274-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.12.0-0fcb9daf-SNAPSHOT
+  version: 8.12.0-9a986274-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.12.0-0fcb9daf-SNAPSHOT
+  version: 8.12.0-9a986274-SNAPSHOT
   count: 1
   elasticsearchRef:
     name: elasticsearch