Merge branch 'master' of github.com:hashicorp/nomad

This commit is contained in:
Alex Dadgar
2017-02-24 15:01:24 -08:00

View File

@@ -684,6 +684,10 @@ func (c *Command) setupTelemetry(config *Config) error {
cfg.CheckManager.Broker.ID = telConfig.CirconusBrokerID
cfg.CheckManager.Broker.SelectTag = telConfig.CirconusBrokerSelectTag
if cfg.CheckManager.Check.DisplayName == "" {
cfg.CheckManager.Check.DisplayName = "Nomad"
}
if cfg.CheckManager.API.TokenApp == "" {
cfg.CheckManager.API.TokenApp = "nomad"
}