From 252408b853c3fa94e2bcf53eb457e2d3d57a7778 Mon Sep 17 00:00:00 2001 From: Tudor Golubenco Date: Fri, 23 Sep 2016 14:27:08 +0200 Subject: [PATCH 1/2] Fix default Metricbeat config on Windows (#2632) The load metricset is not supported on Windows, and if it's enabled in the configuration file, it makes Metricbeat exit immediately with an error. This change adjusted the configuration on Windows to exclude the load metricset. Fixes 2623. --- metricbeat/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/metricbeat/Makefile b/metricbeat/Makefile index d0c8ec893e2..93d58a80a5f 100644 --- a/metricbeat/Makefile +++ b/metricbeat/Makefile @@ -57,6 +57,11 @@ imports: # This is called by the beats packer before building starts .PHONY: before-build before-build: + # disable the system/load metricset on windows + sed -i.bk 's/- load/#- load/' $(PREFIX)/metricbeat-win.yml + rm $(PREFIX)/metricbeat-win.yml.bk + sed -i.bk 's/- load/#- load/' $(PREFIX)/metricbeat-win.full.yml + rm $(PREFIX)/metricbeat-win.full.yml.bk # Runs all collection steps and updates afterwards .PHONY: collect From 4663faf494170c833f79075eec139bca3ffbd60c Mon Sep 17 00:00:00 2001 From: Tudor Golubenco Date: Fri, 23 Sep 2016 14:32:42 +0200 Subject: [PATCH 2/2] Changelog item for #2632 (#2635) --- CHANGELOG.asciidoc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 05507271e19..4b34f1010b7 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -31,6 +31,8 @@ https://github.com/elastic/beats/compare/v5.0.0-beta1...master[Check the HEAD di *Metricbeat* +- Fix default configuration file on Windows to not enabled the `load` metricset. {pull}2632[2632] + *Packetbeat* *Topbeat*