luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Change circonus_broker_search_tag to circonus_broker_select_tag to match option in consul

This commit is contained in:
matt maier 2016-07-22 15:16:14 -04:00
parent 02d71eb6d3
commit 7f2af04bcd
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
command/agent/config.go
View File

@ -308,7 +308,7 @@ type Telemetry struct {
// should be used based on *where* this particular instance is running. // should be used based on *where* this particular instance is running.
// (e.g. a specific geo location or datacenter, dc:sfo) // (e.g. a specific geo location or datacenter, dc:sfo)
// Default: none // 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 // Ports is used to encapsulate the various ports we bind to for network

2
command/agent/config_parse.go
View File

@ -503,7 +503,7 @@ func parseTelemetry(result **Telemetry, list *ast.ObjectList) error {
"circonus_check_instance_id", "circonus_check_instance_id",
"circonus_check_search_tag", "circonus_check_search_tag",
"circonus_broker_id", "circonus_broker_id",
"circonus_broker_search_tag", "circonus_broker_select_tag",
} }
if err := checkHCLKeys(listVal, valid); err != nil { if err := checkHCLKeys(listVal, valid); err != nil {
return err return err

2
website/source/docs/agent/config.html.md
View File

@ -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"). 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` * `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. 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. 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 * `leave_on_interrupt`: Enables gracefully leaving when receiving the