alexandre/mikrotik-exporter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

DHCP Lease Collector (#50)

Browse Source 
* DHCP Leases Collector

Add Information about DHCP Leases:
* Active MAC Address
* Active Address
* Hostname
* Status
* Expire time

* Modified resource collector

Add Boardname and RouterOS version metrics
This commit is contained in:
devi1
2019-09-03 00:50:20 +06:00
committed by Steve Brunton
parent 0cf5d19883
commit f1f09b42bb
5 changed files with 89 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
collector/resource_collector.go
View File

@@ -32,9 +32,9 @@ func newResourceCollector() routerOSCollector {
}
func (c *resourceCollector) init() {
c.props = []string{"free-memory", "total-memory", "cpu-load", "free-hdd-space", "total-hdd-space", "uptime"}
c.props = []string{"free-memory", "total-memory", "cpu-load", "free-hdd-space", "total-hdd-space", "uptime", "board-name", "version"}
labelNames := []string{"name", "address"}
labelNames := []string{"name", "address", "boardname", "version"}
c.descriptions = make(map[string]*prometheus.Desc)
for _, p := range c.props {
c.descriptions[p] = descriptionForPropertyName("system", p, labelNames)
@@ -54,7 +54,7 @@ func (c *resourceCollector) collect(ctx *collectorContext) error {
}
for _, re := range stats {
c.collectForStat(re, ctx)
c.collectForStat(re, ctx)
}
return nil
@@ -74,7 +74,7 @@ func (c *resourceCollector) fetch(ctx *collectorContext) ([]*proto.Sentence, err
}
func (c *resourceCollector) collectForStat(re *proto.Sentence, ctx *collectorContext) {
for _, p := range c.props {
for _, p := range c.props[:6] {
c.collectMetricForProperty(p, re, ctx)
}
}
@@ -82,6 +82,11 @@ func (c *resourceCollector) collectForStat(re *proto.Sentence, ctx *collectorCon
func (c *resourceCollector) collectMetricForProperty(property string, re *proto.Sentence, ctx *collectorContext) {
var v float64
var err error
// const boardname = "BOARD"
// const version = "3.33.3"
boardname := re.Map["board-name"]
version := re.Map["version"]
if property == "uptime" {
v, err = parseUptime(re.Map[property])
@@ -100,7 +105,7 @@ func (c *resourceCollector) collectMetricForProperty(property string, re *proto.
}
desc := c.descriptions[property]
ctx.ch <- prometheus.MustNewConstMetric(desc, prometheus.CounterValue, v, ctx.device.Name, ctx.device.Address)
ctx.ch <- prometheus.MustNewConstMetric(desc, prometheus.CounterValue, v, ctx.device.Name, ctx.device.Address, boardname, version)
}
func parseUptime(uptime string) (float64, error) {