Sync configs with new option and bump base requirement

clickhouse/datadog_checks/clickhouse/data/conf.yaml.example

@@ -75,6 +75,12 @@ instances:
     #
     # tls_verify: false
 
+    ## @param only_custom_queries - boolean - optional - default: false
+    ## Set this parameter to `true` if you want to skip the integration's default metrics collection.
+    ## Only metrics specified in `custom_queries` will be collected.
+    #
+    # only_custom_queries: false
+
     ## @param use_global_custom_queries - string - optional - default: true
     ## How `global_custom_queries` should be used for this instance. There are 3 options:
     ##

clickhouse/setup.py

@@ -27,7 +27,7 @@ def get_dependencies():
         return f.readlines()
 
 
-CHECKS_BASE_REQ = 'datadog-checks-base>=20.1.0'
+CHECKS_BASE_REQ = 'datadog-checks-base>=23.1.0'
 
 
 setup(

datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/instances/db.yaml

@@ -1,3 +1,10 @@
+- name: only_custom_queries
+  description: |
+    Set this parameter to `true` if you want to skip the integration's default metrics collection.
+    Only metrics specified in `custom_queries` will be collected.
+  value:
+    type: boolean
+    example: false
 - name: use_global_custom_queries
   description: |
     How `global_custom_queries` should be used for this instance. There are 3 options:

ibm_db2/datadog_checks/ibm_db2/data/conf.yaml.example

@@ -56,6 +56,12 @@ instances:
     #
     # tls_cert: <TLS_CERT>
 
+    ## @param only_custom_queries - boolean - optional - default: false
+    ## Set this parameter to `true` if you want to skip the integration's default metrics collection.
+    ## Only metrics specified in `custom_queries` will be collected.
+    #
+    # only_custom_queries: false
+
     ## @param use_global_custom_queries - string - optional - default: true
     ## How `global_custom_queries` should be used for this instance. There are 3 options:
     ##

ibm_db2/setup.py

@@ -27,7 +27,7 @@ def get_dependencies():
         return f.readlines()
 
 
-CHECKS_BASE_REQ = 'datadog-checks-base>=11.2.0'
+CHECKS_BASE_REQ = 'datadog-checks-base>=23.1.0'
 
 
 setup(

ibm_was/datadog_checks/ibm_was/data/conf.yaml.example

@@ -359,6 +359,12 @@ instances:
     #
     # collect_thread_pool_stats: true
 
+    ## @param only_custom_queries - boolean - optional - default: false
+    ## Set this parameter to `true` if you want to skip the integration's default metrics collection.
+    ## Only metrics specified in `custom_queries` will be collected.
+    #
+    # only_custom_queries: false
+
     ## @param custom_queries - list of mappings - optional
     ## List of custom or additional XML attributes to parse and submit as metrics
     ## Each must contain a `metric_prefix` and `stat` element

ibm_was/setup.py

@@ -27,7 +27,7 @@ def get_dependencies():
         return f.readlines()
 
 
-CHECKS_BASE_REQ = 'datadog-checks-base>=11.2.0'
+CHECKS_BASE_REQ = 'datadog-checks-base>=23.1.0'
 
 
 setup(

mysql/datadog_checks/mysql/config_models/defaults.py

@@ -56,6 +56,10 @@ def instance_obfuscator_options(field, value):
     return get_default_field_value(field, value)
 
 
+def instance_only_custom_queries(field, value):
+    return False
+
+
 def instance_options(field, value):
     return get_default_field_value(field, value)
 

mysql/datadog_checks/mysql/config_models/instance.py

@@ -96,6 +96,7 @@ class Config:
     max_custom_queries: Optional[int]
     min_collection_interval: Optional[float]
     obfuscator_options: Optional[ObfuscatorOptions]
+    only_custom_queries: Optional[bool]
     options: Optional[Options]
     password: Optional[str]
     port: Optional[float]

mysql/datadog_checks/mysql/data/conf.yaml.example

@@ -83,6 +83,12 @@ instances:
     #   cert: <CERT_FILE_PATH>
     #   ca: <CA_PATH_FILE>
 
+    ## @param only_custom_queries - boolean - optional - default: false
+    ## Set this parameter to `true` if you want to skip the integration's default metrics collection.
+    ## Only metrics specified in `custom_queries` will be collected.
+    #
+    # only_custom_queries: false
+
     ## @param use_global_custom_queries - string - optional - default: true
     ## How `global_custom_queries` should be used for this instance. There are 3 options:
     ##

mysql/setup.py

@@ -27,7 +27,7 @@ def get_dependencies():
         return f.readlines()
 
 
-CHECKS_BASE_REQ = 'datadog-checks-base>=21.2.1'
+CHECKS_BASE_REQ = 'datadog-checks-base>=23.1.0'
 
 setup(
     name='datadog-mysql',

oracle/assets/configuration/spec.yaml

@@ -38,10 +38,5 @@ files:
       value:
         type: string
         example: <DRIVER_PATH>.jar
-    - name: only_custom_queries
-      description: Set this parameter to `true` if you want to skip default system, process, and tablespace metrics checks.
-      value:
-        type: boolean
-        example: false
     - template: instances/db
     - template: instances/default

oracle/datadog_checks/oracle/data/conf.yaml.example

@@ -52,7 +52,8 @@ instances:
     # jdbc_driver_path: <DRIVER_PATH>.jar
 
     ## @param only_custom_queries - boolean - optional - default: false
-    ## Set this parameter to `true` if you want to skip default system, process, and tablespace metrics checks.
+    ## Set this parameter to `true` if you want to skip the integration's default metrics collection.
+    ## Only metrics specified in `custom_queries` will be collected.
     #
     # only_custom_queries: false
 

sap_hana/datadog_checks/sap_hana/config_models/defaults.py

@@ -36,6 +36,10 @@ def instance_min_collection_interval(field, value):
     return 15
 
 
+def instance_only_custom_queries(field, value):
+    return False
+
+
 def instance_persist_db_connections(field, value):
     return True
 

sap_hana/datadog_checks/sap_hana/config_models/instance.py

@@ -31,6 +31,7 @@ class Config:
     disable_generic_tags: Optional[bool]
     empty_default_hostname: Optional[bool]
     min_collection_interval: Optional[float]
+    only_custom_queries: Optional[bool]
     password: str
     persist_db_connections: Optional[bool]
     port: Optional[int]

sap_hana/datadog_checks/sap_hana/data/conf.yaml.example

@@ -65,6 +65,12 @@ instances:
     #
     # timeout: <TIMEOUT>
 
+    ## @param only_custom_queries - boolean - optional - default: false
+    ## Set this parameter to `true` if you want to skip the integration's default metrics collection.
+    ## Only metrics specified in `custom_queries` will be collected.
+    #
+    # only_custom_queries: false
+
     ## @param use_global_custom_queries - string - optional - default: true
     ## How `global_custom_queries` should be used for this instance. There are 3 options:
     ##

sap_hana/setup.py

@@ -27,7 +27,7 @@ def get_dependencies():
         return f.readlines()
 
 
-CHECKS_BASE_REQ = 'datadog-checks-base>=15.3.0'
+CHECKS_BASE_REQ = 'datadog-checks-base>=23.1.0'
 
 
 setup(

singlestore/datadog_checks/singlestore/config_models/defaults.py

@@ -36,6 +36,10 @@ def instance_min_collection_interval(field, value):
     return 15
 
 
+def instance_only_custom_queries(field, value):
+    return False
+
+
 def instance_password(field, value):
     return get_default_field_value(field, value)
 

singlestore/datadog_checks/singlestore/config_models/instance.py

@@ -33,6 +33,7 @@ class Config:
     empty_default_hostname: Optional[bool]
     host: str
     min_collection_interval: Optional[float]
+    only_custom_queries: Optional[bool]
     password: Optional[str]
     port: Optional[int]
     read_timeout: Optional[int]

singlestore/datadog_checks/singlestore/data/conf.yaml.example

@@ -54,6 +54,12 @@ instances:
     #
     # read_timeout: <READ_TIMEOUT>
 
+    ## @param only_custom_queries - boolean - optional - default: false
+    ## Set this parameter to `true` if you want to skip the integration's default metrics collection.
+    ## Only metrics specified in `custom_queries` will be collected.
+    #
+    # only_custom_queries: false
+
     ## @param use_global_custom_queries - string - optional - default: true
     ## How `global_custom_queries` should be used for this instance. There are 3 options:
     ##

singlestore/setup.py

@@ -27,7 +27,7 @@ def get_dependencies():
         return f.readlines()
 
 
-CHECKS_BASE_REQ = 'datadog-checks-base>=11.2.0'
+CHECKS_BASE_REQ = 'datadog-checks-base>=23.1.0'
 
 
 setup(

snowflake/datadog_checks/snowflake/config_models/defaults.py

@@ -72,6 +72,10 @@ def instance_ocsp_response_cache_filename(field, value):
     return get_default_field_value(field, value)
 
 
+def instance_only_custom_queries(field, value):
+    return False
+
+
 def instance_schema(field, value):
     return 'ACCOUNT_USAGE'
 

snowflake/datadog_checks/snowflake/config_models/instance.py

@@ -5,7 +5,7 @@
 
 from typing import Any, Mapping, Optional, Sequence
 
-from pydantic import BaseModel, Field, root_validator, validator
+from pydantic import BaseModel, root_validator, validator
 
 from datadog_checks.base.utils.functions import identity
 from datadog_checks.base.utils.models import validation
@@ -38,9 +38,10 @@ class Config:
     metric_groups: Optional[Sequence[str]]
     min_collection_interval: Optional[float]
     ocsp_response_cache_filename: Optional[str]
+    only_custom_queries: Optional[bool]
     password: str
     role: str
-    schema_: Optional[str] = Field(None, alias='schema')
+    schema: Optional[str]
     service: Optional[str]
     tags: Optional[Sequence[str]]
     token: Optional[str]

snowflake/datadog_checks/snowflake/data/conf.yaml.example

@@ -145,6 +145,12 @@ instances:
     #   - snowflake.storage
     #   - snowflake.logins
 
+    ## @param only_custom_queries - boolean - optional - default: false
+    ## Set this parameter to `true` if you want to skip the integration's default metrics collection.
+    ## Only metrics specified in `custom_queries` will be collected.
+    #
+    # only_custom_queries: false
+
     ## @param use_global_custom_queries - string - optional - default: true
     ## How `global_custom_queries` should be used for this instance. There are 3 options:
     ##

snowflake/setup.py

@@ -27,7 +27,7 @@ def get_dependencies():
         return f.readlines()
 
 
-CHECKS_BASE_REQ = 'datadog-checks-base>=21.2.0'
+CHECKS_BASE_REQ = 'datadog-checks-base>=23.1.0'
 
 
 setup(

sqlserver/datadog_checks/sqlserver/config_models/defaults.py

@@ -120,6 +120,10 @@ def instance_min_collection_interval(field, value):
     return 15
 
 
+def instance_only_custom_queries(field, value):
+    return False
+
+
 def instance_only_emit_local(field, value):
     return False
 

sqlserver/datadog_checks/sqlserver/config_models/instance.py

@@ -61,6 +61,7 @@ class Config:
     include_master_files_metrics: Optional[bool]
     include_task_scheduler_metrics: Optional[bool]
     min_collection_interval: Optional[float]
+    only_custom_queries: Optional[bool]
     only_emit_local: Optional[bool]
     password: Optional[str]
     proc_only_if: Optional[str]

sqlserver/datadog_checks/sqlserver/data/conf.yaml.example

@@ -214,6 +214,12 @@ instances:
     #
     # command_timeout: 5
 
+    ## @param only_custom_queries - boolean - optional - default: false
+    ## Set this parameter to `true` if you want to skip the integration's default metrics collection.
+    ## Only metrics specified in `custom_queries` will be collected.
+    #
+    # only_custom_queries: false
+
     ## @param use_global_custom_queries - string - optional - default: true
     ## How `global_custom_queries` should be used for this instance. There are 3 options:
     ##

sqlserver/setup.py

@@ -27,7 +27,7 @@ def get_dependencies():
         return f.readlines()
 
 
-CHECKS_BASE_REQ = 'datadog-checks-base>=23.0.0'
+CHECKS_BASE_REQ = 'datadog-checks-base>=23.1.0'
 
 setup(
     name='datadog-sqlserver',

vertica/datadog_checks/vertica/config_models/defaults.py

@@ -48,6 +48,10 @@ def instance_min_collection_interval(field, value):
     return 15
 
 
+def instance_only_custom_queries(field, value):
+    return False
+
+
 def instance_password(field, value):
     return get_default_field_value(field, value)
 

vertica/datadog_checks/vertica/config_models/instance.py

@@ -35,6 +35,7 @@ class Config:
     empty_default_hostname: Optional[bool]
     metric_groups: Optional[Sequence[str]]
     min_collection_interval: Optional[float]
+    only_custom_queries: Optional[bool]
     password: Optional[str]
     port: Optional[int]
     server: Optional[str]

vertica/datadog_checks/vertica/data/conf.yaml.example

@@ -172,6 +172,12 @@ instances:
     #
     # empty_default_hostname: false
 
+    ## @param only_custom_queries - boolean - optional - default: false
+    ## Set this parameter to `true` if you want to skip the integration's default metrics collection.
+    ## Only metrics specified in `custom_queries` will be collected.
+    #
+    # only_custom_queries: false
+
     ## @param use_global_custom_queries - string - optional - default: true
     ## How `global_custom_queries` should be used for this instance. There are 3 options:
     ##

vertica/setup.py

@@ -27,7 +27,7 @@ def get_dependencies():
         return f.readlines()
 
 
-CHECKS_BASE_REQ = 'datadog-checks-base>=15.3.0'
+CHECKS_BASE_REQ = 'datadog-checks-base>=23.1.0'
 
 
 setup(

voltdb/datadog_checks/voltdb/config_models/defaults.py

@@ -112,6 +112,10 @@ def instance_ntlm_domain(field, value):
     return get_default_field_value(field, value)
 
 
+def instance_only_custom_queries(field, value):
+    return False
+
+
 def instance_password_hashed(field, value):
     return False
 

voltdb/datadog_checks/voltdb/config_models/instance.py

@@ -65,6 +65,7 @@ class Config:
     log_requests: Optional[bool]
     min_collection_interval: Optional[float]
     ntlm_domain: Optional[str]
+    only_custom_queries: Optional[bool]
     password: str
     password_hashed: Optional[bool]
     persist_connections: Optional[bool]

voltdb/datadog_checks/voltdb/data/conf.yaml.example

@@ -241,6 +241,12 @@ instances:
     #
     # allow_redirects: true
 
+    ## @param only_custom_queries - boolean - optional - default: false
+    ## Set this parameter to `true` if you want to skip the integration's default metrics collection.
+    ## Only metrics specified in `custom_queries` will be collected.
+    #
+    # only_custom_queries: false
+
     ## @param use_global_custom_queries - string - optional - default: true
     ## How `global_custom_queries` should be used for this instance. There are 3 options:
     ##

voltdb/setup.py

@@ -27,7 +27,7 @@ def get_dependencies():
         return f.readlines()
 
 
-CHECKS_BASE_REQ = 'datadog-checks-base>=18.1.0'
+CHECKS_BASE_REQ = 'datadog-checks-base>=23.1.0'
 
 
 setup(