Adding a network.count metric for meraki (#651)

* Adding a network.count metric for meraki * Moving to a "tag_1": "tag_value", style of tag system * Adding in kentik.meraki.organization.Count
kentik · Jan 30, 2024 · e9135f1 · e9135f1
1 parent 7c9b402
commit e9135f1
Showing 1 changed file with 73 additions and 3 deletions.
diff --git a/pkg/inputs/snmp/x/meraki/meraki.go b/pkg/inputs/snmp/x/meraki/meraki.go
@@ -251,11 +251,12 @@ func (c *MerakiClient) Run(ctx context.Context, dur time.Duration) {
 	doOrgChanges := c.conf.Ext.MerakiConfig.MonitorOrgChanges
 	doNetworkClients := c.conf.Ext.MerakiConfig.MonitorNetworkClients
 	doVpnStatus := c.conf.Ext.MerakiConfig.MonitorVpnStatus
-	if !doUplinks && !doDeviceClients && !doDeviceStatus && !doOrgChanges && !doNetworkClients && !doVpnStatus {
+	doNetworkAttr := c.conf.Ext.MerakiConfig.Prefs["show_network_attr"]
+	if !doUplinks && !doDeviceClients && !doDeviceStatus && !doOrgChanges && !doNetworkClients && !doVpnStatus && !doNetworkAttr {
 		doUplinks = true
 	}
-	c.log.Infof("Running Every %v with uplinks=%v, device_clients=%v, device_status=%v, orgs=%v, networks=%v, vpn_status=%v",
-		dur, doUplinks, doDeviceClients, doDeviceStatus, doOrgChanges, doNetworkClients, doVpnStatus)
+	c.log.Infof("Running Every %v with uplinks=%v, device_clients=%v, device_status=%v, orgs=%v, networks=%v, vpn_status=%v, network_attr=%v",
+		dur, doUplinks, doDeviceClients, doDeviceStatus, doOrgChanges, doNetworkClients, doVpnStatus, doNetworkAttr)
 
 	for {
 		select {
@@ -310,6 +311,14 @@ func (c *MerakiClient) Run(ctx context.Context, dur time.Duration) {
 				}
 			}
 
+			if doNetworkAttr {
+				if res, err := c.getNetworkAttr(dur); err != nil {
+					c.log.Infof("Meraki cannot get network attr: %v", err)
+				} else if len(res) > 0 {
+					c.jchfChan <- res
+				}
+			}
+
 		case <-ctx.Done():
 			c.log.Infof("Meraki Poll Done")
 			return
@@ -1035,6 +1044,67 @@ func (c *MerakiClient) parseUplinks(uplinkMap map[string]deviceUplink) ([]*kt.JC
 	return res, nil
 }
 
+func (c *MerakiClient) getNetworkAttr(dur time.Duration) ([]*kt.JCHF, error) {
+	res := make([]*kt.JCHF, 0)
+	for _, org := range c.orgs {
+		for _, network := range org.networks {
+			dst := kt.NewJCHF()
+			dst.DeviceName = network.Name
+
+			dst.CustomStr = map[string]string{
+				ControllerKey: c.conf.DeviceName,
+				"network":     network.Name,
+				"network_id":  network.ID,
+				"org_name":    network.org.Name,
+				"org_id":      network.org.ID,
+			}
+			for i, tag := range network.Tags {
+				dst.CustomStr[fmt.Sprintf("tag_%d", i+1)] = tag
+			}
+
+			dst.CustomInt = map[string]int32{}
+			dst.CustomBigInt = map[string]int64{}
+			dst.EventType = kt.KENTIK_EVENT_SNMP_DEV_METRIC
+			dst.Provider = kt.ProviderMerakiCloud
+
+			dst.Timestamp = time.Now().Unix()
+			dst.CustomMetrics = map[string]kt.MetricInfo{}
+
+			dst.CustomBigInt["Count"] = 1
+			dst.CustomMetrics["Count"] = kt.MetricInfo{Oid: "meraki", Mib: "meraki", Profile: "meraki.network", Type: "meraki.network"}
+
+			c.conf.SetUserTags(dst.CustomStr)
+			res = append(res, dst)
+		}
+
+		// Now add in 1 count per organization.
+		dst := kt.NewJCHF()
+		dst.DeviceName = org.Name
+
+		dst.CustomStr = map[string]string{
+			ControllerKey: c.conf.DeviceName,
+			"org_name":    org.Name,
+			"org_id":      org.ID,
+		}
+
+		dst.CustomInt = map[string]int32{}
+		dst.CustomBigInt = map[string]int64{}
+		dst.EventType = kt.KENTIK_EVENT_SNMP_DEV_METRIC
+		dst.Provider = kt.ProviderMerakiCloud
+
+		dst.Timestamp = time.Now().Unix()
+		dst.CustomMetrics = map[string]kt.MetricInfo{}
+
+		dst.CustomBigInt["Count"] = 1
+		dst.CustomMetrics["Count"] = kt.MetricInfo{Oid: "meraki", Mib: "meraki", Profile: "meraki.organization", Type: "meraki.organization"}
+
+		c.conf.SetUserTags(dst.CustomStr)
+		res = append(res, dst)
+	}
+
+	return res, nil
+}
+
 func getLatencyLoss(u uplink) (float64, float64) {
 	latency := float64(0)
 	loss := float64(0)