From ad0a3d2380ffd25690ce62eb0d57988f51a5ee2a Mon Sep 17 00:00:00 2001 From: urso Date: Thu, 20 Jul 2017 23:33:36 +0200 Subject: [PATCH] Check for removed settings on startup - introduce cfgwarn package: - use Beta, Experimental, Deprecated from cfgwarn package - use cfgwarn.CheckRemoved5xSettings for all settings removed by publisher pipeline refactoring - introduce system tests checking for removed settings being correctly reported on startup --- auditbeat/module/audit/file/metricset.go | 3 +- auditbeat/module/audit/kernel/audit_linux.go | 3 +- filebeat/beater/filebeat.go | 6 +++ filebeat/crawler/crawler.go | 5 +- filebeat/prospector/config.go | 4 +- filebeat/prospector/log/config.go | 3 +- filebeat/prospector/redis/prospector.go | 4 +- filebeat/prospector/udp/prospector.go | 3 +- .../system/config/filebeat_modules.yml.j2 | 1 - .../system/config/filebeat_prospectors.yml.j2 | 1 - filebeat/tests/system/test_base.py | 20 ++++++++ libbeat/api/server.go | 3 +- libbeat/beat/beat.go | 12 +++-- libbeat/common/cfgwarn/cfgwarn.go | 24 +++++++++ libbeat/common/cfgwarn/removed.go | 49 +++++++++++++++++++ libbeat/logp/log.go | 17 ------- .../add_docker_metadata.go | 3 +- .../add_kubernetes_metadata/kubernetes.go | 3 +- libbeat/tests/system/test_base.py | 15 ++++++ metricbeat/beater/metricbeat.go | 9 ++++ metricbeat/docs/modules/redis.asciidoc | 4 +- metricbeat/docs/modules/system.asciidoc | 5 +- metricbeat/mb/module/factory.go | 16 +++++- metricbeat/metricbeat.reference.yml | 4 +- .../module/aerospike/namespace/namespace.go | 3 +- .../module/ceph/cluster_disk/cluster_disk.go | 4 +- .../ceph/cluster_health/cluster_health.go | 4 +- .../ceph/monitor_health/monitor_health.go | 4 +- metricbeat/module/ceph/pool_disk/pool_disk.go | 4 +- metricbeat/module/couchbase/bucket/bucket.go | 4 +- .../module/couchbase/cluster/cluster.go | 4 +- metricbeat/module/couchbase/node/node.go | 4 +- .../module/docker/container/container.go | 4 +- metricbeat/module/docker/cpu/cpu.go | 4 +- metricbeat/module/docker/diskio/diskio.go | 4 +- .../module/docker/healthcheck/healthcheck.go | 4 +- metricbeat/module/docker/image/image.go | 4 +- metricbeat/module/docker/info/info.go | 4 +- metricbeat/module/docker/memory/memory.go | 4 +- metricbeat/module/docker/network/network.go | 4 +- .../module/dropwizard/collector/collector.go | 4 +- metricbeat/module/golang/expvar/expvar.go | 4 +- metricbeat/module/golang/heap/heap.go | 3 +- metricbeat/module/http/json/json.go | 4 +- metricbeat/module/jolokia/jmx/jmx.go | 3 +- .../kafka/consumergroup/consumergroup.go | 3 +- .../module/kafka/partition/partition.go | 3 +- .../module/kubernetes/container/container.go | 4 +- metricbeat/module/kubernetes/event/event.go | 4 +- metricbeat/module/kubernetes/node/node.go | 4 +- metricbeat/module/kubernetes/pod/pod.go | 4 +- .../state_container/state_container.go | 4 +- .../state_deployment/state_deployment.go | 4 +- .../kubernetes/state_node/state_node.go | 4 +- .../module/kubernetes/state_pod/state_pod.go | 4 +- .../state_replicaset/state_replicaset.go | 4 +- metricbeat/module/kubernetes/system/system.go | 4 +- metricbeat/module/kubernetes/volume/volume.go | 4 +- metricbeat/module/memcached/stats/stats.go | 4 +- metricbeat/module/mongodb/dbstats/dbstats.go | 3 +- metricbeat/module/php_fpm/pool/pool.go | 4 +- .../module/prometheus/collector/collector.go | 4 +- metricbeat/module/prometheus/stats/stats.go | 4 +- metricbeat/module/rabbitmq/node/node.go | 4 +- metricbeat/module/redis/_meta/config.yml | 4 +- metricbeat/module/system/_meta/config.yml | 5 +- metricbeat/module/system/core/config.go | 4 +- metricbeat/module/system/cpu/config.go | 4 +- metricbeat/module/system/process/config.go | 4 +- .../module/vsphere/datastore/datastore.go | 4 +- metricbeat/module/vsphere/host/host.go | 4 +- .../vsphere/virtualmachine/virtualmachine.go | 4 +- metricbeat/module/windows/perfmon/perfmon.go | 4 +- metricbeat/modules.d/redis.yml.disabled | 4 +- metricbeat/modules.d/system.yml | 5 +- metricbeat/tests/system/test_config.py | 18 +++++++ packetbeat/protos/protos.go | 3 +- 77 files changed, 299 insertions(+), 139 deletions(-) create mode 100644 libbeat/common/cfgwarn/cfgwarn.go create mode 100644 libbeat/common/cfgwarn/removed.go diff --git a/auditbeat/module/audit/file/metricset.go b/auditbeat/module/audit/file/metricset.go index c0b37214ed11..67cf3b3d4f37 100644 --- a/auditbeat/module/audit/file/metricset.go +++ b/auditbeat/module/audit/file/metricset.go @@ -5,6 +5,7 @@ import ( "github.com/pkg/errors" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/libbeat/logp" "github.com/elastic/beats/metricbeat/mb" "github.com/elastic/beats/metricbeat/mb/parse" @@ -45,7 +46,7 @@ type MetricSet struct { } func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - logp.Beta("The %v metricset is an beta feature", metricsetName) + cfgwarn.Experimental("The %v metricset is an experimental feature", metricsetName) config := defaultConfig if err := base.Module().UnpackConfig(&config); err != nil { diff --git a/auditbeat/module/audit/kernel/audit_linux.go b/auditbeat/module/audit/kernel/audit_linux.go index 48b5627446cd..45314fb45669 100644 --- a/auditbeat/module/audit/kernel/audit_linux.go +++ b/auditbeat/module/audit/kernel/audit_linux.go @@ -8,6 +8,7 @@ import ( "github.com/pkg/errors" "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/libbeat/logp" "github.com/elastic/beats/libbeat/monitoring" "github.com/elastic/beats/metricbeat/mb" @@ -47,7 +48,7 @@ type MetricSet struct { // New constructs a new MetricSet. func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - logp.Beta("The %v metricset is a beta feature", metricsetName) + cfgwarn.Experimental("The %v metricset is a beta feature", metricsetName) config := defaultConfig if err := base.Module().UnpackConfig(&config); err != nil { diff --git a/filebeat/beater/filebeat.go b/filebeat/beater/filebeat.go index b77867113eff..2b47adcc1aca 100644 --- a/filebeat/beater/filebeat.go +++ b/filebeat/beater/filebeat.go @@ -8,6 +8,7 @@ import ( "github.com/elastic/beats/libbeat/beat" "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/libbeat/logp" "github.com/elastic/beats/libbeat/monitoring" "github.com/elastic/beats/libbeat/outputs/elasticsearch" @@ -46,6 +47,11 @@ func New(b *beat.Beat, rawConfig *common.Config) (beat.Beater, error) { return nil, fmt.Errorf("Error reading config file: %v", err) } + err := cfgwarn.CheckRemoved5xSettings(rawConfig, "spool_size", "publish_async", "idle_timeout") + if err != nil { + return nil, err + } + moduleRegistry, err := fileset.NewModuleRegistry(config.Modules, b.Info.Version) if err != nil { return nil, err diff --git a/filebeat/crawler/crawler.go b/filebeat/crawler/crawler.go index ccca466c4718..1e37caa384e6 100644 --- a/filebeat/crawler/crawler.go +++ b/filebeat/crawler/crawler.go @@ -11,6 +11,7 @@ import ( "github.com/elastic/beats/filebeat/registrar" "github.com/elastic/beats/libbeat/cfgfile" "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/libbeat/logp" ) @@ -51,7 +52,7 @@ func (c *Crawler) Start(r *registrar.Registrar, configProspectors *common.Config } if configProspectors.Enabled() { - logp.Beta("Loading separate prospectors is enabled.") + cfgwarn.Beta("Loading separate prospectors is enabled.") c.reloader = cfgfile.NewReloader(configProspectors) factory := prospector.NewFactory(c.out, r, c.beatDone) @@ -61,7 +62,7 @@ func (c *Crawler) Start(r *registrar.Registrar, configProspectors *common.Config } if configModules.Enabled() { - logp.Beta("Loading separate modules is enabled.") + cfgwarn.Beta("Loading separate modules is enabled.") c.reloader = cfgfile.NewReloader(configModules) factory := fileset.NewFactory(c.out, r, c.beatVersion, pipelineLoaderFactory, c.beatDone) diff --git a/filebeat/prospector/config.go b/filebeat/prospector/config.go index 99d8d2ad41b3..e4eadc2da5a2 100644 --- a/filebeat/prospector/config.go +++ b/filebeat/prospector/config.go @@ -4,7 +4,7 @@ import ( "time" cfg "github.com/elastic/beats/filebeat/config" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/libbeat/common/cfgwarn" ) var ( @@ -22,7 +22,7 @@ type prospectorConfig struct { func (c *prospectorConfig) Validate() error { if c.InputType != "" { - logp.Deprecate("6.0.0", "input_type prospector config is deprecated. Use type instead.") + cfgwarn.Deprecate("6.0.0", "input_type prospector config is deprecated. Use type instead.") c.Type = c.InputType } return nil diff --git a/filebeat/prospector/log/config.go b/filebeat/prospector/log/config.go index ea6e03843c73..3a4ad12c8f71 100644 --- a/filebeat/prospector/log/config.go +++ b/filebeat/prospector/log/config.go @@ -10,6 +10,7 @@ import ( "github.com/elastic/beats/filebeat/harvester" "github.com/elastic/beats/filebeat/harvester/reader" "github.com/elastic/beats/filebeat/input/file" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/libbeat/common/match" "github.com/elastic/beats/libbeat/logp" ) @@ -151,7 +152,7 @@ func (c *config) Validate() error { } if c.ScanSort != "" { - logp.Experimental("scan_sort is used.") + cfgwarn.Experimental("scan_sort is used.") // Check input type if _, ok := ValidScanSort[c.ScanSort]; !ok { diff --git a/filebeat/prospector/redis/prospector.go b/filebeat/prospector/redis/prospector.go index b3bef6532e11..0a949ffbd5fb 100644 --- a/filebeat/prospector/redis/prospector.go +++ b/filebeat/prospector/redis/prospector.go @@ -9,6 +9,7 @@ import ( "github.com/elastic/beats/filebeat/harvester" "github.com/elastic/beats/filebeat/input/file" "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/libbeat/logp" ) @@ -23,7 +24,8 @@ type Prospector struct { // NewProspector creates a new redis prospector func NewProspector(cfg *common.Config, outletFactory channel.OutleterFactory) (*Prospector, error) { - logp.Experimental("Redis slowlog prospector is enabled.") + cfgwarn.Experimental("Redis slowlog prospector is enabled.") + config := defaultConfig err := cfg.Unpack(&config) diff --git a/filebeat/prospector/udp/prospector.go b/filebeat/prospector/udp/prospector.go index 65478a14883c..c89d3b712fec 100644 --- a/filebeat/prospector/udp/prospector.go +++ b/filebeat/prospector/udp/prospector.go @@ -4,6 +4,7 @@ import ( "github.com/elastic/beats/filebeat/channel" "github.com/elastic/beats/filebeat/harvester" "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/libbeat/logp" ) @@ -14,7 +15,7 @@ type Prospector struct { } func NewProspector(cfg *common.Config, outlet channel.OutleterFactory) (*Prospector, error) { - logp.Experimental("UDP prospector type is used") + cfgwarn.Experimental("UDP prospector type is used") out, err := outlet(cfg) if err != nil { diff --git a/filebeat/tests/system/config/filebeat_modules.yml.j2 b/filebeat/tests/system/config/filebeat_modules.yml.j2 index b7aa09abdcfe..3e8083fc037f 100644 --- a/filebeat/tests/system/config/filebeat_modules.yml.j2 +++ b/filebeat/tests/system/config/filebeat_modules.yml.j2 @@ -1,4 +1,3 @@ -filebeat.idle_timeout: 0.5s filebeat.registry_file: {{ beat.working_dir + '/' }}{{ registryFile|default("registry")}} output.elasticsearch.hosts: ["{{ elasticsearch_url }}"] diff --git a/filebeat/tests/system/config/filebeat_prospectors.yml.j2 b/filebeat/tests/system/config/filebeat_prospectors.yml.j2 index 53cd3ec90c5d..43536e9c481c 100644 --- a/filebeat/tests/system/config/filebeat_prospectors.yml.j2 +++ b/filebeat/tests/system/config/filebeat_prospectors.yml.j2 @@ -5,7 +5,6 @@ filebeat.prospectors: scan_frequency: 0.5s encoding: {{prospector.encoding | default("plain") }} {% endfor %} -filebeat.idle_timeout: 0.5s filebeat.registry_file: {{ beat.working_dir + '/' }}{{ registryFile|default("registry")}} output.file: diff --git a/filebeat/tests/system/test_base.py b/filebeat/tests/system/test_base.py index fcf605208c90..019446dd5c39 100644 --- a/filebeat/tests/system/test_base.py +++ b/filebeat/tests/system/test_base.py @@ -26,3 +26,23 @@ def test_base(self): output = self.read_output()[0] assert "@timestamp" in output assert "prospector.type" in output + + def test_invalid_config_with_removed_settings(self): + """ + Checks if filebeat fails to load if removed settings have been used: + """ + self.render_config_template(console={"pretty": "false"}) + + exit_code = self.run_beat(extra_args=[ + "-E", "filebeat.spool_size=2048", + "-E", "filebeat.publish_async=true", + "-E", "filebeat.idle_timeout=1s", + ]) + + assert exit_code == 1 + assert self.log_contains("setting 'filebeat.spool_size'" + " has been removed") + assert self.log_contains("setting 'filebeat.publish_async'" + " has been removed") + assert self.log_contains("setting 'filebeat.idle_timeout'" + " has been removed") diff --git a/libbeat/api/server.go b/libbeat/api/server.go index 899bb580bf51..1326f1b0d694 100644 --- a/libbeat/api/server.go +++ b/libbeat/api/server.go @@ -7,13 +7,14 @@ import ( "strconv" "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/libbeat/logp" "github.com/elastic/beats/libbeat/monitoring" ) // Start starts the metrics api endpoint on the configured host and port func Start(cfg *common.Config, info common.BeatInfo) { - logp.Beta("Metrics endpoint is enabled.") + cfgwarn.Beta("Metrics endpoint is enabled.") config := DefaultConfig cfg.Unpack(&config) diff --git a/libbeat/beat/beat.go b/libbeat/beat/beat.go index ff050c97725b..c27016c860a6 100644 --- a/libbeat/beat/beat.go +++ b/libbeat/beat/beat.go @@ -48,6 +48,7 @@ import ( "github.com/elastic/beats/libbeat/api" "github.com/elastic/beats/libbeat/cfgfile" "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/libbeat/common/file" "github.com/elastic/beats/libbeat/dashboards" "github.com/elastic/beats/libbeat/logp" @@ -290,7 +291,7 @@ func (b *Beat) launch(bt Creator) error { // If -configtest was specified, exit now prior to run. if cfgfile.IsTestConfig() { - logp.Deprecate("6.0", "-configtest flag has been deprecated, use configtest subcommand") + cfgwarn.Deprecate("6.0", "-configtest flag has been deprecated, use configtest subcommand") fmt.Println("Config OK") return GracefulExit } @@ -299,7 +300,7 @@ func (b *Beat) launch(bt Creator) error { // TODO Deprecate this in favor of setup subcommand (7.0) if *setup { - logp.Deprecate("6.0", "-setup flag has been deprectad, use setup subcommand") + cfgwarn.Deprecate("6.0", "-setup flag has been deprectad, use setup subcommand") } err = b.loadDashboards(false) if err != nil { @@ -419,7 +420,7 @@ func (b *Beat) handleFlags() error { flag.Parse() if *printVersion { - logp.Deprecate("6.0", "-version flag has been deprectad, use version subcommand") + cfgwarn.Deprecate("6.0", "-version flag has been deprectad, use version subcommand") fmt.Printf("%s version %s (%s), libbeat %s\n", b.Info.Beat, b.Info.Version, runtime.GOARCH, version.GetDefaultVersion()) return GracefulExit @@ -452,6 +453,11 @@ func (b *Beat) configure() error { return fmt.Errorf("error unpacking config data: %v", err) } + err = cfgwarn.CheckRemoved5xSettings(cfg, "queue_size", "bulk_queue_size") + if err != nil { + return err + } + if name := b.Config.Shipper.Name; name != "" { b.Info.Name = name } diff --git a/libbeat/common/cfgwarn/cfgwarn.go b/libbeat/common/cfgwarn/cfgwarn.go new file mode 100644 index 000000000000..9034cf1eeb6b --- /dev/null +++ b/libbeat/common/cfgwarn/cfgwarn.go @@ -0,0 +1,24 @@ +package cfgwarn + +import ( + "fmt" + + "github.com/elastic/beats/libbeat/logp" +) + +// Beta logs the usage of an beta feature. +func Beta(format string, v ...interface{}) { + logp.Warn("BETA: "+format, v...) +} + +// Deprecate logs a deprecation message. +// The version string contains the version when the future will be removed +func Deprecate(version string, format string, v ...interface{}) { + postfix := fmt.Sprintf(" Will be removed in version: %s", version) + logp.Warn("DEPRECATED: "+format+postfix, v...) +} + +// Experimental logs the usage of an experimental feature. +func Experimental(format string, v ...interface{}) { + logp.Warn("EXPERIMENTAL: "+format, v...) +} diff --git a/libbeat/common/cfgwarn/removed.go b/libbeat/common/cfgwarn/removed.go new file mode 100644 index 000000000000..05a7b82e2b7e --- /dev/null +++ b/libbeat/common/cfgwarn/removed.go @@ -0,0 +1,49 @@ +package cfgwarn + +import ( + "fmt" + "strings" + + "github.com/joeshaw/multierror" + + "github.com/elastic/beats/libbeat/common" +) + +func CheckRemoved5xSettings(cfg *common.Config, settings ...string) error { + var errs multierror.Errors + for _, setting := range settings { + if err := CheckRemoved5xSetting(cfg, setting); err != nil { + errs = append(errs, err) + } + } + + return errs.Err() +} + +// CheckRemoved5xSetting prints a warning if the obsolete setting is used. +func CheckRemoved5xSetting(cfg *common.Config, setting string) error { + segments := strings.Split(setting, ".") + + L := len(segments) + name := segments[L-1] + path := segments[:L-1] + + current := cfg + for _, p := range path { + current, _ := current.Child(p, -1) + if current == nil { + break + } + } + + // full path to setting not available -> setting not found + if current == nil { + return nil + } + + if !current.HasField(name) { + return nil + } + + return fmt.Errorf("setting '%v' has been removed", current.PathOf(name)) +} diff --git a/libbeat/logp/log.go b/libbeat/logp/log.go index f00ab8aa5f2d..e854cd54deb0 100644 --- a/libbeat/logp/log.go +++ b/libbeat/logp/log.go @@ -163,23 +163,6 @@ func Critical(format string, v ...interface{}) { msg(LOG_CRIT, "CRIT", format, v...) } -// Deprecate logs a deprecation message. -// The version string contains the version when the future will be removed -func Deprecate(version string, format string, v ...interface{}) { - postfix := fmt.Sprintf(" Will be removed in version: %s", version) - Warn("DEPRECATED: "+format+postfix, v...) -} - -// Experimental logs the usage of an experimental feature. -func Experimental(format string, v ...interface{}) { - Warn("EXPERIMENTAL: "+format, v...) -} - -// Beta logs the usage of an beta feature. -func Beta(format string, v ...interface{}) { - Warn("BETA: "+format, v...) -} - // WTF prints the message at CRIT level and panics immediately with the same // message func WTF(format string, v ...interface{}) { diff --git a/libbeat/processors/add_docker_metadata/add_docker_metadata.go b/libbeat/processors/add_docker_metadata/add_docker_metadata.go index 3e4e464a3271..1019a2740229 100644 --- a/libbeat/processors/add_docker_metadata/add_docker_metadata.go +++ b/libbeat/processors/add_docker_metadata/add_docker_metadata.go @@ -5,6 +5,7 @@ import ( "strings" "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/libbeat/logp" "github.com/elastic/beats/libbeat/processors" "github.com/elastic/beats/libbeat/processors/actions" @@ -26,7 +27,7 @@ func newDockerMetadataProcessor(cfg *common.Config) (processors.Processor, error } func buildDockerMetadataProcessor(cfg *common.Config, watcherConstructor WatcherConstructor) (processors.Processor, error) { - logp.Beta("The add_docker_metadata processor is beta") + cfgwarn.Beta("The add_docker_metadata processor is beta") config := defaultConfig() diff --git a/libbeat/processors/add_kubernetes_metadata/kubernetes.go b/libbeat/processors/add_kubernetes_metadata/kubernetes.go index 5310bf171e17..40fdd3a5a456 100644 --- a/libbeat/processors/add_kubernetes_metadata/kubernetes.go +++ b/libbeat/processors/add_kubernetes_metadata/kubernetes.go @@ -9,6 +9,7 @@ import ( "time" "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/libbeat/logp" "github.com/elastic/beats/libbeat/processors" "github.com/elastic/beats/libbeat/publisher/beat" @@ -40,7 +41,7 @@ func init() { } func newKubernetesAnnotator(cfg *common.Config) (processors.Processor, error) { - logp.Beta("The kubernetes processor is beta") + cfgwarn.Beta("The kubernetes processor is beta") config := defaultKuberentesAnnotatorConfig() diff --git a/libbeat/tests/system/test_base.py b/libbeat/tests/system/test_base.py index 059fe8eb15fb..0bb8ccd1d966 100644 --- a/libbeat/tests/system/test_base.py +++ b/libbeat/tests/system/test_base.py @@ -82,6 +82,21 @@ def test_config_test(self): assert exit_code == 0 assert self.log_contains("Config OK") is True + def test_invalid_config_with_removed_settings(self): + """ + Checks if libbeat fails to load if removed settings have been used: + """ + self.render_config_template(console={"pretty": "false"}) + + exit_code = self.run_beat(extra_args=[ + "-E", "queue_size=2048", + "-E", "bulk_queue_size=1", + ]) + + assert exit_code == 1 + assert self.log_contains("setting 'queue_size' has been removed") + assert self.log_contains("setting 'bulk_queue_size' has been removed") + def test_version_simple(self): """ Tests -version prints a version and exits. diff --git a/metricbeat/beater/metricbeat.go b/metricbeat/beater/metricbeat.go index 8ee48d53ff9a..9df9be605e3a 100644 --- a/metricbeat/beater/metricbeat.go +++ b/metricbeat/beater/metricbeat.go @@ -10,6 +10,7 @@ import ( "github.com/elastic/beats/libbeat/beat" "github.com/elastic/beats/libbeat/cfgfile" "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/libbeat/logp" "github.com/elastic/beats/metricbeat/mb" "github.com/elastic/beats/metricbeat/mb/module" @@ -53,6 +54,13 @@ func New(b *beat.Beat, rawConfig *common.Config) (beat.Beater, error) { } failed := false + + err := cfgwarn.CheckRemoved5xSettings(moduleCfg, "filters") + if err != nil { + errs = append(errs, err) + failed = true + } + connector, err := module.NewConnector(b.Publisher, moduleCfg) if err != nil { errs = append(errs, err) @@ -68,6 +76,7 @@ func New(b *beat.Beat, rawConfig *common.Config) (beat.Beater, error) { if failed { continue } + modules = append(modules, staticModule{ connector: connector, module: module, diff --git a/metricbeat/docs/modules/redis.asciidoc b/metricbeat/docs/modules/redis.asciidoc index 8cbd57ce4067..343a58c14fa8 100644 --- a/metricbeat/docs/modules/redis.asciidoc +++ b/metricbeat/docs/modules/redis.asciidoc @@ -63,9 +63,9 @@ metricbeat.modules: #maxconn: 10 # Filters can be used to reduce the number of fields sent. - #filters: + #processors: # - include_fields: - # fields: ["stats"] + # fields: ["beat", "metricset", "redis.info.stats"] # Redis AUTH password. Empty by default. #password: foobared diff --git a/metricbeat/docs/modules/system.asciidoc b/metricbeat/docs/modules/system.asciidoc index e9ae39dae7c1..4fad8617d311 100644 --- a/metricbeat/docs/modules/system.asciidoc +++ b/metricbeat/docs/modules/system.asciidoc @@ -107,8 +107,9 @@ metricbeat.modules: metricsets: - filesystem - fsstat - filters: - - drop_event.when.regexp.mount_point: '^/(sys|cgroup|proc|dev|etc|host|lib)($|/)' + processors: + - drop_event.when.regexp: + system.filesystem.mount_point: '^/(sys|cgroup|proc|dev|etc|host|lib)($|/)' ---- [float] diff --git a/metricbeat/mb/module/factory.go b/metricbeat/mb/module/factory.go index cf641407f3ac..b2123bd79d15 100644 --- a/metricbeat/mb/module/factory.go +++ b/metricbeat/mb/module/factory.go @@ -3,8 +3,11 @@ package module import ( "time" + "github.com/joeshaw/multierror" + "github.com/elastic/beats/libbeat/cfgfile" "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/libbeat/publisher/bc/publisher" "github.com/elastic/beats/metricbeat/mb" ) @@ -25,13 +28,22 @@ func NewFactory(maxStartDelay time.Duration, p publisher.Publisher) *Factory { } func (r *Factory) Create(c *common.Config) (cfgfile.Runner, error) { + var errs multierror.Errors + + err := cfgwarn.CheckRemoved5xSettings(c, "filters") + if err != nil { + errs = append(errs, err) + } connector, err := NewConnector(r.pipeline, c) if err != nil { - return nil, err + errs = append(errs, err) } - w, err := NewWrapper(r.maxStartDelay, c, mb.Registry) if err != nil { + errs = append(errs, err) + } + + if err := errs.Err(); err != nil { return nil, err } diff --git a/metricbeat/metricbeat.reference.yml b/metricbeat/metricbeat.reference.yml index cfd256846c23..83cef2f00fbb 100644 --- a/metricbeat/metricbeat.reference.yml +++ b/metricbeat/metricbeat.reference.yml @@ -376,9 +376,9 @@ metricbeat.modules: #maxconn: 10 # Filters can be used to reduce the number of fields sent. - #filters: + #processors: # - include_fields: - # fields: ["stats"] + # fields: ["beat", "metricset", "redis.info.stats"] # Redis AUTH password. Empty by default. #password: foobared diff --git a/metricbeat/module/aerospike/namespace/namespace.go b/metricbeat/module/aerospike/namespace/namespace.go index a7c9470636a0..0be932eb2f7a 100644 --- a/metricbeat/module/aerospike/namespace/namespace.go +++ b/metricbeat/module/aerospike/namespace/namespace.go @@ -7,6 +7,7 @@ import ( "github.com/pkg/errors" "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/libbeat/logp" "github.com/elastic/beats/metricbeat/mb" "github.com/elastic/beats/metricbeat/module/aerospike" @@ -35,7 +36,7 @@ type MetricSet struct { func New(base mb.BaseMetricSet) (mb.MetricSet, error) { config := struct{}{} - logp.Experimental("The aerospike namespace metricset is experimental") + cfgwarn.Experimental("The aerospike namespace metricset is experimental") if err := base.Module().UnpackConfig(&config); err != nil { return nil, err diff --git a/metricbeat/module/ceph/cluster_disk/cluster_disk.go b/metricbeat/module/ceph/cluster_disk/cluster_disk.go index a562174b22c2..e0d78f98b6fc 100644 --- a/metricbeat/module/ceph/cluster_disk/cluster_disk.go +++ b/metricbeat/module/ceph/cluster_disk/cluster_disk.go @@ -2,7 +2,7 @@ package cluster_disk import ( "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/metricbeat/helper" "github.com/elastic/beats/metricbeat/mb" "github.com/elastic/beats/metricbeat/mb/parse" @@ -32,7 +32,7 @@ type MetricSet struct { } func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - logp.Experimental("The ceph cluster_disk metricset is experimental") + cfgwarn.Experimental("The ceph cluster_disk metricset is experimental") http := helper.NewHTTP(base) http.SetHeader("Accept", "application/json") diff --git a/metricbeat/module/ceph/cluster_health/cluster_health.go b/metricbeat/module/ceph/cluster_health/cluster_health.go index c209be2b0451..64cf3ebd0cde 100644 --- a/metricbeat/module/ceph/cluster_health/cluster_health.go +++ b/metricbeat/module/ceph/cluster_health/cluster_health.go @@ -2,7 +2,7 @@ package cluster_health import ( "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/metricbeat/helper" "github.com/elastic/beats/metricbeat/mb" "github.com/elastic/beats/metricbeat/mb/parse" @@ -32,7 +32,7 @@ type MetricSet struct { } func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - logp.Beta("The ceph cluster_health metricset is beta") + cfgwarn.Beta("The ceph cluster_health metricset is beta") http := helper.NewHTTP(base) http.SetHeader("Accept", "application/json") diff --git a/metricbeat/module/ceph/monitor_health/monitor_health.go b/metricbeat/module/ceph/monitor_health/monitor_health.go index a16909cdb881..8499d7975808 100644 --- a/metricbeat/module/ceph/monitor_health/monitor_health.go +++ b/metricbeat/module/ceph/monitor_health/monitor_health.go @@ -2,7 +2,7 @@ package monitor_health import ( "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/metricbeat/helper" "github.com/elastic/beats/metricbeat/mb" "github.com/elastic/beats/metricbeat/mb/parse" @@ -32,7 +32,7 @@ type MetricSet struct { } func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - logp.Beta("The ceph monitor_health metricset is beta") + cfgwarn.Beta("The ceph monitor_health metricset is beta") http := helper.NewHTTP(base) http.SetHeader("Accept", "application/json") diff --git a/metricbeat/module/ceph/pool_disk/pool_disk.go b/metricbeat/module/ceph/pool_disk/pool_disk.go index 9686b222e5c6..f430fc178788 100644 --- a/metricbeat/module/ceph/pool_disk/pool_disk.go +++ b/metricbeat/module/ceph/pool_disk/pool_disk.go @@ -2,7 +2,7 @@ package pool_disk import ( "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/metricbeat/helper" "github.com/elastic/beats/metricbeat/mb" "github.com/elastic/beats/metricbeat/mb/parse" @@ -32,7 +32,7 @@ type MetricSet struct { } func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - logp.Experimental("The ceph pool_disk metricset is experimental") + cfgwarn.Experimental("The ceph pool_disk metricset is experimental") http := helper.NewHTTP(base) http.SetHeader("Accept", "application/json") diff --git a/metricbeat/module/couchbase/bucket/bucket.go b/metricbeat/module/couchbase/bucket/bucket.go index 74e7608e9299..41c211796c6c 100644 --- a/metricbeat/module/couchbase/bucket/bucket.go +++ b/metricbeat/module/couchbase/bucket/bucket.go @@ -2,7 +2,7 @@ package bucket import ( "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/metricbeat/helper" "github.com/elastic/beats/metricbeat/mb" "github.com/elastic/beats/metricbeat/mb/parse" @@ -36,7 +36,7 @@ type MetricSet struct { // New create a new instance of the MetricSet func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - logp.Beta("The couchbase bucket metricset is beta") + cfgwarn.Beta("The couchbase bucket metricset is beta") return &MetricSet{ BaseMetricSet: base, diff --git a/metricbeat/module/couchbase/cluster/cluster.go b/metricbeat/module/couchbase/cluster/cluster.go index e6372b4cf501..0e3444a90262 100644 --- a/metricbeat/module/couchbase/cluster/cluster.go +++ b/metricbeat/module/couchbase/cluster/cluster.go @@ -2,7 +2,7 @@ package cluster import ( "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/metricbeat/helper" "github.com/elastic/beats/metricbeat/mb" "github.com/elastic/beats/metricbeat/mb/parse" @@ -36,7 +36,7 @@ type MetricSet struct { // New create a new instance of the MetricSet func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - logp.Beta("The couchbase cluster metricset is beta") + cfgwarn.Beta("The couchbase cluster metricset is beta") return &MetricSet{ BaseMetricSet: base, diff --git a/metricbeat/module/couchbase/node/node.go b/metricbeat/module/couchbase/node/node.go index 201044d5f5d3..c99d696312c6 100644 --- a/metricbeat/module/couchbase/node/node.go +++ b/metricbeat/module/couchbase/node/node.go @@ -2,7 +2,7 @@ package node import ( "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/metricbeat/helper" "github.com/elastic/beats/metricbeat/mb" "github.com/elastic/beats/metricbeat/mb/parse" @@ -36,7 +36,7 @@ type MetricSet struct { // New create a new instance of the MetricSet func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - logp.Beta("The couchbase node metricset is beta") + cfgwarn.Beta("The couchbase node metricset is beta") return &MetricSet{ BaseMetricSet: base, diff --git a/metricbeat/module/docker/container/container.go b/metricbeat/module/docker/container/container.go index 5084fc1a5dd7..72928a381b20 100644 --- a/metricbeat/module/docker/container/container.go +++ b/metricbeat/module/docker/container/container.go @@ -4,7 +4,7 @@ import ( dc "github.com/fsouza/go-dockerclient" "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/metricbeat/mb" "github.com/elastic/beats/metricbeat/module/docker" ) @@ -22,7 +22,7 @@ type MetricSet struct { // New creates a new instance of the docker container MetricSet. func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - logp.Beta("The docker container metricset is beta") + cfgwarn.Beta("The docker container metricset is beta") config := docker.Config{} if err := base.Module().UnpackConfig(&config); err != nil { diff --git a/metricbeat/module/docker/cpu/cpu.go b/metricbeat/module/docker/cpu/cpu.go index 69e4351e2d14..8422893b9f82 100644 --- a/metricbeat/module/docker/cpu/cpu.go +++ b/metricbeat/module/docker/cpu/cpu.go @@ -2,7 +2,7 @@ package cpu import ( "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/metricbeat/mb" "github.com/elastic/beats/metricbeat/module/docker" @@ -23,7 +23,7 @@ type MetricSet struct { // New creates a new instance of the docker cpu MetricSet. func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - logp.Beta("The docker cpu metricset is beta") + cfgwarn.Beta("The docker cpu metricset is beta") config := docker.Config{} if err := base.Module().UnpackConfig(&config); err != nil { diff --git a/metricbeat/module/docker/diskio/diskio.go b/metricbeat/module/docker/diskio/diskio.go index 3c7e8647e4e2..6cfe1fbb1c1f 100644 --- a/metricbeat/module/docker/diskio/diskio.go +++ b/metricbeat/module/docker/diskio/diskio.go @@ -2,7 +2,7 @@ package diskio import ( "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/metricbeat/mb" "github.com/elastic/beats/metricbeat/module/docker" @@ -23,7 +23,7 @@ type MetricSet struct { // New create a new instance of the docker diskio MetricSet. func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - logp.Beta("The docker diskio metricset is beta") + cfgwarn.Beta("The docker diskio metricset is beta") config := docker.Config{} if err := base.Module().UnpackConfig(&config); err != nil { diff --git a/metricbeat/module/docker/healthcheck/healthcheck.go b/metricbeat/module/docker/healthcheck/healthcheck.go index 3d8754ef4514..adf14c5ba78c 100644 --- a/metricbeat/module/docker/healthcheck/healthcheck.go +++ b/metricbeat/module/docker/healthcheck/healthcheck.go @@ -4,7 +4,7 @@ import ( dc "github.com/fsouza/go-dockerclient" "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/metricbeat/mb" "github.com/elastic/beats/metricbeat/module/docker" ) @@ -22,7 +22,7 @@ type MetricSet struct { // New creates a new instance of the docker healthcheck MetricSet. func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - logp.Beta("The docker healthcheck metricset is beta") + cfgwarn.Beta("The docker healthcheck metricset is beta") config := docker.Config{} if err := base.Module().UnpackConfig(&config); err != nil { diff --git a/metricbeat/module/docker/image/image.go b/metricbeat/module/docker/image/image.go index 326216213b4a..5b8facd4a4f3 100644 --- a/metricbeat/module/docker/image/image.go +++ b/metricbeat/module/docker/image/image.go @@ -2,7 +2,7 @@ package image import ( "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/metricbeat/mb" "github.com/elastic/beats/metricbeat/module/docker" @@ -30,7 +30,7 @@ type MetricSet struct { // Part of new is also setting up the configuration by processing additional // configuration entries if needed. func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - logp.Beta("The docker info metricset is beta") + cfgwarn.Beta("The docker info metricset is beta") config := docker.Config{} if err := base.Module().UnpackConfig(&config); err != nil { diff --git a/metricbeat/module/docker/info/info.go b/metricbeat/module/docker/info/info.go index b3094b44928d..d2ba8e80f058 100644 --- a/metricbeat/module/docker/info/info.go +++ b/metricbeat/module/docker/info/info.go @@ -2,7 +2,7 @@ package info import ( "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/metricbeat/mb" "github.com/elastic/beats/metricbeat/module/docker" @@ -22,7 +22,7 @@ type MetricSet struct { // New create a new instance of the docker info MetricSet. func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - logp.Beta("The docker info metricset is beta") + cfgwarn.Beta("The docker info metricset is beta") config := docker.Config{} if err := base.Module().UnpackConfig(&config); err != nil { diff --git a/metricbeat/module/docker/memory/memory.go b/metricbeat/module/docker/memory/memory.go index ee21c66ca4da..c4558e7b5752 100644 --- a/metricbeat/module/docker/memory/memory.go +++ b/metricbeat/module/docker/memory/memory.go @@ -2,7 +2,7 @@ package memory import ( "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/metricbeat/mb" "github.com/elastic/beats/metricbeat/module/docker" @@ -23,7 +23,7 @@ type MetricSet struct { // New creates a new instance of the docker memory MetricSet. func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - logp.Beta("The docker memory metricset is beta") + cfgwarn.Beta("The docker memory metricset is beta") config := docker.Config{} if err := base.Module().UnpackConfig(&config); err != nil { diff --git a/metricbeat/module/docker/network/network.go b/metricbeat/module/docker/network/network.go index a24fc2d218b3..a15c8f8eb62f 100644 --- a/metricbeat/module/docker/network/network.go +++ b/metricbeat/module/docker/network/network.go @@ -2,7 +2,7 @@ package network import ( "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/metricbeat/mb" "github.com/elastic/beats/metricbeat/module/docker" @@ -23,7 +23,7 @@ type MetricSet struct { // New creates a new instance of the docker network MetricSet. func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - logp.Beta("The docker network metricset is beta") + cfgwarn.Beta("The docker network metricset is beta") config := docker.Config{} if err := base.Module().UnpackConfig(&config); err != nil { diff --git a/metricbeat/module/dropwizard/collector/collector.go b/metricbeat/module/dropwizard/collector/collector.go index 5ef209079645..e2adb471a950 100644 --- a/metricbeat/module/dropwizard/collector/collector.go +++ b/metricbeat/module/dropwizard/collector/collector.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/metricbeat/helper" "github.com/elastic/beats/metricbeat/mb" "github.com/elastic/beats/metricbeat/mb/parse" @@ -47,7 +47,7 @@ type MetricSet struct { // Part of new is also setting up the configuration by processing additional // configuration entries if needed. func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - logp.Beta("The dropwizard collector metricset is beta") + cfgwarn.Beta("The dropwizard collector metricset is beta") config := struct { Namespace string `config:"namespace" validate:"required"` }{} diff --git a/metricbeat/module/golang/expvar/expvar.go b/metricbeat/module/golang/expvar/expvar.go index 0d10144270f0..1ffcff816532 100644 --- a/metricbeat/module/golang/expvar/expvar.go +++ b/metricbeat/module/golang/expvar/expvar.go @@ -2,7 +2,7 @@ package expvar import ( "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/metricbeat/helper" "github.com/elastic/beats/metricbeat/mb" "github.com/elastic/beats/metricbeat/mb/parse" @@ -44,7 +44,7 @@ type MetricSet struct { // Part of new is also setting up the configuration by processing additional // configuration entries if needed. func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - logp.Experimental("The golang expvar metricset is experimental") + cfgwarn.Experimental("The golang expvar metricset is experimental") config := struct { Namespace string `config:"expvar.namespace" validate:"required"` diff --git a/metricbeat/module/golang/heap/heap.go b/metricbeat/module/golang/heap/heap.go index 8454b3a893c0..37130502166f 100644 --- a/metricbeat/module/golang/heap/heap.go +++ b/metricbeat/module/golang/heap/heap.go @@ -5,6 +5,7 @@ import ( "runtime" "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/libbeat/logp" "github.com/elastic/beats/metricbeat/helper" "github.com/elastic/beats/metricbeat/mb" @@ -47,7 +48,7 @@ type MetricSet struct { // Part of new is also setting up the configuration by processing additional // configuration entries if needed. func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - logp.Experimental("The golang heap metricset is experimental") + cfgwarn.Experimental("The golang heap metricset is experimental") return &MetricSet{ BaseMetricSet: base, diff --git a/metricbeat/module/http/json/json.go b/metricbeat/module/http/json/json.go index 4d3e083130a5..5b914c2d4345 100644 --- a/metricbeat/module/http/json/json.go +++ b/metricbeat/module/http/json/json.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/metricbeat/helper" "github.com/elastic/beats/metricbeat/mb" "github.com/elastic/beats/metricbeat/mb/parse" @@ -55,7 +55,7 @@ type MetricSet struct { // Part of new is also setting up the configuration by processing additional // configuration entries if needed. func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - logp.Beta("The http json metricset is in beta.") + cfgwarn.Beta("The http json metricset is in beta.") config := struct { Namespace string `config:"namespace" validate:"required"` diff --git a/metricbeat/module/jolokia/jmx/jmx.go b/metricbeat/module/jolokia/jmx/jmx.go index f5ed37248aa4..fe79c3845c59 100644 --- a/metricbeat/module/jolokia/jmx/jmx.go +++ b/metricbeat/module/jolokia/jmx/jmx.go @@ -2,6 +2,7 @@ package jmx import ( "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/libbeat/logp" "github.com/elastic/beats/metricbeat/helper" "github.com/elastic/beats/metricbeat/mb" @@ -48,7 +49,7 @@ type MetricSet struct { // New create a new instance of the MetricSet func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - logp.Beta("The jolokia jmx metricset is beta") + cfgwarn.Beta("The jolokia jmx metricset is beta") // Additional configuration options config := struct { diff --git a/metricbeat/module/kafka/consumergroup/consumergroup.go b/metricbeat/module/kafka/consumergroup/consumergroup.go index 5818ab0d3fff..083d357bf91a 100644 --- a/metricbeat/module/kafka/consumergroup/consumergroup.go +++ b/metricbeat/module/kafka/consumergroup/consumergroup.go @@ -4,6 +4,7 @@ import ( "crypto/tls" "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/libbeat/logp" "github.com/elastic/beats/libbeat/outputs" "github.com/elastic/beats/metricbeat/mb" @@ -36,7 +37,7 @@ var debugf = logp.MakeDebug("kafka") // New creates a new instance of the MetricSet. func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - logp.Beta("The kafka consumergroup metricset is beta") + cfgwarn.Beta("The kafka consumergroup metricset is beta") config := defaultConfig if err := base.Module().UnpackConfig(&config); err != nil { diff --git a/metricbeat/module/kafka/partition/partition.go b/metricbeat/module/kafka/partition/partition.go index 4dfc172d5026..84e2282734f7 100644 --- a/metricbeat/module/kafka/partition/partition.go +++ b/metricbeat/module/kafka/partition/partition.go @@ -5,6 +5,7 @@ import ( "errors" "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/libbeat/logp" "github.com/elastic/beats/libbeat/outputs" "github.com/elastic/beats/metricbeat/mb" @@ -37,7 +38,7 @@ var debugf = logp.MakeDebug("kafka") // New creates a new instance of the partition MetricSet. func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - logp.Beta("The kafka partition metricset is beta") + cfgwarn.Beta("The kafka partition metricset is beta") config := defaultConfig if err := base.Module().UnpackConfig(&config); err != nil { diff --git a/metricbeat/module/kubernetes/container/container.go b/metricbeat/module/kubernetes/container/container.go index 7d2ca4f3e0c0..561bc0faeb37 100644 --- a/metricbeat/module/kubernetes/container/container.go +++ b/metricbeat/module/kubernetes/container/container.go @@ -2,7 +2,7 @@ package container import ( "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/metricbeat/helper" "github.com/elastic/beats/metricbeat/mb" "github.com/elastic/beats/metricbeat/mb/parse" @@ -41,7 +41,7 @@ type MetricSet struct { // Part of new is also setting up the configuration by processing additional // configuration entries if needed. func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - logp.Beta("The kubernetes container metricset is beta") + cfgwarn.Beta("The kubernetes container metricset is beta") return &MetricSet{ BaseMetricSet: base, http: helper.NewHTTP(base), diff --git a/metricbeat/module/kubernetes/event/event.go b/metricbeat/module/kubernetes/event/event.go index 16c6a9280507..a57e6b72b7b7 100644 --- a/metricbeat/module/kubernetes/event/event.go +++ b/metricbeat/module/kubernetes/event/event.go @@ -5,7 +5,7 @@ import ( "io/ioutil" "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/metricbeat/mb" "github.com/ericchiang/k8s" @@ -32,7 +32,7 @@ type MetricSet struct { // Part of new is also setting up the configuration by processing additional // configuration entries if needed. func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - logp.Experimental("The kubernetes event metricset is experimental") + cfgwarn.Experimental("The kubernetes event metricset is experimental") config := defaultKuberentesEventsConfig() diff --git a/metricbeat/module/kubernetes/node/node.go b/metricbeat/module/kubernetes/node/node.go index b7fcba24c416..59be64079b16 100644 --- a/metricbeat/module/kubernetes/node/node.go +++ b/metricbeat/module/kubernetes/node/node.go @@ -2,7 +2,7 @@ package node import ( "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/metricbeat/helper" "github.com/elastic/beats/metricbeat/mb" "github.com/elastic/beats/metricbeat/mb/parse" @@ -41,7 +41,7 @@ type MetricSet struct { // Part of new is also setting up the configuration by processing additional // configuration entries if needed. func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - logp.Beta("The kubernetes node metricset is beta") + cfgwarn.Beta("The kubernetes node metricset is beta") return &MetricSet{ BaseMetricSet: base, http: helper.NewHTTP(base), diff --git a/metricbeat/module/kubernetes/pod/pod.go b/metricbeat/module/kubernetes/pod/pod.go index 86f306cf11b0..60dfbb056a03 100644 --- a/metricbeat/module/kubernetes/pod/pod.go +++ b/metricbeat/module/kubernetes/pod/pod.go @@ -2,7 +2,7 @@ package pod import ( "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/metricbeat/helper" "github.com/elastic/beats/metricbeat/mb" "github.com/elastic/beats/metricbeat/mb/parse" @@ -41,7 +41,7 @@ type MetricSet struct { // Part of new is also setting up the configuration by processing additional // configuration entries if needed. func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - logp.Beta("The kubernetes pod metricset is beta") + cfgwarn.Beta("The kubernetes pod metricset is beta") return &MetricSet{ BaseMetricSet: base, http: helper.NewHTTP(base), diff --git a/metricbeat/module/kubernetes/state_container/state_container.go b/metricbeat/module/kubernetes/state_container/state_container.go index e7e06c1d9c99..6ab5aca2e9bb 100644 --- a/metricbeat/module/kubernetes/state_container/state_container.go +++ b/metricbeat/module/kubernetes/state_container/state_container.go @@ -2,7 +2,7 @@ package state_container import ( "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/metricbeat/helper" "github.com/elastic/beats/metricbeat/mb" "github.com/elastic/beats/metricbeat/mb/parse" @@ -41,7 +41,7 @@ type MetricSet struct { // Part of new is also setting up the configuration by processing additional // configuration entries if needed. func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - logp.Beta("The kubernetes state_container metricset is beta") + cfgwarn.Beta("The kubernetes state_container metricset is beta") return &MetricSet{ BaseMetricSet: base, diff --git a/metricbeat/module/kubernetes/state_deployment/state_deployment.go b/metricbeat/module/kubernetes/state_deployment/state_deployment.go index 78d36451d8f2..31c5740587bf 100644 --- a/metricbeat/module/kubernetes/state_deployment/state_deployment.go +++ b/metricbeat/module/kubernetes/state_deployment/state_deployment.go @@ -2,7 +2,7 @@ package state_deployment import ( "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/metricbeat/helper" "github.com/elastic/beats/metricbeat/mb" "github.com/elastic/beats/metricbeat/mb/parse" @@ -41,7 +41,7 @@ type MetricSet struct { // Part of new is also setting up the configuration by processing additional // configuration entries if needed. func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - logp.Beta("The kubernetes state_deployment metricset is beta") + cfgwarn.Beta("The kubernetes state_deployment metricset is beta") return &MetricSet{ BaseMetricSet: base, diff --git a/metricbeat/module/kubernetes/state_node/state_node.go b/metricbeat/module/kubernetes/state_node/state_node.go index b45cc2c97088..74daa504df0e 100644 --- a/metricbeat/module/kubernetes/state_node/state_node.go +++ b/metricbeat/module/kubernetes/state_node/state_node.go @@ -2,7 +2,7 @@ package state_node import ( "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/metricbeat/helper" "github.com/elastic/beats/metricbeat/mb" "github.com/elastic/beats/metricbeat/mb/parse" @@ -41,7 +41,7 @@ type MetricSet struct { // Part of new is also setting up the configuration by processing additional // configuration entries if needed. func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - logp.Beta("The kubernetes state_node metricset is beta") + cfgwarn.Beta("The kubernetes state_node metricset is beta") return &MetricSet{ BaseMetricSet: base, diff --git a/metricbeat/module/kubernetes/state_pod/state_pod.go b/metricbeat/module/kubernetes/state_pod/state_pod.go index 327f85d5e4ae..ef4c7d349aac 100644 --- a/metricbeat/module/kubernetes/state_pod/state_pod.go +++ b/metricbeat/module/kubernetes/state_pod/state_pod.go @@ -2,7 +2,7 @@ package state_pod import ( "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/metricbeat/helper" "github.com/elastic/beats/metricbeat/mb" "github.com/elastic/beats/metricbeat/mb/parse" @@ -41,7 +41,7 @@ type MetricSet struct { // Part of new is also setting up the configuration by processing additional // configuration entries if needed. func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - logp.Beta("The kubernetes state_pod metricset is beta") + cfgwarn.Beta("The kubernetes state_pod metricset is beta") return &MetricSet{ BaseMetricSet: base, diff --git a/metricbeat/module/kubernetes/state_replicaset/state_replicaset.go b/metricbeat/module/kubernetes/state_replicaset/state_replicaset.go index ba0f046f9136..2240951174f5 100644 --- a/metricbeat/module/kubernetes/state_replicaset/state_replicaset.go +++ b/metricbeat/module/kubernetes/state_replicaset/state_replicaset.go @@ -2,7 +2,7 @@ package state_replicaset import ( "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/metricbeat/helper" "github.com/elastic/beats/metricbeat/mb" "github.com/elastic/beats/metricbeat/mb/parse" @@ -41,7 +41,7 @@ type MetricSet struct { // Part of new is also setting up the configuration by processing additional // configuration entries if needed. func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - logp.Beta("The kubernetes state_replicaset metricset is beta") + cfgwarn.Beta("The kubernetes state_replicaset metricset is beta") return &MetricSet{ BaseMetricSet: base, diff --git a/metricbeat/module/kubernetes/system/system.go b/metricbeat/module/kubernetes/system/system.go index ad3aa430a1fc..bff48e6d72b8 100644 --- a/metricbeat/module/kubernetes/system/system.go +++ b/metricbeat/module/kubernetes/system/system.go @@ -2,7 +2,7 @@ package system import ( "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/metricbeat/helper" "github.com/elastic/beats/metricbeat/mb" "github.com/elastic/beats/metricbeat/mb/parse" @@ -41,7 +41,7 @@ type MetricSet struct { // Part of new is also setting up the configuration by processing additional // configuration entries if needed. func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - logp.Beta("The kubernetes system metricset is beta") + cfgwarn.Beta("The kubernetes system metricset is beta") return &MetricSet{ BaseMetricSet: base, http: helper.NewHTTP(base), diff --git a/metricbeat/module/kubernetes/volume/volume.go b/metricbeat/module/kubernetes/volume/volume.go index 28d22378f923..79c4dac95832 100644 --- a/metricbeat/module/kubernetes/volume/volume.go +++ b/metricbeat/module/kubernetes/volume/volume.go @@ -2,7 +2,7 @@ package volume import ( "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/metricbeat/helper" "github.com/elastic/beats/metricbeat/mb" "github.com/elastic/beats/metricbeat/mb/parse" @@ -41,7 +41,7 @@ type MetricSet struct { // Part of new is also setting up the configuration by processing additional // configuration entries if needed. func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - logp.Beta("The kubernetes volume metricset is beta") + cfgwarn.Beta("The kubernetes volume metricset is beta") return &MetricSet{ BaseMetricSet: base, http: helper.NewHTTP(base), diff --git a/metricbeat/module/memcached/stats/stats.go b/metricbeat/module/memcached/stats/stats.go index b0fc4b3d6a26..faf23ab5e23b 100644 --- a/metricbeat/module/memcached/stats/stats.go +++ b/metricbeat/module/memcached/stats/stats.go @@ -6,7 +6,7 @@ import ( "strings" "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/metricbeat/mb" ) @@ -21,7 +21,7 @@ type MetricSet struct { } func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - logp.Beta("The memcached stats metricset is beta") + cfgwarn.Beta("The memcached stats metricset is beta") return &MetricSet{ BaseMetricSet: base, diff --git a/metricbeat/module/mongodb/dbstats/dbstats.go b/metricbeat/module/mongodb/dbstats/dbstats.go index 19f34a52ecfa..81870e9d13c1 100644 --- a/metricbeat/module/mongodb/dbstats/dbstats.go +++ b/metricbeat/module/mongodb/dbstats/dbstats.go @@ -6,6 +6,7 @@ import ( "gopkg.in/mgo.v2" "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/libbeat/logp" "github.com/elastic/beats/metricbeat/mb" "github.com/elastic/beats/metricbeat/module/mongodb" @@ -34,7 +35,7 @@ type MetricSet struct { // Part of new is also setting up the configuration by processing additional // configuration entries if needed. func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - logp.Experimental("The %v %v metricset is experimental", base.Module().Name(), base.Name()) + cfgwarn.Experimental("The %v %v metricset is experimental", base.Module().Name(), base.Name()) dialInfo, err := mgo.ParseURL(base.HostData().URI) if err != nil { diff --git a/metricbeat/module/php_fpm/pool/pool.go b/metricbeat/module/php_fpm/pool/pool.go index 6c99771c6391..c59f05c8a766 100644 --- a/metricbeat/module/php_fpm/pool/pool.go +++ b/metricbeat/module/php_fpm/pool/pool.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/metricbeat/helper" "github.com/elastic/beats/metricbeat/mb" "github.com/elastic/beats/metricbeat/mb/parse" @@ -39,7 +39,7 @@ type MetricSet struct { // New create a new instance of the MetricSet func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - logp.Beta("The php_fpm pool metricset is beta") + cfgwarn.Beta("The php_fpm pool metricset is beta") return &MetricSet{ base, diff --git a/metricbeat/module/prometheus/collector/collector.go b/metricbeat/module/prometheus/collector/collector.go index cdf917671091..801655609228 100644 --- a/metricbeat/module/prometheus/collector/collector.go +++ b/metricbeat/module/prometheus/collector/collector.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/metricbeat/helper" "github.com/elastic/beats/metricbeat/mb" "github.com/elastic/beats/metricbeat/mb/parse" @@ -36,7 +36,7 @@ type MetricSet struct { } func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - logp.Beta("The prometheus collector metricset is beta") + cfgwarn.Beta("The prometheus collector metricset is beta") config := struct { Namespace string `config:"namespace" validate:"required"` diff --git a/metricbeat/module/prometheus/stats/stats.go b/metricbeat/module/prometheus/stats/stats.go index a805ad854a51..e17c31a4989f 100644 --- a/metricbeat/module/prometheus/stats/stats.go +++ b/metricbeat/module/prometheus/stats/stats.go @@ -4,7 +4,7 @@ import ( "strings" "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/metricbeat/helper" "github.com/elastic/beats/metricbeat/mb" "github.com/elastic/beats/metricbeat/mb/parse" @@ -34,7 +34,7 @@ type MetricSet struct { } func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - logp.Beta("The prometheus stats metricset is beta") + cfgwarn.Beta("The prometheus stats metricset is beta") return &MetricSet{ BaseMetricSet: base, diff --git a/metricbeat/module/rabbitmq/node/node.go b/metricbeat/module/rabbitmq/node/node.go index a7c8ad839784..f10895ee1f88 100644 --- a/metricbeat/module/rabbitmq/node/node.go +++ b/metricbeat/module/rabbitmq/node/node.go @@ -2,7 +2,7 @@ package node import ( "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/metricbeat/helper" "github.com/elastic/beats/metricbeat/mb" "github.com/elastic/beats/metricbeat/mb/parse" @@ -32,7 +32,7 @@ type MetricSet struct { } func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - logp.Experimental("The rabbitmq node metricset is experimental") + cfgwarn.Experimental("The rabbitmq node metricset is experimental") http := helper.NewHTTP(base) http.SetHeader("Accept", "application/json") diff --git a/metricbeat/module/redis/_meta/config.yml b/metricbeat/module/redis/_meta/config.yml index 3f3e29ec5a40..3f5ea513e8a3 100644 --- a/metricbeat/module/redis/_meta/config.yml +++ b/metricbeat/module/redis/_meta/config.yml @@ -21,9 +21,9 @@ #maxconn: 10 # Filters can be used to reduce the number of fields sent. - #filters: + #processors: # - include_fields: - # fields: ["stats"] + # fields: ["beat", "metricset", "redis.info.stats"] # Redis AUTH password. Empty by default. #password: foobared diff --git a/metricbeat/module/system/_meta/config.yml b/metricbeat/module/system/_meta/config.yml index d994e02c2e77..ac2e8ce00d9f 100644 --- a/metricbeat/module/system/_meta/config.yml +++ b/metricbeat/module/system/_meta/config.yml @@ -20,5 +20,6 @@ metricsets: - filesystem - fsstat - filters: - - drop_event.when.regexp.mount_point: '^/(sys|cgroup|proc|dev|etc|host|lib)($|/)' + processors: + - drop_event.when.regexp: + system.filesystem.mount_point: '^/(sys|cgroup|proc|dev|etc|host|lib)($|/)' diff --git a/metricbeat/module/system/core/config.go b/metricbeat/module/system/core/config.go index 7e1a786904c2..ec71d9b4d4f6 100644 --- a/metricbeat/module/system/core/config.go +++ b/metricbeat/module/system/core/config.go @@ -5,7 +5,7 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/libbeat/common/cfgwarn" ) // Core metric types. @@ -23,7 +23,7 @@ type Config struct { // Validate validates the core config. func (c Config) Validate() error { if c.CPUTicks != nil { - logp.Deprecate("6.1", "cpu_ticks is deprecated. Add 'ticks' to the core.metrics list.") + cfgwarn.Deprecate("6.1", "cpu_ticks is deprecated. Add 'ticks' to the core.metrics list.") } if len(c.Metrics) == 0 { diff --git a/metricbeat/module/system/cpu/config.go b/metricbeat/module/system/cpu/config.go index f6953d29c556..a71e96e023c4 100644 --- a/metricbeat/module/system/cpu/config.go +++ b/metricbeat/module/system/cpu/config.go @@ -5,7 +5,7 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/libbeat/common/cfgwarn" ) // CPU metric types. @@ -24,7 +24,7 @@ type Config struct { // Validate validates the cpu config. func (c Config) Validate() error { if c.CPUTicks != nil { - logp.Deprecate("6.1", "cpu_ticks is deprecated. Add 'ticks' to the cpu.metrics list.") + cfgwarn.Deprecate("6.1", "cpu_ticks is deprecated. Add 'ticks' to the cpu.metrics list.") } if len(c.Metrics) == 0 { diff --git a/metricbeat/module/system/process/config.go b/metricbeat/module/system/process/config.go index df4a488c4f48..f89a52e78445 100644 --- a/metricbeat/module/system/process/config.go +++ b/metricbeat/module/system/process/config.go @@ -1,6 +1,6 @@ package process -import "github.com/elastic/beats/libbeat/logp" +import "github.com/elastic/beats/libbeat/common/cfgwarn" // includeTopConfig is the configuration for the "top N processes // filtering" feature @@ -22,7 +22,7 @@ type Config struct { func (c Config) Validate() error { if c.CPUTicks != nil { - logp.Deprecate("6.1", "cpu_ticks is deprecated. Use process.include_cpu_ticks instead") + cfgwarn.Deprecate("6.1", "cpu_ticks is deprecated. Use process.include_cpu_ticks instead") } return nil } diff --git a/metricbeat/module/vsphere/datastore/datastore.go b/metricbeat/module/vsphere/datastore/datastore.go index 519045979d19..954869fdb3d3 100644 --- a/metricbeat/module/vsphere/datastore/datastore.go +++ b/metricbeat/module/vsphere/datastore/datastore.go @@ -5,7 +5,7 @@ import ( "net/url" "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/metricbeat/mb" "github.com/pkg/errors" @@ -29,7 +29,7 @@ type MetricSet struct { } func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - logp.Experimental("The vsphere datastore metricset is experimental") + cfgwarn.Experimental("The vsphere datastore metricset is experimental") config := struct { Username string `config:"username"` diff --git a/metricbeat/module/vsphere/host/host.go b/metricbeat/module/vsphere/host/host.go index 7e9d1cd831ac..5d56815de9f8 100644 --- a/metricbeat/module/vsphere/host/host.go +++ b/metricbeat/module/vsphere/host/host.go @@ -5,7 +5,7 @@ import ( "net/url" "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/metricbeat/mb" "github.com/pkg/errors" @@ -29,7 +29,7 @@ type MetricSet struct { } func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - logp.Experimental("The vsphere host metricset is experimental") + cfgwarn.Experimental("The vsphere host metricset is experimental") config := struct { Username string `config:"username"` diff --git a/metricbeat/module/vsphere/virtualmachine/virtualmachine.go b/metricbeat/module/vsphere/virtualmachine/virtualmachine.go index 2b211800ab74..48baff743139 100644 --- a/metricbeat/module/vsphere/virtualmachine/virtualmachine.go +++ b/metricbeat/module/vsphere/virtualmachine/virtualmachine.go @@ -7,7 +7,7 @@ import ( "sync" "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/metricbeat/mb" "github.com/pkg/errors" @@ -33,7 +33,7 @@ type MetricSet struct { } func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - logp.Experimental("The vsphere virtualmachine metricset is experimental") + cfgwarn.Experimental("The vsphere virtualmachine metricset is experimental") config := struct { Username string `config:"username"` diff --git a/metricbeat/module/windows/perfmon/perfmon.go b/metricbeat/module/windows/perfmon/perfmon.go index fbdf2b0df4c5..002d9a31e845 100644 --- a/metricbeat/module/windows/perfmon/perfmon.go +++ b/metricbeat/module/windows/perfmon/perfmon.go @@ -9,7 +9,7 @@ import ( "github.com/pkg/errors" "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/metricbeat/mb" ) @@ -33,7 +33,7 @@ type MetricSet struct { // New create a new instance of the MetricSet. func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - logp.Beta("The perfmon metricset is beta") + cfgwarn.Beta("The perfmon metricset is beta") config := struct { CounterConfig []CounterConfig `config:"perfmon.counters" validate:"required"` diff --git a/metricbeat/modules.d/redis.yml.disabled b/metricbeat/modules.d/redis.yml.disabled index 3f3e29ec5a40..3f5ea513e8a3 100644 --- a/metricbeat/modules.d/redis.yml.disabled +++ b/metricbeat/modules.d/redis.yml.disabled @@ -21,9 +21,9 @@ #maxconn: 10 # Filters can be used to reduce the number of fields sent. - #filters: + #processors: # - include_fields: - # fields: ["stats"] + # fields: ["beat", "metricset", "redis.info.stats"] # Redis AUTH password. Empty by default. #password: foobared diff --git a/metricbeat/modules.d/system.yml b/metricbeat/modules.d/system.yml index d994e02c2e77..ac2e8ce00d9f 100644 --- a/metricbeat/modules.d/system.yml +++ b/metricbeat/modules.d/system.yml @@ -20,5 +20,6 @@ metricsets: - filesystem - fsstat - filters: - - drop_event.when.regexp.mount_point: '^/(sys|cgroup|proc|dev|etc|host|lib)($|/)' + processors: + - drop_event.when.regexp: + system.filesystem.mount_point: '^/(sys|cgroup|proc|dev|etc|host|lib)($|/)' diff --git a/metricbeat/tests/system/test_config.py b/metricbeat/tests/system/test_config.py index 04f473468024..e3602f7da469 100644 --- a/metricbeat/tests/system/test_config.py +++ b/metricbeat/tests/system/test_config.py @@ -65,5 +65,23 @@ def test_compare_config(self): assert same == True + def test_invalid_config_with_removed_settings(self): + """ + Checks if metricbeat fails to load a module if remove settings have been used: + """ + self.render_config_template(modules=[{ + "name": "system", + "metricsets": ["cpu"], + "period": "5s", + }]) + + exit_code = self.run_beat(extra_args=[ + "-E", + "metricbeat.modules.0.filters.0.include_fields='field1,field2'" + ]) + assert exit_code == 1 + assert self.log_contains("setting 'metricbeat.modules.0.filters'" + " has been removed") + def get_host(self): return 'http://' + os.getenv('ELASTICSEARCH_HOST', 'localhost') + ':' + os.getenv('ELASTICSEARCH_PORT', '9200') diff --git a/packetbeat/protos/protos.go b/packetbeat/protos/protos.go index 45da9e8ae504..c5f0bee8afb6 100644 --- a/packetbeat/protos/protos.go +++ b/packetbeat/protos/protos.go @@ -8,6 +8,7 @@ import ( "time" "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/libbeat/logp" "github.com/elastic/beats/libbeat/publisher/beat" ) @@ -97,7 +98,7 @@ func (s ProtocolsStruct) Init( listConfigs []*common.Config, ) error { if len(configs) > 0 { - logp.Deprecate("7.0.0", "dictionary style protocols configuration has been deprecated. Please use list-style protocols configuration.") + cfgwarn.Deprecate("7.0.0", "dictionary style protocols configuration has been deprecated. Please use list-style protocols configuration.") } for proto := range protocolSyms {