diff --git a/activemq/datadog_checks/activemq/config_models/defaults.py b/activemq/datadog_checks/activemq/config_models/defaults.py index df8f2b23176c2..b9702a06b9ed7 100644 --- a/activemq/datadog_checks/activemq/config_models/defaults.py +++ b/activemq/datadog_checks/activemq/config_models/defaults.py @@ -34,10 +34,6 @@ 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/activemq/datadog_checks/activemq/config_models/instance.py b/activemq/datadog_checks/activemq/config_models/instance.py index af907d23523bc..bc4c01723f132 100644 --- a/activemq/datadog_checks/activemq/config_models/instance.py +++ b/activemq/datadog_checks/activemq/config_models/instance.py @@ -24,7 +24,6 @@ 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/cassandra/datadog_checks/cassandra/config_models/defaults.py b/cassandra/datadog_checks/cassandra/config_models/defaults.py index 1b5b215f4328f..91f55843f388b 100644 --- a/cassandra/datadog_checks/cassandra/config_models/defaults.py +++ b/cassandra/datadog_checks/cassandra/config_models/defaults.py @@ -34,10 +34,6 @@ 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 2b267c8f79f70..a5d173e6c4a8b 100644 --- a/cassandra/datadog_checks/cassandra/config_models/instance.py +++ b/cassandra/datadog_checks/cassandra/config_models/instance.py @@ -25,7 +25,6 @@ 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/confluent_platform/datadog_checks/confluent_platform/config_models/defaults.py b/confluent_platform/datadog_checks/confluent_platform/config_models/defaults.py index e4bcdd89308c8..e5109d019a056 100644 --- a/confluent_platform/datadog_checks/confluent_platform/config_models/defaults.py +++ b/confluent_platform/datadog_checks/confluent_platform/config_models/defaults.py @@ -30,10 +30,6 @@ 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/confluent_platform/datadog_checks/confluent_platform/config_models/instance.py b/confluent_platform/datadog_checks/confluent_platform/config_models/instance.py index af907d23523bc..bc4c01723f132 100644 --- a/confluent_platform/datadog_checks/confluent_platform/config_models/instance.py +++ b/confluent_platform/datadog_checks/confluent_platform/config_models/instance.py @@ -24,7 +24,6 @@ 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/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/instances/all_integrations.yaml b/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/instances/all_integrations.yaml new file mode 100644 index 0000000000000..48900d29ec229 --- /dev/null +++ b/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/instances/all_integrations.yaml @@ -0,0 +1,3 @@ +- template: instances/tags +- template: instances/service +- template: instances/global 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 98e71052a95e7..11cefc62e6b1e 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,6 +1,4 @@ -- template: instances/tags -- template: instances/service -- template: instances/global +- template: instances/all_integrations - name: disable_generic_tags description: | Generic tags such as `cluster` will be replaced by _cluster to avoid diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/instances/jmx.yaml b/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/instances/jmx.yaml index 03216d5d829e9..8b6e810d4f44c 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/instances/jmx.yaml +++ b/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/instances/jmx.yaml @@ -127,4 +127,4 @@ example: true type: boolean -- template: instances/default +- template: instances/all_integrations diff --git a/hazelcast/datadog_checks/hazelcast/config_models/defaults.py b/hazelcast/datadog_checks/hazelcast/config_models/defaults.py index 187e378cf6b04..c83a66aa87c91 100644 --- a/hazelcast/datadog_checks/hazelcast/config_models/defaults.py +++ b/hazelcast/datadog_checks/hazelcast/config_models/defaults.py @@ -78,10 +78,6 @@ 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/hazelcast/datadog_checks/hazelcast/config_models/instance.py b/hazelcast/datadog_checks/hazelcast/config_models/instance.py index 19025ee6bba31..593548c7e4c4b 100644 --- a/hazelcast/datadog_checks/hazelcast/config_models/instance.py +++ b/hazelcast/datadog_checks/hazelcast/config_models/instance.py @@ -48,7 +48,6 @@ class Config: aws_service: Optional[str] collect_default_jvm_metrics: Optional[bool] 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/hive/datadog_checks/hive/config_models/defaults.py b/hive/datadog_checks/hive/config_models/defaults.py index df8f2b23176c2..b9702a06b9ed7 100644 --- a/hive/datadog_checks/hive/config_models/defaults.py +++ b/hive/datadog_checks/hive/config_models/defaults.py @@ -34,10 +34,6 @@ 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/hive/datadog_checks/hive/config_models/instance.py b/hive/datadog_checks/hive/config_models/instance.py index af907d23523bc..bc4c01723f132 100644 --- a/hive/datadog_checks/hive/config_models/instance.py +++ b/hive/datadog_checks/hive/config_models/instance.py @@ -24,7 +24,6 @@ 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/hivemq/datadog_checks/hivemq/config_models/defaults.py b/hivemq/datadog_checks/hivemq/config_models/defaults.py index df8f2b23176c2..b9702a06b9ed7 100644 --- a/hivemq/datadog_checks/hivemq/config_models/defaults.py +++ b/hivemq/datadog_checks/hivemq/config_models/defaults.py @@ -34,10 +34,6 @@ 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/hivemq/datadog_checks/hivemq/config_models/instance.py b/hivemq/datadog_checks/hivemq/config_models/instance.py index af907d23523bc..bc4c01723f132 100644 --- a/hivemq/datadog_checks/hivemq/config_models/instance.py +++ b/hivemq/datadog_checks/hivemq/config_models/instance.py @@ -24,7 +24,6 @@ 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/hudi/datadog_checks/hudi/config_models/defaults.py b/hudi/datadog_checks/hudi/config_models/defaults.py index df8f2b23176c2..b9702a06b9ed7 100644 --- a/hudi/datadog_checks/hudi/config_models/defaults.py +++ b/hudi/datadog_checks/hudi/config_models/defaults.py @@ -34,10 +34,6 @@ 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/hudi/datadog_checks/hudi/config_models/instance.py b/hudi/datadog_checks/hudi/config_models/instance.py index af907d23523bc..bc4c01723f132 100644 --- a/hudi/datadog_checks/hudi/config_models/instance.py +++ b/hudi/datadog_checks/hudi/config_models/instance.py @@ -24,7 +24,6 @@ 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/ignite/datadog_checks/ignite/config_models/defaults.py b/ignite/datadog_checks/ignite/config_models/defaults.py index df8f2b23176c2..b9702a06b9ed7 100644 --- a/ignite/datadog_checks/ignite/config_models/defaults.py +++ b/ignite/datadog_checks/ignite/config_models/defaults.py @@ -34,10 +34,6 @@ 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/ignite/datadog_checks/ignite/config_models/instance.py b/ignite/datadog_checks/ignite/config_models/instance.py index af907d23523bc..bc4c01723f132 100644 --- a/ignite/datadog_checks/ignite/config_models/instance.py +++ b/ignite/datadog_checks/ignite/config_models/instance.py @@ -24,7 +24,6 @@ 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/jboss_wildfly/datadog_checks/jboss_wildfly/config_models/defaults.py b/jboss_wildfly/datadog_checks/jboss_wildfly/config_models/defaults.py index f9c6676ece8b8..20f8a0d7a0213 100644 --- a/jboss_wildfly/datadog_checks/jboss_wildfly/config_models/defaults.py +++ b/jboss_wildfly/datadog_checks/jboss_wildfly/config_models/defaults.py @@ -34,10 +34,6 @@ 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/jboss_wildfly/datadog_checks/jboss_wildfly/config_models/instance.py b/jboss_wildfly/datadog_checks/jboss_wildfly/config_models/instance.py index ba4ff83c1a560..20bdc22879459 100644 --- a/jboss_wildfly/datadog_checks/jboss_wildfly/config_models/instance.py +++ b/jboss_wildfly/datadog_checks/jboss_wildfly/config_models/instance.py @@ -24,7 +24,6 @@ class Config: allow_mutation = False collect_default_jvm_metrics: Optional[bool] - disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] host: Optional[str] is_jmx: Optional[bool] diff --git a/kafka/datadog_checks/kafka/config_models/defaults.py b/kafka/datadog_checks/kafka/config_models/defaults.py index 1b5b215f4328f..91f55843f388b 100644 --- a/kafka/datadog_checks/kafka/config_models/defaults.py +++ b/kafka/datadog_checks/kafka/config_models/defaults.py @@ -34,10 +34,6 @@ 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 af907d23523bc..bc4c01723f132 100644 --- a/kafka/datadog_checks/kafka/config_models/instance.py +++ b/kafka/datadog_checks/kafka/config_models/instance.py @@ -24,7 +24,6 @@ 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/presto/datadog_checks/presto/config_models/defaults.py b/presto/datadog_checks/presto/config_models/defaults.py index df8f2b23176c2..b9702a06b9ed7 100644 --- a/presto/datadog_checks/presto/config_models/defaults.py +++ b/presto/datadog_checks/presto/config_models/defaults.py @@ -34,10 +34,6 @@ 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/presto/datadog_checks/presto/config_models/instance.py b/presto/datadog_checks/presto/config_models/instance.py index af907d23523bc..bc4c01723f132 100644 --- a/presto/datadog_checks/presto/config_models/instance.py +++ b/presto/datadog_checks/presto/config_models/instance.py @@ -24,7 +24,6 @@ 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/solr/datadog_checks/solr/config_models/defaults.py b/solr/datadog_checks/solr/config_models/defaults.py index 698ca7381218a..dd4e89c31b649 100644 --- a/solr/datadog_checks/solr/config_models/defaults.py +++ b/solr/datadog_checks/solr/config_models/defaults.py @@ -34,10 +34,6 @@ 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/solr/datadog_checks/solr/config_models/instance.py b/solr/datadog_checks/solr/config_models/instance.py index af907d23523bc..bc4c01723f132 100644 --- a/solr/datadog_checks/solr/config_models/instance.py +++ b/solr/datadog_checks/solr/config_models/instance.py @@ -24,7 +24,6 @@ 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/sonarqube/datadog_checks/sonarqube/config_models/defaults.py b/sonarqube/datadog_checks/sonarqube/config_models/defaults.py index 77c2f57666151..23f7c7dc6c0f5 100644 --- a/sonarqube/datadog_checks/sonarqube/config_models/defaults.py +++ b/sonarqube/datadog_checks/sonarqube/config_models/defaults.py @@ -94,10 +94,6 @@ 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 1868db9ef018c..95a43609b1c35 100644 --- a/sonarqube/datadog_checks/sonarqube/config_models/instance.py +++ b/sonarqube/datadog_checks/sonarqube/config_models/instance.py @@ -61,7 +61,6 @@ 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/tomcat/datadog_checks/tomcat/config_models/defaults.py b/tomcat/datadog_checks/tomcat/config_models/defaults.py index 1b5b215f4328f..91f55843f388b 100644 --- a/tomcat/datadog_checks/tomcat/config_models/defaults.py +++ b/tomcat/datadog_checks/tomcat/config_models/defaults.py @@ -34,10 +34,6 @@ 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 af907d23523bc..bc4c01723f132 100644 --- a/tomcat/datadog_checks/tomcat/config_models/instance.py +++ b/tomcat/datadog_checks/tomcat/config_models/instance.py @@ -24,7 +24,6 @@ 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/weblogic/datadog_checks/weblogic/config_models/defaults.py b/weblogic/datadog_checks/weblogic/config_models/defaults.py index df8f2b23176c2..b9702a06b9ed7 100644 --- a/weblogic/datadog_checks/weblogic/config_models/defaults.py +++ b/weblogic/datadog_checks/weblogic/config_models/defaults.py @@ -34,10 +34,6 @@ 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/weblogic/datadog_checks/weblogic/config_models/instance.py b/weblogic/datadog_checks/weblogic/config_models/instance.py index af907d23523bc..bc4c01723f132 100644 --- a/weblogic/datadog_checks/weblogic/config_models/instance.py +++ b/weblogic/datadog_checks/weblogic/config_models/instance.py @@ -24,7 +24,6 @@ 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]