From b71abbfa5ca22952f210dc299c4ca1bc389efd10 Mon Sep 17 00:00:00 2001 From: Ofek Lev Date: Thu, 20 Feb 2020 20:08:10 -0500 Subject: [PATCH 1/2] Add `service` option to default configuration --- apache/assets/configuration/spec.yaml | 4 ++-- .../apache/data/conf.yaml.example | 17 ++++++++++++++++- .../configuration/init_config/default.yaml | 1 + .../configuration/init_config/service.yaml | 7 +++++++ .../configuration/instances/default.yaml | 1 + .../configuration/instances/service.yaml | 7 +++++++ .../tooling/templates/configuration/logs.yaml | 3 ++- .../{check_name}/assets/configuration/spec.yaml | 6 +++--- .../{check_name}/data/conf.yaml.example | 14 ++++++++++++++ .../{check_name}/assets/configuration/spec.yaml | 4 ++-- .../{check_name}/data/conf.yaml.example | 14 ++++++++++++++ .../configuration/consumers/test_example.py | 10 +++++++++- kong/assets/configuration/spec.yaml | 4 ++-- kong/datadog_checks/kong/data/conf.yaml.example | 17 ++++++++++++++++- vault/assets/configuration/spec.yaml | 4 ++-- .../datadog_checks/vault/data/conf.yaml.example | 17 ++++++++++++++++- 16 files changed, 114 insertions(+), 16 deletions(-) create mode 100644 datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/init_config/default.yaml create mode 100644 datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/init_config/service.yaml create mode 100644 datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/instances/service.yaml diff --git a/apache/assets/configuration/spec.yaml b/apache/assets/configuration/spec.yaml index a4902ae62d7a4..382885aa86f47 100644 --- a/apache/assets/configuration/spec.yaml +++ b/apache/assets/configuration/spec.yaml @@ -5,6 +5,7 @@ files: - template: init_config options: - template: init_config/http + - template: init_config/default - template: instances options: - name: apache_status_url @@ -14,8 +15,7 @@ files: example: http://localhost/server-status?auto type: string - template: instances/http - - template: instances/tags - - template: instances/global + - template: instances/default - template: logs example: - type: file diff --git a/apache/datadog_checks/apache/data/conf.yaml.example b/apache/datadog_checks/apache/data/conf.yaml.example index ca8c3716e7632..454a7d5b5a594 100644 --- a/apache/datadog_checks/apache/data/conf.yaml.example +++ b/apache/datadog_checks/apache/data/conf.yaml.example @@ -34,6 +34,13 @@ init_config: # # timeout: 10 + ## @param service - string - optional + ## Attach tag `service:` to every metric, event, and service check emitted by this integration. + ## + ## Additionally, this sets the default `service` for every log source. + # + # service: + ## Every instance is scheduled independent of the others. # instances: @@ -281,6 +288,13 @@ instances: # - : # - : + ## @param service - string - optional + ## Attach tag `service:` to every metric, event, and service check emitted by this integration. + ## + ## Overrides any `service` defined in the `init_config` section. + # + # service: + ## @param min_collection_interval - number - optional - default: 15 ## This changes the collection interval of the check. For more information, see: ## https://docs.datadoghq.com/developers/write_agent_check/#collection-interval @@ -300,8 +314,9 @@ instances: ## port / path / channel_path - required - Set port if type is tcp or udp. ## Set path if type is file. ## Set channel_path if type is windows_event. -## service - required - Name of the service that generated the log ## source - required - Attribute that defines which Integration sent the logs +## service - required - Name of the service that generated the log. +## Overrides any `service` defined in the `init_config` section. ## sourcecategory - optional - Multiple value attribute. Used to refine the source attribute ## tags - optional - Add tags to the collected logs ## diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/init_config/default.yaml b/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/init_config/default.yaml new file mode 100644 index 0000000000000..fa3a001e465cc --- /dev/null +++ b/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/init_config/default.yaml @@ -0,0 +1 @@ +- template: init_config/service diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/init_config/service.yaml b/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/init_config/service.yaml new file mode 100644 index 0000000000000..6823e890a1c98 --- /dev/null +++ b/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/init_config/service.yaml @@ -0,0 +1,7 @@ +name: service +value: + type: string +description: | + Attach tag `service:` to every metric, event, and service check emitted by this integration. + + Additionally, this sets the default `service` for every log source. 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 d6734d34635e0..48900d29ec229 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,2 +1,3 @@ - template: instances/tags +- template: instances/service - template: instances/global diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/instances/service.yaml b/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/instances/service.yaml new file mode 100644 index 0000000000000..1c18c2d95663f --- /dev/null +++ b/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/instances/service.yaml @@ -0,0 +1,7 @@ +name: service +value: + type: string +description: | + Attach tag `service:` to every metric, event, and service check emitted by this integration. + + Overrides any `service` defined in the `init_config` section. diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/logs.yaml b/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/logs.yaml index 258646cca1b9e..ab14315dcf110 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/logs.yaml +++ b/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/logs.yaml @@ -6,8 +6,9 @@ description: | port / path / channel_path - required - Set port if type is tcp or udp. Set path if type is file. Set channel_path if type is windows_event. - service - required - Name of the service that generated the log source - required - Attribute that defines which Integration sent the logs + service - required - Name of the service that generated the log. + Overrides any `service` defined in the `init_config` section. sourcecategory - optional - Multiple value attribute. Used to refine the source attribute tags - optional - Add tags to the collected logs diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/templates/integration/check/{check_name}/assets/configuration/spec.yaml b/datadog_checks_dev/datadog_checks/dev/tooling/templates/integration/check/{check_name}/assets/configuration/spec.yaml index c4175656d2ee2..9670b1f65b739 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/templates/integration/check/{check_name}/assets/configuration/spec.yaml +++ b/datadog_checks_dev/datadog_checks/dev/tooling/templates/integration/check/{check_name}/assets/configuration/spec.yaml @@ -3,8 +3,8 @@ files: - name: {check_name}.yaml options: - template: init_config - options: [] + options: + - template: init_config/default - template: instances options: - - template: instances/tags - - template: instances/global + - template: instances/default diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/templates/integration/check/{check_name}/datadog_checks/{check_name}/data/conf.yaml.example b/datadog_checks_dev/datadog_checks/dev/tooling/templates/integration/check/{check_name}/datadog_checks/{check_name}/data/conf.yaml.example index 745b4afccafd9..c5d4ee3e7500c 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/templates/integration/check/{check_name}/datadog_checks/{check_name}/data/conf.yaml.example +++ b/datadog_checks_dev/datadog_checks/dev/tooling/templates/integration/check/{check_name}/datadog_checks/{check_name}/data/conf.yaml.example @@ -2,6 +2,13 @@ # init_config: + ## @param service - string - optional + ## Attach tag `service:` to every metric, event, and service check emitted by this integration. + ## + ## Additionally, this sets the default `service` for every log source. + # + # service: + ## Every instance is scheduled independent of the others. # instances: @@ -16,6 +23,13 @@ instances: # - : # - : + ## @param service - string - optional + ## Attach tag `service:` to every metric, event, and service check emitted by this integration. + ## + ## Overrides any `service` defined in the `init_config` section. + # + # service: + ## @param min_collection_interval - number - optional - default: 15 ## This changes the collection interval of the check. For more information, see: ## https://docs.datadoghq.com/developers/write_agent_check/#collection-interval diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/templates/integration/jmx/{check_name}/assets/configuration/spec.yaml b/datadog_checks_dev/datadog_checks/dev/tooling/templates/integration/jmx/{check_name}/assets/configuration/spec.yaml index c253bd0ddca10..95fc6e53fb8ea 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/templates/integration/jmx/{check_name}/assets/configuration/spec.yaml +++ b/datadog_checks_dev/datadog_checks/dev/tooling/templates/integration/jmx/{check_name}/assets/configuration/spec.yaml @@ -16,10 +16,10 @@ files: value: example: true type: boolean + - template: init_config/default - template: instances options: - - template: instances/tags - - template: instances/global + - template: instances/default - name: metrics.yaml example_name: metrics.yaml options: diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/templates/integration/jmx/{check_name}/datadog_checks/{check_name}/data/conf.yaml.example b/datadog_checks_dev/datadog_checks/dev/tooling/templates/integration/jmx/{check_name}/datadog_checks/{check_name}/data/conf.yaml.example index 56ca4d4220eff..edaebc138a357 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/templates/integration/jmx/{check_name}/datadog_checks/{check_name}/data/conf.yaml.example +++ b/datadog_checks_dev/datadog_checks/dev/tooling/templates/integration/jmx/{check_name}/datadog_checks/{check_name}/data/conf.yaml.example @@ -12,6 +12,13 @@ init_config: # collect_default_metrics: true + ## @param service - string - optional + ## Attach tag `service:` to every metric, event, and service check emitted by this integration. + ## + ## Additionally, this sets the default `service` for every log source. + # + # service: + ## Every instance is scheduled independent of the others. # instances: @@ -26,6 +33,13 @@ instances: # - : # - : + ## @param service - string - optional + ## Attach tag `service:` to every metric, event, and service check emitted by this integration. + ## + ## Overrides any `service` defined in the `init_config` section. + # + # service: + ## @param min_collection_interval - number - optional - default: 15 ## This changes the collection interval of the check. For more information, see: ## https://docs.datadoghq.com/developers/write_agent_check/#collection-interval diff --git a/datadog_checks_dev/tests/tooling/configuration/consumers/test_example.py b/datadog_checks_dev/tests/tooling/configuration/consumers/test_example.py index bce138b9b137b..bedca6e51b7c1 100644 --- a/datadog_checks_dev/tests/tooling/configuration/consumers/test_example.py +++ b/datadog_checks_dev/tests/tooling/configuration/consumers/test_example.py @@ -242,8 +242,9 @@ def test_section_example_indent(): ## port / path / channel_path - required - Set port if type is tcp or udp. ## Set path if type is file. ## Set channel_path if type is windows_event. - ## service - required - Name of the service that generated the log ## source - required - Attribute that defines which Integration sent the logs + ## service - required - Name of the service that generated the log. + ## Overrides any `service` defined in the `init_config` section. ## sourcecategory - optional - Multiple value attribute. Used to refine the source attribute ## tags - optional - Add tags to the collected logs ## @@ -842,6 +843,13 @@ def test_template_recursion(): # - : # - : + ## @param service - string - optional + ## Attach tag `service:` to every metric, event, and service check emitted by this integration. + ## + ## Overrides any `service` defined in the `init_config` section. + # + # service: + ## @param min_collection_interval - number - optional - default: 15 ## This changes the collection interval of the check. For more information, see: ## https://docs.datadoghq.com/developers/write_agent_check/#collection-interval diff --git a/kong/assets/configuration/spec.yaml b/kong/assets/configuration/spec.yaml index ff09ba851c5b4..4f59dc63d7677 100644 --- a/kong/assets/configuration/spec.yaml +++ b/kong/assets/configuration/spec.yaml @@ -5,6 +5,7 @@ files: - template: init_config options: - template: init_config/http + - template: init_config/default - template: instances options: - name: kong_status_url @@ -14,8 +15,7 @@ files: example: http://localhost:8001/status/ type: string - template: instances/http - - template: instances/tags - - template: instances/global + - template: instances/default - template: logs example: - type: file diff --git a/kong/datadog_checks/kong/data/conf.yaml.example b/kong/datadog_checks/kong/data/conf.yaml.example index 04cfcefca24d0..c3f4b7010da0e 100644 --- a/kong/datadog_checks/kong/data/conf.yaml.example +++ b/kong/datadog_checks/kong/data/conf.yaml.example @@ -34,6 +34,13 @@ init_config: # # timeout: 10 + ## @param service - string - optional + ## Attach tag `service:` to every metric, event, and service check emitted by this integration. + ## + ## Additionally, this sets the default `service` for every log source. + # + # service: + ## Every instance is scheduled independent of the others. # instances: @@ -281,6 +288,13 @@ instances: # - : # - : + ## @param service - string - optional + ## Attach tag `service:` to every metric, event, and service check emitted by this integration. + ## + ## Overrides any `service` defined in the `init_config` section. + # + # service: + ## @param min_collection_interval - number - optional - default: 15 ## This changes the collection interval of the check. For more information, see: ## https://docs.datadoghq.com/developers/write_agent_check/#collection-interval @@ -300,8 +314,9 @@ instances: ## port / path / channel_path - required - Set port if type is tcp or udp. ## Set path if type is file. ## Set channel_path if type is windows_event. -## service - required - Name of the service that generated the log ## source - required - Attribute that defines which Integration sent the logs +## service - required - Name of the service that generated the log. +## Overrides any `service` defined in the `init_config` section. ## sourcecategory - optional - Multiple value attribute. Used to refine the source attribute ## tags - optional - Add tags to the collected logs ## diff --git a/vault/assets/configuration/spec.yaml b/vault/assets/configuration/spec.yaml index 12ef6971b4b8c..b6c81b623a972 100644 --- a/vault/assets/configuration/spec.yaml +++ b/vault/assets/configuration/spec.yaml @@ -5,6 +5,7 @@ files: - template: init_config options: - template: init_config/http + - template: init_config/default - template: instances options: - name: api_url @@ -36,8 +37,7 @@ files: example: false type: boolean - template: instances/http - - template: instances/tags - - template: instances/global + - template: instances/default - template: logs example: - type: file diff --git a/vault/datadog_checks/vault/data/conf.yaml.example b/vault/datadog_checks/vault/data/conf.yaml.example index 2fbb76248b291..e0e177d0612f3 100644 --- a/vault/datadog_checks/vault/data/conf.yaml.example +++ b/vault/datadog_checks/vault/data/conf.yaml.example @@ -34,6 +34,13 @@ init_config: # # timeout: 10 + ## @param service - string - optional + ## Attach tag `service:` to every metric, event, and service check emitted by this integration. + ## + ## Additionally, this sets the default `service` for every log source. + # + # service: + ## Every instance is scheduled independent of the others. # instances: @@ -302,6 +309,13 @@ instances: # - : # - : + ## @param service - string - optional + ## Attach tag `service:` to every metric, event, and service check emitted by this integration. + ## + ## Overrides any `service` defined in the `init_config` section. + # + # service: + ## @param min_collection_interval - number - optional - default: 15 ## This changes the collection interval of the check. For more information, see: ## https://docs.datadoghq.com/developers/write_agent_check/#collection-interval @@ -321,8 +335,9 @@ instances: ## port / path / channel_path - required - Set port if type is tcp or udp. ## Set path if type is file. ## Set channel_path if type is windows_event. -## service - required - Name of the service that generated the log ## source - required - Attribute that defines which Integration sent the logs +## service - required - Name of the service that generated the log. +## Overrides any `service` defined in the `init_config` section. ## sourcecategory - optional - Multiple value attribute. Used to refine the source attribute ## tags - optional - Add tags to the collected logs ## From 8a1268004b9e66985157f2e5bf6a38b57ed50969 Mon Sep 17 00:00:00 2001 From: Ofek Lev Date: Fri, 21 Feb 2020 11:40:05 -0500 Subject: [PATCH 2/2] Apply suggestions from code review Co-Authored-By: ruthnaebeck <19349244+ruthnaebeck@users.noreply.github.com> --- apache/datadog_checks/apache/data/conf.yaml.example | 6 +++--- .../templates/configuration/init_config/service.yaml | 2 +- .../tooling/templates/configuration/instances/service.yaml | 2 +- .../dev/tooling/templates/configuration/logs.yaml | 2 +- .../datadog_checks/{check_name}/data/conf.yaml.example | 4 ++-- .../datadog_checks/{check_name}/data/conf.yaml.example | 4 ++-- .../tests/tooling/configuration/consumers/test_example.py | 4 ++-- kong/datadog_checks/kong/data/conf.yaml.example | 6 +++--- vault/datadog_checks/vault/data/conf.yaml.example | 6 +++--- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/apache/datadog_checks/apache/data/conf.yaml.example b/apache/datadog_checks/apache/data/conf.yaml.example index 454a7d5b5a594..b18887496f800 100644 --- a/apache/datadog_checks/apache/data/conf.yaml.example +++ b/apache/datadog_checks/apache/data/conf.yaml.example @@ -35,7 +35,7 @@ init_config: # timeout: 10 ## @param service - string - optional - ## Attach tag `service:` to every metric, event, and service check emitted by this integration. + ## Attach the tag `service:` to every metric, event, and service check emitted by this integration. ## ## Additionally, this sets the default `service` for every log source. # @@ -289,7 +289,7 @@ instances: # - : ## @param service - string - optional - ## Attach tag `service:` to every metric, event, and service check emitted by this integration. + ## Attach the tag `service:` to every metric, event, and service check emitted by this integration. ## ## Overrides any `service` defined in the `init_config` section. # @@ -315,7 +315,7 @@ instances: ## Set path if type is file. ## Set channel_path if type is windows_event. ## source - required - Attribute that defines which Integration sent the logs -## service - required - Name of the service that generated the log. +## service - required - The name of the service that generates the log. ## Overrides any `service` defined in the `init_config` section. ## sourcecategory - optional - Multiple value attribute. Used to refine the source attribute ## tags - optional - Add tags to the collected logs diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/init_config/service.yaml b/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/init_config/service.yaml index 6823e890a1c98..0c8be786fef00 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/init_config/service.yaml +++ b/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/init_config/service.yaml @@ -2,6 +2,6 @@ name: service value: type: string description: | - Attach tag `service:` to every metric, event, and service check emitted by this integration. + Attach the tag `service:` to every metric, event, and service check emitted by this integration. Additionally, this sets the default `service` for every log source. diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/instances/service.yaml b/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/instances/service.yaml index 1c18c2d95663f..7d7beef50b1e6 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/instances/service.yaml +++ b/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/instances/service.yaml @@ -2,6 +2,6 @@ name: service value: type: string description: | - Attach tag `service:` to every metric, event, and service check emitted by this integration. + Attach the tag `service:` to every metric, event, and service check emitted by this integration. Overrides any `service` defined in the `init_config` section. diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/logs.yaml b/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/logs.yaml index ab14315dcf110..3efa5381e124c 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/logs.yaml +++ b/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/logs.yaml @@ -7,7 +7,7 @@ description: | Set path if type is file. Set channel_path if type is windows_event. source - required - Attribute that defines which Integration sent the logs - service - required - Name of the service that generated the log. + service - required - The name of the service that generates the log. Overrides any `service` defined in the `init_config` section. sourcecategory - optional - Multiple value attribute. Used to refine the source attribute tags - optional - Add tags to the collected logs diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/templates/integration/check/{check_name}/datadog_checks/{check_name}/data/conf.yaml.example b/datadog_checks_dev/datadog_checks/dev/tooling/templates/integration/check/{check_name}/datadog_checks/{check_name}/data/conf.yaml.example index c5d4ee3e7500c..aa04469d1fbd8 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/templates/integration/check/{check_name}/datadog_checks/{check_name}/data/conf.yaml.example +++ b/datadog_checks_dev/datadog_checks/dev/tooling/templates/integration/check/{check_name}/datadog_checks/{check_name}/data/conf.yaml.example @@ -3,7 +3,7 @@ init_config: ## @param service - string - optional - ## Attach tag `service:` to every metric, event, and service check emitted by this integration. + ## Attach the tag `service:` to every metric, event, and service check emitted by this integration. ## ## Additionally, this sets the default `service` for every log source. # @@ -24,7 +24,7 @@ instances: # - : ## @param service - string - optional - ## Attach tag `service:` to every metric, event, and service check emitted by this integration. + ## Attach the tag `service:` to every metric, event, and service check emitted by this integration. ## ## Overrides any `service` defined in the `init_config` section. # diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/templates/integration/jmx/{check_name}/datadog_checks/{check_name}/data/conf.yaml.example b/datadog_checks_dev/datadog_checks/dev/tooling/templates/integration/jmx/{check_name}/datadog_checks/{check_name}/data/conf.yaml.example index edaebc138a357..3efe941f5fb74 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/templates/integration/jmx/{check_name}/datadog_checks/{check_name}/data/conf.yaml.example +++ b/datadog_checks_dev/datadog_checks/dev/tooling/templates/integration/jmx/{check_name}/datadog_checks/{check_name}/data/conf.yaml.example @@ -13,7 +13,7 @@ init_config: collect_default_metrics: true ## @param service - string - optional - ## Attach tag `service:` to every metric, event, and service check emitted by this integration. + ## Attach the tag `service:` to every metric, event, and service check emitted by this integration. ## ## Additionally, this sets the default `service` for every log source. # @@ -34,7 +34,7 @@ instances: # - : ## @param service - string - optional - ## Attach tag `service:` to every metric, event, and service check emitted by this integration. + ## Attach the tag `service:` to every metric, event, and service check emitted by this integration. ## ## Overrides any `service` defined in the `init_config` section. # diff --git a/datadog_checks_dev/tests/tooling/configuration/consumers/test_example.py b/datadog_checks_dev/tests/tooling/configuration/consumers/test_example.py index bedca6e51b7c1..0d3d1861a3b36 100644 --- a/datadog_checks_dev/tests/tooling/configuration/consumers/test_example.py +++ b/datadog_checks_dev/tests/tooling/configuration/consumers/test_example.py @@ -243,7 +243,7 @@ def test_section_example_indent(): ## Set path if type is file. ## Set channel_path if type is windows_event. ## source - required - Attribute that defines which Integration sent the logs - ## service - required - Name of the service that generated the log. + ## service - required - The name of the service that generates the log. ## Overrides any `service` defined in the `init_config` section. ## sourcecategory - optional - Multiple value attribute. Used to refine the source attribute ## tags - optional - Add tags to the collected logs @@ -844,7 +844,7 @@ def test_template_recursion(): # - : ## @param service - string - optional - ## Attach tag `service:` to every metric, event, and service check emitted by this integration. + ## Attach the tag `service:` to every metric, event, and service check emitted by this integration. ## ## Overrides any `service` defined in the `init_config` section. # diff --git a/kong/datadog_checks/kong/data/conf.yaml.example b/kong/datadog_checks/kong/data/conf.yaml.example index c3f4b7010da0e..fb21ead7215e3 100644 --- a/kong/datadog_checks/kong/data/conf.yaml.example +++ b/kong/datadog_checks/kong/data/conf.yaml.example @@ -35,7 +35,7 @@ init_config: # timeout: 10 ## @param service - string - optional - ## Attach tag `service:` to every metric, event, and service check emitted by this integration. + ## Attach the tag `service:` to every metric, event, and service check emitted by this integration. ## ## Additionally, this sets the default `service` for every log source. # @@ -289,7 +289,7 @@ instances: # - : ## @param service - string - optional - ## Attach tag `service:` to every metric, event, and service check emitted by this integration. + ## Attach the tag `service:` to every metric, event, and service check emitted by this integration. ## ## Overrides any `service` defined in the `init_config` section. # @@ -315,7 +315,7 @@ instances: ## Set path if type is file. ## Set channel_path if type is windows_event. ## source - required - Attribute that defines which Integration sent the logs -## service - required - Name of the service that generated the log. +## service - required - The name of the service that generates the log. ## Overrides any `service` defined in the `init_config` section. ## sourcecategory - optional - Multiple value attribute. Used to refine the source attribute ## tags - optional - Add tags to the collected logs diff --git a/vault/datadog_checks/vault/data/conf.yaml.example b/vault/datadog_checks/vault/data/conf.yaml.example index e0e177d0612f3..fea55f8ec7f79 100644 --- a/vault/datadog_checks/vault/data/conf.yaml.example +++ b/vault/datadog_checks/vault/data/conf.yaml.example @@ -35,7 +35,7 @@ init_config: # timeout: 10 ## @param service - string - optional - ## Attach tag `service:` to every metric, event, and service check emitted by this integration. + ## Attach the tag `service:` to every metric, event, and service check emitted by this integration. ## ## Additionally, this sets the default `service` for every log source. # @@ -310,7 +310,7 @@ instances: # - : ## @param service - string - optional - ## Attach tag `service:` to every metric, event, and service check emitted by this integration. + ## Attach the tag `service:` to every metric, event, and service check emitted by this integration. ## ## Overrides any `service` defined in the `init_config` section. # @@ -336,7 +336,7 @@ instances: ## Set path if type is file. ## Set channel_path if type is windows_event. ## source - required - Attribute that defines which Integration sent the logs -## service - required - Name of the service that generated the log. +## service - required - The name of the service that generates the log. ## Overrides any `service` defined in the `init_config` section. ## sourcecategory - optional - Multiple value attribute. Used to refine the source attribute ## tags - optional - Add tags to the collected logs