From 38e1830116dc2689f542c130e094052606ebecdd Mon Sep 17 00:00:00 2001 From: Philipp Kahr Date: Mon, 13 Sep 2021 18:48:36 +0200 Subject: [PATCH] Metricbeat, fix metricsets log level behavior (#27804) --- CHANGELOG-developer.next.asciidoc | 1 + CHANGELOG.next.asciidoc | 1 + metricbeat/mb/module/wrapper.go | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG-developer.next.asciidoc b/CHANGELOG-developer.next.asciidoc index d45791a2755f..33ce2d0ec4a5 100644 --- a/CHANGELOG-developer.next.asciidoc +++ b/CHANGELOG-developer.next.asciidoc @@ -62,6 +62,7 @@ The list below covers the major changes between 7.0.0-rc2 and master only. - Metricbeat module builders call host parser only once when instantiating light modules. {pull}20149[20149] - Fix export dashboard command when running against Elastic Cloud hosted Kibana. {pull}22746[22746] - Remove `event.dataset` (ECS) annotion from `libbeat.logp`. {issue}27404[27404] +- Errors should be thrown as errors. Metricsets inside Metricbeat will now throw errors as the `error` log level. {pull}27804[27804] ==== Added diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index cebd0c3ffd55..f01b1aefec93 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -109,6 +109,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Add Linux pressure metricset {pull}27355[27355] - Add support for kube-state-metrics v2.0.0 {pull}27552[27552] - Add User-Agent header to HTTP requests. {issue}18160[18160] {pull}27509[27509] +- Errors should be thrown as errors. Metricsets inside Metricbeat will now throw errors as the `error` log level. {pull}27804[27804] *Packetbeat* diff --git a/metricbeat/mb/module/wrapper.go b/metricbeat/mb/module/wrapper.go index 8d18dfbe552a..c3d279d2859b 100644 --- a/metricbeat/mb/module/wrapper.go +++ b/metricbeat/mb/module/wrapper.go @@ -251,14 +251,14 @@ func (msw *metricSetWrapper) fetch(ctx context.Context, reporter reporter) { err := fetcher.Fetch(reporter.V2()) if err != nil { reporter.V2().Error(err) - logp.Info("Error fetching data for metricset %s.%s: %s", msw.module.Name(), msw.Name(), err) + logp.Err("Error fetching data for metricset %s.%s: %s", msw.module.Name(), msw.Name(), err) } case mb.ReportingMetricSetV2WithContext: reporter.StartFetchTimer() err := fetcher.Fetch(ctx, reporter.V2()) if err != nil { reporter.V2().Error(err) - logp.Info("Error fetching data for metricset %s.%s: %s", msw.module.Name(), msw.Name(), err) + logp.Err("Error fetching data for metricset %s.%s: %s", msw.module.Name(), msw.Name(), err) } default: panic(fmt.Sprintf("unexpected fetcher type for %v", msw))