Merge pull request #3611 from jens-solarisbank/master

Fix typos in metric names. #3610
hashicorp · Dec 1, 2017 · 4a6ceee · 4a6ceee
2 parents 6457735 + 0fe9b07
commit 4a6ceee
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/command/agent/consul/client.go b/command/agent/consul/client.go
@@ -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 {

diff --git a/integrations/grafana_dashboards/sample_grafana_dashboard.json b/integrations/grafana_dashboards/sample_grafana_dashboard.json
@@ -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
-}
+}