From a8f2728cf9b0b2bfcb5e9160e310099938b8924d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20P=C3=A9rez-Aradros=20Herce?= Date: Fri, 20 Apr 2018 12:33:49 +0200 Subject: [PATCH 1/8] Unify default module configurations Since we split module configurations into modules.d folder, we can keep configurations more verbose, so users can have a quick reference when opening them for editing. This change unifies configuration files using the followin rules: * Write at least the following settings, in this order: `module`, `metricsets`, `period`, `hosts`. * Default metricsets list shown as it helps to know what's the list, or disable just one. Inline if there is only one metricset, one line per metricset if there is more than one. * Some modules have exceptions and include more definitions, different defaults. * Comments are allowed (and encouraged), both to explain a setting and to suggest a full configuration. * `enabled` setting is not shown at all, modules are enabled by using `metricbeat modules enable `. Use comments to suggest settings that are disabled by default. --- metricbeat/docs/modules/golang.asciidoc | 4 ++- metricbeat/docs/modules/jolokia.asciidoc | 24 ++++++++------- metricbeat/metricbeat.reference.yml | 28 +++++++++++------- metricbeat/module/aerospike/_meta/config.yml | 2 ++ metricbeat/module/apache/_meta/config.yml | 2 ++ metricbeat/module/ceph/_meta/config.yml | 13 +++++++-- metricbeat/module/couchbase/_meta/config.yml | 5 ++++ metricbeat/module/docker/_meta/config.yml | 15 ++++++++++ metricbeat/module/dropwizard/_meta/config.yml | 2 ++ .../module/elasticsearch/_meta/config.yml | 4 +++ metricbeat/module/etcd/_meta/config.yml | 5 ++++ metricbeat/module/golang/_meta/config.yml | 4 ++- metricbeat/module/graphite/_meta/config.yml | 7 +++++ metricbeat/module/haproxy/_meta/config.yml | 4 +++ metricbeat/module/jolokia/_meta/config.yml | 24 ++++++++------- metricbeat/module/kafka/_meta/config.yml | 25 ++++++++++++++++ metricbeat/module/kibana/_meta/config.yml | 2 ++ metricbeat/module/kubernetes/_meta/config.yml | 26 +++++++++++++++-- metricbeat/module/kvm/_meta/config.yml | 2 ++ metricbeat/module/logstash/_meta/config.yml | 4 +++ metricbeat/module/memcached/_meta/config.yml | 2 ++ metricbeat/module/mongodb/_meta/config.yml | 16 ++++++++++ metricbeat/module/munin/_meta/config.yml | 2 ++ metricbeat/module/mysql/_meta/config.yml | 17 ++++++++++- metricbeat/module/nginx/_meta/config.yml | 7 +++++ metricbeat/module/php_fpm/_meta/config.yml | 3 ++ metricbeat/module/postgresql/_meta/config.yml | 22 ++++++++++++++ metricbeat/module/prometheus/_meta/config.yml | 2 ++ metricbeat/module/rabbitmq/_meta/config.yml | 8 +++++ metricbeat/module/redis/_meta/config.yml | 29 +++++++++++++++++++ metricbeat/module/system/_meta/config.yml | 28 +++++++++++------- metricbeat/module/uwsgi/_meta/config.yml | 2 ++ metricbeat/module/vsphere/_meta/config.yml | 1 + metricbeat/module/windows/_meta/config.yml | 8 ++++- metricbeat/module/zookeeper/_meta/config.yml | 1 + metricbeat/modules.d/aerospike.yml.disabled | 2 ++ metricbeat/modules.d/apache.yml.disabled | 2 ++ metricbeat/modules.d/ceph.yml.disabled | 13 +++++++-- metricbeat/modules.d/couchbase.yml.disabled | 5 ++++ metricbeat/modules.d/docker.yml.disabled | 15 ++++++++++ metricbeat/modules.d/dropwizard.yml.disabled | 2 ++ .../modules.d/elasticsearch.yml.disabled | 4 +++ metricbeat/modules.d/etcd.yml.disabled | 5 ++++ metricbeat/modules.d/golang.yml.disabled | 4 ++- metricbeat/modules.d/graphite.yml.disabled | 7 +++++ metricbeat/modules.d/haproxy.yml.disabled | 4 +++ metricbeat/modules.d/jolokia.yml.disabled | 24 ++++++++------- metricbeat/modules.d/kafka.yml.disabled | 25 ++++++++++++++++ metricbeat/modules.d/kibana.yml.disabled | 2 ++ metricbeat/modules.d/kubernetes.yml.disabled | 26 +++++++++++++++-- metricbeat/modules.d/kvm.yml.disabled | 2 ++ metricbeat/modules.d/logstash.yml.disabled | 4 +++ metricbeat/modules.d/memcached.yml.disabled | 2 ++ metricbeat/modules.d/mongodb.yml.disabled | 16 ++++++++++ metricbeat/modules.d/munin.yml.disabled | 2 ++ metricbeat/modules.d/mysql.yml.disabled | 17 ++++++++++- metricbeat/modules.d/nginx.yml.disabled | 7 +++++ metricbeat/modules.d/php_fpm.yml.disabled | 3 ++ metricbeat/modules.d/postgresql.yml.disabled | 22 ++++++++++++++ metricbeat/modules.d/prometheus.yml.disabled | 2 ++ metricbeat/modules.d/rabbitmq.yml.disabled | 8 +++++ metricbeat/modules.d/redis.yml.disabled | 29 +++++++++++++++++++ metricbeat/modules.d/system.yml | 28 +++++++++++------- metricbeat/modules.d/uwsgi.yml.disabled | 2 ++ metricbeat/modules.d/vsphere.yml.disabled | 1 + metricbeat/modules.d/windows.yml.disabled | 8 ++++- metricbeat/modules.d/zookeeper.yml.disabled | 1 + 67 files changed, 566 insertions(+), 78 deletions(-) diff --git a/metricbeat/docs/modules/golang.asciidoc b/metricbeat/docs/modules/golang.asciidoc index d23b3cb2654..fcf2f5385df 100644 --- a/metricbeat/docs/modules/golang.asciidoc +++ b/metricbeat/docs/modules/golang.asciidoc @@ -20,7 +20,9 @@ in <>. Here is an example configuration: ---- metricbeat.modules: - module: golang - metricsets: ["expvar","heap"] + metricsets: + - expvar + - heap period: 10s hosts: ["localhost:6060"] heap.path: "/debug/vars" diff --git a/metricbeat/docs/modules/jolokia.asciidoc b/metricbeat/docs/modules/jolokia.asciidoc index a5c80a2a390..87aef19ce7a 100644 --- a/metricbeat/docs/modules/jolokia.asciidoc +++ b/metricbeat/docs/modules/jolokia.asciidoc @@ -23,17 +23,18 @@ metricbeat.modules: period: 10s hosts: ["localhost"] namespace: "metrics" + #path: "/jolokia/?ignoreErrors=true&canonicalNaming=false" jmx.mappings: - - mbean: 'java.lang:type=Runtime' - attributes: - - attr: Uptime - field: uptime - - mbean: 'java.lang:type=Memory' - attributes: - - attr: HeapMemoryUsage - field: memory.heap_usage - - attr: NonHeapMemoryUsage - field: memory.non_heap_usage + # - mbean: 'java.lang:type=Runtime' + # attributes: + # - attr: Uptime + # field: uptime + # - mbean: 'java.lang:type=Memory' + # attributes: + # - attr: HeapMemoryUsage + # field: memory.heap_usage + # - attr: NonHeapMemoryUsage + # field: memory.non_heap_usage # GC Metrics - this depends on what is available on your JVM # - mbean: 'java.lang:type=GarbageCollector,name=ConcurrentMarkSweep' # attributes: @@ -41,6 +42,9 @@ metricbeat.modules: # field: gc.cms_collection_time # - attr: CollectionCount # field: gc.cms_collection_count + + jmx.application: + jmx.instance: ---- This module supports TLS connection when using `ssl` config field, as described in <>. diff --git a/metricbeat/metricbeat.reference.yml b/metricbeat/metricbeat.reference.yml index 92361aa1e2d..7ec9304a221 100644 --- a/metricbeat/metricbeat.reference.yml +++ b/metricbeat/metricbeat.reference.yml @@ -210,7 +210,9 @@ metricbeat.modules: #------------------------------- Golang Module ------------------------------- - module: golang - metricsets: ["expvar","heap"] + metricsets: + - expvar + - heap period: 10s hosts: ["localhost:6060"] heap.path: "/debug/vars" @@ -280,17 +282,18 @@ metricbeat.modules: period: 10s hosts: ["localhost"] namespace: "metrics" + #path: "/jolokia/?ignoreErrors=true&canonicalNaming=false" jmx.mappings: - - mbean: 'java.lang:type=Runtime' - attributes: - - attr: Uptime - field: uptime - - mbean: 'java.lang:type=Memory' - attributes: - - attr: HeapMemoryUsage - field: memory.heap_usage - - attr: NonHeapMemoryUsage - field: memory.non_heap_usage + # - mbean: 'java.lang:type=Runtime' + # attributes: + # - attr: Uptime + # field: uptime + # - mbean: 'java.lang:type=Memory' + # attributes: + # - attr: HeapMemoryUsage + # field: memory.heap_usage + # - attr: NonHeapMemoryUsage + # field: memory.non_heap_usage # GC Metrics - this depends on what is available on your JVM # - mbean: 'java.lang:type=GarbageCollector,name=ConcurrentMarkSweep' # attributes: @@ -299,6 +302,9 @@ metricbeat.modules: # - attr: CollectionCount # field: gc.cms_collection_count + jmx.application: + jmx.instance: + #-------------------------------- Kafka Module ------------------------------- - module: kafka metricsets: ["consumergroup", "partition"] diff --git a/metricbeat/module/aerospike/_meta/config.yml b/metricbeat/module/aerospike/_meta/config.yml index 0a4a883f474..443cb556825 100644 --- a/metricbeat/module/aerospike/_meta/config.yml +++ b/metricbeat/module/aerospike/_meta/config.yml @@ -1,2 +1,4 @@ - module: aerospike + metricsets: ["namespace"] + period: 10s hosts: ["localhost:3000"] diff --git a/metricbeat/module/apache/_meta/config.yml b/metricbeat/module/apache/_meta/config.yml index 17815f93344..9b5a0b9bda6 100644 --- a/metricbeat/module/apache/_meta/config.yml +++ b/metricbeat/module/apache/_meta/config.yml @@ -1,2 +1,4 @@ - module: apache + metricsets: ["status"] + period: 10s hosts: ["http://127.0.0.1"] diff --git a/metricbeat/module/ceph/_meta/config.yml b/metricbeat/module/ceph/_meta/config.yml index ba19a8fa59f..42838f6177e 100644 --- a/metricbeat/module/ceph/_meta/config.yml +++ b/metricbeat/module/ceph/_meta/config.yml @@ -1,7 +1,16 @@ - module: ceph - metricsets: ["cluster_health", "cluster_status", "monitor_health"] + metricsets: + - cluster_health + - cluster_status + - monitor_health period: 10s + hosts: ["localhost:5000"] - module: ceph - metricsets: ["cluster_disk", "osd_tree", "pool_disk"] + metricsets: + - cluster_disk + - osd_tree + - osd_df + - pool_disk period: 1m + hosts: ["localhost:5000"] diff --git a/metricbeat/module/couchbase/_meta/config.yml b/metricbeat/module/couchbase/_meta/config.yml index ea168be3971..6d62238dfea 100644 --- a/metricbeat/module/couchbase/_meta/config.yml +++ b/metricbeat/module/couchbase/_meta/config.yml @@ -1,2 +1,7 @@ - module: couchbase + metricsets: + - bucket + - cluster + - node + period: 10s hosts: ["localhost:8091"] diff --git a/metricbeat/module/docker/_meta/config.yml b/metricbeat/module/docker/_meta/config.yml index 5b25e17f678..8b5950fc339 100644 --- a/metricbeat/module/docker/_meta/config.yml +++ b/metricbeat/module/docker/_meta/config.yml @@ -1,5 +1,20 @@ - module: docker + metricsets: + - container + - cpu + - diskio + - healthcheck + - info + - memory + - network + period: 10s hosts: ["unix:///var/run/docker.sock"] # Replace dots in labels with `_`. Set to false to keep dots labels.dedot: true + + # To connect to Docker over TLS you must specify a client and CA certificate. + #ssl: + #certificate_authority: "/etc/pki/root/ca.pem" + #certificate: "/etc/pki/client/cert.pem" + #key: "/etc/pki/client/cert.key" diff --git a/metricbeat/module/dropwizard/_meta/config.yml b/metricbeat/module/dropwizard/_meta/config.yml index 8f4bb7d0dc7..6dfa3755ca0 100644 --- a/metricbeat/module/dropwizard/_meta/config.yml +++ b/metricbeat/module/dropwizard/_meta/config.yml @@ -1,4 +1,6 @@ - module: dropwizard + metricsets: ["collector"] + period: 10s hosts: ["localhost:8080"] metrics_path: /metrics/metrics namespace: example diff --git a/metricbeat/module/elasticsearch/_meta/config.yml b/metricbeat/module/elasticsearch/_meta/config.yml index bbb7ff0c47d..74450f0b6ab 100644 --- a/metricbeat/module/elasticsearch/_meta/config.yml +++ b/metricbeat/module/elasticsearch/_meta/config.yml @@ -1,2 +1,6 @@ - module: elasticsearch + metricsets: + - node + - node_stats + period: 10s hosts: ["localhost:9200"] diff --git a/metricbeat/module/etcd/_meta/config.yml b/metricbeat/module/etcd/_meta/config.yml index 38142c4a03a..5f6eb5da829 100644 --- a/metricbeat/module/etcd/_meta/config.yml +++ b/metricbeat/module/etcd/_meta/config.yml @@ -1,2 +1,7 @@ - module: etcd + metricsets: + - leader + - self + - store + period: 10s hosts: ["localhost:2379"] diff --git a/metricbeat/module/golang/_meta/config.yml b/metricbeat/module/golang/_meta/config.yml index ba9db8e1089..d2750e803b4 100644 --- a/metricbeat/module/golang/_meta/config.yml +++ b/metricbeat/module/golang/_meta/config.yml @@ -1,5 +1,7 @@ - module: golang - metricsets: ["expvar","heap"] + metricsets: + - expvar + - heap period: 10s hosts: ["localhost:6060"] heap.path: "/debug/vars" diff --git a/metricbeat/module/graphite/_meta/config.yml b/metricbeat/module/graphite/_meta/config.yml index 2c6ac0e784b..ac9f2d8fe80 100644 --- a/metricbeat/module/graphite/_meta/config.yml +++ b/metricbeat/module/graphite/_meta/config.yml @@ -1 +1,8 @@ - module: graphite + metricsets: ["server"] +# protocol: "udp" +# templates: +# - filter: "test.*.bash.*" # This would match metrics like test.localhost.bash.stats +# namespace: "test" +# template: ".host.shell.metric*" # test.localhost.bash.stats would become metric=stats and tags host=localhost,shell=bash +# delimiter: "_" diff --git a/metricbeat/module/haproxy/_meta/config.yml b/metricbeat/module/haproxy/_meta/config.yml index 203e1cc772f..f787ade55a0 100644 --- a/metricbeat/module/haproxy/_meta/config.yml +++ b/metricbeat/module/haproxy/_meta/config.yml @@ -1,2 +1,6 @@ - module: haproxy + metricsets: + - info + - stat + period: 10s hosts: ["tcp://127.0.0.1:14567"] diff --git a/metricbeat/module/jolokia/_meta/config.yml b/metricbeat/module/jolokia/_meta/config.yml index af6de7b42d4..f7d1892f94e 100644 --- a/metricbeat/module/jolokia/_meta/config.yml +++ b/metricbeat/module/jolokia/_meta/config.yml @@ -3,17 +3,18 @@ period: 10s hosts: ["localhost"] namespace: "metrics" + #path: "/jolokia/?ignoreErrors=true&canonicalNaming=false" jmx.mappings: - - mbean: 'java.lang:type=Runtime' - attributes: - - attr: Uptime - field: uptime - - mbean: 'java.lang:type=Memory' - attributes: - - attr: HeapMemoryUsage - field: memory.heap_usage - - attr: NonHeapMemoryUsage - field: memory.non_heap_usage + # - mbean: 'java.lang:type=Runtime' + # attributes: + # - attr: Uptime + # field: uptime + # - mbean: 'java.lang:type=Memory' + # attributes: + # - attr: HeapMemoryUsage + # field: memory.heap_usage + # - attr: NonHeapMemoryUsage + # field: memory.non_heap_usage # GC Metrics - this depends on what is available on your JVM # - mbean: 'java.lang:type=GarbageCollector,name=ConcurrentMarkSweep' # attributes: @@ -21,3 +22,6 @@ # field: gc.cms_collection_time # - attr: CollectionCount # field: gc.cms_collection_count + + jmx.application: + jmx.instance: diff --git a/metricbeat/module/kafka/_meta/config.yml b/metricbeat/module/kafka/_meta/config.yml index f9db371184a..8b0b8434b53 100644 --- a/metricbeat/module/kafka/_meta/config.yml +++ b/metricbeat/module/kafka/_meta/config.yml @@ -1,2 +1,27 @@ - module: kafka + metricsets: + - partition + - consumergroup + period: 10s hosts: ["localhost:9092"] + + #client_id: metricbeat + #retries: 3 + #backoff: 250ms + + # List of Topics to query metadata for. If empty, all topics will be queried. + #topics: [] + + # Optional SSL. By default is off. + # List of root certificates for HTTPS server verifications + #ssl.certificate_authorities: ["/etc/pki/root/ca.pem"] + + # Certificate for SSL client authentication + #ssl.certificate: "/etc/pki/client/cert.pem" + + # Client Certificate Key + #ssl.key: "/etc/pki/client/cert.key" + + # SASL authentication + #username: "" + #password: "" diff --git a/metricbeat/module/kibana/_meta/config.yml b/metricbeat/module/kibana/_meta/config.yml index a1252a5d9bc..09a30295679 100644 --- a/metricbeat/module/kibana/_meta/config.yml +++ b/metricbeat/module/kibana/_meta/config.yml @@ -1,2 +1,4 @@ - module: kibana + metricsets: ["status"] + period: 10s hosts: ["localhost:5601"] diff --git a/metricbeat/module/kubernetes/_meta/config.yml b/metricbeat/module/kubernetes/_meta/config.yml index 1bd81376021..e9286692370 100644 --- a/metricbeat/module/kubernetes/_meta/config.yml +++ b/metricbeat/module/kubernetes/_meta/config.yml @@ -1,8 +1,30 @@ +# Node metrics, from kubelet: - module: kubernetes metricsets: - - container - node - - pod - system + - pod + - container - volume + period: 10s hosts: ["localhost:10255"] + #ssl.certificate_authorities: ["/etc/pki/root/ca.pem"] + #ssl.certificate: "/etc/pki/client/cert.pem" + #ssl.key: "/etc/pki/client/cert.key" + +# State metrics from kube-state-metrics service: +# - module: kubernetes +# metricsets: +# - state_node +# - state_deployment +# - state_replicaset +# - state_statefulset +# - state_pod +# - state_container +# period: 10s +# hosts: ["kube-state-metrics:8080"] + +# Kubernetes events +# - module: kubernetes +# metricsets: +# - event diff --git a/metricbeat/module/kvm/_meta/config.yml b/metricbeat/module/kvm/_meta/config.yml index cbed13e7fdd..a144d706fd8 100644 --- a/metricbeat/module/kvm/_meta/config.yml +++ b/metricbeat/module/kvm/_meta/config.yml @@ -1,2 +1,4 @@ - module: kvm + metricsets: ["dommemstat"] + period: 10s hosts: ["localhost"] diff --git a/metricbeat/module/logstash/_meta/config.yml b/metricbeat/module/logstash/_meta/config.yml index 73b63b016e1..3d1cb5fcd0f 100644 --- a/metricbeat/module/logstash/_meta/config.yml +++ b/metricbeat/module/logstash/_meta/config.yml @@ -1,2 +1,6 @@ - module: logstash + metricsets: + - node + - node_stats + period: 10s hosts: ["localhost:9600"] diff --git a/metricbeat/module/memcached/_meta/config.yml b/metricbeat/module/memcached/_meta/config.yml index f1f6533d677..1b230087fab 100644 --- a/metricbeat/module/memcached/_meta/config.yml +++ b/metricbeat/module/memcached/_meta/config.yml @@ -1,2 +1,4 @@ - module: memcached + metricsets: ["stats"] + period: 10s hosts: ["localhost:11211"] diff --git a/metricbeat/module/mongodb/_meta/config.yml b/metricbeat/module/mongodb/_meta/config.yml index f22fc37872d..e620efc796f 100644 --- a/metricbeat/module/mongodb/_meta/config.yml +++ b/metricbeat/module/mongodb/_meta/config.yml @@ -1,2 +1,18 @@ - module: mongodb + metricsets: + - dbstats + - status + period: 10s + + # The hosts must be passed as MongoDB URLs in the format: + # [mongodb://][user:pass@]host[:port]. + # The username and password can also be set using the respective configuration + # options. The credentials in the URL take precedence over the username and + # password configuration options. hosts: ["localhost:27017"] + + # Username to use when connecting to MongoDB. Empty by default. + #username: user + + # Password to use when connecting to MongoDB. Empty by default. + #password: pass diff --git a/metricbeat/module/munin/_meta/config.yml b/metricbeat/module/munin/_meta/config.yml index 1ea9bf8c854..9e22e743a6d 100644 --- a/metricbeat/module/munin/_meta/config.yml +++ b/metricbeat/module/munin/_meta/config.yml @@ -1,3 +1,5 @@ - module: munin + metricsets: ["node"] + period: 10s hosts: ["localhost:4949"] node.namespace: node diff --git a/metricbeat/module/mysql/_meta/config.yml b/metricbeat/module/mysql/_meta/config.yml index 8855531cdca..afff5ff7201 100644 --- a/metricbeat/module/mysql/_meta/config.yml +++ b/metricbeat/module/mysql/_meta/config.yml @@ -1,2 +1,17 @@ - module: mysql - hosts: ["tcp(127.0.0.1:3306)/"] + metricsets: ["status"] + period: 10s + + # Host DSN should be defined as "user:pass@tcp(127.0.0.1:3306)/" + # The username and password can either be set in the DSN or using the username + # and password config options. Those specified in the DSN take precedence. + hosts: ["root:secret@tcp(127.0.0.1:3306)/"] + + # Username of hosts. Empty by default. + #username: root + + # Password of hosts. Empty by default. + #password: secret + + # By setting raw to true, all raw fields from the status metricset will be added to the event. + #raw: false diff --git a/metricbeat/module/nginx/_meta/config.yml b/metricbeat/module/nginx/_meta/config.yml index e24bd89b965..e3737ed986e 100644 --- a/metricbeat/module/nginx/_meta/config.yml +++ b/metricbeat/module/nginx/_meta/config.yml @@ -1,2 +1,9 @@ - module: nginx + metricsets: ["stubstatus"] + period: 10s + + # Nginx hosts hosts: ["http://127.0.0.1"] + + # Path to server status. Default server-status + #server_status_path: "server-status" diff --git a/metricbeat/module/php_fpm/_meta/config.yml b/metricbeat/module/php_fpm/_meta/config.yml index 508aba58bda..e1004550895 100644 --- a/metricbeat/module/php_fpm/_meta/config.yml +++ b/metricbeat/module/php_fpm/_meta/config.yml @@ -1,2 +1,5 @@ - module: php_fpm + metricsets: ["pool"] + period: 10s hosts: ["localhost:8080"] + status_path: "/status" diff --git a/metricbeat/module/postgresql/_meta/config.yml b/metricbeat/module/postgresql/_meta/config.yml index 8adc44083fc..383c66d9f4f 100644 --- a/metricbeat/module/postgresql/_meta/config.yml +++ b/metricbeat/module/postgresql/_meta/config.yml @@ -1,2 +1,24 @@ - module: postgresql + metricsets: + # Stats about every PostgreSQL database + - database + + # Stats about the background writer process's activity + - bgwriter + + # Stats about every PostgreSQL process + - activity + + period: 10s + + # The host must be passed as PostgreSQL URL. Example: + # postgres://localhost:5432?sslmode=disable + # The available parameters are documented here: + # https://godoc.org/github.com/lib/pq#hdr-Connection_String_Parameters hosts: ["postgres://localhost:5432"] + + # Username to use when connecting to PostgreSQL. Empty by default. + #username: user + + # Password to use when connecting to PostgreSQL. Empty by default. + #password: pass diff --git a/metricbeat/module/prometheus/_meta/config.yml b/metricbeat/module/prometheus/_meta/config.yml index 4990104ef41..76bee349195 100644 --- a/metricbeat/module/prometheus/_meta/config.yml +++ b/metricbeat/module/prometheus/_meta/config.yml @@ -1,4 +1,6 @@ - module: prometheus + metricsets: ["stats"] period: 10s hosts: ["localhost:9090"] + metrics_path: /metrics #namespace: example diff --git a/metricbeat/module/rabbitmq/_meta/config.yml b/metricbeat/module/rabbitmq/_meta/config.yml index b5912718c76..694ea597dcc 100644 --- a/metricbeat/module/rabbitmq/_meta/config.yml +++ b/metricbeat/module/rabbitmq/_meta/config.yml @@ -1,2 +1,10 @@ - module: rabbitmq + metricsets: + - node + - queue + - connection + period: 10s hosts: ["localhost:15672"] + + username: guest + password: guest diff --git a/metricbeat/module/redis/_meta/config.yml b/metricbeat/module/redis/_meta/config.yml index e4ad9bb95e3..243382d8edc 100644 --- a/metricbeat/module/redis/_meta/config.yml +++ b/metricbeat/module/redis/_meta/config.yml @@ -1,2 +1,31 @@ - module: redis + metricsets: + - info + - keyspace + period: 10s + + # Redis hosts hosts: ["127.0.0.1:6379"] + + # Timeout after which time a metricset should return an error + # Timeout is by default defined as period, as a fetch of a metricset + # should never take longer then period, as otherwise calls can pile up. + #timeout: 1s + + # Optional fields to be added to each event + #fields: + # datacenter: west + + # Network type to be used for redis connection. Default: tcp + #network: tcp + + # Max number of concurrent connections. Default: 10 + #maxconn: 10 + + # Filters can be used to reduce the number of fields sent. + #processors: + # - include_fields: + # 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 82a6338cea4..becb28b9b3d 100644 --- a/metricbeat/module/system/_meta/config.yml +++ b/metricbeat/module/system/_meta/config.yml @@ -1,14 +1,20 @@ - module: system + period: 10s + metricsets: + - cpu + - load + - memory + - network + - process + - process_summary + #- core + #- diskio + #- socket + processes: ['.*'] process.include_top_n: by_cpu: 5 # include top 5 processes by CPU by_memory: 5 # include top 5 processes by memory -#- module: system -# metricsets: -# - core -# - diskio -# - socket - - module: system period: 1m metricsets: @@ -23,8 +29,8 @@ metricsets: - uptime -#- module: system -# period: 5m -# metricsets: -# - raid -# raid.mount_point: '/' +# - module: system +# period: 5m +# metricsets: +# - raid +# raid.mount_point: '/' diff --git a/metricbeat/module/uwsgi/_meta/config.yml b/metricbeat/module/uwsgi/_meta/config.yml index e16ad9be6d1..46dbc35d4b8 100644 --- a/metricbeat/module/uwsgi/_meta/config.yml +++ b/metricbeat/module/uwsgi/_meta/config.yml @@ -1,2 +1,4 @@ - module: uwsgi + metricsets: ["status"] + period: 10s hosts: ["tcp://127.0.0.1:9191"] diff --git a/metricbeat/module/vsphere/_meta/config.yml b/metricbeat/module/vsphere/_meta/config.yml index d2badbc4c0e..c53563791d0 100644 --- a/metricbeat/module/vsphere/_meta/config.yml +++ b/metricbeat/module/vsphere/_meta/config.yml @@ -1,4 +1,5 @@ - module: vsphere + metricsets: ["datastore", "host", "virtualmachine"] period: 10s hosts: ["https://localhost/sdk"] diff --git a/metricbeat/module/windows/_meta/config.yml b/metricbeat/module/windows/_meta/config.yml index 866e00010f8..1ad5aaeb2d8 100644 --- a/metricbeat/module/windows/_meta/config.yml +++ b/metricbeat/module/windows/_meta/config.yml @@ -1,2 +1,8 @@ - module: windows - period: 60s + metricsets: ["perfmon"] + period: 10s + perfmon.counters: + +- module: windows + metricsets: ["service"] + period: 1m diff --git a/metricbeat/module/zookeeper/_meta/config.yml b/metricbeat/module/zookeeper/_meta/config.yml index fb77d08fffa..63543cefdd7 100644 --- a/metricbeat/module/zookeeper/_meta/config.yml +++ b/metricbeat/module/zookeeper/_meta/config.yml @@ -1,3 +1,4 @@ - module: zookeeper + metricsets: ["mntr"] period: 10s hosts: ["localhost:2181"] diff --git a/metricbeat/modules.d/aerospike.yml.disabled b/metricbeat/modules.d/aerospike.yml.disabled index 0a4a883f474..443cb556825 100644 --- a/metricbeat/modules.d/aerospike.yml.disabled +++ b/metricbeat/modules.d/aerospike.yml.disabled @@ -1,2 +1,4 @@ - module: aerospike + metricsets: ["namespace"] + period: 10s hosts: ["localhost:3000"] diff --git a/metricbeat/modules.d/apache.yml.disabled b/metricbeat/modules.d/apache.yml.disabled index 17815f93344..9b5a0b9bda6 100644 --- a/metricbeat/modules.d/apache.yml.disabled +++ b/metricbeat/modules.d/apache.yml.disabled @@ -1,2 +1,4 @@ - module: apache + metricsets: ["status"] + period: 10s hosts: ["http://127.0.0.1"] diff --git a/metricbeat/modules.d/ceph.yml.disabled b/metricbeat/modules.d/ceph.yml.disabled index ba19a8fa59f..42838f6177e 100644 --- a/metricbeat/modules.d/ceph.yml.disabled +++ b/metricbeat/modules.d/ceph.yml.disabled @@ -1,7 +1,16 @@ - module: ceph - metricsets: ["cluster_health", "cluster_status", "monitor_health"] + metricsets: + - cluster_health + - cluster_status + - monitor_health period: 10s + hosts: ["localhost:5000"] - module: ceph - metricsets: ["cluster_disk", "osd_tree", "pool_disk"] + metricsets: + - cluster_disk + - osd_tree + - osd_df + - pool_disk period: 1m + hosts: ["localhost:5000"] diff --git a/metricbeat/modules.d/couchbase.yml.disabled b/metricbeat/modules.d/couchbase.yml.disabled index ea168be3971..6d62238dfea 100644 --- a/metricbeat/modules.d/couchbase.yml.disabled +++ b/metricbeat/modules.d/couchbase.yml.disabled @@ -1,2 +1,7 @@ - module: couchbase + metricsets: + - bucket + - cluster + - node + period: 10s hosts: ["localhost:8091"] diff --git a/metricbeat/modules.d/docker.yml.disabled b/metricbeat/modules.d/docker.yml.disabled index 5b25e17f678..8b5950fc339 100644 --- a/metricbeat/modules.d/docker.yml.disabled +++ b/metricbeat/modules.d/docker.yml.disabled @@ -1,5 +1,20 @@ - module: docker + metricsets: + - container + - cpu + - diskio + - healthcheck + - info + - memory + - network + period: 10s hosts: ["unix:///var/run/docker.sock"] # Replace dots in labels with `_`. Set to false to keep dots labels.dedot: true + + # To connect to Docker over TLS you must specify a client and CA certificate. + #ssl: + #certificate_authority: "/etc/pki/root/ca.pem" + #certificate: "/etc/pki/client/cert.pem" + #key: "/etc/pki/client/cert.key" diff --git a/metricbeat/modules.d/dropwizard.yml.disabled b/metricbeat/modules.d/dropwizard.yml.disabled index 8f4bb7d0dc7..6dfa3755ca0 100644 --- a/metricbeat/modules.d/dropwizard.yml.disabled +++ b/metricbeat/modules.d/dropwizard.yml.disabled @@ -1,4 +1,6 @@ - module: dropwizard + metricsets: ["collector"] + period: 10s hosts: ["localhost:8080"] metrics_path: /metrics/metrics namespace: example diff --git a/metricbeat/modules.d/elasticsearch.yml.disabled b/metricbeat/modules.d/elasticsearch.yml.disabled index bbb7ff0c47d..74450f0b6ab 100644 --- a/metricbeat/modules.d/elasticsearch.yml.disabled +++ b/metricbeat/modules.d/elasticsearch.yml.disabled @@ -1,2 +1,6 @@ - module: elasticsearch + metricsets: + - node + - node_stats + period: 10s hosts: ["localhost:9200"] diff --git a/metricbeat/modules.d/etcd.yml.disabled b/metricbeat/modules.d/etcd.yml.disabled index 38142c4a03a..5f6eb5da829 100644 --- a/metricbeat/modules.d/etcd.yml.disabled +++ b/metricbeat/modules.d/etcd.yml.disabled @@ -1,2 +1,7 @@ - module: etcd + metricsets: + - leader + - self + - store + period: 10s hosts: ["localhost:2379"] diff --git a/metricbeat/modules.d/golang.yml.disabled b/metricbeat/modules.d/golang.yml.disabled index ba9db8e1089..d2750e803b4 100644 --- a/metricbeat/modules.d/golang.yml.disabled +++ b/metricbeat/modules.d/golang.yml.disabled @@ -1,5 +1,7 @@ - module: golang - metricsets: ["expvar","heap"] + metricsets: + - expvar + - heap period: 10s hosts: ["localhost:6060"] heap.path: "/debug/vars" diff --git a/metricbeat/modules.d/graphite.yml.disabled b/metricbeat/modules.d/graphite.yml.disabled index 2c6ac0e784b..ac9f2d8fe80 100644 --- a/metricbeat/modules.d/graphite.yml.disabled +++ b/metricbeat/modules.d/graphite.yml.disabled @@ -1 +1,8 @@ - module: graphite + metricsets: ["server"] +# protocol: "udp" +# templates: +# - filter: "test.*.bash.*" # This would match metrics like test.localhost.bash.stats +# namespace: "test" +# template: ".host.shell.metric*" # test.localhost.bash.stats would become metric=stats and tags host=localhost,shell=bash +# delimiter: "_" diff --git a/metricbeat/modules.d/haproxy.yml.disabled b/metricbeat/modules.d/haproxy.yml.disabled index 203e1cc772f..f787ade55a0 100644 --- a/metricbeat/modules.d/haproxy.yml.disabled +++ b/metricbeat/modules.d/haproxy.yml.disabled @@ -1,2 +1,6 @@ - module: haproxy + metricsets: + - info + - stat + period: 10s hosts: ["tcp://127.0.0.1:14567"] diff --git a/metricbeat/modules.d/jolokia.yml.disabled b/metricbeat/modules.d/jolokia.yml.disabled index af6de7b42d4..f7d1892f94e 100644 --- a/metricbeat/modules.d/jolokia.yml.disabled +++ b/metricbeat/modules.d/jolokia.yml.disabled @@ -3,17 +3,18 @@ period: 10s hosts: ["localhost"] namespace: "metrics" + #path: "/jolokia/?ignoreErrors=true&canonicalNaming=false" jmx.mappings: - - mbean: 'java.lang:type=Runtime' - attributes: - - attr: Uptime - field: uptime - - mbean: 'java.lang:type=Memory' - attributes: - - attr: HeapMemoryUsage - field: memory.heap_usage - - attr: NonHeapMemoryUsage - field: memory.non_heap_usage + # - mbean: 'java.lang:type=Runtime' + # attributes: + # - attr: Uptime + # field: uptime + # - mbean: 'java.lang:type=Memory' + # attributes: + # - attr: HeapMemoryUsage + # field: memory.heap_usage + # - attr: NonHeapMemoryUsage + # field: memory.non_heap_usage # GC Metrics - this depends on what is available on your JVM # - mbean: 'java.lang:type=GarbageCollector,name=ConcurrentMarkSweep' # attributes: @@ -21,3 +22,6 @@ # field: gc.cms_collection_time # - attr: CollectionCount # field: gc.cms_collection_count + + jmx.application: + jmx.instance: diff --git a/metricbeat/modules.d/kafka.yml.disabled b/metricbeat/modules.d/kafka.yml.disabled index f9db371184a..8b0b8434b53 100644 --- a/metricbeat/modules.d/kafka.yml.disabled +++ b/metricbeat/modules.d/kafka.yml.disabled @@ -1,2 +1,27 @@ - module: kafka + metricsets: + - partition + - consumergroup + period: 10s hosts: ["localhost:9092"] + + #client_id: metricbeat + #retries: 3 + #backoff: 250ms + + # List of Topics to query metadata for. If empty, all topics will be queried. + #topics: [] + + # Optional SSL. By default is off. + # List of root certificates for HTTPS server verifications + #ssl.certificate_authorities: ["/etc/pki/root/ca.pem"] + + # Certificate for SSL client authentication + #ssl.certificate: "/etc/pki/client/cert.pem" + + # Client Certificate Key + #ssl.key: "/etc/pki/client/cert.key" + + # SASL authentication + #username: "" + #password: "" diff --git a/metricbeat/modules.d/kibana.yml.disabled b/metricbeat/modules.d/kibana.yml.disabled index a1252a5d9bc..09a30295679 100644 --- a/metricbeat/modules.d/kibana.yml.disabled +++ b/metricbeat/modules.d/kibana.yml.disabled @@ -1,2 +1,4 @@ - module: kibana + metricsets: ["status"] + period: 10s hosts: ["localhost:5601"] diff --git a/metricbeat/modules.d/kubernetes.yml.disabled b/metricbeat/modules.d/kubernetes.yml.disabled index 1bd81376021..e9286692370 100644 --- a/metricbeat/modules.d/kubernetes.yml.disabled +++ b/metricbeat/modules.d/kubernetes.yml.disabled @@ -1,8 +1,30 @@ +# Node metrics, from kubelet: - module: kubernetes metricsets: - - container - node - - pod - system + - pod + - container - volume + period: 10s hosts: ["localhost:10255"] + #ssl.certificate_authorities: ["/etc/pki/root/ca.pem"] + #ssl.certificate: "/etc/pki/client/cert.pem" + #ssl.key: "/etc/pki/client/cert.key" + +# State metrics from kube-state-metrics service: +# - module: kubernetes +# metricsets: +# - state_node +# - state_deployment +# - state_replicaset +# - state_statefulset +# - state_pod +# - state_container +# period: 10s +# hosts: ["kube-state-metrics:8080"] + +# Kubernetes events +# - module: kubernetes +# metricsets: +# - event diff --git a/metricbeat/modules.d/kvm.yml.disabled b/metricbeat/modules.d/kvm.yml.disabled index cbed13e7fdd..a144d706fd8 100644 --- a/metricbeat/modules.d/kvm.yml.disabled +++ b/metricbeat/modules.d/kvm.yml.disabled @@ -1,2 +1,4 @@ - module: kvm + metricsets: ["dommemstat"] + period: 10s hosts: ["localhost"] diff --git a/metricbeat/modules.d/logstash.yml.disabled b/metricbeat/modules.d/logstash.yml.disabled index 73b63b016e1..3d1cb5fcd0f 100644 --- a/metricbeat/modules.d/logstash.yml.disabled +++ b/metricbeat/modules.d/logstash.yml.disabled @@ -1,2 +1,6 @@ - module: logstash + metricsets: + - node + - node_stats + period: 10s hosts: ["localhost:9600"] diff --git a/metricbeat/modules.d/memcached.yml.disabled b/metricbeat/modules.d/memcached.yml.disabled index f1f6533d677..1b230087fab 100644 --- a/metricbeat/modules.d/memcached.yml.disabled +++ b/metricbeat/modules.d/memcached.yml.disabled @@ -1,2 +1,4 @@ - module: memcached + metricsets: ["stats"] + period: 10s hosts: ["localhost:11211"] diff --git a/metricbeat/modules.d/mongodb.yml.disabled b/metricbeat/modules.d/mongodb.yml.disabled index f22fc37872d..e620efc796f 100644 --- a/metricbeat/modules.d/mongodb.yml.disabled +++ b/metricbeat/modules.d/mongodb.yml.disabled @@ -1,2 +1,18 @@ - module: mongodb + metricsets: + - dbstats + - status + period: 10s + + # The hosts must be passed as MongoDB URLs in the format: + # [mongodb://][user:pass@]host[:port]. + # The username and password can also be set using the respective configuration + # options. The credentials in the URL take precedence over the username and + # password configuration options. hosts: ["localhost:27017"] + + # Username to use when connecting to MongoDB. Empty by default. + #username: user + + # Password to use when connecting to MongoDB. Empty by default. + #password: pass diff --git a/metricbeat/modules.d/munin.yml.disabled b/metricbeat/modules.d/munin.yml.disabled index 1ea9bf8c854..9e22e743a6d 100644 --- a/metricbeat/modules.d/munin.yml.disabled +++ b/metricbeat/modules.d/munin.yml.disabled @@ -1,3 +1,5 @@ - module: munin + metricsets: ["node"] + period: 10s hosts: ["localhost:4949"] node.namespace: node diff --git a/metricbeat/modules.d/mysql.yml.disabled b/metricbeat/modules.d/mysql.yml.disabled index 8855531cdca..afff5ff7201 100644 --- a/metricbeat/modules.d/mysql.yml.disabled +++ b/metricbeat/modules.d/mysql.yml.disabled @@ -1,2 +1,17 @@ - module: mysql - hosts: ["tcp(127.0.0.1:3306)/"] + metricsets: ["status"] + period: 10s + + # Host DSN should be defined as "user:pass@tcp(127.0.0.1:3306)/" + # The username and password can either be set in the DSN or using the username + # and password config options. Those specified in the DSN take precedence. + hosts: ["root:secret@tcp(127.0.0.1:3306)/"] + + # Username of hosts. Empty by default. + #username: root + + # Password of hosts. Empty by default. + #password: secret + + # By setting raw to true, all raw fields from the status metricset will be added to the event. + #raw: false diff --git a/metricbeat/modules.d/nginx.yml.disabled b/metricbeat/modules.d/nginx.yml.disabled index e24bd89b965..e3737ed986e 100644 --- a/metricbeat/modules.d/nginx.yml.disabled +++ b/metricbeat/modules.d/nginx.yml.disabled @@ -1,2 +1,9 @@ - module: nginx + metricsets: ["stubstatus"] + period: 10s + + # Nginx hosts hosts: ["http://127.0.0.1"] + + # Path to server status. Default server-status + #server_status_path: "server-status" diff --git a/metricbeat/modules.d/php_fpm.yml.disabled b/metricbeat/modules.d/php_fpm.yml.disabled index 508aba58bda..e1004550895 100644 --- a/metricbeat/modules.d/php_fpm.yml.disabled +++ b/metricbeat/modules.d/php_fpm.yml.disabled @@ -1,2 +1,5 @@ - module: php_fpm + metricsets: ["pool"] + period: 10s hosts: ["localhost:8080"] + status_path: "/status" diff --git a/metricbeat/modules.d/postgresql.yml.disabled b/metricbeat/modules.d/postgresql.yml.disabled index 8adc44083fc..383c66d9f4f 100644 --- a/metricbeat/modules.d/postgresql.yml.disabled +++ b/metricbeat/modules.d/postgresql.yml.disabled @@ -1,2 +1,24 @@ - module: postgresql + metricsets: + # Stats about every PostgreSQL database + - database + + # Stats about the background writer process's activity + - bgwriter + + # Stats about every PostgreSQL process + - activity + + period: 10s + + # The host must be passed as PostgreSQL URL. Example: + # postgres://localhost:5432?sslmode=disable + # The available parameters are documented here: + # https://godoc.org/github.com/lib/pq#hdr-Connection_String_Parameters hosts: ["postgres://localhost:5432"] + + # Username to use when connecting to PostgreSQL. Empty by default. + #username: user + + # Password to use when connecting to PostgreSQL. Empty by default. + #password: pass diff --git a/metricbeat/modules.d/prometheus.yml.disabled b/metricbeat/modules.d/prometheus.yml.disabled index 4990104ef41..76bee349195 100644 --- a/metricbeat/modules.d/prometheus.yml.disabled +++ b/metricbeat/modules.d/prometheus.yml.disabled @@ -1,4 +1,6 @@ - module: prometheus + metricsets: ["stats"] period: 10s hosts: ["localhost:9090"] + metrics_path: /metrics #namespace: example diff --git a/metricbeat/modules.d/rabbitmq.yml.disabled b/metricbeat/modules.d/rabbitmq.yml.disabled index b5912718c76..694ea597dcc 100644 --- a/metricbeat/modules.d/rabbitmq.yml.disabled +++ b/metricbeat/modules.d/rabbitmq.yml.disabled @@ -1,2 +1,10 @@ - module: rabbitmq + metricsets: + - node + - queue + - connection + period: 10s hosts: ["localhost:15672"] + + username: guest + password: guest diff --git a/metricbeat/modules.d/redis.yml.disabled b/metricbeat/modules.d/redis.yml.disabled index e4ad9bb95e3..243382d8edc 100644 --- a/metricbeat/modules.d/redis.yml.disabled +++ b/metricbeat/modules.d/redis.yml.disabled @@ -1,2 +1,31 @@ - module: redis + metricsets: + - info + - keyspace + period: 10s + + # Redis hosts hosts: ["127.0.0.1:6379"] + + # Timeout after which time a metricset should return an error + # Timeout is by default defined as period, as a fetch of a metricset + # should never take longer then period, as otherwise calls can pile up. + #timeout: 1s + + # Optional fields to be added to each event + #fields: + # datacenter: west + + # Network type to be used for redis connection. Default: tcp + #network: tcp + + # Max number of concurrent connections. Default: 10 + #maxconn: 10 + + # Filters can be used to reduce the number of fields sent. + #processors: + # - include_fields: + # 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 82a6338cea4..becb28b9b3d 100644 --- a/metricbeat/modules.d/system.yml +++ b/metricbeat/modules.d/system.yml @@ -1,14 +1,20 @@ - module: system + period: 10s + metricsets: + - cpu + - load + - memory + - network + - process + - process_summary + #- core + #- diskio + #- socket + processes: ['.*'] process.include_top_n: by_cpu: 5 # include top 5 processes by CPU by_memory: 5 # include top 5 processes by memory -#- module: system -# metricsets: -# - core -# - diskio -# - socket - - module: system period: 1m metricsets: @@ -23,8 +29,8 @@ metricsets: - uptime -#- module: system -# period: 5m -# metricsets: -# - raid -# raid.mount_point: '/' +# - module: system +# period: 5m +# metricsets: +# - raid +# raid.mount_point: '/' diff --git a/metricbeat/modules.d/uwsgi.yml.disabled b/metricbeat/modules.d/uwsgi.yml.disabled index e16ad9be6d1..46dbc35d4b8 100644 --- a/metricbeat/modules.d/uwsgi.yml.disabled +++ b/metricbeat/modules.d/uwsgi.yml.disabled @@ -1,2 +1,4 @@ - module: uwsgi + metricsets: ["status"] + period: 10s hosts: ["tcp://127.0.0.1:9191"] diff --git a/metricbeat/modules.d/vsphere.yml.disabled b/metricbeat/modules.d/vsphere.yml.disabled index d2badbc4c0e..c53563791d0 100644 --- a/metricbeat/modules.d/vsphere.yml.disabled +++ b/metricbeat/modules.d/vsphere.yml.disabled @@ -1,4 +1,5 @@ - module: vsphere + metricsets: ["datastore", "host", "virtualmachine"] period: 10s hosts: ["https://localhost/sdk"] diff --git a/metricbeat/modules.d/windows.yml.disabled b/metricbeat/modules.d/windows.yml.disabled index 866e00010f8..1ad5aaeb2d8 100644 --- a/metricbeat/modules.d/windows.yml.disabled +++ b/metricbeat/modules.d/windows.yml.disabled @@ -1,2 +1,8 @@ - module: windows - period: 60s + metricsets: ["perfmon"] + period: 10s + perfmon.counters: + +- module: windows + metricsets: ["service"] + period: 1m diff --git a/metricbeat/modules.d/zookeeper.yml.disabled b/metricbeat/modules.d/zookeeper.yml.disabled index fb77d08fffa..63543cefdd7 100644 --- a/metricbeat/modules.d/zookeeper.yml.disabled +++ b/metricbeat/modules.d/zookeeper.yml.disabled @@ -1,3 +1,4 @@ - module: zookeeper + metricsets: ["mntr"] period: 10s hosts: ["localhost:2181"] From 2581f7ecbf10647a032750c9f2ea2d3cf4d5ae4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20P=C3=A9rez-Aradros=20Herce?= Date: Fri, 20 Apr 2018 16:48:19 +0200 Subject: [PATCH 2/8] Update `windows.yml` after comments --- metricbeat/module/windows/_meta/config.yml | 22 +++++++++++++++++----- metricbeat/modules.d/windows.yml.disabled | 22 +++++++++++++++++----- 2 files changed, 34 insertions(+), 10 deletions(-) diff --git a/metricbeat/module/windows/_meta/config.yml b/metricbeat/module/windows/_meta/config.yml index 1ad5aaeb2d8..9b3b65a38c9 100644 --- a/metricbeat/module/windows/_meta/config.yml +++ b/metricbeat/module/windows/_meta/config.yml @@ -1,8 +1,20 @@ -- module: windows - metricsets: ["perfmon"] - period: 10s - perfmon.counters: - - module: windows metricsets: ["service"] period: 1m + +#- module: windows +# metricsets: ["perfmon"] +# period: 10s +# perfmon.counters: +# - instance_label: processor.name +# instance_name: total +# measurement_label: processor.time.total.pct +# query: '\Processor Information(_Total)\% Processor Time' +# +# - instance_label: physical_disk.name +# measurement_label: physical_disk.write.per_sec +# query: '\PhysicalDisk(*)\Disk Writes/sec' +# +# - instance_label: physical_disk.name +# measurement_label: physical_disk.write.time.pct +# query: '\PhysicalDisk(*)\% Disk Write Time' diff --git a/metricbeat/modules.d/windows.yml.disabled b/metricbeat/modules.d/windows.yml.disabled index 1ad5aaeb2d8..9b3b65a38c9 100644 --- a/metricbeat/modules.d/windows.yml.disabled +++ b/metricbeat/modules.d/windows.yml.disabled @@ -1,8 +1,20 @@ -- module: windows - metricsets: ["perfmon"] - period: 10s - perfmon.counters: - - module: windows metricsets: ["service"] period: 1m + +#- module: windows +# metricsets: ["perfmon"] +# period: 10s +# perfmon.counters: +# - instance_label: processor.name +# instance_name: total +# measurement_label: processor.time.total.pct +# query: '\Processor Information(_Total)\% Processor Time' +# +# - instance_label: physical_disk.name +# measurement_label: physical_disk.write.per_sec +# query: '\PhysicalDisk(*)\Disk Writes/sec' +# +# - instance_label: physical_disk.name +# measurement_label: physical_disk.write.time.pct +# query: '\PhysicalDisk(*)\% Disk Write Time' From 662dbaaf43777c911b28e58ca864c028dccb7b6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20P=C3=A9rez-Aradros=20Herce?= Date: Fri, 20 Apr 2018 16:54:38 +0200 Subject: [PATCH 3/8] Update `system.yml` after comments --- metricbeat/module/system/_meta/config.yml | 1 - metricbeat/modules.d/system.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/metricbeat/module/system/_meta/config.yml b/metricbeat/module/system/_meta/config.yml index becb28b9b3d..6e4b5226c93 100644 --- a/metricbeat/module/system/_meta/config.yml +++ b/metricbeat/module/system/_meta/config.yml @@ -10,7 +10,6 @@ #- core #- diskio #- socket - processes: ['.*'] process.include_top_n: by_cpu: 5 # include top 5 processes by CPU by_memory: 5 # include top 5 processes by memory diff --git a/metricbeat/modules.d/system.yml b/metricbeat/modules.d/system.yml index becb28b9b3d..6e4b5226c93 100644 --- a/metricbeat/modules.d/system.yml +++ b/metricbeat/modules.d/system.yml @@ -10,7 +10,6 @@ #- core #- diskio #- socket - processes: ['.*'] process.include_top_n: by_cpu: 5 # include top 5 processes by CPU by_memory: 5 # include top 5 processes by memory From 3ab3e17f1fa84a6fd5aad82945c40e5c5656b1db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20P=C3=A9rez-Aradros=20Herce?= Date: Wed, 25 Apr 2018 18:32:30 +0200 Subject: [PATCH 4/8] Add docs link to module config headers --- metricbeat/Makefile | 5 +- metricbeat/modules.d/aerospike.yml.disabled | 3 ++ metricbeat/modules.d/apache.yml.disabled | 3 ++ metricbeat/modules.d/ceph.yml.disabled | 3 ++ metricbeat/modules.d/couchbase.yml.disabled | 3 ++ metricbeat/modules.d/docker.yml.disabled | 3 ++ metricbeat/modules.d/dropwizard.yml.disabled | 3 ++ .../modules.d/elasticsearch.yml.disabled | 3 ++ metricbeat/modules.d/etcd.yml.disabled | 3 ++ metricbeat/modules.d/golang.yml.disabled | 3 ++ metricbeat/modules.d/graphite.yml.disabled | 3 ++ metricbeat/modules.d/haproxy.yml.disabled | 3 ++ metricbeat/modules.d/http.yml.disabled | 3 ++ metricbeat/modules.d/jolokia.yml.disabled | 3 ++ metricbeat/modules.d/kafka.yml.disabled | 3 ++ metricbeat/modules.d/kibana.yml.disabled | 3 ++ metricbeat/modules.d/kubernetes.yml.disabled | 3 ++ metricbeat/modules.d/kvm.yml.disabled | 3 ++ metricbeat/modules.d/logstash.yml.disabled | 3 ++ metricbeat/modules.d/memcached.yml.disabled | 3 ++ metricbeat/modules.d/mongodb.yml.disabled | 3 ++ metricbeat/modules.d/munin.yml.disabled | 3 ++ metricbeat/modules.d/mysql.yml.disabled | 3 ++ metricbeat/modules.d/nginx.yml.disabled | 3 ++ metricbeat/modules.d/php_fpm.yml.disabled | 3 ++ metricbeat/modules.d/postgresql.yml.disabled | 3 ++ metricbeat/modules.d/prometheus.yml.disabled | 3 ++ metricbeat/modules.d/rabbitmq.yml.disabled | 3 ++ metricbeat/modules.d/redis.yml.disabled | 3 ++ metricbeat/modules.d/system.yml | 3 ++ metricbeat/modules.d/uwsgi.yml.disabled | 3 ++ metricbeat/modules.d/vsphere.yml.disabled | 3 ++ metricbeat/modules.d/windows.yml.disabled | 3 ++ metricbeat/modules.d/zookeeper.yml.disabled | 3 ++ metricbeat/scripts/modules_collector.py | 48 +++++++++++++++++++ 35 files changed, 150 insertions(+), 2 deletions(-) create mode 100644 metricbeat/scripts/modules_collector.py diff --git a/metricbeat/Makefile b/metricbeat/Makefile index cd076d91a7f..3586ee355d8 100644 --- a/metricbeat/Makefile +++ b/metricbeat/Makefile @@ -10,6 +10,7 @@ ES_BEATS?=.. GOX_OS=netbsd linux windows GOX_FLAGS=-arch="amd64 386 arm ppc64 ppc64le" +DOCS_BRANCH=$(shell grep doc-branch ../libbeat/docs/version.asciidoc | cut -c 14-) include ${ES_BEATS}/libbeat/scripts/Makefile @@ -41,8 +42,8 @@ configs: python-env @cat ${ES_BEATS}/metricbeat/_meta/setup.yml >> _meta/beat.yml @cat ${ES_BEATS}/metricbeat/_meta/common.reference.yml > _meta/beat.reference.yml @${PYTHON_ENV}/bin/python ${ES_BEATS}/script/config_collector.py --beat ${BEAT_NAME} --full $(PWD) >> _meta/beat.reference.yml - @rm -rf modules.d && mkdir -p modules.d - @for MODULE in `find module -maxdepth 1 -mindepth 1 -type d -exec basename {} \;`; do cp -a $(PWD)/module/$$MODULE/_meta/config.yml modules.d/$$MODULE.yml.disabled; done + @rm -rf modules.d + ${PYTHON_ENV}/bin/python ${ES_BEATS}/metricbeat/scripts/modules_collector.py --docs_branch=$(DOCS_BRANCH) @chmod go-w modules.d/* @# Enable system by default: @if [ -f modules.d/system.yml.disabled ]; then mv modules.d/system.yml.disabled modules.d/system.yml; fi diff --git a/metricbeat/modules.d/aerospike.yml.disabled b/metricbeat/modules.d/aerospike.yml.disabled index 443cb556825..5856d9b231f 100644 --- a/metricbeat/modules.d/aerospike.yml.disabled +++ b/metricbeat/modules.d/aerospike.yml.disabled @@ -1,3 +1,6 @@ +# Module: aerospike +# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-aerospike.html + - module: aerospike metricsets: ["namespace"] period: 10s diff --git a/metricbeat/modules.d/apache.yml.disabled b/metricbeat/modules.d/apache.yml.disabled index 9b5a0b9bda6..3d0d5e3c8c8 100644 --- a/metricbeat/modules.d/apache.yml.disabled +++ b/metricbeat/modules.d/apache.yml.disabled @@ -1,3 +1,6 @@ +# Module: apache +# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-apache.html + - module: apache metricsets: ["status"] period: 10s diff --git a/metricbeat/modules.d/ceph.yml.disabled b/metricbeat/modules.d/ceph.yml.disabled index 42838f6177e..c5fc19b6c8f 100644 --- a/metricbeat/modules.d/ceph.yml.disabled +++ b/metricbeat/modules.d/ceph.yml.disabled @@ -1,3 +1,6 @@ +# Module: ceph +# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-ceph.html + - module: ceph metricsets: - cluster_health diff --git a/metricbeat/modules.d/couchbase.yml.disabled b/metricbeat/modules.d/couchbase.yml.disabled index 6d62238dfea..25e6cbf12f8 100644 --- a/metricbeat/modules.d/couchbase.yml.disabled +++ b/metricbeat/modules.d/couchbase.yml.disabled @@ -1,3 +1,6 @@ +# Module: couchbase +# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-couchbase.html + - module: couchbase metricsets: - bucket diff --git a/metricbeat/modules.d/docker.yml.disabled b/metricbeat/modules.d/docker.yml.disabled index 8b5950fc339..22301e5c27f 100644 --- a/metricbeat/modules.d/docker.yml.disabled +++ b/metricbeat/modules.d/docker.yml.disabled @@ -1,3 +1,6 @@ +# Module: docker +# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-docker.html + - module: docker metricsets: - container diff --git a/metricbeat/modules.d/dropwizard.yml.disabled b/metricbeat/modules.d/dropwizard.yml.disabled index 6dfa3755ca0..8f4657b7612 100644 --- a/metricbeat/modules.d/dropwizard.yml.disabled +++ b/metricbeat/modules.d/dropwizard.yml.disabled @@ -1,3 +1,6 @@ +# Module: dropwizard +# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-dropwizard.html + - module: dropwizard metricsets: ["collector"] period: 10s diff --git a/metricbeat/modules.d/elasticsearch.yml.disabled b/metricbeat/modules.d/elasticsearch.yml.disabled index 74450f0b6ab..9f4c484f910 100644 --- a/metricbeat/modules.d/elasticsearch.yml.disabled +++ b/metricbeat/modules.d/elasticsearch.yml.disabled @@ -1,3 +1,6 @@ +# Module: elasticsearch +# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-elasticsearch.html + - module: elasticsearch metricsets: - node diff --git a/metricbeat/modules.d/etcd.yml.disabled b/metricbeat/modules.d/etcd.yml.disabled index 5f6eb5da829..81d605e8285 100644 --- a/metricbeat/modules.d/etcd.yml.disabled +++ b/metricbeat/modules.d/etcd.yml.disabled @@ -1,3 +1,6 @@ +# Module: etcd +# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-etcd.html + - module: etcd metricsets: - leader diff --git a/metricbeat/modules.d/golang.yml.disabled b/metricbeat/modules.d/golang.yml.disabled index d2750e803b4..dc37952394b 100644 --- a/metricbeat/modules.d/golang.yml.disabled +++ b/metricbeat/modules.d/golang.yml.disabled @@ -1,3 +1,6 @@ +# Module: golang +# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-golang.html + - module: golang metricsets: - expvar diff --git a/metricbeat/modules.d/graphite.yml.disabled b/metricbeat/modules.d/graphite.yml.disabled index ac9f2d8fe80..dc655431c8a 100644 --- a/metricbeat/modules.d/graphite.yml.disabled +++ b/metricbeat/modules.d/graphite.yml.disabled @@ -1,3 +1,6 @@ +# Module: graphite +# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-graphite.html + - module: graphite metricsets: ["server"] # protocol: "udp" diff --git a/metricbeat/modules.d/haproxy.yml.disabled b/metricbeat/modules.d/haproxy.yml.disabled index f787ade55a0..e13e6b139a3 100644 --- a/metricbeat/modules.d/haproxy.yml.disabled +++ b/metricbeat/modules.d/haproxy.yml.disabled @@ -1,3 +1,6 @@ +# Module: haproxy +# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-haproxy.html + - module: haproxy metricsets: - info diff --git a/metricbeat/modules.d/http.yml.disabled b/metricbeat/modules.d/http.yml.disabled index 286bddb897b..fc34463c026 100644 --- a/metricbeat/modules.d/http.yml.disabled +++ b/metricbeat/modules.d/http.yml.disabled @@ -1,3 +1,6 @@ +# Module: http +# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-http.html + - module: http metricsets: ["json"] period: 10s diff --git a/metricbeat/modules.d/jolokia.yml.disabled b/metricbeat/modules.d/jolokia.yml.disabled index f7d1892f94e..47c71c0427a 100644 --- a/metricbeat/modules.d/jolokia.yml.disabled +++ b/metricbeat/modules.d/jolokia.yml.disabled @@ -1,3 +1,6 @@ +# Module: jolokia +# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-jolokia.html + - module: jolokia metricsets: ["jmx"] period: 10s diff --git a/metricbeat/modules.d/kafka.yml.disabled b/metricbeat/modules.d/kafka.yml.disabled index 8b0b8434b53..e2dceaf2c23 100644 --- a/metricbeat/modules.d/kafka.yml.disabled +++ b/metricbeat/modules.d/kafka.yml.disabled @@ -1,3 +1,6 @@ +# Module: kafka +# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-kafka.html + - module: kafka metricsets: - partition diff --git a/metricbeat/modules.d/kibana.yml.disabled b/metricbeat/modules.d/kibana.yml.disabled index 09a30295679..6ca240bf761 100644 --- a/metricbeat/modules.d/kibana.yml.disabled +++ b/metricbeat/modules.d/kibana.yml.disabled @@ -1,3 +1,6 @@ +# Module: kibana +# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-kibana.html + - module: kibana metricsets: ["status"] period: 10s diff --git a/metricbeat/modules.d/kubernetes.yml.disabled b/metricbeat/modules.d/kubernetes.yml.disabled index e9286692370..e3bba2ee775 100644 --- a/metricbeat/modules.d/kubernetes.yml.disabled +++ b/metricbeat/modules.d/kubernetes.yml.disabled @@ -1,3 +1,6 @@ +# Module: kubernetes +# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-kubernetes.html + # Node metrics, from kubelet: - module: kubernetes metricsets: diff --git a/metricbeat/modules.d/kvm.yml.disabled b/metricbeat/modules.d/kvm.yml.disabled index a144d706fd8..919a1fa4ed9 100644 --- a/metricbeat/modules.d/kvm.yml.disabled +++ b/metricbeat/modules.d/kvm.yml.disabled @@ -1,3 +1,6 @@ +# Module: kvm +# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-kvm.html + - module: kvm metricsets: ["dommemstat"] period: 10s diff --git a/metricbeat/modules.d/logstash.yml.disabled b/metricbeat/modules.d/logstash.yml.disabled index 3d1cb5fcd0f..00852d3ac77 100644 --- a/metricbeat/modules.d/logstash.yml.disabled +++ b/metricbeat/modules.d/logstash.yml.disabled @@ -1,3 +1,6 @@ +# Module: logstash +# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-logstash.html + - module: logstash metricsets: - node diff --git a/metricbeat/modules.d/memcached.yml.disabled b/metricbeat/modules.d/memcached.yml.disabled index 1b230087fab..8c8bbb81820 100644 --- a/metricbeat/modules.d/memcached.yml.disabled +++ b/metricbeat/modules.d/memcached.yml.disabled @@ -1,3 +1,6 @@ +# Module: memcached +# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-memcached.html + - module: memcached metricsets: ["stats"] period: 10s diff --git a/metricbeat/modules.d/mongodb.yml.disabled b/metricbeat/modules.d/mongodb.yml.disabled index e620efc796f..eb4d5f1cd19 100644 --- a/metricbeat/modules.d/mongodb.yml.disabled +++ b/metricbeat/modules.d/mongodb.yml.disabled @@ -1,3 +1,6 @@ +# Module: mongodb +# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-mongodb.html + - module: mongodb metricsets: - dbstats diff --git a/metricbeat/modules.d/munin.yml.disabled b/metricbeat/modules.d/munin.yml.disabled index 9e22e743a6d..7ce01d7b1a1 100644 --- a/metricbeat/modules.d/munin.yml.disabled +++ b/metricbeat/modules.d/munin.yml.disabled @@ -1,3 +1,6 @@ +# Module: munin +# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-munin.html + - module: munin metricsets: ["node"] period: 10s diff --git a/metricbeat/modules.d/mysql.yml.disabled b/metricbeat/modules.d/mysql.yml.disabled index afff5ff7201..43aac88e535 100644 --- a/metricbeat/modules.d/mysql.yml.disabled +++ b/metricbeat/modules.d/mysql.yml.disabled @@ -1,3 +1,6 @@ +# Module: mysql +# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-mysql.html + - module: mysql metricsets: ["status"] period: 10s diff --git a/metricbeat/modules.d/nginx.yml.disabled b/metricbeat/modules.d/nginx.yml.disabled index e3737ed986e..957fbbaa572 100644 --- a/metricbeat/modules.d/nginx.yml.disabled +++ b/metricbeat/modules.d/nginx.yml.disabled @@ -1,3 +1,6 @@ +# Module: nginx +# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-nginx.html + - module: nginx metricsets: ["stubstatus"] period: 10s diff --git a/metricbeat/modules.d/php_fpm.yml.disabled b/metricbeat/modules.d/php_fpm.yml.disabled index e1004550895..e57ea128839 100644 --- a/metricbeat/modules.d/php_fpm.yml.disabled +++ b/metricbeat/modules.d/php_fpm.yml.disabled @@ -1,3 +1,6 @@ +# Module: php_fpm +# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-php_fpm.html + - module: php_fpm metricsets: ["pool"] period: 10s diff --git a/metricbeat/modules.d/postgresql.yml.disabled b/metricbeat/modules.d/postgresql.yml.disabled index 383c66d9f4f..2c71ad0b782 100644 --- a/metricbeat/modules.d/postgresql.yml.disabled +++ b/metricbeat/modules.d/postgresql.yml.disabled @@ -1,3 +1,6 @@ +# Module: postgresql +# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-postgresql.html + - module: postgresql metricsets: # Stats about every PostgreSQL database diff --git a/metricbeat/modules.d/prometheus.yml.disabled b/metricbeat/modules.d/prometheus.yml.disabled index 76bee349195..488434c5fbe 100644 --- a/metricbeat/modules.d/prometheus.yml.disabled +++ b/metricbeat/modules.d/prometheus.yml.disabled @@ -1,3 +1,6 @@ +# Module: prometheus +# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-prometheus.html + - module: prometheus metricsets: ["stats"] period: 10s diff --git a/metricbeat/modules.d/rabbitmq.yml.disabled b/metricbeat/modules.d/rabbitmq.yml.disabled index 694ea597dcc..6bcc6aeeb53 100644 --- a/metricbeat/modules.d/rabbitmq.yml.disabled +++ b/metricbeat/modules.d/rabbitmq.yml.disabled @@ -1,3 +1,6 @@ +# Module: rabbitmq +# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-rabbitmq.html + - module: rabbitmq metricsets: - node diff --git a/metricbeat/modules.d/redis.yml.disabled b/metricbeat/modules.d/redis.yml.disabled index 243382d8edc..6a1a122b75c 100644 --- a/metricbeat/modules.d/redis.yml.disabled +++ b/metricbeat/modules.d/redis.yml.disabled @@ -1,3 +1,6 @@ +# Module: redis +# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-redis.html + - module: redis metricsets: - info diff --git a/metricbeat/modules.d/system.yml b/metricbeat/modules.d/system.yml index 6e4b5226c93..f0813da30d5 100644 --- a/metricbeat/modules.d/system.yml +++ b/metricbeat/modules.d/system.yml @@ -1,3 +1,6 @@ +# Module: system +# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-system.html + - module: system period: 10s metricsets: diff --git a/metricbeat/modules.d/uwsgi.yml.disabled b/metricbeat/modules.d/uwsgi.yml.disabled index 46dbc35d4b8..fc4e89d9624 100644 --- a/metricbeat/modules.d/uwsgi.yml.disabled +++ b/metricbeat/modules.d/uwsgi.yml.disabled @@ -1,3 +1,6 @@ +# Module: uwsgi +# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-uwsgi.html + - module: uwsgi metricsets: ["status"] period: 10s diff --git a/metricbeat/modules.d/vsphere.yml.disabled b/metricbeat/modules.d/vsphere.yml.disabled index c53563791d0..15c637892f1 100644 --- a/metricbeat/modules.d/vsphere.yml.disabled +++ b/metricbeat/modules.d/vsphere.yml.disabled @@ -1,3 +1,6 @@ +# Module: vsphere +# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-vsphere.html + - module: vsphere metricsets: ["datastore", "host", "virtualmachine"] period: 10s diff --git a/metricbeat/modules.d/windows.yml.disabled b/metricbeat/modules.d/windows.yml.disabled index 9b3b65a38c9..53c1dfc5f49 100644 --- a/metricbeat/modules.d/windows.yml.disabled +++ b/metricbeat/modules.d/windows.yml.disabled @@ -1,3 +1,6 @@ +# Module: windows +# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-windows.html + - module: windows metricsets: ["service"] period: 1m diff --git a/metricbeat/modules.d/zookeeper.yml.disabled b/metricbeat/modules.d/zookeeper.yml.disabled index 63543cefdd7..8af244f5d91 100644 --- a/metricbeat/modules.d/zookeeper.yml.disabled +++ b/metricbeat/modules.d/zookeeper.yml.disabled @@ -1,3 +1,6 @@ +# Module: zookeeper +# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-zookeeper.html + - module: zookeeper metricsets: ["mntr"] period: 10s diff --git a/metricbeat/scripts/modules_collector.py b/metricbeat/scripts/modules_collector.py new file mode 100644 index 00000000000..0ee891a8bcc --- /dev/null +++ b/metricbeat/scripts/modules_collector.py @@ -0,0 +1,48 @@ +import os +import argparse +import yaml +import six + +# Collects module configs to modules.d + + +def collect(docs_branch): + + base_dir = "module" + path = os.path.abspath("module") + + # TODO add module release status if beta or experimental + header = """# Module: {module} +# Docs: https://www.elastic.co/guide/en/beats/metricbeat/{docs_branch}/metricbeat-module-{module}.html + +""" + + # Create directory for module confs + os.mkdir(os.path.abspath('modules.d')) + + # Iterate over all modules + for module in sorted(os.listdir(base_dir)): + + module_conf = path + '/' + module + '/_meta/config.yml' + if os.path.isfile(module_conf) == False: + continue + + module_file = header.format(module=module, docs_branch=docs_branch) + + with open(module_conf) as f: + module_file += f.read() + + # Write disabled module conf + with open(os.path.abspath('modules.d/') + '/' + module + '.yml.disabled', 'w') as f: + f.write(module_file) + + +if __name__ == "__main__": + parser = argparse.ArgumentParser( + description="Collects modules confs") + parser.add_argument("--docs_branch", help="Docs branch") + + args = parser.parse_args() + docs_branch = args.docs_branch + + collect(docs_branch) From efc05207db4d7bef930f7ff09b10826ee04ed401 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20P=C3=A9rez-Aradros=20Herce?= Date: Wed, 25 Apr 2018 18:43:16 +0200 Subject: [PATCH 5/8] Coment metricsets when they are the default --- metricbeat/docs/modules/golang.asciidoc | 6 +++--- metricbeat/docs/modules/jolokia.asciidoc | 4 ++-- metricbeat/metricbeat.reference.yml | 10 +++++----- metricbeat/module/aerospike/_meta/config.yml | 2 +- metricbeat/module/apache/_meta/config.yml | 2 +- metricbeat/module/ceph/_meta/config.yml | 18 +++++++++--------- metricbeat/module/couchbase/_meta/config.yml | 8 ++++---- metricbeat/module/docker/_meta/config.yml | 16 ++++++++-------- metricbeat/module/dropwizard/_meta/config.yml | 2 +- .../module/elasticsearch/_meta/config.yml | 6 +++--- metricbeat/module/etcd/_meta/config.yml | 8 ++++---- metricbeat/module/golang/_meta/config.yml | 6 +++--- metricbeat/module/graphite/_meta/config.yml | 2 +- metricbeat/module/haproxy/_meta/config.yml | 6 +++--- metricbeat/module/jolokia/_meta/config.yml | 4 ++-- metricbeat/module/kafka/_meta/config.yml | 6 +++--- metricbeat/module/kibana/_meta/config.yml | 2 +- metricbeat/module/kubernetes/_meta/config.yml | 12 ++++++------ metricbeat/module/kvm/_meta/config.yml | 2 +- metricbeat/module/logstash/_meta/config.yml | 6 +++--- metricbeat/module/memcached/_meta/config.yml | 2 +- metricbeat/module/mongodb/_meta/config.yml | 6 +++--- metricbeat/module/munin/_meta/config.yml | 2 +- metricbeat/module/mysql/_meta/config.yml | 2 +- metricbeat/module/nginx/_meta/config.yml | 2 +- metricbeat/module/php_fpm/_meta/config.yml | 2 +- metricbeat/module/postgresql/_meta/config.yml | 17 +++++++---------- metricbeat/module/prometheus/_meta/config.yml | 2 +- metricbeat/module/rabbitmq/_meta/config.yml | 8 ++++---- metricbeat/module/redis/_meta/config.yml | 6 +++--- metricbeat/module/uwsgi/_meta/config.yml | 2 +- metricbeat/module/vsphere/_meta/config.yml | 6 ++++-- metricbeat/module/windows/_meta/config.yml | 2 +- metricbeat/module/zookeeper/_meta/config.yml | 2 +- metricbeat/modules.d/aerospike.yml.disabled | 2 +- metricbeat/modules.d/apache.yml.disabled | 2 +- metricbeat/modules.d/ceph.yml.disabled | 18 +++++++++--------- metricbeat/modules.d/couchbase.yml.disabled | 8 ++++---- metricbeat/modules.d/docker.yml.disabled | 16 ++++++++-------- metricbeat/modules.d/dropwizard.yml.disabled | 2 +- .../modules.d/elasticsearch.yml.disabled | 6 +++--- metricbeat/modules.d/etcd.yml.disabled | 8 ++++---- metricbeat/modules.d/golang.yml.disabled | 6 +++--- metricbeat/modules.d/graphite.yml.disabled | 2 +- metricbeat/modules.d/haproxy.yml.disabled | 6 +++--- metricbeat/modules.d/jolokia.yml.disabled | 4 ++-- metricbeat/modules.d/kafka.yml.disabled | 6 +++--- metricbeat/modules.d/kibana.yml.disabled | 2 +- metricbeat/modules.d/kubernetes.yml.disabled | 12 ++++++------ metricbeat/modules.d/kvm.yml.disabled | 2 +- metricbeat/modules.d/logstash.yml.disabled | 6 +++--- metricbeat/modules.d/memcached.yml.disabled | 2 +- metricbeat/modules.d/mongodb.yml.disabled | 6 +++--- metricbeat/modules.d/munin.yml.disabled | 2 +- metricbeat/modules.d/mysql.yml.disabled | 2 +- metricbeat/modules.d/nginx.yml.disabled | 2 +- metricbeat/modules.d/php_fpm.yml.disabled | 2 +- metricbeat/modules.d/postgresql.yml.disabled | 17 +++++++---------- metricbeat/modules.d/prometheus.yml.disabled | 2 +- metricbeat/modules.d/rabbitmq.yml.disabled | 8 ++++---- metricbeat/modules.d/redis.yml.disabled | 6 +++--- metricbeat/modules.d/uwsgi.yml.disabled | 2 +- metricbeat/modules.d/vsphere.yml.disabled | 6 ++++-- metricbeat/modules.d/windows.yml.disabled | 2 +- metricbeat/modules.d/zookeeper.yml.disabled | 2 +- 65 files changed, 178 insertions(+), 180 deletions(-) diff --git a/metricbeat/docs/modules/golang.asciidoc b/metricbeat/docs/modules/golang.asciidoc index fcf2f5385df..de85469a3dd 100644 --- a/metricbeat/docs/modules/golang.asciidoc +++ b/metricbeat/docs/modules/golang.asciidoc @@ -20,9 +20,9 @@ in <>. Here is an example configuration: ---- metricbeat.modules: - module: golang - metricsets: - - expvar - - heap +# metricsets: +# - expvar +# - heap period: 10s hosts: ["localhost:6060"] heap.path: "/debug/vars" diff --git a/metricbeat/docs/modules/jolokia.asciidoc b/metricbeat/docs/modules/jolokia.asciidoc index 87aef19ce7a..556b95e19b6 100644 --- a/metricbeat/docs/modules/jolokia.asciidoc +++ b/metricbeat/docs/modules/jolokia.asciidoc @@ -19,11 +19,11 @@ in <>. Here is an example configuration: ---- metricbeat.modules: - module: jolokia - metricsets: ["jmx"] +# metricsets: ["jmx"] period: 10s hosts: ["localhost"] namespace: "metrics" - #path: "/jolokia/?ignoreErrors=true&canonicalNaming=false" +# path: "/jolokia/?ignoreErrors=true&canonicalNaming=false" jmx.mappings: # - mbean: 'java.lang:type=Runtime' # attributes: diff --git a/metricbeat/metricbeat.reference.yml b/metricbeat/metricbeat.reference.yml index 7ec9304a221..98190309efa 100644 --- a/metricbeat/metricbeat.reference.yml +++ b/metricbeat/metricbeat.reference.yml @@ -210,9 +210,9 @@ metricbeat.modules: #------------------------------- Golang Module ------------------------------- - module: golang - metricsets: - - expvar - - heap +# metricsets: +# - expvar +# - heap period: 10s hosts: ["localhost:6060"] heap.path: "/debug/vars" @@ -278,11 +278,11 @@ metricbeat.modules: #------------------------------- Jolokia Module ------------------------------ - module: jolokia - metricsets: ["jmx"] +# metricsets: ["jmx"] period: 10s hosts: ["localhost"] namespace: "metrics" - #path: "/jolokia/?ignoreErrors=true&canonicalNaming=false" +# path: "/jolokia/?ignoreErrors=true&canonicalNaming=false" jmx.mappings: # - mbean: 'java.lang:type=Runtime' # attributes: diff --git a/metricbeat/module/aerospike/_meta/config.yml b/metricbeat/module/aerospike/_meta/config.yml index 443cb556825..8af991f6fed 100644 --- a/metricbeat/module/aerospike/_meta/config.yml +++ b/metricbeat/module/aerospike/_meta/config.yml @@ -1,4 +1,4 @@ - module: aerospike - metricsets: ["namespace"] +# metricsets: ["namespace"] period: 10s hosts: ["localhost:3000"] diff --git a/metricbeat/module/apache/_meta/config.yml b/metricbeat/module/apache/_meta/config.yml index 9b5a0b9bda6..e1f875e3ff1 100644 --- a/metricbeat/module/apache/_meta/config.yml +++ b/metricbeat/module/apache/_meta/config.yml @@ -1,4 +1,4 @@ - module: apache - metricsets: ["status"] +# metricsets: ["status"] period: 10s hosts: ["http://127.0.0.1"] diff --git a/metricbeat/module/ceph/_meta/config.yml b/metricbeat/module/ceph/_meta/config.yml index 42838f6177e..d0c10db2c7d 100644 --- a/metricbeat/module/ceph/_meta/config.yml +++ b/metricbeat/module/ceph/_meta/config.yml @@ -1,16 +1,16 @@ - module: ceph - metricsets: - - cluster_health - - cluster_status - - monitor_health +# metricsets: +# - cluster_health +# - cluster_status +# - monitor_health period: 10s hosts: ["localhost:5000"] - module: ceph - metricsets: - - cluster_disk - - osd_tree - - osd_df - - pool_disk +# metricsets: +# - cluster_disk +# - osd_tree +# - osd_df +# - pool_disk period: 1m hosts: ["localhost:5000"] diff --git a/metricbeat/module/couchbase/_meta/config.yml b/metricbeat/module/couchbase/_meta/config.yml index 6d62238dfea..3553da50e7f 100644 --- a/metricbeat/module/couchbase/_meta/config.yml +++ b/metricbeat/module/couchbase/_meta/config.yml @@ -1,7 +1,7 @@ - module: couchbase - metricsets: - - bucket - - cluster - - node +# metricsets: +# - bucket +# - cluster +# - node period: 10s hosts: ["localhost:8091"] diff --git a/metricbeat/module/docker/_meta/config.yml b/metricbeat/module/docker/_meta/config.yml index 8b5950fc339..3b74bf63138 100644 --- a/metricbeat/module/docker/_meta/config.yml +++ b/metricbeat/module/docker/_meta/config.yml @@ -1,12 +1,12 @@ - module: docker - metricsets: - - container - - cpu - - diskio - - healthcheck - - info - - memory - - network +# metricsets: +# - container +# - cpu +# - diskio +# - healthcheck +# - info +# - memory +# - network period: 10s hosts: ["unix:///var/run/docker.sock"] diff --git a/metricbeat/module/dropwizard/_meta/config.yml b/metricbeat/module/dropwizard/_meta/config.yml index 6dfa3755ca0..48a44569a1c 100644 --- a/metricbeat/module/dropwizard/_meta/config.yml +++ b/metricbeat/module/dropwizard/_meta/config.yml @@ -1,5 +1,5 @@ - module: dropwizard - metricsets: ["collector"] +# metricsets: ["collector"] period: 10s hosts: ["localhost:8080"] metrics_path: /metrics/metrics diff --git a/metricbeat/module/elasticsearch/_meta/config.yml b/metricbeat/module/elasticsearch/_meta/config.yml index 74450f0b6ab..5c30bde5045 100644 --- a/metricbeat/module/elasticsearch/_meta/config.yml +++ b/metricbeat/module/elasticsearch/_meta/config.yml @@ -1,6 +1,6 @@ - module: elasticsearch - metricsets: - - node - - node_stats +# metricsets: +# - node +# - node_stats period: 10s hosts: ["localhost:9200"] diff --git a/metricbeat/module/etcd/_meta/config.yml b/metricbeat/module/etcd/_meta/config.yml index 5f6eb5da829..4ccb6c54554 100644 --- a/metricbeat/module/etcd/_meta/config.yml +++ b/metricbeat/module/etcd/_meta/config.yml @@ -1,7 +1,7 @@ - module: etcd - metricsets: - - leader - - self - - store +# metricsets: +# - leader +# - self +# - store period: 10s hosts: ["localhost:2379"] diff --git a/metricbeat/module/golang/_meta/config.yml b/metricbeat/module/golang/_meta/config.yml index d2750e803b4..5ebf9250e96 100644 --- a/metricbeat/module/golang/_meta/config.yml +++ b/metricbeat/module/golang/_meta/config.yml @@ -1,7 +1,7 @@ - module: golang - metricsets: - - expvar - - heap +# metricsets: +# - expvar +# - heap period: 10s hosts: ["localhost:6060"] heap.path: "/debug/vars" diff --git a/metricbeat/module/graphite/_meta/config.yml b/metricbeat/module/graphite/_meta/config.yml index ac9f2d8fe80..2407aba52f1 100644 --- a/metricbeat/module/graphite/_meta/config.yml +++ b/metricbeat/module/graphite/_meta/config.yml @@ -1,5 +1,5 @@ - module: graphite - metricsets: ["server"] +# metricsets: ["server"] # protocol: "udp" # templates: # - filter: "test.*.bash.*" # This would match metrics like test.localhost.bash.stats diff --git a/metricbeat/module/haproxy/_meta/config.yml b/metricbeat/module/haproxy/_meta/config.yml index f787ade55a0..f858e8f35ba 100644 --- a/metricbeat/module/haproxy/_meta/config.yml +++ b/metricbeat/module/haproxy/_meta/config.yml @@ -1,6 +1,6 @@ - module: haproxy - metricsets: - - info - - stat +# metricsets: +# - info +# - stat period: 10s hosts: ["tcp://127.0.0.1:14567"] diff --git a/metricbeat/module/jolokia/_meta/config.yml b/metricbeat/module/jolokia/_meta/config.yml index f7d1892f94e..a74913a8373 100644 --- a/metricbeat/module/jolokia/_meta/config.yml +++ b/metricbeat/module/jolokia/_meta/config.yml @@ -1,9 +1,9 @@ - module: jolokia - metricsets: ["jmx"] +# metricsets: ["jmx"] period: 10s hosts: ["localhost"] namespace: "metrics" - #path: "/jolokia/?ignoreErrors=true&canonicalNaming=false" +# path: "/jolokia/?ignoreErrors=true&canonicalNaming=false" jmx.mappings: # - mbean: 'java.lang:type=Runtime' # attributes: diff --git a/metricbeat/module/kafka/_meta/config.yml b/metricbeat/module/kafka/_meta/config.yml index 8b0b8434b53..5c85f0e6896 100644 --- a/metricbeat/module/kafka/_meta/config.yml +++ b/metricbeat/module/kafka/_meta/config.yml @@ -1,7 +1,7 @@ - module: kafka - metricsets: - - partition - - consumergroup +# metricsets: +# - partition +# - consumergroup period: 10s hosts: ["localhost:9092"] diff --git a/metricbeat/module/kibana/_meta/config.yml b/metricbeat/module/kibana/_meta/config.yml index 09a30295679..5b34b28a5b8 100644 --- a/metricbeat/module/kibana/_meta/config.yml +++ b/metricbeat/module/kibana/_meta/config.yml @@ -1,4 +1,4 @@ - module: kibana - metricsets: ["status"] +# metricsets: ["status"] period: 10s hosts: ["localhost:5601"] diff --git a/metricbeat/module/kubernetes/_meta/config.yml b/metricbeat/module/kubernetes/_meta/config.yml index e9286692370..424a8de8215 100644 --- a/metricbeat/module/kubernetes/_meta/config.yml +++ b/metricbeat/module/kubernetes/_meta/config.yml @@ -1,11 +1,11 @@ # Node metrics, from kubelet: - module: kubernetes - metricsets: - - node - - system - - pod - - container - - volume +# metricsets: +# - node +# - system +# - pod +# - container +# - volume period: 10s hosts: ["localhost:10255"] #ssl.certificate_authorities: ["/etc/pki/root/ca.pem"] diff --git a/metricbeat/module/kvm/_meta/config.yml b/metricbeat/module/kvm/_meta/config.yml index a144d706fd8..589b1ad7b7a 100644 --- a/metricbeat/module/kvm/_meta/config.yml +++ b/metricbeat/module/kvm/_meta/config.yml @@ -1,4 +1,4 @@ - module: kvm - metricsets: ["dommemstat"] +# metricsets: ["dommemstat"] period: 10s hosts: ["localhost"] diff --git a/metricbeat/module/logstash/_meta/config.yml b/metricbeat/module/logstash/_meta/config.yml index 3d1cb5fcd0f..a645edbbbed 100644 --- a/metricbeat/module/logstash/_meta/config.yml +++ b/metricbeat/module/logstash/_meta/config.yml @@ -1,6 +1,6 @@ - module: logstash - metricsets: - - node - - node_stats +# metricsets: +# - node +# - node_stats period: 10s hosts: ["localhost:9600"] diff --git a/metricbeat/module/memcached/_meta/config.yml b/metricbeat/module/memcached/_meta/config.yml index 1b230087fab..3e6ae607139 100644 --- a/metricbeat/module/memcached/_meta/config.yml +++ b/metricbeat/module/memcached/_meta/config.yml @@ -1,4 +1,4 @@ - module: memcached - metricsets: ["stats"] +# metricsets: ["stats"] period: 10s hosts: ["localhost:11211"] diff --git a/metricbeat/module/mongodb/_meta/config.yml b/metricbeat/module/mongodb/_meta/config.yml index e620efc796f..b7855b86d7a 100644 --- a/metricbeat/module/mongodb/_meta/config.yml +++ b/metricbeat/module/mongodb/_meta/config.yml @@ -1,7 +1,7 @@ - module: mongodb - metricsets: - - dbstats - - status +# metricsets: +# - dbstats +# - status period: 10s # The hosts must be passed as MongoDB URLs in the format: diff --git a/metricbeat/module/munin/_meta/config.yml b/metricbeat/module/munin/_meta/config.yml index 9e22e743a6d..90fde4b6c4b 100644 --- a/metricbeat/module/munin/_meta/config.yml +++ b/metricbeat/module/munin/_meta/config.yml @@ -1,5 +1,5 @@ - module: munin - metricsets: ["node"] +# metricsets: ["node"] period: 10s hosts: ["localhost:4949"] node.namespace: node diff --git a/metricbeat/module/mysql/_meta/config.yml b/metricbeat/module/mysql/_meta/config.yml index afff5ff7201..613c9561255 100644 --- a/metricbeat/module/mysql/_meta/config.yml +++ b/metricbeat/module/mysql/_meta/config.yml @@ -1,5 +1,5 @@ - module: mysql - metricsets: ["status"] +# metricsets: ["status"] period: 10s # Host DSN should be defined as "user:pass@tcp(127.0.0.1:3306)/" diff --git a/metricbeat/module/nginx/_meta/config.yml b/metricbeat/module/nginx/_meta/config.yml index e3737ed986e..2b0019d1cb7 100644 --- a/metricbeat/module/nginx/_meta/config.yml +++ b/metricbeat/module/nginx/_meta/config.yml @@ -1,5 +1,5 @@ - module: nginx - metricsets: ["stubstatus"] +# metricsets: ["stubstatus"] period: 10s # Nginx hosts diff --git a/metricbeat/module/php_fpm/_meta/config.yml b/metricbeat/module/php_fpm/_meta/config.yml index e1004550895..0cbe6fb032f 100644 --- a/metricbeat/module/php_fpm/_meta/config.yml +++ b/metricbeat/module/php_fpm/_meta/config.yml @@ -1,5 +1,5 @@ - module: php_fpm - metricsets: ["pool"] +# metricsets: ["pool"] period: 10s hosts: ["localhost:8080"] status_path: "/status" diff --git a/metricbeat/module/postgresql/_meta/config.yml b/metricbeat/module/postgresql/_meta/config.yml index 383c66d9f4f..e8d47bb5173 100644 --- a/metricbeat/module/postgresql/_meta/config.yml +++ b/metricbeat/module/postgresql/_meta/config.yml @@ -1,14 +1,11 @@ - module: postgresql - metricsets: - # Stats about every PostgreSQL database - - database - - # Stats about the background writer process's activity - - bgwriter - - # Stats about every PostgreSQL process - - activity - +# metricsets: +# # Stats about every PostgreSQL database +# - database +# # Stats about the background writer process's activity +# - bgwriter +# # Stats about every PostgreSQL process +# - activity period: 10s # The host must be passed as PostgreSQL URL. Example: diff --git a/metricbeat/module/prometheus/_meta/config.yml b/metricbeat/module/prometheus/_meta/config.yml index 76bee349195..d69fef1549e 100644 --- a/metricbeat/module/prometheus/_meta/config.yml +++ b/metricbeat/module/prometheus/_meta/config.yml @@ -1,5 +1,5 @@ - module: prometheus - metricsets: ["stats"] +# metricsets: ["stats"] period: 10s hosts: ["localhost:9090"] metrics_path: /metrics diff --git a/metricbeat/module/rabbitmq/_meta/config.yml b/metricbeat/module/rabbitmq/_meta/config.yml index 694ea597dcc..062c01ca7f3 100644 --- a/metricbeat/module/rabbitmq/_meta/config.yml +++ b/metricbeat/module/rabbitmq/_meta/config.yml @@ -1,8 +1,8 @@ - module: rabbitmq - metricsets: - - node - - queue - - connection +# metricsets: +# - node +# - queue +# - connection period: 10s hosts: ["localhost:15672"] diff --git a/metricbeat/module/redis/_meta/config.yml b/metricbeat/module/redis/_meta/config.yml index 243382d8edc..49ca38b5e57 100644 --- a/metricbeat/module/redis/_meta/config.yml +++ b/metricbeat/module/redis/_meta/config.yml @@ -1,7 +1,7 @@ - module: redis - metricsets: - - info - - keyspace +# metricsets: +# - info +# - keyspace period: 10s # Redis hosts diff --git a/metricbeat/module/uwsgi/_meta/config.yml b/metricbeat/module/uwsgi/_meta/config.yml index 46dbc35d4b8..1646dfb8605 100644 --- a/metricbeat/module/uwsgi/_meta/config.yml +++ b/metricbeat/module/uwsgi/_meta/config.yml @@ -1,4 +1,4 @@ - module: uwsgi - metricsets: ["status"] +# metricsets: ["status"] period: 10s hosts: ["tcp://127.0.0.1:9191"] diff --git a/metricbeat/module/vsphere/_meta/config.yml b/metricbeat/module/vsphere/_meta/config.yml index c53563791d0..11c59fb4e14 100644 --- a/metricbeat/module/vsphere/_meta/config.yml +++ b/metricbeat/module/vsphere/_meta/config.yml @@ -1,5 +1,8 @@ - module: vsphere - metricsets: ["datastore", "host", "virtualmachine"] +# metricsets: +# - datastore +# - host +# - virtualmachine period: 10s hosts: ["https://localhost/sdk"] @@ -9,4 +12,3 @@ insecure: false # Get custom fields when using virtualmachine metric set. Default false. # get_custom_fields: false - diff --git a/metricbeat/module/windows/_meta/config.yml b/metricbeat/module/windows/_meta/config.yml index 9b3b65a38c9..d1de803e878 100644 --- a/metricbeat/module/windows/_meta/config.yml +++ b/metricbeat/module/windows/_meta/config.yml @@ -1,5 +1,5 @@ - module: windows - metricsets: ["service"] +# metricsets: ["service"] period: 1m #- module: windows diff --git a/metricbeat/module/zookeeper/_meta/config.yml b/metricbeat/module/zookeeper/_meta/config.yml index 63543cefdd7..e81204dfcdb 100644 --- a/metricbeat/module/zookeeper/_meta/config.yml +++ b/metricbeat/module/zookeeper/_meta/config.yml @@ -1,4 +1,4 @@ - module: zookeeper - metricsets: ["mntr"] +# metricsets: ["mntr"] period: 10s hosts: ["localhost:2181"] diff --git a/metricbeat/modules.d/aerospike.yml.disabled b/metricbeat/modules.d/aerospike.yml.disabled index 5856d9b231f..6ebf3c4a782 100644 --- a/metricbeat/modules.d/aerospike.yml.disabled +++ b/metricbeat/modules.d/aerospike.yml.disabled @@ -2,6 +2,6 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-aerospike.html - module: aerospike - metricsets: ["namespace"] +# metricsets: ["namespace"] period: 10s hosts: ["localhost:3000"] diff --git a/metricbeat/modules.d/apache.yml.disabled b/metricbeat/modules.d/apache.yml.disabled index 3d0d5e3c8c8..7e9a59a475e 100644 --- a/metricbeat/modules.d/apache.yml.disabled +++ b/metricbeat/modules.d/apache.yml.disabled @@ -2,6 +2,6 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-apache.html - module: apache - metricsets: ["status"] +# metricsets: ["status"] period: 10s hosts: ["http://127.0.0.1"] diff --git a/metricbeat/modules.d/ceph.yml.disabled b/metricbeat/modules.d/ceph.yml.disabled index c5fc19b6c8f..79746edba8c 100644 --- a/metricbeat/modules.d/ceph.yml.disabled +++ b/metricbeat/modules.d/ceph.yml.disabled @@ -2,18 +2,18 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-ceph.html - module: ceph - metricsets: - - cluster_health - - cluster_status - - monitor_health +# metricsets: +# - cluster_health +# - cluster_status +# - monitor_health period: 10s hosts: ["localhost:5000"] - module: ceph - metricsets: - - cluster_disk - - osd_tree - - osd_df - - pool_disk +# metricsets: +# - cluster_disk +# - osd_tree +# - osd_df +# - pool_disk period: 1m hosts: ["localhost:5000"] diff --git a/metricbeat/modules.d/couchbase.yml.disabled b/metricbeat/modules.d/couchbase.yml.disabled index 25e6cbf12f8..d04f855e2a2 100644 --- a/metricbeat/modules.d/couchbase.yml.disabled +++ b/metricbeat/modules.d/couchbase.yml.disabled @@ -2,9 +2,9 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-couchbase.html - module: couchbase - metricsets: - - bucket - - cluster - - node +# metricsets: +# - bucket +# - cluster +# - node period: 10s hosts: ["localhost:8091"] diff --git a/metricbeat/modules.d/docker.yml.disabled b/metricbeat/modules.d/docker.yml.disabled index 22301e5c27f..f1f341ec9f6 100644 --- a/metricbeat/modules.d/docker.yml.disabled +++ b/metricbeat/modules.d/docker.yml.disabled @@ -2,14 +2,14 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-docker.html - module: docker - metricsets: - - container - - cpu - - diskio - - healthcheck - - info - - memory - - network +# metricsets: +# - container +# - cpu +# - diskio +# - healthcheck +# - info +# - memory +# - network period: 10s hosts: ["unix:///var/run/docker.sock"] diff --git a/metricbeat/modules.d/dropwizard.yml.disabled b/metricbeat/modules.d/dropwizard.yml.disabled index 8f4657b7612..7531c3cac66 100644 --- a/metricbeat/modules.d/dropwizard.yml.disabled +++ b/metricbeat/modules.d/dropwizard.yml.disabled @@ -2,7 +2,7 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-dropwizard.html - module: dropwizard - metricsets: ["collector"] +# metricsets: ["collector"] period: 10s hosts: ["localhost:8080"] metrics_path: /metrics/metrics diff --git a/metricbeat/modules.d/elasticsearch.yml.disabled b/metricbeat/modules.d/elasticsearch.yml.disabled index 9f4c484f910..f9c371baf7d 100644 --- a/metricbeat/modules.d/elasticsearch.yml.disabled +++ b/metricbeat/modules.d/elasticsearch.yml.disabled @@ -2,8 +2,8 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-elasticsearch.html - module: elasticsearch - metricsets: - - node - - node_stats +# metricsets: +# - node +# - node_stats period: 10s hosts: ["localhost:9200"] diff --git a/metricbeat/modules.d/etcd.yml.disabled b/metricbeat/modules.d/etcd.yml.disabled index 81d605e8285..f3cdbc3c49b 100644 --- a/metricbeat/modules.d/etcd.yml.disabled +++ b/metricbeat/modules.d/etcd.yml.disabled @@ -2,9 +2,9 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-etcd.html - module: etcd - metricsets: - - leader - - self - - store +# metricsets: +# - leader +# - self +# - store period: 10s hosts: ["localhost:2379"] diff --git a/metricbeat/modules.d/golang.yml.disabled b/metricbeat/modules.d/golang.yml.disabled index dc37952394b..c70b456b11f 100644 --- a/metricbeat/modules.d/golang.yml.disabled +++ b/metricbeat/modules.d/golang.yml.disabled @@ -2,9 +2,9 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-golang.html - module: golang - metricsets: - - expvar - - heap +# metricsets: +# - expvar +# - heap period: 10s hosts: ["localhost:6060"] heap.path: "/debug/vars" diff --git a/metricbeat/modules.d/graphite.yml.disabled b/metricbeat/modules.d/graphite.yml.disabled index dc655431c8a..e31fd1848a8 100644 --- a/metricbeat/modules.d/graphite.yml.disabled +++ b/metricbeat/modules.d/graphite.yml.disabled @@ -2,7 +2,7 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-graphite.html - module: graphite - metricsets: ["server"] +# metricsets: ["server"] # protocol: "udp" # templates: # - filter: "test.*.bash.*" # This would match metrics like test.localhost.bash.stats diff --git a/metricbeat/modules.d/haproxy.yml.disabled b/metricbeat/modules.d/haproxy.yml.disabled index e13e6b139a3..fe8efe1a833 100644 --- a/metricbeat/modules.d/haproxy.yml.disabled +++ b/metricbeat/modules.d/haproxy.yml.disabled @@ -2,8 +2,8 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-haproxy.html - module: haproxy - metricsets: - - info - - stat +# metricsets: +# - info +# - stat period: 10s hosts: ["tcp://127.0.0.1:14567"] diff --git a/metricbeat/modules.d/jolokia.yml.disabled b/metricbeat/modules.d/jolokia.yml.disabled index 47c71c0427a..1faa63e64ab 100644 --- a/metricbeat/modules.d/jolokia.yml.disabled +++ b/metricbeat/modules.d/jolokia.yml.disabled @@ -2,11 +2,11 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-jolokia.html - module: jolokia - metricsets: ["jmx"] +# metricsets: ["jmx"] period: 10s hosts: ["localhost"] namespace: "metrics" - #path: "/jolokia/?ignoreErrors=true&canonicalNaming=false" +# path: "/jolokia/?ignoreErrors=true&canonicalNaming=false" jmx.mappings: # - mbean: 'java.lang:type=Runtime' # attributes: diff --git a/metricbeat/modules.d/kafka.yml.disabled b/metricbeat/modules.d/kafka.yml.disabled index e2dceaf2c23..de1104b4eab 100644 --- a/metricbeat/modules.d/kafka.yml.disabled +++ b/metricbeat/modules.d/kafka.yml.disabled @@ -2,9 +2,9 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-kafka.html - module: kafka - metricsets: - - partition - - consumergroup +# metricsets: +# - partition +# - consumergroup period: 10s hosts: ["localhost:9092"] diff --git a/metricbeat/modules.d/kibana.yml.disabled b/metricbeat/modules.d/kibana.yml.disabled index 6ca240bf761..96104a38f65 100644 --- a/metricbeat/modules.d/kibana.yml.disabled +++ b/metricbeat/modules.d/kibana.yml.disabled @@ -2,6 +2,6 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-kibana.html - module: kibana - metricsets: ["status"] +# metricsets: ["status"] period: 10s hosts: ["localhost:5601"] diff --git a/metricbeat/modules.d/kubernetes.yml.disabled b/metricbeat/modules.d/kubernetes.yml.disabled index e3bba2ee775..a981ed82eb9 100644 --- a/metricbeat/modules.d/kubernetes.yml.disabled +++ b/metricbeat/modules.d/kubernetes.yml.disabled @@ -3,12 +3,12 @@ # Node metrics, from kubelet: - module: kubernetes - metricsets: - - node - - system - - pod - - container - - volume +# metricsets: +# - node +# - system +# - pod +# - container +# - volume period: 10s hosts: ["localhost:10255"] #ssl.certificate_authorities: ["/etc/pki/root/ca.pem"] diff --git a/metricbeat/modules.d/kvm.yml.disabled b/metricbeat/modules.d/kvm.yml.disabled index 919a1fa4ed9..357ae24c08e 100644 --- a/metricbeat/modules.d/kvm.yml.disabled +++ b/metricbeat/modules.d/kvm.yml.disabled @@ -2,6 +2,6 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-kvm.html - module: kvm - metricsets: ["dommemstat"] +# metricsets: ["dommemstat"] period: 10s hosts: ["localhost"] diff --git a/metricbeat/modules.d/logstash.yml.disabled b/metricbeat/modules.d/logstash.yml.disabled index 00852d3ac77..f95a75577c5 100644 --- a/metricbeat/modules.d/logstash.yml.disabled +++ b/metricbeat/modules.d/logstash.yml.disabled @@ -2,8 +2,8 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-logstash.html - module: logstash - metricsets: - - node - - node_stats +# metricsets: +# - node +# - node_stats period: 10s hosts: ["localhost:9600"] diff --git a/metricbeat/modules.d/memcached.yml.disabled b/metricbeat/modules.d/memcached.yml.disabled index 8c8bbb81820..7037988cc35 100644 --- a/metricbeat/modules.d/memcached.yml.disabled +++ b/metricbeat/modules.d/memcached.yml.disabled @@ -2,6 +2,6 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-memcached.html - module: memcached - metricsets: ["stats"] +# metricsets: ["stats"] period: 10s hosts: ["localhost:11211"] diff --git a/metricbeat/modules.d/mongodb.yml.disabled b/metricbeat/modules.d/mongodb.yml.disabled index eb4d5f1cd19..4ffa806cb96 100644 --- a/metricbeat/modules.d/mongodb.yml.disabled +++ b/metricbeat/modules.d/mongodb.yml.disabled @@ -2,9 +2,9 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-mongodb.html - module: mongodb - metricsets: - - dbstats - - status +# metricsets: +# - dbstats +# - status period: 10s # The hosts must be passed as MongoDB URLs in the format: diff --git a/metricbeat/modules.d/munin.yml.disabled b/metricbeat/modules.d/munin.yml.disabled index 7ce01d7b1a1..a7bcb034fb4 100644 --- a/metricbeat/modules.d/munin.yml.disabled +++ b/metricbeat/modules.d/munin.yml.disabled @@ -2,7 +2,7 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-munin.html - module: munin - metricsets: ["node"] +# metricsets: ["node"] period: 10s hosts: ["localhost:4949"] node.namespace: node diff --git a/metricbeat/modules.d/mysql.yml.disabled b/metricbeat/modules.d/mysql.yml.disabled index 43aac88e535..fbb07e03a44 100644 --- a/metricbeat/modules.d/mysql.yml.disabled +++ b/metricbeat/modules.d/mysql.yml.disabled @@ -2,7 +2,7 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-mysql.html - module: mysql - metricsets: ["status"] +# metricsets: ["status"] period: 10s # Host DSN should be defined as "user:pass@tcp(127.0.0.1:3306)/" diff --git a/metricbeat/modules.d/nginx.yml.disabled b/metricbeat/modules.d/nginx.yml.disabled index 957fbbaa572..d0bbde6a519 100644 --- a/metricbeat/modules.d/nginx.yml.disabled +++ b/metricbeat/modules.d/nginx.yml.disabled @@ -2,7 +2,7 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-nginx.html - module: nginx - metricsets: ["stubstatus"] +# metricsets: ["stubstatus"] period: 10s # Nginx hosts diff --git a/metricbeat/modules.d/php_fpm.yml.disabled b/metricbeat/modules.d/php_fpm.yml.disabled index e57ea128839..c25fcac1ee7 100644 --- a/metricbeat/modules.d/php_fpm.yml.disabled +++ b/metricbeat/modules.d/php_fpm.yml.disabled @@ -2,7 +2,7 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-php_fpm.html - module: php_fpm - metricsets: ["pool"] +# metricsets: ["pool"] period: 10s hosts: ["localhost:8080"] status_path: "/status" diff --git a/metricbeat/modules.d/postgresql.yml.disabled b/metricbeat/modules.d/postgresql.yml.disabled index 2c71ad0b782..16154c04306 100644 --- a/metricbeat/modules.d/postgresql.yml.disabled +++ b/metricbeat/modules.d/postgresql.yml.disabled @@ -2,16 +2,13 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-postgresql.html - module: postgresql - metricsets: - # Stats about every PostgreSQL database - - database - - # Stats about the background writer process's activity - - bgwriter - - # Stats about every PostgreSQL process - - activity - +# metricsets: +# # Stats about every PostgreSQL database +# - database +# # Stats about the background writer process's activity +# - bgwriter +# # Stats about every PostgreSQL process +# - activity period: 10s # The host must be passed as PostgreSQL URL. Example: diff --git a/metricbeat/modules.d/prometheus.yml.disabled b/metricbeat/modules.d/prometheus.yml.disabled index 488434c5fbe..63a408d6a1a 100644 --- a/metricbeat/modules.d/prometheus.yml.disabled +++ b/metricbeat/modules.d/prometheus.yml.disabled @@ -2,7 +2,7 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-prometheus.html - module: prometheus - metricsets: ["stats"] +# metricsets: ["stats"] period: 10s hosts: ["localhost:9090"] metrics_path: /metrics diff --git a/metricbeat/modules.d/rabbitmq.yml.disabled b/metricbeat/modules.d/rabbitmq.yml.disabled index 6bcc6aeeb53..5702c04ab34 100644 --- a/metricbeat/modules.d/rabbitmq.yml.disabled +++ b/metricbeat/modules.d/rabbitmq.yml.disabled @@ -2,10 +2,10 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-rabbitmq.html - module: rabbitmq - metricsets: - - node - - queue - - connection +# metricsets: +# - node +# - queue +# - connection period: 10s hosts: ["localhost:15672"] diff --git a/metricbeat/modules.d/redis.yml.disabled b/metricbeat/modules.d/redis.yml.disabled index 6a1a122b75c..742dd6ad89e 100644 --- a/metricbeat/modules.d/redis.yml.disabled +++ b/metricbeat/modules.d/redis.yml.disabled @@ -2,9 +2,9 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-redis.html - module: redis - metricsets: - - info - - keyspace +# metricsets: +# - info +# - keyspace period: 10s # Redis hosts diff --git a/metricbeat/modules.d/uwsgi.yml.disabled b/metricbeat/modules.d/uwsgi.yml.disabled index fc4e89d9624..109be6c8312 100644 --- a/metricbeat/modules.d/uwsgi.yml.disabled +++ b/metricbeat/modules.d/uwsgi.yml.disabled @@ -2,6 +2,6 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-uwsgi.html - module: uwsgi - metricsets: ["status"] +# metricsets: ["status"] period: 10s hosts: ["tcp://127.0.0.1:9191"] diff --git a/metricbeat/modules.d/vsphere.yml.disabled b/metricbeat/modules.d/vsphere.yml.disabled index 15c637892f1..95810121557 100644 --- a/metricbeat/modules.d/vsphere.yml.disabled +++ b/metricbeat/modules.d/vsphere.yml.disabled @@ -2,7 +2,10 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-vsphere.html - module: vsphere - metricsets: ["datastore", "host", "virtualmachine"] +# metricsets: +# - datastore +# - host +# - virtualmachine period: 10s hosts: ["https://localhost/sdk"] @@ -12,4 +15,3 @@ insecure: false # Get custom fields when using virtualmachine metric set. Default false. # get_custom_fields: false - diff --git a/metricbeat/modules.d/windows.yml.disabled b/metricbeat/modules.d/windows.yml.disabled index 53c1dfc5f49..91339facd1f 100644 --- a/metricbeat/modules.d/windows.yml.disabled +++ b/metricbeat/modules.d/windows.yml.disabled @@ -2,7 +2,7 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-windows.html - module: windows - metricsets: ["service"] +# metricsets: ["service"] period: 1m #- module: windows diff --git a/metricbeat/modules.d/zookeeper.yml.disabled b/metricbeat/modules.d/zookeeper.yml.disabled index 8af244f5d91..cfdde01039c 100644 --- a/metricbeat/modules.d/zookeeper.yml.disabled +++ b/metricbeat/modules.d/zookeeper.yml.disabled @@ -2,6 +2,6 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-zookeeper.html - module: zookeeper - metricsets: ["mntr"] +# metricsets: ["mntr"] period: 10s hosts: ["localhost:2181"] From a6ed0f3911a547183bd0b407d5934d22256f007d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20P=C3=A9rez-Aradros=20Herce?= Date: Mon, 7 May 2018 19:14:08 +0200 Subject: [PATCH 6/8] Rework metricsets and comments --- metricbeat/docs/modules/golang.asciidoc | 6 +- metricbeat/docs/modules/http.asciidoc | 16 ++--- metricbeat/docs/modules/jolokia.asciidoc | 36 ++++++------ metricbeat/metricbeat.reference.yml | 58 ++++++++++--------- metricbeat/module/apache/_meta/config.yml | 3 +- metricbeat/module/ceph/_meta/config.yml | 18 +++--- metricbeat/module/couchbase/_meta/config.yml | 8 +-- metricbeat/module/docker/_meta/config.yml | 16 ++--- metricbeat/module/dropwizard/_meta/config.yml | 3 +- .../module/elasticsearch/_meta/config.yml | 6 +- metricbeat/module/etcd/_meta/config.yml | 8 +-- metricbeat/module/golang/_meta/config.yml | 6 +- metricbeat/module/graphite/_meta/config.yml | 15 ++--- metricbeat/module/haproxy/_meta/config.yml | 6 +- metricbeat/module/http/_meta/config.yml | 16 ++--- metricbeat/module/jolokia/_meta/config.yml | 36 ++++++------ metricbeat/module/kafka/_meta/config.yml | 6 +- metricbeat/module/kibana/_meta/config.yml | 3 +- metricbeat/module/kubernetes/_meta/config.yml | 38 ++++++------ metricbeat/module/kvm/_meta/config.yml | 3 +- metricbeat/module/logstash/_meta/config.yml | 6 +- metricbeat/module/mongodb/_meta/config.yml | 6 +- metricbeat/module/munin/_meta/config.yml | 3 +- metricbeat/module/mysql/_meta/config.yml | 8 +-- metricbeat/module/nginx/_meta/config.yml | 3 +- metricbeat/module/php_fpm/_meta/config.yml | 3 +- metricbeat/module/postgresql/_meta/config.yml | 14 ++--- metricbeat/module/prometheus/_meta/config.yml | 3 +- metricbeat/module/rabbitmq/_meta/config.yml | 8 +-- metricbeat/module/redis/_meta/config.yml | 6 +- metricbeat/module/system/_meta/config.yml | 10 ++-- metricbeat/module/uwsgi/_meta/config.yml | 3 +- metricbeat/module/vsphere/_meta/config.yml | 8 +-- metricbeat/module/windows/_meta/config.yml | 6 +- metricbeat/module/zookeeper/_meta/config.yml | 3 +- metricbeat/modules.d/apache.yml.disabled | 3 +- metricbeat/modules.d/ceph.yml.disabled | 18 +++--- metricbeat/modules.d/couchbase.yml.disabled | 8 +-- metricbeat/modules.d/docker.yml.disabled | 16 ++--- metricbeat/modules.d/dropwizard.yml.disabled | 3 +- .../modules.d/elasticsearch.yml.disabled | 6 +- metricbeat/modules.d/etcd.yml.disabled | 8 +-- metricbeat/modules.d/golang.yml.disabled | 6 +- metricbeat/modules.d/graphite.yml.disabled | 15 ++--- metricbeat/modules.d/haproxy.yml.disabled | 6 +- metricbeat/modules.d/http.yml.disabled | 16 ++--- metricbeat/modules.d/jolokia.yml.disabled | 36 ++++++------ metricbeat/modules.d/kafka.yml.disabled | 6 +- metricbeat/modules.d/kibana.yml.disabled | 3 +- metricbeat/modules.d/kubernetes.yml.disabled | 38 ++++++------ metricbeat/modules.d/kvm.yml.disabled | 3 +- metricbeat/modules.d/logstash.yml.disabled | 6 +- metricbeat/modules.d/mongodb.yml.disabled | 6 +- metricbeat/modules.d/munin.yml.disabled | 3 +- metricbeat/modules.d/mysql.yml.disabled | 8 +-- metricbeat/modules.d/nginx.yml.disabled | 3 +- metricbeat/modules.d/php_fpm.yml.disabled | 3 +- metricbeat/modules.d/postgresql.yml.disabled | 14 ++--- metricbeat/modules.d/prometheus.yml.disabled | 3 +- metricbeat/modules.d/rabbitmq.yml.disabled | 8 +-- metricbeat/modules.d/redis.yml.disabled | 6 +- metricbeat/modules.d/system.yml | 10 ++-- metricbeat/modules.d/uwsgi.yml.disabled | 3 +- metricbeat/modules.d/vsphere.yml.disabled | 8 +-- metricbeat/modules.d/windows.yml.disabled | 6 +- metricbeat/modules.d/zookeeper.yml.disabled | 3 +- 66 files changed, 354 insertions(+), 324 deletions(-) diff --git a/metricbeat/docs/modules/golang.asciidoc b/metricbeat/docs/modules/golang.asciidoc index de85469a3dd..c662a666534 100644 --- a/metricbeat/docs/modules/golang.asciidoc +++ b/metricbeat/docs/modules/golang.asciidoc @@ -20,9 +20,9 @@ in <>. Here is an example configuration: ---- metricbeat.modules: - module: golang -# metricsets: -# - expvar -# - heap + #metricsets: + # - expvar + # - heap period: 10s hosts: ["localhost:6060"] heap.path: "/debug/vars" diff --git a/metricbeat/docs/modules/http.asciidoc b/metricbeat/docs/modules/http.asciidoc index d23e3b3dee2..6e1953b233a 100644 --- a/metricbeat/docs/modules/http.asciidoc +++ b/metricbeat/docs/modules/http.asciidoc @@ -26,7 +26,8 @@ in <>. Here is an example configuration: ---- metricbeat.modules: - module: http - metricsets: ["json"] + #metricsets: + # - json period: 10s hosts: ["localhost:80"] namespace: "json_namespace" @@ -39,15 +40,16 @@ metricbeat.modules: #dedot.enabled: false - module: http - metricsets: ["server"] + #metricsets: + # - server host: "localhost" port: "8080" enabled: false -# paths: -# - path: "/foo" -# namespace: "foo" -# fields: # added to the the response in root. overwrites existing fields -# key: "value" + #paths: + # - path: "/foo" + # namespace: "foo" + # fields: # added to the the response in root. overwrites existing fields + # key: "value" ---- This module supports TLS connection when using `ssl` config field, as described in <>. diff --git a/metricbeat/docs/modules/jolokia.asciidoc b/metricbeat/docs/modules/jolokia.asciidoc index 556b95e19b6..abf127325db 100644 --- a/metricbeat/docs/modules/jolokia.asciidoc +++ b/metricbeat/docs/modules/jolokia.asciidoc @@ -19,29 +19,29 @@ in <>. Here is an example configuration: ---- metricbeat.modules: - module: jolokia -# metricsets: ["jmx"] + #metricsets: ["jmx"] period: 10s hosts: ["localhost"] namespace: "metrics" -# path: "/jolokia/?ignoreErrors=true&canonicalNaming=false" + #path: "/jolokia/?ignoreErrors=true&canonicalNaming=false" jmx.mappings: - # - mbean: 'java.lang:type=Runtime' - # attributes: - # - attr: Uptime - # field: uptime - # - mbean: 'java.lang:type=Memory' - # attributes: - # - attr: HeapMemoryUsage - # field: memory.heap_usage - # - attr: NonHeapMemoryUsage - # field: memory.non_heap_usage + #- mbean: 'java.lang:type=Runtime' + # attributes: + # - attr: Uptime + # field: uptime + #- mbean: 'java.lang:type=Memory' + # attributes: + # - attr: HeapMemoryUsage + # field: memory.heap_usage + # - attr: NonHeapMemoryUsage + # field: memory.non_heap_usage # GC Metrics - this depends on what is available on your JVM - # - mbean: 'java.lang:type=GarbageCollector,name=ConcurrentMarkSweep' - # attributes: - # - attr: CollectionTime - # field: gc.cms_collection_time - # - attr: CollectionCount - # field: gc.cms_collection_count + #- mbean: 'java.lang:type=GarbageCollector,name=ConcurrentMarkSweep' + # attributes: + # - attr: CollectionTime + # field: gc.cms_collection_time + # - attr: CollectionCount + # field: gc.cms_collection_count jmx.application: jmx.instance: diff --git a/metricbeat/metricbeat.reference.yml b/metricbeat/metricbeat.reference.yml index 98190309efa..c3442837233 100644 --- a/metricbeat/metricbeat.reference.yml +++ b/metricbeat/metricbeat.reference.yml @@ -210,9 +210,9 @@ metricbeat.modules: #------------------------------- Golang Module ------------------------------- - module: golang -# metricsets: -# - expvar -# - heap + #metricsets: + # - expvar + # - heap period: 10s hosts: ["localhost:6060"] heap.path: "/debug/vars" @@ -253,7 +253,8 @@ metricbeat.modules: #-------------------------------- HTTP Module -------------------------------- - module: http - metricsets: ["json"] + #metricsets: + # - json period: 10s hosts: ["localhost:80"] namespace: "json_namespace" @@ -266,41 +267,42 @@ metricbeat.modules: #dedot.enabled: false - module: http - metricsets: ["server"] + #metricsets: + # - server host: "localhost" port: "8080" enabled: false -# paths: -# - path: "/foo" -# namespace: "foo" -# fields: # added to the the response in root. overwrites existing fields -# key: "value" + #paths: + # - path: "/foo" + # namespace: "foo" + # fields: # added to the the response in root. overwrites existing fields + # key: "value" #------------------------------- Jolokia Module ------------------------------ - module: jolokia -# metricsets: ["jmx"] + #metricsets: ["jmx"] period: 10s hosts: ["localhost"] namespace: "metrics" -# path: "/jolokia/?ignoreErrors=true&canonicalNaming=false" + #path: "/jolokia/?ignoreErrors=true&canonicalNaming=false" jmx.mappings: - # - mbean: 'java.lang:type=Runtime' - # attributes: - # - attr: Uptime - # field: uptime - # - mbean: 'java.lang:type=Memory' - # attributes: - # - attr: HeapMemoryUsage - # field: memory.heap_usage - # - attr: NonHeapMemoryUsage - # field: memory.non_heap_usage + #- mbean: 'java.lang:type=Runtime' + # attributes: + # - attr: Uptime + # field: uptime + #- mbean: 'java.lang:type=Memory' + # attributes: + # - attr: HeapMemoryUsage + # field: memory.heap_usage + # - attr: NonHeapMemoryUsage + # field: memory.non_heap_usage # GC Metrics - this depends on what is available on your JVM - # - mbean: 'java.lang:type=GarbageCollector,name=ConcurrentMarkSweep' - # attributes: - # - attr: CollectionTime - # field: gc.cms_collection_time - # - attr: CollectionCount - # field: gc.cms_collection_count + #- mbean: 'java.lang:type=GarbageCollector,name=ConcurrentMarkSweep' + # attributes: + # - attr: CollectionTime + # field: gc.cms_collection_time + # - attr: CollectionCount + # field: gc.cms_collection_count jmx.application: jmx.instance: diff --git a/metricbeat/module/apache/_meta/config.yml b/metricbeat/module/apache/_meta/config.yml index e1f875e3ff1..070eec24463 100644 --- a/metricbeat/module/apache/_meta/config.yml +++ b/metricbeat/module/apache/_meta/config.yml @@ -1,4 +1,5 @@ - module: apache -# metricsets: ["status"] + #metricsets: + # - status period: 10s hosts: ["http://127.0.0.1"] diff --git a/metricbeat/module/ceph/_meta/config.yml b/metricbeat/module/ceph/_meta/config.yml index d0c10db2c7d..d84cf3c8c5c 100644 --- a/metricbeat/module/ceph/_meta/config.yml +++ b/metricbeat/module/ceph/_meta/config.yml @@ -1,16 +1,16 @@ - module: ceph -# metricsets: -# - cluster_health -# - cluster_status -# - monitor_health + #metricsets: + # - cluster_health + # - cluster_status + # - monitor_health period: 10s hosts: ["localhost:5000"] - module: ceph -# metricsets: -# - cluster_disk -# - osd_tree -# - osd_df -# - pool_disk + #metricsets: + # - cluster_disk + # - osd_tree + # - osd_df + # - pool_disk period: 1m hosts: ["localhost:5000"] diff --git a/metricbeat/module/couchbase/_meta/config.yml b/metricbeat/module/couchbase/_meta/config.yml index 3553da50e7f..74840343019 100644 --- a/metricbeat/module/couchbase/_meta/config.yml +++ b/metricbeat/module/couchbase/_meta/config.yml @@ -1,7 +1,7 @@ - module: couchbase -# metricsets: -# - bucket -# - cluster -# - node + #metricsets: + # - bucket + # - cluster + # - node period: 10s hosts: ["localhost:8091"] diff --git a/metricbeat/module/docker/_meta/config.yml b/metricbeat/module/docker/_meta/config.yml index 3b74bf63138..58e0880b8e4 100644 --- a/metricbeat/module/docker/_meta/config.yml +++ b/metricbeat/module/docker/_meta/config.yml @@ -1,12 +1,12 @@ - module: docker -# metricsets: -# - container -# - cpu -# - diskio -# - healthcheck -# - info -# - memory -# - network + #metricsets: + # - container + # - cpu + # - diskio + # - healthcheck + # - info + # - memory + # - network period: 10s hosts: ["unix:///var/run/docker.sock"] diff --git a/metricbeat/module/dropwizard/_meta/config.yml b/metricbeat/module/dropwizard/_meta/config.yml index 48a44569a1c..cf04a3365f9 100644 --- a/metricbeat/module/dropwizard/_meta/config.yml +++ b/metricbeat/module/dropwizard/_meta/config.yml @@ -1,5 +1,6 @@ - module: dropwizard -# metricsets: ["collector"] + #metricsets: + # - collector period: 10s hosts: ["localhost:8080"] metrics_path: /metrics/metrics diff --git a/metricbeat/module/elasticsearch/_meta/config.yml b/metricbeat/module/elasticsearch/_meta/config.yml index 5c30bde5045..96844963529 100644 --- a/metricbeat/module/elasticsearch/_meta/config.yml +++ b/metricbeat/module/elasticsearch/_meta/config.yml @@ -1,6 +1,6 @@ - module: elasticsearch -# metricsets: -# - node -# - node_stats + #metricsets: + # - node + # - node_stats period: 10s hosts: ["localhost:9200"] diff --git a/metricbeat/module/etcd/_meta/config.yml b/metricbeat/module/etcd/_meta/config.yml index 4ccb6c54554..86e1e58fcc9 100644 --- a/metricbeat/module/etcd/_meta/config.yml +++ b/metricbeat/module/etcd/_meta/config.yml @@ -1,7 +1,7 @@ - module: etcd -# metricsets: -# - leader -# - self -# - store + #metricsets: + # - leader + # - self + # - store period: 10s hosts: ["localhost:2379"] diff --git a/metricbeat/module/golang/_meta/config.yml b/metricbeat/module/golang/_meta/config.yml index 5ebf9250e96..fe5805b1e51 100644 --- a/metricbeat/module/golang/_meta/config.yml +++ b/metricbeat/module/golang/_meta/config.yml @@ -1,7 +1,7 @@ - module: golang -# metricsets: -# - expvar -# - heap + #metricsets: + # - expvar + # - heap period: 10s hosts: ["localhost:6060"] heap.path: "/debug/vars" diff --git a/metricbeat/module/graphite/_meta/config.yml b/metricbeat/module/graphite/_meta/config.yml index 2407aba52f1..21c7c3a329b 100644 --- a/metricbeat/module/graphite/_meta/config.yml +++ b/metricbeat/module/graphite/_meta/config.yml @@ -1,8 +1,9 @@ - module: graphite -# metricsets: ["server"] -# protocol: "udp" -# templates: -# - filter: "test.*.bash.*" # This would match metrics like test.localhost.bash.stats -# namespace: "test" -# template: ".host.shell.metric*" # test.localhost.bash.stats would become metric=stats and tags host=localhost,shell=bash -# delimiter: "_" + #metricsets: + # - server + #protocol: "udp" + #templates: + # - filter: "test.*.bash.*" # This would match metrics like test.localhost.bash.stats + # namespace: "test" + # template: ".host.shell.metric*" # test.localhost.bash.stats would become metric=stats and tags host=localhost,shell=bash + # delimiter: "_" diff --git a/metricbeat/module/haproxy/_meta/config.yml b/metricbeat/module/haproxy/_meta/config.yml index f858e8f35ba..0da97519923 100644 --- a/metricbeat/module/haproxy/_meta/config.yml +++ b/metricbeat/module/haproxy/_meta/config.yml @@ -1,6 +1,6 @@ - module: haproxy -# metricsets: -# - info -# - stat + #metricsets: + # - info + # - stat period: 10s hosts: ["tcp://127.0.0.1:14567"] diff --git a/metricbeat/module/http/_meta/config.yml b/metricbeat/module/http/_meta/config.yml index 286bddb897b..a66e9429513 100644 --- a/metricbeat/module/http/_meta/config.yml +++ b/metricbeat/module/http/_meta/config.yml @@ -1,5 +1,6 @@ - module: http - metricsets: ["json"] + #metricsets: + # - json period: 10s hosts: ["localhost:80"] namespace: "json_namespace" @@ -12,12 +13,13 @@ #dedot.enabled: false - module: http - metricsets: ["server"] + #metricsets: + # - server host: "localhost" port: "8080" enabled: false -# paths: -# - path: "/foo" -# namespace: "foo" -# fields: # added to the the response in root. overwrites existing fields -# key: "value" + #paths: + # - path: "/foo" + # namespace: "foo" + # fields: # added to the the response in root. overwrites existing fields + # key: "value" diff --git a/metricbeat/module/jolokia/_meta/config.yml b/metricbeat/module/jolokia/_meta/config.yml index a74913a8373..de48ae161fd 100644 --- a/metricbeat/module/jolokia/_meta/config.yml +++ b/metricbeat/module/jolokia/_meta/config.yml @@ -1,27 +1,27 @@ - module: jolokia -# metricsets: ["jmx"] + #metricsets: ["jmx"] period: 10s hosts: ["localhost"] namespace: "metrics" -# path: "/jolokia/?ignoreErrors=true&canonicalNaming=false" + #path: "/jolokia/?ignoreErrors=true&canonicalNaming=false" jmx.mappings: - # - mbean: 'java.lang:type=Runtime' - # attributes: - # - attr: Uptime - # field: uptime - # - mbean: 'java.lang:type=Memory' - # attributes: - # - attr: HeapMemoryUsage - # field: memory.heap_usage - # - attr: NonHeapMemoryUsage - # field: memory.non_heap_usage + #- mbean: 'java.lang:type=Runtime' + # attributes: + # - attr: Uptime + # field: uptime + #- mbean: 'java.lang:type=Memory' + # attributes: + # - attr: HeapMemoryUsage + # field: memory.heap_usage + # - attr: NonHeapMemoryUsage + # field: memory.non_heap_usage # GC Metrics - this depends on what is available on your JVM - # - mbean: 'java.lang:type=GarbageCollector,name=ConcurrentMarkSweep' - # attributes: - # - attr: CollectionTime - # field: gc.cms_collection_time - # - attr: CollectionCount - # field: gc.cms_collection_count + #- mbean: 'java.lang:type=GarbageCollector,name=ConcurrentMarkSweep' + # attributes: + # - attr: CollectionTime + # field: gc.cms_collection_time + # - attr: CollectionCount + # field: gc.cms_collection_count jmx.application: jmx.instance: diff --git a/metricbeat/module/kafka/_meta/config.yml b/metricbeat/module/kafka/_meta/config.yml index 5c85f0e6896..9ed476ffe6f 100644 --- a/metricbeat/module/kafka/_meta/config.yml +++ b/metricbeat/module/kafka/_meta/config.yml @@ -1,7 +1,7 @@ - module: kafka -# metricsets: -# - partition -# - consumergroup + #metricsets: + # - partition + # - consumergroup period: 10s hosts: ["localhost:9092"] diff --git a/metricbeat/module/kibana/_meta/config.yml b/metricbeat/module/kibana/_meta/config.yml index 5b34b28a5b8..db546c95829 100644 --- a/metricbeat/module/kibana/_meta/config.yml +++ b/metricbeat/module/kibana/_meta/config.yml @@ -1,4 +1,5 @@ - module: kibana -# metricsets: ["status"] + #metricsets: + # - status period: 10s hosts: ["localhost:5601"] diff --git a/metricbeat/module/kubernetes/_meta/config.yml b/metricbeat/module/kubernetes/_meta/config.yml index 424a8de8215..ab04d158cee 100644 --- a/metricbeat/module/kubernetes/_meta/config.yml +++ b/metricbeat/module/kubernetes/_meta/config.yml @@ -1,11 +1,11 @@ # Node metrics, from kubelet: - module: kubernetes -# metricsets: -# - node -# - system -# - pod -# - container -# - volume + #metricsets: + # - node + # - system + # - pod + # - container + # - volume period: 10s hosts: ["localhost:10255"] #ssl.certificate_authorities: ["/etc/pki/root/ca.pem"] @@ -13,18 +13,18 @@ #ssl.key: "/etc/pki/client/cert.key" # State metrics from kube-state-metrics service: -# - module: kubernetes -# metricsets: -# - state_node -# - state_deployment -# - state_replicaset -# - state_statefulset -# - state_pod -# - state_container -# period: 10s -# hosts: ["kube-state-metrics:8080"] +#- module: kubernetes +# metricsets: +# - state_node +# - state_deployment +# - state_replicaset +# - state_statefulset +# - state_pod +# - state_container +# period: 10s +# hosts: ["kube-state-metrics:8080"] # Kubernetes events -# - module: kubernetes -# metricsets: -# - event +#- module: kubernetes +# metricsets: +# - event diff --git a/metricbeat/module/kvm/_meta/config.yml b/metricbeat/module/kvm/_meta/config.yml index 589b1ad7b7a..cddd5e78cf8 100644 --- a/metricbeat/module/kvm/_meta/config.yml +++ b/metricbeat/module/kvm/_meta/config.yml @@ -1,4 +1,5 @@ - module: kvm -# metricsets: ["dommemstat"] + #metricsets: + # - dommemstat period: 10s hosts: ["localhost"] diff --git a/metricbeat/module/logstash/_meta/config.yml b/metricbeat/module/logstash/_meta/config.yml index a645edbbbed..4e4f828e179 100644 --- a/metricbeat/module/logstash/_meta/config.yml +++ b/metricbeat/module/logstash/_meta/config.yml @@ -1,6 +1,6 @@ - module: logstash -# metricsets: -# - node -# - node_stats + #metricsets: + # - node + # - node_stats period: 10s hosts: ["localhost:9600"] diff --git a/metricbeat/module/mongodb/_meta/config.yml b/metricbeat/module/mongodb/_meta/config.yml index b7855b86d7a..18589bb4ef7 100644 --- a/metricbeat/module/mongodb/_meta/config.yml +++ b/metricbeat/module/mongodb/_meta/config.yml @@ -1,7 +1,7 @@ - module: mongodb -# metricsets: -# - dbstats -# - status + #metricsets: + # - dbstats + # - status period: 10s # The hosts must be passed as MongoDB URLs in the format: diff --git a/metricbeat/module/munin/_meta/config.yml b/metricbeat/module/munin/_meta/config.yml index 90fde4b6c4b..c8267c385dd 100644 --- a/metricbeat/module/munin/_meta/config.yml +++ b/metricbeat/module/munin/_meta/config.yml @@ -1,5 +1,6 @@ - module: munin -# metricsets: ["node"] + #metricsets: + # - node period: 10s hosts: ["localhost:4949"] node.namespace: node diff --git a/metricbeat/module/mysql/_meta/config.yml b/metricbeat/module/mysql/_meta/config.yml index 613c9561255..b1417fe8d5c 100644 --- a/metricbeat/module/mysql/_meta/config.yml +++ b/metricbeat/module/mysql/_meta/config.yml @@ -1,5 +1,6 @@ - module: mysql -# metricsets: ["status"] + #metricsets: + # - status period: 10s # Host DSN should be defined as "user:pass@tcp(127.0.0.1:3306)/" @@ -11,7 +12,4 @@ #username: root # Password of hosts. Empty by default. - #password: secret - - # By setting raw to true, all raw fields from the status metricset will be added to the event. - #raw: false + #password: secret \ No newline at end of file diff --git a/metricbeat/module/nginx/_meta/config.yml b/metricbeat/module/nginx/_meta/config.yml index 2b0019d1cb7..d2f66a7c455 100644 --- a/metricbeat/module/nginx/_meta/config.yml +++ b/metricbeat/module/nginx/_meta/config.yml @@ -1,5 +1,6 @@ - module: nginx -# metricsets: ["stubstatus"] + #metricsets: + # - stubstatus period: 10s # Nginx hosts diff --git a/metricbeat/module/php_fpm/_meta/config.yml b/metricbeat/module/php_fpm/_meta/config.yml index 0cbe6fb032f..87d98c3b4b8 100644 --- a/metricbeat/module/php_fpm/_meta/config.yml +++ b/metricbeat/module/php_fpm/_meta/config.yml @@ -1,5 +1,6 @@ - module: php_fpm -# metricsets: ["pool"] + #metricsets: + # - pool period: 10s hosts: ["localhost:8080"] status_path: "/status" diff --git a/metricbeat/module/postgresql/_meta/config.yml b/metricbeat/module/postgresql/_meta/config.yml index e8d47bb5173..0d6e99806de 100644 --- a/metricbeat/module/postgresql/_meta/config.yml +++ b/metricbeat/module/postgresql/_meta/config.yml @@ -1,11 +1,11 @@ - module: postgresql -# metricsets: -# # Stats about every PostgreSQL database -# - database -# # Stats about the background writer process's activity -# - bgwriter -# # Stats about every PostgreSQL process -# - activity + #metricsets: + # # Stats about every PostgreSQL database + # - database + # # Stats about the background writer process's activity + # - bgwriter + # # Stats about every PostgreSQL process + # - activity period: 10s # The host must be passed as PostgreSQL URL. Example: diff --git a/metricbeat/module/prometheus/_meta/config.yml b/metricbeat/module/prometheus/_meta/config.yml index d69fef1549e..e343f58df38 100644 --- a/metricbeat/module/prometheus/_meta/config.yml +++ b/metricbeat/module/prometheus/_meta/config.yml @@ -1,5 +1,6 @@ - module: prometheus -# metricsets: ["stats"] + #metricsets: + # - stats period: 10s hosts: ["localhost:9090"] metrics_path: /metrics diff --git a/metricbeat/module/rabbitmq/_meta/config.yml b/metricbeat/module/rabbitmq/_meta/config.yml index 062c01ca7f3..f3dc2dd6fb4 100644 --- a/metricbeat/module/rabbitmq/_meta/config.yml +++ b/metricbeat/module/rabbitmq/_meta/config.yml @@ -1,8 +1,8 @@ - module: rabbitmq -# metricsets: -# - node -# - queue -# - connection + #metricsets: + # - node + # - queue + # - connection period: 10s hosts: ["localhost:15672"] diff --git a/metricbeat/module/redis/_meta/config.yml b/metricbeat/module/redis/_meta/config.yml index 49ca38b5e57..c64ccb83500 100644 --- a/metricbeat/module/redis/_meta/config.yml +++ b/metricbeat/module/redis/_meta/config.yml @@ -1,7 +1,7 @@ - module: redis -# metricsets: -# - info -# - keyspace + #metricsets: + # - info + # - keyspace period: 10s # Redis hosts diff --git a/metricbeat/module/system/_meta/config.yml b/metricbeat/module/system/_meta/config.yml index 6e4b5226c93..532faff31a1 100644 --- a/metricbeat/module/system/_meta/config.yml +++ b/metricbeat/module/system/_meta/config.yml @@ -28,8 +28,8 @@ metricsets: - uptime -# - module: system -# period: 5m -# metricsets: -# - raid -# raid.mount_point: '/' +#- module: system +# period: 5m +# metricsets: +# - raid +# raid.mount_point: '/' diff --git a/metricbeat/module/uwsgi/_meta/config.yml b/metricbeat/module/uwsgi/_meta/config.yml index 1646dfb8605..42ee93c1899 100644 --- a/metricbeat/module/uwsgi/_meta/config.yml +++ b/metricbeat/module/uwsgi/_meta/config.yml @@ -1,4 +1,5 @@ - module: uwsgi -# metricsets: ["status"] + #metricsets: + # - status period: 10s hosts: ["tcp://127.0.0.1:9191"] diff --git a/metricbeat/module/vsphere/_meta/config.yml b/metricbeat/module/vsphere/_meta/config.yml index 11c59fb4e14..6862012209b 100644 --- a/metricbeat/module/vsphere/_meta/config.yml +++ b/metricbeat/module/vsphere/_meta/config.yml @@ -1,8 +1,8 @@ - module: vsphere -# metricsets: -# - datastore -# - host -# - virtualmachine + #metricsets: + # - datastore + # - host + # - virtualmachine period: 10s hosts: ["https://localhost/sdk"] diff --git a/metricbeat/module/windows/_meta/config.yml b/metricbeat/module/windows/_meta/config.yml index d1de803e878..3d3269a3b07 100644 --- a/metricbeat/module/windows/_meta/config.yml +++ b/metricbeat/module/windows/_meta/config.yml @@ -1,9 +1,11 @@ - module: windows -# metricsets: ["service"] + #metricsets: + # - service period: 1m #- module: windows -# metricsets: ["perfmon"] +# metricsets: +# - perfmon # period: 10s # perfmon.counters: # - instance_label: processor.name diff --git a/metricbeat/module/zookeeper/_meta/config.yml b/metricbeat/module/zookeeper/_meta/config.yml index e81204dfcdb..17fb7135973 100644 --- a/metricbeat/module/zookeeper/_meta/config.yml +++ b/metricbeat/module/zookeeper/_meta/config.yml @@ -1,4 +1,5 @@ - module: zookeeper -# metricsets: ["mntr"] + #metricsets: + # - mntr period: 10s hosts: ["localhost:2181"] diff --git a/metricbeat/modules.d/apache.yml.disabled b/metricbeat/modules.d/apache.yml.disabled index 7e9a59a475e..0f838b8d56c 100644 --- a/metricbeat/modules.d/apache.yml.disabled +++ b/metricbeat/modules.d/apache.yml.disabled @@ -2,6 +2,7 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-apache.html - module: apache -# metricsets: ["status"] + #metricsets: + # - status period: 10s hosts: ["http://127.0.0.1"] diff --git a/metricbeat/modules.d/ceph.yml.disabled b/metricbeat/modules.d/ceph.yml.disabled index 79746edba8c..fafa2a69d71 100644 --- a/metricbeat/modules.d/ceph.yml.disabled +++ b/metricbeat/modules.d/ceph.yml.disabled @@ -2,18 +2,18 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-ceph.html - module: ceph -# metricsets: -# - cluster_health -# - cluster_status -# - monitor_health + #metricsets: + # - cluster_health + # - cluster_status + # - monitor_health period: 10s hosts: ["localhost:5000"] - module: ceph -# metricsets: -# - cluster_disk -# - osd_tree -# - osd_df -# - pool_disk + #metricsets: + # - cluster_disk + # - osd_tree + # - osd_df + # - pool_disk period: 1m hosts: ["localhost:5000"] diff --git a/metricbeat/modules.d/couchbase.yml.disabled b/metricbeat/modules.d/couchbase.yml.disabled index d04f855e2a2..1c0b2035d08 100644 --- a/metricbeat/modules.d/couchbase.yml.disabled +++ b/metricbeat/modules.d/couchbase.yml.disabled @@ -2,9 +2,9 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-couchbase.html - module: couchbase -# metricsets: -# - bucket -# - cluster -# - node + #metricsets: + # - bucket + # - cluster + # - node period: 10s hosts: ["localhost:8091"] diff --git a/metricbeat/modules.d/docker.yml.disabled b/metricbeat/modules.d/docker.yml.disabled index f1f341ec9f6..9200aa5eb77 100644 --- a/metricbeat/modules.d/docker.yml.disabled +++ b/metricbeat/modules.d/docker.yml.disabled @@ -2,14 +2,14 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-docker.html - module: docker -# metricsets: -# - container -# - cpu -# - diskio -# - healthcheck -# - info -# - memory -# - network + #metricsets: + # - container + # - cpu + # - diskio + # - healthcheck + # - info + # - memory + # - network period: 10s hosts: ["unix:///var/run/docker.sock"] diff --git a/metricbeat/modules.d/dropwizard.yml.disabled b/metricbeat/modules.d/dropwizard.yml.disabled index 7531c3cac66..d2607d7b7f0 100644 --- a/metricbeat/modules.d/dropwizard.yml.disabled +++ b/metricbeat/modules.d/dropwizard.yml.disabled @@ -2,7 +2,8 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-dropwizard.html - module: dropwizard -# metricsets: ["collector"] + #metricsets: + # - collector period: 10s hosts: ["localhost:8080"] metrics_path: /metrics/metrics diff --git a/metricbeat/modules.d/elasticsearch.yml.disabled b/metricbeat/modules.d/elasticsearch.yml.disabled index f9c371baf7d..cebc667e85c 100644 --- a/metricbeat/modules.d/elasticsearch.yml.disabled +++ b/metricbeat/modules.d/elasticsearch.yml.disabled @@ -2,8 +2,8 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-elasticsearch.html - module: elasticsearch -# metricsets: -# - node -# - node_stats + #metricsets: + # - node + # - node_stats period: 10s hosts: ["localhost:9200"] diff --git a/metricbeat/modules.d/etcd.yml.disabled b/metricbeat/modules.d/etcd.yml.disabled index f3cdbc3c49b..0039ea9b50e 100644 --- a/metricbeat/modules.d/etcd.yml.disabled +++ b/metricbeat/modules.d/etcd.yml.disabled @@ -2,9 +2,9 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-etcd.html - module: etcd -# metricsets: -# - leader -# - self -# - store + #metricsets: + # - leader + # - self + # - store period: 10s hosts: ["localhost:2379"] diff --git a/metricbeat/modules.d/golang.yml.disabled b/metricbeat/modules.d/golang.yml.disabled index c70b456b11f..8bb65e090e1 100644 --- a/metricbeat/modules.d/golang.yml.disabled +++ b/metricbeat/modules.d/golang.yml.disabled @@ -2,9 +2,9 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-golang.html - module: golang -# metricsets: -# - expvar -# - heap + #metricsets: + # - expvar + # - heap period: 10s hosts: ["localhost:6060"] heap.path: "/debug/vars" diff --git a/metricbeat/modules.d/graphite.yml.disabled b/metricbeat/modules.d/graphite.yml.disabled index e31fd1848a8..78f7c32b304 100644 --- a/metricbeat/modules.d/graphite.yml.disabled +++ b/metricbeat/modules.d/graphite.yml.disabled @@ -2,10 +2,11 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-graphite.html - module: graphite -# metricsets: ["server"] -# protocol: "udp" -# templates: -# - filter: "test.*.bash.*" # This would match metrics like test.localhost.bash.stats -# namespace: "test" -# template: ".host.shell.metric*" # test.localhost.bash.stats would become metric=stats and tags host=localhost,shell=bash -# delimiter: "_" + #metricsets: + # - server + #protocol: "udp" + #templates: + # - filter: "test.*.bash.*" # This would match metrics like test.localhost.bash.stats + # namespace: "test" + # template: ".host.shell.metric*" # test.localhost.bash.stats would become metric=stats and tags host=localhost,shell=bash + # delimiter: "_" diff --git a/metricbeat/modules.d/haproxy.yml.disabled b/metricbeat/modules.d/haproxy.yml.disabled index fe8efe1a833..2c61ee0c55d 100644 --- a/metricbeat/modules.d/haproxy.yml.disabled +++ b/metricbeat/modules.d/haproxy.yml.disabled @@ -2,8 +2,8 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-haproxy.html - module: haproxy -# metricsets: -# - info -# - stat + #metricsets: + # - info + # - stat period: 10s hosts: ["tcp://127.0.0.1:14567"] diff --git a/metricbeat/modules.d/http.yml.disabled b/metricbeat/modules.d/http.yml.disabled index fc34463c026..fb4b5787b46 100644 --- a/metricbeat/modules.d/http.yml.disabled +++ b/metricbeat/modules.d/http.yml.disabled @@ -2,7 +2,8 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-http.html - module: http - metricsets: ["json"] + #metricsets: + # - json period: 10s hosts: ["localhost:80"] namespace: "json_namespace" @@ -15,12 +16,13 @@ #dedot.enabled: false - module: http - metricsets: ["server"] + #metricsets: + # - server host: "localhost" port: "8080" enabled: false -# paths: -# - path: "/foo" -# namespace: "foo" -# fields: # added to the the response in root. overwrites existing fields -# key: "value" + #paths: + # - path: "/foo" + # namespace: "foo" + # fields: # added to the the response in root. overwrites existing fields + # key: "value" diff --git a/metricbeat/modules.d/jolokia.yml.disabled b/metricbeat/modules.d/jolokia.yml.disabled index 1faa63e64ab..38a6adbf9e8 100644 --- a/metricbeat/modules.d/jolokia.yml.disabled +++ b/metricbeat/modules.d/jolokia.yml.disabled @@ -2,29 +2,29 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-jolokia.html - module: jolokia -# metricsets: ["jmx"] + #metricsets: ["jmx"] period: 10s hosts: ["localhost"] namespace: "metrics" -# path: "/jolokia/?ignoreErrors=true&canonicalNaming=false" + #path: "/jolokia/?ignoreErrors=true&canonicalNaming=false" jmx.mappings: - # - mbean: 'java.lang:type=Runtime' - # attributes: - # - attr: Uptime - # field: uptime - # - mbean: 'java.lang:type=Memory' - # attributes: - # - attr: HeapMemoryUsage - # field: memory.heap_usage - # - attr: NonHeapMemoryUsage - # field: memory.non_heap_usage + #- mbean: 'java.lang:type=Runtime' + # attributes: + # - attr: Uptime + # field: uptime + #- mbean: 'java.lang:type=Memory' + # attributes: + # - attr: HeapMemoryUsage + # field: memory.heap_usage + # - attr: NonHeapMemoryUsage + # field: memory.non_heap_usage # GC Metrics - this depends on what is available on your JVM - # - mbean: 'java.lang:type=GarbageCollector,name=ConcurrentMarkSweep' - # attributes: - # - attr: CollectionTime - # field: gc.cms_collection_time - # - attr: CollectionCount - # field: gc.cms_collection_count + #- mbean: 'java.lang:type=GarbageCollector,name=ConcurrentMarkSweep' + # attributes: + # - attr: CollectionTime + # field: gc.cms_collection_time + # - attr: CollectionCount + # field: gc.cms_collection_count jmx.application: jmx.instance: diff --git a/metricbeat/modules.d/kafka.yml.disabled b/metricbeat/modules.d/kafka.yml.disabled index de1104b4eab..106e7fec680 100644 --- a/metricbeat/modules.d/kafka.yml.disabled +++ b/metricbeat/modules.d/kafka.yml.disabled @@ -2,9 +2,9 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-kafka.html - module: kafka -# metricsets: -# - partition -# - consumergroup + #metricsets: + # - partition + # - consumergroup period: 10s hosts: ["localhost:9092"] diff --git a/metricbeat/modules.d/kibana.yml.disabled b/metricbeat/modules.d/kibana.yml.disabled index 96104a38f65..37a1e8f9ed8 100644 --- a/metricbeat/modules.d/kibana.yml.disabled +++ b/metricbeat/modules.d/kibana.yml.disabled @@ -2,6 +2,7 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-kibana.html - module: kibana -# metricsets: ["status"] + #metricsets: + # - status period: 10s hosts: ["localhost:5601"] diff --git a/metricbeat/modules.d/kubernetes.yml.disabled b/metricbeat/modules.d/kubernetes.yml.disabled index a981ed82eb9..a446b381ec1 100644 --- a/metricbeat/modules.d/kubernetes.yml.disabled +++ b/metricbeat/modules.d/kubernetes.yml.disabled @@ -3,12 +3,12 @@ # Node metrics, from kubelet: - module: kubernetes -# metricsets: -# - node -# - system -# - pod -# - container -# - volume + #metricsets: + # - node + # - system + # - pod + # - container + # - volume period: 10s hosts: ["localhost:10255"] #ssl.certificate_authorities: ["/etc/pki/root/ca.pem"] @@ -16,18 +16,18 @@ #ssl.key: "/etc/pki/client/cert.key" # State metrics from kube-state-metrics service: -# - module: kubernetes -# metricsets: -# - state_node -# - state_deployment -# - state_replicaset -# - state_statefulset -# - state_pod -# - state_container -# period: 10s -# hosts: ["kube-state-metrics:8080"] +#- module: kubernetes +# metricsets: +# - state_node +# - state_deployment +# - state_replicaset +# - state_statefulset +# - state_pod +# - state_container +# period: 10s +# hosts: ["kube-state-metrics:8080"] # Kubernetes events -# - module: kubernetes -# metricsets: -# - event +#- module: kubernetes +# metricsets: +# - event diff --git a/metricbeat/modules.d/kvm.yml.disabled b/metricbeat/modules.d/kvm.yml.disabled index 357ae24c08e..56d087a191a 100644 --- a/metricbeat/modules.d/kvm.yml.disabled +++ b/metricbeat/modules.d/kvm.yml.disabled @@ -2,6 +2,7 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-kvm.html - module: kvm -# metricsets: ["dommemstat"] + #metricsets: + # - dommemstat period: 10s hosts: ["localhost"] diff --git a/metricbeat/modules.d/logstash.yml.disabled b/metricbeat/modules.d/logstash.yml.disabled index f95a75577c5..fa6a2351560 100644 --- a/metricbeat/modules.d/logstash.yml.disabled +++ b/metricbeat/modules.d/logstash.yml.disabled @@ -2,8 +2,8 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-logstash.html - module: logstash -# metricsets: -# - node -# - node_stats + #metricsets: + # - node + # - node_stats period: 10s hosts: ["localhost:9600"] diff --git a/metricbeat/modules.d/mongodb.yml.disabled b/metricbeat/modules.d/mongodb.yml.disabled index 4ffa806cb96..b9bfe31b814 100644 --- a/metricbeat/modules.d/mongodb.yml.disabled +++ b/metricbeat/modules.d/mongodb.yml.disabled @@ -2,9 +2,9 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-mongodb.html - module: mongodb -# metricsets: -# - dbstats -# - status + #metricsets: + # - dbstats + # - status period: 10s # The hosts must be passed as MongoDB URLs in the format: diff --git a/metricbeat/modules.d/munin.yml.disabled b/metricbeat/modules.d/munin.yml.disabled index a7bcb034fb4..a86e6df767f 100644 --- a/metricbeat/modules.d/munin.yml.disabled +++ b/metricbeat/modules.d/munin.yml.disabled @@ -2,7 +2,8 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-munin.html - module: munin -# metricsets: ["node"] + #metricsets: + # - node period: 10s hosts: ["localhost:4949"] node.namespace: node diff --git a/metricbeat/modules.d/mysql.yml.disabled b/metricbeat/modules.d/mysql.yml.disabled index fbb07e03a44..6442da42bed 100644 --- a/metricbeat/modules.d/mysql.yml.disabled +++ b/metricbeat/modules.d/mysql.yml.disabled @@ -2,7 +2,8 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-mysql.html - module: mysql -# metricsets: ["status"] + #metricsets: + # - status period: 10s # Host DSN should be defined as "user:pass@tcp(127.0.0.1:3306)/" @@ -14,7 +15,4 @@ #username: root # Password of hosts. Empty by default. - #password: secret - - # By setting raw to true, all raw fields from the status metricset will be added to the event. - #raw: false + #password: secret \ No newline at end of file diff --git a/metricbeat/modules.d/nginx.yml.disabled b/metricbeat/modules.d/nginx.yml.disabled index d0bbde6a519..dcb7e1ffb2c 100644 --- a/metricbeat/modules.d/nginx.yml.disabled +++ b/metricbeat/modules.d/nginx.yml.disabled @@ -2,7 +2,8 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-nginx.html - module: nginx -# metricsets: ["stubstatus"] + #metricsets: + # - stubstatus period: 10s # Nginx hosts diff --git a/metricbeat/modules.d/php_fpm.yml.disabled b/metricbeat/modules.d/php_fpm.yml.disabled index c25fcac1ee7..3f88f99471e 100644 --- a/metricbeat/modules.d/php_fpm.yml.disabled +++ b/metricbeat/modules.d/php_fpm.yml.disabled @@ -2,7 +2,8 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-php_fpm.html - module: php_fpm -# metricsets: ["pool"] + #metricsets: + # - pool period: 10s hosts: ["localhost:8080"] status_path: "/status" diff --git a/metricbeat/modules.d/postgresql.yml.disabled b/metricbeat/modules.d/postgresql.yml.disabled index 16154c04306..963b004bd5e 100644 --- a/metricbeat/modules.d/postgresql.yml.disabled +++ b/metricbeat/modules.d/postgresql.yml.disabled @@ -2,13 +2,13 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-postgresql.html - module: postgresql -# metricsets: -# # Stats about every PostgreSQL database -# - database -# # Stats about the background writer process's activity -# - bgwriter -# # Stats about every PostgreSQL process -# - activity + #metricsets: + # # Stats about every PostgreSQL database + # - database + # # Stats about the background writer process's activity + # - bgwriter + # # Stats about every PostgreSQL process + # - activity period: 10s # The host must be passed as PostgreSQL URL. Example: diff --git a/metricbeat/modules.d/prometheus.yml.disabled b/metricbeat/modules.d/prometheus.yml.disabled index 63a408d6a1a..061ba9fde05 100644 --- a/metricbeat/modules.d/prometheus.yml.disabled +++ b/metricbeat/modules.d/prometheus.yml.disabled @@ -2,7 +2,8 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-prometheus.html - module: prometheus -# metricsets: ["stats"] + #metricsets: + # - stats period: 10s hosts: ["localhost:9090"] metrics_path: /metrics diff --git a/metricbeat/modules.d/rabbitmq.yml.disabled b/metricbeat/modules.d/rabbitmq.yml.disabled index 5702c04ab34..a97424c1e6b 100644 --- a/metricbeat/modules.d/rabbitmq.yml.disabled +++ b/metricbeat/modules.d/rabbitmq.yml.disabled @@ -2,10 +2,10 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-rabbitmq.html - module: rabbitmq -# metricsets: -# - node -# - queue -# - connection + #metricsets: + # - node + # - queue + # - connection period: 10s hosts: ["localhost:15672"] diff --git a/metricbeat/modules.d/redis.yml.disabled b/metricbeat/modules.d/redis.yml.disabled index 742dd6ad89e..ea588e803e8 100644 --- a/metricbeat/modules.d/redis.yml.disabled +++ b/metricbeat/modules.d/redis.yml.disabled @@ -2,9 +2,9 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-redis.html - module: redis -# metricsets: -# - info -# - keyspace + #metricsets: + # - info + # - keyspace period: 10s # Redis hosts diff --git a/metricbeat/modules.d/system.yml b/metricbeat/modules.d/system.yml index f0813da30d5..b4d38cc520b 100644 --- a/metricbeat/modules.d/system.yml +++ b/metricbeat/modules.d/system.yml @@ -31,8 +31,8 @@ metricsets: - uptime -# - module: system -# period: 5m -# metricsets: -# - raid -# raid.mount_point: '/' +#- module: system +# period: 5m +# metricsets: +# - raid +# raid.mount_point: '/' diff --git a/metricbeat/modules.d/uwsgi.yml.disabled b/metricbeat/modules.d/uwsgi.yml.disabled index 109be6c8312..f758061b65a 100644 --- a/metricbeat/modules.d/uwsgi.yml.disabled +++ b/metricbeat/modules.d/uwsgi.yml.disabled @@ -2,6 +2,7 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-uwsgi.html - module: uwsgi -# metricsets: ["status"] + #metricsets: + # - status period: 10s hosts: ["tcp://127.0.0.1:9191"] diff --git a/metricbeat/modules.d/vsphere.yml.disabled b/metricbeat/modules.d/vsphere.yml.disabled index 95810121557..c56a9b1ac33 100644 --- a/metricbeat/modules.d/vsphere.yml.disabled +++ b/metricbeat/modules.d/vsphere.yml.disabled @@ -2,10 +2,10 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-vsphere.html - module: vsphere -# metricsets: -# - datastore -# - host -# - virtualmachine + #metricsets: + # - datastore + # - host + # - virtualmachine period: 10s hosts: ["https://localhost/sdk"] diff --git a/metricbeat/modules.d/windows.yml.disabled b/metricbeat/modules.d/windows.yml.disabled index 91339facd1f..059667d82f3 100644 --- a/metricbeat/modules.d/windows.yml.disabled +++ b/metricbeat/modules.d/windows.yml.disabled @@ -2,11 +2,13 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-windows.html - module: windows -# metricsets: ["service"] + #metricsets: + # - service period: 1m #- module: windows -# metricsets: ["perfmon"] +# metricsets: +# - perfmon # period: 10s # perfmon.counters: # - instance_label: processor.name diff --git a/metricbeat/modules.d/zookeeper.yml.disabled b/metricbeat/modules.d/zookeeper.yml.disabled index cfdde01039c..253de00d3e2 100644 --- a/metricbeat/modules.d/zookeeper.yml.disabled +++ b/metricbeat/modules.d/zookeeper.yml.disabled @@ -2,6 +2,7 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-zookeeper.html - module: zookeeper -# metricsets: ["mntr"] + #metricsets: + # - mntr period: 10s hosts: ["localhost:2181"] From 13b1f0e8a51cbaae01affdfade462c1868d98b88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20P=C3=A9rez-Aradros=20Herce?= Date: Mon, 7 May 2018 19:15:49 +0200 Subject: [PATCH 7/8] Update redis config --- metricbeat/module/redis/_meta/config.yml | 14 -------------- metricbeat/modules.d/redis.yml.disabled | 14 -------------- 2 files changed, 28 deletions(-) diff --git a/metricbeat/module/redis/_meta/config.yml b/metricbeat/module/redis/_meta/config.yml index c64ccb83500..3ececd56686 100644 --- a/metricbeat/module/redis/_meta/config.yml +++ b/metricbeat/module/redis/_meta/config.yml @@ -7,25 +7,11 @@ # Redis hosts hosts: ["127.0.0.1:6379"] - # Timeout after which time a metricset should return an error - # Timeout is by default defined as period, as a fetch of a metricset - # should never take longer then period, as otherwise calls can pile up. - #timeout: 1s - - # Optional fields to be added to each event - #fields: - # datacenter: west - # Network type to be used for redis connection. Default: tcp #network: tcp # Max number of concurrent connections. Default: 10 #maxconn: 10 - # Filters can be used to reduce the number of fields sent. - #processors: - # - include_fields: - # fields: ["beat", "metricset", "redis.info.stats"] - # Redis AUTH password. Empty by default. #password: foobared diff --git a/metricbeat/modules.d/redis.yml.disabled b/metricbeat/modules.d/redis.yml.disabled index ea588e803e8..d2ad5abda48 100644 --- a/metricbeat/modules.d/redis.yml.disabled +++ b/metricbeat/modules.d/redis.yml.disabled @@ -10,25 +10,11 @@ # Redis hosts hosts: ["127.0.0.1:6379"] - # Timeout after which time a metricset should return an error - # Timeout is by default defined as period, as a fetch of a metricset - # should never take longer then period, as otherwise calls can pile up. - #timeout: 1s - - # Optional fields to be added to each event - #fields: - # datacenter: west - # Network type to be used for redis connection. Default: tcp #network: tcp # Max number of concurrent connections. Default: 10 #maxconn: 10 - # Filters can be used to reduce the number of fields sent. - #processors: - # - include_fields: - # fields: ["beat", "metricset", "redis.info.stats"] - # Redis AUTH password. Empty by default. #password: foobared From 6f1c0d9e3a324ed590120913bf2a4d3119ceeea3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20P=C3=A9rez-Aradros=20Herce?= Date: Tue, 15 May 2018 23:50:50 +0200 Subject: [PATCH 8/8] Remove some comments --- metricbeat/module/aerospike/_meta/config.yml | 3 ++- metricbeat/module/postgresql/_meta/config.yml | 12 ------------ metricbeat/module/rabbitmq/_meta/config.yml | 5 ++--- metricbeat/modules.d/aerospike.yml.disabled | 3 ++- metricbeat/modules.d/postgresql.yml.disabled | 12 ------------ metricbeat/modules.d/rabbitmq.yml.disabled | 5 ++--- 6 files changed, 8 insertions(+), 32 deletions(-) diff --git a/metricbeat/module/aerospike/_meta/config.yml b/metricbeat/module/aerospike/_meta/config.yml index 8af991f6fed..a4e7384ed55 100644 --- a/metricbeat/module/aerospike/_meta/config.yml +++ b/metricbeat/module/aerospike/_meta/config.yml @@ -1,4 +1,5 @@ - module: aerospike -# metricsets: ["namespace"] + #metricsets: + # - namespace period: 10s hosts: ["localhost:3000"] diff --git a/metricbeat/module/postgresql/_meta/config.yml b/metricbeat/module/postgresql/_meta/config.yml index 0d6e99806de..bf897fd7b06 100644 --- a/metricbeat/module/postgresql/_meta/config.yml +++ b/metricbeat/module/postgresql/_meta/config.yml @@ -1,21 +1,9 @@ - module: postgresql #metricsets: - # # Stats about every PostgreSQL database # - database - # # Stats about the background writer process's activity # - bgwriter - # # Stats about every PostgreSQL process # - activity period: 10s - - # The host must be passed as PostgreSQL URL. Example: - # postgres://localhost:5432?sslmode=disable - # The available parameters are documented here: - # https://godoc.org/github.com/lib/pq#hdr-Connection_String_Parameters hosts: ["postgres://localhost:5432"] - - # Username to use when connecting to PostgreSQL. Empty by default. #username: user - - # Password to use when connecting to PostgreSQL. Empty by default. #password: pass diff --git a/metricbeat/module/rabbitmq/_meta/config.yml b/metricbeat/module/rabbitmq/_meta/config.yml index f3dc2dd6fb4..68dee136571 100644 --- a/metricbeat/module/rabbitmq/_meta/config.yml +++ b/metricbeat/module/rabbitmq/_meta/config.yml @@ -5,6 +5,5 @@ # - connection period: 10s hosts: ["localhost:15672"] - - username: guest - password: guest + #username: guest + #password: guest diff --git a/metricbeat/modules.d/aerospike.yml.disabled b/metricbeat/modules.d/aerospike.yml.disabled index 6ebf3c4a782..a2fbdf83d2c 100644 --- a/metricbeat/modules.d/aerospike.yml.disabled +++ b/metricbeat/modules.d/aerospike.yml.disabled @@ -2,6 +2,7 @@ # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-aerospike.html - module: aerospike -# metricsets: ["namespace"] + #metricsets: + # - namespace period: 10s hosts: ["localhost:3000"] diff --git a/metricbeat/modules.d/postgresql.yml.disabled b/metricbeat/modules.d/postgresql.yml.disabled index 963b004bd5e..14ee2fc7aca 100644 --- a/metricbeat/modules.d/postgresql.yml.disabled +++ b/metricbeat/modules.d/postgresql.yml.disabled @@ -3,22 +3,10 @@ - module: postgresql #metricsets: - # # Stats about every PostgreSQL database # - database - # # Stats about the background writer process's activity # - bgwriter - # # Stats about every PostgreSQL process # - activity period: 10s - - # The host must be passed as PostgreSQL URL. Example: - # postgres://localhost:5432?sslmode=disable - # The available parameters are documented here: - # https://godoc.org/github.com/lib/pq#hdr-Connection_String_Parameters hosts: ["postgres://localhost:5432"] - - # Username to use when connecting to PostgreSQL. Empty by default. #username: user - - # Password to use when connecting to PostgreSQL. Empty by default. #password: pass diff --git a/metricbeat/modules.d/rabbitmq.yml.disabled b/metricbeat/modules.d/rabbitmq.yml.disabled index a97424c1e6b..990c55ee816 100644 --- a/metricbeat/modules.d/rabbitmq.yml.disabled +++ b/metricbeat/modules.d/rabbitmq.yml.disabled @@ -8,6 +8,5 @@ # - connection period: 10s hosts: ["localhost:15672"] - - username: guest - password: guest + #username: guest + #password: guest