metrics: refine shares' counters

Define two distinct share counter-metrics: number of remote machines
currently using a specific share and the number of distinct shares used
by a specific remote machine (identified by IP-address).

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

Author: synarete

internal/metrics/collectors.go

@@ -151,15 +151,19 @@ type smbSharesCollector struct {
 
 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)
-		}
+	serviceToMachine := smbInfo.MapServiceToMachines()
+	for service, machines := range serviceToMachine {
+		ch <- prometheus.MustNewConstMetric(col.dsc[0],
+			prometheus.GaugeValue,
+			float64(len(machines)),
+			service)
+	}
+	machineToServices := smbInfo.MapMachineToServies()
+	for machine, services := range machineToServices {
+		ch <- prometheus.MustNewConstMetric(col.dsc[1],
+			prometheus.GaugeValue,
+			float64(len(services)),
+			machine)
 	}
 }
 
@@ -168,9 +172,14 @@ func (sme *smbMetricsExporter) newSMBSharesCollector() prometheus.Collector {
 	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("share", "activity"),
+			"Number of remote machines currently using a share",
+			[]string{"service"}, nil),
+
+		prometheus.NewDesc(
+			collectorName("share", "byremote"),
+			"Number of shares served for remote machine",
+			[]string{"machine"}, nil),
 	}
 	return col
 }

internal/metrics/smbinfo.go

@@ -109,3 +109,18 @@ func (smbinfo *SMBInfo) MapServiceToMachines() map[string]map[string]int {
 	}
 	return ret
 }
+
+func (smbinfo *SMBInfo) MapMachineToServies() map[string]map[string]int {
+	ret := map[string]map[string]int{}
+	for _, tcon := range smbinfo.smbstat.TCons {
+		serviceID := tcon.Service
+		machineID := tcon.Machine
+		sub, found := ret[machineID]
+		if !found {
+			ret[machineID] = map[string]int{serviceID: 1}
+		} else {
+			sub[serviceID]++
+		}
+	}
+	return ret
+}