Use native metrics instead of collector (#393) (#400)

Author: assafad1

cmd/main.go

@@ -48,7 +48,7 @@ import (
 	//+kubebuilder:scaffold:imports
 )
 
-const OperatorVersion = "0.5.2"
+const OperatorVersion = "0.5.3"
 
 var (
 	scheme   = k8sruntime.NewScheme()
@@ -285,7 +285,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	if err := monitoring.SetupMetrics(); err != nil {
+	if err := monitoring.RegisterMetrics(); err != nil {
 		setupLog.Error(err, "unable to set up 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"
 )
 
@@ -101,6 +102,11 @@ func ReconcileResource(ctx context.Context, req ctrl.Request, obj client.Object,
 			return ManageErrorWithRequeue(ctx, obj, utils.ReasonInternalK8sError, err)
 		}
 
+		monitoring.DeleteResourceInfoMetric(
+			obj.GetObjectKind().GroupVersionKind().Kind,
+			obj.GetName(),
+			obj.GetNamespace(),
+		)
 		return ctrl.Result{}, nil
 	}
 
@@ -121,6 +127,11 @@ func ReconcileResource(ctx context.Context, req ctrl.Request, obj client.Object,
 			return ManageErrorWithRequeue(ctx, obj, utils.ReasonInternalK8sError, err)
 		}
 
+		monitoring.DeleteResourceInfoMetric(
+			obj.GetObjectKind().GroupVersionKind().Kind,
+			obj.GetName(),
+			obj.GetNamespace(),
+		)
 		return ctrl.Result{}, nil
 	}
 
@@ -196,6 +207,12 @@ func ManageErrorWithRequeue(ctx context.Context, obj client.Object, reason strin
 		}
 	}
 
+	monitoring.SetResourceInfoMetricUnsynced(
+		obj.GetObjectKind().GroupVersionKind().Kind,
+		obj.GetName(),
+		obj.GetNamespace(),
+	)
+
 	return reconcile.Result{}, err
 }
 
@@ -210,6 +227,12 @@ func ManageSuccessWithRequeue(ctx context.Context, obj client.Object, interval t
 		}
 	}
 
+	monitoring.SetResourceInfoMetricSynced(
+		obj.GetObjectKind().GroupVersionKind().Kind,
+		obj.GetName(),
+		obj.GetNamespace(),
+	)
+
 	return reconcile.Result{RequeueAfter: interval}, nil
 }
 

internal/monitoring/collectors.go

@@ -22,25 +22,16 @@ 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
-}
+const (
+	remoteSynced   = "RemoteSynced"
+	remoteUnsynced = "RemoteUnsynced"
+)
 
 func RegisterMetrics() error {
 	metricsLog.V(1).Info("Registering metrics")
 	for _, metric := range metricsList {
 		err := metrics.Registry.Register(metric)
 		if err != nil {
-			metricsLog.Error(err, "Failed to register metric", "metric", metric)
 			return err
 		}
 	}
@@ -50,14 +41,24 @@ func RegisterMetrics() error {
 
 var metricsList = []prometheus.Collector{
 	operatorInfoMetric,
+	resourceInfoMetric,
 }
 
-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_build_info",
+			Help: "Coralogix Operator build 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"},
+	)
 )
 
 func SetOperatorInfoMetric(goVersion, operatorVersion, url string) {
@@ -68,3 +69,33 @@ func SetOperatorInfoMetric(goVersion, operatorVersion, url string) {
 	)
 	operatorInfoMetric.WithLabelValues(goVersion, operatorVersion, url).Set(1)
 }
+
+func SetResourceInfoMetricSynced(kind, name, namespace string) {
+	metricsLog.V(1).Info("Setting resource info metric synced",
+		"kind", kind,
+		"name", name,
+		"namespace", namespace,
+	)
+	resourceInfoMetric.WithLabelValues(kind, name, namespace, remoteSynced).Set(1)
+	resourceInfoMetric.DeleteLabelValues(kind, name, namespace, remoteUnsynced)
+}
+
+func SetResourceInfoMetricUnsynced(kind, name, namespace string) {
+	metricsLog.V(1).Info("Setting resource info metric unsynced",
+		"kind", kind,
+		"name", name,
+		"namespace", namespace,
+	)
+	resourceInfoMetric.WithLabelValues(kind, name, namespace, remoteUnsynced).Set(1)
+	resourceInfoMetric.DeleteLabelValues(kind, name, namespace, remoteSynced)
+}
+
+func DeleteResourceInfoMetric(kind, name, namespace string) {
+	metricsLog.V(1).Info("Deleting resource info metric",
+		"kind", kind,
+		"name", name,
+		"namespace", namespace,
+	)
+	resourceInfoMetric.DeleteLabelValues(kind, name, namespace, remoteSynced)
+	resourceInfoMetric.DeleteLabelValues(kind, name, namespace, remoteUnsynced)
+}