add new counter for dns messages operations

dmachard · Oct 23, 2024 · 029b8e0 · 029b8e0
1 parent 75e4b5b
commit 029b8e0
Showing 1 changed file with 23 additions and 0 deletions.
diff --git a/workers/prometheus.go b/workers/prometheus.go
@@ -48,6 +48,7 @@ type EpsCounters struct {
 
 	TotalRcodes, TotalQtypes                       map[string]float64
 	TotalIPVersion, TotalIPProtocol                map[string]float64
+	TotalOperations                                map[string]float64
 	TotalDNSMessages                               float64
 	TotalQueries, TotalReplies                     int
 	TotalBytes, TotalBytesSent, TotalBytesReceived int
@@ -166,6 +167,7 @@ type Prometheus struct {
 	counterQtypes, counterRcodes                             *prometheus.Desc
 	counterIPProtocol, counterIPVersion                      *prometheus.Desc
 	counterDNSMessages, counterDNSQueries, counterDNSReplies *prometheus.Desc
+	counterOperations                                        *prometheus.Desc
 
 	counterFlagsTC, counterFlagsAA                                         *prometheus.Desc
 	counterFlagsRA, counterFlagsAD                                         *prometheus.Desc
@@ -196,6 +198,7 @@ func newPrometheusCounterSet(w *Prometheus, labels prometheus.Labels) *Prometheu
 		epsCounters: EpsCounters{
 			TotalRcodes: make(map[string]float64), TotalQtypes: make(map[string]float64),
 			TotalIPVersion: make(map[string]float64), TotalIPProtocol: make(map[string]float64),
+			TotalOperations: make(map[string]float64),
 		},
 
 		topRequesters:   topmap.NewTopMap(w.GetConfig().Loggers.Prometheus.TopN),
@@ -248,6 +251,7 @@ func (w *PrometheusCountersSet) Describe(ch chan<- *prometheus.Desc) {
 
 	ch <- w.prom.counterQtypes
 	ch <- w.prom.counterRcodes
+	ch <- w.prom.counterOperations
 	ch <- w.prom.counterIPProtocol
 	ch <- w.prom.counterIPVersion
 	ch <- w.prom.counterDNSMessages
@@ -374,6 +378,12 @@ func (w *PrometheusCountersSet) Record(dm dnsutils.DNSMessage) {
 		w.epsCounters.TotalRcodes[dm.DNS.Rcode]++
 	}
 
+	if _, exists := w.epsCounters.TotalOperations[dm.DNSTap.Operation]; !exists {
+		w.epsCounters.TotalOperations[dm.DNSTap.Operation] = 1
+	} else {
+		w.epsCounters.TotalOperations[dm.DNSTap.Operation]++
+	}
+
 	if dm.DNS.Type == dnsutils.DNSQuery {
 		w.epsCounters.TotalBytesReceived += dm.DNS.Length
 		w.epsCounters.TotalQueries++
@@ -518,6 +528,13 @@ func (w *PrometheusCountersSet) Collect(ch chan<- prometheus.Metric) {
 		)
 	}
 
+	// Update DNSTap Operations counter
+	for k, v := range w.epsCounters.TotalOperations {
+		ch <- prometheus.MustNewConstMetric(w.prom.counterOperations, prometheus.CounterValue,
+			v, k,
+		)
+	}
+
 	// Update IP protocol counter
 	for k, v := range w.epsCounters.TotalIPProtocol {
 		ch <- prometheus.MustNewConstMetric(w.prom.counterIPProtocol, prometheus.CounterValue,
@@ -880,6 +897,12 @@ func (w *Prometheus) InitProm() {
 		[]string{"return_code"}, nil,
 	)
 
+	w.counterOperations = prometheus.NewDesc(
+		fmt.Sprintf("%s_operations_total", promPrefix),
+		"Counter of dns messages per operations",
+		[]string{"operation"}, nil,
+	)
+
 	w.counterIPProtocol = prometheus.NewDesc(
 		fmt.Sprintf("%s_ipprotocol_total", promPrefix),
 		"Counter of packets per IP protocol",