From 42d50d24b06c490261abf0b6f070c33582b52a51 Mon Sep 17 00:00:00 2001 From: David Newhall II Date: Wed, 17 Jul 2019 01:22:37 -0700 Subject: [PATCH 1/3] Update screenshots. --- integrations/inputunifi/README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/integrations/inputunifi/README.md b/integrations/inputunifi/README.md index 4672a74b..e690e5ab 100644 --- a/integrations/inputunifi/README.md +++ b/integrations/inputunifi/README.md @@ -120,19 +120,19 @@ configurations. Help me figure that out? # What's it look like? Here's a picture of the Client dashboard. -![UniFi Clients Dashboard Image](https://grafana.com/api/dashboards/10418/images/6554/image) +![UniFi Clients Dashboard Image](https://grafana.com/api/dashboards/10418/images/6660/image) Here's a picture of the USG dashboard. -![USG Dashboard Image](https://grafana.com/api/dashboards/10416/images/6552/image) +![USG Dashboard Image](https://grafana.com/api/dashboards/10416/images/6663/image) Here's a picture of the UAP dashboard. This only shows one device, but you can select multiple to put specific stats side-by-side. -![UAP Dashboard Image](https://grafana.com/api/dashboards/10415/images/6551/image) +![UAP Dashboard Image](https://grafana.com/api/dashboards/10415/images/6662/image) The USW / Switch Dashboard is pretty big with one data-filled section per selected port. You can drill down into specific sites, switches, and ports. Compare ports in different sites side-by-side. So easy! This screenshot barely does it justice. -![USW Dashboard Image](https://grafana.com/api/dashboards/10417/images/6553/image) +![USW Dashboard Image](https://grafana.com/api/dashboards/10417/images/6664/image) ## Copyright & License From 024fa832152a4baf70f9d1dfc71241c04e3a6841 Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Sat, 20 Jul 2019 02:55:45 -0700 Subject: [PATCH 2/3] Rename the library path. --- integrations/inputunifi/.metadata.sh | 2 +- integrations/inputunifi/Gopkg.lock | 18 +++++++++--------- integrations/inputunifi/README.md | 8 ++++---- integrations/inputunifi/unifipoller/config.go | 2 +- integrations/inputunifi/unifipoller/dumper.go | 2 +- integrations/inputunifi/unifipoller/start.go | 2 +- integrations/inputunifi/unifipoller/unifi.go | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/integrations/inputunifi/.metadata.sh b/integrations/inputunifi/.metadata.sh index 63f9675b..e98a9718 100755 --- a/integrations/inputunifi/.metadata.sh +++ b/integrations/inputunifi/.metadata.sh @@ -48,6 +48,6 @@ COMMIT="$(git rev-parse --short HEAD || echo 0)" # Used by homebrew downloads. #SOURCE_PATH=https://codeload.${IMPORT_PATH}/tar.gz/v${VERSION} # This is a custom download path for homebrew formula. -SOURCE_PATH=https://code.golift.io/${BINARY}/archive/v${VERSION}.tar.gz +SOURCE_PATH=https://golift.io/${BINARY}/archive/v${VERSION}.tar.gz export IMPORT_PATH SOURCE_URL URL VERSION_PATH VVERSION VERSION ITERATION DATE COMMIT SOURCE_PATH diff --git a/integrations/inputunifi/Gopkg.lock b/integrations/inputunifi/Gopkg.lock index 8238a21c..db4e08d3 100644 --- a/integrations/inputunifi/Gopkg.lock +++ b/integrations/inputunifi/Gopkg.lock @@ -1,14 +1,6 @@ # This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. -[[projects]] - digest = "1:6a0be013a234fe00d3c080db2b887aee9cd6bc8f3f559b8b7a079150c34ba017" - name = "code.golift.io/unifi" - packages = ["."] - pruneopts = "UT" - revision = "c998e559a9b52f7e7859de86e7f69b40582d3e37" - version = "v3.3.2" - [[projects]] digest = "1:9f3b30d9f8e0d7040f729b82dcbc8f0dead820a133b3147ce355fc451f32d761" name = "github.com/BurntSushi/toml" @@ -45,6 +37,14 @@ revision = "298182f68c66c05229eb03ac171abe6e309ee79a" version = "v1.0.3" +[[projects]] + digest = "1:6a0be013a234fe00d3c080db2b887aee9cd6bc8f3f559b8b7a079150c34ba017" + name = "golift.io/unifi" + packages = ["."] + pruneopts = "UT" + revision = "c998e559a9b52f7e7859de86e7f69b40582d3e37" + version = "v3.3.2" + [[projects]] digest = "1:4d2e5a73dc1500038e504a8d78b986630e3626dc027bc030ba5c75da257cdb96" name = "gopkg.in/yaml.v2" @@ -57,11 +57,11 @@ analyzer-name = "dep" analyzer-version = 1 input-imports = [ - "code.golift.io/unifi", "github.com/BurntSushi/toml", "github.com/influxdata/influxdb1-client/v2", "github.com/pkg/errors", "github.com/spf13/pflag", + "golift.io/unifi", "gopkg.in/yaml.v2", ] solver-name = "gps-cdcl" diff --git a/integrations/inputunifi/README.md b/integrations/inputunifi/README.md index e690e5ab..074b7e7a 100644 --- a/integrations/inputunifi/README.md +++ b/integrations/inputunifi/README.md @@ -3,12 +3,12 @@ [![discord](https://badgen.net/badge/icon/Discord?color=0011ff&label&icon=https://simpleicons.now.sh/discord/eee "Captain's Discord")](https://discord.gg/DyVsMyt) [![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/code.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) [![DLs](https://img.shields.io/github/downloads/davidnewhall/unifi-poller/total.svg?logo=github&color=0116ff "GitHub Downloads")](https://www.somsubhra.com/github-release-stats/?username=davidnewhall&repository=unifi-poller) -[![unifi](https://badgen.net/badge/UniFi/5.10.x,5.11.x,UAP,USG,USW?list=|&icon=https://golift.io/svg/ubiquiti_color.svg&color=0099ee "UniFi Products Supported")](https://github.com/golift/unifi) -[![builer](https://badgen.net/badge/go/Application%20Builder?label=&icon=https://golift.io/svg/go.svg&color=0099ee "Go Application Builder")](https://github.com/golift/application-builder) +[![unifi](https://badgen.net/badge/UniFi/5.10.x,5.11.x,UAP,USG,USW?list=|&icon=https://golift.github.io/svg/ubiquiti_color.svg&color=0099ee "UniFi Products Supported")](https://github.com/golift/unifi) +[![builer](https://badgen.net/badge/go/Application%20Builder?label=&icon=https://golift.github.io/svg/go.svg&color=0099ee "Go Application Builder")](https://github.com/golift/application-builder) [![stars](https://badgen.net/github/stars/davidnewhall/unifi-poller?icon=https://simpleicons.now.sh/macys/fab&label=&color=0099ee "GitHub Stars")](https://github.com/davidnewhall/unifi-poller) [![travis](https://badgen.net/travis/davidnewhall/unifi-poller?icon=travis&label=build "Travis Build")](https://travis-ci.org/davidnewhall/unifi-poller) @@ -91,7 +91,7 @@ script if you needed to. It's available for macOS, Linux and Docker. It comes wi a systemd service unit that allows you automatically start it up on most Linux hosts. It works just fine on [Windows](https://github.com/davidnewhall/unifi-poller/wiki/Windows) too. -The unifi data extraction is provided as an [external library](https://godoc.org/github.com/golift/unifi), +The unifi data extraction is provided as an [external library](https://godoc.org/golift.io/unifi), and you can import that code directly without futzing with this application. That means, if you wanted to do something like make telegraf collect your data instead of UniFi Poller you can achieve that with a little bit of Go code. You could write diff --git a/integrations/inputunifi/unifipoller/config.go b/integrations/inputunifi/unifipoller/config.go index 65ded912..4ee5a42a 100644 --- a/integrations/inputunifi/unifipoller/config.go +++ b/integrations/inputunifi/unifipoller/config.go @@ -3,9 +3,9 @@ package unifipoller import ( "time" - "code.golift.io/unifi" influx "github.com/influxdata/influxdb1-client/v2" "github.com/spf13/pflag" + "golift.io/unifi" ) // Version is injected by the Makefile diff --git a/integrations/inputunifi/unifipoller/dumper.go b/integrations/inputunifi/unifipoller/dumper.go index 049c4249..f1f2a1d6 100644 --- a/integrations/inputunifi/unifipoller/dumper.go +++ b/integrations/inputunifi/unifipoller/dumper.go @@ -5,8 +5,8 @@ import ( "os" "strings" - "code.golift.io/unifi" "github.com/pkg/errors" + "golift.io/unifi" ) // DumpJSONPayload prints raw json from the UniFi Controller. diff --git a/integrations/inputunifi/unifipoller/start.go b/integrations/inputunifi/unifipoller/start.go index 2520459a..e722da49 100644 --- a/integrations/inputunifi/unifipoller/start.go +++ b/integrations/inputunifi/unifipoller/start.go @@ -10,11 +10,11 @@ import ( "strings" "time" - "code.golift.io/unifi" "github.com/BurntSushi/toml" influx "github.com/influxdata/influxdb1-client/v2" "github.com/pkg/errors" flag "github.com/spf13/pflag" + "golift.io/unifi" yaml "gopkg.in/yaml.v2" ) diff --git a/integrations/inputunifi/unifipoller/unifi.go b/integrations/inputunifi/unifipoller/unifi.go index a62b777c..37330686 100644 --- a/integrations/inputunifi/unifipoller/unifi.go +++ b/integrations/inputunifi/unifipoller/unifi.go @@ -6,9 +6,9 @@ import ( "strings" "time" - "code.golift.io/unifi" influx "github.com/influxdata/influxdb1-client/v2" "github.com/pkg/errors" + "golift.io/unifi" ) // CheckSites makes sure the list of provided sites exists on the controller. From f78f4c0de5a6dde3604b2585c13aa86525f90dbc Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Sat, 20 Jul 2019 02:57:39 -0700 Subject: [PATCH 3/3] Fix these paths too --- integrations/inputunifi/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/integrations/inputunifi/README.md b/integrations/inputunifi/README.md index 074b7e7a..ee219986 100644 --- a/integrations/inputunifi/README.md +++ b/integrations/inputunifi/README.md @@ -7,8 +7,8 @@ [![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) [![DLs](https://img.shields.io/github/downloads/davidnewhall/unifi-poller/total.svg?logo=github&color=0116ff "GitHub Downloads")](https://www.somsubhra.com/github-release-stats/?username=davidnewhall&repository=unifi-poller) -[![unifi](https://badgen.net/badge/UniFi/5.10.x,5.11.x,UAP,USG,USW?list=|&icon=https://golift.github.io/svg/ubiquiti_color.svg&color=0099ee "UniFi Products Supported")](https://github.com/golift/unifi) -[![builer](https://badgen.net/badge/go/Application%20Builder?label=&icon=https://golift.github.io/svg/go.svg&color=0099ee "Go Application Builder")](https://github.com/golift/application-builder) +[![unifi](https://badgen.net/badge/UniFi/5.10.x,5.11.x,UAP,USG,USW?list=|&icon=https://docs.golift.io/svg/ubiquiti_color.svg&color=0099ee "UniFi Products Supported")](https://github.com/golift/unifi) +[![builer](https://badgen.net/badge/go/Application%20Builder?label=&icon=https://docs.golift.io/svg/go.svg&color=0099ee "Go Application Builder")](https://github.com/golift/application-builder) [![stars](https://badgen.net/github/stars/davidnewhall/unifi-poller?icon=https://simpleicons.now.sh/macys/fab&label=&color=0099ee "GitHub Stars")](https://github.com/davidnewhall/unifi-poller) [![travis](https://badgen.net/travis/davidnewhall/unifi-poller?icon=travis&label=build "Travis Build")](https://travis-ci.org/davidnewhall/unifi-poller)