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

Merge pull request #3611 from jens-solarisbank/master

Browse source 
Fix typos in metric names. #3610
This commit is contained in:
Chelsea Komlo 2017-12-01 10:25:18 -05:00 committed by GitHub
parent 94ebdc652f 5680fcccc2
commit 297c4ddbf9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
command/agent/consul/client.go
View file

@ -395,7 +395,7 @@ func (c *ServiceClient) sync() error {
return err
}
sdereg++
metrics.IncrCounter([]string{"client", "consul", "service_deregisrations"}, 1)
metrics.IncrCounter([]string{"client", "consul", "service_deregistrations"}, 1)
}
// Track services whose ports have changed as their checks may also
@ -420,7 +420,7 @@ func (c *ServiceClient) sync() error {
return err
}
sreg++
metrics.IncrCounter([]string{"client", "consul", "service_regisrations"}, 1)
metrics.IncrCounter([]string{"client", "consul", "service_registrations"}, 1)
}
// Remove Nomad checks in Consul but unknown locally
@ -439,7 +439,7 @@ func (c *ServiceClient) sync() error {
return err
}
cdereg++
metrics.IncrCounter([]string{"client", "consul", "check_deregisrations"}, 1)
metrics.IncrCounter([]string{"client", "consul", "check_deregistrations"}, 1)
}
// Add Nomad checks missing from Consul
@ -455,7 +455,7 @@ func (c *ServiceClient) sync() error {
return err
}
creg++
metrics.IncrCounter([]string{"client", "consul", "check_regisrations"}, 1)
metrics.IncrCounter([]string{"client", "consul", "check_registrations"}, 1)
// Handle starting scripts
if script, ok := c.scripts[id]; ok {

6
integrations/grafana_dashboards/sample_grafana_dashboard.json
View file

@ -81,10 +81,10 @@
"steppedLine": false,
"targets": [
{
"expr": "nomad_client_consul_check_regisrations",
"expr": "nomad_client_consul_check_registrations",
"format": "time_series",
"intervalFactor": 2,
"metric": "nomad_client_consul_check_regisrations",
"metric": "nomad_client_consul_check_registrations",
"refId": "B",
"step": 20
}
@ -531,4 +531,4 @@
"timezone": "",
"title": "Prometheus Nomad",
"version": 7
}
}