From 7f2af04bcd53deab0e9c873a10e2a79b84a3b80f Mon Sep 17 00:00:00 2001 From: matt maier Date: Fri, 22 Jul 2016 15:16:14 -0400 Subject: [PATCH] Change circonus_broker_search_tag to circonus_broker_select_tag to match option in consul --- command/agent/config.go | 2 +- command/agent/config_parse.go | 2 +- website/source/docs/agent/config.html.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/command/agent/config.go b/command/agent/config.go index c1a698991..b7c820bce 100644 --- a/command/agent/config.go +++ b/command/agent/config.go @@ -308,7 +308,7 @@ type Telemetry struct { // should be used based on *where* this particular instance is running. // (e.g. a specific geo location or datacenter, dc:sfo) // Default: none - CirconusBrokerSelectTag string `mapstructure:"circonus_broker_search_tag"` + CirconusBrokerSelectTag string `mapstructure:"circonus_broker_select_tag"` } // Ports is used to encapsulate the various ports we bind to for network diff --git a/command/agent/config_parse.go b/command/agent/config_parse.go index 9a9d79712..6abacfb10 100644 --- a/command/agent/config_parse.go +++ b/command/agent/config_parse.go @@ -503,7 +503,7 @@ func parseTelemetry(result **Telemetry, list *ast.ObjectList) error { "circonus_check_instance_id", "circonus_check_search_tag", "circonus_broker_id", - "circonus_broker_search_tag", + "circonus_broker_select_tag", } if err := checkHCLKeys(listVal, valid); err != nil { return err diff --git a/website/source/docs/agent/config.html.md b/website/source/docs/agent/config.html.md index 5f3e84d18..d12df7e89 100644 --- a/website/source/docs/agent/config.html.md +++ b/website/source/docs/agent/config.html.md @@ -213,7 +213,7 @@ nodes, unless otherwise specified: A special tag which, when coupled with the instance id, helps to narrow down the search results when neither a Submission URL or Check ID is provided. By default, this is set to service:app (e.g. "service:consul"). * `circonus_broker_id` The ID of a specific Circonus Broker to use when creating a new check. The numeric portion of `broker._cid` field in a Broker API object. If metric management is enabled and neither a Submission URL nor Check ID is provided, an attempt will be made to search for an existing check using Instance ID and Search Tag. If one is not found, a new HTTPTRAP check will be created. By default, this is not used and a random Enterprise Broker is selected, or, the default Circonus Public Broker. - * `circonus_broker_search_tag` + * `circonus_broker_select_tag` A special tag which will be used to select a Circonus Broker when a Broker ID is not provided. The best use of this is to as a hint for which broker should be used based on *where* this particular instance is running (e.g. a specific geo location or datacenter, dc:sfo). By default, this is not used. * `leave_on_interrupt`: Enables gracefully leaving when receiving the