Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update 7.x test images to 7.7.0 #16699

Merged
merged 10 commits into from
Mar 4, 2020
Merged

update 7.x test images to 7.7.0 #16699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d41d0d1
Regenerate expected files after changes in date parsing (#16139)
jsoriano Feb 6, 2020
0f44381
Merge remote-tracking branch 'origin/7.x' into backport_16139_7.x
jsoriano Feb 11, 2020
ea5c44f
Merge remote-tracking branch 'origin/7.x' into backport_16139_7.x
jsoriano Feb 17, 2020
35cc375
Merge remote-tracking branch 'origin/7.x' into backport_16139_7.x
jsoriano Feb 26, 2020
b5c503b
update 7.x tests images to 7.7.0
graphaelli Feb 28, 2020
489ed1d
Merge remote-tracking branch 'elastic/7.x' into update-7.x-test-snaps…
graphaelli Mar 2, 2020
1e05432
Merge remote-tracking branch 'elastic/7.x' into update-7.x-test-snaps…
graphaelli Mar 2, 2020
6b68c3d
Merge remote-tracking branch 'origin/7.x' into backport_16139_7.x
jsoriano Mar 3, 2020
91d53fc
Merge remote-tracking branch 'elastic/7.x' into update-7.x-test-snaps…
graphaelli Mar 4, 2020
7e94e91
Merge remote-tracking branch 'jsoriano/backport_16139_7.x' into updat…
graphaelli Mar 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion filebeat/module/system/auth/test/timestamp.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion filebeat/module/system/syslog/test/tz-offset.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions testing/environments/snapshot-oss.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions testing/environments/snapshot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down