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

bump elastic stack tests to 6.2.2 #6370

Merged
merged 2 commits into from
Feb 13, 2018
Merged

bump elastic stack tests to 6.2.2 #6370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
840517a
Wrong assertions and types conversion on the logstash slow plain format.
ph Feb 13, 2018
05c3f82
bump elastic stack tests to 6.2.2
graphaelli Feb 13, 2018
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
4 changes: 4 additions & 0 deletions CHANGELOG.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,10 @@ https://github.com/elastic/beats/compare/v6.2.1...v6.2.2[View commits]

- Add logging when monitoring cannot connect to Elasticsearch. {pull}6365[6365]

*Filebeat*

- Fix a conversion issue for time related fields in the Logstash module for the slowlog
fileset. {issue}6317[6317]

[[release-notes-6.2.1]]
=== Beats version 6.2.1
Expand Down
4 changes: 2 additions & 2 deletions filebeat/module/logstash/slowlog/ingest/pipeline-plain.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,13 @@
{
"convert": {
"field": "logstash.slowlog.took_in_nanos",
"type": "auto"
"type": "long"
}
},
{
"convert": {
"field": "logstash.slowlog.took_in_millis",
"type": "auto"
"type": "long"
}
}
]
Expand Down
1 change: 0 additions & 1 deletion filebeat/module/logstash/slowlog/test/slowlog-plain.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
[2017-10-30T09:57:58,243][WARN ][slowlog.logstash.filters.sleep] event processing time {:plugin_params=>{"time"=>3, "id"=>"e4e12a4e3082615c5427079bf4250dbfa338ebac10f8ea9912d7b98a14f56b8c"}, :took_in_nanos=>3027675106, :took_in_millis=>3027, :event=>"{\"@version\":\"1\",\"@timestamp\":\"2017-10-30T13:57:55.130Z\",\"host\":\"sashimi\",\"sequence\":0,\"message\":\"Hello world!\"}"}

2 changes: 1 addition & 1 deletion filebeat/module/logstash/slowlog/test/slowlog-plain.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"plugin_params": "{\"time\"=>3, \"id\"=>\"e4e12a4e3082615c5427079bf4250dbfa338ebac10f8ea9912d7b98a14f56b8c\"}",
"plugin_type": "filters",
"took_in_millis": 3027,
"took_in_nanos": 3027675140.0
"took_in_nanos": 3027675106
}
},
"offset": 383,
Expand Down
4 changes: 2 additions & 2 deletions testing/environments/args.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ services:
build:
args:
DOWNLOAD_URL: https://snapshots.elastic.co/downloads
ELASTIC_VERSION: 6.2.1-SNAPSHOT
CACHE_BUST: 20180108
ELASTIC_VERSION: 6.2.2-SNAPSHOT
CACHE_BUST: 20180208
2 changes: 1 addition & 1 deletion testing/environments/docker/kibana/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ EXPOSE 5601

### Beats specific args ####
ARG DOWNLOAD_URL=https://snapshots.elastic.co/downloads
ARG ELASTIC_VERSION=7.0.0-alpha1-SNAPSHOT
ARG ELASTIC_VERSION=6.2.2-SNAPSHOT
ARG CACHE_BUST=1
ARG XPACK=1

Expand Down