Remove check options from jmx template (#11686)

* Remove default template * Add back more options * Add default all template * Change to all_integrations
DataDog · Mar 17, 2022 · 9bcf7cb · 9bcf7cb
1 parent d4fe06e
commit 9bcf7cb
Show file tree

Hide file tree

Showing 33 changed files with 5 additions and 79 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...ks_dev/datadog_checks/dev/tooling/templates/configuration/instances/all_integrations.yaml b/...ks_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
@@ -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 <integration_name>_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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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]