From d41d0d13db4a8802b9b399b5c51e3e747890861b Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Thu, 6 Feb 2020 22:28:14 +0100 Subject: [PATCH 1/2] Regenerate expected files after changes in date parsing (#16139) Elasticsearch has modified the behaviour on date parsing when the date doesn't include timezone data. Regenerate a couple of golden files that are affected by this change. (cherry picked from commit e61c4c4844b6fdb7f7da5db2e6f418b528e39b74) --- filebeat/module/system/auth/test/timestamp.log-expected.json | 2 +- filebeat/module/system/syslog/test/tz-offset.log-expected.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/filebeat/module/system/auth/test/timestamp.log-expected.json b/filebeat/module/system/auth/test/timestamp.log-expected.json index 2b881dc5fa0..80c07d4e9a8 100644 --- a/filebeat/module/system/auth/test/timestamp.log-expected.json +++ b/filebeat/module/system/auth/test/timestamp.log-expected.json @@ -1,6 +1,6 @@ [ { - "@timestamp": "2019-06-14T08:40:20.912-02:00", + "@timestamp": "2019-06-14T10:40:20.912-02:00", "event.dataset": "system.auth", "event.module": "system", "event.timezone": "-02:00", diff --git a/filebeat/module/system/syslog/test/tz-offset.log-expected.json b/filebeat/module/system/syslog/test/tz-offset.log-expected.json index 0e9c7d984cc..154e256b2ba 100644 --- a/filebeat/module/system/syslog/test/tz-offset.log-expected.json +++ b/filebeat/module/system/syslog/test/tz-offset.log-expected.json @@ -29,7 +29,7 @@ "service.type": "system" }, { - "@timestamp": "2019-06-14T08:40:20.912-02:00", + "@timestamp": "2019-06-14T10:40:20.912-02:00", "event.dataset": "system.syslog", "event.module": "system", "event.timezone": "-02:00", From b5c503b1d0a9ba6391a48e680263560a14779be5 Mon Sep 17 00:00:00 2001 From: Gil Raphaelli Date: Fri, 28 Feb 2020 17:14:22 -0500 Subject: [PATCH 2/2] update 7.x tests images to 7.7.0 --- testing/environments/snapshot-oss.yml | 6 +++--- testing/environments/snapshot.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/testing/environments/snapshot-oss.yml b/testing/environments/snapshot-oss.yml index bafacca8095..11f17f750a5 100644 --- a/testing/environments/snapshot-oss.yml +++ b/testing/environments/snapshot-oss.yml @@ -3,7 +3,7 @@ version: '2.3' services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.6.0-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.7.0-SNAPSHOT healthcheck: test: ["CMD", "curl", "-f", "http://localhost:9200"] retries: 300 @@ -15,7 +15,7 @@ services: - "http.host=0.0.0.0" logstash: - image: docker.elastic.co/logstash/logstash-oss:7.6.0-SNAPSHOT + image: docker.elastic.co/logstash/logstash-oss:7.7.0-SNAPSHOT healthcheck: test: ["CMD", "curl", "-f", "http://localhost:9600/_node/stats"] retries: 600 @@ -25,7 +25,7 @@ services: - ./docker/logstash/pki:/etc/pki:ro kibana: - image: docker.elastic.co/kibana/kibana-oss:7.6.0-SNAPSHOT + image: docker.elastic.co/kibana/kibana-oss:7.7.0-SNAPSHOT healthcheck: test: ["CMD-SHELL", 'python -c ''import urllib, json; response = urllib.urlopen("http://localhost:5601/api/status"); data = json.loads(response.read()); exit(1) if data["status"]["overall"]["state"] != "green" else exit(0);'''] retries: 600 diff --git a/testing/environments/snapshot.yml b/testing/environments/snapshot.yml index 00eea2c70ce..2dce1fbd7a5 100644 --- a/testing/environments/snapshot.yml +++ b/testing/environments/snapshot.yml @@ -3,7 +3,7 @@ version: '2.3' services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:7.6.0-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:7.7.0-SNAPSHOT healthcheck: test: ["CMD", "curl", "-f", "http://localhost:9200"] retries: 300 @@ -16,7 +16,7 @@ services: - "xpack.security.enabled=false" logstash: - image: docker.elastic.co/logstash/logstash:7.6.0-SNAPSHOT + image: docker.elastic.co/logstash/logstash:7.7.0-SNAPSHOT healthcheck: test: ["CMD", "curl", "-f", "http://localhost:9600/_node/stats"] retries: 600 @@ -26,7 +26,7 @@ services: - ./docker/logstash/pki:/etc/pki:ro kibana: - image: docker.elastic.co/kibana/kibana:7.6.0-SNAPSHOT + image: docker.elastic.co/kibana/kibana:7.7.0-SNAPSHOT healthcheck: test: ["CMD-SHELL", 'python -c ''import urllib, json; response = urllib.urlopen("http://localhost:5601/api/status"); data = json.loads(response.read()); exit(1) if data["status"]["overall"]["state"] != "green" else exit(0);'''] retries: 600