Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync openmetrics config specs with new option ignore_metrics_by_labels #7823

Merged
merged 8 commits into from
Oct 29, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions amazon_msk/datadog_checks/amazon_msk/data/conf.yaml.example
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,17 @@ instances:
# - <PREFIX_*_SUFFIX>
# - <*_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:
# <KEY_1>:
# - <LABEL_1>
# - <LABEL_2>
# <KEY_2>:
# - '*'

## @param proxy - mapping - optional
## This overrides the `proxy` setting in `init_config`.
##
Expand Down
2 changes: 1 addition & 1 deletion amazon_msk/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
11 changes: 11 additions & 0 deletions cilium/datadog_checks/cilium/data/conf.yaml.example
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,17 @@ instances:
# - <PREFIX_*_SUFFIX>
# - <*_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:
# <KEY_1>:
# - <LABEL_1>
# - <LABEL_2>
# <KEY_2>:
# - '*'

## @param proxy - mapping - optional
## This overrides the `proxy` setting in `init_config`.
##
Expand Down
2 changes: 1 addition & 1 deletion cilium/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
11 changes: 11 additions & 0 deletions cockroachdb/datadog_checks/cockroachdb/data/conf.yaml.example
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,17 @@ instances:
# - <PREFIX_*_SUFFIX>
# - <*_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:
# <KEY_1>:
# - <LABEL_1>
# - <LABEL_2>
# <KEY_2>:
# - '*'

## @param proxy - mapping - optional
## This overrides the `proxy` setting in `init_config`.
##
Expand Down
2 changes: 1 addition & 1 deletion cockroachdb/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
11 changes: 11 additions & 0 deletions coredns/datadog_checks/coredns/data/conf.yaml.example
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,17 @@ instances:
# - <PREFIX_*_SUFFIX>
# - <*_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:
# <KEY_1>:
# - <LABEL_1>
# - <LABEL_2>
# <KEY_2>:
# - '*'

## @param proxy - mapping - optional
## This overrides the `proxy` setting in `init_config`.
##
Expand Down
2 changes: 1 addition & 1 deletion coredns/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
11 changes: 11 additions & 0 deletions crio/datadog_checks/crio/data/conf.yaml.example
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,17 @@ instances:
# - <PREFIX_*_SUFFIX>
# - <*_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:
# <KEY_1>:
# - <LABEL_1>
# - <LABEL_2>
# <KEY_2>:
# - '*'

## @param proxy - mapping - optional
## This overrides the `proxy` setting in `init_config`.
##
Expand Down
2 changes: 1 addition & 1 deletion crio/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,21 @@
- <*_SUFFIX>
- <PREFIX_*_SUFFIX>
- <*_SUBSTRING_*>

- name: ignore_metrics_by_labels
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: object
properties:
- name: target_label_key
type: string
- name: target_label_value_list
type: array
items:
type: string
example:
<KEY_1>: [<LABEL_1>, <LABEL_2>]
<KEY_2>: ['*']
- template: instances/http
- template: instances/default
11 changes: 11 additions & 0 deletions etcd/datadog_checks/etcd/data/conf.yaml.example
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,17 @@ instances:
# - <PREFIX_*_SUFFIX>
# - <*_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:
# <KEY_1>:
# - <LABEL_1>
# - <LABEL_2>
# <KEY_2>:
# - '*'

## @param proxy - mapping - optional
## This overrides the `proxy` setting in `init_config`.
##
Expand Down
2 changes: 1 addition & 1 deletion etcd/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
11 changes: 11 additions & 0 deletions gitlab/datadog_checks/gitlab/data/conf.yaml.example
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,17 @@ instances:
# - <PREFIX_*_SUFFIX>
# - <*_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:
# <KEY_1>:
# - <LABEL_1>
# - <LABEL_2>
# <KEY_2>:
# - '*'

## @param proxy - mapping - optional
## This overrides the `proxy` setting in `init_config`.
##
Expand Down
2 changes: 1 addition & 1 deletion gitlab/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,17 @@ instances:
# - <PREFIX_*_SUFFIX>
# - <*_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:
# <KEY_1>:
# - <LABEL_1>
# - <LABEL_2>
# <KEY_2>:
# - '*'

## @param proxy - mapping - optional
## This overrides the `proxy` setting in `init_config`.
##
Expand Down
2 changes: 1 addition & 1 deletion gitlab_runner/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
11 changes: 11 additions & 0 deletions haproxy/datadog_checks/haproxy/data/conf.yaml.example
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,17 @@ instances:
# - <PREFIX_*_SUFFIX>
# - <*_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:
# <KEY_1>:
# - <LABEL_1>
# - <LABEL_2>
# <KEY_2>:
# - '*'

## @param proxy - mapping - optional
## This overrides the `proxy` setting in `init_config`.
##
Expand Down
2 changes: 1 addition & 1 deletion haproxy/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
11 changes: 11 additions & 0 deletions istio/datadog_checks/istio/data/conf.yaml.example
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,17 @@ instances:
# - <PREFIX_*_SUFFIX>
# - <*_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:
# <KEY_1>:
# - <LABEL_1>
# - <LABEL_2>
# <KEY_2>:
# - '*'

## @param proxy - mapping - optional
## This overrides the `proxy` setting in `init_config`.
##
Expand Down
2 changes: 1 addition & 1 deletion istio/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,17 @@ instances:
# - <PREFIX_*_SUFFIX>
# - <*_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:
# <KEY_1>:
# - <LABEL_1>
# - <LABEL_2>
# <KEY_2>:
# - '*'

## @param proxy - mapping - optional
## This overrides the `proxy` setting in `init_config`.
##
Expand Down
2 changes: 1 addition & 1 deletion kube_apiserver_metrics/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,17 @@ instances:
# - <PREFIX_*_SUFFIX>
# - <*_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:
# <KEY_1>:
# - <LABEL_1>
# - <LABEL_2>
# <KEY_2>:
# - '*'

## @param proxy - mapping - optional
## This overrides the `proxy` setting in `init_config`.
##
Expand Down
2 changes: 1 addition & 1 deletion kube_scheduler/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,17 @@ instances:
# - <PREFIX_*_SUFFIX>
# - <*_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:
# <KEY_1>:
# - <LABEL_1>
# - <LABEL_2>
# <KEY_2>:
# - '*'

## @param proxy - mapping - optional
## This overrides the `proxy` setting in `init_config`.
##
Expand Down
2 changes: 1 addition & 1 deletion nginx_ingress_controller/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
11 changes: 11 additions & 0 deletions openmetrics/datadog_checks/openmetrics/data/conf.yaml.example
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,17 @@ instances:
# - <PREFIX_*_SUFFIX>
# - <*_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:
# <KEY_1>:
# - <LABEL_1>
# - <LABEL_2>
# <KEY_2>:
# - '*'

## @param proxy - mapping - optional
## This overrides the `proxy` setting in `init_config`.
##
Expand Down
Loading