add 'apatit_mp_data_status' metric

Author: willowweevil

internal/exporter/exporter.go

@@ -158,7 +158,11 @@ func (e *Exporter) RefreshMetrics() ([]prometheus.Labels, error) {
 		// check monitoring point status and set it as ZERO if it was incorrect
 		if item.Status > 1 || item.Status < 0 {
 			e.log.WithFields(
-				logrus.Fields{"mp_id": item.ID, "mp_name": item.Name}).Errorf("incorrect monitoring points status: %d", item.Status)
+				logrus.Fields{
+					"mp_id": item.ID, 
+					"mp_name": item.Name,
+					"status": item.Status,
+				}).Errorf("incorrect monitoring points status: %d", item.Status)
 			item.Status = 0
 		}
 
@@ -186,8 +190,21 @@ func (e *Exporter) processTaskStatResults(taskStatResults *client.TaskStatEntry)
 // processTaskStatGraphResultItem processes one record (monitoring point) and updates metrics.
 func (e *Exporter) processTaskStatGraphResultItem(item *client.MonitoringPointEntry, refreshStartTime time.Time) []prometheus.Labels {
 	if len(item.Result) == 0 {
+		locationName := item.Name
+		if e.Config.EngMPNames {
+			locationName = translator.GetEngLocation(item.Name)
+		}
+		MPDataStatus.WithLabelValues(
+			strconv.Itoa(e.taskInfo.ID), 
+			e.taskInfo.ServiceName,
+			item.ID,
+			locationName,
+			).Set(0)
+
 		e.log.WithFields(
-			logrus.Fields{"mp_id": item.ID, "mp_name": item.Name}).Warn("No results found for MP")
+			logrus.Fields{
+				"mp_id": item.ID, 
+				"mp_name": item.Name}).Warn("No results found for MP")
 		return nil
 	}
 
@@ -198,6 +215,14 @@ func (e *Exporter) processTaskStatGraphResultItem(item *client.MonitoringPointEn
 		e.updateMetrics(res, labels, item.Status, refreshStartTime)
 		processedLabels = append(processedLabels, labels)
 	}
+
+	MPDataStatus.WithLabelValues(
+		strconv.Itoa(e.taskInfo.ID), 
+		e.taskInfo.ServiceName,
+		item.ID,
+		processedLabels[0][LabelMPName],
+		).Set(1)
+
 	return processedLabels
 }
 

internal/exporter/metrics.go

@@ -96,12 +96,22 @@ var (
 		prometheus.GaugeOpts{
 			Namespace: namespace,
 			Subsystem: subsystemMP,
-			Name:      "status",
+			Name:      "mp_status",
 			Help:      "Status of the monitoring point (1 = up/processed, 0 = stale/down).",
 		},
 		mpLabels,
 	)
 
+	MPDataStatus = prometheus.NewGaugeVec(
+		prometheus.GaugeOpts{
+			Namespace: namespace,
+			Subsystem: subsystemMP,
+			Name:      "data_status",
+			Help:      "Status of the data for the monitoring point (1 = has data, 0 = no data).",
+		},
+		[]string{LabelTaskID, LabelTaskName, LabelMPID, LabelMPName},
+	)
+
 	MPConnectSeconds = prometheus.NewGaugeVec(
 		prometheus.GaugeOpts{
 			Namespace: namespace,
@@ -192,6 +202,7 @@ func RegisterMetrics() {
 		ELoopsTotal,
 		EErrorsTotal,
 		MPStatus,
+		MPDataStatus,
 		MPConnectSeconds,
 		MPDNSLookupSeconds,
 		MPServerProcessingSeconds,
@@ -206,6 +217,7 @@ func RegisterMetrics() {
 // DeleteSeries deletes "Monitoring Point" related metrics
 func DeleteSeries(labels prometheus.Labels) {
 	MPStatus.Delete(labels)
+	MPDataStatus.Delete(labels)
 	MPConnectSeconds.Delete(labels)
 	MPDNSLookupSeconds.Delete(labels)
 	MPServerProcessingSeconds.Delete(labels)