From 6a7abf9c551e26a490a90fa0eb6e10312f1f03ed Mon Sep 17 00:00:00 2001 From: Julia <611228+hithwen@users.noreply.github.com> Date: Thu, 9 Sep 2021 15:00:20 +0200 Subject: [PATCH] Disable generic tags - option 2 (#10027) * Transform generic tags * Add config option * Sync models Co-authored-by: Paul --- .../amazon_msk/config_models/defaults.py | 4 ++++ .../amazon_msk/config_models/instance.py | 1 + .../apache/config_models/defaults.py | 4 ++++ .../apache/config_models/instance.py | 1 + .../avi_vantage/config_models/defaults.py | 4 ++++ .../avi_vantage/config_models/instance.py | 1 + .../cassandra/config_models/defaults.py | 4 ++++ .../cassandra/config_models/instance.py | 1 + .../config_models/defaults.py | 4 ++++ .../config_models/instance.py | 1 + .../consul/config_models/defaults.py | 4 ++++ .../consul/config_models/instance.py | 1 + .../datadog_checks/base/checks/base.py | 20 +++++++++++++++---- .../tests/base/checks/test_agent_check.py | 13 ++++++++++++ .../configuration/instances/default.yaml | 9 +++++++++ .../config_models/defaults.py | 4 ++++ .../config_models/instance.py | 1 + .../directory/config_models/defaults.py | 4 ++++ .../directory/config_models/instance.py | 1 + .../elastic/config_models/defaults.py | 4 ++++ .../elastic/config_models/instance.py | 1 + .../envoy/config_models/defaults.py | 4 ++++ .../envoy/config_models/instance.py | 1 + .../gitlab_runner/config_models/defaults.py | 4 ++++ .../gitlab_runner/config_models/instance.py | 1 + .../glusterfs/config_models/defaults.py | 4 ++++ .../glusterfs/config_models/instance.py | 1 + .../go_expvar/config_models/defaults.py | 4 ++++ .../go_expvar/config_models/instance.py | 1 + .../gunicorn/config_models/defaults.py | 4 ++++ .../gunicorn/config_models/instance.py | 1 + .../haproxy/config_models/defaults.py | 4 ++++ .../haproxy/config_models/instance.py | 1 + .../harbor/config_models/defaults.py | 4 ++++ .../harbor/config_models/instance.py | 1 + .../http_check/config_models/defaults.py | 4 ++++ .../http_check/config_models/instance.py | 1 + .../ibm_mq/config_models/defaults.py | 4 ++++ .../ibm_mq/config_models/instance.py | 1 + .../istio/config_models/defaults.py | 4 ++++ .../istio/config_models/instance.py | 1 + .../kafka/config_models/defaults.py | 4 ++++ .../kafka/config_models/instance.py | 1 + .../kafka_consumer/config_models/defaults.py | 4 ++++ .../kafka_consumer/config_models/instance.py | 1 + .../mapr/config_models/defaults.py | 4 ++++ .../mapr/config_models/instance.py | 1 + .../mcache/config_models/defaults.py | 4 ++++ .../mcache/config_models/instance.py | 1 + .../mesos_master/config_models/defaults.py | 4 ++++ .../mesos_master/config_models/instance.py | 1 + .../mesos_slave/config_models/defaults.py | 4 ++++ .../mesos_slave/config_models/instance.py | 1 + .../mongo/config_models/defaults.py | 4 ++++ .../mongo/config_models/instance.py | 1 + .../mysql/config_models/defaults.py | 4 ++++ .../mysql/config_models/instance.py | 1 + .../nagios/config_models/defaults.py | 4 ++++ .../nagios/config_models/instance.py | 1 + .../network/config_models/defaults.py | 4 ++++ .../network/config_models/instance.py | 1 + .../nfsstat/config_models/defaults.py | 4 ++++ .../nfsstat/config_models/instance.py | 1 + .../nginx/config_models/defaults.py | 4 ++++ .../nginx/config_models/instance.py | 1 + .../config_models/defaults.py | 4 ++++ .../config_models/instance.py | 1 + .../openldap/config_models/defaults.py | 4 ++++ .../openldap/config_models/instance.py | 1 + .../oracle/config_models/defaults.py | 4 ++++ .../oracle/config_models/instance.py | 1 + .../postfix/config_models/defaults.py | 4 ++++ .../postfix/config_models/instance.py | 1 + .../postgres/config_models/defaults.py | 4 ++++ .../postgres/config_models/instance.py | 1 + .../config_models/defaults.py | 4 ++++ .../config_models/instance.py | 1 + .../process/config_models/defaults.py | 4 ++++ .../process/config_models/instance.py | 1 + .../proxysql/config_models/defaults.py | 4 ++++ .../proxysql/config_models/instance.py | 1 + .../rabbitmq/config_models/defaults.py | 4 ++++ .../rabbitmq/config_models/instance.py | 1 + .../redisdb/config_models/defaults.py | 4 ++++ .../redisdb/config_models/instance.py | 1 + .../riak/config_models/defaults.py | 4 ++++ .../riak/config_models/instance.py | 1 + .../riakcs/config_models/defaults.py | 4 ++++ .../riakcs/config_models/instance.py | 1 + .../sap_hana/config_models/defaults.py | 4 ++++ .../sap_hana/config_models/instance.py | 1 + .../sonarqube/config_models/defaults.py | 4 ++++ .../sonarqube/config_models/instance.py | 1 + .../spark/config_models/defaults.py | 4 ++++ .../spark/config_models/instance.py | 1 + .../sqlserver/config_models/defaults.py | 4 ++++ .../sqlserver/config_models/instance.py | 1 + .../squid/config_models/defaults.py | 4 ++++ .../squid/config_models/instance.py | 1 + .../ssh_check/config_models/defaults.py | 4 ++++ .../ssh_check/config_models/instance.py | 1 + .../statsd/config_models/defaults.py | 4 ++++ .../statsd/config_models/instance.py | 1 + .../supervisord/config_models/defaults.py | 4 ++++ .../supervisord/config_models/instance.py | 1 + .../system_core/config_models/defaults.py | 4 ++++ .../system_core/config_models/instance.py | 1 + .../system_swap/config_models/defaults.py | 4 ++++ .../system_swap/config_models/instance.py | 1 + .../tcp_check/config_models/defaults.py | 4 ++++ .../tcp_check/config_models/instance.py | 1 + .../teamcity/config_models/defaults.py | 4 ++++ .../teamcity/config_models/instance.py | 1 + .../tls/config_models/defaults.py | 4 ++++ .../tls/config_models/instance.py | 1 + .../tomcat/config_models/defaults.py | 4 ++++ .../tomcat/config_models/instance.py | 1 + .../twemproxy/config_models/defaults.py | 4 ++++ .../twemproxy/config_models/instance.py | 1 + .../twistlock/config_models/defaults.py | 4 ++++ .../twistlock/config_models/instance.py | 1 + .../varnish/config_models/defaults.py | 4 ++++ .../varnish/config_models/instance.py | 1 + .../vault/config_models/defaults.py | 4 ++++ .../vault/config_models/instance.py | 1 + .../vertica/config_models/defaults.py | 4 ++++ .../vertica/config_models/instance.py | 1 + .../voltdb/config_models/defaults.py | 4 ++++ .../voltdb/config_models/instance.py | 1 + .../vsphere/config_models/defaults.py | 4 ++++ .../vsphere/config_models/instance.py | 1 + .../win32_event_log/config_models/defaults.py | 4 ++++ .../win32_event_log/config_models/instance.py | 1 + .../windows_service/config_models/defaults.py | 4 ++++ .../windows_service/config_models/instance.py | 1 + .../wmi_check/config_models/defaults.py | 4 ++++ .../wmi_check/config_models/instance.py | 1 + .../yarn/config_models/defaults.py | 4 ++++ .../yarn/config_models/instance.py | 1 + .../zk/config_models/defaults.py | 4 ++++ .../zk/config_models/instance.py | 1 + 141 files changed, 383 insertions(+), 4 deletions(-) diff --git a/amazon_msk/datadog_checks/amazon_msk/config_models/defaults.py b/amazon_msk/datadog_checks/amazon_msk/config_models/defaults.py index 7ab8111851a96..790cb9aee9ca5 100644 --- a/amazon_msk/datadog_checks/amazon_msk/config_models/defaults.py +++ b/amazon_msk/datadog_checks/amazon_msk/config_models/defaults.py @@ -64,6 +64,10 @@ def instance_connect_timeout(field, value): return get_default_field_value(field, value) +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/amazon_msk/datadog_checks/amazon_msk/config_models/instance.py b/amazon_msk/datadog_checks/amazon_msk/config_models/instance.py index 1e2dc3c140569..bf6797dc86070 100644 --- a/amazon_msk/datadog_checks/amazon_msk/config_models/instance.py +++ b/amazon_msk/datadog_checks/amazon_msk/config_models/instance.py @@ -72,6 +72,7 @@ class Config: collect_counters_with_distributions: Optional[bool] collect_histogram_buckets: Optional[bool] connect_timeout: Optional[float] + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] enable_health_service_check: Optional[bool] exclude_labels: Optional[Sequence[str]] diff --git a/apache/datadog_checks/apache/config_models/defaults.py b/apache/datadog_checks/apache/config_models/defaults.py index dc62768e6ebb1..58c0caa9012ea 100644 --- a/apache/datadog_checks/apache/config_models/defaults.py +++ b/apache/datadog_checks/apache/config_models/defaults.py @@ -44,6 +44,10 @@ def instance_connect_timeout(field, value): return get_default_field_value(field, value) +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/apache/datadog_checks/apache/config_models/instance.py b/apache/datadog_checks/apache/config_models/instance.py index faa802c96df73..f593f89eb7fe1 100644 --- a/apache/datadog_checks/apache/config_models/instance.py +++ b/apache/datadog_checks/apache/config_models/instance.py @@ -41,6 +41,7 @@ class Config: aws_region: Optional[str] aws_service: Optional[str] connect_timeout: Optional[float] + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] extra_headers: Optional[Mapping[str, Any]] headers: Optional[Mapping[str, Any]] diff --git a/avi_vantage/datadog_checks/avi_vantage/config_models/defaults.py b/avi_vantage/datadog_checks/avi_vantage/config_models/defaults.py index daf49b49ec2ee..2a022dea0f16d 100644 --- a/avi_vantage/datadog_checks/avi_vantage/config_models/defaults.py +++ b/avi_vantage/datadog_checks/avi_vantage/config_models/defaults.py @@ -60,6 +60,10 @@ def instance_connect_timeout(field, value): return get_default_field_value(field, value) +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/avi_vantage/datadog_checks/avi_vantage/config_models/instance.py b/avi_vantage/datadog_checks/avi_vantage/config_models/instance.py index 932844b1a85c7..017f57d0d5fea 100644 --- a/avi_vantage/datadog_checks/avi_vantage/config_models/instance.py +++ b/avi_vantage/datadog_checks/avi_vantage/config_models/instance.py @@ -71,6 +71,7 @@ class Config: collect_counters_with_distributions: Optional[bool] collect_histogram_buckets: Optional[bool] connect_timeout: Optional[float] + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] enable_health_service_check: Optional[bool] entities: Optional[Sequence[Literal['controller', 'pool', 'serviceengine', 'virtualservice']]] diff --git a/cassandra/datadog_checks/cassandra/config_models/defaults.py b/cassandra/datadog_checks/cassandra/config_models/defaults.py index 2fa99a6c3c270..645f060fafee5 100644 --- a/cassandra/datadog_checks/cassandra/config_models/defaults.py +++ b/cassandra/datadog_checks/cassandra/config_models/defaults.py @@ -28,6 +28,10 @@ def instance_collect_default_jvm_metrics(field, value): return True +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/cassandra/datadog_checks/cassandra/config_models/instance.py b/cassandra/datadog_checks/cassandra/config_models/instance.py index 17915856ce308..e98afb9405ea6 100644 --- a/cassandra/datadog_checks/cassandra/config_models/instance.py +++ b/cassandra/datadog_checks/cassandra/config_models/instance.py @@ -19,6 +19,7 @@ class Config: cassandra_aliasing: bool collect_default_jvm_metrics: Optional[bool] + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] host: str is_jmx: Optional[bool] diff --git a/cassandra_nodetool/datadog_checks/cassandra_nodetool/config_models/defaults.py b/cassandra_nodetool/datadog_checks/cassandra_nodetool/config_models/defaults.py index 5a3c342056aab..abf7ed292b819 100644 --- a/cassandra_nodetool/datadog_checks/cassandra_nodetool/config_models/defaults.py +++ b/cassandra_nodetool/datadog_checks/cassandra_nodetool/config_models/defaults.py @@ -12,6 +12,10 @@ def shared_service(field, value): return get_default_field_value(field, value) +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/cassandra_nodetool/datadog_checks/cassandra_nodetool/config_models/instance.py b/cassandra_nodetool/datadog_checks/cassandra_nodetool/config_models/instance.py index 65477c1f694a2..18cdb3ffcb546 100644 --- a/cassandra_nodetool/datadog_checks/cassandra_nodetool/config_models/instance.py +++ b/cassandra_nodetool/datadog_checks/cassandra_nodetool/config_models/instance.py @@ -17,6 +17,7 @@ class InstanceConfig(BaseModel): class Config: allow_mutation = False + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] host: Optional[str] keyspaces: Sequence[str] diff --git a/consul/datadog_checks/consul/config_models/defaults.py b/consul/datadog_checks/consul/config_models/defaults.py index 24d1637cb74c9..60f689f86532b 100644 --- a/consul/datadog_checks/consul/config_models/defaults.py +++ b/consul/datadog_checks/consul/config_models/defaults.py @@ -52,6 +52,10 @@ def instance_connect_timeout(field, value): return get_default_field_value(field, value) +def instance_disable_generic_tags(field, value): + return False + + def instance_disable_legacy_service_tag(field, value): return False diff --git a/consul/datadog_checks/consul/config_models/instance.py b/consul/datadog_checks/consul/config_models/instance.py index 52523352e3b2d..55634369cea7a 100644 --- a/consul/datadog_checks/consul/config_models/instance.py +++ b/consul/datadog_checks/consul/config_models/instance.py @@ -42,6 +42,7 @@ class Config: aws_service: Optional[str] catalog_checks: Optional[bool] connect_timeout: Optional[float] + disable_generic_tags: Optional[bool] disable_legacy_service_tag: Optional[bool] empty_default_hostname: Optional[bool] extra_headers: Optional[Mapping[str, Any]] diff --git a/datadog_checks_base/datadog_checks/base/checks/base.py b/datadog_checks_base/datadog_checks/base/checks/base.py index b1e7a0217f638..35fb62e98366c 100644 --- a/datadog_checks_base/datadog_checks/base/checks/base.py +++ b/datadog_checks_base/datadog_checks/base/checks/base.py @@ -35,6 +35,7 @@ from ..utils.limiter import Limiter from ..utils.metadata import MetadataManager from ..utils.secrets import SecretsSanitizer +from ..utils.tagging import GENERIC_TAGS from ..utils.tls import TlsContextWrapper try: @@ -188,6 +189,9 @@ def __init__(self, *args, **kwargs): self.instance = instance # type: InstanceType self.instances = instances # type: List[InstanceType] self.warnings = [] # type: List[str] + self.disable_generic_tags = ( + is_affirmative(self.instance.get('disable_generic_tags', False)) if instance else False + ) # `self.hostname` is deprecated, use `datadog_agent.get_hostname()` instead self.hostname = datadog_agent.get_hostname() # type: str @@ -1087,13 +1091,21 @@ def _normalize_tags_type(self, tags, device_name=None, metric_name=None): for tag in tags: if tag is None: continue - try: tag = to_native_string(tag) except UnicodeError: self.log.warning('Encoding error with tag `%s` for metric `%s`, ignoring tag', tag, metric_name) continue - - normalized_tags.append(tag) - + if self.disable_generic_tags: + normalized_tags.append(self.degeneralise_tag(tag)) + else: + normalized_tags.append(tag) return normalized_tags + + def degeneralise_tag(self, tag): + tag_name, value = tag.split(':') + if tag_name in GENERIC_TAGS: + new_name = '{}_{}'.format(self.name, tag_name) + return '{}:{}'.format(new_name, value) + else: + return tag diff --git a/datadog_checks_base/tests/base/checks/test_agent_check.py b/datadog_checks_base/tests/base/checks/test_agent_check.py index 79d4bbd44e794..e65d1f7c8d7f6 100644 --- a/datadog_checks_base/tests/base/checks/test_agent_check.py +++ b/datadog_checks_base/tests/base/checks/test_agent_check.py @@ -629,6 +629,19 @@ def test_external_hostname(self): else: set_external_tags.assert_called_with([('hostnam\xc3\xa9', {'src_name': ['key1:val1']})]) + @pytest.mark.parametrize( + "disable_generic_tags, expected_tags", + [ + pytest.param(False, {"foo:bar", "cluster:my_cluster"}), + pytest.param(True, {"foo:bar", "myintegration_cluster:my_cluster"}), + ], + ) + def test_generic_tags(self, disable_generic_tags, expected_tags): + instance = {'disable_generic_tags': disable_generic_tags} + check = AgentCheck('myintegration', {}, [instance]) + tags = check._normalize_tags_type(tags=["foo:bar", "cluster:my_cluster"]) + assert set(tags) == expected_tags + class LimitedCheck(AgentCheck): DEFAULT_METRIC_LIMIT = 10 diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/instances/default.yaml b/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/instances/default.yaml index 48900d29ec229..98e71052a95e7 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/instances/default.yaml +++ b/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/instances/default.yaml @@ -1,3 +1,12 @@ - template: instances/tags - template: instances/service - template: instances/global +- name: disable_generic_tags + description: | + Generic tags such as `cluster` will be replaced by _cluster to avoid + getting mixed with other integraton tags. + value: + type: boolean + display_default: false + example: true + hidden: true diff --git a/datadog_cluster_agent/datadog_checks/datadog_cluster_agent/config_models/defaults.py b/datadog_cluster_agent/datadog_checks/datadog_cluster_agent/config_models/defaults.py index d34784c3492c3..e68de216fb090 100644 --- a/datadog_cluster_agent/datadog_checks/datadog_cluster_agent/config_models/defaults.py +++ b/datadog_cluster_agent/datadog_checks/datadog_cluster_agent/config_models/defaults.py @@ -52,6 +52,10 @@ def instance_connect_timeout(field, value): return get_default_field_value(field, value) +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/datadog_cluster_agent/datadog_checks/datadog_cluster_agent/config_models/instance.py b/datadog_cluster_agent/datadog_checks/datadog_cluster_agent/config_models/instance.py index 0af127d2cc4ea..be5bf663af444 100644 --- a/datadog_cluster_agent/datadog_checks/datadog_cluster_agent/config_models/instance.py +++ b/datadog_cluster_agent/datadog_checks/datadog_cluster_agent/config_models/instance.py @@ -65,6 +65,7 @@ class Config: bearer_token_auth: Optional[bool] bearer_token_path: Optional[str] connect_timeout: Optional[float] + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] exclude_labels: Optional[Sequence[str]] extra_headers: Optional[Mapping[str, Any]] diff --git a/directory/datadog_checks/directory/config_models/defaults.py b/directory/datadog_checks/directory/config_models/defaults.py index 8a8d9a4677dd3..6d5e5d205946a 100644 --- a/directory/datadog_checks/directory/config_models/defaults.py +++ b/directory/datadog_checks/directory/config_models/defaults.py @@ -20,6 +20,10 @@ def instance_dirtagname(field, value): return get_default_field_value(field, value) +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/directory/datadog_checks/directory/config_models/instance.py b/directory/datadog_checks/directory/config_models/instance.py index 2040b575f2b19..85883b908ca46 100644 --- a/directory/datadog_checks/directory/config_models/instance.py +++ b/directory/datadog_checks/directory/config_models/instance.py @@ -21,6 +21,7 @@ class Config: directory: str dirs_patterns_full: Optional[bool] dirtagname: Optional[str] + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] exclude_dirs: Optional[Sequence[str]] filegauges: Optional[bool] diff --git a/elastic/datadog_checks/elastic/config_models/defaults.py b/elastic/datadog_checks/elastic/config_models/defaults.py index 263e72e7737c5..4d68c3902c9c2 100644 --- a/elastic/datadog_checks/elastic/config_models/defaults.py +++ b/elastic/datadog_checks/elastic/config_models/defaults.py @@ -56,6 +56,10 @@ def instance_connect_timeout(field, value): return get_default_field_value(field, value) +def instance_disable_generic_tags(field, value): + return False + + def instance_disable_legacy_cluster_tag(field, value): return False diff --git a/elastic/datadog_checks/elastic/config_models/instance.py b/elastic/datadog_checks/elastic/config_models/instance.py index 6e2ea60af8288..b076bd5465721 100644 --- a/elastic/datadog_checks/elastic/config_models/instance.py +++ b/elastic/datadog_checks/elastic/config_models/instance.py @@ -43,6 +43,7 @@ class Config: cat_allocation_stats: Optional[bool] cluster_stats: Optional[bool] connect_timeout: Optional[float] + disable_generic_tags: Optional[bool] disable_legacy_cluster_tag: Optional[bool] empty_default_hostname: Optional[bool] extra_headers: Optional[Mapping[str, Any]] diff --git a/envoy/datadog_checks/envoy/config_models/defaults.py b/envoy/datadog_checks/envoy/config_models/defaults.py index 59fe55b3c460e..29db6271b778a 100644 --- a/envoy/datadog_checks/envoy/config_models/defaults.py +++ b/envoy/datadog_checks/envoy/config_models/defaults.py @@ -52,6 +52,10 @@ def instance_connect_timeout(field, value): return get_default_field_value(field, value) +def instance_disable_generic_tags(field, value): + return False + + def instance_disable_legacy_cluster_tag(field, value): return False diff --git a/envoy/datadog_checks/envoy/config_models/instance.py b/envoy/datadog_checks/envoy/config_models/instance.py index 475ea6a210c58..676ece2629dda 100644 --- a/envoy/datadog_checks/envoy/config_models/instance.py +++ b/envoy/datadog_checks/envoy/config_models/instance.py @@ -42,6 +42,7 @@ class Config: cache_metrics: Optional[bool] collect_server_info: Optional[bool] connect_timeout: Optional[float] + disable_generic_tags: Optional[bool] disable_legacy_cluster_tag: Optional[bool] empty_default_hostname: Optional[bool] excluded_metrics: Optional[Sequence[str]] diff --git a/gitlab_runner/datadog_checks/gitlab_runner/config_models/defaults.py b/gitlab_runner/datadog_checks/gitlab_runner/config_models/defaults.py index d34784c3492c3..e68de216fb090 100644 --- a/gitlab_runner/datadog_checks/gitlab_runner/config_models/defaults.py +++ b/gitlab_runner/datadog_checks/gitlab_runner/config_models/defaults.py @@ -52,6 +52,10 @@ def instance_connect_timeout(field, value): return get_default_field_value(field, value) +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/gitlab_runner/datadog_checks/gitlab_runner/config_models/instance.py b/gitlab_runner/datadog_checks/gitlab_runner/config_models/instance.py index cf0415915d47f..d9edec13b5293 100644 --- a/gitlab_runner/datadog_checks/gitlab_runner/config_models/instance.py +++ b/gitlab_runner/datadog_checks/gitlab_runner/config_models/instance.py @@ -65,6 +65,7 @@ class Config: bearer_token_auth: Optional[bool] bearer_token_path: Optional[str] connect_timeout: Optional[float] + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] exclude_labels: Optional[Sequence[str]] extra_headers: Optional[Mapping[str, Any]] diff --git a/glusterfs/datadog_checks/glusterfs/config_models/defaults.py b/glusterfs/datadog_checks/glusterfs/config_models/defaults.py index 9a64d4197b6d1..dd3d7aa71bef9 100644 --- a/glusterfs/datadog_checks/glusterfs/config_models/defaults.py +++ b/glusterfs/datadog_checks/glusterfs/config_models/defaults.py @@ -12,6 +12,10 @@ def shared_service(field, value): return get_default_field_value(field, value) +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/glusterfs/datadog_checks/glusterfs/config_models/instance.py b/glusterfs/datadog_checks/glusterfs/config_models/instance.py index 1b7dff3f43150..454589df7de85 100644 --- a/glusterfs/datadog_checks/glusterfs/config_models/instance.py +++ b/glusterfs/datadog_checks/glusterfs/config_models/instance.py @@ -17,6 +17,7 @@ class InstanceConfig(BaseModel): class Config: allow_mutation = False + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] min_collection_interval: Optional[float] service: Optional[str] diff --git a/go_expvar/datadog_checks/go_expvar/config_models/defaults.py b/go_expvar/datadog_checks/go_expvar/config_models/defaults.py index b968bb24cb8d0..1dacd5501b73a 100644 --- a/go_expvar/datadog_checks/go_expvar/config_models/defaults.py +++ b/go_expvar/datadog_checks/go_expvar/config_models/defaults.py @@ -44,6 +44,10 @@ def instance_connect_timeout(field, value): return get_default_field_value(field, value) +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/go_expvar/datadog_checks/go_expvar/config_models/instance.py b/go_expvar/datadog_checks/go_expvar/config_models/instance.py index ba7afeecccefa..1be9b0ea0e6cd 100644 --- a/go_expvar/datadog_checks/go_expvar/config_models/instance.py +++ b/go_expvar/datadog_checks/go_expvar/config_models/instance.py @@ -50,6 +50,7 @@ class Config: aws_region: Optional[str] aws_service: Optional[str] connect_timeout: Optional[float] + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] expvar_url: str extra_headers: Optional[Mapping[str, Any]] diff --git a/gunicorn/datadog_checks/gunicorn/config_models/defaults.py b/gunicorn/datadog_checks/gunicorn/config_models/defaults.py index e6bcd21086ad9..fde10603e6bbe 100644 --- a/gunicorn/datadog_checks/gunicorn/config_models/defaults.py +++ b/gunicorn/datadog_checks/gunicorn/config_models/defaults.py @@ -12,6 +12,10 @@ def shared_service(field, value): return get_default_field_value(field, value) +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/gunicorn/datadog_checks/gunicorn/config_models/instance.py b/gunicorn/datadog_checks/gunicorn/config_models/instance.py index 465736ba31867..ad77af9eb77d6 100644 --- a/gunicorn/datadog_checks/gunicorn/config_models/instance.py +++ b/gunicorn/datadog_checks/gunicorn/config_models/instance.py @@ -17,6 +17,7 @@ class InstanceConfig(BaseModel): class Config: allow_mutation = False + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] gunicorn: Optional[str] min_collection_interval: Optional[float] diff --git a/haproxy/datadog_checks/haproxy/config_models/defaults.py b/haproxy/datadog_checks/haproxy/config_models/defaults.py index 8af3632670053..2c9cbea51b6c9 100644 --- a/haproxy/datadog_checks/haproxy/config_models/defaults.py +++ b/haproxy/datadog_checks/haproxy/config_models/defaults.py @@ -76,6 +76,10 @@ def instance_count_status_by_service(field, value): return True +def instance_disable_generic_tags(field, value): + return False + + def instance_disable_legacy_service_tag(field, value): return False diff --git a/haproxy/datadog_checks/haproxy/config_models/instance.py b/haproxy/datadog_checks/haproxy/config_models/instance.py index 45a315f8fa695..15bd8b69082ed 100644 --- a/haproxy/datadog_checks/haproxy/config_models/instance.py +++ b/haproxy/datadog_checks/haproxy/config_models/instance.py @@ -71,6 +71,7 @@ class Config: collect_status_metrics_by_host: Optional[bool] connect_timeout: Optional[float] count_status_by_service: Optional[bool] + disable_generic_tags: Optional[bool] disable_legacy_service_tag: Optional[bool] empty_default_hostname: Optional[bool] enable_service_check: Optional[bool] diff --git a/harbor/datadog_checks/harbor/config_models/defaults.py b/harbor/datadog_checks/harbor/config_models/defaults.py index e3089c77c362f..5fa3aadc3f5f0 100644 --- a/harbor/datadog_checks/harbor/config_models/defaults.py +++ b/harbor/datadog_checks/harbor/config_models/defaults.py @@ -44,6 +44,10 @@ def instance_connect_timeout(field, value): return get_default_field_value(field, value) +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/harbor/datadog_checks/harbor/config_models/instance.py b/harbor/datadog_checks/harbor/config_models/instance.py index ce2f371875f1a..b8bad0635d42f 100644 --- a/harbor/datadog_checks/harbor/config_models/instance.py +++ b/harbor/datadog_checks/harbor/config_models/instance.py @@ -40,6 +40,7 @@ class Config: aws_region: Optional[str] aws_service: Optional[str] connect_timeout: Optional[float] + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] extra_headers: Optional[Mapping[str, Any]] headers: Optional[Mapping[str, Any]] diff --git a/http_check/datadog_checks/http_check/config_models/defaults.py b/http_check/datadog_checks/http_check/config_models/defaults.py index 729f8dfa63b8a..fdc5a2bf47d2d 100644 --- a/http_check/datadog_checks/http_check/config_models/defaults.py +++ b/http_check/datadog_checks/http_check/config_models/defaults.py @@ -76,6 +76,10 @@ def instance_days_warning(field, value): return get_default_field_value(field, value) +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/http_check/datadog_checks/http_check/config_models/instance.py b/http_check/datadog_checks/http_check/config_models/instance.py index 1b72658050ff8..699bf05d575ba 100644 --- a/http_check/datadog_checks/http_check/config_models/instance.py +++ b/http_check/datadog_checks/http_check/config_models/instance.py @@ -48,6 +48,7 @@ class Config: data: Optional[Union[Mapping[str, Any], str]] days_critical: Optional[int] days_warning: Optional[int] + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] extra_headers: Optional[Mapping[str, Any]] headers: Optional[Mapping[str, Any]] diff --git a/ibm_mq/datadog_checks/ibm_mq/config_models/defaults.py b/ibm_mq/datadog_checks/ibm_mq/config_models/defaults.py index a4394fc591fea..7237297185fce 100644 --- a/ibm_mq/datadog_checks/ibm_mq/config_models/defaults.py +++ b/ibm_mq/datadog_checks/ibm_mq/config_models/defaults.py @@ -32,6 +32,10 @@ def instance_convert_endianness(field, value): return False +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/ibm_mq/datadog_checks/ibm_mq/config_models/instance.py b/ibm_mq/datadog_checks/ibm_mq/config_models/instance.py index d7a3d0b46ac64..ca0a58fba5ce7 100644 --- a/ibm_mq/datadog_checks/ibm_mq/config_models/instance.py +++ b/ibm_mq/datadog_checks/ibm_mq/config_models/instance.py @@ -24,6 +24,7 @@ class Config: collect_statistics_metrics: Optional[bool] connection_name: Optional[str] convert_endianness: Optional[bool] + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] host: Optional[str] min_collection_interval: Optional[float] diff --git a/istio/datadog_checks/istio/config_models/defaults.py b/istio/datadog_checks/istio/config_models/defaults.py index 99098ae6e2d37..d390ce3bf5f92 100644 --- a/istio/datadog_checks/istio/config_models/defaults.py +++ b/istio/datadog_checks/istio/config_models/defaults.py @@ -56,6 +56,10 @@ def instance_connect_timeout(field, value): return get_default_field_value(field, value) +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/istio/datadog_checks/istio/config_models/instance.py b/istio/datadog_checks/istio/config_models/instance.py index 88f7a758c61fd..1e415017891f3 100644 --- a/istio/datadog_checks/istio/config_models/instance.py +++ b/istio/datadog_checks/istio/config_models/instance.py @@ -66,6 +66,7 @@ class Config: bearer_token_path: Optional[str] citadel_endpoint: Optional[str] connect_timeout: Optional[float] + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] exclude_labels: Optional[Sequence[str]] extra_headers: Optional[Mapping[str, Any]] diff --git a/kafka/datadog_checks/kafka/config_models/defaults.py b/kafka/datadog_checks/kafka/config_models/defaults.py index 2fa99a6c3c270..645f060fafee5 100644 --- a/kafka/datadog_checks/kafka/config_models/defaults.py +++ b/kafka/datadog_checks/kafka/config_models/defaults.py @@ -28,6 +28,10 @@ def instance_collect_default_jvm_metrics(field, value): return True +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/kafka/datadog_checks/kafka/config_models/instance.py b/kafka/datadog_checks/kafka/config_models/instance.py index cf47e9f1b401b..34c04039bc8af 100644 --- a/kafka/datadog_checks/kafka/config_models/instance.py +++ b/kafka/datadog_checks/kafka/config_models/instance.py @@ -18,6 +18,7 @@ class Config: allow_mutation = False collect_default_jvm_metrics: Optional[bool] + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] host: str is_jmx: Optional[bool] diff --git a/kafka_consumer/datadog_checks/kafka_consumer/config_models/defaults.py b/kafka_consumer/datadog_checks/kafka_consumer/config_models/defaults.py index 41cfa9ca97e78..9bdb38ba5ad47 100644 --- a/kafka_consumer/datadog_checks/kafka_consumer/config_models/defaults.py +++ b/kafka_consumer/datadog_checks/kafka_consumer/config_models/defaults.py @@ -24,6 +24,10 @@ def instance_consumer_groups(field, value): return get_default_field_value(field, value) +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/kafka_consumer/datadog_checks/kafka_consumer/config_models/instance.py b/kafka_consumer/datadog_checks/kafka_consumer/config_models/instance.py index 4b1047a8d23be..9d56fd50dcd71 100644 --- a/kafka_consumer/datadog_checks/kafka_consumer/config_models/instance.py +++ b/kafka_consumer/datadog_checks/kafka_consumer/config_models/instance.py @@ -19,6 +19,7 @@ class Config: broker_requests_batch_size: Optional[int] consumer_groups: Optional[Mapping[str, Any]] + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] kafka_client_api_version: Optional[str] kafka_connect_str: Union[str, Sequence[str]] diff --git a/mapr/datadog_checks/mapr/config_models/defaults.py b/mapr/datadog_checks/mapr/config_models/defaults.py index bf6168b534dfa..ec331af76fe9d 100644 --- a/mapr/datadog_checks/mapr/config_models/defaults.py +++ b/mapr/datadog_checks/mapr/config_models/defaults.py @@ -8,6 +8,10 @@ def shared_service(field, value): return get_default_field_value(field, value) +def instance_disable_generic_tags(field, value): + return False + + def instance_disable_legacy_cluster_tag(field, value): return False diff --git a/mapr/datadog_checks/mapr/config_models/instance.py b/mapr/datadog_checks/mapr/config_models/instance.py index 4863264bdebc1..3d6d51f32e79c 100644 --- a/mapr/datadog_checks/mapr/config_models/instance.py +++ b/mapr/datadog_checks/mapr/config_models/instance.py @@ -17,6 +17,7 @@ class InstanceConfig(BaseModel): class Config: allow_mutation = False + disable_generic_tags: Optional[bool] disable_legacy_cluster_tag: Optional[bool] empty_default_hostname: Optional[bool] hostname: Optional[str] diff --git a/mcache/datadog_checks/mcache/config_models/defaults.py b/mcache/datadog_checks/mcache/config_models/defaults.py index 023caa8aa1242..ed9b3a20f823b 100644 --- a/mcache/datadog_checks/mcache/config_models/defaults.py +++ b/mcache/datadog_checks/mcache/config_models/defaults.py @@ -8,6 +8,10 @@ def shared_service(field, value): return get_default_field_value(field, value) +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/mcache/datadog_checks/mcache/config_models/instance.py b/mcache/datadog_checks/mcache/config_models/instance.py index 923905266fee3..542f3e2672ebe 100644 --- a/mcache/datadog_checks/mcache/config_models/instance.py +++ b/mcache/datadog_checks/mcache/config_models/instance.py @@ -17,6 +17,7 @@ class InstanceConfig(BaseModel): class Config: allow_mutation = False + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] min_collection_interval: Optional[float] options: Optional[Mapping[str, Any]] diff --git a/mesos_master/datadog_checks/mesos_master/config_models/defaults.py b/mesos_master/datadog_checks/mesos_master/config_models/defaults.py index dc62768e6ebb1..58c0caa9012ea 100644 --- a/mesos_master/datadog_checks/mesos_master/config_models/defaults.py +++ b/mesos_master/datadog_checks/mesos_master/config_models/defaults.py @@ -44,6 +44,10 @@ def instance_connect_timeout(field, value): return get_default_field_value(field, value) +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/mesos_master/datadog_checks/mesos_master/config_models/instance.py b/mesos_master/datadog_checks/mesos_master/config_models/instance.py index 10aa032649504..c92f3009a8408 100644 --- a/mesos_master/datadog_checks/mesos_master/config_models/instance.py +++ b/mesos_master/datadog_checks/mesos_master/config_models/instance.py @@ -40,6 +40,7 @@ class Config: aws_region: Optional[str] aws_service: Optional[str] connect_timeout: Optional[float] + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] extra_headers: Optional[Mapping[str, Any]] headers: Optional[Mapping[str, Any]] diff --git a/mesos_slave/datadog_checks/mesos_slave/config_models/defaults.py b/mesos_slave/datadog_checks/mesos_slave/config_models/defaults.py index b9ade9e4a6bb7..a96c16058fd3c 100644 --- a/mesos_slave/datadog_checks/mesos_slave/config_models/defaults.py +++ b/mesos_slave/datadog_checks/mesos_slave/config_models/defaults.py @@ -48,6 +48,10 @@ def instance_connect_timeout(field, value): return get_default_field_value(field, value) +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/mesos_slave/datadog_checks/mesos_slave/config_models/instance.py b/mesos_slave/datadog_checks/mesos_slave/config_models/instance.py index 2bff7b15289f3..41b7545b376d9 100644 --- a/mesos_slave/datadog_checks/mesos_slave/config_models/instance.py +++ b/mesos_slave/datadog_checks/mesos_slave/config_models/instance.py @@ -41,6 +41,7 @@ class Config: aws_service: Optional[str] cluster_name: Optional[str] connect_timeout: Optional[float] + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] extra_headers: Optional[Mapping[str, Any]] headers: Optional[Mapping[str, Any]] diff --git a/mongo/datadog_checks/mongo/config_models/defaults.py b/mongo/datadog_checks/mongo/config_models/defaults.py index 84d211764aaa8..33928e0cd6507 100644 --- a/mongo/datadog_checks/mongo/config_models/defaults.py +++ b/mongo/datadog_checks/mongo/config_models/defaults.py @@ -28,6 +28,10 @@ def instance_database(field, value): return get_default_field_value(field, value) +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/mongo/datadog_checks/mongo/config_models/instance.py b/mongo/datadog_checks/mongo/config_models/instance.py index 57f21fb742050..3172427d7faf5 100644 --- a/mongo/datadog_checks/mongo/config_models/instance.py +++ b/mongo/datadog_checks/mongo/config_models/instance.py @@ -42,6 +42,7 @@ class Config: collections_indexes_stats: Optional[bool] custom_queries: Optional[Sequence[CustomQuery]] database: Optional[str] + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] hosts: Optional[Sequence[str]] min_collection_interval: Optional[float] diff --git a/mysql/datadog_checks/mysql/config_models/defaults.py b/mysql/datadog_checks/mysql/config_models/defaults.py index 9a6d9f0239ffe..aee4270cd3d11 100644 --- a/mysql/datadog_checks/mysql/config_models/defaults.py +++ b/mysql/datadog_checks/mysql/config_models/defaults.py @@ -32,6 +32,10 @@ def instance_defaults_file(field, value): return get_default_field_value(field, value) +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/mysql/datadog_checks/mysql/config_models/instance.py b/mysql/datadog_checks/mysql/config_models/instance.py index f08506aaebe24..8f6fd389b348c 100644 --- a/mysql/datadog_checks/mysql/config_models/instance.py +++ b/mysql/datadog_checks/mysql/config_models/instance.py @@ -90,6 +90,7 @@ class Config: custom_queries: Optional[Sequence[CustomQuery]] dbm: Optional[bool] defaults_file: Optional[str] + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] host: Optional[str] max_custom_queries: Optional[int] diff --git a/nagios/datadog_checks/nagios/config_models/defaults.py b/nagios/datadog_checks/nagios/config_models/defaults.py index 960a9b50699cf..09163cfc1ad91 100644 --- a/nagios/datadog_checks/nagios/config_models/defaults.py +++ b/nagios/datadog_checks/nagios/config_models/defaults.py @@ -20,6 +20,10 @@ def instance_collect_service_performance_data(field, value): return False +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/nagios/datadog_checks/nagios/config_models/instance.py b/nagios/datadog_checks/nagios/config_models/instance.py index 14df1af025ad2..98b3950f51ddf 100644 --- a/nagios/datadog_checks/nagios/config_models/instance.py +++ b/nagios/datadog_checks/nagios/config_models/instance.py @@ -20,6 +20,7 @@ class Config: collect_events: Optional[bool] collect_host_performance_data: Optional[bool] collect_service_performance_data: Optional[bool] + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] min_collection_interval: Optional[float] nagios_conf: str diff --git a/network/datadog_checks/network/config_models/defaults.py b/network/datadog_checks/network/config_models/defaults.py index 89efa4b1b7805..c01631d411987 100644 --- a/network/datadog_checks/network/config_models/defaults.py +++ b/network/datadog_checks/network/config_models/defaults.py @@ -40,6 +40,10 @@ def instance_conntrack_path(field, value): return get_default_field_value(field, value) +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/network/datadog_checks/network/config_models/instance.py b/network/datadog_checks/network/config_models/instance.py index d27e586e234f7..2d0c5ea24ab34 100644 --- a/network/datadog_checks/network/config_models/instance.py +++ b/network/datadog_checks/network/config_models/instance.py @@ -25,6 +25,7 @@ class Config: collect_rate_metrics: Optional[bool] combine_connection_states: Optional[bool] conntrack_path: Optional[str] + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] excluded_interface_re: Optional[str] excluded_interfaces: Optional[Sequence[str]] diff --git a/nfsstat/datadog_checks/nfsstat/config_models/defaults.py b/nfsstat/datadog_checks/nfsstat/config_models/defaults.py index 65bdab6bb35d5..3b1ab845b3888 100644 --- a/nfsstat/datadog_checks/nfsstat/config_models/defaults.py +++ b/nfsstat/datadog_checks/nfsstat/config_models/defaults.py @@ -16,6 +16,10 @@ def shared_service(field, value): return get_default_field_value(field, value) +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/nfsstat/datadog_checks/nfsstat/config_models/instance.py b/nfsstat/datadog_checks/nfsstat/config_models/instance.py index 0670ee1646bdb..8f2d4f9604de0 100644 --- a/nfsstat/datadog_checks/nfsstat/config_models/instance.py +++ b/nfsstat/datadog_checks/nfsstat/config_models/instance.py @@ -17,6 +17,7 @@ class InstanceConfig(BaseModel): class Config: allow_mutation = False + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] min_collection_interval: Optional[float] service: Optional[str] diff --git a/nginx/datadog_checks/nginx/config_models/defaults.py b/nginx/datadog_checks/nginx/config_models/defaults.py index c23ddbc893ec1..2672ba9759823 100644 --- a/nginx/datadog_checks/nginx/config_models/defaults.py +++ b/nginx/datadog_checks/nginx/config_models/defaults.py @@ -44,6 +44,10 @@ def instance_connect_timeout(field, value): return get_default_field_value(field, value) +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/nginx/datadog_checks/nginx/config_models/instance.py b/nginx/datadog_checks/nginx/config_models/instance.py index 346ac762ee15b..2c19910c3d03c 100644 --- a/nginx/datadog_checks/nginx/config_models/instance.py +++ b/nginx/datadog_checks/nginx/config_models/instance.py @@ -40,6 +40,7 @@ class Config: aws_region: Optional[str] aws_service: Optional[str] connect_timeout: Optional[float] + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] extra_headers: Optional[Mapping[str, Any]] headers: Optional[Mapping[str, Any]] diff --git a/nginx_ingress_controller/datadog_checks/nginx_ingress_controller/config_models/defaults.py b/nginx_ingress_controller/datadog_checks/nginx_ingress_controller/config_models/defaults.py index e7ae6c0db367a..1cf23a63c886c 100644 --- a/nginx_ingress_controller/datadog_checks/nginx_ingress_controller/config_models/defaults.py +++ b/nginx_ingress_controller/datadog_checks/nginx_ingress_controller/config_models/defaults.py @@ -56,6 +56,10 @@ def instance_connect_timeout(field, value): return get_default_field_value(field, value) +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/nginx_ingress_controller/datadog_checks/nginx_ingress_controller/config_models/instance.py b/nginx_ingress_controller/datadog_checks/nginx_ingress_controller/config_models/instance.py index bfcb7a1cc220c..8d8c0360cba5c 100644 --- a/nginx_ingress_controller/datadog_checks/nginx_ingress_controller/config_models/instance.py +++ b/nginx_ingress_controller/datadog_checks/nginx_ingress_controller/config_models/instance.py @@ -66,6 +66,7 @@ class Config: bearer_token_path: Optional[str] collect_nginx_histograms: Optional[bool] connect_timeout: Optional[float] + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] exclude_labels: Optional[Sequence[str]] extra_headers: Optional[Mapping[str, Any]] diff --git a/openldap/datadog_checks/openldap/config_models/defaults.py b/openldap/datadog_checks/openldap/config_models/defaults.py index c85b5ea21494e..33a2945d0ae62 100644 --- a/openldap/datadog_checks/openldap/config_models/defaults.py +++ b/openldap/datadog_checks/openldap/config_models/defaults.py @@ -12,6 +12,10 @@ def instance_custom_queries(field, value): return get_default_field_value(field, value) +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/openldap/datadog_checks/openldap/config_models/instance.py b/openldap/datadog_checks/openldap/config_models/instance.py index 9f96746fd8a2a..6bc1cedb9382f 100644 --- a/openldap/datadog_checks/openldap/config_models/instance.py +++ b/openldap/datadog_checks/openldap/config_models/instance.py @@ -18,6 +18,7 @@ class Config: allow_mutation = False custom_queries: Optional[Sequence[Mapping[str, Any]]] + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] min_collection_interval: Optional[float] password: Optional[str] diff --git a/oracle/datadog_checks/oracle/config_models/defaults.py b/oracle/datadog_checks/oracle/config_models/defaults.py index d02fd1c3df81b..f9b5e37fbb7ed 100644 --- a/oracle/datadog_checks/oracle/config_models/defaults.py +++ b/oracle/datadog_checks/oracle/config_models/defaults.py @@ -16,6 +16,10 @@ def instance_custom_queries(field, value): return get_default_field_value(field, value) +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/oracle/datadog_checks/oracle/config_models/instance.py b/oracle/datadog_checks/oracle/config_models/instance.py index b71637d16ef7e..3e46d7f124830 100644 --- a/oracle/datadog_checks/oracle/config_models/instance.py +++ b/oracle/datadog_checks/oracle/config_models/instance.py @@ -27,6 +27,7 @@ class Config: allow_mutation = False custom_queries: Optional[Sequence[CustomQuery]] + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] jdbc_driver_path: Optional[str] min_collection_interval: Optional[float] diff --git a/postfix/datadog_checks/postfix/config_models/defaults.py b/postfix/datadog_checks/postfix/config_models/defaults.py index 6212e2bd62f61..8ab526f005fc2 100644 --- a/postfix/datadog_checks/postfix/config_models/defaults.py +++ b/postfix/datadog_checks/postfix/config_models/defaults.py @@ -20,6 +20,10 @@ def instance_config_directory(field, value): return '/etc/postfix' +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/postfix/datadog_checks/postfix/config_models/instance.py b/postfix/datadog_checks/postfix/config_models/instance.py index 88a7d6fec517a..809b914623b56 100644 --- a/postfix/datadog_checks/postfix/config_models/instance.py +++ b/postfix/datadog_checks/postfix/config_models/instance.py @@ -19,6 +19,7 @@ class Config: config_directory: Optional[str] directory: str + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] min_collection_interval: Optional[float] queues: Sequence[str] diff --git a/postgres/datadog_checks/postgres/config_models/defaults.py b/postgres/datadog_checks/postgres/config_models/defaults.py index 63a37caf9bb1b..a8a4313064f95 100644 --- a/postgres/datadog_checks/postgres/config_models/defaults.py +++ b/postgres/datadog_checks/postgres/config_models/defaults.py @@ -56,6 +56,10 @@ def instance_dbstrict(field, value): return False +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/postgres/datadog_checks/postgres/config_models/instance.py b/postgres/datadog_checks/postgres/config_models/instance.py index 649250b015ddb..5f2edf351e1a5 100644 --- a/postgres/datadog_checks/postgres/config_models/instance.py +++ b/postgres/datadog_checks/postgres/config_models/instance.py @@ -68,6 +68,7 @@ class Config: dbm: Optional[bool] dbname: Optional[str] dbstrict: Optional[bool] + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] host: str ignore_databases: Optional[Sequence[str]] diff --git a/powerdns_recursor/datadog_checks/powerdns_recursor/config_models/defaults.py b/powerdns_recursor/datadog_checks/powerdns_recursor/config_models/defaults.py index a8d21466178f8..9736a57d4456b 100644 --- a/powerdns_recursor/datadog_checks/powerdns_recursor/config_models/defaults.py +++ b/powerdns_recursor/datadog_checks/powerdns_recursor/config_models/defaults.py @@ -44,6 +44,10 @@ def instance_connect_timeout(field, value): return get_default_field_value(field, value) +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/powerdns_recursor/datadog_checks/powerdns_recursor/config_models/instance.py b/powerdns_recursor/datadog_checks/powerdns_recursor/config_models/instance.py index 6b5d4e9085090..07ddbbb02ba5a 100644 --- a/powerdns_recursor/datadog_checks/powerdns_recursor/config_models/instance.py +++ b/powerdns_recursor/datadog_checks/powerdns_recursor/config_models/instance.py @@ -41,6 +41,7 @@ class Config: aws_region: Optional[str] aws_service: Optional[str] connect_timeout: Optional[float] + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] extra_headers: Optional[Mapping[str, Any]] headers: Optional[Mapping[str, Any]] diff --git a/process/datadog_checks/process/config_models/defaults.py b/process/datadog_checks/process/config_models/defaults.py index e7e0fdc3628ae..baabfd0bf5821 100644 --- a/process/datadog_checks/process/config_models/defaults.py +++ b/process/datadog_checks/process/config_models/defaults.py @@ -28,6 +28,10 @@ def instance_collect_children(field, value): return False +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/process/datadog_checks/process/config_models/instance.py b/process/datadog_checks/process/config_models/instance.py index 81679d240754e..0bc7ecbf8e5b4 100644 --- a/process/datadog_checks/process/config_models/instance.py +++ b/process/datadog_checks/process/config_models/instance.py @@ -18,6 +18,7 @@ class Config: allow_mutation = False collect_children: Optional[bool] + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] exact_match: Optional[bool] ignore_denied_access: Optional[bool] diff --git a/proxysql/datadog_checks/proxysql/config_models/defaults.py b/proxysql/datadog_checks/proxysql/config_models/defaults.py index 84f5e5780a067..6c974cfe26ece 100644 --- a/proxysql/datadog_checks/proxysql/config_models/defaults.py +++ b/proxysql/datadog_checks/proxysql/config_models/defaults.py @@ -16,6 +16,10 @@ def instance_connect_timeout(field, value): return 10 +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/proxysql/datadog_checks/proxysql/config_models/instance.py b/proxysql/datadog_checks/proxysql/config_models/instance.py index dd9b92053aea8..80cbd636dc01f 100644 --- a/proxysql/datadog_checks/proxysql/config_models/instance.py +++ b/proxysql/datadog_checks/proxysql/config_models/instance.py @@ -19,6 +19,7 @@ class Config: additional_metrics: Optional[Sequence[str]] connect_timeout: Optional[int] + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] host: str min_collection_interval: Optional[float] diff --git a/rabbitmq/datadog_checks/rabbitmq/config_models/defaults.py b/rabbitmq/datadog_checks/rabbitmq/config_models/defaults.py index 8d927922fe1a2..7d09c1d4303b0 100644 --- a/rabbitmq/datadog_checks/rabbitmq/config_models/defaults.py +++ b/rabbitmq/datadog_checks/rabbitmq/config_models/defaults.py @@ -48,6 +48,10 @@ def instance_connect_timeout(field, value): return get_default_field_value(field, value) +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/rabbitmq/datadog_checks/rabbitmq/config_models/instance.py b/rabbitmq/datadog_checks/rabbitmq/config_models/instance.py index fbcec3bbddaed..78dc1e6a0fd59 100644 --- a/rabbitmq/datadog_checks/rabbitmq/config_models/instance.py +++ b/rabbitmq/datadog_checks/rabbitmq/config_models/instance.py @@ -41,6 +41,7 @@ class Config: aws_service: Optional[str] collect_node_metrics: Optional[bool] connect_timeout: Optional[float] + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] exchanges: Optional[Sequence[str]] exchanges_regexes: Optional[Sequence[str]] diff --git a/redisdb/datadog_checks/redisdb/config_models/defaults.py b/redisdb/datadog_checks/redisdb/config_models/defaults.py index 32ef6fb07557c..0731249223e5e 100644 --- a/redisdb/datadog_checks/redisdb/config_models/defaults.py +++ b/redisdb/datadog_checks/redisdb/config_models/defaults.py @@ -24,6 +24,10 @@ def instance_disable_connection_cache(field, value): return False +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/redisdb/datadog_checks/redisdb/config_models/instance.py b/redisdb/datadog_checks/redisdb/config_models/instance.py index c813f231978a0..7cee954cf71a8 100644 --- a/redisdb/datadog_checks/redisdb/config_models/instance.py +++ b/redisdb/datadog_checks/redisdb/config_models/instance.py @@ -21,6 +21,7 @@ class Config: command_stats: Optional[bool] db: Optional[int] disable_connection_cache: Optional[bool] + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] host: str keys: Optional[Sequence[str]] diff --git a/riak/datadog_checks/riak/config_models/defaults.py b/riak/datadog_checks/riak/config_models/defaults.py index dc62768e6ebb1..58c0caa9012ea 100644 --- a/riak/datadog_checks/riak/config_models/defaults.py +++ b/riak/datadog_checks/riak/config_models/defaults.py @@ -44,6 +44,10 @@ def instance_connect_timeout(field, value): return get_default_field_value(field, value) +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/riak/datadog_checks/riak/config_models/instance.py b/riak/datadog_checks/riak/config_models/instance.py index 10aa032649504..c92f3009a8408 100644 --- a/riak/datadog_checks/riak/config_models/instance.py +++ b/riak/datadog_checks/riak/config_models/instance.py @@ -40,6 +40,7 @@ class Config: aws_region: Optional[str] aws_service: Optional[str] connect_timeout: Optional[float] + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] extra_headers: Optional[Mapping[str, Any]] headers: Optional[Mapping[str, Any]] diff --git a/riakcs/datadog_checks/riakcs/config_models/defaults.py b/riakcs/datadog_checks/riakcs/config_models/defaults.py index f5963853417ef..17cf820e507c1 100644 --- a/riakcs/datadog_checks/riakcs/config_models/defaults.py +++ b/riakcs/datadog_checks/riakcs/config_models/defaults.py @@ -16,6 +16,10 @@ def instance_access_secret(field, value): return get_default_field_value(field, value) +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/riakcs/datadog_checks/riakcs/config_models/instance.py b/riakcs/datadog_checks/riakcs/config_models/instance.py index 19c7aab62ad80..c244f698afc75 100644 --- a/riakcs/datadog_checks/riakcs/config_models/instance.py +++ b/riakcs/datadog_checks/riakcs/config_models/instance.py @@ -19,6 +19,7 @@ class Config: access_id: Optional[str] access_secret: Optional[str] + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] host: Optional[str] is_secure: Optional[bool] diff --git a/sap_hana/datadog_checks/sap_hana/config_models/defaults.py b/sap_hana/datadog_checks/sap_hana/config_models/defaults.py index 36d24264f8f71..c1f332f72b398 100644 --- a/sap_hana/datadog_checks/sap_hana/config_models/defaults.py +++ b/sap_hana/datadog_checks/sap_hana/config_models/defaults.py @@ -20,6 +20,10 @@ def instance_custom_queries(field, value): return get_default_field_value(field, value) +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/sap_hana/datadog_checks/sap_hana/config_models/instance.py b/sap_hana/datadog_checks/sap_hana/config_models/instance.py index 6ef4da42c4d77..476cd9c69fc9f 100644 --- a/sap_hana/datadog_checks/sap_hana/config_models/instance.py +++ b/sap_hana/datadog_checks/sap_hana/config_models/instance.py @@ -28,6 +28,7 @@ class Config: batch_size: Optional[int] custom_queries: Optional[Sequence[CustomQuery]] + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] min_collection_interval: Optional[float] password: str diff --git a/sonarqube/datadog_checks/sonarqube/config_models/defaults.py b/sonarqube/datadog_checks/sonarqube/config_models/defaults.py index 2080ec59edac7..40c5fa2975c54 100644 --- a/sonarqube/datadog_checks/sonarqube/config_models/defaults.py +++ b/sonarqube/datadog_checks/sonarqube/config_models/defaults.py @@ -84,6 +84,10 @@ def instance_default_tag(field, value): return 'component' +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/sonarqube/datadog_checks/sonarqube/config_models/instance.py b/sonarqube/datadog_checks/sonarqube/config_models/instance.py index 6af5115572720..e5c68855979c5 100644 --- a/sonarqube/datadog_checks/sonarqube/config_models/instance.py +++ b/sonarqube/datadog_checks/sonarqube/config_models/instance.py @@ -54,6 +54,7 @@ class Config: default_exclude: Optional[Sequence[str]] default_include: Optional[Sequence[str]] default_tag: Optional[str] + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] extra_headers: Optional[Mapping[str, Any]] headers: Optional[Mapping[str, Any]] diff --git a/spark/datadog_checks/spark/config_models/defaults.py b/spark/datadog_checks/spark/config_models/defaults.py index 467655c69f899..dcc091dcde465 100644 --- a/spark/datadog_checks/spark/config_models/defaults.py +++ b/spark/datadog_checks/spark/config_models/defaults.py @@ -44,6 +44,10 @@ def instance_connect_timeout(field, value): return get_default_field_value(field, value) +def instance_disable_generic_tags(field, value): + return False + + def instance_disable_legacy_cluster_tag(field, value): return False diff --git a/spark/datadog_checks/spark/config_models/instance.py b/spark/datadog_checks/spark/config_models/instance.py index 68e2899e176b4..947af9be1079c 100644 --- a/spark/datadog_checks/spark/config_models/instance.py +++ b/spark/datadog_checks/spark/config_models/instance.py @@ -41,6 +41,7 @@ class Config: aws_service: Optional[str] cluster_name: str connect_timeout: Optional[float] + disable_generic_tags: Optional[bool] disable_legacy_cluster_tag: Optional[bool] empty_default_hostname: Optional[bool] executor_level_metrics: Optional[bool] diff --git a/sqlserver/datadog_checks/sqlserver/config_models/defaults.py b/sqlserver/datadog_checks/sqlserver/config_models/defaults.py index ce07e0defc779..a710c266e9d04 100644 --- a/sqlserver/datadog_checks/sqlserver/config_models/defaults.py +++ b/sqlserver/datadog_checks/sqlserver/config_models/defaults.py @@ -68,6 +68,10 @@ def instance_db_fragmentation_object_names(field, value): return get_default_field_value(field, value) +def instance_disable_generic_tags(field, value): + return False + + def instance_driver(field, value): return 'SQL Server' diff --git a/sqlserver/datadog_checks/sqlserver/config_models/instance.py b/sqlserver/datadog_checks/sqlserver/config_models/instance.py index d15371499d61b..5ee02a10061b6 100644 --- a/sqlserver/datadog_checks/sqlserver/config_models/instance.py +++ b/sqlserver/datadog_checks/sqlserver/config_models/instance.py @@ -39,6 +39,7 @@ class Config: database_autodiscovery: Optional[bool] database_autodiscovery_interval: Optional[int] db_fragmentation_object_names: Optional[Sequence[str]] + disable_generic_tags: Optional[bool] driver: Optional[str] dsn: Optional[str] empty_default_hostname: Optional[bool] diff --git a/squid/datadog_checks/squid/config_models/defaults.py b/squid/datadog_checks/squid/config_models/defaults.py index 2f955f6370891..57dbaa39ff0fa 100644 --- a/squid/datadog_checks/squid/config_models/defaults.py +++ b/squid/datadog_checks/squid/config_models/defaults.py @@ -44,6 +44,10 @@ def instance_connect_timeout(field, value): return get_default_field_value(field, value) +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/squid/datadog_checks/squid/config_models/instance.py b/squid/datadog_checks/squid/config_models/instance.py index b08b0b0e50f75..1b810c766d172 100644 --- a/squid/datadog_checks/squid/config_models/instance.py +++ b/squid/datadog_checks/squid/config_models/instance.py @@ -40,6 +40,7 @@ class Config: aws_region: Optional[str] aws_service: Optional[str] connect_timeout: Optional[float] + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] extra_headers: Optional[Mapping[str, Any]] headers: Optional[Mapping[str, Any]] diff --git a/ssh_check/datadog_checks/ssh_check/config_models/defaults.py b/ssh_check/datadog_checks/ssh_check/config_models/defaults.py index 226cc1c45e245..9f6a08042cf9d 100644 --- a/ssh_check/datadog_checks/ssh_check/config_models/defaults.py +++ b/ssh_check/datadog_checks/ssh_check/config_models/defaults.py @@ -12,6 +12,10 @@ def instance_add_missing_keys(field, value): return False +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/ssh_check/datadog_checks/ssh_check/config_models/instance.py b/ssh_check/datadog_checks/ssh_check/config_models/instance.py index 6732ae04e669a..4236f03575281 100644 --- a/ssh_check/datadog_checks/ssh_check/config_models/instance.py +++ b/ssh_check/datadog_checks/ssh_check/config_models/instance.py @@ -18,6 +18,7 @@ class Config: allow_mutation = False add_missing_keys: Optional[bool] + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] host: str min_collection_interval: Optional[float] diff --git a/statsd/datadog_checks/statsd/config_models/defaults.py b/statsd/datadog_checks/statsd/config_models/defaults.py index ec0447b8fc232..86e28fb4d9760 100644 --- a/statsd/datadog_checks/statsd/config_models/defaults.py +++ b/statsd/datadog_checks/statsd/config_models/defaults.py @@ -8,6 +8,10 @@ def shared_service(field, value): return get_default_field_value(field, value) +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/statsd/datadog_checks/statsd/config_models/instance.py b/statsd/datadog_checks/statsd/config_models/instance.py index d09d27b55606d..d1c2ae414c4fd 100644 --- a/statsd/datadog_checks/statsd/config_models/instance.py +++ b/statsd/datadog_checks/statsd/config_models/instance.py @@ -17,6 +17,7 @@ class InstanceConfig(BaseModel): class Config: allow_mutation = False + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] host: Optional[str] min_collection_interval: Optional[float] diff --git a/supervisord/datadog_checks/supervisord/config_models/defaults.py b/supervisord/datadog_checks/supervisord/config_models/defaults.py index 2b4a75bf8f6d6..acd13c3adb94e 100644 --- a/supervisord/datadog_checks/supervisord/config_models/defaults.py +++ b/supervisord/datadog_checks/supervisord/config_models/defaults.py @@ -8,6 +8,10 @@ def shared_service(field, value): return get_default_field_value(field, value) +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/supervisord/datadog_checks/supervisord/config_models/instance.py b/supervisord/datadog_checks/supervisord/config_models/instance.py index 71b579bda040f..5900d990332ea 100644 --- a/supervisord/datadog_checks/supervisord/config_models/instance.py +++ b/supervisord/datadog_checks/supervisord/config_models/instance.py @@ -17,6 +17,7 @@ class InstanceConfig(BaseModel): class Config: allow_mutation = False + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] host: Optional[str] min_collection_interval: Optional[float] diff --git a/system_core/datadog_checks/system_core/config_models/defaults.py b/system_core/datadog_checks/system_core/config_models/defaults.py index 958076edbe969..d384a603f06d6 100644 --- a/system_core/datadog_checks/system_core/config_models/defaults.py +++ b/system_core/datadog_checks/system_core/config_models/defaults.py @@ -8,6 +8,10 @@ def shared_service(field, value): return get_default_field_value(field, value) +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/system_core/datadog_checks/system_core/config_models/instance.py b/system_core/datadog_checks/system_core/config_models/instance.py index 0670ee1646bdb..8f2d4f9604de0 100644 --- a/system_core/datadog_checks/system_core/config_models/instance.py +++ b/system_core/datadog_checks/system_core/config_models/instance.py @@ -17,6 +17,7 @@ class InstanceConfig(BaseModel): class Config: allow_mutation = False + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] min_collection_interval: Optional[float] service: Optional[str] diff --git a/system_swap/datadog_checks/system_swap/config_models/defaults.py b/system_swap/datadog_checks/system_swap/config_models/defaults.py index 958076edbe969..d384a603f06d6 100644 --- a/system_swap/datadog_checks/system_swap/config_models/defaults.py +++ b/system_swap/datadog_checks/system_swap/config_models/defaults.py @@ -8,6 +8,10 @@ def shared_service(field, value): return get_default_field_value(field, value) +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/system_swap/datadog_checks/system_swap/config_models/instance.py b/system_swap/datadog_checks/system_swap/config_models/instance.py index 0670ee1646bdb..8f2d4f9604de0 100644 --- a/system_swap/datadog_checks/system_swap/config_models/instance.py +++ b/system_swap/datadog_checks/system_swap/config_models/instance.py @@ -17,6 +17,7 @@ class InstanceConfig(BaseModel): class Config: allow_mutation = False + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] min_collection_interval: Optional[float] service: Optional[str] diff --git a/tcp_check/datadog_checks/tcp_check/config_models/defaults.py b/tcp_check/datadog_checks/tcp_check/config_models/defaults.py index 4d7000a7b3b49..cde61906f0ecc 100644 --- a/tcp_check/datadog_checks/tcp_check/config_models/defaults.py +++ b/tcp_check/datadog_checks/tcp_check/config_models/defaults.py @@ -12,6 +12,10 @@ def instance_collect_response_time(field, value): return False +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/tcp_check/datadog_checks/tcp_check/config_models/instance.py b/tcp_check/datadog_checks/tcp_check/config_models/instance.py index 5ef8e72d3358f..b5cb2db383f77 100644 --- a/tcp_check/datadog_checks/tcp_check/config_models/instance.py +++ b/tcp_check/datadog_checks/tcp_check/config_models/instance.py @@ -18,6 +18,7 @@ class Config: allow_mutation = False collect_response_time: Optional[bool] + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] host: str ip_cache_duration: Optional[float] diff --git a/teamcity/datadog_checks/teamcity/config_models/defaults.py b/teamcity/datadog_checks/teamcity/config_models/defaults.py index f4348c2fcdcaa..b7339720e76e2 100644 --- a/teamcity/datadog_checks/teamcity/config_models/defaults.py +++ b/teamcity/datadog_checks/teamcity/config_models/defaults.py @@ -48,6 +48,10 @@ def instance_connect_timeout(field, value): return get_default_field_value(field, value) +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/teamcity/datadog_checks/teamcity/config_models/instance.py b/teamcity/datadog_checks/teamcity/config_models/instance.py index 58017a9e0e6e9..2a65edce41867 100644 --- a/teamcity/datadog_checks/teamcity/config_models/instance.py +++ b/teamcity/datadog_checks/teamcity/config_models/instance.py @@ -42,6 +42,7 @@ class Config: basic_http_authentication: Optional[bool] build_configuration: str connect_timeout: Optional[float] + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] extra_headers: Optional[Mapping[str, Any]] headers: Optional[Mapping[str, Any]] diff --git a/tls/datadog_checks/tls/config_models/defaults.py b/tls/datadog_checks/tls/config_models/defaults.py index e47bf9526fc30..a8be6bb5c39bb 100644 --- a/tls/datadog_checks/tls/config_models/defaults.py +++ b/tls/datadog_checks/tls/config_models/defaults.py @@ -28,6 +28,10 @@ def instance_days_warning(field, value): return 14.0 +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/tls/datadog_checks/tls/config_models/instance.py b/tls/datadog_checks/tls/config_models/instance.py index a009c895af241..72b2cb9a31bac 100644 --- a/tls/datadog_checks/tls/config_models/instance.py +++ b/tls/datadog_checks/tls/config_models/instance.py @@ -20,6 +20,7 @@ class Config: allowed_versions: Optional[Sequence[str]] days_critical: Optional[float] days_warning: Optional[float] + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] fetch_intermediate_certs: Optional[bool] intermediate_cert_refresh_interval: Optional[float] diff --git a/tomcat/datadog_checks/tomcat/config_models/defaults.py b/tomcat/datadog_checks/tomcat/config_models/defaults.py index 2fa99a6c3c270..645f060fafee5 100644 --- a/tomcat/datadog_checks/tomcat/config_models/defaults.py +++ b/tomcat/datadog_checks/tomcat/config_models/defaults.py @@ -28,6 +28,10 @@ def instance_collect_default_jvm_metrics(field, value): return True +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/tomcat/datadog_checks/tomcat/config_models/instance.py b/tomcat/datadog_checks/tomcat/config_models/instance.py index cf47e9f1b401b..34c04039bc8af 100644 --- a/tomcat/datadog_checks/tomcat/config_models/instance.py +++ b/tomcat/datadog_checks/tomcat/config_models/instance.py @@ -18,6 +18,7 @@ class Config: allow_mutation = False collect_default_jvm_metrics: Optional[bool] + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] host: str is_jmx: Optional[bool] diff --git a/twemproxy/datadog_checks/twemproxy/config_models/defaults.py b/twemproxy/datadog_checks/twemproxy/config_models/defaults.py index 958076edbe969..d384a603f06d6 100644 --- a/twemproxy/datadog_checks/twemproxy/config_models/defaults.py +++ b/twemproxy/datadog_checks/twemproxy/config_models/defaults.py @@ -8,6 +8,10 @@ def shared_service(field, value): return get_default_field_value(field, value) +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/twemproxy/datadog_checks/twemproxy/config_models/instance.py b/twemproxy/datadog_checks/twemproxy/config_models/instance.py index bd195ee06a878..5431b24c70617 100644 --- a/twemproxy/datadog_checks/twemproxy/config_models/instance.py +++ b/twemproxy/datadog_checks/twemproxy/config_models/instance.py @@ -17,6 +17,7 @@ class InstanceConfig(BaseModel): class Config: allow_mutation = False + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] host: str min_collection_interval: Optional[float] diff --git a/twistlock/datadog_checks/twistlock/config_models/defaults.py b/twistlock/datadog_checks/twistlock/config_models/defaults.py index 0f00265cdab5c..a769ce7a4caf2 100644 --- a/twistlock/datadog_checks/twistlock/config_models/defaults.py +++ b/twistlock/datadog_checks/twistlock/config_models/defaults.py @@ -44,6 +44,10 @@ def instance_connect_timeout(field, value): return get_default_field_value(field, value) +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/twistlock/datadog_checks/twistlock/config_models/instance.py b/twistlock/datadog_checks/twistlock/config_models/instance.py index cfe2f0c8efc5a..91007edd624f2 100644 --- a/twistlock/datadog_checks/twistlock/config_models/instance.py +++ b/twistlock/datadog_checks/twistlock/config_models/instance.py @@ -40,6 +40,7 @@ class Config: aws_region: Optional[str] aws_service: Optional[str] connect_timeout: Optional[float] + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] extra_headers: Optional[Mapping[str, Any]] headers: Optional[Mapping[str, Any]] diff --git a/varnish/datadog_checks/varnish/config_models/defaults.py b/varnish/datadog_checks/varnish/config_models/defaults.py index 65494a89d5fd4..7afec736b88d8 100644 --- a/varnish/datadog_checks/varnish/config_models/defaults.py +++ b/varnish/datadog_checks/varnish/config_models/defaults.py @@ -16,6 +16,10 @@ def instance_daemon_port(field, value): return 6082 +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/varnish/datadog_checks/varnish/config_models/instance.py b/varnish/datadog_checks/varnish/config_models/instance.py index 746327e5e0eee..014724c966116 100644 --- a/varnish/datadog_checks/varnish/config_models/instance.py +++ b/varnish/datadog_checks/varnish/config_models/instance.py @@ -19,6 +19,7 @@ class Config: daemon_host: Optional[str] daemon_port: Optional[int] + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] metrics_filter: Optional[Sequence[str]] min_collection_interval: Optional[float] diff --git a/vault/datadog_checks/vault/config_models/defaults.py b/vault/datadog_checks/vault/config_models/defaults.py index ed32ae40d919f..658335eb8a891 100644 --- a/vault/datadog_checks/vault/config_models/defaults.py +++ b/vault/datadog_checks/vault/config_models/defaults.py @@ -56,6 +56,10 @@ def instance_detect_leader(field, value): return False +def instance_disable_generic_tags(field, value): + return False + + def instance_disable_legacy_cluster_tag(field, value): return False diff --git a/vault/datadog_checks/vault/config_models/instance.py b/vault/datadog_checks/vault/config_models/instance.py index c7927c3731d94..168b94d3fa87b 100644 --- a/vault/datadog_checks/vault/config_models/instance.py +++ b/vault/datadog_checks/vault/config_models/instance.py @@ -44,6 +44,7 @@ class Config: client_token_path: Optional[str] connect_timeout: Optional[float] detect_leader: Optional[bool] + disable_generic_tags: Optional[bool] disable_legacy_cluster_tag: Optional[bool] empty_default_hostname: Optional[bool] extra_headers: Optional[Mapping[str, Any]] diff --git a/vertica/datadog_checks/vertica/config_models/defaults.py b/vertica/datadog_checks/vertica/config_models/defaults.py index d7e76c1026cd1..0dd3cd8bd6def 100644 --- a/vertica/datadog_checks/vertica/config_models/defaults.py +++ b/vertica/datadog_checks/vertica/config_models/defaults.py @@ -32,6 +32,10 @@ def instance_db(field, value): return get_default_field_value(field, value) +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/vertica/datadog_checks/vertica/config_models/instance.py b/vertica/datadog_checks/vertica/config_models/instance.py index 6b4241fbb033d..ec6f8033be868 100644 --- a/vertica/datadog_checks/vertica/config_models/instance.py +++ b/vertica/datadog_checks/vertica/config_models/instance.py @@ -31,6 +31,7 @@ class Config: connection_load_balance: Optional[bool] custom_queries: Optional[Sequence[CustomQuery]] db: Optional[str] + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] metric_groups: Optional[Sequence[str]] min_collection_interval: Optional[float] diff --git a/voltdb/datadog_checks/voltdb/config_models/defaults.py b/voltdb/datadog_checks/voltdb/config_models/defaults.py index d0434a3ea8327..1002f4528e6b8 100644 --- a/voltdb/datadog_checks/voltdb/config_models/defaults.py +++ b/voltdb/datadog_checks/voltdb/config_models/defaults.py @@ -52,6 +52,10 @@ def instance_custom_queries(field, value): return get_default_field_value(field, value) +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/voltdb/datadog_checks/voltdb/config_models/instance.py b/voltdb/datadog_checks/voltdb/config_models/instance.py index 48d3c5a234d08..9e4c4efadd92a 100644 --- a/voltdb/datadog_checks/voltdb/config_models/instance.py +++ b/voltdb/datadog_checks/voltdb/config_models/instance.py @@ -50,6 +50,7 @@ class Config: aws_service: Optional[str] connect_timeout: Optional[float] custom_queries: Optional[Sequence[CustomQuery]] + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] extra_headers: Optional[Mapping[str, Any]] headers: Optional[Mapping[str, Any]] diff --git a/vsphere/datadog_checks/vsphere/config_models/defaults.py b/vsphere/datadog_checks/vsphere/config_models/defaults.py index 15e71dbb09864..7bd71a99185d1 100644 --- a/vsphere/datadog_checks/vsphere/config_models/defaults.py +++ b/vsphere/datadog_checks/vsphere/config_models/defaults.py @@ -52,6 +52,10 @@ def instance_collection_type(field, value): return 'realtime' +def instance_disable_generic_tags(field, value): + return False + + def instance_excluded_host_tags(field, value): return [] diff --git a/vsphere/datadog_checks/vsphere/config_models/instance.py b/vsphere/datadog_checks/vsphere/config_models/instance.py index 8a9dba807fa54..b3f91aecc3ec9 100644 --- a/vsphere/datadog_checks/vsphere/config_models/instance.py +++ b/vsphere/datadog_checks/vsphere/config_models/instance.py @@ -112,6 +112,7 @@ class Config: collect_tags: Optional[bool] collection_level: Optional[int] collection_type: Optional[str] + disable_generic_tags: Optional[bool] empty_default_hostname: bool excluded_host_tags: Optional[Sequence[str]] host: str diff --git a/win32_event_log/datadog_checks/win32_event_log/config_models/defaults.py b/win32_event_log/datadog_checks/win32_event_log/config_models/defaults.py index 1698dbe35ace6..991ab0ee08959 100644 --- a/win32_event_log/datadog_checks/win32_event_log/config_models/defaults.py +++ b/win32_event_log/datadog_checks/win32_event_log/config_models/defaults.py @@ -36,6 +36,10 @@ def instance_bookmark_frequency(field, value): return '' +def instance_disable_generic_tags(field, value): + return False + + def instance_domain(field, value): return get_default_field_value(field, value) diff --git a/win32_event_log/datadog_checks/win32_event_log/config_models/instance.py b/win32_event_log/datadog_checks/win32_event_log/config_models/instance.py index d1e35d0e08580..e0785e734ade9 100644 --- a/win32_event_log/datadog_checks/win32_event_log/config_models/instance.py +++ b/win32_event_log/datadog_checks/win32_event_log/config_models/instance.py @@ -28,6 +28,7 @@ class Config: auth_type: Optional[Literal['default', 'negotiate', 'kerberos', 'ntlm']] bookmark_frequency: Optional[int] + disable_generic_tags: Optional[bool] domain: Optional[str] empty_default_hostname: Optional[bool] event_format: Optional[Sequence[str]] diff --git a/windows_service/datadog_checks/windows_service/config_models/defaults.py b/windows_service/datadog_checks/windows_service/config_models/defaults.py index c88215284f023..c3e0abcc91428 100644 --- a/windows_service/datadog_checks/windows_service/config_models/defaults.py +++ b/windows_service/datadog_checks/windows_service/config_models/defaults.py @@ -8,6 +8,10 @@ def shared_service(field, value): return get_default_field_value(field, value) +def instance_disable_generic_tags(field, value): + return False + + def instance_disable_legacy_service_tag(field, value): return False diff --git a/windows_service/datadog_checks/windows_service/config_models/instance.py b/windows_service/datadog_checks/windows_service/config_models/instance.py index cc0ed5466b0ed..866f0094a5709 100644 --- a/windows_service/datadog_checks/windows_service/config_models/instance.py +++ b/windows_service/datadog_checks/windows_service/config_models/instance.py @@ -17,6 +17,7 @@ class InstanceConfig(BaseModel): class Config: allow_mutation = False + disable_generic_tags: Optional[bool] disable_legacy_service_tag: Optional[bool] empty_default_hostname: Optional[bool] min_collection_interval: Optional[float] diff --git a/wmi_check/datadog_checks/wmi_check/config_models/defaults.py b/wmi_check/datadog_checks/wmi_check/config_models/defaults.py index 2dd8c3e224974..cadd2761e4a10 100644 --- a/wmi_check/datadog_checks/wmi_check/config_models/defaults.py +++ b/wmi_check/datadog_checks/wmi_check/config_models/defaults.py @@ -8,6 +8,10 @@ def shared_service(field, value): return get_default_field_value(field, value) +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/wmi_check/datadog_checks/wmi_check/config_models/instance.py b/wmi_check/datadog_checks/wmi_check/config_models/instance.py index 4065c6ce6e1f7..2bb7ceaf7e89e 100644 --- a/wmi_check/datadog_checks/wmi_check/config_models/instance.py +++ b/wmi_check/datadog_checks/wmi_check/config_models/instance.py @@ -18,6 +18,7 @@ class Config: allow_mutation = False class_: str = Field(..., alias='class') + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] filters: Optional[Sequence[Mapping[str, Any]]] host: Optional[str] diff --git a/yarn/datadog_checks/yarn/config_models/defaults.py b/yarn/datadog_checks/yarn/config_models/defaults.py index d7656a30c3fee..a6b0eb7f69fdc 100644 --- a/yarn/datadog_checks/yarn/config_models/defaults.py +++ b/yarn/datadog_checks/yarn/config_models/defaults.py @@ -64,6 +64,10 @@ def instance_connect_timeout(field, value): return get_default_field_value(field, value) +def instance_disable_generic_tags(field, value): + return False + + def instance_disable_legacy_cluster_tag(field, value): return False diff --git a/yarn/datadog_checks/yarn/config_models/instance.py b/yarn/datadog_checks/yarn/config_models/instance.py index e6eb4a4e5a2ac..1123da1169562 100644 --- a/yarn/datadog_checks/yarn/config_models/instance.py +++ b/yarn/datadog_checks/yarn/config_models/instance.py @@ -45,6 +45,7 @@ class Config: collect_app_metrics: Optional[bool] collect_node_metrics: Optional[bool] connect_timeout: Optional[float] + disable_generic_tags: Optional[bool] disable_legacy_cluster_tag: Optional[bool] empty_default_hostname: Optional[bool] extra_headers: Optional[Mapping[str, Any]] diff --git a/zk/datadog_checks/zk/config_models/defaults.py b/zk/datadog_checks/zk/config_models/defaults.py index bf3b29ac08379..6fc93e5870e5b 100644 --- a/zk/datadog_checks/zk/config_models/defaults.py +++ b/zk/datadog_checks/zk/config_models/defaults.py @@ -8,6 +8,10 @@ def shared_service(field, value): return get_default_field_value(field, value) +def instance_disable_generic_tags(field, value): + return False + + def instance_empty_default_hostname(field, value): return False diff --git a/zk/datadog_checks/zk/config_models/instance.py b/zk/datadog_checks/zk/config_models/instance.py index 85982071fc91c..8d9ac63087411 100644 --- a/zk/datadog_checks/zk/config_models/instance.py +++ b/zk/datadog_checks/zk/config_models/instance.py @@ -17,6 +17,7 @@ class InstanceConfig(BaseModel): class Config: allow_mutation = False + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] expected_mode: Optional[str] host: str