Skip to content

Commit 328e6ff

Browse files
authored
move disable_legacy_service_tag up in the conf.yaml.example (#21743)
* Slight re-arragement of config params * changelog * Update spec.yaml * Update conf.yaml.example * Update 21743.fixed
1 parent d605a5b commit 328e6ff

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

consul/assets/configuration/spec.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ files:
99
- template: instances
1010
options:
1111
- name: url
12+
display_priority: 2
1213
required: true
1314
description: |
1415
Where your Consul HTTP server lives,
@@ -125,9 +126,10 @@ files:
125126
example: 1
126127

127128
- name: disable_legacy_service_tag
129+
display_priority: 1
128130
description: |
129-
Whether or not to stop submitting the tag `service` that has been renamed
130-
to `consul_service` and disable the associated deprecation warning.
131+
Whether to stop submitting the `service` tag, which has been renamed to `consul_service`, and to disable
132+
the associated deprecation warning. Datadog recommends setting this to `true`.
131133
value:
132134
type: boolean
133135
display_default: false

consul/changelog.d/21743.fixed

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Move `disable_legacy_service_tag` config param up in conf.yaml.example

consul/datadog_checks/consul/data/conf.yaml.example

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,12 @@ instances:
5252
#
5353
- url: http://localhost:8500
5454

55+
## @param disable_legacy_service_tag - boolean - optional - default: false
56+
## Whether to stop submitting the `service` tag, which has been renamed to `consul_service`, and to disable
57+
## the associated deprecation warning. Datadog recommends setting this to `true`.
58+
#
59+
disable_legacy_service_tag: true
60+
5561
## @param use_prometheus_endpoint - boolean - optional - default: false
5662
## Whether to use the Prometheus endpoint to get more metrics.
5763
## The Prometheus endpoint is available for Consul versions v1.1.0 or higher.
@@ -136,12 +142,6 @@ instances:
136142
#
137143
# threads_count: 1
138144

139-
## @param disable_legacy_service_tag - boolean - optional - default: false
140-
## Whether or not to stop submitting the tag `service` that has been renamed
141-
## to `consul_service` and disable the associated deprecation warning.
142-
#
143-
disable_legacy_service_tag: true
144-
145145
## @param collect_health_checks - boolean - optional - default: false
146146
## Whether to enable new service health checks from this instance. Enabling this will
147147
## also emit an event for every failed service health check.

0 commit comments

Comments
 (0)