From a9981a0d484d52a39565c14f49ca410f6a540898 Mon Sep 17 00:00:00 2001 From: Chris Mark Date: Fri, 27 Mar 2020 14:17:34 +0200 Subject: [PATCH] Disable remote_write and query metricsets from Prom default config (#17278) (cherry picked from commit 697c016ac6c11f06ec52d905bb8fcb2dd94c707b) --- metricbeat/docs/modules/prometheus.asciidoc | 56 +++++++++---------- metricbeat/metricbeat.reference.yml | 56 +++++++++---------- metricbeat/module/prometheus/_meta/config.yml | 56 +++++++++---------- metricbeat/modules.d/prometheus.yml.disabled | 56 +++++++++---------- x-pack/metricbeat/metricbeat.reference.yml | 56 +++++++++---------- 5 files changed, 140 insertions(+), 140 deletions(-) diff --git a/metricbeat/docs/modules/prometheus.asciidoc b/metricbeat/docs/modules/prometheus.asciidoc index a6fc4b82bedf..af87d01b0ee2 100644 --- a/metricbeat/docs/modules/prometheus.asciidoc +++ b/metricbeat/docs/modules/prometheus.asciidoc @@ -47,40 +47,40 @@ metricbeat.modules: # Metrics sent by a Prometheus server using remote_write option -- module: prometheus - metricsets: ["remote_write"] - host: "localhost" - port: "9201" +#- module: prometheus +# metricsets: ["remote_write"] +# host: "localhost" +# port: "9201" # Secure settings for the server using TLS/SSL: #ssl.certificate: "/etc/pki/server/cert.pem" #ssl.key: "/etc/pki/server/cert.key" # Metrics that will be collected using a PromQL -- module: prometheus - period: 10s - hosts: ["localhost:9090"] - metricsets: ["query"] - queries: - #- name: "instant_vector" - # path: "/api/v1/query" - # params: - # query: "sum(rate(prometheus_http_requests_total[1m]))" - #- name: "range_vector" - # path: "/api/v1/query_range" - # params: - # query: "up" - # start: "2019-12-20T00:00:00.000Z" - # end: "2019-12-21T00:00:00.000Z" - # step: 1h - #- name: "scalar" - # path: "/api/v1/query" - # params: - # query: "100" - #- name: "string" - # path: "/api/v1/query" - # params: - # query: "some_value" +#- module: prometheus +# metricsets: ["query"] +# hosts: ["localhost:9090"] +# period: 10s +# queries: +# - name: "instant_vector" +# path: "/api/v1/query" +# params: +# query: "sum(rate(prometheus_http_requests_total[1m]))" +# - name: "range_vector" +# path: "/api/v1/query_range" +# params: +# query: "up" +# start: "2019-12-20T00:00:00.000Z" +# end: "2019-12-21T00:00:00.000Z" +# step: 1h +# - name: "scalar" +# path: "/api/v1/query" +# params: +# query: "100" +# - name: "string" +# path: "/api/v1/query" +# params: +# query: "some_value" ---- This module supports TLS connections when using `ssl` config field, as described in <>. diff --git a/metricbeat/metricbeat.reference.yml b/metricbeat/metricbeat.reference.yml index 6d07b39b18d2..562950373878 100644 --- a/metricbeat/metricbeat.reference.yml +++ b/metricbeat/metricbeat.reference.yml @@ -719,40 +719,40 @@ metricbeat.modules: # Metrics sent by a Prometheus server using remote_write option -- module: prometheus - metricsets: ["remote_write"] - host: "localhost" - port: "9201" +#- module: prometheus +# metricsets: ["remote_write"] +# host: "localhost" +# port: "9201" # Secure settings for the server using TLS/SSL: #ssl.certificate: "/etc/pki/server/cert.pem" #ssl.key: "/etc/pki/server/cert.key" # Metrics that will be collected using a PromQL -- module: prometheus - period: 10s - hosts: ["localhost:9090"] - metricsets: ["query"] - queries: - #- name: "instant_vector" - # path: "/api/v1/query" - # params: - # query: "sum(rate(prometheus_http_requests_total[1m]))" - #- name: "range_vector" - # path: "/api/v1/query_range" - # params: - # query: "up" - # start: "2019-12-20T00:00:00.000Z" - # end: "2019-12-21T00:00:00.000Z" - # step: 1h - #- name: "scalar" - # path: "/api/v1/query" - # params: - # query: "100" - #- name: "string" - # path: "/api/v1/query" - # params: - # query: "some_value" +#- module: prometheus +# metricsets: ["query"] +# hosts: ["localhost:9090"] +# period: 10s +# queries: +# - name: "instant_vector" +# path: "/api/v1/query" +# params: +# query: "sum(rate(prometheus_http_requests_total[1m]))" +# - name: "range_vector" +# path: "/api/v1/query_range" +# params: +# query: "up" +# start: "2019-12-20T00:00:00.000Z" +# end: "2019-12-21T00:00:00.000Z" +# step: 1h +# - name: "scalar" +# path: "/api/v1/query" +# params: +# query: "100" +# - name: "string" +# path: "/api/v1/query" +# params: +# query: "some_value" #------------------------------- RabbitMQ Module ------------------------------- - module: rabbitmq diff --git a/metricbeat/module/prometheus/_meta/config.yml b/metricbeat/module/prometheus/_meta/config.yml index aa855dd2dec5..01b87776e4c8 100644 --- a/metricbeat/module/prometheus/_meta/config.yml +++ b/metricbeat/module/prometheus/_meta/config.yml @@ -17,37 +17,37 @@ # Metrics sent by a Prometheus server using remote_write option -- module: prometheus - metricsets: ["remote_write"] - host: "localhost" - port: "9201" +#- module: prometheus +# metricsets: ["remote_write"] +# host: "localhost" +# port: "9201" # Secure settings for the server using TLS/SSL: #ssl.certificate: "/etc/pki/server/cert.pem" #ssl.key: "/etc/pki/server/cert.key" # Metrics that will be collected using a PromQL -- module: prometheus - period: 10s - hosts: ["localhost:9090"] - metricsets: ["query"] - queries: - #- name: "instant_vector" - # path: "/api/v1/query" - # params: - # query: "sum(rate(prometheus_http_requests_total[1m]))" - #- name: "range_vector" - # path: "/api/v1/query_range" - # params: - # query: "up" - # start: "2019-12-20T00:00:00.000Z" - # end: "2019-12-21T00:00:00.000Z" - # step: 1h - #- name: "scalar" - # path: "/api/v1/query" - # params: - # query: "100" - #- name: "string" - # path: "/api/v1/query" - # params: - # query: "some_value" +#- module: prometheus +# metricsets: ["query"] +# hosts: ["localhost:9090"] +# period: 10s +# queries: +# - name: "instant_vector" +# path: "/api/v1/query" +# params: +# query: "sum(rate(prometheus_http_requests_total[1m]))" +# - name: "range_vector" +# path: "/api/v1/query_range" +# params: +# query: "up" +# start: "2019-12-20T00:00:00.000Z" +# end: "2019-12-21T00:00:00.000Z" +# step: 1h +# - name: "scalar" +# path: "/api/v1/query" +# params: +# query: "100" +# - name: "string" +# path: "/api/v1/query" +# params: +# query: "some_value" diff --git a/metricbeat/modules.d/prometheus.yml.disabled b/metricbeat/modules.d/prometheus.yml.disabled index e494e8794795..af0266188b39 100644 --- a/metricbeat/modules.d/prometheus.yml.disabled +++ b/metricbeat/modules.d/prometheus.yml.disabled @@ -20,37 +20,37 @@ # Metrics sent by a Prometheus server using remote_write option -- module: prometheus - metricsets: ["remote_write"] - host: "localhost" - port: "9201" +#- module: prometheus +# metricsets: ["remote_write"] +# host: "localhost" +# port: "9201" # Secure settings for the server using TLS/SSL: #ssl.certificate: "/etc/pki/server/cert.pem" #ssl.key: "/etc/pki/server/cert.key" # Metrics that will be collected using a PromQL -- module: prometheus - period: 10s - hosts: ["localhost:9090"] - metricsets: ["query"] - queries: - #- name: "instant_vector" - # path: "/api/v1/query" - # params: - # query: "sum(rate(prometheus_http_requests_total[1m]))" - #- name: "range_vector" - # path: "/api/v1/query_range" - # params: - # query: "up" - # start: "2019-12-20T00:00:00.000Z" - # end: "2019-12-21T00:00:00.000Z" - # step: 1h - #- name: "scalar" - # path: "/api/v1/query" - # params: - # query: "100" - #- name: "string" - # path: "/api/v1/query" - # params: - # query: "some_value" +#- module: prometheus +# metricsets: ["query"] +# hosts: ["localhost:9090"] +# period: 10s +# queries: +# - name: "instant_vector" +# path: "/api/v1/query" +# params: +# query: "sum(rate(prometheus_http_requests_total[1m]))" +# - name: "range_vector" +# path: "/api/v1/query_range" +# params: +# query: "up" +# start: "2019-12-20T00:00:00.000Z" +# end: "2019-12-21T00:00:00.000Z" +# step: 1h +# - name: "scalar" +# path: "/api/v1/query" +# params: +# query: "100" +# - name: "string" +# path: "/api/v1/query" +# params: +# query: "some_value" diff --git a/x-pack/metricbeat/metricbeat.reference.yml b/x-pack/metricbeat/metricbeat.reference.yml index d01c084f872e..649dc852b511 100644 --- a/x-pack/metricbeat/metricbeat.reference.yml +++ b/x-pack/metricbeat/metricbeat.reference.yml @@ -1047,40 +1047,40 @@ metricbeat.modules: # Metrics sent by a Prometheus server using remote_write option -- module: prometheus - metricsets: ["remote_write"] - host: "localhost" - port: "9201" +#- module: prometheus +# metricsets: ["remote_write"] +# host: "localhost" +# port: "9201" # Secure settings for the server using TLS/SSL: #ssl.certificate: "/etc/pki/server/cert.pem" #ssl.key: "/etc/pki/server/cert.key" # Metrics that will be collected using a PromQL -- module: prometheus - period: 10s - hosts: ["localhost:9090"] - metricsets: ["query"] - queries: - #- name: "instant_vector" - # path: "/api/v1/query" - # params: - # query: "sum(rate(prometheus_http_requests_total[1m]))" - #- name: "range_vector" - # path: "/api/v1/query_range" - # params: - # query: "up" - # start: "2019-12-20T00:00:00.000Z" - # end: "2019-12-21T00:00:00.000Z" - # step: 1h - #- name: "scalar" - # path: "/api/v1/query" - # params: - # query: "100" - #- name: "string" - # path: "/api/v1/query" - # params: - # query: "some_value" +#- module: prometheus +# metricsets: ["query"] +# hosts: ["localhost:9090"] +# period: 10s +# queries: +# - name: "instant_vector" +# path: "/api/v1/query" +# params: +# query: "sum(rate(prometheus_http_requests_total[1m]))" +# - name: "range_vector" +# path: "/api/v1/query_range" +# params: +# query: "up" +# start: "2019-12-20T00:00:00.000Z" +# end: "2019-12-21T00:00:00.000Z" +# step: 1h +# - name: "scalar" +# path: "/api/v1/query" +# params: +# query: "100" +# - name: "string" +# path: "/api/v1/query" +# params: +# query: "some_value" #------------------------------- RabbitMQ Module ------------------------------- - module: rabbitmq