w60g Interface collector (#63)
Allow the collection of w60g interface statistics.
This commit is contained in:
committed by
Steve Brunton
parent
55ae663ce3
commit
5cea9840a7
@@ -106,6 +106,13 @@ func WithOptics() Option {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// WithW60G enables w60g metrics
|
||||||
|
func WithW60G() Option {
|
||||||
|
return func(c *collector) {
|
||||||
|
c.collectors = append(c.collectors, neww60gInterfaceCollector())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// WithWlanSTA enables wlan STA metrics
|
// WithWlanSTA enables wlan STA metrics
|
||||||
func WithWlanSTA() Option {
|
func WithWlanSTA() Option {
|
||||||
return func(c *collector) {
|
return func(c *collector) {
|
||||||
|
|||||||
146
collector/w60g_collector.go
Normal file
146
collector/w60g_collector.go
Normal file
@@ -0,0 +1,146 @@
|
|||||||
|
package collector
|
||||||
|
|
||||||
|
import (
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"github.com/prometheus/client_golang/prometheus"
|
||||||
|
log "github.com/sirupsen/logrus"
|
||||||
|
"gopkg.in/routeros.v2/proto"
|
||||||
|
)
|
||||||
|
|
||||||
|
type w60gInterfaceCollector struct {
|
||||||
|
frequencyDesc *prometheus.Desc
|
||||||
|
txMCSDesc *prometheus.Desc
|
||||||
|
txPHYRateDesc *prometheus.Desc
|
||||||
|
signalDesc *prometheus.Desc
|
||||||
|
rssiDesc *prometheus.Desc
|
||||||
|
txSectorDesc *prometheus.Desc
|
||||||
|
txDistanceDesc *prometheus.Desc
|
||||||
|
txPacketErrorRateDesc *prometheus.Desc
|
||||||
|
props []string
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *w60gInterfaceCollector) describe(ch chan<- *prometheus.Desc) {
|
||||||
|
ch <- c.frequencyDesc
|
||||||
|
ch <- c.txMCSDesc
|
||||||
|
ch <- c.txPHYRateDesc
|
||||||
|
ch <- c.signalDesc
|
||||||
|
ch <- c.rssiDesc
|
||||||
|
ch <- c.txSectorDesc
|
||||||
|
ch <- c.txDistanceDesc
|
||||||
|
ch <- c.txPacketErrorRateDesc
|
||||||
|
}
|
||||||
|
func (c *w60gInterfaceCollector) collect(ctx *collectorContext) error {
|
||||||
|
reply, err := ctx.client.Run("/interface/w60g/print", "=.proplist=name")
|
||||||
|
if err != nil {
|
||||||
|
log.WithFields(log.Fields{
|
||||||
|
"device": ctx.device.Name,
|
||||||
|
"error": err,
|
||||||
|
}).Error("error fetching w60g interface metrics")
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
ifaces := make([]string, 0)
|
||||||
|
for _, iface := range reply.Re {
|
||||||
|
n := iface.Map["name"]
|
||||||
|
ifaces = append(ifaces, n)
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(ifaces) == 0 {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return c.collectw60gMetricsForInterfaces(ifaces, ctx)
|
||||||
|
}
|
||||||
|
func (c *w60gInterfaceCollector) collectw60gMetricsForInterfaces(ifaces []string, ctx *collectorContext) error {
|
||||||
|
reply, err := ctx.client.Run("/interface/w60g/monitor",
|
||||||
|
"=numbers="+strings.Join(ifaces, ","),
|
||||||
|
"=once=",
|
||||||
|
"=.proplist=name,"+strings.Join(c.props, ","))
|
||||||
|
if err != nil {
|
||||||
|
log.WithFields(log.Fields{
|
||||||
|
"device": ctx.device.Name,
|
||||||
|
"error": err,
|
||||||
|
}).Error("error fetching w60g interface monitor metrics")
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
for _, se := range reply.Re {
|
||||||
|
name, ok := se.Map["name"]
|
||||||
|
if !ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
c.collectMetricsForw60gInterface(name, se, ctx)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *w60gInterfaceCollector) collectMetricsForw60gInterface(name string, se *proto.Sentence, ctx *collectorContext) {
|
||||||
|
for _, prop := range c.props {
|
||||||
|
v, ok := se.Map[prop]
|
||||||
|
if !ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if v == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
value, err := strconv.ParseFloat(v, 64)
|
||||||
|
if err != nil {
|
||||||
|
log.WithFields(log.Fields{
|
||||||
|
"device": ctx.device.Name,
|
||||||
|
"interface": name,
|
||||||
|
"property": prop,
|
||||||
|
"error": err,
|
||||||
|
}).Error("error parsing w60g interface monitor metric")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx.ch <- prometheus.MustNewConstMetric(c.descForKey(prop), prometheus.GaugeValue, value, ctx.device.Name, ctx.device.Address, name)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func neww60gInterfaceCollector() routerOSCollector {
|
||||||
|
const prefix = "w60ginterface"
|
||||||
|
|
||||||
|
labelNames := []string{"name", "address", "interface"}
|
||||||
|
return &w60gInterfaceCollector{
|
||||||
|
frequencyDesc: description(prefix, "frequency", "frequency of tx in MHz", labelNames),
|
||||||
|
txMCSDesc: description(prefix, "txMCS", "TX MCS", labelNames),
|
||||||
|
txPHYRateDesc: description(prefix, "txPHYRate", "PHY Rate in bps", labelNames),
|
||||||
|
signalDesc: description(prefix, "signal", "Signal quality in %", labelNames),
|
||||||
|
rssiDesc: description(prefix, "rssi", "Signal RSSI in dB", labelNames),
|
||||||
|
txSectorDesc: description(prefix, "txSector", "TX Sector", labelNames),
|
||||||
|
txDistanceDesc: description(prefix, "txDistance", "Distance to remote", labelNames),
|
||||||
|
txPacketErrorRateDesc: description(prefix, "txPacketErrorRate", "TX Packet Error Rate", labelNames),
|
||||||
|
props: []string{"signal", "rssi", "tx-mcs", "frequency", "tx-phy-rate", "tx-sector", "distance", "tx-packet-error-rate"},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *w60gInterfaceCollector) valueForKey(name, value string) (float64, error) {
|
||||||
|
return strconv.ParseFloat(value, 64)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *w60gInterfaceCollector) descForKey(name string) *prometheus.Desc {
|
||||||
|
switch name {
|
||||||
|
case "signal":
|
||||||
|
return c.signalDesc
|
||||||
|
case "rssi":
|
||||||
|
return c.rssiDesc
|
||||||
|
case "tx-mcs":
|
||||||
|
return c.txMCSDesc
|
||||||
|
case "tx-phy-rate":
|
||||||
|
return c.txPHYRateDesc
|
||||||
|
case "frequency":
|
||||||
|
return c.frequencyDesc
|
||||||
|
case "tx-sector":
|
||||||
|
return c.txSectorDesc
|
||||||
|
case "distance":
|
||||||
|
return c.txDistanceDesc
|
||||||
|
case "tx-packet-error-rate":
|
||||||
|
return c.txPacketErrorRateDesc
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
@@ -18,6 +18,7 @@ type Config struct {
|
|||||||
POE bool `yaml:"poe,omitempty"`
|
POE bool `yaml:"poe,omitempty"`
|
||||||
Pools bool `yaml:"pools,omitempty"`
|
Pools bool `yaml:"pools,omitempty"`
|
||||||
Optics bool `yaml:"optics,omitempty"`
|
Optics bool `yaml:"optics,omitempty"`
|
||||||
|
W60G bool `yaml:"w60g,omitempty"`
|
||||||
WlanSTA bool `yaml:"wlansta,omitempty"`
|
WlanSTA bool `yaml:"wlansta,omitempty"`
|
||||||
WlanIF bool `yaml:"wlanif,omitempty"`
|
WlanIF bool `yaml:"wlanif,omitempty"`
|
||||||
Monitor bool `yaml:"monitor,omitempty"`
|
Monitor bool `yaml:"monitor,omitempty"`
|
||||||
|
|||||||
5
main.go
5
main.go
@@ -43,6 +43,7 @@ var (
|
|||||||
withPOE = flag.Bool("with-poe", false, "retrieves PoE metrics")
|
withPOE = flag.Bool("with-poe", false, "retrieves PoE metrics")
|
||||||
withPools = flag.Bool("with-pools", false, "retrieves IP(v6) pool metrics")
|
withPools = flag.Bool("with-pools", false, "retrieves IP(v6) pool metrics")
|
||||||
withOptics = flag.Bool("with-optics", false, "retrieves optical diagnostic metrics")
|
withOptics = flag.Bool("with-optics", false, "retrieves optical diagnostic metrics")
|
||||||
|
withW60G = flag.Bool("with-w60g", false, "retrieves w60g interface metrics")
|
||||||
withWlanSTA = flag.Bool("with-wlansta", false, "retrieves connected wlan station metrics")
|
withWlanSTA = flag.Bool("with-wlansta", false, "retrieves connected wlan station metrics")
|
||||||
withWlanIF = flag.Bool("with-wlanif", false, "retrieves wlan interface metrics")
|
withWlanIF = flag.Bool("with-wlanif", false, "retrieves wlan interface metrics")
|
||||||
withMonitor = flag.Bool("with-monitor", false, "retrieves ethernet interface monitor info")
|
withMonitor = flag.Bool("with-monitor", false, "retrieves ethernet interface monitor info")
|
||||||
@@ -204,6 +205,10 @@ func collectorOptions() []collector.Option {
|
|||||||
opts = append(opts, collector.WithOptics())
|
opts = append(opts, collector.WithOptics())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if *withW60G || cfg.Features.W60G {
|
||||||
|
opts = append(opts, collector.WithW60G())
|
||||||
|
}
|
||||||
|
|
||||||
if *withWlanSTA || cfg.Features.WlanSTA {
|
if *withWlanSTA || cfg.Features.WlanSTA {
|
||||||
opts = append(opts, collector.WithWlanSTA())
|
opts = append(opts, collector.WithWlanSTA())
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user