From 9f825239439da9a5800f59cc80141c5daea8d701 Mon Sep 17 00:00:00 2001 From: ChristineTChen Date: Tue, 20 Oct 2020 15:54:21 -0400 Subject: [PATCH 1/8] Add option --- .../configuration/instances/openmetrics.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/instances/openmetrics.yaml b/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/instances/openmetrics.yaml index 5eb43d7d48b87..47d0e1f26d5cc 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/instances/openmetrics.yaml +++ b/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/instances/openmetrics.yaml @@ -149,6 +149,22 @@ - <*_SUFFIX> - - <*_SUBSTRING_*> +- name: ignore_metrics_by_labels + description: A mapping of labels where metrics with matching labels are ignored. + value: + type: array + items: + type: object + properties: + - name: key + type: string + - name: label + type: array + items: + type: string + example: + : [, ] + : * - template: instances/http - template: instances/default \ No newline at end of file From d8ff0fea8343b670599bd608dc056492af2874c9 Mon Sep 17 00:00:00 2001 From: ChristineTChen Date: Tue, 20 Oct 2020 15:57:59 -0400 Subject: [PATCH 2/8] Update config examples and sync --- .../amazon_msk/data/conf.yaml.example | 10 +++++++ .../cilium/data/conf.yaml.example | 10 +++++++ .../cockroachdb/data/conf.yaml.example | 10 +++++++ .../coredns/data/conf.yaml.example | 10 +++++++ .../configuration/instances/openmetrics.yaml | 29 ++++++++++--------- .../gitlab/data/conf.yaml.example | 10 +++++++ .../gitlab_runner/data/conf.yaml.example | 10 +++++++ .../haproxy/data/conf.yaml.example | 10 +++++++ .../istio/data/conf.yaml.example | 10 +++++++ .../data/conf.yaml.example | 10 +++++++ .../kube_scheduler/data/conf.yaml.example | 10 +++++++ .../data/conf.yaml.example | 10 +++++++ .../openmetrics/data/conf.yaml.example | 10 +++++++ .../scylla/data/conf.yaml.example | 10 +++++++ 14 files changed, 145 insertions(+), 14 deletions(-) diff --git a/amazon_msk/datadog_checks/amazon_msk/data/conf.yaml.example b/amazon_msk/datadog_checks/amazon_msk/data/conf.yaml.example index da07aed92e1fb..4acfbf3ed9a42 100644 --- a/amazon_msk/datadog_checks/amazon_msk/data/conf.yaml.example +++ b/amazon_msk/datadog_checks/amazon_msk/data/conf.yaml.example @@ -168,6 +168,16 @@ instances: # - # - <*_SUBSTRING_*> + ## @param ignore_metrics_by_labels - mapping - optional + ## A mapping of labels where metrics with matching label key and values are ignored. + ## Use the "*" wildcard to match all label values. + # + # ignore_metrics_by_labels: + # : + # - + # - + # : '*' + ## @param proxy - mapping - optional ## This overrides the `proxy` setting in `init_config`. ## diff --git a/cilium/datadog_checks/cilium/data/conf.yaml.example b/cilium/datadog_checks/cilium/data/conf.yaml.example index 1f3229c98b188..d84f4016e80ca 100644 --- a/cilium/datadog_checks/cilium/data/conf.yaml.example +++ b/cilium/datadog_checks/cilium/data/conf.yaml.example @@ -122,6 +122,16 @@ instances: # - # - <*_SUBSTRING_*> + ## @param ignore_metrics_by_labels - mapping - optional + ## A mapping of labels where metrics with matching label key and values are ignored. + ## Use the "*" wildcard to match all label values. + # + # ignore_metrics_by_labels: + # : + # - + # - + # : '*' + ## @param proxy - mapping - optional ## This overrides the `proxy` setting in `init_config`. ## diff --git a/cockroachdb/datadog_checks/cockroachdb/data/conf.yaml.example b/cockroachdb/datadog_checks/cockroachdb/data/conf.yaml.example index ea03547bad706..d24ebd578bb14 100644 --- a/cockroachdb/datadog_checks/cockroachdb/data/conf.yaml.example +++ b/cockroachdb/datadog_checks/cockroachdb/data/conf.yaml.example @@ -146,6 +146,16 @@ instances: # - # - <*_SUBSTRING_*> + ## @param ignore_metrics_by_labels - mapping - optional + ## A mapping of labels where metrics with matching label key and values are ignored. + ## Use the "*" wildcard to match all label values. + # + # ignore_metrics_by_labels: + # : + # - + # - + # : '*' + ## @param proxy - mapping - optional ## This overrides the `proxy` setting in `init_config`. ## diff --git a/coredns/datadog_checks/coredns/data/conf.yaml.example b/coredns/datadog_checks/coredns/data/conf.yaml.example index 44481270db242..5b713c4722925 100644 --- a/coredns/datadog_checks/coredns/data/conf.yaml.example +++ b/coredns/datadog_checks/coredns/data/conf.yaml.example @@ -165,6 +165,16 @@ instances: # - # - <*_SUBSTRING_*> + ## @param ignore_metrics_by_labels - mapping - optional + ## A mapping of labels where metrics with matching label key and values are ignored. + ## Use the "*" wildcard to match all label values. + # + # ignore_metrics_by_labels: + # : + # - + # - + # : '*' + ## @param proxy - mapping - optional ## This overrides the `proxy` setting in `init_config`. ## diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/instances/openmetrics.yaml b/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/instances/openmetrics.yaml index 47d0e1f26d5cc..b28495a51a406 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/instances/openmetrics.yaml +++ b/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/instances/openmetrics.yaml @@ -150,21 +150,22 @@ - - <*_SUBSTRING_*> - name: ignore_metrics_by_labels - description: A mapping of labels where metrics with matching labels are ignored. - + description: | + A mapping of labels where metrics with matching label key and values are ignored. + Use the "*" wildcard to match all label values. value: - type: array - items: - type: object - properties: - - name: key + type: object + properties: + - name: target_label_key + type: string + - name: target_label_value_list + type: array + items: type: string - - name: label - type: array - items: - type: string - example: - : [, ] - : * + - name: target_label_value_wildcard + type: string + example: + : [, ] + : '*' - template: instances/http - template: instances/default \ No newline at end of file diff --git a/gitlab/datadog_checks/gitlab/data/conf.yaml.example b/gitlab/datadog_checks/gitlab/data/conf.yaml.example index 51bf3a8a65246..02acde395acd9 100644 --- a/gitlab/datadog_checks/gitlab/data/conf.yaml.example +++ b/gitlab/datadog_checks/gitlab/data/conf.yaml.example @@ -116,6 +116,16 @@ instances: # - # - <*_SUBSTRING_*> + ## @param ignore_metrics_by_labels - mapping - optional + ## A mapping of labels where metrics with matching label key and values are ignored. + ## Use the "*" wildcard to match all label values. + # + # ignore_metrics_by_labels: + # : + # - + # - + # : '*' + ## @param proxy - mapping - optional ## This overrides the `proxy` setting in `init_config`. ## diff --git a/gitlab_runner/datadog_checks/gitlab_runner/data/conf.yaml.example b/gitlab_runner/datadog_checks/gitlab_runner/data/conf.yaml.example index ace0ee660a2cf..320adfc4424fc 100644 --- a/gitlab_runner/datadog_checks/gitlab_runner/data/conf.yaml.example +++ b/gitlab_runner/datadog_checks/gitlab_runner/data/conf.yaml.example @@ -200,6 +200,16 @@ instances: # - # - <*_SUBSTRING_*> + ## @param ignore_metrics_by_labels - mapping - optional + ## A mapping of labels where metrics with matching label key and values are ignored. + ## Use the "*" wildcard to match all label values. + # + # ignore_metrics_by_labels: + # : + # - + # - + # : '*' + ## @param proxy - mapping - optional ## This overrides the `proxy` setting in `init_config`. ## diff --git a/haproxy/datadog_checks/haproxy/data/conf.yaml.example b/haproxy/datadog_checks/haproxy/data/conf.yaml.example index 4abfeef8d6722..60fad847f0375 100644 --- a/haproxy/datadog_checks/haproxy/data/conf.yaml.example +++ b/haproxy/datadog_checks/haproxy/data/conf.yaml.example @@ -292,6 +292,16 @@ instances: # - # - <*_SUBSTRING_*> + ## @param ignore_metrics_by_labels - mapping - optional + ## A mapping of labels where metrics with matching label key and values are ignored. + ## Use the "*" wildcard to match all label values. + # + # ignore_metrics_by_labels: + # : + # - + # - + # : '*' + ## @param proxy - mapping - optional ## This overrides the `proxy` setting in `init_config`. ## diff --git a/istio/datadog_checks/istio/data/conf.yaml.example b/istio/datadog_checks/istio/data/conf.yaml.example index b4195a546f244..2d309de86a2df 100644 --- a/istio/datadog_checks/istio/data/conf.yaml.example +++ b/istio/datadog_checks/istio/data/conf.yaml.example @@ -185,6 +185,16 @@ instances: # - # - <*_SUBSTRING_*> + ## @param ignore_metrics_by_labels - mapping - optional + ## A mapping of labels where metrics with matching label key and values are ignored. + ## Use the "*" wildcard to match all label values. + # + # ignore_metrics_by_labels: + # : + # - + # - + # : '*' + ## @param proxy - mapping - optional ## This overrides the `proxy` setting in `init_config`. ## diff --git a/kube_apiserver_metrics/datadog_checks/kube_apiserver_metrics/data/conf.yaml.example b/kube_apiserver_metrics/datadog_checks/kube_apiserver_metrics/data/conf.yaml.example index a0606ae30f25b..fc30f60ac9bc8 100644 --- a/kube_apiserver_metrics/datadog_checks/kube_apiserver_metrics/data/conf.yaml.example +++ b/kube_apiserver_metrics/datadog_checks/kube_apiserver_metrics/data/conf.yaml.example @@ -153,6 +153,16 @@ instances: # - # - <*_SUBSTRING_*> + ## @param ignore_metrics_by_labels - mapping - optional + ## A mapping of labels where metrics with matching label key and values are ignored. + ## Use the "*" wildcard to match all label values. + # + # ignore_metrics_by_labels: + # : + # - + # - + # : '*' + ## @param proxy - mapping - optional ## This overrides the `proxy` setting in `init_config`. ## diff --git a/kube_scheduler/datadog_checks/kube_scheduler/data/conf.yaml.example b/kube_scheduler/datadog_checks/kube_scheduler/data/conf.yaml.example index 42698c76fae1e..81e7e6babbbda 100644 --- a/kube_scheduler/datadog_checks/kube_scheduler/data/conf.yaml.example +++ b/kube_scheduler/datadog_checks/kube_scheduler/data/conf.yaml.example @@ -151,6 +151,16 @@ instances: # - # - <*_SUBSTRING_*> + ## @param ignore_metrics_by_labels - mapping - optional + ## A mapping of labels where metrics with matching label key and values are ignored. + ## Use the "*" wildcard to match all label values. + # + # ignore_metrics_by_labels: + # : + # - + # - + # : '*' + ## @param proxy - mapping - optional ## This overrides the `proxy` setting in `init_config`. ## diff --git a/nginx_ingress_controller/datadog_checks/nginx_ingress_controller/data/conf.yaml.example b/nginx_ingress_controller/datadog_checks/nginx_ingress_controller/data/conf.yaml.example index 1c154221b0326..9adae49c90b4c 100644 --- a/nginx_ingress_controller/datadog_checks/nginx_ingress_controller/data/conf.yaml.example +++ b/nginx_ingress_controller/datadog_checks/nginx_ingress_controller/data/conf.yaml.example @@ -154,6 +154,16 @@ instances: # - # - <*_SUBSTRING_*> + ## @param ignore_metrics_by_labels - mapping - optional + ## A mapping of labels where metrics with matching label key and values are ignored. + ## Use the "*" wildcard to match all label values. + # + # ignore_metrics_by_labels: + # : + # - + # - + # : '*' + ## @param proxy - mapping - optional ## This overrides the `proxy` setting in `init_config`. ## diff --git a/openmetrics/datadog_checks/openmetrics/data/conf.yaml.example b/openmetrics/datadog_checks/openmetrics/data/conf.yaml.example index f6d769c181abd..d0996ecebfbb4 100644 --- a/openmetrics/datadog_checks/openmetrics/data/conf.yaml.example +++ b/openmetrics/datadog_checks/openmetrics/data/conf.yaml.example @@ -160,6 +160,16 @@ instances: # - # - <*_SUBSTRING_*> + ## @param ignore_metrics_by_labels - mapping - optional + ## A mapping of labels where metrics with matching label key and values are ignored. + ## Use the "*" wildcard to match all label values. + # + # ignore_metrics_by_labels: + # : + # - + # - + # : '*' + ## @param proxy - mapping - optional ## This overrides the `proxy` setting in `init_config`. ## diff --git a/scylla/datadog_checks/scylla/data/conf.yaml.example b/scylla/datadog_checks/scylla/data/conf.yaml.example index f1e0d9477ea0e..9c7c7415d98aa 100644 --- a/scylla/datadog_checks/scylla/data/conf.yaml.example +++ b/scylla/datadog_checks/scylla/data/conf.yaml.example @@ -163,6 +163,16 @@ instances: # - # - <*_SUBSTRING_*> + ## @param ignore_metrics_by_labels - mapping - optional + ## A mapping of labels where metrics with matching label key and values are ignored. + ## Use the "*" wildcard to match all label values. + # + # ignore_metrics_by_labels: + # : + # - + # - + # : '*' + ## @param proxy - mapping - optional ## This overrides the `proxy` setting in `init_config`. ## From 89341d88b6ec03bc9c1010a215f9330349ba894b Mon Sep 17 00:00:00 2001 From: ChristineTChen Date: Wed, 21 Oct 2020 10:23:17 -0400 Subject: [PATCH 3/8] Put wildcard in list --- .../tooling/templates/configuration/instances/openmetrics.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/instances/openmetrics.yaml b/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/instances/openmetrics.yaml index b28495a51a406..21d42d36f410e 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/instances/openmetrics.yaml +++ b/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/instances/openmetrics.yaml @@ -166,6 +166,6 @@ type: string example: : [, ] - : '*' + : ['*'] - template: instances/http - template: instances/default \ No newline at end of file From a3345f9d3b711804b65328738ffee703d985d55b Mon Sep 17 00:00:00 2001 From: ChristineTChen Date: Wed, 21 Oct 2020 10:25:42 -0400 Subject: [PATCH 4/8] remove unused property --- .../tooling/templates/configuration/instances/openmetrics.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/instances/openmetrics.yaml b/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/instances/openmetrics.yaml index 21d42d36f410e..469e7f8a3c16c 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/instances/openmetrics.yaml +++ b/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/instances/openmetrics.yaml @@ -162,8 +162,6 @@ type: array items: type: string - - name: target_label_value_wildcard - type: string example: : [, ] : ['*'] From 8a1ce25c85ae910994fb9556f2a7eb0068c52e45 Mon Sep 17 00:00:00 2001 From: ChristineTChen Date: Wed, 21 Oct 2020 10:26:16 -0400 Subject: [PATCH 5/8] Sync configs --- amazon_msk/datadog_checks/amazon_msk/data/conf.yaml.example | 3 ++- cilium/datadog_checks/cilium/data/conf.yaml.example | 3 ++- cockroachdb/datadog_checks/cockroachdb/data/conf.yaml.example | 3 ++- coredns/datadog_checks/coredns/data/conf.yaml.example | 3 ++- gitlab/datadog_checks/gitlab/data/conf.yaml.example | 3 ++- .../datadog_checks/gitlab_runner/data/conf.yaml.example | 3 ++- haproxy/datadog_checks/haproxy/data/conf.yaml.example | 3 ++- istio/datadog_checks/istio/data/conf.yaml.example | 3 ++- .../kube_apiserver_metrics/data/conf.yaml.example | 3 ++- .../datadog_checks/kube_scheduler/data/conf.yaml.example | 3 ++- .../nginx_ingress_controller/data/conf.yaml.example | 3 ++- openmetrics/datadog_checks/openmetrics/data/conf.yaml.example | 3 ++- scylla/datadog_checks/scylla/data/conf.yaml.example | 3 ++- 13 files changed, 26 insertions(+), 13 deletions(-) diff --git a/amazon_msk/datadog_checks/amazon_msk/data/conf.yaml.example b/amazon_msk/datadog_checks/amazon_msk/data/conf.yaml.example index 4acfbf3ed9a42..2eeb342f7a3de 100644 --- a/amazon_msk/datadog_checks/amazon_msk/data/conf.yaml.example +++ b/amazon_msk/datadog_checks/amazon_msk/data/conf.yaml.example @@ -176,7 +176,8 @@ instances: # : # - # - - # : '*' + # : + # - '*' ## @param proxy - mapping - optional ## This overrides the `proxy` setting in `init_config`. diff --git a/cilium/datadog_checks/cilium/data/conf.yaml.example b/cilium/datadog_checks/cilium/data/conf.yaml.example index d84f4016e80ca..f2b392176c9e8 100644 --- a/cilium/datadog_checks/cilium/data/conf.yaml.example +++ b/cilium/datadog_checks/cilium/data/conf.yaml.example @@ -130,7 +130,8 @@ instances: # : # - # - - # : '*' + # : + # - '*' ## @param proxy - mapping - optional ## This overrides the `proxy` setting in `init_config`. diff --git a/cockroachdb/datadog_checks/cockroachdb/data/conf.yaml.example b/cockroachdb/datadog_checks/cockroachdb/data/conf.yaml.example index d24ebd578bb14..b5e3db705a0f1 100644 --- a/cockroachdb/datadog_checks/cockroachdb/data/conf.yaml.example +++ b/cockroachdb/datadog_checks/cockroachdb/data/conf.yaml.example @@ -154,7 +154,8 @@ instances: # : # - # - - # : '*' + # : + # - '*' ## @param proxy - mapping - optional ## This overrides the `proxy` setting in `init_config`. diff --git a/coredns/datadog_checks/coredns/data/conf.yaml.example b/coredns/datadog_checks/coredns/data/conf.yaml.example index 5b713c4722925..d47490ab660b9 100644 --- a/coredns/datadog_checks/coredns/data/conf.yaml.example +++ b/coredns/datadog_checks/coredns/data/conf.yaml.example @@ -173,7 +173,8 @@ instances: # : # - # - - # : '*' + # : + # - '*' ## @param proxy - mapping - optional ## This overrides the `proxy` setting in `init_config`. diff --git a/gitlab/datadog_checks/gitlab/data/conf.yaml.example b/gitlab/datadog_checks/gitlab/data/conf.yaml.example index 02acde395acd9..320e5dc9b7521 100644 --- a/gitlab/datadog_checks/gitlab/data/conf.yaml.example +++ b/gitlab/datadog_checks/gitlab/data/conf.yaml.example @@ -124,7 +124,8 @@ instances: # : # - # - - # : '*' + # : + # - '*' ## @param proxy - mapping - optional ## This overrides the `proxy` setting in `init_config`. diff --git a/gitlab_runner/datadog_checks/gitlab_runner/data/conf.yaml.example b/gitlab_runner/datadog_checks/gitlab_runner/data/conf.yaml.example index 320adfc4424fc..b54063740a766 100644 --- a/gitlab_runner/datadog_checks/gitlab_runner/data/conf.yaml.example +++ b/gitlab_runner/datadog_checks/gitlab_runner/data/conf.yaml.example @@ -208,7 +208,8 @@ instances: # : # - # - - # : '*' + # : + # - '*' ## @param proxy - mapping - optional ## This overrides the `proxy` setting in `init_config`. diff --git a/haproxy/datadog_checks/haproxy/data/conf.yaml.example b/haproxy/datadog_checks/haproxy/data/conf.yaml.example index 60fad847f0375..edcd48f9860c0 100644 --- a/haproxy/datadog_checks/haproxy/data/conf.yaml.example +++ b/haproxy/datadog_checks/haproxy/data/conf.yaml.example @@ -300,7 +300,8 @@ instances: # : # - # - - # : '*' + # : + # - '*' ## @param proxy - mapping - optional ## This overrides the `proxy` setting in `init_config`. diff --git a/istio/datadog_checks/istio/data/conf.yaml.example b/istio/datadog_checks/istio/data/conf.yaml.example index 2d309de86a2df..4e87da6b985e2 100644 --- a/istio/datadog_checks/istio/data/conf.yaml.example +++ b/istio/datadog_checks/istio/data/conf.yaml.example @@ -193,7 +193,8 @@ instances: # : # - # - - # : '*' + # : + # - '*' ## @param proxy - mapping - optional ## This overrides the `proxy` setting in `init_config`. diff --git a/kube_apiserver_metrics/datadog_checks/kube_apiserver_metrics/data/conf.yaml.example b/kube_apiserver_metrics/datadog_checks/kube_apiserver_metrics/data/conf.yaml.example index fc30f60ac9bc8..686659f388ae0 100644 --- a/kube_apiserver_metrics/datadog_checks/kube_apiserver_metrics/data/conf.yaml.example +++ b/kube_apiserver_metrics/datadog_checks/kube_apiserver_metrics/data/conf.yaml.example @@ -161,7 +161,8 @@ instances: # : # - # - - # : '*' + # : + # - '*' ## @param proxy - mapping - optional ## This overrides the `proxy` setting in `init_config`. diff --git a/kube_scheduler/datadog_checks/kube_scheduler/data/conf.yaml.example b/kube_scheduler/datadog_checks/kube_scheduler/data/conf.yaml.example index 81e7e6babbbda..aad4198cda329 100644 --- a/kube_scheduler/datadog_checks/kube_scheduler/data/conf.yaml.example +++ b/kube_scheduler/datadog_checks/kube_scheduler/data/conf.yaml.example @@ -159,7 +159,8 @@ instances: # : # - # - - # : '*' + # : + # - '*' ## @param proxy - mapping - optional ## This overrides the `proxy` setting in `init_config`. diff --git a/nginx_ingress_controller/datadog_checks/nginx_ingress_controller/data/conf.yaml.example b/nginx_ingress_controller/datadog_checks/nginx_ingress_controller/data/conf.yaml.example index 9adae49c90b4c..d385ca766ae64 100644 --- a/nginx_ingress_controller/datadog_checks/nginx_ingress_controller/data/conf.yaml.example +++ b/nginx_ingress_controller/datadog_checks/nginx_ingress_controller/data/conf.yaml.example @@ -162,7 +162,8 @@ instances: # : # - # - - # : '*' + # : + # - '*' ## @param proxy - mapping - optional ## This overrides the `proxy` setting in `init_config`. diff --git a/openmetrics/datadog_checks/openmetrics/data/conf.yaml.example b/openmetrics/datadog_checks/openmetrics/data/conf.yaml.example index d0996ecebfbb4..6b47286cc1d1a 100644 --- a/openmetrics/datadog_checks/openmetrics/data/conf.yaml.example +++ b/openmetrics/datadog_checks/openmetrics/data/conf.yaml.example @@ -168,7 +168,8 @@ instances: # : # - # - - # : '*' + # : + # - '*' ## @param proxy - mapping - optional ## This overrides the `proxy` setting in `init_config`. diff --git a/scylla/datadog_checks/scylla/data/conf.yaml.example b/scylla/datadog_checks/scylla/data/conf.yaml.example index 9c7c7415d98aa..6ca1d2109c646 100644 --- a/scylla/datadog_checks/scylla/data/conf.yaml.example +++ b/scylla/datadog_checks/scylla/data/conf.yaml.example @@ -171,7 +171,8 @@ instances: # : # - # - - # : '*' + # : + # - '*' ## @param proxy - mapping - optional ## This overrides the `proxy` setting in `init_config`. From dbfa63d03eb604801ffe91bb44095ebfcfa5a5b0 Mon Sep 17 00:00:00 2001 From: ChristineTChen Date: Wed, 28 Oct 2020 17:54:49 -0400 Subject: [PATCH 6/8] bump dep --- amazon_msk/setup.py | 2 +- cilium/setup.py | 2 +- cockroachdb/setup.py | 2 +- coredns/setup.py | 2 +- gitlab/setup.py | 2 +- gitlab_runner/setup.py | 2 +- haproxy/setup.py | 2 +- istio/setup.py | 2 +- kube_apiserver_metrics/setup.py | 2 +- kube_scheduler/setup.py | 2 +- nginx_ingress_controller/setup.py | 2 +- openmetrics/setup.py | 2 +- scylla/setup.py | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/amazon_msk/setup.py b/amazon_msk/setup.py index 8dc02d33097b7..f1fdef6a1924c 100644 --- a/amazon_msk/setup.py +++ b/amazon_msk/setup.py @@ -27,7 +27,7 @@ def get_dependencies(): return f.readlines() -CHECKS_BASE_REQ = 'datadog-checks-base>=11.0.0' +CHECKS_BASE_REQ = 'datadog-checks-base>=15.4.0' setup( diff --git a/cilium/setup.py b/cilium/setup.py index 2fff92d2dc737..d78c78acbb0de 100644 --- a/cilium/setup.py +++ b/cilium/setup.py @@ -27,7 +27,7 @@ def get_dependencies(): return f.readlines() -CHECKS_BASE_REQ = 'datadog-checks-base>=11.0.0' +CHECKS_BASE_REQ = 'datadog-checks-base>=15.4.0' setup( diff --git a/cockroachdb/setup.py b/cockroachdb/setup.py index 953c5a26a7e22..051c7e418692b 100644 --- a/cockroachdb/setup.py +++ b/cockroachdb/setup.py @@ -27,7 +27,7 @@ def get_dependencies(): return f.readlines() -CHECKS_BASE_REQ = 'datadog-checks-base>=11.0.0' +CHECKS_BASE_REQ = 'datadog-checks-base>=15.4.0' setup( diff --git a/coredns/setup.py b/coredns/setup.py index 55d9b19b6737b..bc3384de05909 100644 --- a/coredns/setup.py +++ b/coredns/setup.py @@ -28,7 +28,7 @@ def get_dependencies(): return f.readlines() -CHECKS_BASE_REQ = 'datadog-checks-base>=11.0.0' +CHECKS_BASE_REQ = 'datadog-checks-base>=15.4.0' setup( diff --git a/gitlab/setup.py b/gitlab/setup.py index 3fa353ee7959a..8b03f73362cf3 100644 --- a/gitlab/setup.py +++ b/gitlab/setup.py @@ -27,7 +27,7 @@ def get_dependencies(): return f.readlines() -CHECKS_BASE_REQ = 'datadog-checks-base>=11.0.0' +CHECKS_BASE_REQ = 'datadog-checks-base>=15.4.0' setup( name='datadog-gitlab', diff --git a/gitlab_runner/setup.py b/gitlab_runner/setup.py index 40a136d219e5b..85c28039654ed 100644 --- a/gitlab_runner/setup.py +++ b/gitlab_runner/setup.py @@ -27,7 +27,7 @@ def get_dependencies(): return f.readlines() -CHECKS_BASE_REQ = 'datadog-checks-base' +CHECKS_BASE_REQ = 'datadog-checks-base>=15.4.0' setup( name='datadog-gitlab_runner', diff --git a/haproxy/setup.py b/haproxy/setup.py index 1be1533dde190..64c3b32312b50 100644 --- a/haproxy/setup.py +++ b/haproxy/setup.py @@ -25,7 +25,7 @@ def get_dependencies(): return f.readlines() -CHECKS_BASE_REQ = 'datadog-checks-base>=11.0.0' +CHECKS_BASE_REQ = 'datadog-checks-base>=15.4.0' setup( name='datadog-haproxy', diff --git a/istio/setup.py b/istio/setup.py index d8b7e535884c6..4a964a83394fd 100644 --- a/istio/setup.py +++ b/istio/setup.py @@ -27,7 +27,7 @@ def get_dependencies(): return f.readlines() -CHECKS_BASE_REQ = 'datadog-checks-base' +CHECKS_BASE_REQ = 'datadog-checks-base>=15.4.0' setup( name='datadog-istio', diff --git a/kube_apiserver_metrics/setup.py b/kube_apiserver_metrics/setup.py index 2853fd566f6bd..f45978617a022 100644 --- a/kube_apiserver_metrics/setup.py +++ b/kube_apiserver_metrics/setup.py @@ -27,7 +27,7 @@ def get_dependencies(): return f.readlines() -CHECKS_BASE_REQ = 'datadog-checks-base>=11.0.0' +CHECKS_BASE_REQ = 'datadog-checks-base>=15.4.0' setup( diff --git a/kube_scheduler/setup.py b/kube_scheduler/setup.py index d36fc5d0d1033..81de2ed52aa2e 100644 --- a/kube_scheduler/setup.py +++ b/kube_scheduler/setup.py @@ -27,7 +27,7 @@ def get_dependencies(): return f.readlines() -CHECKS_BASE_REQ = 'datadog-checks-base>=11.0.0' +CHECKS_BASE_REQ = 'datadog-checks-base>=15.4.0' setup( diff --git a/nginx_ingress_controller/setup.py b/nginx_ingress_controller/setup.py index 7dd8886752f6a..b2c99f6a16aa6 100644 --- a/nginx_ingress_controller/setup.py +++ b/nginx_ingress_controller/setup.py @@ -27,7 +27,7 @@ def get_dependencies(): return f.readlines() -CHECKS_BASE_REQ = 'datadog-checks-base' +CHECKS_BASE_REQ = 'datadog-checks-base>=15.4.0' setup( diff --git a/openmetrics/setup.py b/openmetrics/setup.py index 98cc51c228af1..f4b1ade085079 100644 --- a/openmetrics/setup.py +++ b/openmetrics/setup.py @@ -27,7 +27,7 @@ def get_dependencies(): return f.readlines() -CHECKS_BASE_REQ = 'datadog-checks-base>=11.0.0' +CHECKS_BASE_REQ = 'datadog-checks-base>=15.4.0' setup( name='datadog-openmetrics', diff --git a/scylla/setup.py b/scylla/setup.py index d3fa3b00b6f59..37ad178308f81 100644 --- a/scylla/setup.py +++ b/scylla/setup.py @@ -32,7 +32,7 @@ def get_dependencies(): return f.readlines() -CHECKS_BASE_REQ = 'datadog-checks-base>=11.0.0' +CHECKS_BASE_REQ = 'datadog-checks-base>=15.4.0' setup( From 7427f874d5bebcaa3ec86f893f1669f7df92648f Mon Sep 17 00:00:00 2001 From: ChristineTChen Date: Wed, 28 Oct 2020 18:03:17 -0400 Subject: [PATCH 7/8] sync new configs --- crio/datadog_checks/crio/data/conf.yaml.example | 11 +++++++++++ etcd/datadog_checks/etcd/data/conf.yaml.example | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/crio/datadog_checks/crio/data/conf.yaml.example b/crio/datadog_checks/crio/data/conf.yaml.example index fa08936837924..8e8f7433f712d 100644 --- a/crio/datadog_checks/crio/data/conf.yaml.example +++ b/crio/datadog_checks/crio/data/conf.yaml.example @@ -146,6 +146,17 @@ instances: # - # - <*_SUBSTRING_*> + ## @param ignore_metrics_by_labels - mapping - optional + ## A mapping of labels where metrics with matching label key and values are ignored. + ## Use the "*" wildcard to match all label values. + # + # ignore_metrics_by_labels: + # : + # - + # - + # : + # - '*' + ## @param proxy - mapping - optional ## This overrides the `proxy` setting in `init_config`. ## diff --git a/etcd/datadog_checks/etcd/data/conf.yaml.example b/etcd/datadog_checks/etcd/data/conf.yaml.example index 8cf39ebb976a1..bd88f82092c9a 100644 --- a/etcd/datadog_checks/etcd/data/conf.yaml.example +++ b/etcd/datadog_checks/etcd/data/conf.yaml.example @@ -152,6 +152,17 @@ instances: # - # - <*_SUBSTRING_*> + ## @param ignore_metrics_by_labels - mapping - optional + ## A mapping of labels where metrics with matching label key and values are ignored. + ## Use the "*" wildcard to match all label values. + # + # ignore_metrics_by_labels: + # : + # - + # - + # : + # - '*' + ## @param proxy - mapping - optional ## This overrides the `proxy` setting in `init_config`. ## From b9d7c5d71e6ff49351059197e762e0f0b2dceea4 Mon Sep 17 00:00:00 2001 From: ChristineTChen Date: Thu, 29 Oct 2020 13:46:10 -0400 Subject: [PATCH 8/8] Bump base dep --- crio/setup.py | 2 +- etcd/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/crio/setup.py b/crio/setup.py index b8838f09b38a3..bb20fdca545c1 100644 --- a/crio/setup.py +++ b/crio/setup.py @@ -24,7 +24,7 @@ def get_dependencies(): return f.readlines() -CHECKS_BASE_REQ = 'datadog-checks-base>=11.0.0' +CHECKS_BASE_REQ = 'datadog-checks-base>=15.4.0' setup( diff --git a/etcd/setup.py b/etcd/setup.py index 3e85dc5a9d5ba..58c4d1a26dbca 100644 --- a/etcd/setup.py +++ b/etcd/setup.py @@ -27,7 +27,7 @@ def get_dependencies(): return f.readlines() -CHECKS_BASE_REQ = 'datadog-checks-base>=11.0.0' +CHECKS_BASE_REQ = 'datadog-checks-base>=15.4.0' setup( name='datadog-etcd',