Fix metrics

Author: Rulox

collector/nginx_plus.go

@@ -102,13 +102,13 @@ func NewNginxPlusCollector(nginxClient *plusclient.NginxClient, namespace string
 			"health_checks_unhealthy": newStreamUpstreamServerMetric(namespace, "health_checks_unhealthy", "How many times the server became unhealthy (state 'unhealthy')"),
 		},
 		streamZoneSyncMetrics: map[string]*prometheus.Desc{
-			"bytes_in":        newStreamZoneSyncMetric(namespace, "bytes_in", "Bytes received by this zone"),
-			"bytes_out":       newStreamZoneSyncMetric(namespace, "bytes_out", "Bytes sent by this zone"),
-			"msgs_in":         newStreamZoneSyncMetric(namespace, "msgs_in", "Total messages received by ths zone"),
-			"msgs_out":        newStreamZoneSyncMetric(namespace, "msgs_out", "Total messages sent by this zone"),
+			"bytes_in":        newStreamZoneSyncMetric(namespace, "bytes_in", "Bytes received by this node"),
+			"bytes_out":       newStreamZoneSyncMetric(namespace, "bytes_out", "Bytes sent by this node"),
+			"msgs_in":         newStreamZoneSyncMetric(namespace, "msgs_in", "Total messages received by this node"),
+			"msgs_out":        newStreamZoneSyncMetric(namespace, "msgs_out", "Total messages sent by this node"),
 			"nodes_online":    newStreamZoneSyncMetric(namespace, "nodes_online", "Number of peers this node is conected to"),
-			"records_pending": newStreamZoneSyncZonesMetric(namespace, "records_pending", "The number of records that need to be sent to the cluster"),
-			"records_total":   newStreamZoneSyncZonesMetric(namespace, "records_total", "The total number of records stored in the shared memory zone"),
+			"records_pending": newStreamZoneSyncZoneMetric(namespace, "records_pending", "The number of records that need to be sent to the cluster"),
+			"records_total":   newStreamZoneSyncZoneMetric(namespace, "records_total", "The total number of records stored in the shared memory zone"),
 		},
 		upMetric: newUpMetric(namespace),
 	}
@@ -305,9 +305,9 @@ func (c *NginxPlusCollector) Collect(ch chan<- prometheus.Metric) {
 
 	for name, zone := range stats.StreamZoneSync.Zones {
 		ch <- prometheus.MustNewConstMetric(c.streamZoneSyncMetrics["records_pending"],
-			prometheus.CounterValue, float64(zone.RecordsPending), name)
+			prometheus.GaugeValue, float64(zone.RecordsPending), name)
 		ch <- prometheus.MustNewConstMetric(c.streamZoneSyncMetrics["records_total"],
-			prometheus.CounterValue, float64(zone.RecordsTotal), name)
+			prometheus.GaugeValue, float64(zone.RecordsTotal), name)
 	}
 
 	ch <- prometheus.MustNewConstMetric(c.streamZoneSyncMetrics["bytes_in"],
@@ -319,7 +319,7 @@ func (c *NginxPlusCollector) Collect(ch chan<- prometheus.Metric) {
 	ch <- prometheus.MustNewConstMetric(c.streamZoneSyncMetrics["msgs_out"],
 		prometheus.CounterValue, float64(stats.StreamZoneSync.Status.MsgsOut))
 	ch <- prometheus.MustNewConstMetric(c.streamZoneSyncMetrics["nodes_online"],
-		prometheus.CounterValue, float64(stats.StreamZoneSync.Status.NodesOnline))
+		prometheus.GaugeValue, float64(stats.StreamZoneSync.Status.NodesOnline))
 }
 
 var upstreamServerStates = map[string]float64{
@@ -359,6 +359,6 @@ func newStreamZoneSyncMetric(namespace string, metricName string, docString stri
 	return prometheus.NewDesc(prometheus.BuildFQName(namespace, "stream_zone_sync_status", metricName), docString, nil, nil)
 }
 
-func newStreamZoneSyncZonesMetric(namespace string, metricName string, docString string) *prometheus.Desc {
-	return prometheus.NewDesc(prometheus.BuildFQName(namespace, "stream_zone_sync", metricName), docString, []string{"server_zone"}, nil)
+func newStreamZoneSyncZoneMetric(namespace string, metricName string, docString string) *prometheus.Desc {
+	return prometheus.NewDesc(prometheus.BuildFQName(namespace, "stream_zone_sync_zone", metricName), docString, []string{"zone"}, nil)
 }