From e29cab77a9f23bc8105a13325371f2b9e2447d65 Mon Sep 17 00:00:00 2001 From: Julia Simon <611228+hithwen@users.noreply.github.com> Date: Mon, 23 Aug 2021 10:42:54 +0200 Subject: [PATCH] Update config models --- .../datadog_checks/avi_vantage/config_models/defaults.py | 8 ++++++++ .../datadog_checks/avi_vantage/config_models/instance.py | 2 ++ process/datadog_checks/process/config_models/defaults.py | 8 ++++++++ process/datadog_checks/process/config_models/instance.py | 2 ++ .../datadog_checks/proxysql/config_models/defaults.py | 8 ++++++++ .../datadog_checks/proxysql/config_models/instance.py | 2 ++ redisdb/datadog_checks/redisdb/config_models/defaults.py | 8 ++++++++ redisdb/datadog_checks/redisdb/config_models/instance.py | 2 ++ 8 files changed, 40 insertions(+) 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..84afe29503393 100644 --- a/avi_vantage/datadog_checks/avi_vantage/config_models/defaults.py +++ b/avi_vantage/datadog_checks/avi_vantage/config_models/defaults.py @@ -48,6 +48,10 @@ def instance_cache_shared_labels(field, value): return True +def instance_check_generic_tags(field, value): + return False + + def instance_collect_counters_with_distributions(field, value): return False @@ -60,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/avi_vantage/datadog_checks/avi_vantage/config_models/instance.py b/avi_vantage/datadog_checks/avi_vantage/config_models/instance.py index 932844b1a85c7..fc724d93b03a7 100644 --- a/avi_vantage/datadog_checks/avi_vantage/config_models/instance.py +++ b/avi_vantage/datadog_checks/avi_vantage/config_models/instance.py @@ -68,9 +68,11 @@ class Config: aws_service: Optional[str] cache_metric_wildcards: Optional[bool] cache_shared_labels: Optional[bool] + check_generic_tags: Optional[bool] 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/process/datadog_checks/process/config_models/defaults.py b/process/datadog_checks/process/config_models/defaults.py index e7e0fdc3628ae..d2a93bd5fe9fd 100644 --- a/process/datadog_checks/process/config_models/defaults.py +++ b/process/datadog_checks/process/config_models/defaults.py @@ -24,10 +24,18 @@ def shared_shared_process_list_cache_duration(field, value): return 120 +def instance_check_generic_tags(field, value): + return False + + 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..c28421cd75771 100644 --- a/process/datadog_checks/process/config_models/instance.py +++ b/process/datadog_checks/process/config_models/instance.py @@ -17,7 +17,9 @@ class InstanceConfig(BaseModel): class Config: allow_mutation = False + check_generic_tags: Optional[bool] 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..8b675f4e0e38a 100644 --- a/proxysql/datadog_checks/proxysql/config_models/defaults.py +++ b/proxysql/datadog_checks/proxysql/config_models/defaults.py @@ -12,10 +12,18 @@ def instance_additional_metrics(field, value): return get_default_field_value(field, value) +def instance_check_generic_tags(field, value): + return False + + 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..ddab1e1357af9 100644 --- a/proxysql/datadog_checks/proxysql/config_models/instance.py +++ b/proxysql/datadog_checks/proxysql/config_models/instance.py @@ -18,7 +18,9 @@ class Config: allow_mutation = False additional_metrics: Optional[Sequence[str]] + check_generic_tags: Optional[bool] connect_timeout: Optional[int] + disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] host: str min_collection_interval: Optional[float] diff --git a/redisdb/datadog_checks/redisdb/config_models/defaults.py b/redisdb/datadog_checks/redisdb/config_models/defaults.py index 32ef6fb07557c..098f7480b7066 100644 --- a/redisdb/datadog_checks/redisdb/config_models/defaults.py +++ b/redisdb/datadog_checks/redisdb/config_models/defaults.py @@ -8,6 +8,10 @@ def shared_service(field, value): return get_default_field_value(field, value) +def instance_check_generic_tags(field, value): + return False + + def instance_collect_client_metrics(field, value): return False @@ -24,6 +28,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..b97faf5198549 100644 --- a/redisdb/datadog_checks/redisdb/config_models/instance.py +++ b/redisdb/datadog_checks/redisdb/config_models/instance.py @@ -17,10 +17,12 @@ class InstanceConfig(BaseModel): class Config: allow_mutation = False + check_generic_tags: Optional[bool] collect_client_metrics: Optional[bool] 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]]