diff --git a/azure_iot_edge/datadog_checks/azure_iot_edge/config_models/defaults.py b/azure_iot_edge/datadog_checks/azure_iot_edge/config_models/defaults.py index 5ec6e462bd4478..50cf5270cee244 100644 --- a/azure_iot_edge/datadog_checks/azure_iot_edge/config_models/defaults.py +++ b/azure_iot_edge/datadog_checks/azure_iot_edge/config_models/defaults.py @@ -58,6 +58,10 @@ def instance_bearer_token_path(field, value): return get_default_field_value(field, value) +def instance_bearer_token_refresh_interval(field, value): + return 60 + + def instance_connect_timeout(field, value): return get_default_field_value(field, value) diff --git a/azure_iot_edge/datadog_checks/azure_iot_edge/config_models/instance.py b/azure_iot_edge/datadog_checks/azure_iot_edge/config_models/instance.py index c19a0a1343e3de..0e063890c92467 100644 --- a/azure_iot_edge/datadog_checks/azure_iot_edge/config_models/instance.py +++ b/azure_iot_edge/datadog_checks/azure_iot_edge/config_models/instance.py @@ -79,6 +79,7 @@ class Config: aws_service: Optional[str] bearer_token_auth: Optional[Union[bool, str]] bearer_token_path: Optional[str] + bearer_token_refresh_interval: Optional[int] connect_timeout: Optional[float] disable_generic_tags: Optional[bool] edge_agent_prometheus_url: str diff --git a/azure_iot_edge/datadog_checks/azure_iot_edge/data/conf.yaml.example b/azure_iot_edge/datadog_checks/azure_iot_edge/data/conf.yaml.example index fd64025417569a..84246ed2390448 100644 --- a/azure_iot_edge/datadog_checks/azure_iot_edge/data/conf.yaml.example +++ b/azure_iot_edge/datadog_checks/azure_iot_edge/data/conf.yaml.example @@ -157,6 +157,11 @@ instances: # # bearer_token_path: + ## @param bearer_token_refresh_interval - integer - optional - default: 60 + ## The refresh interval to keep the bearer token up-to-date. + # + # bearer_token_refresh_interval: 60 + ## @param ignore_metrics - list of strings - optional ## A list of metrics to ignore, the "*" wildcard can be used to match multiple metric names. ## The wildcard matching is done via fnmatch, it locates a match anywhere in the string. diff --git a/cilium/datadog_checks/cilium/config_models/defaults.py b/cilium/datadog_checks/cilium/config_models/defaults.py index ea88a286f5f6cb..f42d629977cc00 100644 --- a/cilium/datadog_checks/cilium/config_models/defaults.py +++ b/cilium/datadog_checks/cilium/config_models/defaults.py @@ -62,6 +62,10 @@ def instance_bearer_token_path(field, value): return get_default_field_value(field, value) +def instance_bearer_token_refresh_interval(field, value): + return 60 + + def instance_cache_metric_wildcards(field, value): return True diff --git a/cilium/datadog_checks/cilium/config_models/instance.py b/cilium/datadog_checks/cilium/config_models/instance.py index a725c472323d94..f15dc2c34cae7e 100644 --- a/cilium/datadog_checks/cilium/config_models/instance.py +++ b/cilium/datadog_checks/cilium/config_models/instance.py @@ -106,6 +106,7 @@ class Config: aws_service: Optional[str] bearer_token_auth: Optional[Union[bool, str]] bearer_token_path: Optional[str] + bearer_token_refresh_interval: Optional[int] cache_metric_wildcards: Optional[bool] cache_shared_labels: Optional[bool] collect_counters_with_distributions: Optional[bool] diff --git a/cockroachdb/datadog_checks/cockroachdb/config_models/defaults.py b/cockroachdb/datadog_checks/cockroachdb/config_models/defaults.py index 57c3662fc143da..39a2b7110ec0f5 100644 --- a/cockroachdb/datadog_checks/cockroachdb/config_models/defaults.py +++ b/cockroachdb/datadog_checks/cockroachdb/config_models/defaults.py @@ -58,6 +58,10 @@ def instance_bearer_token_path(field, value): return get_default_field_value(field, value) +def instance_bearer_token_refresh_interval(field, value): + return 60 + + def instance_cache_metric_wildcards(field, value): return True diff --git a/cockroachdb/datadog_checks/cockroachdb/config_models/instance.py b/cockroachdb/datadog_checks/cockroachdb/config_models/instance.py index fa2070aa1de31d..f3192f11e616a6 100644 --- a/cockroachdb/datadog_checks/cockroachdb/config_models/instance.py +++ b/cockroachdb/datadog_checks/cockroachdb/config_models/instance.py @@ -105,6 +105,7 @@ class Config: aws_service: Optional[str] bearer_token_auth: Optional[Union[bool, str]] bearer_token_path: Optional[str] + bearer_token_refresh_interval: Optional[int] cache_metric_wildcards: Optional[bool] cache_shared_labels: Optional[bool] collect_counters_with_distributions: Optional[bool] diff --git a/coredns/datadog_checks/coredns/config_models/defaults.py b/coredns/datadog_checks/coredns/config_models/defaults.py index 6df9b62190eb6f..4a8ac421f09fbf 100644 --- a/coredns/datadog_checks/coredns/config_models/defaults.py +++ b/coredns/datadog_checks/coredns/config_models/defaults.py @@ -58,6 +58,10 @@ def instance_bearer_token_path(field, value): return get_default_field_value(field, value) +def instance_bearer_token_refresh_interval(field, value): + return 60 + + def instance_cache_metric_wildcards(field, value): return True diff --git a/coredns/datadog_checks/coredns/config_models/instance.py b/coredns/datadog_checks/coredns/config_models/instance.py index fa2070aa1de31d..f3192f11e616a6 100644 --- a/coredns/datadog_checks/coredns/config_models/instance.py +++ b/coredns/datadog_checks/coredns/config_models/instance.py @@ -105,6 +105,7 @@ class Config: aws_service: Optional[str] bearer_token_auth: Optional[Union[bool, str]] bearer_token_path: Optional[str] + bearer_token_refresh_interval: Optional[int] cache_metric_wildcards: Optional[bool] cache_shared_labels: Optional[bool] collect_counters_with_distributions: Optional[bool] diff --git a/crio/datadog_checks/crio/config_models/defaults.py b/crio/datadog_checks/crio/config_models/defaults.py index 69f2ded98254ad..9d0d06c6805c65 100644 --- a/crio/datadog_checks/crio/config_models/defaults.py +++ b/crio/datadog_checks/crio/config_models/defaults.py @@ -58,6 +58,10 @@ def instance_bearer_token_path(field, value): return get_default_field_value(field, value) +def instance_bearer_token_refresh_interval(field, value): + return 60 + + def instance_connect_timeout(field, value): return get_default_field_value(field, value) diff --git a/crio/datadog_checks/crio/config_models/instance.py b/crio/datadog_checks/crio/config_models/instance.py index 4abc1ec8e3ff07..4bb176acb6d2f6 100644 --- a/crio/datadog_checks/crio/config_models/instance.py +++ b/crio/datadog_checks/crio/config_models/instance.py @@ -79,6 +79,7 @@ class Config: aws_service: Optional[str] bearer_token_auth: Optional[Union[bool, str]] bearer_token_path: Optional[str] + bearer_token_refresh_interval: Optional[int] connect_timeout: Optional[float] disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] diff --git a/crio/datadog_checks/crio/data/conf.yaml.example b/crio/datadog_checks/crio/data/conf.yaml.example index d60617af791d26..9499e4a9ed11c5 100644 --- a/crio/datadog_checks/crio/data/conf.yaml.example +++ b/crio/datadog_checks/crio/data/conf.yaml.example @@ -152,6 +152,11 @@ instances: # # bearer_token_path: + ## @param bearer_token_refresh_interval - integer - optional - default: 60 + ## The refresh interval to keep the bearer token up-to-date. + # + # bearer_token_refresh_interval: 60 + ## @param ignore_metrics - list of strings - optional ## A list of metrics to ignore, the "*" wildcard can be used to match multiple metric names. ## The wildcard matching is done via fnmatch, it locates a match anywhere in the string. 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 69f2ded98254ad..9d0d06c6805c65 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 @@ -58,6 +58,10 @@ def instance_bearer_token_path(field, value): return get_default_field_value(field, value) +def instance_bearer_token_refresh_interval(field, value): + return 60 + + def instance_connect_timeout(field, value): return get_default_field_value(field, value) 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 4abc1ec8e3ff07..4bb176acb6d2f6 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 @@ -79,6 +79,7 @@ class Config: aws_service: Optional[str] bearer_token_auth: Optional[Union[bool, str]] bearer_token_path: Optional[str] + bearer_token_refresh_interval: Optional[int] connect_timeout: Optional[float] disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] diff --git a/datadog_cluster_agent/datadog_checks/datadog_cluster_agent/data/auto_conf.yaml b/datadog_cluster_agent/datadog_checks/datadog_cluster_agent/data/auto_conf.yaml index cba18c1609eb61..0b7734e4966c17 100644 --- a/datadog_cluster_agent/datadog_checks/datadog_cluster_agent/data/auto_conf.yaml +++ b/datadog_cluster_agent/datadog_checks/datadog_cluster_agent/data/auto_conf.yaml @@ -160,6 +160,11 @@ instances: # # bearer_token_path: + ## @param bearer_token_refresh_interval - integer - optional - default: 60 + ## The refresh interval to keep the bearer token up-to-date. + # + # bearer_token_refresh_interval: 60 + ## @param ignore_metrics - list of strings - optional ## A list of metrics to ignore, the "*" wildcard can be used to match multiple metric names. ## The wildcard matching is done via fnmatch, it locates a match anywhere in the string. diff --git a/datadog_cluster_agent/datadog_checks/datadog_cluster_agent/data/conf.yaml.example b/datadog_cluster_agent/datadog_checks/datadog_cluster_agent/data/conf.yaml.example index 4a26a444dc6d01..c261599a611118 100644 --- a/datadog_cluster_agent/datadog_checks/datadog_cluster_agent/data/conf.yaml.example +++ b/datadog_cluster_agent/datadog_checks/datadog_cluster_agent/data/conf.yaml.example @@ -152,6 +152,11 @@ instances: # # bearer_token_path: + ## @param bearer_token_refresh_interval - integer - optional - default: 60 + ## The refresh interval to keep the bearer token up-to-date. + # + # bearer_token_refresh_interval: 60 + ## @param ignore_metrics - list of strings - optional ## A list of metrics to ignore, the "*" wildcard can be used to match multiple metric names. ## The wildcard matching is done via fnmatch, it locates a match anywhere in the string. diff --git a/etcd/datadog_checks/etcd/config_models/defaults.py b/etcd/datadog_checks/etcd/config_models/defaults.py index 907b624af2354d..3db7c1f1ea08fc 100644 --- a/etcd/datadog_checks/etcd/config_models/defaults.py +++ b/etcd/datadog_checks/etcd/config_models/defaults.py @@ -58,6 +58,10 @@ def instance_bearer_token_path(field, value): return get_default_field_value(field, value) +def instance_bearer_token_refresh_interval(field, value): + return 60 + + def instance_connect_timeout(field, value): return get_default_field_value(field, value) diff --git a/etcd/datadog_checks/etcd/config_models/instance.py b/etcd/datadog_checks/etcd/config_models/instance.py index f69406e267d8ed..9c391774389c0e 100644 --- a/etcd/datadog_checks/etcd/config_models/instance.py +++ b/etcd/datadog_checks/etcd/config_models/instance.py @@ -79,6 +79,7 @@ class Config: aws_service: Optional[str] bearer_token_auth: Optional[Union[bool, str]] bearer_token_path: Optional[str] + bearer_token_refresh_interval: Optional[int] connect_timeout: Optional[float] disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] diff --git a/etcd/datadog_checks/etcd/data/conf.yaml.example b/etcd/datadog_checks/etcd/data/conf.yaml.example index 86aab10a2e3222..cf72bb6b614d26 100644 --- a/etcd/datadog_checks/etcd/data/conf.yaml.example +++ b/etcd/datadog_checks/etcd/data/conf.yaml.example @@ -158,6 +158,11 @@ instances: # # bearer_token_path: + ## @param bearer_token_refresh_interval - integer - optional - default: 60 + ## The refresh interval to keep the bearer token up-to-date. + # + # bearer_token_refresh_interval: 60 + ## @param ignore_metrics - list of strings - optional ## A list of metrics to ignore, the "*" wildcard can be used to match multiple metric names. ## The wildcard matching is done via fnmatch, it locates a match anywhere in the string. diff --git a/external_dns/datadog_checks/external_dns/config_models/defaults.py b/external_dns/datadog_checks/external_dns/config_models/defaults.py index 69f2ded98254ad..9d0d06c6805c65 100644 --- a/external_dns/datadog_checks/external_dns/config_models/defaults.py +++ b/external_dns/datadog_checks/external_dns/config_models/defaults.py @@ -58,6 +58,10 @@ def instance_bearer_token_path(field, value): return get_default_field_value(field, value) +def instance_bearer_token_refresh_interval(field, value): + return 60 + + def instance_connect_timeout(field, value): return get_default_field_value(field, value) diff --git a/external_dns/datadog_checks/external_dns/config_models/instance.py b/external_dns/datadog_checks/external_dns/config_models/instance.py index 4abc1ec8e3ff07..4bb176acb6d2f6 100644 --- a/external_dns/datadog_checks/external_dns/config_models/instance.py +++ b/external_dns/datadog_checks/external_dns/config_models/instance.py @@ -79,6 +79,7 @@ class Config: aws_service: Optional[str] bearer_token_auth: Optional[Union[bool, str]] bearer_token_path: Optional[str] + bearer_token_refresh_interval: Optional[int] connect_timeout: Optional[float] disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] diff --git a/external_dns/datadog_checks/external_dns/data/conf.yaml.example b/external_dns/datadog_checks/external_dns/data/conf.yaml.example index 94b81ea1fad586..ca3fc95b21df16 100644 --- a/external_dns/datadog_checks/external_dns/data/conf.yaml.example +++ b/external_dns/datadog_checks/external_dns/data/conf.yaml.example @@ -152,6 +152,11 @@ instances: # # bearer_token_path: + ## @param bearer_token_refresh_interval - integer - optional - default: 60 + ## The refresh interval to keep the bearer token up-to-date. + # + # bearer_token_refresh_interval: 60 + ## @param ignore_metrics - list of strings - optional ## A list of metrics to ignore, the "*" wildcard can be used to match multiple metric names. ## The wildcard matching is done via fnmatch, it locates a match anywhere in the string. diff --git a/gitlab/datadog_checks/gitlab/config_models/defaults.py b/gitlab/datadog_checks/gitlab/config_models/defaults.py index 91b10a12687181..3602c4294ebbac 100644 --- a/gitlab/datadog_checks/gitlab/config_models/defaults.py +++ b/gitlab/datadog_checks/gitlab/config_models/defaults.py @@ -66,6 +66,10 @@ def instance_bearer_token_path(field, value): return get_default_field_value(field, value) +def instance_bearer_token_refresh_interval(field, value): + return 60 + + def instance_connect_timeout(field, value): return get_default_field_value(field, value) diff --git a/gitlab/datadog_checks/gitlab/config_models/instance.py b/gitlab/datadog_checks/gitlab/config_models/instance.py index c90ffb178c318c..c9f03353569c80 100644 --- a/gitlab/datadog_checks/gitlab/config_models/instance.py +++ b/gitlab/datadog_checks/gitlab/config_models/instance.py @@ -80,6 +80,7 @@ class Config: aws_service: Optional[str] bearer_token_auth: Optional[Union[bool, str]] bearer_token_path: Optional[str] + bearer_token_refresh_interval: Optional[int] connect_timeout: Optional[float] disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] diff --git a/gitlab/datadog_checks/gitlab/data/conf.yaml.example b/gitlab/datadog_checks/gitlab/data/conf.yaml.example index cd9e3f2e0b3360..0d9c8ed6142fe8 100644 --- a/gitlab/datadog_checks/gitlab/data/conf.yaml.example +++ b/gitlab/datadog_checks/gitlab/data/conf.yaml.example @@ -123,6 +123,11 @@ instances: # # bearer_token_path: + ## @param bearer_token_refresh_interval - integer - optional - default: 60 + ## The refresh interval to keep the bearer token up-to-date. + # + # bearer_token_refresh_interval: 60 + ## @param ignore_metrics - list of strings - optional ## A list of metrics to ignore, the "*" wildcard can be used to match multiple metric names. ## The wildcard matching is done via fnmatch, it locates a match anywhere in the string. 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 69f2ded98254ad..9d0d06c6805c65 100644 --- a/gitlab_runner/datadog_checks/gitlab_runner/config_models/defaults.py +++ b/gitlab_runner/datadog_checks/gitlab_runner/config_models/defaults.py @@ -58,6 +58,10 @@ def instance_bearer_token_path(field, value): return get_default_field_value(field, value) +def instance_bearer_token_refresh_interval(field, value): + return 60 + + def instance_connect_timeout(field, value): return get_default_field_value(field, value) 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 c3d7f1b5af8d17..b924b6cdecdf71 100644 --- a/gitlab_runner/datadog_checks/gitlab_runner/config_models/instance.py +++ b/gitlab_runner/datadog_checks/gitlab_runner/config_models/instance.py @@ -79,6 +79,7 @@ class Config: aws_service: Optional[str] bearer_token_auth: Optional[Union[bool, str]] bearer_token_path: Optional[str] + bearer_token_refresh_interval: Optional[int] connect_timeout: Optional[float] disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] diff --git a/gitlab_runner/datadog_checks/gitlab_runner/data/conf.yaml.example b/gitlab_runner/datadog_checks/gitlab_runner/data/conf.yaml.example index 2e0ca501168d4c..7b109c001af726 100644 --- a/gitlab_runner/datadog_checks/gitlab_runner/data/conf.yaml.example +++ b/gitlab_runner/datadog_checks/gitlab_runner/data/conf.yaml.example @@ -206,6 +206,11 @@ instances: # # bearer_token_path: + ## @param bearer_token_refresh_interval - integer - optional - default: 60 + ## The refresh interval to keep the bearer token up-to-date. + # + # bearer_token_refresh_interval: 60 + ## @param ignore_metrics - list of strings - optional ## A list of metrics to ignore, the "*" wildcard can be used to match multiple metric names. ## The wildcard matching is done via fnmatch, it locates a match anywhere in the string. diff --git a/haproxy/datadog_checks/haproxy/config_models/defaults.py b/haproxy/datadog_checks/haproxy/config_models/defaults.py index 495d85469d7dbb..bab91ef702fae6 100644 --- a/haproxy/datadog_checks/haproxy/config_models/defaults.py +++ b/haproxy/datadog_checks/haproxy/config_models/defaults.py @@ -62,6 +62,10 @@ def instance_bearer_token_path(field, value): return get_default_field_value(field, value) +def instance_bearer_token_refresh_interval(field, value): + return 60 + + def instance_cache_metric_wildcards(field, value): return True diff --git a/haproxy/datadog_checks/haproxy/config_models/instance.py b/haproxy/datadog_checks/haproxy/config_models/instance.py index 2d123ca926d707..19c5864c0250e5 100644 --- a/haproxy/datadog_checks/haproxy/config_models/instance.py +++ b/haproxy/datadog_checks/haproxy/config_models/instance.py @@ -106,6 +106,7 @@ class Config: aws_service: Optional[str] bearer_token_auth: Optional[Union[bool, str]] bearer_token_path: Optional[str] + bearer_token_refresh_interval: Optional[int] cache_metric_wildcards: Optional[bool] cache_shared_labels: Optional[bool] collate_status_tags_per_host: Optional[bool] diff --git a/ibm_ace/datadog_checks/ibm_ace/config_models/instance.py b/ibm_ace/datadog_checks/ibm_ace/config_models/instance.py index e526d3b11b870b..bb976cdb5a5c4e 100644 --- a/ibm_ace/datadog_checks/ibm_ace/config_models/instance.py +++ b/ibm_ace/datadog_checks/ibm_ace/config_models/instance.py @@ -41,7 +41,7 @@ class Config: mq_port: int mq_server: str = Field(..., min_length=1) mq_user: Optional[str] = Field(None, min_length=1) - mqcd_version: Optional[Literal[1, 2, 3, 4, 5, 6, 7, 8, 9]] + mqcd_version: Optional[Literal['1', '2', '3', '4', '5', '6', '7', '8', '9']] persist_connections: Optional[bool] queue_manager: str = Field(..., min_length=1) resource_statistics: Optional[bool] diff --git a/istio/datadog_checks/istio/config_models/defaults.py b/istio/datadog_checks/istio/config_models/defaults.py index 6df4f43b579d65..8f46b65b6a4cbe 100644 --- a/istio/datadog_checks/istio/config_models/defaults.py +++ b/istio/datadog_checks/istio/config_models/defaults.py @@ -58,6 +58,10 @@ def instance_bearer_token_path(field, value): return get_default_field_value(field, value) +def instance_bearer_token_refresh_interval(field, value): + return 60 + + def instance_cache_metric_wildcards(field, value): return True diff --git a/istio/datadog_checks/istio/config_models/instance.py b/istio/datadog_checks/istio/config_models/instance.py index 2aaffa41b28058..468344752715ee 100644 --- a/istio/datadog_checks/istio/config_models/instance.py +++ b/istio/datadog_checks/istio/config_models/instance.py @@ -105,6 +105,7 @@ class Config: aws_service: Optional[str] bearer_token_auth: Optional[Union[bool, str]] bearer_token_path: Optional[str] + bearer_token_refresh_interval: Optional[int] cache_metric_wildcards: Optional[bool] cache_shared_labels: Optional[bool] collect_counters_with_distributions: Optional[bool] diff --git a/kube_apiserver_metrics/datadog_checks/kube_apiserver_metrics/config_models/defaults.py b/kube_apiserver_metrics/datadog_checks/kube_apiserver_metrics/config_models/defaults.py index cff3f9cd913de5..71cb526970c55b 100644 --- a/kube_apiserver_metrics/datadog_checks/kube_apiserver_metrics/config_models/defaults.py +++ b/kube_apiserver_metrics/datadog_checks/kube_apiserver_metrics/config_models/defaults.py @@ -58,6 +58,10 @@ def instance_bearer_token_path(field, value): return get_default_field_value(field, value) +def instance_bearer_token_refresh_interval(field, value): + return 60 + + def instance_connect_timeout(field, value): return get_default_field_value(field, value) diff --git a/kube_apiserver_metrics/datadog_checks/kube_apiserver_metrics/config_models/instance.py b/kube_apiserver_metrics/datadog_checks/kube_apiserver_metrics/config_models/instance.py index 2ef20d8398fddf..63cc98cac8b62e 100644 --- a/kube_apiserver_metrics/datadog_checks/kube_apiserver_metrics/config_models/instance.py +++ b/kube_apiserver_metrics/datadog_checks/kube_apiserver_metrics/config_models/instance.py @@ -79,6 +79,7 @@ class Config: aws_service: Optional[str] bearer_token_auth: Optional[Union[bool, str]] bearer_token_path: Optional[str] + bearer_token_refresh_interval: Optional[int] connect_timeout: Optional[float] disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] diff --git a/kube_apiserver_metrics/datadog_checks/kube_apiserver_metrics/data/conf.yaml.example b/kube_apiserver_metrics/datadog_checks/kube_apiserver_metrics/data/conf.yaml.example index 949cd1341d31fb..186957e46f032a 100644 --- a/kube_apiserver_metrics/datadog_checks/kube_apiserver_metrics/data/conf.yaml.example +++ b/kube_apiserver_metrics/datadog_checks/kube_apiserver_metrics/data/conf.yaml.example @@ -159,6 +159,11 @@ instances: # # bearer_token_path: + ## @param bearer_token_refresh_interval - integer - optional - default: 60 + ## The refresh interval to keep the bearer token up-to-date. + # + # bearer_token_refresh_interval: 60 + ## @param ignore_metrics - list of strings - optional ## A list of metrics to ignore, the "*" wildcard can be used to match multiple metric names. ## The wildcard matching is done via fnmatch, it locates a match anywhere in the string. diff --git a/kube_controller_manager/datadog_checks/kube_controller_manager/data/conf.yaml.example b/kube_controller_manager/datadog_checks/kube_controller_manager/data/conf.yaml.example index 1910fa96199328..435300dcc3d20f 100644 --- a/kube_controller_manager/datadog_checks/kube_controller_manager/data/conf.yaml.example +++ b/kube_controller_manager/datadog_checks/kube_controller_manager/data/conf.yaml.example @@ -194,6 +194,11 @@ instances: # # bearer_token_path: + ## @param bearer_token_refresh_interval - integer - optional - default: 60 + ## The refresh interval to keep the bearer token up-to-date. + # + # bearer_token_refresh_interval: 60 + ## @param ignore_metrics - list of strings - optional ## A list of metrics to ignore, the "*" wildcard can be used to match multiple metric names. ## The wildcard matching is done via fnmatch, it locates a match anywhere in the string. diff --git a/kube_dns/datadog_checks/kube_dns/data/conf.yaml.example b/kube_dns/datadog_checks/kube_dns/data/conf.yaml.example index 50c58ada1bc4e1..113cead2b57016 100644 --- a/kube_dns/datadog_checks/kube_dns/data/conf.yaml.example +++ b/kube_dns/datadog_checks/kube_dns/data/conf.yaml.example @@ -152,6 +152,11 @@ instances: # # bearer_token_path: + ## @param bearer_token_refresh_interval - integer - optional - default: 60 + ## The refresh interval to keep the bearer token up-to-date. + # + # bearer_token_refresh_interval: 60 + ## @param ignore_metrics - list of strings - optional ## A list of metrics to ignore, the "*" wildcard can be used to match multiple metric names. ## The wildcard matching is done via fnmatch, it locates a match anywhere in the string. diff --git a/kube_metrics_server/datadog_checks/kube_metrics_server/data/conf.yaml.example b/kube_metrics_server/datadog_checks/kube_metrics_server/data/conf.yaml.example index bc25d22b884edd..87213d42d8aea9 100644 --- a/kube_metrics_server/datadog_checks/kube_metrics_server/data/conf.yaml.example +++ b/kube_metrics_server/datadog_checks/kube_metrics_server/data/conf.yaml.example @@ -159,6 +159,11 @@ instances: # # bearer_token_path: + ## @param bearer_token_refresh_interval - integer - optional - default: 60 + ## The refresh interval to keep the bearer token up-to-date. + # + # bearer_token_refresh_interval: 60 + ## @param ignore_metrics - list of strings - optional ## A list of metrics to ignore, the "*" wildcard can be used to match multiple metric names. ## The wildcard matching is done via fnmatch, it locates a match anywhere in the string. diff --git a/kube_proxy/datadog_checks/kube_proxy/data/conf.yaml.example b/kube_proxy/datadog_checks/kube_proxy/data/conf.yaml.example index 8084a1d2eb60e2..64784125890d85 100644 --- a/kube_proxy/datadog_checks/kube_proxy/data/conf.yaml.example +++ b/kube_proxy/datadog_checks/kube_proxy/data/conf.yaml.example @@ -152,6 +152,11 @@ instances: # # bearer_token_path: + ## @param bearer_token_refresh_interval - integer - optional - default: 60 + ## The refresh interval to keep the bearer token up-to-date. + # + # bearer_token_refresh_interval: 60 + ## @param ignore_metrics - list of strings - optional ## A list of metrics to ignore, the "*" wildcard can be used to match multiple metric names. ## The wildcard matching is done via fnmatch, it locates a match anywhere in the string. diff --git a/kube_scheduler/datadog_checks/kube_scheduler/config_models/defaults.py b/kube_scheduler/datadog_checks/kube_scheduler/config_models/defaults.py index 089678f5bdd29c..6ee371d2b5dacd 100644 --- a/kube_scheduler/datadog_checks/kube_scheduler/config_models/defaults.py +++ b/kube_scheduler/datadog_checks/kube_scheduler/config_models/defaults.py @@ -58,6 +58,10 @@ def instance_bearer_token_path(field, value): return get_default_field_value(field, value) +def instance_bearer_token_refresh_interval(field, value): + return 60 + + def instance_connect_timeout(field, value): return get_default_field_value(field, value) diff --git a/kube_scheduler/datadog_checks/kube_scheduler/config_models/instance.py b/kube_scheduler/datadog_checks/kube_scheduler/config_models/instance.py index 385eac7f96511c..061f8ef9b11151 100644 --- a/kube_scheduler/datadog_checks/kube_scheduler/config_models/instance.py +++ b/kube_scheduler/datadog_checks/kube_scheduler/config_models/instance.py @@ -79,6 +79,7 @@ class Config: aws_service: Optional[str] bearer_token_auth: Optional[Union[bool, str]] bearer_token_path: Optional[str] + bearer_token_refresh_interval: Optional[int] connect_timeout: Optional[float] disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] diff --git a/kube_scheduler/datadog_checks/kube_scheduler/data/conf.yaml.example b/kube_scheduler/datadog_checks/kube_scheduler/data/conf.yaml.example index 492098014298dc..14cb7402c502a0 100644 --- a/kube_scheduler/datadog_checks/kube_scheduler/data/conf.yaml.example +++ b/kube_scheduler/datadog_checks/kube_scheduler/data/conf.yaml.example @@ -173,6 +173,11 @@ instances: # # bearer_token_path: + ## @param bearer_token_refresh_interval - integer - optional - default: 60 + ## The refresh interval to keep the bearer token up-to-date. + # + # bearer_token_refresh_interval: 60 + ## @param ignore_metrics - list of strings - optional ## A list of metrics to ignore, the "*" wildcard can be used to match multiple metric names. ## The wildcard matching is done via fnmatch, it locates a match anywhere in the string. diff --git a/kubelet/datadog_checks/kubelet/data/conf.yaml.example b/kubelet/datadog_checks/kubelet/data/conf.yaml.example index 0092557adede3d..2e5733a77dc90d 100644 --- a/kubelet/datadog_checks/kubelet/data/conf.yaml.example +++ b/kubelet/datadog_checks/kubelet/data/conf.yaml.example @@ -180,6 +180,11 @@ instances: # # bearer_token_path: + ## @param bearer_token_refresh_interval - integer - optional - default: 60 + ## The refresh interval to keep the bearer token up-to-date. + # + # bearer_token_refresh_interval: 60 + ## @param ignore_metrics - list of strings - optional ## A list of metrics to ignore, the "*" wildcard can be used to match multiple metric names. ## The wildcard matching is done via fnmatch, it locates a match anywhere in the string. diff --git a/kubernetes_state/datadog_checks/kubernetes_state/data/conf.yaml.example b/kubernetes_state/datadog_checks/kubernetes_state/data/conf.yaml.example index 5af9e3bebee6ff..a68fd87f2e34da 100644 --- a/kubernetes_state/datadog_checks/kubernetes_state/data/conf.yaml.example +++ b/kubernetes_state/datadog_checks/kubernetes_state/data/conf.yaml.example @@ -166,6 +166,11 @@ instances: # # bearer_token_path: + ## @param bearer_token_refresh_interval - integer - optional - default: 60 + ## The refresh interval to keep the bearer token up-to-date. + # + # bearer_token_refresh_interval: 60 + ## @param ignore_metrics - list of strings - optional ## A list of metrics to ignore, the "*" wildcard can be used to match multiple metric names. ## The wildcard matching is done via fnmatch, it locates a match anywhere in the string. diff --git a/linkerd/datadog_checks/linkerd/config_models/defaults.py b/linkerd/datadog_checks/linkerd/config_models/defaults.py index 5404df7483cdb1..2923804e186a0c 100644 --- a/linkerd/datadog_checks/linkerd/config_models/defaults.py +++ b/linkerd/datadog_checks/linkerd/config_models/defaults.py @@ -58,6 +58,10 @@ def instance_bearer_token_path(field, value): return get_default_field_value(field, value) +def instance_bearer_token_refresh_interval(field, value): + return 60 + + def instance_cache_metric_wildcards(field, value): return True diff --git a/linkerd/datadog_checks/linkerd/config_models/instance.py b/linkerd/datadog_checks/linkerd/config_models/instance.py index fa2070aa1de31d..f3192f11e616a6 100644 --- a/linkerd/datadog_checks/linkerd/config_models/instance.py +++ b/linkerd/datadog_checks/linkerd/config_models/instance.py @@ -105,6 +105,7 @@ class Config: aws_service: Optional[str] bearer_token_auth: Optional[Union[bool, str]] bearer_token_path: Optional[str] + bearer_token_refresh_interval: Optional[int] cache_metric_wildcards: Optional[bool] cache_shared_labels: Optional[bool] collect_counters_with_distributions: Optional[bool] 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 cd7781c23f0117..ac37081d21df71 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 @@ -58,6 +58,10 @@ def instance_bearer_token_path(field, value): return get_default_field_value(field, value) +def instance_bearer_token_refresh_interval(field, value): + return 60 + + def instance_collect_nginx_histograms(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 32ef19a4f460d3..d5d0ab2db4c19b 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 @@ -79,6 +79,7 @@ class Config: aws_service: Optional[str] bearer_token_auth: Optional[Union[bool, str]] bearer_token_path: Optional[str] + bearer_token_refresh_interval: Optional[int] collect_nginx_histograms: Optional[bool] connect_timeout: Optional[float] disable_generic_tags: Optional[bool] diff --git a/nginx_ingress_controller/datadog_checks/nginx_ingress_controller/data/conf.yaml.example b/nginx_ingress_controller/datadog_checks/nginx_ingress_controller/data/conf.yaml.example index 2278c55feebc1b..1c9693a0059906 100644 --- a/nginx_ingress_controller/datadog_checks/nginx_ingress_controller/data/conf.yaml.example +++ b/nginx_ingress_controller/datadog_checks/nginx_ingress_controller/data/conf.yaml.example @@ -160,6 +160,11 @@ instances: # # bearer_token_path: + ## @param bearer_token_refresh_interval - integer - optional - default: 60 + ## The refresh interval to keep the bearer token up-to-date. + # + # bearer_token_refresh_interval: 60 + ## @param ignore_metrics - list of strings - optional ## A list of metrics to ignore, the "*" wildcard can be used to match multiple metric names. ## The wildcard matching is done via fnmatch, it locates a match anywhere in the string. diff --git a/openmetrics/datadog_checks/openmetrics/config_models/defaults.py b/openmetrics/datadog_checks/openmetrics/config_models/defaults.py index 75c2ee66ac4f93..9d8aefa19cbd9f 100644 --- a/openmetrics/datadog_checks/openmetrics/config_models/defaults.py +++ b/openmetrics/datadog_checks/openmetrics/config_models/defaults.py @@ -58,6 +58,10 @@ def instance_bearer_token_path(field, value): return get_default_field_value(field, value) +def instance_bearer_token_refresh_interval(field, value): + return 60 + + def instance_cache_metric_wildcards(field, value): return True diff --git a/openmetrics/datadog_checks/openmetrics/config_models/instance.py b/openmetrics/datadog_checks/openmetrics/config_models/instance.py index dfe88470d8bb72..83ff4cc176732f 100644 --- a/openmetrics/datadog_checks/openmetrics/config_models/instance.py +++ b/openmetrics/datadog_checks/openmetrics/config_models/instance.py @@ -105,6 +105,7 @@ class Config: aws_service: Optional[str] bearer_token_auth: Optional[Union[bool, str]] bearer_token_path: Optional[str] + bearer_token_refresh_interval: Optional[int] cache_metric_wildcards: Optional[bool] cache_shared_labels: Optional[bool] collect_counters_with_distributions: Optional[bool] diff --git a/scylla/datadog_checks/scylla/config_models/defaults.py b/scylla/datadog_checks/scylla/config_models/defaults.py index 68914cfcab3832..5e6ad4215c3898 100644 --- a/scylla/datadog_checks/scylla/config_models/defaults.py +++ b/scylla/datadog_checks/scylla/config_models/defaults.py @@ -58,6 +58,10 @@ def instance_bearer_token_path(field, value): return get_default_field_value(field, value) +def instance_bearer_token_refresh_interval(field, value): + return 60 + + def instance_connect_timeout(field, value): return get_default_field_value(field, value) diff --git a/scylla/datadog_checks/scylla/config_models/instance.py b/scylla/datadog_checks/scylla/config_models/instance.py index 59aa919e3b001f..bb428d9526b62d 100644 --- a/scylla/datadog_checks/scylla/config_models/instance.py +++ b/scylla/datadog_checks/scylla/config_models/instance.py @@ -79,6 +79,7 @@ class Config: aws_service: Optional[str] bearer_token_auth: Optional[Union[bool, str]] bearer_token_path: Optional[str] + bearer_token_refresh_interval: Optional[int] connect_timeout: Optional[float] disable_generic_tags: Optional[bool] empty_default_hostname: Optional[bool] diff --git a/scylla/datadog_checks/scylla/data/conf.yaml.example b/scylla/datadog_checks/scylla/data/conf.yaml.example index c6b0802c2d568e..b4f78f1eec954a 100644 --- a/scylla/datadog_checks/scylla/data/conf.yaml.example +++ b/scylla/datadog_checks/scylla/data/conf.yaml.example @@ -169,6 +169,11 @@ instances: # # bearer_token_path: + ## @param bearer_token_refresh_interval - integer - optional - default: 60 + ## The refresh interval to keep the bearer token up-to-date. + # + # bearer_token_refresh_interval: 60 + ## @param ignore_metrics - list of strings - optional ## A list of metrics to ignore, the "*" wildcard can be used to match multiple metric names. ## The wildcard matching is done via fnmatch, it locates a match anywhere in the string. diff --git a/snowflake/datadog_checks/snowflake/config_models/instance.py b/snowflake/datadog_checks/snowflake/config_models/instance.py index c374f47a1cbc28..5b7fa80d136a73 100644 --- a/snowflake/datadog_checks/snowflake/config_models/instance.py +++ b/snowflake/datadog_checks/snowflake/config_models/instance.py @@ -11,7 +11,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 @@ -59,7 +59,7 @@ class Config: private_key_password: Optional[str] private_key_path: Optional[str] role: str - schema_: Optional[str] = Field(None, alias='schema') + schema: Optional[str] service: Optional[str] tags: Optional[Sequence[str]] token: Optional[str]