Use native metrics instead of collector (#395)

Author: assafad1

cmd/main.go

@@ -308,8 +308,8 @@ func main() {
 		os.Exit(1)
 	}
 
-	if err := monitoring.SetupMetrics(); err != nil {
-		setupLog.Error(err, "unable to set up metrics")
+	if err := monitoring.RegisterMetrics(); err != nil {
+		setupLog.Error(err, "unable to register metrics")
 		os.Exit(1)
 	}
 

internal/controller/coralogix/coralogix-reconciler/coralogix_reconciler.go

@@ -35,6 +35,7 @@ import (
 	cxsdk "github.com/coralogix/coralogix-management-sdk/go"
 
 	"github.com/coralogix/coralogix-operator/internal/config"
+	"github.com/coralogix/coralogix-operator/internal/monitoring"
 	"github.com/coralogix/coralogix-operator/internal/utils"
 )
 
@@ -196,6 +197,19 @@ func ManageErrorWithRequeue(ctx context.Context, obj client.Object, reason strin
 		}
 	}
 
+	monitoring.DeleteResourceInfoMetric(
+		obj.GetObjectKind().GroupVersionKind().Kind,
+		obj.GetName(),
+		obj.GetNamespace(),
+		"synced",
+	)
+	monitoring.SetResourceInfoMetric(
+		obj.GetObjectKind().GroupVersionKind().Kind,
+		obj.GetName(),
+		obj.GetNamespace(),
+		"unsynced",
+	)
+
 	return reconcile.Result{}, err
 }
 
@@ -211,6 +225,19 @@ func ManageSuccessWithRequeue(ctx context.Context, obj client.Object,
 		}
 	}
 
+	monitoring.DeleteResourceInfoMetric(
+		obj.GetObjectKind().GroupVersionKind().Kind,
+		obj.GetName(),
+		obj.GetNamespace(),
+		"unsynced",
+	)
+	monitoring.SetResourceInfoMetric(
+		obj.GetObjectKind().GroupVersionKind().Kind,
+		obj.GetName(),
+		obj.GetNamespace(),
+		"synced",
+	)
+
 	return reconcile.Result{RequeueAfter: interval}, nil
 }
 

internal/monitoring/collectors.go

@@ -22,19 +22,6 @@ import (
 
 var metricsLog = logf.Log.WithName("metrics")
 
-func SetupMetrics() error {
-	metricsLog.V(1).Info("Setting up metrics")
-	if err := RegisterMetrics(); err != nil {
-		return err
-	}
-
-	if err := RegisterCollectors(); err != nil {
-		return err
-	}
-
-	return nil
-}
-
 func RegisterMetrics() error {
 	metricsLog.V(1).Info("Registering metrics")
 	for _, metric := range metricsList {
@@ -50,15 +37,32 @@ func RegisterMetrics() error {
 
 var metricsList = []prometheus.Collector{
 	operatorInfoMetric,
+	resourceInfoMetric,
 	resourceRejectionsTotalMetric,
 }
 
-var operatorInfoMetric = prometheus.NewGaugeVec(
-	prometheus.GaugeOpts{
-		Name: "cx_operator_info",
-		Help: "Coralogix Operator information.",
-	},
-	[]string{"go_version", "operator_version", "coralogix_url"},
+var (
+	operatorInfoMetric = prometheus.NewGaugeVec(
+		prometheus.GaugeOpts{
+			Name: "cx_operator_info",
+			Help: "Coralogix Operator information.",
+		},
+		[]string{"go_version", "operator_version", "coralogix_url"},
+	)
+	resourceInfoMetric = prometheus.NewGaugeVec(
+		prometheus.GaugeOpts{
+			Name: "cx_operator_resource_info",
+			Help: "Coralogix Operator custom resource information.",
+		},
+		[]string{"kind", "name", "namespace", "status"},
+	)
+	resourceRejectionsTotalMetric = prometheus.NewCounterVec(
+		prometheus.CounterOpts{
+			Name: "cx_operator_resource_rejections_total",
+			Help: "The total count of rejections by Coralogix Operator validation webhook.",
+		},
+		[]string{"kind", "name", "namespace"},
+	)
 )
 
 func SetOperatorInfoMetric(goVersion, operatorVersion, url string) {
@@ -70,15 +74,27 @@ func SetOperatorInfoMetric(goVersion, operatorVersion, url string) {
 	operatorInfoMetric.WithLabelValues(goVersion, operatorVersion, url).Set(1)
 }
 
-var resourceRejectionsTotalMetric = prometheus.NewCounterVec(
-	prometheus.CounterOpts{
-		Name: "cx_operator_resource_rejections_total",
-		Help: "The total count of rejections by Coralogix Operator validation webhook.",
-	},
-	[]string{"kind", "name", "namespace"},
-)
-
 func IncResourceRejectionsTotalMetric(kind, name, namespace string) {
 	metricsLog.V(1).Info("Incrementing resource total rejected metric", "kind", kind)
 	resourceRejectionsTotalMetric.WithLabelValues(kind, name, namespace).Inc()
 }
+
+func SetResourceInfoMetric(kind, name, namespace, status string) {
+	metricsLog.V(1).Info("Setting resource info metric",
+		"kind", kind,
+		"name", name,
+		"namespace", namespace,
+		"status", status,
+	)
+	resourceInfoMetric.WithLabelValues(kind, name, namespace, status).Set(1)
+}
+
+func DeleteResourceInfoMetric(kind, name, namespace, status string) {
+	metricsLog.V(1).Info("Deleting resource info metric",
+		"kind", kind,
+		"name", name,
+		"namespace", namespace,
+		"status", status,
+	)
+	resourceInfoMetric.DeleteLabelValues(kind, name, namespace, status)
+}