public_git
/
unpoller_unpoller
mirror of https://github.com/unpoller/unpoller.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update discord links, make processPoints better, add restartsec to unit

This commit is contained in:
davidnewhall2 2019-09-03 11:54:58 -07:00
parent e1be422270
commit a4a61c4b15
3 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -1,7 +1,7 @@
<img width="320px" src="https://raw.githubusercontent.com/wiki/davidnewhall/unifi-poller/images/unifi-poller-logo.png"> <img width="320px" src="https://raw.githubusercontent.com/wiki/davidnewhall/unifi-poller/images/unifi-poller-logo.png">
[![discord](https://badgen.net/badge/icon/Discord?color=0011ff&label&icon=https://simpleicons.now.sh/discord/eee "Captain's Discord")](https://discord.gg/DyVsMyt) [![discord](https://badgen.net/badge/icon/Discord?color=0011ff&label&icon=https://simpleicons.now.sh/discord/eee "Ubiquiti Discord")](https://discord.gg/KnyKYt2)
[![twitter](https://badgen.net/twitter/follow/TwitchCaptain?icon=https://simpleicons.now.sh/twitter/0099ff&label=TwitchCaptain&color=0116ff "TwitchCaptain @ Twitter")](https://twitter.com/TwitchCaptain) [![twitter](https://badgen.net/twitter/follow/TwitchCaptain?icon=https://simpleicons.now.sh/twitter/0099ff&label=TwitchCaptain&color=0116ff "TwitchCaptain @ Twitter")](https://twitter.com/TwitchCaptain)
[![grafana](https://badgen.net/https/golift.io/bd/grafana/dashboard-downloads/10414,10415,10416,10417,10418?icon=https://simpleicons.now.sh/grafana/ED7F38&color=0011ff "Grafana Dashboard Downloads")](http://grafana.com/dashboards?search=unifi-poller) [![grafana](https://badgen.net/https/golift.io/bd/grafana/dashboard-downloads/10414,10415,10416,10417,10418?icon=https://simpleicons.now.sh/grafana/ED7F38&color=0011ff "Grafana Dashboard Downloads")](http://grafana.com/dashboards?search=unifi-poller)
[![pulls](https://badgen.net/docker/pulls/golift/unifi-poller?icon=https://simpleicons.now.sh/docker/38B1ED&label=pulls&color=0011ff "Docker Pulls")](https://hub.docker.com/r/golift/unifi-poller) [![pulls](https://badgen.net/docker/pulls/golift/unifi-poller?icon=https://simpleicons.now.sh/docker/38B1ED&label=pulls&color=0011ff "Docker Pulls")](https://hub.docker.com/r/golift/unifi-poller)
@ -22,8 +22,8 @@ included; with screenshots. Updated 2019.
We have a special place for [Docker Users](https://github.com/davidnewhall/unifi-poller/wiki/Docker). We have a special place for [Docker Users](https://github.com/davidnewhall/unifi-poller/wiki/Docker).
I'm willing to help if you have troubles. I'm willing to help if you have troubles.
Open an [Issue](https://github.com/davidnewhall/unifi-poller/issues) and Open an [Issue](https://github.com/davidnewhall/unifi-poller/issues) and
we'll figure out how to get things working for you. You can also check out we'll figure out how to get things working for you. You can also get help in
my [Discord server](https://discord.gg/DyVsMyt); sometimes I look at it too! the #unifi-poller channel on the [Ubiquiti Discord server](https://discord.gg/KnyKYt2).
## Description ## Description

1
init/systemd/template.unit.service
View File

@ -12,6 +12,7 @@ ExecStart=/usr/bin/{{BINARY}} $DAEMON_OPTS
EnvironmentFile=-/etc/default/{{BINARY}} EnvironmentFile=-/etc/default/{{BINARY}}
EnvironmentFile=-/etc/sysconfig/{{BINARY}} EnvironmentFile=-/etc/sysconfig/{{BINARY}}
Restart=always Restart=always
RestartSec=10
StandardOutput=syslog StandardOutput=syslog
StandardError=syslog StandardError=syslog
SyslogIdentifier={{BINARY}} SyslogIdentifier={{BINARY}}

26
unifipoller/unifi.go
View File

@ -176,25 +176,27 @@ func (u *UnifiPoller) ReportMetrics(metrics *Metrics) error {
// still check&log it in case the data going is skewed up and causes errors! // still check&log it in case the data going is skewed up and causes errors!
func (m *Metrics) ProcessPoints() []error { func (m *Metrics) ProcessPoints() []error {
errs := []error{} errs := []error{}
processPoints := func(m *Metrics, p []*influx.Point, err error) error { processPoints := func(m *Metrics, p []*influx.Point, err error) {
if err != nil || p == nil { switch {
return err case err != nil:
errs = append(errs, err)
case p == nil:
default:
m.BatchPoints.AddPoints(p)
} }
m.BatchPoints.AddPoints(p)
return nil
} }
for _, asset := range m.Sites { for _, asset := range m.Sites {
pts, err := SitePoints(asset, m.TS) pts, err := SitePoints(asset, m.TS)
errs = append(errs, processPoints(m, pts, err)) processPoints(m, pts, err)
} }
for _, asset := range m.Clients { for _, asset := range m.Clients {
pts, err := ClientPoints(asset, m.TS) pts, err := ClientPoints(asset, m.TS)
errs = append(errs, processPoints(m, pts, err)) processPoints(m, pts, err)
} }
for _, asset := range m.IDSList { for _, asset := range m.IDSList {
pts, err := IDSPoints(asset) // no m.TS. pts, err := IDSPoints(asset) // no m.TS.
errs = append(errs, processPoints(m, pts, err)) processPoints(m, pts, err)
} }
if m.Devices == nil { if m.Devices == nil {
@ -202,19 +204,19 @@ func (m *Metrics) ProcessPoints() []error {
} }
for _, asset := range m.Devices.UAPs { for _, asset := range m.Devices.UAPs {
pts, err := UAPPoints(asset, m.TS) pts, err := UAPPoints(asset, m.TS)
errs = append(errs, processPoints(m, pts, err)) processPoints(m, pts, err)
} }
for _, asset := range m.Devices.USGs { for _, asset := range m.Devices.USGs {
pts, err := USGPoints(asset, m.TS) pts, err := USGPoints(asset, m.TS)
errs = append(errs, processPoints(m, pts, err)) processPoints(m, pts, err)
} }
for _, asset := range m.Devices.USWs { for _, asset := range m.Devices.USWs {
pts, err := USWPoints(asset, m.TS) pts, err := USWPoints(asset, m.TS)
errs = append(errs, processPoints(m, pts, err)) processPoints(m, pts, err)
} }
for _, asset := range m.Devices.UDMs { for _, asset := range m.Devices.UDMs {
pts, err := UDMPoints(asset, m.TS) pts, err := UDMPoints(asset, m.TS)
errs = append(errs, processPoints(m, pts, err)) processPoints(m, pts, err)
} }
return errs return errs
} }