Collect operator autopilot health metrics

Signed-off-by: Charles Zaffery <[email protected]>
prometheus · Nov 20, 2020 · fb2569a · fb2569a
2 parents 55ca968 + 4a57f65
commit fb2569a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/consul_exporter.go b/consul_exporter.go
@@ -290,7 +290,7 @@ func (e *Exporter) collectLeaderMetric(ch chan<- prometheus.Metric) bool {
 }
 
 func (e *Exporter) collectOperatorAutopilotServerHealthMetric(ch chan<- prometheus.Metric) bool {
-	if e.operatorHealth == false {
+	if !e.operatorHealth {
 		return true
 	}
 	clusterHealth, err := e.client.Operator().AutopilotServerHealth(&queryOptions)
@@ -306,14 +306,14 @@ func (e *Exporter) collectOperatorAutopilotServerHealthMetric(ch chan<- promethe
 			operatorAutopilotLastTerm, prometheus.CounterValue, float64(server.LastTerm), server.ID, server.Name, server.Address, server.Version,
 		)
 		server_health := 0.0
-		if server.Healthy == true {
+		if server.Healthy {
 			server_health = 1.0
 		}
 		ch <- prometheus.MustNewConstMetric(
 			operatorAutopilotHealthy, prometheus.CounterValue, server_health, server.ID, server.Name, server.Address, server.Version,
 		)
 		server_voter := 0.0
-		if server.Voter == true {
+		if server.Voter {
 			server_voter = 1.0
 		}
 		ch <- prometheus.MustNewConstMetric(

diff --git a/consul_exporter_test.go b/consul_exporter_test.go
@@ -40,7 +40,7 @@ func TestNewExporter(t *testing.T) {
 	}
 
 	for _, test := range cases {
-		_, err := NewExporter(consulOpts{uri: test.uri}, "", ".*", true, log.NewNopLogger())
+		_, err := NewExporter(consulOpts{uri: test.uri}, "", ".*", true, true, log.NewNopLogger())
 		if test.ok && err != nil {
 			t.Errorf("expected no error w/ %q, but got %q", test.uri, err)
 		}
@@ -208,7 +208,7 @@ consul_service_tag{node="{{ .Node }}",service_id="foobar",tag="tag2"} 1
 					uri:          addr,
 					timeout:      time.Duration(time.Second),
 					requestLimit: tc.requestLimit,
-				}, "", "", true, log.NewNopLogger())
+				}, "", "", true, true, log.NewNopLogger())
 			if err != nil {
 				t.Errorf("expected no error but got %q", err)
 			}