-
Notifications
You must be signed in to change notification settings - Fork 4.9k
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.
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
Upgrade test Docker images to latest versions #9198
Merged
Merged
Changes from 12 commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
0ccc091
Upgrade to latest versions
ycombinator d2ac30d
Adding test fixtures
ycombinator 051becb
Fixing integration test by setting up CCR stats
ycombinator 1678f3a
Renaming per hound suggestion
ycombinator 94e2a15
Start trial for all metricsets
ycombinator 6b91bc5
Create CCR stats first!
ycombinator 41497a5
Fix formatting issues
ycombinator 2c4a42b
Refactoring to reuse ES client
ycombinator 457ebc5
[WIP] Testing if this is a timing issue
ycombinator a8a18be
Fixing formatting
ycombinator 0d54c05
WIP: Make container health check use GET /_xpack/license
ycombinator d9e9afb
Removing test sleep
ycombinator db12c30
Trying a more generic health check
ycombinator File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
FROM docker.elastic.co/elasticsearch/elasticsearch:6.4.3 | ||
HEALTHCHECK --interval=1s --retries=300 CMD curl -f http://localhost:9200 | ||
FROM docker.elastic.co/elasticsearch/elasticsearch:6.5.1 | ||
HEALTHCHECK --interval=1s --retries=300 CMD curl -f http://localhost:9200/_xpack/license | ||
4 changes: 4 additions & 0 deletions
4
metricbeat/module/elasticsearch/ccr/_meta/test/test_follower_index.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 |
---|---|---|
@@ -0,0 +1,4 @@ | ||
{ | ||
"remote_cluster": "same", | ||
"leader_index": "pied_piper" | ||
} |
5 changes: 5 additions & 0 deletions
5
metricbeat/module/elasticsearch/ccr/_meta/test/test_leader_index.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 |
---|---|---|
@@ -0,0 +1,5 @@ | ||
{ | ||
"settings": { | ||
"soft_deletes.enabled": true | ||
} | ||
} |
13 changes: 13 additions & 0 deletions
13
metricbeat/module/elasticsearch/ccr/_meta/test/test_remote_settings.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 |
---|---|---|
@@ -0,0 +1,13 @@ | ||
{ | ||
"transient": { | ||
"cluster": { | ||
"remote": { | ||
"same": { | ||
"seeds": [ | ||
"127.0.0.1:9300" | ||
] | ||
} | ||
} | ||
} | ||
} | ||
} |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
FROM docker.elastic.co/kibana/kibana:6.4.3 | ||
FROM docker.elastic.co/kibana/kibana:6.5.1 | ||
HEALTHCHECK --interval=1s --retries=300 CMD curl -f http://localhost:5601/api/status | grep '"disconnects"' |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would it also work with a more generic health check like
/_cluster/health
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let me try this and see.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think it works reliably with
_cluster/health
. Jenkins CI passed but Travis CI failed with the same 404 error onGET _xpack/license
that we were seeing earlier.I think it's okay to base the health check on the URL we expect to call, i.e.
GET _xpack/license
, no?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, it's fine, lets leave it with
_xpack/license
then.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
But lets take this into account elastic/elasticsearch#35959 :(
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm going to fix all deprecated
_xpack
endpoints across the codebase in #9656.