-
Notifications
You must be signed in to change notification settings - Fork 525
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
systemtest: Fix geoip changes (#11764)
Fix geoip changes that cause systemtest failures
- Loading branch information
Showing
5 changed files
with
86 additions
and
77 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
127 changes: 62 additions & 65 deletions
127
systemtest/approvals/TestOTLPGRPCLogsClientIP.approved.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,67 +1,64 @@ | ||
| { | ||
| "events": [ | ||
| { | ||
| "@timestamp": "1970-01-01T00:00:01.000Z", | ||
| "agent": { | ||
| "name": "android/java", | ||
| "version": "unknown" | ||
| }, | ||
| "client": { | ||
| "geo": { | ||
| "continent_name": "Europe", | ||
| "region_iso_code": "ES-M", | ||
| "city_name": "Madrid", | ||
| "country_iso_code": "ES", | ||
| "country_name": "Spain", | ||
| "region_name": "Madrid", | ||
| "location": { | ||
| "lon": -3.6934, | ||
| "lat": 40.4163 | ||
| } | ||
| }, | ||
| "ip": "195.55.79.118" | ||
| }, | ||
| "data_stream": { | ||
| "dataset": "apm.app.unknown", | ||
| "namespace": "default", | ||
| "type": "logs" | ||
| }, | ||
| "event": { | ||
| "severity": 9 | ||
| }, | ||
| "labels": { | ||
| "key": "value" | ||
| }, | ||
| "log": { | ||
| "level": "Info" | ||
| }, | ||
| "message": "a log message", | ||
| "numeric_labels": { | ||
| "numeric_key": 1234 | ||
| }, | ||
| "observer": { | ||
| "hostname": "dynamic", | ||
| "type": "apm-server", | ||
| "version": "dynamic" | ||
| }, | ||
| "service": { | ||
| "language": { | ||
| "name": "java" | ||
| }, | ||
| "name": "unknown" | ||
| }, | ||
| "source": { | ||
| "nat": { | ||
| "ip": "127.0.0.1" | ||
| }, | ||
| "ip": "195.55.79.118" | ||
| }, | ||
| "span": { | ||
| "id": "0200000000000000" | ||
| }, | ||
| "trace": { | ||
| "id": "01000000000000000000000000000000" | ||
| } | ||
| } | ||
| ] | ||
| "events": [ | ||
| { | ||
| "@timestamp": "1970-01-01T00:00:01.000Z", | ||
| "agent": { | ||
| "name": "android/java", | ||
| "version": "unknown" | ||
| }, | ||
| "client": { | ||
| "geo": { | ||
| "continent_name": "Europe", | ||
| "country_iso_code": "ES", | ||
| "country_name": "Spain", | ||
| "location": { | ||
| "lat": 40.4172, | ||
| "lon": -3.684 | ||
| } | ||
| }, | ||
| "ip": "195.55.79.118" | ||
| }, | ||
| "data_stream": { | ||
| "dataset": "apm.app.unknown", | ||
| "namespace": "default", | ||
| "type": "logs" | ||
| }, | ||
| "event": { | ||
| "severity": 9 | ||
| }, | ||
| "labels": { | ||
| "key": "value" | ||
| }, | ||
| "log": { | ||
| "level": "Info" | ||
| }, | ||
| "message": "a log message", | ||
| "numeric_labels": { | ||
| "numeric_key": 1234 | ||
| }, | ||
| "observer": { | ||
| "hostname": "dynamic", | ||
| "type": "apm-server", | ||
| "version": "dynamic" | ||
| }, | ||
| "service": { | ||
| "language": { | ||
| "name": "java" | ||
| }, | ||
| "name": "unknown" | ||
| }, | ||
| "source": { | ||
| "ip": "195.55.79.118", | ||
| "nat": { | ||
| "ip": "127.0.0.1" | ||
| } | ||
| }, | ||
| "span": { | ||
| "id": "0200000000000000" | ||
| }, | ||
| "trace": { | ||
| "id": "01000000000000000000000000000000" | ||
| } | ||
| } | ||
| ] | ||
| } |