observer: Rename ringbuf metrics

Use more consistent names for easier querying.

Signed-off-by: Anna Kapuscinska <[email protected]>

contrib/upgrade-notes/latest.md

@@ -47,3 +47,9 @@ tetragon:
 * `tetragon_policyfilter_metrics_total` metric is renamed to `tetragon_policyfilter_operations_total`, and its `op`
   label is renamed to `operation`.
 * `tetragon_missed_events_total` metric is renamed to `tetragon_bpf_missed_events_total`.
+* Metrics related to ring buffer and events queue are renamed:
+  * `tetragon_ringbuf_perf_event_errors_total` -> `tetragon_observer_ringbuf_errors_total`
+  * `tetragon_ringbuf_perf_event_received_total` -> `tetragon_observer_ringbuf_events_received_total`
+  * `tetragon_ringbuf_perf_event_lost_total` -> `tetragon_observer_ringbuf_events_lost_total`
+  * `tetragon_ringbuf_queue_received_total` -> `tetragon_observer_ringbuf_queue_events_received_total`
+  * `tetragon_ringbuf_queue_lost_total` -> `tetragon_observer_ringbuf_queue_events_lost_total`

pkg/observer/metrics.go

@@ -9,38 +9,47 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 )
 
+const (
+	subsystem = "observer"
+)
+
 var (
 	// TODO: These metrics are also stored as Observer struct fields. We could
 	// collect them only once: https://github.com/cilium/tetragon/issues/2834
 
 	RingbufReceived = prometheus.NewCounter(prometheus.CounterOpts{
 		Namespace:   consts.MetricsNamespace,
-		Name:        "ringbuf_perf_event_received_total",
+		Subsystem:   subsystem,
+		Name:        "ringbuf_events_received_total",
 		Help:        "Number of perf events Tetragon ring buffer received.",
 		ConstLabels: nil,
 	})
 	RingbufLost = prometheus.NewCounter(prometheus.CounterOpts{
 		Namespace:   consts.MetricsNamespace,
-		Name:        "ringbuf_perf_event_lost_total",
+		Subsystem:   subsystem,
+		Name:        "ringbuf_events_lost_total",
 		Help:        "Number of perf events Tetragon ring buffer lost.",
 		ConstLabels: nil,
 	})
 	RingbufErrors = prometheus.NewCounter(prometheus.CounterOpts{
 		Namespace:   consts.MetricsNamespace,
-		Name:        "ringbuf_perf_event_errors_total",
+		Subsystem:   subsystem,
+		Name:        "ringbuf_errors_total",
 		Help:        "Number of errors when reading Tetragon ring buffer.",
 		ConstLabels: nil,
 	})
 
 	queueReceived = prometheus.NewCounter(prometheus.CounterOpts{
 		Namespace:   consts.MetricsNamespace,
-		Name:        "ringbuf_queue_received_total",
+		Subsystem:   subsystem,
+		Name:        "ringbuf_queue_events_received_total",
 		Help:        "Number of perf events Tetragon ring buffer events queue received.",
 		ConstLabels: nil,
 	})
 	queueLost = prometheus.NewCounter(prometheus.CounterOpts{
 		Namespace:   consts.MetricsNamespace,
-		Name:        "ringbuf_queue_lost_total",
+		Subsystem:   subsystem,
+		Name:        "ringbuf_queue_events_lost_total",
 		Help:        "Number of perf events Tetragon ring buffer events queue lost.",
 		ConstLabels: nil,
 	})