metrics: defined activity collector

Defined a new metrics collector-and-exporter which provide top-level
overview on the current activity of the local Samba-server. This
exporter represents the first layer of SMB counters which are exported
to Prometheus.

Signed-off-by: Shachar Sharon <[email protected]>

Author: synarete

internal/metrics/collectors.go

@@ -13,8 +13,8 @@ var (
 func (sme *smbMetricsExporter) register() error {
 	cols := []prometheus.Collector{
 		sme.newSMBVersionsCollector(),
+		sme.newSMBActivityCollector(),
 		sme.newSMBSharesCollector(),
-		sme.newSMBLocksCollector(),
 	}
 	for _, c := range cols {
 		if err := sme.reg.Register(c); err != nil {
@@ -79,72 +79,88 @@ func (sme *smbMetricsExporter) newSMBVersionsCollector() prometheus.Collector {
 	return col
 }
 
-type smbSharesCollector struct {
+type smbActivityCollector struct {
 	smbCollector
 }
 
-func (col *smbSharesCollector) Collect(ch chan<- prometheus.Metric) {
-	total := 0
+func (col *smbActivityCollector) Collect(ch chan<- prometheus.Metric) {
+	totalSessions := 0
+	totalTreeCons := 0
+	totalConnectedUsers := 0
+	totalLockedFiles := 0
 	smbInfo, err := NewUpdatedSMBInfo()
-	if err != nil {
-		ch <- prometheus.MustNewConstMetric(col.dsc[1],
-			prometheus.GaugeValue, float64(total))
-		return
-	}
-	serviceByMachine := smbInfo.MapServiceToMachines()
-	for serviceID, machineToCount := range serviceByMachine {
-		for machineID, count := range machineToCount {
-			ch <- prometheus.MustNewConstMetric(col.dsc[0],
-				prometheus.GaugeValue,
-				float64(count),
-				serviceID,
-				machineID)
-			total += count
-		}
+	if err == nil {
+		totalSessions = smbInfo.TotalSessions()
+		totalTreeCons = smbInfo.TotalTreeCons()
+		totalConnectedUsers = smbInfo.TotalConnectedUsers()
+		totalLockedFiles = smbInfo.TotalLockedFiles()
 	}
+	ch <- prometheus.MustNewConstMetric(col.dsc[0],
+		prometheus.GaugeValue, float64(totalSessions))
+
 	ch <- prometheus.MustNewConstMetric(col.dsc[1],
-		prometheus.GaugeValue, float64(total))
+		prometheus.GaugeValue, float64(totalTreeCons))
+
+	ch <- prometheus.MustNewConstMetric(col.dsc[2],
+		prometheus.GaugeValue, float64(totalConnectedUsers))
+
+	ch <- prometheus.MustNewConstMetric(col.dsc[3],
+		prometheus.GaugeValue, float64(totalLockedFiles))
 }
 
-func (sme *smbMetricsExporter) newSMBSharesCollector() prometheus.Collector {
-	col := &smbSharesCollector{}
+func (sme *smbMetricsExporter) newSMBActivityCollector() prometheus.Collector {
+	col := &smbActivityCollector{}
 	col.sme = sme
 	col.dsc = []*prometheus.Desc{
 		prometheus.NewDesc(
-			collectorName("shares", "machine"),
-			"Number of currently active shares by host-machine ip",
-			[]string{"service", "machine"}, nil),
+			collectorName("sessions", "total"),
+			"Number of currently active SMB sessions",
+			[]string{}, nil),
+
+		prometheus.NewDesc(
+			collectorName("tcon", "total"),
+			"Number of currently active SMB tree-connections",
+			[]string{}, nil),
 
 		prometheus.NewDesc(
-			collectorName("shares", "total"),
-			"Total number of currently active shares",
+			collectorName("users", "total"),
+			"Number of currently active SMB users",
+			[]string{}, nil),
+
+		prometheus.NewDesc(
+			collectorName("locks", "total"),
+			"Number of currently active file-locks",
 			[]string{}, nil),
 	}
 	return col
 }
 
-type smbLocksCollector struct {
+type smbSharesCollector struct {
 	smbCollector
 }
 
-func (col *smbLocksCollector) Collect(ch chan<- prometheus.Metric) {
-	value := 0
-	smbInfo, err := NewUpdatedSMBInfo()
-	if err == nil {
-		value = smbInfo.TotalLockedFiles()
+func (col *smbSharesCollector) Collect(ch chan<- prometheus.Metric) {
+	smbInfo, _ := NewUpdatedSMBInfo()
+	serviceByMachine := smbInfo.MapServiceToMachines()
+	for serviceID, machineToCount := range serviceByMachine {
+		for machineID, count := range machineToCount {
+			ch <- prometheus.MustNewConstMetric(col.dsc[0],
+				prometheus.GaugeValue,
+				float64(count),
+				serviceID,
+				machineID)
+		}
 	}
-	ch <- prometheus.MustNewConstMetric(col.dsc[0],
-		prometheus.GaugeValue, float64(value))
 }
 
-func (sme *smbMetricsExporter) newSMBLocksCollector() prometheus.Collector {
-	col := &smbLocksCollector{}
+func (sme *smbMetricsExporter) newSMBSharesCollector() prometheus.Collector {
+	col := &smbSharesCollector{}
 	col.sme = sme
 	col.dsc = []*prometheus.Desc{
 		prometheus.NewDesc(
-			collectorName("locks", "total"),
-			"Total number of active locks",
-			[]string{}, nil),
+			collectorName("shares", "machine"),
+			"Number of currently active shares by host-machine ip",
+			[]string{"service", "machine"}, nil),
 	}
 	return col
 }