Refactor metrics

Signed-off-by: João Vilaça <jvilaca@redhat.com>

docs/metrics.md

@@ -1,11 +1,23 @@
 # Cluster Network Addons Operator Metrics
 
+### kubevirt_cnao_cr_kubemacpool_aggregated
+Total count of KubeMacPool manager pods deployed by CNAO CR. Type: Gauge.
+
 ### kubevirt_cnao_cr_kubemacpool_deployed
 KubeMacpool is deployed by CNAO CR. Type: Gauge.
 
 ### kubevirt_cnao_cr_ready
 CNAO CR Ready. Type: Gauge.
 
+### kubevirt_cnao_kubemacpool_duplicate_macs
+Total count of duplicate KubeMacPool MAC addresses. Type: Gauge.
+
+### kubevirt_cnao_kubemacpool_manager_up
+Total count of running KubeMacPool manager pods. Type: Gauge.
+
+### kubevirt_cnao_operator_up
+Total count of running CNAO operators. Type: Gauge.
+
 ## Developing new metrics
 
 All metrics documented here are auto-generated and reflect exactly what is being

tools/metrics-parser/metrics_parser.go

@@ -7,20 +7,12 @@ import (
 	"strings"
 	"text/template"
 
+	"github.com/machadovilaca/operator-observability/pkg/operatormetrics"
+	"github.com/prometheus/client_golang/prometheus"
 	"gopkg.in/yaml.v3"
-
-	"github.com/kubevirt/cluster-network-addons-operator/pkg/monitoring"
-
 	"sigs.k8s.io/controller-tools/pkg/markers"
 )
 
-func MetricsOptsToMetricList(Metrics map[monitoring.MetricsKey]monitoring.MetricsOpts, result MetricList) MetricList {
-	for _, opts := range Metrics {
-		result = append(result, MetricDescriptionToMetric(opts))
-	}
-	return result
-}
-
 type PrometheusCR struct {
 	Spec struct {
 		Groups []struct {
@@ -111,19 +103,26 @@ func ParseTemplateFile() []byte {
 }
 
 type Metric struct {
+	operatormetrics.Metric
+
 	Name        string
 	Description string
 	MType       string
 }
 
-func MetricDescriptionToMetric(rrd monitoring.MetricsOpts) Metric {
-	return Metric{
-		Name:        rrd.Name,
-		Description: rrd.Help,
-		MType:       rrd.Type,
+func (m Metric) getCollector() prometheus.Collector { return nil }
+
+func (m Metric) GetOpts() operatormetrics.MetricOpts {
+	return operatormetrics.MetricOpts{
+		Name: m.Name,
+		Help: m.Description,
 	}
 }
 
+func (m Metric) GetType() operatormetrics.MetricType {
+	return operatormetrics.MetricType(m.MType)
+}
+
 func (m Metric) WriteOut() {
 	fmt.Println("###", m.Name)
 

tools/metricsdocs/metricsdocs.go

@@ -6,6 +6,7 @@ import (
 	"github.com/machadovilaca/operator-observability/pkg/docs"
 
 	"github.com/kubevirt/cluster-network-addons-operator/pkg/monitoring/metrics"
+	metricsparser "github.com/kubevirt/cluster-network-addons-operator/tools/metrics-parser"
 )
 
 const tpl = `# Cluster Network Addons Operator Metrics
@@ -40,6 +41,12 @@ func main() {
 		panic(err)
 	}
 
-	docsString := docs.BuildMetricsDocsWithCustomTemplate(metrics.ListMetrics(), nil, tpl)
+	metricsList := metrics.ListMetrics()
+
+	for _, metric := range metricsparser.ReadFromPrometheusCR() {
+		metricsList = append(metricsList, metric)
+	}
+
+	docsString := docs.BuildMetricsDocsWithCustomTemplate(metricsList, nil, tpl)
 	fmt.Print(docsString)
 }