From 22741ccab30cb1594901ffc0bf6a7f3e5165df0a Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Tue, 4 Feb 2020 20:04:17 -0800 Subject: [PATCH 1/3] update docs --- README.md | 8 +++++--- examples/up.conf.example | 8 -------- examples/up.xml.example | 2 +- examples/up.yaml.example | 2 +- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 341ba09a..ba95b506 100644 --- a/README.md +++ b/README.md @@ -23,8 +23,9 @@ We have a special place for [Docker Users](https://github.com/unifi-poller/unifi I'm willing to help if you have troubles. Open an [Issue](https://github.com/unifi-poller/unifi-poller/issues) and we'll figure out how to get things working for you. You can also get help in -the #unifi-poller channel on the [Ubiquiti Discord server](https://discord.gg/KnyKYt2). -I've also [provided a forum post](https://community.ui.com/questions/Unifi-Poller-Store-Unifi-Controller-Metrics-in-InfluxDB-without-SNMP/58a0ea34-d2b3-41cd-93bb-d95d3896d1a1) you may use to get additional help. +the #unifi-poller channel on the [Ubiquiti Discord server](https://discord.gg/KnyKYt2). I've also +[provided a forum post](https://community.ui.com/questions/Unifi-Poller-Store-Unifi-Controller-Metrics-in-InfluxDB-without-SNMP/58a0ea34-d2b3-41cd-93bb-d95d3896d1a1) +you may use to get additional help. ## Description @@ -62,7 +63,8 @@ The original code pulled only the client data. This app now pulls data for clients, access points, security gateways, dream machines and switches. I've been trying to get my UAP data into Grafana. Sure, google search that. -You'll find [this](https://community.ubnt.com/t5/UniFi-Wireless/Grafana-dashboard-for-UniFi-APs-now-available/td-p/1833532). What if you don't want to deal with SNMP? +You'll find [this](https://community.ubnt.com/t5/UniFi-Wireless/Grafana-dashboard-for-UniFi-APs-now-available/td-p/1833532). +What if you don't want to deal with SNMP? Well, here you go. I've replicated 400% of what you see on those SNMP-powered dashboards with this Go app running on the same mac as my UniFi controller. All without enabling SNMP nor trying to understand those OIDs. Mad props diff --git a/examples/up.conf.example b/examples/up.conf.example index 041f21f5..018a4131 100644 --- a/examples/up.conf.example +++ b/examples/up.conf.example @@ -1,14 +1,6 @@ # UniFi Poller v2 primary configuration file. TOML FORMAT # ########################################################### -### NOTICE ### 1-26-2020 ### - -# This config file, and all the config files in this same folder are for VERSION 2. -# V2 is still alpha and not released. If you use Docker, specifically `latest` you -# will get version 1.6.3. This is *not* the correct config file and will not work. -# It will also not generate errors, and you will spend hours pulling your hair out. -# Use this file for v1: https://github.com/unifi-poller/unifi-poller/blob/v1.6.3/examples/up.conf.example - [poller] # Turns on line numbers, microsecond logging, and a per-device log. # The default is false, but I personally leave this on at home (four devices). diff --git a/examples/up.xml.example b/examples/up.xml.example index 2b332740..b8b1fb0e 100644 --- a/examples/up.xml.example +++ b/examples/up.xml.example @@ -3,7 +3,7 @@ ############################################# # UniFi Poller primary configuration file. # # XML FORMAT. Provided values are defaults. # -# See up.conf.example! # +# See up.conf.example! v2 # ############################################# and are lists of strings and may be repeated. diff --git a/examples/up.yaml.example b/examples/up.yaml.example index 74e692c2..d82e7989 100644 --- a/examples/up.yaml.example +++ b/examples/up.yaml.example @@ -1,7 +1,7 @@ ############################################## # UniFi Poller primary configuration file. # # YAML FORMAT. Provided values are defaults. # -# See up.conf.example! # +# See up.conf.example! v2 # ############################################## --- From 54f7cff78a7978bbfcb23ab74ce2d5d0a80b2e56 Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Wed, 5 Feb 2020 18:49:53 -0800 Subject: [PATCH 2/3] library updates --- go.mod | 8 ++++---- go.sum | 8 ++++++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 00226aed..aa09663d 100644 --- a/go.mod +++ b/go.mod @@ -8,9 +8,9 @@ require ( github.com/mattn/go-isatty v0.0.11 // indirect github.com/russross/blackfriday v2.0.0+incompatible // indirect github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect - github.com/unifi-poller/influxunifi v0.0.8-0.20200205011639-5c4a3be8cbc7 + github.com/unifi-poller/influxunifi v0.0.8 github.com/unifi-poller/inputunifi v0.0.6-0.20200205010458-a1783e28d08a - github.com/unifi-poller/poller v0.0.5-0.20200203042411-c58679b76f5c - github.com/unifi-poller/promunifi v0.0.6-0.20200202075223-eecff9bfcebd - github.com/unifi-poller/unifi v0.0.4-0.20200205010421-c48a6fc3abb7 + github.com/unifi-poller/poller v0.0.5 + github.com/unifi-poller/promunifi v0.0.6 + github.com/unifi-poller/unifi v0.0.4 ) diff --git a/go.sum b/go.sum index a702336e..a4909ad7 100644 --- a/go.sum +++ b/go.sum @@ -70,6 +70,8 @@ github.com/unifi-poller/influxunifi v0.0.7 h1:mQ34a6KRQ4+e18+Ba0gEIkMM+lGa1AVFIv github.com/unifi-poller/influxunifi v0.0.7/go.mod h1:QcGZzDnkAl1IMfqhvyroyYOtCZs2VsSxekF/04Qe0XY= github.com/unifi-poller/influxunifi v0.0.8-0.20200205011639-5c4a3be8cbc7 h1:LWHANHIouTL7XmKmfGLMMJqSVitZLt37en/q9MaCvgQ= github.com/unifi-poller/influxunifi v0.0.8-0.20200205011639-5c4a3be8cbc7/go.mod h1:QcGZzDnkAl1IMfqhvyroyYOtCZs2VsSxekF/04Qe0XY= +github.com/unifi-poller/influxunifi v0.0.8 h1:LlhzyoG81u7cg9SaSigwKF7zi9fAUsoEtUNtVcISZZs= +github.com/unifi-poller/influxunifi v0.0.8/go.mod h1:QcGZzDnkAl1IMfqhvyroyYOtCZs2VsSxekF/04Qe0XY= github.com/unifi-poller/inputunifi v0.0.5 h1:go+5j7WS1y0N/2pKKPvjzn8bkPpFXurQnoYGYajJD04= github.com/unifi-poller/inputunifi v0.0.5/go.mod h1:X1Vd5uAtO5etZveY0WpMVMQBM/iLoMwZ/SvN1iXLxHo= github.com/unifi-poller/inputunifi v0.0.6-0.20200203055955-411a49dea2e7 h1:CXMB+6tTJJZEoyMmH24PN/7evm3yuvily9Df4sujeT0= @@ -93,8 +95,12 @@ github.com/unifi-poller/poller v0.0.4 h1:TYCdQeCYwUmmFcj1H75iGKAFbAOBFwo/XIJDX2I github.com/unifi-poller/poller v0.0.4/go.mod h1:LbOCEdNth7invhaOTpcadW/sDlD2WsU+IE3GRXKzOCg= github.com/unifi-poller/poller v0.0.5-0.20200203042411-c58679b76f5c h1:x1EiLvLx9OU1iyPSEnb7TzpKLRvYB8zRQ0S8wb4+5B0= github.com/unifi-poller/poller v0.0.5-0.20200203042411-c58679b76f5c/go.mod h1:LbOCEdNth7invhaOTpcadW/sDlD2WsU+IE3GRXKzOCg= +github.com/unifi-poller/poller v0.0.5 h1:qnofARTx0JveNc9PqGJmNUs7xsjwFqCWpS8pwDSjW78= +github.com/unifi-poller/poller v0.0.5/go.mod h1:45TyAHk+xYF4KoFKaaZyjMmSdhbq2I1pLniYWfOXdHs= github.com/unifi-poller/promunifi v0.0.6-0.20200202075223-eecff9bfcebd h1:go68sWVWpQSrk9MVWTaH7Sx12C/mbeX7lpYxo91DWy8= github.com/unifi-poller/promunifi v0.0.6-0.20200202075223-eecff9bfcebd/go.mod h1:xgUekNECq3gVfJrbBKBctL0VTJShd7bzlNBRXkwl4uk= +github.com/unifi-poller/promunifi v0.0.6 h1:0b+2gmTYqY+WVLpN4GiKZ0qsfYDHTbrErrJFCBNL8nE= +github.com/unifi-poller/promunifi v0.0.6/go.mod h1:yK/6tNvTlRunkADWNzfE8nTtj/hSZA+RZih1TD8pOOc= github.com/unifi-poller/unifi v0.0.2/go.mod h1:DagVD/I+VMnVUHmTT4Fi76lPI+DHbuMwwtMIzanwMxM= github.com/unifi-poller/unifi v0.0.3 h1:6pmjW7MuEEDKKvYoxjL3EZlaLOgmhYyxJBAg4X7GliI= github.com/unifi-poller/unifi v0.0.3/go.mod h1:DagVD/I+VMnVUHmTT4Fi76lPI+DHbuMwwtMIzanwMxM= @@ -105,6 +111,8 @@ github.com/unifi-poller/unifi v0.0.4-0.20200204205816-4e0f82ec6586 h1:jpA5yAZ9oT github.com/unifi-poller/unifi v0.0.4-0.20200204205816-4e0f82ec6586/go.mod h1:bTUtctrf56aapjKH+L+98eThBaVFbQXw5iNGZI0g/+E= github.com/unifi-poller/unifi v0.0.4-0.20200205010421-c48a6fc3abb7 h1:NulSYl6Ky9xLemgHY8Q/3QNV+ilJgB1p0uyzwZ8RtKg= github.com/unifi-poller/unifi v0.0.4-0.20200205010421-c48a6fc3abb7/go.mod h1:bTUtctrf56aapjKH+L+98eThBaVFbQXw5iNGZI0g/+E= +github.com/unifi-poller/unifi v0.0.4 h1:NDTxHTdF0MAt1y1RU8J+MSqdYlO0CEIqlrktcj3y/og= +github.com/unifi-poller/unifi v0.0.4/go.mod h1:bTUtctrf56aapjKH+L+98eThBaVFbQXw5iNGZI0g/+E= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= From 3d56e509bd2234318760ac644ffe9deb4a610377 Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Wed, 5 Feb 2020 20:10:49 -0800 Subject: [PATCH 3/3] update screenshots --- README.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index ba95b506..04d7787e 100644 --- a/README.md +++ b/README.md @@ -80,21 +80,22 @@ Most people prefer Docker, and this app is right at home in that environment. ## What's it look like? -There are five total dashboards available. Below you'll find screenshots of a few. +There are 12 total dashboards available; the 6 InfluxDB dashboards are very similar +to the 6 Prometheus dashboards. Below you'll find screenshots of the first four dashboards. ##### Client Dashboard (InfluxDB) -![UniFi Clients Dashboard Image](https://grafana.com/api/dashboards/10418/images/6660/image) +![UniFi Clients Dashboard Image](https://grafana.com/api/dashboards/10418/images/7540/image) ##### USG Dashboard (InfluxDB) -![USG Dashboard Image](https://grafana.com/api/dashboards/10416/images/6663/image) +![USG Dashboard Image](https://grafana.com/api/dashboards/10416/images/7543/image) ##### UAP Dashboard (InfluxDB) -![UAP Dashboard Image](https://grafana.com/api/dashboards/10415/images/6662/image) +![UAP Dashboard Image](https://grafana.com/api/dashboards/10415/images/7542/image) ##### USW / Switch Dashboard (InfluxDB) 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/6664/image) +![USW Dashboard Image](https://grafana.com/api/dashboards/10417/images/7544/image) ## Integrations