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

Support "ignore_tags" configuration #9392

Merged
merged 4 commits into from
May 25, 2021
Merged

Support "ignore_tags" configuration #9392

merged 4 commits into from
May 25, 2021

Conversation

ahmed-mez
Copy link
Contributor

What does this PR do?

Introduce a new config ignore_tags in the openmetrics check.

Motivation

  • FR
  • Useful for cost optimization when the openmetrics check is configured to collect custom metrics

Additional Notes

Review checklist (to be filled by reviewers)

  • Feature or bugfix MUST have appropriate tests (unit, integration, e2e)
  • PR title must be written as a CHANGELOG entry (see why)
  • Files changes must correspond to the primary purpose of the PR as described in the title (small unrelated changes should have their own PR)
  • PR must have changelog/ and integration/ labels attached

@codecov
Copy link

codecov bot commented May 20, 2021

Codecov Report

Merging #9392 (aee9171) into master (2c95f16) will increase coverage by 0.02%.
The diff coverage is 100.00%.

Flag Coverage Δ
active_directory 100.00% <ø> (ø)
activemq_xml 82.31% <ø> (ø)
aerospike 86.92% <ø> (ø)
airflow 89.94% <ø> (ø)
amazon_msk 87.82% <ø> (ø)
ambari 86.98% <ø> (ø)
apache 94.90% <ø> (ø)
aspdotnet 93.87% <ø> (ø)
azure_iot_edge 82.01% <ø> (ø)
btrfs 82.91% <ø> (ø)
cacti 84.01% <ø> (ø)
cassandra_nodetool 94.19% <ø> (ø)
ceph 91.04% <ø> (ø)
cilium 85.84% <ø> (+1.88%) ⬆️
cisco_aci 95.88% <ø> (ø)
clickhouse 96.95% <ø> (ø)
cloud_foundry_api 95.98% <ø> (+0.12%) ⬆️
cockroachdb 97.18% <ø> (ø)
consul 94.26% <ø> (ø)
coredns 96.36% <ø> (ø)
couch 94.81% <ø> (+0.24%) ⬆️
couchbase 81.45% <ø> (ø)
crio 100.00% <ø> (ø)
datadog_checks_base 88.94% <100.00%> (+0.41%) ⬆️
datadog_checks_dev 80.63% <ø> (ø)
datadog_checks_downloader 80.40% <ø> (ø)
directory 94.70% <ø> (ø)
disk 91.00% <ø> (-0.51%) ⬇️
dns_check 94.44% <ø> (ø)
dotnetclr 100.00% <ø> (ø)
druid 97.70% <ø> (ø)
ecs_fargate 77.39% <ø> (ø)
eks_fargate 94.05% <ø> (ø)
elastic 88.54% <ø> (ø)
envoy 93.68% <ø> (+0.26%) ⬆️
etcd 93.09% <ø> (ø)
exchange_server 100.00% <ø> (ø)
external_dns 100.00% <ø> (ø)
fluentd 94.77% <ø> (ø)
gearmand 77.27% <ø> (+1.29%) ⬆️
gitlab 89.94% <ø> (ø)
gitlab_runner 90.32% <ø> (ø)
glusterfs 80.19% <ø> (+0.99%) ⬆️
go_expvar 91.95% <ø> (ø)
gunicorn 93.53% <ø> (-0.77%) ⬇️
haproxy 95.22% <ø> (+0.17%) ⬆️
harbor 91.58% <ø> (ø)
hazelcast 92.39% <ø> (ø)
hdfs_datanode 90.00% <ø> (ø)
hdfs_namenode 87.94% <ø> (ø)
http_check 89.96% <ø> (+1.82%) ⬆️
ibm_db2 93.87% <ø> (ø)
ibm_mq 88.53% <ø> (ø)
ibm_was 97.44% <ø> (ø)
iis 92.41% <ø> (ø)
istio 93.18% <ø> (+0.56%) ⬆️
kafka_consumer 81.15% <ø> (ø)
kong 93.33% <ø> (ø)
kube_apiserver_metrics 97.35% <ø> (ø)
kube_controller_manager 97.05% <ø> (ø)
kube_dns 98.85% <ø> (ø)
kube_metrics_server 100.00% <ø> (ø)
kube_proxy 100.00% <ø> (ø)
kube_scheduler 98.07% <ø> (ø)
kubelet 89.47% <ø> (ø)
kubernetes_state 89.66% <ø> (ø)
kyototycoon 85.96% <ø> (ø)
lighttpd 83.64% <ø> (ø)
linkerd 87.05% <ø> (+1.17%) ⬆️
linux_proc_extras 96.22% <ø> (ø)
mapr 84.97% <ø> (ø)
mapreduce 82.27% <ø> (ø)
marathon 83.12% <ø> (ø)
marklogic 95.32% <ø> (ø)
mcache 93.39% <ø> (ø)
mesos_master 92.20% <ø> (ø)
mesos_slave 93.60% <ø> (ø)
mongo 94.74% <ø> (+0.28%) ⬆️
mysql 85.18% <ø> (-0.06%) ⬇️
nagios 89.53% <ø> (ø)
network 77.76% <ø> (+1.00%) ⬆️
nfsstat 95.20% <ø> (ø)
nginx 95.11% <ø> (+0.93%) ⬆️
nginx_ingress_controller 98.30% <ø> (ø)
openldap 96.33% <ø> (ø)
openmetrics 97.14% <ø> (ø)
openstack 51.30% <ø> (ø)
openstack_controller 90.59% <ø> (ø)
oracle 93.61% <ø> (+0.63%) ⬆️
pdh_check 97.77% <ø> (ø)
pgbouncer 91.50% <ø> (ø)
php_fpm 89.95% <ø> (+0.43%) ⬆️
postfix 88.04% <ø> (ø)
postgres 91.64% <ø> (+0.22%) ⬆️
powerdns_recursor 95.93% <ø> (ø)
process 85.12% <ø> (ø)
prometheus 94.17% <ø> (ø)
proxysql 99.62% <ø> (ø)
rabbitmq 93.73% <ø> (ø)
redisdb 86.87% <ø> (+0.32%) ⬆️
rethinkdb 97.93% <ø> (ø)
riak 99.22% <ø> (ø)
riakcs 93.61% <ø> (ø)
sap_hana 93.04% <ø> (ø)
scylla 100.00% <ø> (ø)
snmp 91.57% <ø> (+0.04%) ⬆️
snowflake 94.44% <ø> (+0.58%) ⬆️
sonarqube 95.69% <ø> (ø)
spark 93.46% <ø> (ø)
sqlserver 81.71% <ø> (ø)
squid 100.00% <ø> (ø)
ssh_check 91.08% <ø> (ø)
statsd 87.36% <ø> (+1.05%) ⬆️
supervisord 92.18% <ø> (ø)
system_core 91.04% <ø> (ø)
system_swap 98.30% <ø> (ø)
tcp_check 86.53% <ø> (ø)
teamcity 80.00% <ø> (ø)
tls 97.04% <ø> (+0.87%) ⬆️
tokumx 58.40% <ø> (?)
twemproxy 78.33% <ø> (ø)
twistlock 80.74% <ø> (ø)
varnish 84.57% <ø> (+0.24%) ⬆️
vault 94.80% <ø> (+0.54%) ⬆️
vertica 92.27% <ø> (ø)
voltdb 96.81% <ø> (ø)
vsphere 89.77% <ø> (+0.08%) ⬆️
win32_event_log 86.03% <ø> (+0.28%) ⬆️
windows_service 95.83% <ø> (ø)
wmi_check 92.91% <ø> (ø)
yarn 90.30% <ø> (ø)
zk 85.17% <ø> (+0.75%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
...e/datadog_checks/base/checks/openmetrics/mixins.py 79.83% <100.00%> (+0.30%) ⬆️
...tadog_checks/base/checks/openmetrics/v2/scraper.py 86.57% <100.00%> (+0.19%) ⬆️
...adog_checks_base/tests/openmetrics/test_options.py 100.00% <100.00%> (ø)
datadog_checks_base/tests/test_openmetrics.py 97.47% <100.00%> (-0.14%) ⬇️
gunicorn/datadog_checks/gunicorn/gunicorn.py 85.71% <0.00%> (-1.91%) ⬇️
disk/datadog_checks/disk/disk.py 79.05% <0.00%> (-1.36%) ⬇️
mysql/datadog_checks/mysql/innodb_metrics.py 66.09% <0.00%> (-0.86%) ⬇️
datadog_checks_base/tests/test_prometheus.py 99.48% <0.00%> (-0.26%) ⬇️
...g_checks/win32_event_log/legacy/win32_event_log.py 69.76% <0.00%> (ø)
... and 59 more

Copy link
Member

@FlorianVeaux FlorianVeaux left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@FlorianVeaux
Copy link
Member

Oh and style is failing as well:

./tests/test_openmetrics.py:2785:1: E302 expected 2 blank lines, found 1
./datadog_checks/base/checks/openmetrics/mixins.py:322:121: E501 line too long (148 > 120 characters)
./datadog_checks/base/checks/openmetrics/mixins.py:323:121: E501 line too long (171 > 120 characters)

ruthnaebeck
ruthnaebeck previously approved these changes May 20, 2021
Copy link
Contributor

@ruthnaebeck ruthnaebeck left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 for docs

Copy link
Member

@FlorianVeaux FlorianVeaux left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we should have regex for v2 and wildcard for v1. This makes it confusing for users once we upgrade older openmetrics integration.

Also let's update the conf.yaml description to mention these are regexes

FlorianVeaux
FlorianVeaux previously approved these changes May 25, 2021
Copy link
Contributor

@clamoriniere clamoriniere left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good,
Just a small comment about some changes that doesn't seem to be linked to the feature.

clamoriniere
clamoriniere previously approved these changes May 25, 2021
Copy link
Contributor

@clamoriniere clamoriniere left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@ahmed-mez ahmed-mez merged commit cc402c6 into master May 25, 2021
@ahmed-mez ahmed-mez deleted the ahmed/om-ignore-tags branch May 25, 2021 13:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment