From 4a4160d10c9a6dcd58c9795f2947df1d30b2cb07 Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Sat, 20 Jun 2020 03:57:58 -0700 Subject: [PATCH 01/39] Add events --- examples/up.conf.example | 25 ++++++++++++++++---- examples/up.json.example | 50 +++++++++++++++++++++------------------- examples/up.xml.example | 2 ++ examples/up.yaml.example | 22 ++++++++++-------- go.mod | 10 ++++---- go.sum | 11 +++++++++ 6 files changed, 77 insertions(+), 43 deletions(-) diff --git a/examples/up.conf.example b/examples/up.conf.example index 93be68bd..d2df0349 100644 --- a/examples/up.conf.example +++ b/examples/up.conf.example @@ -30,8 +30,11 @@ # InfluxDB does not require auth by default, so the user/password are probably unimportant. url = "http://127.0.0.1:8086" user = "unifipoller" + # Password for InfluxDB user (above). + # If the password provided here begins with file:// then the password is read in from + # the file path that follows the file:// prefix. ex: file:///etc/influxdb/passwd.file pass = "unifipoller" - # Be sure to create this database. + # Be sure to create this database. See the InfluxDB Wiki page for more info. db = "unifi" # If your InfluxDB uses a valid SSL cert, set this to true. verify_ssl = false @@ -47,7 +50,7 @@ # configuring controllers in this config file. Instead you configure them in # your prometheus.yml config. Prometheus then sends the controller URL to # unifi-poller when it performs the scrape. This is useful if you have many, - # or changing controllers. Most people can leave this off. See wiki for more. + # or changing controllers. See wiki for more. dynamic = false # The following section contains the default credentials/configuration for any @@ -69,7 +72,7 @@ # The following is optional and used for configurations with multiple controllers. # You may repeat the following section to poll multiple controllers. -# Any ommitted variables will have their values taken from the defaults, above. +# Any omitted variables will have their values taken from the defaults, above. #[[unifi.controller]] # URL for the UniFi Controller. Do not add any paths after the host:port. # Do not use port 8443 if you have a UDM. @@ -77,6 +80,10 @@ # Make a read-only user in the UniFi Admin Settings, allow it access to all sites. #user = "unifipoller" + # Password for UniFi controller user (above). + # If the password provided here begins with file:// then the password is read in from + # the file path that follows the file:// prefix. ex: file:///etc/unifi/password.file + # ex: file:///etc/unifi/passwd.file #pass = "unifipoller" # If the controller has more than one site, specify which sites to poll here. @@ -84,8 +91,18 @@ # A setting of ["all"] will poll all sites; this works if you only have 1 site too. #sites = ["all"] + # Enable collection of UniFi Events (InfluxDB only). + # This may store a lot of information. Only recommended for testing and debugging. + # There are no dashboards to display this data. It can be used for annotations. + # This is a new (July, 2020) feature. Please provide feedback if you try it out! + # Enable this only if using InfluxDB. This may leak PII data! + #save_events = false + # Enable collection of Intrusion Detection System Data (InfluxDB only). - # Only useful if IDS or IPS are enabled on one of the sites. + # Only useful if IDS or IPS are enabled on one of the sites. This may store + # a lot of information. Only recommended for testing and debugging. There + # may not be any dashboards to display this data. It can be used for annotations. + # Enable this only if using InfluxDB. This may leak PII data! #save_ids = false # Enable collection of Deep Packet Inspection data. This data breaks down traffic diff --git a/examples/up.json.example b/examples/up.json.example index 16c62b89..107f20e4 100644 --- a/examples/up.json.example +++ b/examples/up.json.example @@ -1,50 +1,52 @@ { "poller": { - "debug": false, - "quiet": false, + "debug": false, + "quiet": false, "plugins": [] }, "prometheus": { - "disable": false, - "http_listen": "0.0.0.0:9130", + "disable": false, + "http_listen": "0.0.0.0:9130", "report_errors": false }, "influxdb": { "disable": false, - "url": "http://127.0.0.1:8086", + "url": "http://127.0.0.1:8086", "user": "unifipoller", "pass": "unifipoller", - "db": "unifi", + "db": "unifi", "verify_ssl": false, - "interval": "30s" + "interval": "30s" }, "unifi": { "dynamic": false, "defaults": { - "user": "unifipoller", - "pass": "unifipoller", - "url": "https://127.0.0.1:8443", - "sites": ["all"], - "save_ids": false, - "save_dpi": false, - "save_sites": true, - "hash_pii": false, - "verify_ssl": false + "user": "unifipoller", + "pass": "unifipoller", + "url": "https://127.0.0.1:8443", + "sites": ["all"], + "save_events": false, + "save_ids": false, + "save_dpi": false, + "save_sites": true, + "hash_pii": false, + "verify_ssl": false }, "controllers": [ { - "user": "unifipoller", - "pass": "unifipoller", - "url": "https://127.0.0.1:8443", + "user": "unifipoller", + "pass": "unifipoller", + "url": "https://127.0.0.1:8443", "sites": ["all"], - "save_ids": false, - "save_dpi": false, - "save_sites": true, - "hash_pii": false, - "verify_ssl": false + "save_events": false, + "save_ids": false, + "save_dpi": false, + "save_sites": true, + "hash_pii": false, + "verify_ssl": false } ] } diff --git a/examples/up.xml.example b/examples/up.xml.example index 5351257f..3fc3f776 100644 --- a/examples/up.xml.example +++ b/examples/up.xml.example @@ -31,6 +31,7 @@ NOTE: and are lists of strings and may be repeated. unifipoller unifipoller https://127.0.0.1:8443 + false false false true @@ -44,6 +45,7 @@ NOTE: and are lists of strings and may be repeated. unifipoller unifipoller https://127.0.0.1:8443 + false false false true diff --git a/examples/up.yaml.example b/examples/up.yaml.example index 3235761b..b3c9ee94 100644 --- a/examples/up.yaml.example +++ b/examples/up.yaml.example @@ -32,11 +32,12 @@ unifi: pass: "unifipoller" sites: - all - save_ids: false - save_dpi: false - save_sites: true - hash_pii: false - verify_ssl: false + save_events: false + save_ids: false + save_dpi: false + save_sites: true + hash_pii: false + verify_ssl: false controllers: @@ -46,8 +47,9 @@ unifi: pass: "unifipoller" sites: - all - save_ids: false - save_dpi: false - hash_pii: false - save_sites: true - verify_ssl: false + save_events: false + save_ids: false + save_dpi: false + save_sites: true + hash_pii: false + verify_ssl: false diff --git a/go.mod b/go.mod index 8fd69c7e..345f5c5e 100644 --- a/go.mod +++ b/go.mod @@ -10,9 +10,9 @@ require ( github.com/prometheus/procfs v0.1.3 // 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.9 - github.com/unifi-poller/inputunifi v0.0.7 - github.com/unifi-poller/poller v0.0.7 - github.com/unifi-poller/promunifi v0.0.8 - github.com/unifi-poller/unifi v0.0.5 + github.com/unifi-poller/influxunifi v0.0.10-0.20200620104500-bd1a036c5754 + github.com/unifi-poller/inputunifi v0.0.8-0.20200620104121-47689f50d8e3 + github.com/unifi-poller/poller v0.0.8-0.20200619104117-a5e263a36ac9 + github.com/unifi-poller/promunifi v0.0.9-0.20200620104707-26208eb4336b + github.com/unifi-poller/unifi v0.0.5-0.20200620103801-b927287ea1cd ) diff --git a/go.sum b/go.sum index 1ae37013..663a6acf 100644 --- a/go.sum +++ b/go.sum @@ -138,6 +138,8 @@ github.com/unifi-poller/influxunifi v0.0.9-0.20200614094130-d25a8fece6bc h1:IwCB github.com/unifi-poller/influxunifi v0.0.9-0.20200614094130-d25a8fece6bc/go.mod h1:CfMvHVp3TPnp8flNvsiUSz09LWop1kmig/Sukg+hkAg= github.com/unifi-poller/influxunifi v0.0.9 h1:ZDiDbFwoGfNWTXgVOUkkxTOUvkvS8RwweiDRhtntfCU= github.com/unifi-poller/influxunifi v0.0.9/go.mod h1:CfMvHVp3TPnp8flNvsiUSz09LWop1kmig/Sukg+hkAg= +github.com/unifi-poller/influxunifi v0.0.10-0.20200620104500-bd1a036c5754 h1:yp07xJG/OiYCl+2DtDEUghaYMBt1gxRgvjB4iE6v2Zg= +github.com/unifi-poller/influxunifi v0.0.10-0.20200620104500-bd1a036c5754/go.mod h1:8uchM41Th2buvjKYsD5Lu/9fu4d8qBqs4f+ETA8O5a4= 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= @@ -178,6 +180,8 @@ github.com/unifi-poller/inputunifi v0.0.7-0.20200615121955-129eacb5681d h1:qhrqV github.com/unifi-poller/inputunifi v0.0.7-0.20200615121955-129eacb5681d/go.mod h1:sNdMyJPSSxm+IfM6H2g2ovWzn+fXOeIPhRGJbK35tOw= github.com/unifi-poller/inputunifi v0.0.7 h1:P5KJrvM9JPEzc1wRA9QYccFd7uipcbStbk7gIhFUrd8= github.com/unifi-poller/inputunifi v0.0.7/go.mod h1:sNdMyJPSSxm+IfM6H2g2ovWzn+fXOeIPhRGJbK35tOw= +github.com/unifi-poller/inputunifi v0.0.8-0.20200620104121-47689f50d8e3 h1:4EMN1Bp4nxe1wq5QprApyxdORrM/BUn8bL694DEugTY= +github.com/unifi-poller/inputunifi v0.0.8-0.20200620104121-47689f50d8e3/go.mod h1:kmEi1hpjxDzizBeQ5c4gqrpZke8aHu64yfIK0O2T+bE= github.com/unifi-poller/poller v0.0.3/go.mod h1:ugy3FyZEH1rFyC3panBiJpXbLf7EZ4GkjiOtydB2CwQ= github.com/unifi-poller/poller v0.0.4 h1:TYCdQeCYwUmmFcj1H75iGKAFbAOBFwo/XIJDX2Id+cY= github.com/unifi-poller/poller v0.0.4/go.mod h1:LbOCEdNth7invhaOTpcadW/sDlD2WsU+IE3GRXKzOCg= @@ -191,6 +195,8 @@ github.com/unifi-poller/poller v0.0.7-0.20200615130505-b2becb340fdc h1:XgiLe8xg9 github.com/unifi-poller/poller v0.0.7-0.20200615130505-b2becb340fdc/go.mod h1:RkRJ4pAc2dAN8Xu9+VOumeE3BdN5QDQ3PC+jBx8hWW0= github.com/unifi-poller/poller v0.0.7 h1:waSPusZd7yPz1zKJgxPSTwjhIUzA+qj8PwVyfLSLjns= github.com/unifi-poller/poller v0.0.7/go.mod h1:RkRJ4pAc2dAN8Xu9+VOumeE3BdN5QDQ3PC+jBx8hWW0= +github.com/unifi-poller/poller v0.0.8-0.20200619104117-a5e263a36ac9 h1:BYNOSvttR91a0F+ttG2ecD3DenVI9p9oi1W7m36zH98= +github.com/unifi-poller/poller v0.0.8-0.20200619104117-a5e263a36ac9/go.mod h1:q2tufLljemUR/blyhjIj+T0sdAOZo0kdlv3h79kEMgU= 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= @@ -215,6 +221,8 @@ github.com/unifi-poller/promunifi v0.0.8-0.20200615120918-62e66b15dc1a h1:MCrM2Q github.com/unifi-poller/promunifi v0.0.8-0.20200615120918-62e66b15dc1a/go.mod h1:YXNpofH3Tw707nHJaHXZWVnTlosc4Jdia1RpaVkLTd4= github.com/unifi-poller/promunifi v0.0.8 h1:cSoDYZnpFGxyht7sAMytl1wmbHSKem3OOHQXPL3mrrI= github.com/unifi-poller/promunifi v0.0.8/go.mod h1:YXNpofH3Tw707nHJaHXZWVnTlosc4Jdia1RpaVkLTd4= +github.com/unifi-poller/promunifi v0.0.9-0.20200620104707-26208eb4336b h1:HgmbS5cKfvw3x0ie6IV/FfhxNtKwAvICKxXL7gg2sgM= +github.com/unifi-poller/promunifi v0.0.9-0.20200620104707-26208eb4336b/go.mod h1:jOcYehhsOrs4ctswSKEqGuqSgVBpConaWmRYskycbUc= 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= @@ -230,6 +238,9 @@ github.com/unifi-poller/unifi v0.0.4/go.mod h1:bTUtctrf56aapjKH+L+98eThBaVFbQXw5 github.com/unifi-poller/unifi v0.0.5-0.20200614031431-bd4934fc585b h1:g3nleMBVzn/0PVwzoNYCwioFgYjzOxMByAO66a/tTf0= github.com/unifi-poller/unifi v0.0.5-0.20200614031431-bd4934fc585b/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= github.com/unifi-poller/unifi v0.0.5-0.20200614034623-f4c1d18157c2/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= +github.com/unifi-poller/unifi v0.0.5-0.20200619092006-d24c776a42f5/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= +github.com/unifi-poller/unifi v0.0.5-0.20200620103801-b927287ea1cd h1:jrwuiY1AdoPi+b+R8zjt/e8h8ZqULNB9izcyQnf3pSw= +github.com/unifi-poller/unifi v0.0.5-0.20200620103801-b927287ea1cd/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= github.com/unifi-poller/unifi v0.0.5 h1:Izeun32YxcQOeKZUXY0Sy4ltKYFuYxWGcN9JS6xkIJU= github.com/unifi-poller/unifi v0.0.5/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= From 97d63129d216cc4b8794635ceecbc6bca5f5946f Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Sun, 21 Jun 2020 00:59:04 -0700 Subject: [PATCH 02/39] fixes --- go.mod | 4 ++-- go.sum | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 345f5c5e..3afbb13c 100644 --- a/go.mod +++ b/go.mod @@ -10,9 +10,9 @@ require ( github.com/prometheus/procfs v0.1.3 // 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.10-0.20200620104500-bd1a036c5754 + github.com/unifi-poller/influxunifi v0.0.10-0.20200621075823-77eac45b1298 github.com/unifi-poller/inputunifi v0.0.8-0.20200620104121-47689f50d8e3 github.com/unifi-poller/poller v0.0.8-0.20200619104117-a5e263a36ac9 github.com/unifi-poller/promunifi v0.0.9-0.20200620104707-26208eb4336b - github.com/unifi-poller/unifi v0.0.5-0.20200620103801-b927287ea1cd + github.com/unifi-poller/unifi v0.0.5-0.20200621075746-253ccae7e106 ) diff --git a/go.sum b/go.sum index 663a6acf..6abcadf5 100644 --- a/go.sum +++ b/go.sum @@ -140,6 +140,8 @@ github.com/unifi-poller/influxunifi v0.0.9 h1:ZDiDbFwoGfNWTXgVOUkkxTOUvkvS8Rwwei github.com/unifi-poller/influxunifi v0.0.9/go.mod h1:CfMvHVp3TPnp8flNvsiUSz09LWop1kmig/Sukg+hkAg= github.com/unifi-poller/influxunifi v0.0.10-0.20200620104500-bd1a036c5754 h1:yp07xJG/OiYCl+2DtDEUghaYMBt1gxRgvjB4iE6v2Zg= github.com/unifi-poller/influxunifi v0.0.10-0.20200620104500-bd1a036c5754/go.mod h1:8uchM41Th2buvjKYsD5Lu/9fu4d8qBqs4f+ETA8O5a4= +github.com/unifi-poller/influxunifi v0.0.10-0.20200621075823-77eac45b1298 h1:dbBsIr4vMTjlYtLgPEVRlKLiEhDTDsvDciVoM1odz60= +github.com/unifi-poller/influxunifi v0.0.10-0.20200621075823-77eac45b1298/go.mod h1:YNXEniQvf9fS+AORF5Cu+OALev1bsOtsGXnV76AUKaQ= 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= @@ -241,6 +243,9 @@ github.com/unifi-poller/unifi v0.0.5-0.20200614034623-f4c1d18157c2/go.mod h1:L1k github.com/unifi-poller/unifi v0.0.5-0.20200619092006-d24c776a42f5/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= github.com/unifi-poller/unifi v0.0.5-0.20200620103801-b927287ea1cd h1:jrwuiY1AdoPi+b+R8zjt/e8h8ZqULNB9izcyQnf3pSw= github.com/unifi-poller/unifi v0.0.5-0.20200620103801-b927287ea1cd/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= +github.com/unifi-poller/unifi v0.0.5-0.20200621023010-6a70dec929ba/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= +github.com/unifi-poller/unifi v0.0.5-0.20200621075746-253ccae7e106 h1:eKErSqWD656pLSWgxFwhDhHe/zfAXrm7F39Zn4R+si8= +github.com/unifi-poller/unifi v0.0.5-0.20200621075746-253ccae7e106/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= github.com/unifi-poller/unifi v0.0.5 h1:Izeun32YxcQOeKZUXY0Sy4ltKYFuYxWGcN9JS6xkIJU= github.com/unifi-poller/unifi v0.0.5/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= From 13ce2fe6f6d0f9c7172c6d62705040239432ed0e Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Sun, 21 Jun 2020 02:43:08 -0700 Subject: [PATCH 03/39] updates --- .metadata.sh | 2 +- .travis.yml | 3 +++ go.mod | 5 +++++ go.sum | 6 ++++++ main.go | 1 - 5 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.metadata.sh b/.metadata.sh index cf0b92e1..de3e34bc 100755 --- a/.metadata.sh +++ b/.metadata.sh @@ -9,7 +9,7 @@ HBREPO="golift/homebrew-mugs" MAINT="David Newhall II " VENDOR="Go Lift " DESC="Polls a UniFi controller, exports metrics to InfluxDB and Prometheus" -GOLANGCI_LINT_ARGS="--enable-all -D gochecknoglobals -D funlen -e G402 -D gochecknoinits" +GOLANGCI_LINT_ARGS="--enable-all" # Example must exist at examples/$CONFIG_FILE.example CONFIG_FILE="up.conf" LICENSE="MIT" diff --git a/.travis.yml b/.travis.yml index 2040b26d..9d927dbe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,6 +22,8 @@ services: install: - rvm install 2.3.0 - rvm 2.3.0 do gem install --no-document fpm + # download super-linter: golangci-lint + # - curl -sL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin latest before_script: - gpg --import gpg.public.key # Create your own deploy key, tar it, and encrypt the file to make this work. Optionally add a bitly_token file to the archive. @@ -32,6 +34,7 @@ before_script: - source .metadata.sh script: # Test Go and Docker. + # - make test - make docker # Test built docker image. - docker run $BINARY -v 2>&1 | grep -Eq "^$BINARY v$VERSION" diff --git a/go.mod b/go.mod index 3afbb13c..681a555c 100644 --- a/go.mod +++ b/go.mod @@ -7,12 +7,17 @@ require ( github.com/influxdata/influxdb1-client v0.0.0-20200515024757-02f0bf5dbca3 // indirect github.com/mattn/go-colorable v0.1.4 // indirect github.com/mattn/go-isatty v0.0.11 // indirect + github.com/prometheus/client_golang v1.7.0 // indirect + github.com/prometheus/common v0.10.0 // indirect github.com/prometheus/procfs v0.1.3 // indirect github.com/russross/blackfriday v2.0.0+incompatible // indirect github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect github.com/unifi-poller/influxunifi v0.0.10-0.20200621075823-77eac45b1298 github.com/unifi-poller/inputunifi v0.0.8-0.20200620104121-47689f50d8e3 github.com/unifi-poller/poller v0.0.8-0.20200619104117-a5e263a36ac9 github.com/unifi-poller/promunifi v0.0.9-0.20200620104707-26208eb4336b github.com/unifi-poller/unifi v0.0.5-0.20200621075746-253ccae7e106 + golang.org/x/sys v0.0.0-20200620081246-981b61492c35 // indirect + golift.io/cnfg v0.0.5 // indirect ) diff --git a/go.sum b/go.sum index 6abcadf5..8ab2cfb7 100644 --- a/go.sum +++ b/go.sum @@ -52,6 +52,7 @@ github.com/influxdata/influxdb1-client v0.0.0-20200515024757-02f0bf5dbca3 h1:k3/ github.com/influxdata/influxdb1-client v0.0.0-20200515024757-02f0bf5dbca3/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= @@ -82,6 +83,8 @@ github.com/prometheus/client_golang v1.5.0 h1:Ctq0iGpCmr3jeP77kbF2UxgvRwzWWz+4Bh github.com/prometheus/client_golang v1.5.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= github.com/prometheus/client_golang v1.6.0 h1:YVPodQOcK15POxhgARIvnDRVpLcuK8mglnMrWfyrw6A= github.com/prometheus/client_golang v1.6.0/go.mod h1:ZLOG9ck3JLRdB5MgO8f+lLTe83AXG6ro35rLTxvnIl4= +github.com/prometheus/client_golang v1.7.0 h1:wCi7urQOGBsYcQROHqpUUX4ct84xp40t9R9JX0FuA/U= +github.com/prometheus/client_golang v1.7.0/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -290,6 +293,9 @@ golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200610111108-226ff32320da h1:bGb80FudwxpeucJUjPYJXuJ8Hk91vNtfvrymzwiei38= golang.org/x/sys v0.0.0-20200610111108-226ff32320da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200620081246-981b61492c35 h1:wb/9mP8eUAmHfkM8RmpeLq6nUA7c2i5+bQOtcDftjaE= +golang.org/x/sys v0.0.0-20200620081246-981b61492c35/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= diff --git a/main.go b/main.go index e37f1138..1dc0c96c 100644 --- a/main.go +++ b/main.go @@ -9,7 +9,6 @@ import ( // Load input plugins! _ "github.com/unifi-poller/inputunifi" - _ "github.com/unifi-poller/unifi" // Load output plugins! _ "github.com/unifi-poller/influxunifi" From 82401f1476aef2146f56ce789c1b24c3fe32d645 Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Sun, 21 Jun 2020 02:44:27 -0700 Subject: [PATCH 04/39] updates --- go.mod | 6 +++--- go.sum | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 681a555c..6360fc17 100644 --- a/go.mod +++ b/go.mod @@ -13,9 +13,9 @@ require ( github.com/russross/blackfriday v2.0.0+incompatible // indirect github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/unifi-poller/influxunifi v0.0.10-0.20200621075823-77eac45b1298 - github.com/unifi-poller/inputunifi v0.0.8-0.20200620104121-47689f50d8e3 - github.com/unifi-poller/poller v0.0.8-0.20200619104117-a5e263a36ac9 + github.com/unifi-poller/influxunifi v0.0.10-0.20200621085434-01cd04643679 + github.com/unifi-poller/inputunifi v0.0.8-0.20200621094056-1f25f7cd1ec5 + github.com/unifi-poller/poller v0.0.8-0.20200621091816-fd5c7abd9f4b github.com/unifi-poller/promunifi v0.0.9-0.20200620104707-26208eb4336b github.com/unifi-poller/unifi v0.0.5-0.20200621075746-253ccae7e106 golang.org/x/sys v0.0.0-20200620081246-981b61492c35 // indirect diff --git a/go.sum b/go.sum index 8ab2cfb7..3b54579f 100644 --- a/go.sum +++ b/go.sum @@ -145,6 +145,8 @@ github.com/unifi-poller/influxunifi v0.0.10-0.20200620104500-bd1a036c5754 h1:yp0 github.com/unifi-poller/influxunifi v0.0.10-0.20200620104500-bd1a036c5754/go.mod h1:8uchM41Th2buvjKYsD5Lu/9fu4d8qBqs4f+ETA8O5a4= github.com/unifi-poller/influxunifi v0.0.10-0.20200621075823-77eac45b1298 h1:dbBsIr4vMTjlYtLgPEVRlKLiEhDTDsvDciVoM1odz60= github.com/unifi-poller/influxunifi v0.0.10-0.20200621075823-77eac45b1298/go.mod h1:YNXEniQvf9fS+AORF5Cu+OALev1bsOtsGXnV76AUKaQ= +github.com/unifi-poller/influxunifi v0.0.10-0.20200621085434-01cd04643679 h1:PB7SNDENoVsbsmomBUgkuaA38OF4rkUFBSXHeFcVAhU= +github.com/unifi-poller/influxunifi v0.0.10-0.20200621085434-01cd04643679/go.mod h1:p6jHkvpcbqf84Qg+HrMJkYGo0MlFk+5ylH/889amK3M= 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= @@ -187,6 +189,8 @@ github.com/unifi-poller/inputunifi v0.0.7 h1:P5KJrvM9JPEzc1wRA9QYccFd7uipcbStbk7 github.com/unifi-poller/inputunifi v0.0.7/go.mod h1:sNdMyJPSSxm+IfM6H2g2ovWzn+fXOeIPhRGJbK35tOw= github.com/unifi-poller/inputunifi v0.0.8-0.20200620104121-47689f50d8e3 h1:4EMN1Bp4nxe1wq5QprApyxdORrM/BUn8bL694DEugTY= github.com/unifi-poller/inputunifi v0.0.8-0.20200620104121-47689f50d8e3/go.mod h1:kmEi1hpjxDzizBeQ5c4gqrpZke8aHu64yfIK0O2T+bE= +github.com/unifi-poller/inputunifi v0.0.8-0.20200621094056-1f25f7cd1ec5 h1:lfasby9IDbgjQyJPxs4+DWw1Ys9CuEGziafZ+FlwIVc= +github.com/unifi-poller/inputunifi v0.0.8-0.20200621094056-1f25f7cd1ec5/go.mod h1:bt70WpE/Kmoif9lBjsUpmy2cPlC8zHQkuYg2f7a1U14= github.com/unifi-poller/poller v0.0.3/go.mod h1:ugy3FyZEH1rFyC3panBiJpXbLf7EZ4GkjiOtydB2CwQ= github.com/unifi-poller/poller v0.0.4 h1:TYCdQeCYwUmmFcj1H75iGKAFbAOBFwo/XIJDX2Id+cY= github.com/unifi-poller/poller v0.0.4/go.mod h1:LbOCEdNth7invhaOTpcadW/sDlD2WsU+IE3GRXKzOCg= @@ -202,6 +206,8 @@ github.com/unifi-poller/poller v0.0.7 h1:waSPusZd7yPz1zKJgxPSTwjhIUzA+qj8PwVyfLS github.com/unifi-poller/poller v0.0.7/go.mod h1:RkRJ4pAc2dAN8Xu9+VOumeE3BdN5QDQ3PC+jBx8hWW0= github.com/unifi-poller/poller v0.0.8-0.20200619104117-a5e263a36ac9 h1:BYNOSvttR91a0F+ttG2ecD3DenVI9p9oi1W7m36zH98= github.com/unifi-poller/poller v0.0.8-0.20200619104117-a5e263a36ac9/go.mod h1:q2tufLljemUR/blyhjIj+T0sdAOZo0kdlv3h79kEMgU= +github.com/unifi-poller/poller v0.0.8-0.20200621091816-fd5c7abd9f4b h1:AJKt/ZIDtlEOWxwpL/a7pcrWmqdJaaNE9odNn4JSRj0= +github.com/unifi-poller/poller v0.0.8-0.20200621091816-fd5c7abd9f4b/go.mod h1:+Ppksi2wBCrByJke0B0lTutxFtKfv1zx6L1haALBrN4= 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= From 800da350b5299e6c1be0951605418c65b8dde6bc Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Sun, 21 Jun 2020 04:18:30 -0700 Subject: [PATCH 05/39] separation of powers --- go.mod | 8 ++++---- go.sum | 8 ++++++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 6360fc17..0dd94422 100644 --- a/go.mod +++ b/go.mod @@ -13,10 +13,10 @@ require ( github.com/russross/blackfriday v2.0.0+incompatible // indirect github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/unifi-poller/influxunifi v0.0.10-0.20200621085434-01cd04643679 - github.com/unifi-poller/inputunifi v0.0.8-0.20200621094056-1f25f7cd1ec5 - github.com/unifi-poller/poller v0.0.8-0.20200621091816-fd5c7abd9f4b - github.com/unifi-poller/promunifi v0.0.9-0.20200620104707-26208eb4336b + github.com/unifi-poller/influxunifi v0.0.10-0.20200621111730-4fe24d61b4fe + github.com/unifi-poller/inputunifi v0.0.8-0.20200621111657-768a735debef + github.com/unifi-poller/poller v0.0.8-0.20200621110949-33f1a1454d10 + github.com/unifi-poller/promunifi v0.0.9-0.20200621111636-373108c3836a github.com/unifi-poller/unifi v0.0.5-0.20200621075746-253ccae7e106 golang.org/x/sys v0.0.0-20200620081246-981b61492c35 // indirect golift.io/cnfg v0.0.5 // indirect diff --git a/go.sum b/go.sum index 3b54579f..0213f8bb 100644 --- a/go.sum +++ b/go.sum @@ -147,6 +147,8 @@ github.com/unifi-poller/influxunifi v0.0.10-0.20200621075823-77eac45b1298 h1:dbB github.com/unifi-poller/influxunifi v0.0.10-0.20200621075823-77eac45b1298/go.mod h1:YNXEniQvf9fS+AORF5Cu+OALev1bsOtsGXnV76AUKaQ= github.com/unifi-poller/influxunifi v0.0.10-0.20200621085434-01cd04643679 h1:PB7SNDENoVsbsmomBUgkuaA38OF4rkUFBSXHeFcVAhU= github.com/unifi-poller/influxunifi v0.0.10-0.20200621085434-01cd04643679/go.mod h1:p6jHkvpcbqf84Qg+HrMJkYGo0MlFk+5ylH/889amK3M= +github.com/unifi-poller/influxunifi v0.0.10-0.20200621111730-4fe24d61b4fe h1:9749csA5+Yj8IPoL0apBKXOUf7PhI3eWz1lkVi5WUQY= +github.com/unifi-poller/influxunifi v0.0.10-0.20200621111730-4fe24d61b4fe/go.mod h1:5zz9S5zLWqpE1sH7v1PPpmydMajIo1Tj0w0PAxOvj7M= 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= @@ -191,6 +193,8 @@ github.com/unifi-poller/inputunifi v0.0.8-0.20200620104121-47689f50d8e3 h1:4EMN1 github.com/unifi-poller/inputunifi v0.0.8-0.20200620104121-47689f50d8e3/go.mod h1:kmEi1hpjxDzizBeQ5c4gqrpZke8aHu64yfIK0O2T+bE= github.com/unifi-poller/inputunifi v0.0.8-0.20200621094056-1f25f7cd1ec5 h1:lfasby9IDbgjQyJPxs4+DWw1Ys9CuEGziafZ+FlwIVc= github.com/unifi-poller/inputunifi v0.0.8-0.20200621094056-1f25f7cd1ec5/go.mod h1:bt70WpE/Kmoif9lBjsUpmy2cPlC8zHQkuYg2f7a1U14= +github.com/unifi-poller/inputunifi v0.0.8-0.20200621111657-768a735debef h1:VjjX6iouAYIz+Bzikpjc509wfbFkndio2LHASRR3r0s= +github.com/unifi-poller/inputunifi v0.0.8-0.20200621111657-768a735debef/go.mod h1:DJgRak363FXPYcoD2IFcyXKsrc/PGE1Z1zIDXpPff+A= github.com/unifi-poller/poller v0.0.3/go.mod h1:ugy3FyZEH1rFyC3panBiJpXbLf7EZ4GkjiOtydB2CwQ= github.com/unifi-poller/poller v0.0.4 h1:TYCdQeCYwUmmFcj1H75iGKAFbAOBFwo/XIJDX2Id+cY= github.com/unifi-poller/poller v0.0.4/go.mod h1:LbOCEdNth7invhaOTpcadW/sDlD2WsU+IE3GRXKzOCg= @@ -208,6 +212,8 @@ github.com/unifi-poller/poller v0.0.8-0.20200619104117-a5e263a36ac9 h1:BYNOSvttR github.com/unifi-poller/poller v0.0.8-0.20200619104117-a5e263a36ac9/go.mod h1:q2tufLljemUR/blyhjIj+T0sdAOZo0kdlv3h79kEMgU= github.com/unifi-poller/poller v0.0.8-0.20200621091816-fd5c7abd9f4b h1:AJKt/ZIDtlEOWxwpL/a7pcrWmqdJaaNE9odNn4JSRj0= github.com/unifi-poller/poller v0.0.8-0.20200621091816-fd5c7abd9f4b/go.mod h1:+Ppksi2wBCrByJke0B0lTutxFtKfv1zx6L1haALBrN4= +github.com/unifi-poller/poller v0.0.8-0.20200621110949-33f1a1454d10 h1:1rGP4ISFpBj9xjJDXNak7EdaQtyoy3MwMZzo2+W1PLo= +github.com/unifi-poller/poller v0.0.8-0.20200621110949-33f1a1454d10/go.mod h1:+Ppksi2wBCrByJke0B0lTutxFtKfv1zx6L1haALBrN4= 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= @@ -234,6 +240,8 @@ github.com/unifi-poller/promunifi v0.0.8 h1:cSoDYZnpFGxyht7sAMytl1wmbHSKem3OOHQX github.com/unifi-poller/promunifi v0.0.8/go.mod h1:YXNpofH3Tw707nHJaHXZWVnTlosc4Jdia1RpaVkLTd4= github.com/unifi-poller/promunifi v0.0.9-0.20200620104707-26208eb4336b h1:HgmbS5cKfvw3x0ie6IV/FfhxNtKwAvICKxXL7gg2sgM= github.com/unifi-poller/promunifi v0.0.9-0.20200620104707-26208eb4336b/go.mod h1:jOcYehhsOrs4ctswSKEqGuqSgVBpConaWmRYskycbUc= +github.com/unifi-poller/promunifi v0.0.9-0.20200621111636-373108c3836a h1:tNHwueeADX4Bo/QnqlWg8boPzb/iALcCgavUf2o1Szw= +github.com/unifi-poller/promunifi v0.0.9-0.20200621111636-373108c3836a/go.mod h1:t+tJrhz44p2UHqubXJA9D1/OLMUuB3kEfZz+ICQZQfs= 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= From 6c5fa5ef109e25d93f95fc2ab50def8a97d6bb88 Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Sun, 21 Jun 2020 13:29:30 -0700 Subject: [PATCH 06/39] updates --- go.mod | 4 ++-- go.sum | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 0dd94422..9ed0e572 100644 --- a/go.mod +++ b/go.mod @@ -13,8 +13,8 @@ require ( github.com/russross/blackfriday v2.0.0+incompatible // indirect github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/unifi-poller/influxunifi v0.0.10-0.20200621111730-4fe24d61b4fe - github.com/unifi-poller/inputunifi v0.0.8-0.20200621111657-768a735debef + github.com/unifi-poller/influxunifi v0.0.10-0.20200621202825-d81be9b8a363 + github.com/unifi-poller/inputunifi v0.0.8-0.20200621192201-fa58d3bd9ede github.com/unifi-poller/poller v0.0.8-0.20200621110949-33f1a1454d10 github.com/unifi-poller/promunifi v0.0.9-0.20200621111636-373108c3836a github.com/unifi-poller/unifi v0.0.5-0.20200621075746-253ccae7e106 diff --git a/go.sum b/go.sum index 0213f8bb..6b82034e 100644 --- a/go.sum +++ b/go.sum @@ -149,6 +149,8 @@ github.com/unifi-poller/influxunifi v0.0.10-0.20200621085434-01cd04643679 h1:PB7 github.com/unifi-poller/influxunifi v0.0.10-0.20200621085434-01cd04643679/go.mod h1:p6jHkvpcbqf84Qg+HrMJkYGo0MlFk+5ylH/889amK3M= github.com/unifi-poller/influxunifi v0.0.10-0.20200621111730-4fe24d61b4fe h1:9749csA5+Yj8IPoL0apBKXOUf7PhI3eWz1lkVi5WUQY= github.com/unifi-poller/influxunifi v0.0.10-0.20200621111730-4fe24d61b4fe/go.mod h1:5zz9S5zLWqpE1sH7v1PPpmydMajIo1Tj0w0PAxOvj7M= +github.com/unifi-poller/influxunifi v0.0.10-0.20200621202825-d81be9b8a363 h1:4J/+UYtOvlELofvNV/sY3q0VtKG8AdQDvM9iM3GigVk= +github.com/unifi-poller/influxunifi v0.0.10-0.20200621202825-d81be9b8a363/go.mod h1:5zz9S5zLWqpE1sH7v1PPpmydMajIo1Tj0w0PAxOvj7M= 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= @@ -195,6 +197,8 @@ github.com/unifi-poller/inputunifi v0.0.8-0.20200621094056-1f25f7cd1ec5 h1:lfasb github.com/unifi-poller/inputunifi v0.0.8-0.20200621094056-1f25f7cd1ec5/go.mod h1:bt70WpE/Kmoif9lBjsUpmy2cPlC8zHQkuYg2f7a1U14= github.com/unifi-poller/inputunifi v0.0.8-0.20200621111657-768a735debef h1:VjjX6iouAYIz+Bzikpjc509wfbFkndio2LHASRR3r0s= github.com/unifi-poller/inputunifi v0.0.8-0.20200621111657-768a735debef/go.mod h1:DJgRak363FXPYcoD2IFcyXKsrc/PGE1Z1zIDXpPff+A= +github.com/unifi-poller/inputunifi v0.0.8-0.20200621192201-fa58d3bd9ede h1:b/B7RLSG/XyguwBLVFex4IKbbM2SUEIVkIo1Y5v21UA= +github.com/unifi-poller/inputunifi v0.0.8-0.20200621192201-fa58d3bd9ede/go.mod h1:DJgRak363FXPYcoD2IFcyXKsrc/PGE1Z1zIDXpPff+A= github.com/unifi-poller/poller v0.0.3/go.mod h1:ugy3FyZEH1rFyC3panBiJpXbLf7EZ4GkjiOtydB2CwQ= github.com/unifi-poller/poller v0.0.4 h1:TYCdQeCYwUmmFcj1H75iGKAFbAOBFwo/XIJDX2Id+cY= github.com/unifi-poller/poller v0.0.4/go.mod h1:LbOCEdNth7invhaOTpcadW/sDlD2WsU+IE3GRXKzOCg= From 8b1e314351917fb68286dbfa8fb6f75073112591 Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Sun, 21 Jun 2020 19:01:01 -0700 Subject: [PATCH 07/39] new interface --- go.mod | 8 ++++---- go.sum | 8 ++++++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 9ed0e572..1c6cb39b 100644 --- a/go.mod +++ b/go.mod @@ -13,10 +13,10 @@ require ( github.com/russross/blackfriday v2.0.0+incompatible // indirect github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/unifi-poller/influxunifi v0.0.10-0.20200621202825-d81be9b8a363 - github.com/unifi-poller/inputunifi v0.0.8-0.20200621192201-fa58d3bd9ede - github.com/unifi-poller/poller v0.0.8-0.20200621110949-33f1a1454d10 - github.com/unifi-poller/promunifi v0.0.9-0.20200621111636-373108c3836a + github.com/unifi-poller/influxunifi v0.0.10-0.20200621233659-46c84c7e6253 + github.com/unifi-poller/inputunifi v0.0.8-0.20200622013432-300295023003 + github.com/unifi-poller/poller v0.0.8-0.20200621214016-5d1ed3324a46 + github.com/unifi-poller/promunifi v0.0.9-0.20200621232051-90645ba5c482 github.com/unifi-poller/unifi v0.0.5-0.20200621075746-253ccae7e106 golang.org/x/sys v0.0.0-20200620081246-981b61492c35 // indirect golift.io/cnfg v0.0.5 // indirect diff --git a/go.sum b/go.sum index 6b82034e..9e6d1797 100644 --- a/go.sum +++ b/go.sum @@ -151,6 +151,8 @@ github.com/unifi-poller/influxunifi v0.0.10-0.20200621111730-4fe24d61b4fe h1:974 github.com/unifi-poller/influxunifi v0.0.10-0.20200621111730-4fe24d61b4fe/go.mod h1:5zz9S5zLWqpE1sH7v1PPpmydMajIo1Tj0w0PAxOvj7M= github.com/unifi-poller/influxunifi v0.0.10-0.20200621202825-d81be9b8a363 h1:4J/+UYtOvlELofvNV/sY3q0VtKG8AdQDvM9iM3GigVk= github.com/unifi-poller/influxunifi v0.0.10-0.20200621202825-d81be9b8a363/go.mod h1:5zz9S5zLWqpE1sH7v1PPpmydMajIo1Tj0w0PAxOvj7M= +github.com/unifi-poller/influxunifi v0.0.10-0.20200621233659-46c84c7e6253 h1:sKLN0tPLoVSJnXkKTxUJ1Pk+nBgTuzrifnxx9cvnWeg= +github.com/unifi-poller/influxunifi v0.0.10-0.20200621233659-46c84c7e6253/go.mod h1:nAH9kRrACQk1OgmXejvHL0zNZjdfYIA6g3o1gJfMAg8= 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= @@ -199,6 +201,8 @@ github.com/unifi-poller/inputunifi v0.0.8-0.20200621111657-768a735debef h1:VjjX6 github.com/unifi-poller/inputunifi v0.0.8-0.20200621111657-768a735debef/go.mod h1:DJgRak363FXPYcoD2IFcyXKsrc/PGE1Z1zIDXpPff+A= github.com/unifi-poller/inputunifi v0.0.8-0.20200621192201-fa58d3bd9ede h1:b/B7RLSG/XyguwBLVFex4IKbbM2SUEIVkIo1Y5v21UA= github.com/unifi-poller/inputunifi v0.0.8-0.20200621192201-fa58d3bd9ede/go.mod h1:DJgRak363FXPYcoD2IFcyXKsrc/PGE1Z1zIDXpPff+A= +github.com/unifi-poller/inputunifi v0.0.8-0.20200622013432-300295023003 h1:D2O6ubNAgieZAUQFdy8kp87fLgk6WyHVJD0/ZxbQSAw= +github.com/unifi-poller/inputunifi v0.0.8-0.20200622013432-300295023003/go.mod h1:fHY4tcxbR+uqzT6JSSKwWB4SlpkmBqV7QOR0mHcZ7gc= github.com/unifi-poller/poller v0.0.3/go.mod h1:ugy3FyZEH1rFyC3panBiJpXbLf7EZ4GkjiOtydB2CwQ= github.com/unifi-poller/poller v0.0.4 h1:TYCdQeCYwUmmFcj1H75iGKAFbAOBFwo/XIJDX2Id+cY= github.com/unifi-poller/poller v0.0.4/go.mod h1:LbOCEdNth7invhaOTpcadW/sDlD2WsU+IE3GRXKzOCg= @@ -218,6 +222,8 @@ github.com/unifi-poller/poller v0.0.8-0.20200621091816-fd5c7abd9f4b h1:AJKt/ZIDt github.com/unifi-poller/poller v0.0.8-0.20200621091816-fd5c7abd9f4b/go.mod h1:+Ppksi2wBCrByJke0B0lTutxFtKfv1zx6L1haALBrN4= github.com/unifi-poller/poller v0.0.8-0.20200621110949-33f1a1454d10 h1:1rGP4ISFpBj9xjJDXNak7EdaQtyoy3MwMZzo2+W1PLo= github.com/unifi-poller/poller v0.0.8-0.20200621110949-33f1a1454d10/go.mod h1:+Ppksi2wBCrByJke0B0lTutxFtKfv1zx6L1haALBrN4= +github.com/unifi-poller/poller v0.0.8-0.20200621214016-5d1ed3324a46 h1:OhbVj3VVgbpUMQFSwD0NszDsbEL7DdbTcJuU+p9DwIM= +github.com/unifi-poller/poller v0.0.8-0.20200621214016-5d1ed3324a46/go.mod h1:pJ/MeYaakLOOpbyc7s4zeZ92UzNK/rir5jkA7t5jIjo= 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= @@ -246,6 +252,8 @@ github.com/unifi-poller/promunifi v0.0.9-0.20200620104707-26208eb4336b h1:HgmbS5 github.com/unifi-poller/promunifi v0.0.9-0.20200620104707-26208eb4336b/go.mod h1:jOcYehhsOrs4ctswSKEqGuqSgVBpConaWmRYskycbUc= github.com/unifi-poller/promunifi v0.0.9-0.20200621111636-373108c3836a h1:tNHwueeADX4Bo/QnqlWg8boPzb/iALcCgavUf2o1Szw= github.com/unifi-poller/promunifi v0.0.9-0.20200621111636-373108c3836a/go.mod h1:t+tJrhz44p2UHqubXJA9D1/OLMUuB3kEfZz+ICQZQfs= +github.com/unifi-poller/promunifi v0.0.9-0.20200621232051-90645ba5c482 h1:6FUPrhsn9eUbiBMXhA6FSZisAs7PlXRb4faSJPp/JWU= +github.com/unifi-poller/promunifi v0.0.9-0.20200621232051-90645ba5c482/go.mod h1:mlvfj4DRFVx12ewi6BcT4XOG2bxC7sFasl08RlYih8Y= 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= From fd511f90e1e3659d183fec4d3df8248e13018035 Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Sun, 21 Jun 2020 21:18:53 -0700 Subject: [PATCH 08/39] bug fix --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 1c6cb39b..ca0e9a2d 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/unifi-poller/influxunifi v0.0.10-0.20200621233659-46c84c7e6253 github.com/unifi-poller/inputunifi v0.0.8-0.20200622013432-300295023003 - github.com/unifi-poller/poller v0.0.8-0.20200621214016-5d1ed3324a46 + github.com/unifi-poller/poller v0.0.8-0.20200622041812-dd79a3e3073e github.com/unifi-poller/promunifi v0.0.9-0.20200621232051-90645ba5c482 github.com/unifi-poller/unifi v0.0.5-0.20200621075746-253ccae7e106 golang.org/x/sys v0.0.0-20200620081246-981b61492c35 // indirect diff --git a/go.sum b/go.sum index 9e6d1797..f8ebc3a2 100644 --- a/go.sum +++ b/go.sum @@ -224,6 +224,8 @@ github.com/unifi-poller/poller v0.0.8-0.20200621110949-33f1a1454d10 h1:1rGP4ISFp github.com/unifi-poller/poller v0.0.8-0.20200621110949-33f1a1454d10/go.mod h1:+Ppksi2wBCrByJke0B0lTutxFtKfv1zx6L1haALBrN4= github.com/unifi-poller/poller v0.0.8-0.20200621214016-5d1ed3324a46 h1:OhbVj3VVgbpUMQFSwD0NszDsbEL7DdbTcJuU+p9DwIM= github.com/unifi-poller/poller v0.0.8-0.20200621214016-5d1ed3324a46/go.mod h1:pJ/MeYaakLOOpbyc7s4zeZ92UzNK/rir5jkA7t5jIjo= +github.com/unifi-poller/poller v0.0.8-0.20200622041812-dd79a3e3073e h1:pSkgIalhDdb1N0/9uTAVh7emolfFxjCxo68IXIsZzII= +github.com/unifi-poller/poller v0.0.8-0.20200622041812-dd79a3e3073e/go.mod h1:pJ/MeYaakLOOpbyc7s4zeZ92UzNK/rir5jkA7t5jIjo= 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= From f5b7b4f91fc5a799d85e02dad7d865b2c63adf54 Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Sun, 21 Jun 2020 23:21:35 -0700 Subject: [PATCH 09/39] deal with array --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index ca0e9a2d..8517f8b5 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/unifi-poller/inputunifi v0.0.8-0.20200622013432-300295023003 github.com/unifi-poller/poller v0.0.8-0.20200622041812-dd79a3e3073e github.com/unifi-poller/promunifi v0.0.9-0.20200621232051-90645ba5c482 - github.com/unifi-poller/unifi v0.0.5-0.20200621075746-253ccae7e106 + github.com/unifi-poller/unifi v0.0.5-0.20200622062110-c9e26760b47d golang.org/x/sys v0.0.0-20200620081246-981b61492c35 // indirect golift.io/cnfg v0.0.5 // indirect ) diff --git a/go.sum b/go.sum index f8ebc3a2..15713698 100644 --- a/go.sum +++ b/go.sum @@ -277,6 +277,8 @@ github.com/unifi-poller/unifi v0.0.5-0.20200620103801-b927287ea1cd/go.mod h1:L1k github.com/unifi-poller/unifi v0.0.5-0.20200621023010-6a70dec929ba/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= github.com/unifi-poller/unifi v0.0.5-0.20200621075746-253ccae7e106 h1:eKErSqWD656pLSWgxFwhDhHe/zfAXrm7F39Zn4R+si8= github.com/unifi-poller/unifi v0.0.5-0.20200621075746-253ccae7e106/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= +github.com/unifi-poller/unifi v0.0.5-0.20200622062110-c9e26760b47d h1:O1kLVSaEVdUqaInPviFnGkCY8Q9sSCZVQGMv6K66GL4= +github.com/unifi-poller/unifi v0.0.5-0.20200622062110-c9e26760b47d/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= github.com/unifi-poller/unifi v0.0.5 h1:Izeun32YxcQOeKZUXY0Sy4ltKYFuYxWGcN9JS6xkIJU= github.com/unifi-poller/unifi v0.0.5/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= From 6436d4573239dfe309377ac893aa96ee204edfbf Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Mon, 22 Jun 2020 00:19:07 -0700 Subject: [PATCH 10/39] this is looking better --- go.mod | 4 ++-- go.sum | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 8517f8b5..eaea2abd 100644 --- a/go.mod +++ b/go.mod @@ -13,11 +13,11 @@ require ( github.com/russross/blackfriday v2.0.0+incompatible // indirect github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/unifi-poller/influxunifi v0.0.10-0.20200621233659-46c84c7e6253 + github.com/unifi-poller/influxunifi v0.0.10-0.20200622071547-037b0f8d5d5e github.com/unifi-poller/inputunifi v0.0.8-0.20200622013432-300295023003 github.com/unifi-poller/poller v0.0.8-0.20200622041812-dd79a3e3073e github.com/unifi-poller/promunifi v0.0.9-0.20200621232051-90645ba5c482 - github.com/unifi-poller/unifi v0.0.5-0.20200622062110-c9e26760b47d + github.com/unifi-poller/unifi v0.0.5-0.20200622065904-981554badb89 golang.org/x/sys v0.0.0-20200620081246-981b61492c35 // indirect golift.io/cnfg v0.0.5 // indirect ) diff --git a/go.sum b/go.sum index 15713698..93bcb090 100644 --- a/go.sum +++ b/go.sum @@ -153,6 +153,10 @@ github.com/unifi-poller/influxunifi v0.0.10-0.20200621202825-d81be9b8a363 h1:4J/ github.com/unifi-poller/influxunifi v0.0.10-0.20200621202825-d81be9b8a363/go.mod h1:5zz9S5zLWqpE1sH7v1PPpmydMajIo1Tj0w0PAxOvj7M= github.com/unifi-poller/influxunifi v0.0.10-0.20200621233659-46c84c7e6253 h1:sKLN0tPLoVSJnXkKTxUJ1Pk+nBgTuzrifnxx9cvnWeg= github.com/unifi-poller/influxunifi v0.0.10-0.20200621233659-46c84c7e6253/go.mod h1:nAH9kRrACQk1OgmXejvHL0zNZjdfYIA6g3o1gJfMAg8= +github.com/unifi-poller/influxunifi v0.0.10-0.20200622070512-7be9d925dbb5 h1:tdq4lgXazLqDZVfs0s2wYVIITkMHEXzaw94aBwsuts8= +github.com/unifi-poller/influxunifi v0.0.10-0.20200622070512-7be9d925dbb5/go.mod h1:nAH9kRrACQk1OgmXejvHL0zNZjdfYIA6g3o1gJfMAg8= +github.com/unifi-poller/influxunifi v0.0.10-0.20200622071547-037b0f8d5d5e h1:N/66hoaqd8FkGIe8diS016j1LkphQJoBNcYanBBjZuY= +github.com/unifi-poller/influxunifi v0.0.10-0.20200622071547-037b0f8d5d5e/go.mod h1:nAH9kRrACQk1OgmXejvHL0zNZjdfYIA6g3o1gJfMAg8= 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= @@ -279,6 +283,10 @@ github.com/unifi-poller/unifi v0.0.5-0.20200621075746-253ccae7e106 h1:eKErSqWD65 github.com/unifi-poller/unifi v0.0.5-0.20200621075746-253ccae7e106/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= github.com/unifi-poller/unifi v0.0.5-0.20200622062110-c9e26760b47d h1:O1kLVSaEVdUqaInPviFnGkCY8Q9sSCZVQGMv6K66GL4= github.com/unifi-poller/unifi v0.0.5-0.20200622062110-c9e26760b47d/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= +github.com/unifi-poller/unifi v0.0.5-0.20200622063739-6e8b5bc204c5 h1:2bxjc7izwbOFDGKTnsb8aHW0t6eLKpPQ9CedzZfwgP4= +github.com/unifi-poller/unifi v0.0.5-0.20200622063739-6e8b5bc204c5/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= +github.com/unifi-poller/unifi v0.0.5-0.20200622065904-981554badb89 h1:0qs1wRrupRUTH+6v75Z0fqBeaQNXGuTBcKGu/0ACvf8= +github.com/unifi-poller/unifi v0.0.5-0.20200622065904-981554badb89/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= github.com/unifi-poller/unifi v0.0.5 h1:Izeun32YxcQOeKZUXY0Sy4ltKYFuYxWGcN9JS6xkIJU= github.com/unifi-poller/unifi v0.0.5/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= From 9d87511e2c7bcc0ebd19da69911c170830565bf2 Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Mon, 22 Jun 2020 00:50:37 -0700 Subject: [PATCH 11/39] remove debug --- go.mod | 4 ++-- go.sum | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index eaea2abd..cca63aba 100644 --- a/go.mod +++ b/go.mod @@ -14,10 +14,10 @@ require ( github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/unifi-poller/influxunifi v0.0.10-0.20200622071547-037b0f8d5d5e - github.com/unifi-poller/inputunifi v0.0.8-0.20200622013432-300295023003 + github.com/unifi-poller/inputunifi v0.0.8-0.20200622074053-cfb8cc404981 github.com/unifi-poller/poller v0.0.8-0.20200622041812-dd79a3e3073e github.com/unifi-poller/promunifi v0.0.9-0.20200621232051-90645ba5c482 - github.com/unifi-poller/unifi v0.0.5-0.20200622065904-981554badb89 + github.com/unifi-poller/unifi v0.0.5-0.20200622073824-4a29471d80f6 golang.org/x/sys v0.0.0-20200620081246-981b61492c35 // indirect golift.io/cnfg v0.0.5 // indirect ) diff --git a/go.sum b/go.sum index 93bcb090..a1b461db 100644 --- a/go.sum +++ b/go.sum @@ -207,6 +207,8 @@ github.com/unifi-poller/inputunifi v0.0.8-0.20200621192201-fa58d3bd9ede h1:b/B7R github.com/unifi-poller/inputunifi v0.0.8-0.20200621192201-fa58d3bd9ede/go.mod h1:DJgRak363FXPYcoD2IFcyXKsrc/PGE1Z1zIDXpPff+A= github.com/unifi-poller/inputunifi v0.0.8-0.20200622013432-300295023003 h1:D2O6ubNAgieZAUQFdy8kp87fLgk6WyHVJD0/ZxbQSAw= github.com/unifi-poller/inputunifi v0.0.8-0.20200622013432-300295023003/go.mod h1:fHY4tcxbR+uqzT6JSSKwWB4SlpkmBqV7QOR0mHcZ7gc= +github.com/unifi-poller/inputunifi v0.0.8-0.20200622074053-cfb8cc404981 h1:pzaruqPh/AhJ+spLtzpGCA0GZ+raZQrrwgNTYR9mB7s= +github.com/unifi-poller/inputunifi v0.0.8-0.20200622074053-cfb8cc404981/go.mod h1:4LlcrE675d31Do6w+F8HLTq9OBRA1Uf/d1cOL+FjXFg= github.com/unifi-poller/poller v0.0.3/go.mod h1:ugy3FyZEH1rFyC3panBiJpXbLf7EZ4GkjiOtydB2CwQ= github.com/unifi-poller/poller v0.0.4 h1:TYCdQeCYwUmmFcj1H75iGKAFbAOBFwo/XIJDX2Id+cY= github.com/unifi-poller/poller v0.0.4/go.mod h1:LbOCEdNth7invhaOTpcadW/sDlD2WsU+IE3GRXKzOCg= @@ -287,6 +289,8 @@ github.com/unifi-poller/unifi v0.0.5-0.20200622063739-6e8b5bc204c5 h1:2bxjc7izwb github.com/unifi-poller/unifi v0.0.5-0.20200622063739-6e8b5bc204c5/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= github.com/unifi-poller/unifi v0.0.5-0.20200622065904-981554badb89 h1:0qs1wRrupRUTH+6v75Z0fqBeaQNXGuTBcKGu/0ACvf8= github.com/unifi-poller/unifi v0.0.5-0.20200622065904-981554badb89/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= +github.com/unifi-poller/unifi v0.0.5-0.20200622073824-4a29471d80f6 h1:KzQDaEhDxtDzoyfBPXzM/pwpD76+4Y74Y66XMhKt2pI= +github.com/unifi-poller/unifi v0.0.5-0.20200622073824-4a29471d80f6/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= github.com/unifi-poller/unifi v0.0.5 h1:Izeun32YxcQOeKZUXY0Sy4ltKYFuYxWGcN9JS6xkIJU= github.com/unifi-poller/unifi v0.0.5/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= From 89644442f89e8eb281801365a6eeafa5c26e90a5 Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Mon, 22 Jun 2020 01:29:02 -0700 Subject: [PATCH 12/39] working --- go.mod | 2 +- go.sum | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index cca63aba..c948dfb0 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/unifi-poller/influxunifi v0.0.10-0.20200622071547-037b0f8d5d5e - github.com/unifi-poller/inputunifi v0.0.8-0.20200622074053-cfb8cc404981 + github.com/unifi-poller/inputunifi v0.0.8-0.20200622082837-e666c89e4832 github.com/unifi-poller/poller v0.0.8-0.20200622041812-dd79a3e3073e github.com/unifi-poller/promunifi v0.0.9-0.20200621232051-90645ba5c482 github.com/unifi-poller/unifi v0.0.5-0.20200622073824-4a29471d80f6 diff --git a/go.sum b/go.sum index a1b461db..b9a4f246 100644 --- a/go.sum +++ b/go.sum @@ -209,6 +209,12 @@ github.com/unifi-poller/inputunifi v0.0.8-0.20200622013432-300295023003 h1:D2O6u github.com/unifi-poller/inputunifi v0.0.8-0.20200622013432-300295023003/go.mod h1:fHY4tcxbR+uqzT6JSSKwWB4SlpkmBqV7QOR0mHcZ7gc= github.com/unifi-poller/inputunifi v0.0.8-0.20200622074053-cfb8cc404981 h1:pzaruqPh/AhJ+spLtzpGCA0GZ+raZQrrwgNTYR9mB7s= github.com/unifi-poller/inputunifi v0.0.8-0.20200622074053-cfb8cc404981/go.mod h1:4LlcrE675d31Do6w+F8HLTq9OBRA1Uf/d1cOL+FjXFg= +github.com/unifi-poller/inputunifi v0.0.8-0.20200622081000-e1deb673a32e h1:6wnc1/1x3PJLtTOighan5P2BWYQ3ngbJ3+EAidhqH1U= +github.com/unifi-poller/inputunifi v0.0.8-0.20200622081000-e1deb673a32e/go.mod h1:4LlcrE675d31Do6w+F8HLTq9OBRA1Uf/d1cOL+FjXFg= +github.com/unifi-poller/inputunifi v0.0.8-0.20200622081539-3b12c5a55673 h1:3QwsjLZlniPeRdnO6KtrshzxscniQJGHluqgE2kzrYQ= +github.com/unifi-poller/inputunifi v0.0.8-0.20200622081539-3b12c5a55673/go.mod h1:4LlcrE675d31Do6w+F8HLTq9OBRA1Uf/d1cOL+FjXFg= +github.com/unifi-poller/inputunifi v0.0.8-0.20200622082837-e666c89e4832 h1:IZNt8GR4fyhxywCZnDoS67on8WTtg7SOWryQnLieTck= +github.com/unifi-poller/inputunifi v0.0.8-0.20200622082837-e666c89e4832/go.mod h1:4LlcrE675d31Do6w+F8HLTq9OBRA1Uf/d1cOL+FjXFg= github.com/unifi-poller/poller v0.0.3/go.mod h1:ugy3FyZEH1rFyC3panBiJpXbLf7EZ4GkjiOtydB2CwQ= github.com/unifi-poller/poller v0.0.4 h1:TYCdQeCYwUmmFcj1H75iGKAFbAOBFwo/XIJDX2Id+cY= github.com/unifi-poller/poller v0.0.4/go.mod h1:LbOCEdNth7invhaOTpcadW/sDlD2WsU+IE3GRXKzOCg= From 253035d862899ae2302e26a3bcdc6cfecd7eaecd Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Tue, 23 Jun 2020 01:10:28 -0700 Subject: [PATCH 13/39] more logging --- go.mod | 8 ++++---- go.sum | 8 ++++++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index c948dfb0..ca0cb8eb 100644 --- a/go.mod +++ b/go.mod @@ -13,11 +13,11 @@ require ( github.com/russross/blackfriday v2.0.0+incompatible // indirect github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/unifi-poller/influxunifi v0.0.10-0.20200622071547-037b0f8d5d5e - github.com/unifi-poller/inputunifi v0.0.8-0.20200622082837-e666c89e4832 + github.com/unifi-poller/influxunifi v0.0.10-0.20200623073300-b56c0b474733 + github.com/unifi-poller/inputunifi v0.0.8-0.20200623073237-105e56b53d2e github.com/unifi-poller/poller v0.0.8-0.20200622041812-dd79a3e3073e - github.com/unifi-poller/promunifi v0.0.9-0.20200621232051-90645ba5c482 - github.com/unifi-poller/unifi v0.0.5-0.20200622073824-4a29471d80f6 + github.com/unifi-poller/promunifi v0.0.9-0.20200623073250-24621ebb306a + github.com/unifi-poller/unifi v0.0.5-0.20200623080800-1766e7bde07c golang.org/x/sys v0.0.0-20200620081246-981b61492c35 // indirect golift.io/cnfg v0.0.5 // indirect ) diff --git a/go.sum b/go.sum index b9a4f246..cad5ce76 100644 --- a/go.sum +++ b/go.sum @@ -157,6 +157,8 @@ github.com/unifi-poller/influxunifi v0.0.10-0.20200622070512-7be9d925dbb5 h1:tdq github.com/unifi-poller/influxunifi v0.0.10-0.20200622070512-7be9d925dbb5/go.mod h1:nAH9kRrACQk1OgmXejvHL0zNZjdfYIA6g3o1gJfMAg8= github.com/unifi-poller/influxunifi v0.0.10-0.20200622071547-037b0f8d5d5e h1:N/66hoaqd8FkGIe8diS016j1LkphQJoBNcYanBBjZuY= github.com/unifi-poller/influxunifi v0.0.10-0.20200622071547-037b0f8d5d5e/go.mod h1:nAH9kRrACQk1OgmXejvHL0zNZjdfYIA6g3o1gJfMAg8= +github.com/unifi-poller/influxunifi v0.0.10-0.20200623073300-b56c0b474733 h1:7DlMM6+1PQV+mRcEh/0ckvPrIi8I0Iju2Uvc3y4TJ3M= +github.com/unifi-poller/influxunifi v0.0.10-0.20200623073300-b56c0b474733/go.mod h1:nAH9kRrACQk1OgmXejvHL0zNZjdfYIA6g3o1gJfMAg8= 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= @@ -215,6 +217,8 @@ github.com/unifi-poller/inputunifi v0.0.8-0.20200622081539-3b12c5a55673 h1:3Qwsj github.com/unifi-poller/inputunifi v0.0.8-0.20200622081539-3b12c5a55673/go.mod h1:4LlcrE675d31Do6w+F8HLTq9OBRA1Uf/d1cOL+FjXFg= github.com/unifi-poller/inputunifi v0.0.8-0.20200622082837-e666c89e4832 h1:IZNt8GR4fyhxywCZnDoS67on8WTtg7SOWryQnLieTck= github.com/unifi-poller/inputunifi v0.0.8-0.20200622082837-e666c89e4832/go.mod h1:4LlcrE675d31Do6w+F8HLTq9OBRA1Uf/d1cOL+FjXFg= +github.com/unifi-poller/inputunifi v0.0.8-0.20200623073237-105e56b53d2e h1:5J+Aqo7BYkV3XURpzQqs0Orsm1NFrbTI1L/IRR4jxbw= +github.com/unifi-poller/inputunifi v0.0.8-0.20200623073237-105e56b53d2e/go.mod h1:4LlcrE675d31Do6w+F8HLTq9OBRA1Uf/d1cOL+FjXFg= github.com/unifi-poller/poller v0.0.3/go.mod h1:ugy3FyZEH1rFyC3panBiJpXbLf7EZ4GkjiOtydB2CwQ= github.com/unifi-poller/poller v0.0.4 h1:TYCdQeCYwUmmFcj1H75iGKAFbAOBFwo/XIJDX2Id+cY= github.com/unifi-poller/poller v0.0.4/go.mod h1:LbOCEdNth7invhaOTpcadW/sDlD2WsU+IE3GRXKzOCg= @@ -268,6 +272,8 @@ github.com/unifi-poller/promunifi v0.0.9-0.20200621111636-373108c3836a h1:tNHwue github.com/unifi-poller/promunifi v0.0.9-0.20200621111636-373108c3836a/go.mod h1:t+tJrhz44p2UHqubXJA9D1/OLMUuB3kEfZz+ICQZQfs= github.com/unifi-poller/promunifi v0.0.9-0.20200621232051-90645ba5c482 h1:6FUPrhsn9eUbiBMXhA6FSZisAs7PlXRb4faSJPp/JWU= github.com/unifi-poller/promunifi v0.0.9-0.20200621232051-90645ba5c482/go.mod h1:mlvfj4DRFVx12ewi6BcT4XOG2bxC7sFasl08RlYih8Y= +github.com/unifi-poller/promunifi v0.0.9-0.20200623073250-24621ebb306a h1:7CmCHHFUrxzaGVMRINmplAosW8BNXlWIPm05LxCPClU= +github.com/unifi-poller/promunifi v0.0.9-0.20200623073250-24621ebb306a/go.mod h1:mlvfj4DRFVx12ewi6BcT4XOG2bxC7sFasl08RlYih8Y= 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= @@ -297,6 +303,8 @@ github.com/unifi-poller/unifi v0.0.5-0.20200622065904-981554badb89 h1:0qs1wRrupR github.com/unifi-poller/unifi v0.0.5-0.20200622065904-981554badb89/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= github.com/unifi-poller/unifi v0.0.5-0.20200622073824-4a29471d80f6 h1:KzQDaEhDxtDzoyfBPXzM/pwpD76+4Y74Y66XMhKt2pI= github.com/unifi-poller/unifi v0.0.5-0.20200622073824-4a29471d80f6/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= +github.com/unifi-poller/unifi v0.0.5-0.20200623080800-1766e7bde07c h1:pW5Z6cE1DC2GAHy6CdWnkgy5t/wehBvOW19viQXxUVo= +github.com/unifi-poller/unifi v0.0.5-0.20200623080800-1766e7bde07c/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= github.com/unifi-poller/unifi v0.0.5 h1:Izeun32YxcQOeKZUXY0Sy4ltKYFuYxWGcN9JS6xkIJU= github.com/unifi-poller/unifi v0.0.5/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= From a22c59be09e753bd0ac455d350e84f457ef806aa Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Wed, 24 Jun 2020 03:13:55 -0700 Subject: [PATCH 14/39] add loki support --- go.mod | 3 ++- go.sum | 5 +++++ main.go | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index ca0cb8eb..c3fa34e5 100644 --- a/go.mod +++ b/go.mod @@ -15,9 +15,10 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/unifi-poller/influxunifi v0.0.10-0.20200623073300-b56c0b474733 github.com/unifi-poller/inputunifi v0.0.8-0.20200623073237-105e56b53d2e + github.com/unifi-poller/lokiunifi v0.0.0-20200624101250-d682ecc67db1 github.com/unifi-poller/poller v0.0.8-0.20200622041812-dd79a3e3073e github.com/unifi-poller/promunifi v0.0.9-0.20200623073250-24621ebb306a - github.com/unifi-poller/unifi v0.0.5-0.20200623080800-1766e7bde07c + github.com/unifi-poller/unifi v0.0.5-0.20200624101133-921ff05afda7 golang.org/x/sys v0.0.0-20200620081246-981b61492c35 // indirect golift.io/cnfg v0.0.5 // indirect ) diff --git a/go.sum b/go.sum index cad5ce76..c6331d0a 100644 --- a/go.sum +++ b/go.sum @@ -219,6 +219,9 @@ github.com/unifi-poller/inputunifi v0.0.8-0.20200622082837-e666c89e4832 h1:IZNt8 github.com/unifi-poller/inputunifi v0.0.8-0.20200622082837-e666c89e4832/go.mod h1:4LlcrE675d31Do6w+F8HLTq9OBRA1Uf/d1cOL+FjXFg= github.com/unifi-poller/inputunifi v0.0.8-0.20200623073237-105e56b53d2e h1:5J+Aqo7BYkV3XURpzQqs0Orsm1NFrbTI1L/IRR4jxbw= github.com/unifi-poller/inputunifi v0.0.8-0.20200623073237-105e56b53d2e/go.mod h1:4LlcrE675d31Do6w+F8HLTq9OBRA1Uf/d1cOL+FjXFg= +github.com/unifi-poller/lokiunifi v0.0.0-20200623055806-bef9501a2240 h1:5TkGeJiY4IvsQ29LvvoJ45zDpaaGIigKveyuodSWhcY= +github.com/unifi-poller/lokiunifi v0.0.0-20200624101250-d682ecc67db1 h1:T85QCOjtmLYnGIMfvGVP2O1rQ9HDhUBkueZqpamZjVA= +github.com/unifi-poller/lokiunifi v0.0.0-20200624101250-d682ecc67db1/go.mod h1:ZsTuIt3//vACn8IyMhXlI45aOaQiitmI88cy4Ex+lKI= github.com/unifi-poller/poller v0.0.3/go.mod h1:ugy3FyZEH1rFyC3panBiJpXbLf7EZ4GkjiOtydB2CwQ= github.com/unifi-poller/poller v0.0.4 h1:TYCdQeCYwUmmFcj1H75iGKAFbAOBFwo/XIJDX2Id+cY= github.com/unifi-poller/poller v0.0.4/go.mod h1:LbOCEdNth7invhaOTpcadW/sDlD2WsU+IE3GRXKzOCg= @@ -305,6 +308,8 @@ github.com/unifi-poller/unifi v0.0.5-0.20200622073824-4a29471d80f6 h1:KzQDaEhDxt github.com/unifi-poller/unifi v0.0.5-0.20200622073824-4a29471d80f6/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= github.com/unifi-poller/unifi v0.0.5-0.20200623080800-1766e7bde07c h1:pW5Z6cE1DC2GAHy6CdWnkgy5t/wehBvOW19viQXxUVo= github.com/unifi-poller/unifi v0.0.5-0.20200623080800-1766e7bde07c/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= +github.com/unifi-poller/unifi v0.0.5-0.20200624101133-921ff05afda7 h1:m4y7neqrehgXlls6Qk8mYgqp4VudKh+04Z9X40XowV0= +github.com/unifi-poller/unifi v0.0.5-0.20200624101133-921ff05afda7/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= github.com/unifi-poller/unifi v0.0.5 h1:Izeun32YxcQOeKZUXY0Sy4ltKYFuYxWGcN9JS6xkIJU= github.com/unifi-poller/unifi v0.0.5/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= diff --git a/main.go b/main.go index 1dc0c96c..a3269290 100644 --- a/main.go +++ b/main.go @@ -12,6 +12,7 @@ import ( // Load output plugins! _ "github.com/unifi-poller/influxunifi" + _ "github.com/unifi-poller/lokiunifi" _ "github.com/unifi-poller/promunifi" ) From 865a60d78f810ab1ce78d41e9f8df94701a2b601 Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Wed, 24 Jun 2020 04:13:25 -0700 Subject: [PATCH 15/39] updates --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index c3fa34e5..1f3e1dad 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/unifi-poller/influxunifi v0.0.10-0.20200623073300-b56c0b474733 github.com/unifi-poller/inputunifi v0.0.8-0.20200623073237-105e56b53d2e - github.com/unifi-poller/lokiunifi v0.0.0-20200624101250-d682ecc67db1 + github.com/unifi-poller/lokiunifi v0.0.0-20200624111242-0c902d3a56ce github.com/unifi-poller/poller v0.0.8-0.20200622041812-dd79a3e3073e github.com/unifi-poller/promunifi v0.0.9-0.20200623073250-24621ebb306a github.com/unifi-poller/unifi v0.0.5-0.20200624101133-921ff05afda7 diff --git a/go.sum b/go.sum index c6331d0a..95461a7f 100644 --- a/go.sum +++ b/go.sum @@ -222,6 +222,8 @@ github.com/unifi-poller/inputunifi v0.0.8-0.20200623073237-105e56b53d2e/go.mod h github.com/unifi-poller/lokiunifi v0.0.0-20200623055806-bef9501a2240 h1:5TkGeJiY4IvsQ29LvvoJ45zDpaaGIigKveyuodSWhcY= github.com/unifi-poller/lokiunifi v0.0.0-20200624101250-d682ecc67db1 h1:T85QCOjtmLYnGIMfvGVP2O1rQ9HDhUBkueZqpamZjVA= github.com/unifi-poller/lokiunifi v0.0.0-20200624101250-d682ecc67db1/go.mod h1:ZsTuIt3//vACn8IyMhXlI45aOaQiitmI88cy4Ex+lKI= +github.com/unifi-poller/lokiunifi v0.0.0-20200624111242-0c902d3a56ce h1:1rvDepdHE8Ki7J63CxeiGfLTHvDWmrUXG/NZ9RFgcoM= +github.com/unifi-poller/lokiunifi v0.0.0-20200624111242-0c902d3a56ce/go.mod h1:ZsTuIt3//vACn8IyMhXlI45aOaQiitmI88cy4Ex+lKI= github.com/unifi-poller/poller v0.0.3/go.mod h1:ugy3FyZEH1rFyC3panBiJpXbLf7EZ4GkjiOtydB2CwQ= github.com/unifi-poller/poller v0.0.4 h1:TYCdQeCYwUmmFcj1H75iGKAFbAOBFwo/XIJDX2Id+cY= github.com/unifi-poller/poller v0.0.4/go.mod h1:LbOCEdNth7invhaOTpcadW/sDlD2WsU+IE3GRXKzOCg= From 4f960fda7494110bf58c333697abe0e3ab6b0ad8 Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Wed, 24 Jun 2020 13:10:35 -0700 Subject: [PATCH 16/39] update hash --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 1f3e1dad..e3796730 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/unifi-poller/influxunifi v0.0.10-0.20200623073300-b56c0b474733 github.com/unifi-poller/inputunifi v0.0.8-0.20200623073237-105e56b53d2e - github.com/unifi-poller/lokiunifi v0.0.0-20200624111242-0c902d3a56ce + github.com/unifi-poller/lokiunifi v0.0.0-20200624200349-c5eff00ceaca github.com/unifi-poller/poller v0.0.8-0.20200622041812-dd79a3e3073e github.com/unifi-poller/promunifi v0.0.9-0.20200623073250-24621ebb306a github.com/unifi-poller/unifi v0.0.5-0.20200624101133-921ff05afda7 diff --git a/go.sum b/go.sum index 95461a7f..667addc5 100644 --- a/go.sum +++ b/go.sum @@ -224,6 +224,8 @@ github.com/unifi-poller/lokiunifi v0.0.0-20200624101250-d682ecc67db1 h1:T85QCOjt github.com/unifi-poller/lokiunifi v0.0.0-20200624101250-d682ecc67db1/go.mod h1:ZsTuIt3//vACn8IyMhXlI45aOaQiitmI88cy4Ex+lKI= github.com/unifi-poller/lokiunifi v0.0.0-20200624111242-0c902d3a56ce h1:1rvDepdHE8Ki7J63CxeiGfLTHvDWmrUXG/NZ9RFgcoM= github.com/unifi-poller/lokiunifi v0.0.0-20200624111242-0c902d3a56ce/go.mod h1:ZsTuIt3//vACn8IyMhXlI45aOaQiitmI88cy4Ex+lKI= +github.com/unifi-poller/lokiunifi v0.0.0-20200624200349-c5eff00ceaca h1:JawgH0pS+/G+twqbRjmRrxAb0bVyX8Ph/p34nhsOdIg= +github.com/unifi-poller/lokiunifi v0.0.0-20200624200349-c5eff00ceaca/go.mod h1:ZsTuIt3//vACn8IyMhXlI45aOaQiitmI88cy4Ex+lKI= github.com/unifi-poller/poller v0.0.3/go.mod h1:ugy3FyZEH1rFyC3panBiJpXbLf7EZ4GkjiOtydB2CwQ= github.com/unifi-poller/poller v0.0.4 h1:TYCdQeCYwUmmFcj1H75iGKAFbAOBFwo/XIJDX2Id+cY= github.com/unifi-poller/poller v0.0.4/go.mod h1:LbOCEdNth7invhaOTpcadW/sDlD2WsU+IE3GRXKzOCg= From 4e53d5e2ec5525500022aca054b3ba472f62898f Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Thu, 25 Jun 2020 21:10:03 -0700 Subject: [PATCH 17/39] add alarms and anomalies --- go.mod | 8 ++++---- go.sum | 8 ++++++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index e3796730..effbb303 100644 --- a/go.mod +++ b/go.mod @@ -13,12 +13,12 @@ require ( github.com/russross/blackfriday v2.0.0+incompatible // indirect github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/unifi-poller/influxunifi v0.0.10-0.20200623073300-b56c0b474733 - github.com/unifi-poller/inputunifi v0.0.8-0.20200623073237-105e56b53d2e - github.com/unifi-poller/lokiunifi v0.0.0-20200624200349-c5eff00ceaca + github.com/unifi-poller/influxunifi v0.0.10-0.20200626040446-8fe783775415 + github.com/unifi-poller/inputunifi v0.0.8-0.20200625093101-80676d70166d + github.com/unifi-poller/lokiunifi v0.0.0-20200626040346-12af563d2a99 github.com/unifi-poller/poller v0.0.8-0.20200622041812-dd79a3e3073e github.com/unifi-poller/promunifi v0.0.9-0.20200623073250-24621ebb306a - github.com/unifi-poller/unifi v0.0.5-0.20200624101133-921ff05afda7 + github.com/unifi-poller/unifi v0.0.6-0.20200625090439-421046871a37 golang.org/x/sys v0.0.0-20200620081246-981b61492c35 // indirect golift.io/cnfg v0.0.5 // indirect ) diff --git a/go.sum b/go.sum index 667addc5..b26531ea 100644 --- a/go.sum +++ b/go.sum @@ -159,6 +159,8 @@ github.com/unifi-poller/influxunifi v0.0.10-0.20200622071547-037b0f8d5d5e h1:N/6 github.com/unifi-poller/influxunifi v0.0.10-0.20200622071547-037b0f8d5d5e/go.mod h1:nAH9kRrACQk1OgmXejvHL0zNZjdfYIA6g3o1gJfMAg8= github.com/unifi-poller/influxunifi v0.0.10-0.20200623073300-b56c0b474733 h1:7DlMM6+1PQV+mRcEh/0ckvPrIi8I0Iju2Uvc3y4TJ3M= github.com/unifi-poller/influxunifi v0.0.10-0.20200623073300-b56c0b474733/go.mod h1:nAH9kRrACQk1OgmXejvHL0zNZjdfYIA6g3o1gJfMAg8= +github.com/unifi-poller/influxunifi v0.0.10-0.20200626040446-8fe783775415 h1:0rYv6/Ykayeyl9zzCERwrwrWa15ES2/ctDmmr0paQ9c= +github.com/unifi-poller/influxunifi v0.0.10-0.20200626040446-8fe783775415/go.mod h1:HO6WuWoUwuz9Hj4m9hJ8Sh7U9O1Sd62FPV+loEdCDqY= 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= @@ -219,6 +221,8 @@ github.com/unifi-poller/inputunifi v0.0.8-0.20200622082837-e666c89e4832 h1:IZNt8 github.com/unifi-poller/inputunifi v0.0.8-0.20200622082837-e666c89e4832/go.mod h1:4LlcrE675d31Do6w+F8HLTq9OBRA1Uf/d1cOL+FjXFg= github.com/unifi-poller/inputunifi v0.0.8-0.20200623073237-105e56b53d2e h1:5J+Aqo7BYkV3XURpzQqs0Orsm1NFrbTI1L/IRR4jxbw= github.com/unifi-poller/inputunifi v0.0.8-0.20200623073237-105e56b53d2e/go.mod h1:4LlcrE675d31Do6w+F8HLTq9OBRA1Uf/d1cOL+FjXFg= +github.com/unifi-poller/inputunifi v0.0.8-0.20200625093101-80676d70166d h1:TBvOivgenw8B8unzhjsp3HnNLFvPTy1j1b90yhsX41A= +github.com/unifi-poller/inputunifi v0.0.8-0.20200625093101-80676d70166d/go.mod h1:nFr8uB4zJtCLiQvYPypGK3aWfQ9y4cC4iIeS9PyecrU= github.com/unifi-poller/lokiunifi v0.0.0-20200623055806-bef9501a2240 h1:5TkGeJiY4IvsQ29LvvoJ45zDpaaGIigKveyuodSWhcY= github.com/unifi-poller/lokiunifi v0.0.0-20200624101250-d682ecc67db1 h1:T85QCOjtmLYnGIMfvGVP2O1rQ9HDhUBkueZqpamZjVA= github.com/unifi-poller/lokiunifi v0.0.0-20200624101250-d682ecc67db1/go.mod h1:ZsTuIt3//vACn8IyMhXlI45aOaQiitmI88cy4Ex+lKI= @@ -226,6 +230,8 @@ github.com/unifi-poller/lokiunifi v0.0.0-20200624111242-0c902d3a56ce h1:1rvDepdH github.com/unifi-poller/lokiunifi v0.0.0-20200624111242-0c902d3a56ce/go.mod h1:ZsTuIt3//vACn8IyMhXlI45aOaQiitmI88cy4Ex+lKI= github.com/unifi-poller/lokiunifi v0.0.0-20200624200349-c5eff00ceaca h1:JawgH0pS+/G+twqbRjmRrxAb0bVyX8Ph/p34nhsOdIg= github.com/unifi-poller/lokiunifi v0.0.0-20200624200349-c5eff00ceaca/go.mod h1:ZsTuIt3//vACn8IyMhXlI45aOaQiitmI88cy4Ex+lKI= +github.com/unifi-poller/lokiunifi v0.0.0-20200626040346-12af563d2a99 h1:QjDm4wrmPOZehxNDHDSUSZfhtSvM+v7OIt/lZ1/Wpn4= +github.com/unifi-poller/lokiunifi v0.0.0-20200626040346-12af563d2a99/go.mod h1:7+uUJT6nnXVPad/Omsj+lPD80Cshg4L8TPUkV72JNM8= github.com/unifi-poller/poller v0.0.3/go.mod h1:ugy3FyZEH1rFyC3panBiJpXbLf7EZ4GkjiOtydB2CwQ= github.com/unifi-poller/poller v0.0.4 h1:TYCdQeCYwUmmFcj1H75iGKAFbAOBFwo/XIJDX2Id+cY= github.com/unifi-poller/poller v0.0.4/go.mod h1:LbOCEdNth7invhaOTpcadW/sDlD2WsU+IE3GRXKzOCg= @@ -316,6 +322,8 @@ github.com/unifi-poller/unifi v0.0.5-0.20200624101133-921ff05afda7 h1:m4y7neqreh github.com/unifi-poller/unifi v0.0.5-0.20200624101133-921ff05afda7/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= github.com/unifi-poller/unifi v0.0.5 h1:Izeun32YxcQOeKZUXY0Sy4ltKYFuYxWGcN9JS6xkIJU= github.com/unifi-poller/unifi v0.0.5/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= +github.com/unifi-poller/unifi v0.0.6-0.20200625090439-421046871a37 h1:T2y8JWkjZd1vz2ZKu4vmmAk9s6PUwupuTldwhfww5xY= +github.com/unifi-poller/unifi v0.0.6-0.20200625090439-421046871a37/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= 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/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= From 890ef57055c363cf007f8b3deaed7f90b5cedd54 Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Thu, 25 Jun 2020 22:29:00 -0700 Subject: [PATCH 18/39] better log output --- go.mod | 11 ++- go.sum | 243 ++++----------------------------------------------------- 2 files changed, 24 insertions(+), 230 deletions(-) diff --git a/go.mod b/go.mod index effbb303..77834384 100644 --- a/go.mod +++ b/go.mod @@ -4,21 +4,24 @@ go 1.14 require ( github.com/github/hub v2.11.2+incompatible // indirect + github.com/golang/snappy v0.0.1 // indirect github.com/influxdata/influxdb1-client v0.0.0-20200515024757-02f0bf5dbca3 // indirect github.com/mattn/go-colorable v0.1.4 // indirect github.com/mattn/go-isatty v0.0.11 // indirect - github.com/prometheus/client_golang v1.7.0 // indirect + github.com/prometheus/client_golang v1.7.1 // indirect github.com/prometheus/common v0.10.0 // indirect github.com/prometheus/procfs v0.1.3 // indirect github.com/russross/blackfriday v2.0.0+incompatible // indirect github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/unifi-poller/influxunifi v0.0.10-0.20200626040446-8fe783775415 - github.com/unifi-poller/inputunifi v0.0.8-0.20200625093101-80676d70166d - github.com/unifi-poller/lokiunifi v0.0.0-20200626040346-12af563d2a99 + github.com/unifi-poller/inputunifi v0.0.8-0.20200626052630-dabd0510075e + github.com/unifi-poller/lokiunifi v0.0.0-20200626052645-b0336442237e github.com/unifi-poller/poller v0.0.8-0.20200622041812-dd79a3e3073e github.com/unifi-poller/promunifi v0.0.9-0.20200623073250-24621ebb306a github.com/unifi-poller/unifi v0.0.6-0.20200625090439-421046871a37 - golang.org/x/sys v0.0.0-20200620081246-981b61492c35 // indirect + golang.org/x/net v0.0.0-20200625001655-4c5254603344 // indirect + golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae // indirect golift.io/cnfg v0.0.5 // indirect + google.golang.org/protobuf v1.25.0 // indirect ) diff --git a/go.sum b/go.sum index b26531ea..7574bf3e 100644 --- a/go.sum +++ b/go.sum @@ -17,7 +17,6 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/github/hub v2.11.2+incompatible h1:H0wUQmNZVxF2+XyGPTsOxUVrRrFnTq133tezo6u4X4U= github.com/github/hub v2.11.2+incompatible/go.mod h1:zQrzJEdze2hfWJDgktd/L6sROjAdCThFrzjbxw4keTs= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= @@ -30,9 +29,6 @@ github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfb github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.4 h1:87PNWwrRvUSnqS4dlcBU/ftvOIBep4sYuBLlh6rX2wk= -github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= @@ -41,13 +37,13 @@ github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvq github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d h1:/WZQPMZNsjZ7IlCpsLGdQBINg5bxKQ1K1sh6awxLtkA= -github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= github.com/influxdata/influxdb1-client v0.0.0-20200515024757-02f0bf5dbca3 h1:k3/6a1Shi7GGCp9QpyYuXsMM6ncTOjCzOE9Fd6CDA+Q= github.com/influxdata/influxdb1-client v0.0.0-20200515024757-02f0bf5dbca3/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= @@ -59,10 +55,8 @@ github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFB github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.11 h1:FxPOTFNqGkuDUGi3H/qkUbQO4ZiBa2brKq5r0l8TGeM= github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= @@ -78,39 +72,28 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= -github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= -github.com/prometheus/client_golang v1.5.0 h1:Ctq0iGpCmr3jeP77kbF2UxgvRwzWWz+4Bh9/vJTyg1A= -github.com/prometheus/client_golang v1.5.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= -github.com/prometheus/client_golang v1.6.0 h1:YVPodQOcK15POxhgARIvnDRVpLcuK8mglnMrWfyrw6A= github.com/prometheus/client_golang v1.6.0/go.mod h1:ZLOG9ck3JLRdB5MgO8f+lLTe83AXG6ro35rLTxvnIl4= github.com/prometheus/client_golang v1.7.0 h1:wCi7urQOGBsYcQROHqpUUX4ct84xp40t9R9JX0FuA/U= github.com/prometheus/client_golang v1.7.0/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= +github.com/prometheus/client_golang v1.7.1 h1:NTGy1Ja9pByO+xAeH/qiWnLrKtr3hJPNjaVUwnjpdpA= +github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA= -github.com/prometheus/common v0.9.1 h1:KOMtN28tlbam3/7ZKEYKHhKoJZYYj3gMH4uc62x7X7U= github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0 h1:RyRA7RzGXQZiW+tGMr7sxa85G1z0yOpM1qq5c8lNawc= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= -github.com/prometheus/procfs v0.0.10 h1:QJQN3jYQhkamO4mhfUWqdDH2asK7ONOI9MTWjyAxNKM= -github.com/prometheus/procfs v0.0.10/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/prometheus/procfs v0.0.11/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/procfs v0.1.1 h1:/ZKcW+ixpq2dOl4yeH4qvACNXnkiDCp5e/F5Tq07X7o= github.com/prometheus/procfs v0.1.1/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/procfs v0.1.2 h1:DS2izEFqEVp1gPg5yvEF/YzS6Ajo8YdKRJjQKiQm59A= github.com/prometheus/procfs v0.1.2/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.1.3 h1:F0+tqvhOksq22sc6iCHF5WGlWjdwj92p0udFh1VFBS8= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/russross/blackfriday v2.0.0+incompatible h1:cBXrhZNUf9C+La9/YpS+UHpUT8YD6Td9ZMSU9APFcsk= github.com/russross/blackfriday v2.0.0+incompatible/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= -github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= @@ -121,211 +104,24 @@ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/unifi-poller/influxunifi v0.0.7 h1:mQ34a6KRQ4+e18+Ba0gEIkMM+lGa1AVFIvU2/8dAynU= -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/influxunifi v0.0.9-0.20200312080614-979ea0c9c1a0 h1:QV/wl//Gtvg0qT0tFJmmy3plCdqhhKaiNvfXqnxcgHU= -github.com/unifi-poller/influxunifi v0.0.9-0.20200312080614-979ea0c9c1a0/go.mod h1:NbADEvfTpRfn4ycV5bh82QAEf3An7JNd/uYU8JJw4A0= -github.com/unifi-poller/influxunifi v0.0.9-0.20200614012101-da8e25b3e1c0 h1:zh0wSXyJCBV8grVTl96GvsfZMT1atstbRjLVCXgeEnI= -github.com/unifi-poller/influxunifi v0.0.9-0.20200614012101-da8e25b3e1c0/go.mod h1:ApW/E6XsiqbwDxQ1dKgDTb/7FqDI6ppYK5EMv+ziT/Y= -github.com/unifi-poller/influxunifi v0.0.9-0.20200614034715-291e3c246d65 h1:oqzjPC+4p1D0JcuSd8T8Lpyhjm72uSPEVOiQvoTvhac= -github.com/unifi-poller/influxunifi v0.0.9-0.20200614034715-291e3c246d65/go.mod h1:uFA5OXAMxxcDlIFd/LCyaA7iv1DAJR+bmPRH1IQVzco= -github.com/unifi-poller/influxunifi v0.0.9-0.20200614082629-2a147938375e h1:PvuHWNPudQa156LgLYk+tMxfLVEfU8QCAwZYrvH7fro= -github.com/unifi-poller/influxunifi v0.0.9-0.20200614082629-2a147938375e/go.mod h1:uFA5OXAMxxcDlIFd/LCyaA7iv1DAJR+bmPRH1IQVzco= -github.com/unifi-poller/influxunifi v0.0.9-0.20200614084044-5974cdc8af4f h1:09QFwgqdbiNoVfAiQfHlDy+5TbPrkXpHTg4in0ubH+Y= -github.com/unifi-poller/influxunifi v0.0.9-0.20200614084044-5974cdc8af4f/go.mod h1:CfMvHVp3TPnp8flNvsiUSz09LWop1kmig/Sukg+hkAg= -github.com/unifi-poller/influxunifi v0.0.9-0.20200614094130-d25a8fece6bc h1:IwCBppmj6Gh5VwA8dLHdhjdJCUIeuX0xst89cJpG1F0= -github.com/unifi-poller/influxunifi v0.0.9-0.20200614094130-d25a8fece6bc/go.mod h1:CfMvHVp3TPnp8flNvsiUSz09LWop1kmig/Sukg+hkAg= -github.com/unifi-poller/influxunifi v0.0.9 h1:ZDiDbFwoGfNWTXgVOUkkxTOUvkvS8RwweiDRhtntfCU= -github.com/unifi-poller/influxunifi v0.0.9/go.mod h1:CfMvHVp3TPnp8flNvsiUSz09LWop1kmig/Sukg+hkAg= -github.com/unifi-poller/influxunifi v0.0.10-0.20200620104500-bd1a036c5754 h1:yp07xJG/OiYCl+2DtDEUghaYMBt1gxRgvjB4iE6v2Zg= -github.com/unifi-poller/influxunifi v0.0.10-0.20200620104500-bd1a036c5754/go.mod h1:8uchM41Th2buvjKYsD5Lu/9fu4d8qBqs4f+ETA8O5a4= -github.com/unifi-poller/influxunifi v0.0.10-0.20200621075823-77eac45b1298 h1:dbBsIr4vMTjlYtLgPEVRlKLiEhDTDsvDciVoM1odz60= -github.com/unifi-poller/influxunifi v0.0.10-0.20200621075823-77eac45b1298/go.mod h1:YNXEniQvf9fS+AORF5Cu+OALev1bsOtsGXnV76AUKaQ= -github.com/unifi-poller/influxunifi v0.0.10-0.20200621085434-01cd04643679 h1:PB7SNDENoVsbsmomBUgkuaA38OF4rkUFBSXHeFcVAhU= -github.com/unifi-poller/influxunifi v0.0.10-0.20200621085434-01cd04643679/go.mod h1:p6jHkvpcbqf84Qg+HrMJkYGo0MlFk+5ylH/889amK3M= -github.com/unifi-poller/influxunifi v0.0.10-0.20200621111730-4fe24d61b4fe h1:9749csA5+Yj8IPoL0apBKXOUf7PhI3eWz1lkVi5WUQY= -github.com/unifi-poller/influxunifi v0.0.10-0.20200621111730-4fe24d61b4fe/go.mod h1:5zz9S5zLWqpE1sH7v1PPpmydMajIo1Tj0w0PAxOvj7M= -github.com/unifi-poller/influxunifi v0.0.10-0.20200621202825-d81be9b8a363 h1:4J/+UYtOvlELofvNV/sY3q0VtKG8AdQDvM9iM3GigVk= -github.com/unifi-poller/influxunifi v0.0.10-0.20200621202825-d81be9b8a363/go.mod h1:5zz9S5zLWqpE1sH7v1PPpmydMajIo1Tj0w0PAxOvj7M= -github.com/unifi-poller/influxunifi v0.0.10-0.20200621233659-46c84c7e6253 h1:sKLN0tPLoVSJnXkKTxUJ1Pk+nBgTuzrifnxx9cvnWeg= -github.com/unifi-poller/influxunifi v0.0.10-0.20200621233659-46c84c7e6253/go.mod h1:nAH9kRrACQk1OgmXejvHL0zNZjdfYIA6g3o1gJfMAg8= -github.com/unifi-poller/influxunifi v0.0.10-0.20200622070512-7be9d925dbb5 h1:tdq4lgXazLqDZVfs0s2wYVIITkMHEXzaw94aBwsuts8= -github.com/unifi-poller/influxunifi v0.0.10-0.20200622070512-7be9d925dbb5/go.mod h1:nAH9kRrACQk1OgmXejvHL0zNZjdfYIA6g3o1gJfMAg8= -github.com/unifi-poller/influxunifi v0.0.10-0.20200622071547-037b0f8d5d5e h1:N/66hoaqd8FkGIe8diS016j1LkphQJoBNcYanBBjZuY= -github.com/unifi-poller/influxunifi v0.0.10-0.20200622071547-037b0f8d5d5e/go.mod h1:nAH9kRrACQk1OgmXejvHL0zNZjdfYIA6g3o1gJfMAg8= -github.com/unifi-poller/influxunifi v0.0.10-0.20200623073300-b56c0b474733 h1:7DlMM6+1PQV+mRcEh/0ckvPrIi8I0Iju2Uvc3y4TJ3M= -github.com/unifi-poller/influxunifi v0.0.10-0.20200623073300-b56c0b474733/go.mod h1:nAH9kRrACQk1OgmXejvHL0zNZjdfYIA6g3o1gJfMAg8= github.com/unifi-poller/influxunifi v0.0.10-0.20200626040446-8fe783775415 h1:0rYv6/Ykayeyl9zzCERwrwrWa15ES2/ctDmmr0paQ9c= github.com/unifi-poller/influxunifi v0.0.10-0.20200626040446-8fe783775415/go.mod h1:HO6WuWoUwuz9Hj4m9hJ8Sh7U9O1Sd62FPV+loEdCDqY= -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= -github.com/unifi-poller/inputunifi v0.0.6-0.20200203055955-411a49dea2e7/go.mod h1:X1Vd5uAtO5etZveY0WpMVMQBM/iLoMwZ/SvN1iXLxHo= -github.com/unifi-poller/inputunifi v0.0.6-0.20200203073303-9a4abc68dbf8 h1:r0NwfuSckW1tcks5W0+KU237xTBbnSSAJY00HMd31V4= -github.com/unifi-poller/inputunifi v0.0.6-0.20200203073303-9a4abc68dbf8/go.mod h1:X1Vd5uAtO5etZveY0WpMVMQBM/iLoMwZ/SvN1iXLxHo= -github.com/unifi-poller/inputunifi v0.0.6-0.20200203074209-4beb50226323 h1:HKBFcf3MgSgfIgcob8p2XJOCU4tf0+AIM1WjjsvDY5c= -github.com/unifi-poller/inputunifi v0.0.6-0.20200203074209-4beb50226323/go.mod h1:X1Vd5uAtO5etZveY0WpMVMQBM/iLoMwZ/SvN1iXLxHo= -github.com/unifi-poller/inputunifi v0.0.6-0.20200203075041-4b96f410f180 h1:uUCfjvmQ10oowfRXTZ4oZHz75eAc0Ew/oSr/KeiK8Yc= -github.com/unifi-poller/inputunifi v0.0.6-0.20200203075041-4b96f410f180/go.mod h1:X1Vd5uAtO5etZveY0WpMVMQBM/iLoMwZ/SvN1iXLxHo= -github.com/unifi-poller/inputunifi v0.0.6-0.20200203075348-02041fb04441 h1:UeK8p75w8YaBr/CqiZktHXUoTQcw1vcfnvbSCpwF2Jw= -github.com/unifi-poller/inputunifi v0.0.6-0.20200203075348-02041fb04441/go.mod h1:X1Vd5uAtO5etZveY0WpMVMQBM/iLoMwZ/SvN1iXLxHo= -github.com/unifi-poller/inputunifi v0.0.6-0.20200203080812-1b1ca43c1490 h1:4IJhm8I28aRoXKaftx146vSqipTauyyFbx5YmmU9Nq8= -github.com/unifi-poller/inputunifi v0.0.6-0.20200203080812-1b1ca43c1490/go.mod h1:X1Vd5uAtO5etZveY0WpMVMQBM/iLoMwZ/SvN1iXLxHo= -github.com/unifi-poller/inputunifi v0.0.6-0.20200204205922-001fafad6c50 h1:4E51DRV/EWHEcexyWct7ZXuXnS5w2VfR4L5eemNzORE= -github.com/unifi-poller/inputunifi v0.0.6-0.20200204205922-001fafad6c50/go.mod h1:cVYQktoMCwzy09tAaBjDCbeuzIlwD0K5DKi8gBajQMg= -github.com/unifi-poller/inputunifi v0.0.6-0.20200205010458-a1783e28d08a h1:v0vRd4iwBrrzunj+zL0g8eKSHOdirnqyB+Jontewep8= -github.com/unifi-poller/inputunifi v0.0.6-0.20200205010458-a1783e28d08a/go.mod h1:tqEAc/Hp1bAYMilSiJnSr6JopGrB5xV719LDrN/YEsw= -github.com/unifi-poller/inputunifi v0.0.6 h1:3x44qhCl3TXZ0KACQczgsxhI+oHBrcUih8ZepTDBGBs= -github.com/unifi-poller/inputunifi v0.0.6/go.mod h1:5JagfAoHnDmVYkU0Euq+8LSdansuxAf3lnCfRp43NSw= -github.com/unifi-poller/inputunifi v0.0.7-0.20200614011400-ccef115c2def h1:rInzMad38j7jVqyP4pd2u5cfCpTG5s6Ucm0GCwmPQkc= -github.com/unifi-poller/inputunifi v0.0.7-0.20200614011400-ccef115c2def/go.mod h1:ctlM3l9voxrRif2Y8obpkBr4LNSseJwZYsMSOysAHSs= -github.com/unifi-poller/inputunifi v0.0.7-0.20200614024217-51cd08a0421e h1:cF6YNgJS9bBZiaROF+UzH6ehsPH2T7w3mfDgUasv3bU= -github.com/unifi-poller/inputunifi v0.0.7-0.20200614024217-51cd08a0421e/go.mod h1:ctlM3l9voxrRif2Y8obpkBr4LNSseJwZYsMSOysAHSs= -github.com/unifi-poller/inputunifi v0.0.7-0.20200615090539-b2b14e56a5ee h1:AqEqrunRXfiFc8PKefdog+T0WSBjo8JVsZGz06kWWkA= -github.com/unifi-poller/inputunifi v0.0.7-0.20200615090539-b2b14e56a5ee/go.mod h1:sNdMyJPSSxm+IfM6H2g2ovWzn+fXOeIPhRGJbK35tOw= -github.com/unifi-poller/inputunifi v0.0.7-0.20200615092048-70c79f08efca h1:XuGR49M701wnzI0vQ+wCf4bYJsiioD5mTZGQCJuRnPQ= -github.com/unifi-poller/inputunifi v0.0.7-0.20200615092048-70c79f08efca/go.mod h1:sNdMyJPSSxm+IfM6H2g2ovWzn+fXOeIPhRGJbK35tOw= -github.com/unifi-poller/inputunifi v0.0.7-0.20200615102105-baf0b7ccd782 h1:niMlFSb+jbEJIa7dvEXsC7dtlXiFFk2Mq6E3ARmyQiw= -github.com/unifi-poller/inputunifi v0.0.7-0.20200615102105-baf0b7ccd782/go.mod h1:sNdMyJPSSxm+IfM6H2g2ovWzn+fXOeIPhRGJbK35tOw= -github.com/unifi-poller/inputunifi v0.0.7-0.20200615104325-8b4dc0cbe7d2 h1:JVy7RTimrXOuFoTQFsjRTnPf4X8Umab+68x7tGa1kFs= -github.com/unifi-poller/inputunifi v0.0.7-0.20200615104325-8b4dc0cbe7d2/go.mod h1:sNdMyJPSSxm+IfM6H2g2ovWzn+fXOeIPhRGJbK35tOw= -github.com/unifi-poller/inputunifi v0.0.7-0.20200615113835-aa28027f96ca h1:R1ubBMTLkJCEwbhyfTNEl8lXHA8KhQblaA3bVQq6wuU= -github.com/unifi-poller/inputunifi v0.0.7-0.20200615113835-aa28027f96ca/go.mod h1:sNdMyJPSSxm+IfM6H2g2ovWzn+fXOeIPhRGJbK35tOw= -github.com/unifi-poller/inputunifi v0.0.7-0.20200615115520-4de38005d9e4 h1:KG0YreXDyrOryNVsBvz0Nu97dwQWY1MMFc9AK8zAduw= -github.com/unifi-poller/inputunifi v0.0.7-0.20200615115520-4de38005d9e4/go.mod h1:sNdMyJPSSxm+IfM6H2g2ovWzn+fXOeIPhRGJbK35tOw= -github.com/unifi-poller/inputunifi v0.0.7-0.20200615121955-129eacb5681d h1:qhrqVD/3Md2bshqfRXwdFaj5nByyTuQ3Dbz7qaVVrNQ= -github.com/unifi-poller/inputunifi v0.0.7-0.20200615121955-129eacb5681d/go.mod h1:sNdMyJPSSxm+IfM6H2g2ovWzn+fXOeIPhRGJbK35tOw= -github.com/unifi-poller/inputunifi v0.0.7 h1:P5KJrvM9JPEzc1wRA9QYccFd7uipcbStbk7gIhFUrd8= -github.com/unifi-poller/inputunifi v0.0.7/go.mod h1:sNdMyJPSSxm+IfM6H2g2ovWzn+fXOeIPhRGJbK35tOw= -github.com/unifi-poller/inputunifi v0.0.8-0.20200620104121-47689f50d8e3 h1:4EMN1Bp4nxe1wq5QprApyxdORrM/BUn8bL694DEugTY= -github.com/unifi-poller/inputunifi v0.0.8-0.20200620104121-47689f50d8e3/go.mod h1:kmEi1hpjxDzizBeQ5c4gqrpZke8aHu64yfIK0O2T+bE= -github.com/unifi-poller/inputunifi v0.0.8-0.20200621094056-1f25f7cd1ec5 h1:lfasby9IDbgjQyJPxs4+DWw1Ys9CuEGziafZ+FlwIVc= -github.com/unifi-poller/inputunifi v0.0.8-0.20200621094056-1f25f7cd1ec5/go.mod h1:bt70WpE/Kmoif9lBjsUpmy2cPlC8zHQkuYg2f7a1U14= -github.com/unifi-poller/inputunifi v0.0.8-0.20200621111657-768a735debef h1:VjjX6iouAYIz+Bzikpjc509wfbFkndio2LHASRR3r0s= -github.com/unifi-poller/inputunifi v0.0.8-0.20200621111657-768a735debef/go.mod h1:DJgRak363FXPYcoD2IFcyXKsrc/PGE1Z1zIDXpPff+A= -github.com/unifi-poller/inputunifi v0.0.8-0.20200621192201-fa58d3bd9ede h1:b/B7RLSG/XyguwBLVFex4IKbbM2SUEIVkIo1Y5v21UA= -github.com/unifi-poller/inputunifi v0.0.8-0.20200621192201-fa58d3bd9ede/go.mod h1:DJgRak363FXPYcoD2IFcyXKsrc/PGE1Z1zIDXpPff+A= -github.com/unifi-poller/inputunifi v0.0.8-0.20200622013432-300295023003 h1:D2O6ubNAgieZAUQFdy8kp87fLgk6WyHVJD0/ZxbQSAw= -github.com/unifi-poller/inputunifi v0.0.8-0.20200622013432-300295023003/go.mod h1:fHY4tcxbR+uqzT6JSSKwWB4SlpkmBqV7QOR0mHcZ7gc= -github.com/unifi-poller/inputunifi v0.0.8-0.20200622074053-cfb8cc404981 h1:pzaruqPh/AhJ+spLtzpGCA0GZ+raZQrrwgNTYR9mB7s= -github.com/unifi-poller/inputunifi v0.0.8-0.20200622074053-cfb8cc404981/go.mod h1:4LlcrE675d31Do6w+F8HLTq9OBRA1Uf/d1cOL+FjXFg= -github.com/unifi-poller/inputunifi v0.0.8-0.20200622081000-e1deb673a32e h1:6wnc1/1x3PJLtTOighan5P2BWYQ3ngbJ3+EAidhqH1U= -github.com/unifi-poller/inputunifi v0.0.8-0.20200622081000-e1deb673a32e/go.mod h1:4LlcrE675d31Do6w+F8HLTq9OBRA1Uf/d1cOL+FjXFg= -github.com/unifi-poller/inputunifi v0.0.8-0.20200622081539-3b12c5a55673 h1:3QwsjLZlniPeRdnO6KtrshzxscniQJGHluqgE2kzrYQ= -github.com/unifi-poller/inputunifi v0.0.8-0.20200622081539-3b12c5a55673/go.mod h1:4LlcrE675d31Do6w+F8HLTq9OBRA1Uf/d1cOL+FjXFg= -github.com/unifi-poller/inputunifi v0.0.8-0.20200622082837-e666c89e4832 h1:IZNt8GR4fyhxywCZnDoS67on8WTtg7SOWryQnLieTck= -github.com/unifi-poller/inputunifi v0.0.8-0.20200622082837-e666c89e4832/go.mod h1:4LlcrE675d31Do6w+F8HLTq9OBRA1Uf/d1cOL+FjXFg= -github.com/unifi-poller/inputunifi v0.0.8-0.20200623073237-105e56b53d2e h1:5J+Aqo7BYkV3XURpzQqs0Orsm1NFrbTI1L/IRR4jxbw= -github.com/unifi-poller/inputunifi v0.0.8-0.20200623073237-105e56b53d2e/go.mod h1:4LlcrE675d31Do6w+F8HLTq9OBRA1Uf/d1cOL+FjXFg= -github.com/unifi-poller/inputunifi v0.0.8-0.20200625093101-80676d70166d h1:TBvOivgenw8B8unzhjsp3HnNLFvPTy1j1b90yhsX41A= -github.com/unifi-poller/inputunifi v0.0.8-0.20200625093101-80676d70166d/go.mod h1:nFr8uB4zJtCLiQvYPypGK3aWfQ9y4cC4iIeS9PyecrU= -github.com/unifi-poller/lokiunifi v0.0.0-20200623055806-bef9501a2240 h1:5TkGeJiY4IvsQ29LvvoJ45zDpaaGIigKveyuodSWhcY= -github.com/unifi-poller/lokiunifi v0.0.0-20200624101250-d682ecc67db1 h1:T85QCOjtmLYnGIMfvGVP2O1rQ9HDhUBkueZqpamZjVA= -github.com/unifi-poller/lokiunifi v0.0.0-20200624101250-d682ecc67db1/go.mod h1:ZsTuIt3//vACn8IyMhXlI45aOaQiitmI88cy4Ex+lKI= -github.com/unifi-poller/lokiunifi v0.0.0-20200624111242-0c902d3a56ce h1:1rvDepdHE8Ki7J63CxeiGfLTHvDWmrUXG/NZ9RFgcoM= -github.com/unifi-poller/lokiunifi v0.0.0-20200624111242-0c902d3a56ce/go.mod h1:ZsTuIt3//vACn8IyMhXlI45aOaQiitmI88cy4Ex+lKI= -github.com/unifi-poller/lokiunifi v0.0.0-20200624200349-c5eff00ceaca h1:JawgH0pS+/G+twqbRjmRrxAb0bVyX8Ph/p34nhsOdIg= -github.com/unifi-poller/lokiunifi v0.0.0-20200624200349-c5eff00ceaca/go.mod h1:ZsTuIt3//vACn8IyMhXlI45aOaQiitmI88cy4Ex+lKI= -github.com/unifi-poller/lokiunifi v0.0.0-20200626040346-12af563d2a99 h1:QjDm4wrmPOZehxNDHDSUSZfhtSvM+v7OIt/lZ1/Wpn4= +github.com/unifi-poller/inputunifi v0.0.8-0.20200626052630-dabd0510075e h1:gJyoFh49X/9Q8DxsFe2H48DjfZ46/Aw/GBxl7izKDEo= +github.com/unifi-poller/inputunifi v0.0.8-0.20200626052630-dabd0510075e/go.mod h1:nFr8uB4zJtCLiQvYPypGK3aWfQ9y4cC4iIeS9PyecrU= github.com/unifi-poller/lokiunifi v0.0.0-20200626040346-12af563d2a99/go.mod h1:7+uUJT6nnXVPad/Omsj+lPD80Cshg4L8TPUkV72JNM8= -github.com/unifi-poller/poller v0.0.3/go.mod h1:ugy3FyZEH1rFyC3panBiJpXbLf7EZ4GkjiOtydB2CwQ= -github.com/unifi-poller/poller v0.0.4 h1:TYCdQeCYwUmmFcj1H75iGKAFbAOBFwo/XIJDX2Id+cY= -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/poller v0.0.6 h1:KhOWUeYI029Nn/4NOIk/yblQ3tEd9QhS+u/8/S9ZoDs= -github.com/unifi-poller/poller v0.0.6/go.mod h1:RkRJ4pAc2dAN8Xu9+VOumeE3BdN5QDQ3PC+jBx8hWW0= -github.com/unifi-poller/poller v0.0.7-0.20200615130505-b2becb340fdc h1:XgiLe8xg9Cb4qOJHKZwyYf017uqyURfP4jBm3ZnLEH0= -github.com/unifi-poller/poller v0.0.7-0.20200615130505-b2becb340fdc/go.mod h1:RkRJ4pAc2dAN8Xu9+VOumeE3BdN5QDQ3PC+jBx8hWW0= -github.com/unifi-poller/poller v0.0.7 h1:waSPusZd7yPz1zKJgxPSTwjhIUzA+qj8PwVyfLSLjns= -github.com/unifi-poller/poller v0.0.7/go.mod h1:RkRJ4pAc2dAN8Xu9+VOumeE3BdN5QDQ3PC+jBx8hWW0= -github.com/unifi-poller/poller v0.0.8-0.20200619104117-a5e263a36ac9 h1:BYNOSvttR91a0F+ttG2ecD3DenVI9p9oi1W7m36zH98= -github.com/unifi-poller/poller v0.0.8-0.20200619104117-a5e263a36ac9/go.mod h1:q2tufLljemUR/blyhjIj+T0sdAOZo0kdlv3h79kEMgU= -github.com/unifi-poller/poller v0.0.8-0.20200621091816-fd5c7abd9f4b h1:AJKt/ZIDtlEOWxwpL/a7pcrWmqdJaaNE9odNn4JSRj0= -github.com/unifi-poller/poller v0.0.8-0.20200621091816-fd5c7abd9f4b/go.mod h1:+Ppksi2wBCrByJke0B0lTutxFtKfv1zx6L1haALBrN4= -github.com/unifi-poller/poller v0.0.8-0.20200621110949-33f1a1454d10 h1:1rGP4ISFpBj9xjJDXNak7EdaQtyoy3MwMZzo2+W1PLo= -github.com/unifi-poller/poller v0.0.8-0.20200621110949-33f1a1454d10/go.mod h1:+Ppksi2wBCrByJke0B0lTutxFtKfv1zx6L1haALBrN4= -github.com/unifi-poller/poller v0.0.8-0.20200621214016-5d1ed3324a46 h1:OhbVj3VVgbpUMQFSwD0NszDsbEL7DdbTcJuU+p9DwIM= +github.com/unifi-poller/lokiunifi v0.0.0-20200626052645-b0336442237e h1:MoyVcBNks+p1tYCu67UyQycyHpeCqzafWpjMir/Mjh8= +github.com/unifi-poller/lokiunifi v0.0.0-20200626052645-b0336442237e/go.mod h1:7+uUJT6nnXVPad/Omsj+lPD80Cshg4L8TPUkV72JNM8= github.com/unifi-poller/poller v0.0.8-0.20200621214016-5d1ed3324a46/go.mod h1:pJ/MeYaakLOOpbyc7s4zeZ92UzNK/rir5jkA7t5jIjo= github.com/unifi-poller/poller v0.0.8-0.20200622041812-dd79a3e3073e h1:pSkgIalhDdb1N0/9uTAVh7emolfFxjCxo68IXIsZzII= github.com/unifi-poller/poller v0.0.8-0.20200622041812-dd79a3e3073e/go.mod h1:pJ/MeYaakLOOpbyc7s4zeZ92UzNK/rir5jkA7t5jIjo= -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/promunifi v0.0.7-0.20200312082356-2f200a8d7632 h1:/oaYSA9+8Oqdy5wNtL9LY3+twmT+ndRRfB+2PXguM68= -github.com/unifi-poller/promunifi v0.0.7-0.20200312082356-2f200a8d7632/go.mod h1:JuKXj+feqbgEmFX1gJavuRjLcBJ35H7OTv+J20JVw0E= -github.com/unifi-poller/promunifi v0.0.7-0.20200614002236-2fc578d330d8 h1:Kh76SXcNap26XU3qmhlIjMkO2uBXQGn5xg0p3FQ8Hyo= -github.com/unifi-poller/promunifi v0.0.7-0.20200614002236-2fc578d330d8/go.mod h1:JuKXj+feqbgEmFX1gJavuRjLcBJ35H7OTv+J20JVw0E= -github.com/unifi-poller/promunifi v0.0.7-0.20200614032856-bb7f58485c41 h1:cdqSEwbhjtjUkqTQOsXf6owpIyqm9uHzAejyjEf08dI= -github.com/unifi-poller/promunifi v0.0.7-0.20200614032856-bb7f58485c41/go.mod h1:eMjnSpCSuNvHnm4ofAgwRX/tZauGDjHPHdgflH/JATU= -github.com/unifi-poller/promunifi v0.0.7-0.20200614034834-a8547d57cfdc h1:XoSJxz3eGxH8vTKbawecdN42EMem57ydqh9F6XXuZec= -github.com/unifi-poller/promunifi v0.0.7-0.20200614034834-a8547d57cfdc/go.mod h1:gi19r6SSGIOpuYn6aKLOrlScegP/HUIaXY/1tBC7Xdw= -github.com/unifi-poller/promunifi v0.0.7 h1:VylwjZ0qdY6yifMlPTzhvsfaDwdiYgvulKXfTwLPEwI= -github.com/unifi-poller/promunifi v0.0.7/go.mod h1:YXNpofH3Tw707nHJaHXZWVnTlosc4Jdia1RpaVkLTd4= -github.com/unifi-poller/promunifi v0.0.8-0.20200615113800-d557827276cb h1:/vksKDwyU6z6+5uiz6oLEVAchIuZntmvIMjG9xDACwM= -github.com/unifi-poller/promunifi v0.0.8-0.20200615113800-d557827276cb/go.mod h1:YXNpofH3Tw707nHJaHXZWVnTlosc4Jdia1RpaVkLTd4= -github.com/unifi-poller/promunifi v0.0.8-0.20200615115528-b94f4ea4c7fe h1:J4UP0VCFFhe2TiTI9uzRgjuF/9kFDKMmRSGX++UTs9w= -github.com/unifi-poller/promunifi v0.0.8-0.20200615115528-b94f4ea4c7fe/go.mod h1:YXNpofH3Tw707nHJaHXZWVnTlosc4Jdia1RpaVkLTd4= -github.com/unifi-poller/promunifi v0.0.8-0.20200615120614-b01d14f701d5 h1:UwZ7oOZzDXOK7PCCvPm5mlnn7gd0g80DbSaoPm93QeM= -github.com/unifi-poller/promunifi v0.0.8-0.20200615120614-b01d14f701d5/go.mod h1:YXNpofH3Tw707nHJaHXZWVnTlosc4Jdia1RpaVkLTd4= -github.com/unifi-poller/promunifi v0.0.8-0.20200615120918-62e66b15dc1a h1:MCrM2Q4325iXsl+OYqxE3hyq6LfgSYJw82zDZcX7Ejs= -github.com/unifi-poller/promunifi v0.0.8-0.20200615120918-62e66b15dc1a/go.mod h1:YXNpofH3Tw707nHJaHXZWVnTlosc4Jdia1RpaVkLTd4= -github.com/unifi-poller/promunifi v0.0.8 h1:cSoDYZnpFGxyht7sAMytl1wmbHSKem3OOHQXPL3mrrI= -github.com/unifi-poller/promunifi v0.0.8/go.mod h1:YXNpofH3Tw707nHJaHXZWVnTlosc4Jdia1RpaVkLTd4= -github.com/unifi-poller/promunifi v0.0.9-0.20200620104707-26208eb4336b h1:HgmbS5cKfvw3x0ie6IV/FfhxNtKwAvICKxXL7gg2sgM= -github.com/unifi-poller/promunifi v0.0.9-0.20200620104707-26208eb4336b/go.mod h1:jOcYehhsOrs4ctswSKEqGuqSgVBpConaWmRYskycbUc= -github.com/unifi-poller/promunifi v0.0.9-0.20200621111636-373108c3836a h1:tNHwueeADX4Bo/QnqlWg8boPzb/iALcCgavUf2o1Szw= -github.com/unifi-poller/promunifi v0.0.9-0.20200621111636-373108c3836a/go.mod h1:t+tJrhz44p2UHqubXJA9D1/OLMUuB3kEfZz+ICQZQfs= -github.com/unifi-poller/promunifi v0.0.9-0.20200621232051-90645ba5c482 h1:6FUPrhsn9eUbiBMXhA6FSZisAs7PlXRb4faSJPp/JWU= -github.com/unifi-poller/promunifi v0.0.9-0.20200621232051-90645ba5c482/go.mod h1:mlvfj4DRFVx12ewi6BcT4XOG2bxC7sFasl08RlYih8Y= github.com/unifi-poller/promunifi v0.0.9-0.20200623073250-24621ebb306a h1:7CmCHHFUrxzaGVMRINmplAosW8BNXlWIPm05LxCPClU= github.com/unifi-poller/promunifi v0.0.9-0.20200623073250-24621ebb306a/go.mod h1:mlvfj4DRFVx12ewi6BcT4XOG2bxC7sFasl08RlYih8Y= -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= -github.com/unifi-poller/unifi v0.0.4-0.20200204095152-a1669a0b6e3b h1:qVKZKJGNb6SbUCQqbVMJSv1lgzpzdRlZgt7fh/4B9GQ= -github.com/unifi-poller/unifi v0.0.4-0.20200204095152-a1669a0b6e3b/go.mod h1:bTUtctrf56aapjKH+L+98eThBaVFbQXw5iNGZI0g/+E= -github.com/unifi-poller/unifi v0.0.4-0.20200204200450-0e3f394046d0/go.mod h1:bTUtctrf56aapjKH+L+98eThBaVFbQXw5iNGZI0g/+E= -github.com/unifi-poller/unifi v0.0.4-0.20200204205816-4e0f82ec6586 h1:jpA5yAZ9oTUrbN5kKF6s8LYhvOeJ85DMfYXmz41RHEw= -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= -github.com/unifi-poller/unifi v0.0.5-0.20200614031431-bd4934fc585b h1:g3nleMBVzn/0PVwzoNYCwioFgYjzOxMByAO66a/tTf0= -github.com/unifi-poller/unifi v0.0.5-0.20200614031431-bd4934fc585b/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= -github.com/unifi-poller/unifi v0.0.5-0.20200614034623-f4c1d18157c2/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= -github.com/unifi-poller/unifi v0.0.5-0.20200619092006-d24c776a42f5/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= -github.com/unifi-poller/unifi v0.0.5-0.20200620103801-b927287ea1cd h1:jrwuiY1AdoPi+b+R8zjt/e8h8ZqULNB9izcyQnf3pSw= github.com/unifi-poller/unifi v0.0.5-0.20200620103801-b927287ea1cd/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= -github.com/unifi-poller/unifi v0.0.5-0.20200621023010-6a70dec929ba/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= -github.com/unifi-poller/unifi v0.0.5-0.20200621075746-253ccae7e106 h1:eKErSqWD656pLSWgxFwhDhHe/zfAXrm7F39Zn4R+si8= -github.com/unifi-poller/unifi v0.0.5-0.20200621075746-253ccae7e106/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= -github.com/unifi-poller/unifi v0.0.5-0.20200622062110-c9e26760b47d h1:O1kLVSaEVdUqaInPviFnGkCY8Q9sSCZVQGMv6K66GL4= -github.com/unifi-poller/unifi v0.0.5-0.20200622062110-c9e26760b47d/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= -github.com/unifi-poller/unifi v0.0.5-0.20200622063739-6e8b5bc204c5 h1:2bxjc7izwbOFDGKTnsb8aHW0t6eLKpPQ9CedzZfwgP4= -github.com/unifi-poller/unifi v0.0.5-0.20200622063739-6e8b5bc204c5/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= -github.com/unifi-poller/unifi v0.0.5-0.20200622065904-981554badb89 h1:0qs1wRrupRUTH+6v75Z0fqBeaQNXGuTBcKGu/0ACvf8= -github.com/unifi-poller/unifi v0.0.5-0.20200622065904-981554badb89/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= -github.com/unifi-poller/unifi v0.0.5-0.20200622073824-4a29471d80f6 h1:KzQDaEhDxtDzoyfBPXzM/pwpD76+4Y74Y66XMhKt2pI= -github.com/unifi-poller/unifi v0.0.5-0.20200622073824-4a29471d80f6/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= -github.com/unifi-poller/unifi v0.0.5-0.20200623080800-1766e7bde07c h1:pW5Z6cE1DC2GAHy6CdWnkgy5t/wehBvOW19viQXxUVo= -github.com/unifi-poller/unifi v0.0.5-0.20200623080800-1766e7bde07c/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= -github.com/unifi-poller/unifi v0.0.5-0.20200624101133-921ff05afda7 h1:m4y7neqrehgXlls6Qk8mYgqp4VudKh+04Z9X40XowV0= -github.com/unifi-poller/unifi v0.0.5-0.20200624101133-921ff05afda7/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= -github.com/unifi-poller/unifi v0.0.5 h1:Izeun32YxcQOeKZUXY0Sy4ltKYFuYxWGcN9JS6xkIJU= -github.com/unifi-poller/unifi v0.0.5/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= github.com/unifi-poller/unifi v0.0.6-0.20200625090439-421046871a37 h1:T2y8JWkjZd1vz2ZKu4vmmAk9s6PUwupuTldwhfww5xY= github.com/unifi-poller/unifi v0.0.6-0.20200625090439-421046871a37/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= 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/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= @@ -335,13 +131,12 @@ golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200202094626-16171245cfb2 h1:CCH4IOTTfewWjGOlSp+zGcjutRKlBEZQ6wTn8ozI/nI= -golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200301022130-244492dfa37a h1:GuSPYbZzB5/dcLNCwLQLsg3obCJtX9IJhpXkvY7kzk0= -golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200602114024-627f9648deb9 h1:pNX+40auqi2JqRfOP1akLGtYcn15TUbkhwuCO3foqqM= golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200625001655-4c5254603344 h1:vGXIOMxbNfDTk/aXCmfdLgkrSV+Z2tcbze+pEc3v5W4= +golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -353,22 +148,18 @@ golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5 h1:LfCXLvNmTYH9kEmVgqbnsWfruoXZIrh4YBgqVHtDvw0= -golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527 h1:uYVVQ9WP/Ds2ROhcaGPeIdVq0RIXVLwsHlnvJ+cT1So= -golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200610111108-226ff32320da h1:bGb80FudwxpeucJUjPYJXuJ8Hk91vNtfvrymzwiei38= golang.org/x/sys v0.0.0-20200610111108-226ff32320da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200620081246-981b61492c35 h1:wb/9mP8eUAmHfkM8RmpeLq6nUA7c2i5+bQOtcDftjaE= golang.org/x/sys v0.0.0-20200620081246-981b61492c35/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae h1:Ih9Yo4hSPImZOpfGuA4bR/ORKTAbhZo2AbWNRCnevdo= +golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= @@ -395,6 +186,8 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.24.0 h1:UhZDfRO8JRQru4/+LlLE0BRKGF8L+PICnvYZmx/fEGA= google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= +google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c= +google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -402,8 +195,6 @@ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= -gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= From 101b066036fe842959ed6a118b4c0d270e2f4464 Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Thu, 25 Jun 2020 22:39:42 -0700 Subject: [PATCH 19/39] update examples --- examples/up.conf.example | 51 ++++++++++++++++++++++++++-------------- examples/up.json.example | 8 +++++-- examples/up.xml.example | 8 +++++-- examples/up.yaml.example | 8 +++++-- 4 files changed, 51 insertions(+), 24 deletions(-) diff --git a/examples/up.conf.example b/examples/up.conf.example index d2df0349..3a9873be 100644 --- a/examples/up.conf.example +++ b/examples/up.conf.example @@ -59,15 +59,18 @@ # controller here and delete the following section. The internal defaults are # shown below. Any missing values will assume these displayed defaults. [unifi.defaults] - url = "https://127.0.0.1:8443" - user = "unifipoller" - pass = "unifipoller" - sites = ["all"] - save_ids = false - save_dpi = false - save_sites = true - hash_pii = false - verify_ssl = false + url = "https://127.0.0.1:8443" + user = "unifipoller" + pass = "unifipoller" + sites = ["all"] + save_ids = false + save_events = false + save_alarms = false + save_anomalies = false + save_dpi = false + save_sites = true + hash_pii = false + verify_ssl = false # The following is optional and used for configurations with multiple controllers. @@ -91,20 +94,32 @@ # A setting of ["all"] will poll all sites; this works if you only have 1 site too. #sites = ["all"] - # Enable collection of UniFi Events (InfluxDB only). - # This may store a lot of information. Only recommended for testing and debugging. - # There are no dashboards to display this data. It can be used for annotations. - # This is a new (July, 2020) feature. Please provide feedback if you try it out! - # Enable this only if using InfluxDB. This may leak PII data! - #save_events = false - - # Enable collection of Intrusion Detection System Data (InfluxDB only). + # Enable collection of Intrusion Detection System Data (InfluxDB/Loki only). # Only useful if IDS or IPS are enabled on one of the sites. This may store # a lot of information. Only recommended for testing and debugging. There # may not be any dashboards to display this data. It can be used for annotations. - # Enable this only if using InfluxDB. This may leak PII data! + # Enable this only if using InfluxDB or Loki. This will leak PII data! #save_ids = false + # Enable collection of UniFi Events (InfluxDB/Loki only). + # This may store a lot of information. Only recommended for testing and debugging. + # There are no dashboards to display this data. It can be used for annotations. + # This is a new (June, 2020) feature. Please provide feedback if you try it out! + # Enable this only if using InfluxDB or Loki. This will leak PII data! + #save_events = false + + # Enable collection of UniFi Alarms (InfluxDB/Loki only). + # There are no dashboards to display this data. It can be used for annotations. + # This is a new (June, 2020) feature. Please provide feedback if you try it out! + # Enable this only if using InfluxDB or Loki. This will leak PII data! + #save_alarms = false + + # Enable collection of UniFi Anomalies (InfluxDB/Loki only). + # There are no dashboards to display this data. It can be used for annotations. + # This is a new (June, 2020) feature. Please provide feedback if you try it out! + # Enable this only if using InfluxDB or Loki. + #save_anomalies = false + # Enable collection of Deep Packet Inspection data. This data breaks down traffic # types for each client and site, it powers a dedicated DPI dashboard. # Enabling this adds roughly 150 data points per client. That's 6000 metrics for diff --git a/examples/up.json.example b/examples/up.json.example index 107f20e4..63d05010 100644 --- a/examples/up.json.example +++ b/examples/up.json.example @@ -28,8 +28,10 @@ "pass": "unifipoller", "url": "https://127.0.0.1:8443", "sites": ["all"], - "save_events": false, "save_ids": false, + "save_events": false, + "save_alarms": false, + "save_anomalies": false, "save_dpi": false, "save_sites": true, "hash_pii": false, @@ -41,8 +43,10 @@ "pass": "unifipoller", "url": "https://127.0.0.1:8443", "sites": ["all"], - "save_events": false, "save_ids": false, + "save_events": false, + "save_alarms": false, + "save_anomalies": false, "save_dpi": false, "save_sites": true, "hash_pii": false, diff --git a/examples/up.xml.example b/examples/up.xml.example index 3fc3f776..4e9a6a26 100644 --- a/examples/up.xml.example +++ b/examples/up.xml.example @@ -31,8 +31,10 @@ NOTE: and are lists of strings and may be repeated. unifipoller unifipoller https://127.0.0.1:8443 - false false + false + false + false false true false @@ -45,8 +47,10 @@ NOTE: and are lists of strings and may be repeated. unifipoller unifipoller https://127.0.0.1:8443 - false false + false + false + false false true false diff --git a/examples/up.yaml.example b/examples/up.yaml.example index b3c9ee94..a81b40d5 100644 --- a/examples/up.yaml.example +++ b/examples/up.yaml.example @@ -32,8 +32,10 @@ unifi: pass: "unifipoller" sites: - all - save_events: false save_ids: false + save_events: false + save_alarms: false + save_anomalies: false save_dpi: false save_sites: true hash_pii: false @@ -47,8 +49,10 @@ unifi: pass: "unifipoller" sites: - all - save_events: false save_ids: false + save_events: false + save_alarms: false + save_anomalies: false save_dpi: false save_sites: true hash_pii: false From 870421ef694f11e65d97f0787adae2f39a17d9da Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Sun, 28 Jun 2020 04:48:05 -0700 Subject: [PATCH 20/39] add web server code --- Makefile | 13 +++++++++---- go.mod | 5 +++-- go.sum | 23 +++++++++++++++++++++++ main.go | 1 + 4 files changed, 36 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index b723851c..20e5122a 100644 --- a/Makefile +++ b/Makefile @@ -214,10 +214,11 @@ $(BINARY)-$(VERSION)_$(ITERATION).armhf.txz: package_build_freebsd_arm check_fpm # Build an environment that can be packaged for linux. package_build_linux: readme man plugins_linux_amd64 linux # Building package environment for linux. - mkdir -p $@/usr/bin $@/etc/$(BINARY) $@/usr/share/man/man1 $@/usr/share/doc/$(BINARY) $@/usr/lib/$(BINARY) + mkdir -p $@/usr/bin $@/etc/$(BINARY) $@/usr/share/man/man1 $@/usr/share/doc/$(BINARY) $@/usr/lib/$(BINARY)/web # Copying the binary, config file, unit file, and man page into the env. cp $(BINARY).amd64.linux $@/usr/bin/$(BINARY) cp *.1.gz $@/usr/share/man/man1 + cp -r init/webserver/* $@/usr/lib/$(BINARY)/web/ rm -f $@/usr/lib/$(BINARY)/*.so [ ! -f *amd64.so ] || cp *amd64.so $@/usr/lib/$(BINARY)/ cp examples/$(CONFIG_FILE).example $@/etc/$(BINARY)/ @@ -248,9 +249,10 @@ package_build_linux_armhf: package_build_linux armhf # Build an environment that can be packaged for freebsd. package_build_freebsd: readme man freebsd - mkdir -p $@/usr/local/bin $@/usr/local/etc/$(BINARY) $@/usr/local/share/man/man1 $@/usr/local/share/doc/$(BINARY) + mkdir -p $@/usr/local/bin $@/usr/local/etc/$(BINARY) $@/usr/local/share/man/man1 $@/usr/local/share/doc/$(BINARY) $@/usr/local/lib/$(BINARY)/web cp $(BINARY).amd64.freebsd $@/usr/local/bin/$(BINARY) cp *.1.gz $@/usr/local/share/man/man1 + cp -r init/webserver/* $@/usr/local/lib/$(BINARY)/web/ cp examples/$(CONFIG_FILE).example $@/usr/local/etc/$(BINARY)/ cp examples/$(CONFIG_FILE).example $@/usr/local/etc/$(BINARY)/$(CONFIG_FILE) cp LICENSE *.html examples/*?.?* $@/usr/local/share/doc/$(BINARY)/ @@ -337,6 +339,8 @@ deps: go get -u github.com/unifi-poller/unifi go get -u github.com/unifi-poller/influxunifi go get -u github.com/unifi-poller/promunifi + go get -u github.com/unifi-poller/lokiunifi + go get -u github.com/unifi-poller/webserver go get -u github.com/unifi-poller/inputunifi go get -u github.com/unifi-poller/poller @@ -354,9 +358,10 @@ install: man readme $(BINARY) plugins_darwin @[ "$(PREFIX)" != "" ] || (echo "Unable to continue, PREFIX not set. Use: make install PREFIX=/usr/local ETC=/usr/local/etc" && false) @[ "$(ETC)" != "" ] || (echo "Unable to continue, ETC not set. Use: make install PREFIX=/usr/local ETC=/usr/local/etc" && false) # Copying the binary, config file, unit file, and man page into the env. - /usr/bin/install -m 0755 -d $(PREFIX)/bin $(PREFIX)/share/man/man1 $(ETC)/$(BINARY) $(PREFIX)/share/doc/$(BINARY) $(PREFIX)/lib/$(BINARY) + /usr/bin/install -m 0755 -d $(PREFIX)/bin $(PREFIX)/share/man/man1 $(ETC)/$(BINARY) $(PREFIX)/share/doc/$(BINARY) $(PREFIX)/lib/$(BINARY)/web /usr/bin/install -m 0755 -cp $(BINARY) $(PREFIX)/bin/$(BINARY) - /usr/bin/install -m 0644 -cp $(BINARY).1.gz $(PREFIX)/share/man/man1 + /usr/bin/install -m 0644 -cp $(BINARY).1.gz $(PREFIX)/share/man/man1/ /usr/bin/install -m 0644 -cp examples/$(CONFIG_FILE).example $(ETC)/$(BINARY)/ + /usr/bin/install -m 0644 -cp init/webserver/* $(PREFIX)/lib/$(BINARY)/web/ [ -f $(ETC)/$(BINARY)/$(CONFIG_FILE) ] || /usr/bin/install -m 0644 -cp examples/$(CONFIG_FILE).example $(ETC)/$(BINARY)/$(CONFIG_FILE) /usr/bin/install -m 0644 -cp LICENSE *.html examples/* $(PREFIX)/share/doc/$(BINARY)/ diff --git a/go.mod b/go.mod index 77834384..d19011f2 100644 --- a/go.mod +++ b/go.mod @@ -15,11 +15,12 @@ require ( github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/unifi-poller/influxunifi v0.0.10-0.20200626040446-8fe783775415 - github.com/unifi-poller/inputunifi v0.0.8-0.20200626052630-dabd0510075e + github.com/unifi-poller/inputunifi v0.0.8-0.20200628114724-8b60ff573a49 github.com/unifi-poller/lokiunifi v0.0.0-20200626052645-b0336442237e - github.com/unifi-poller/poller v0.0.8-0.20200622041812-dd79a3e3073e + github.com/unifi-poller/poller v0.0.8-0.20200628114359-a40c51a9891d github.com/unifi-poller/promunifi v0.0.9-0.20200623073250-24621ebb306a github.com/unifi-poller/unifi v0.0.6-0.20200625090439-421046871a37 + github.com/unifi-poller/webserver v0.0.0-20200628114213-2b89a50ff1c0 golang.org/x/net v0.0.0-20200625001655-4c5254603344 // indirect golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae // indirect golift.io/cnfg v0.0.5 // indirect diff --git a/go.sum b/go.sum index 7574bf3e..fd244e5d 100644 --- a/go.sum +++ b/go.sum @@ -44,6 +44,8 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/gorilla/mux v1.7.4 h1:VuZ8uybHlWmqV03+zRzdwKL4tUnIp1MAQtp1mIFE1bc= +github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= github.com/influxdata/influxdb1-client v0.0.0-20200515024757-02f0bf5dbca3 h1:k3/6a1Shi7GGCp9QpyYuXsMM6ncTOjCzOE9Fd6CDA+Q= github.com/influxdata/influxdb1-client v0.0.0-20200515024757-02f0bf5dbca3/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= @@ -108,19 +110,40 @@ github.com/unifi-poller/influxunifi v0.0.10-0.20200626040446-8fe783775415 h1:0rY github.com/unifi-poller/influxunifi v0.0.10-0.20200626040446-8fe783775415/go.mod h1:HO6WuWoUwuz9Hj4m9hJ8Sh7U9O1Sd62FPV+loEdCDqY= github.com/unifi-poller/inputunifi v0.0.8-0.20200626052630-dabd0510075e h1:gJyoFh49X/9Q8DxsFe2H48DjfZ46/Aw/GBxl7izKDEo= github.com/unifi-poller/inputunifi v0.0.8-0.20200626052630-dabd0510075e/go.mod h1:nFr8uB4zJtCLiQvYPypGK3aWfQ9y4cC4iIeS9PyecrU= +github.com/unifi-poller/inputunifi v0.0.8-0.20200628114724-8b60ff573a49 h1:ce5cXC4eWs5TfrjvlN8ZEemKcnv7KfbUbzXDr2fHnso= +github.com/unifi-poller/inputunifi v0.0.8-0.20200628114724-8b60ff573a49/go.mod h1:Rb9C8xi/qgxOO/IbwyO4Uu77qVkIhGiQv4cA2jnmNMI= github.com/unifi-poller/lokiunifi v0.0.0-20200626040346-12af563d2a99/go.mod h1:7+uUJT6nnXVPad/Omsj+lPD80Cshg4L8TPUkV72JNM8= github.com/unifi-poller/lokiunifi v0.0.0-20200626052645-b0336442237e h1:MoyVcBNks+p1tYCu67UyQycyHpeCqzafWpjMir/Mjh8= github.com/unifi-poller/lokiunifi v0.0.0-20200626052645-b0336442237e/go.mod h1:7+uUJT6nnXVPad/Omsj+lPD80Cshg4L8TPUkV72JNM8= github.com/unifi-poller/poller v0.0.8-0.20200621214016-5d1ed3324a46/go.mod h1:pJ/MeYaakLOOpbyc7s4zeZ92UzNK/rir5jkA7t5jIjo= github.com/unifi-poller/poller v0.0.8-0.20200622041812-dd79a3e3073e h1:pSkgIalhDdb1N0/9uTAVh7emolfFxjCxo68IXIsZzII= github.com/unifi-poller/poller v0.0.8-0.20200622041812-dd79a3e3073e/go.mod h1:pJ/MeYaakLOOpbyc7s4zeZ92UzNK/rir5jkA7t5jIjo= +github.com/unifi-poller/poller v0.0.8-0.20200626082958-a9a7092a5684 h1:r1B8GoI47czgGnQ7WY89qlSKqSE1d1pQmcLfdXVW/+Y= +github.com/unifi-poller/poller v0.0.8-0.20200626082958-a9a7092a5684/go.mod h1:pJ/MeYaakLOOpbyc7s4zeZ92UzNK/rir5jkA7t5jIjo= +github.com/unifi-poller/poller v0.0.8-0.20200627080311-6a024f8220dd h1:1o5CdAa7HxUHDXDV6N8SGAtKu3GeSkxFJOMkHHm6MVk= +github.com/unifi-poller/poller v0.0.8-0.20200627080311-6a024f8220dd/go.mod h1:pJ/MeYaakLOOpbyc7s4zeZ92UzNK/rir5jkA7t5jIjo= +github.com/unifi-poller/poller v0.0.8-0.20200627082257-8f95941300de h1:GQqHkp9+jdesjCra28BPk10H3pJJ/9uVNzT1JRUP2K4= +github.com/unifi-poller/poller v0.0.8-0.20200627082257-8f95941300de/go.mod h1:pJ/MeYaakLOOpbyc7s4zeZ92UzNK/rir5jkA7t5jIjo= +github.com/unifi-poller/poller v0.0.8-0.20200628114359-a40c51a9891d h1:wS7GngTfpX4Ngmm2+r1uJsECmiAglSOzEInwF/S4dW8= +github.com/unifi-poller/poller v0.0.8-0.20200628114359-a40c51a9891d/go.mod h1:fObadG7weiVnSpFu8pFpGfo2bYYFc7hUMe770FovSc8= github.com/unifi-poller/promunifi v0.0.9-0.20200623073250-24621ebb306a h1:7CmCHHFUrxzaGVMRINmplAosW8BNXlWIPm05LxCPClU= github.com/unifi-poller/promunifi v0.0.9-0.20200623073250-24621ebb306a/go.mod h1:mlvfj4DRFVx12ewi6BcT4XOG2bxC7sFasl08RlYih8Y= github.com/unifi-poller/unifi v0.0.5-0.20200620103801-b927287ea1cd/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= github.com/unifi-poller/unifi v0.0.6-0.20200625090439-421046871a37 h1:T2y8JWkjZd1vz2ZKu4vmmAk9s6PUwupuTldwhfww5xY= github.com/unifi-poller/unifi v0.0.6-0.20200625090439-421046871a37/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= +github.com/unifi-poller/webserver v0.0.0-20200626113232-24ae3f02067d h1:iTp4YWGqBmDRxsMjLnJymmDzhO9b+Jvjly7hqLJnPdY= +github.com/unifi-poller/webserver v0.0.0-20200626113232-24ae3f02067d/go.mod h1:Ydcz7GN8uSpIoAI7h7+v89Q4peWaeq7jIAfsG0vfQKE= +github.com/unifi-poller/webserver v0.0.0-20200627075529-02f6c576d7bc h1:O5qrJOu2E+WB5b5vSDDFrxW/Y7KBm+QdTRHc2Bad30Y= +github.com/unifi-poller/webserver v0.0.0-20200627075529-02f6c576d7bc/go.mod h1:0kv/xON8tow9YE0ZmODW0Migxx2Q7vZZ+c5OVTW/kfU= +github.com/unifi-poller/webserver v0.0.0-20200627075622-78851a262139 h1:JpKj/VMBxErObszX55iJnHRnbMHkEJ2hmzOXY6sDa9g= +github.com/unifi-poller/webserver v0.0.0-20200627075622-78851a262139/go.mod h1:0kv/xON8tow9YE0ZmODW0Migxx2Q7vZZ+c5OVTW/kfU= +github.com/unifi-poller/webserver v0.0.0-20200627080325-7ddac80e969e h1:whQsHnJJZvH0c6UyQwQcxA6dKXTrkLUAVxAjlVWq6Io= +github.com/unifi-poller/webserver v0.0.0-20200627080325-7ddac80e969e/go.mod h1:0kv/xON8tow9YE0ZmODW0Migxx2Q7vZZ+c5OVTW/kfU= +github.com/unifi-poller/webserver v0.0.0-20200628114213-2b89a50ff1c0 h1:hJ+DZonWxH7KybGDIs66U64/HZyY3obuxqyO1LUiWEE= +github.com/unifi-poller/webserver v0.0.0-20200628114213-2b89a50ff1c0/go.mod h1:rlM8tRx7wCxqj4+6ZkuFVt2voFoAlHhS/XTrHd7T57s= 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/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= diff --git a/main.go b/main.go index a3269290..c3543353 100644 --- a/main.go +++ b/main.go @@ -14,6 +14,7 @@ import ( _ "github.com/unifi-poller/influxunifi" _ "github.com/unifi-poller/lokiunifi" _ "github.com/unifi-poller/promunifi" + _ "github.com/unifi-poller/webserver" ) // Keep it simple. From 2a63fa09391bfbed6f68e3dc93b7f05366fbf426 Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Sun, 28 Jun 2020 05:50:44 -0700 Subject: [PATCH 21/39] make web server work in docker --- go.mod | 10 +++++----- go.sum | 10 ++++++++++ init/docker/Dockerfile | 1 + init/webserver/index.html | 2 ++ init/webserver/static/css/index.html | 1 + init/webserver/static/images/index.html | 1 + init/webserver/static/index.html | 1 + init/webserver/static/js/index.html | 1 + 8 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 init/webserver/index.html create mode 100644 init/webserver/static/css/index.html create mode 100644 init/webserver/static/images/index.html create mode 100644 init/webserver/static/index.html create mode 100644 init/webserver/static/js/index.html diff --git a/go.mod b/go.mod index d19011f2..1d963b1d 100644 --- a/go.mod +++ b/go.mod @@ -14,13 +14,13 @@ require ( github.com/russross/blackfriday v2.0.0+incompatible // indirect github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/unifi-poller/influxunifi v0.0.10-0.20200626040446-8fe783775415 - github.com/unifi-poller/inputunifi v0.0.8-0.20200628114724-8b60ff573a49 - github.com/unifi-poller/lokiunifi v0.0.0-20200626052645-b0336442237e + github.com/unifi-poller/influxunifi v0.0.10-0.20200628124841-cb2762a27193 + github.com/unifi-poller/inputunifi v0.0.8-0.20200628124735-b6af0039a275 + github.com/unifi-poller/lokiunifi v0.0.0-20200628124714-778a1a77f311 github.com/unifi-poller/poller v0.0.8-0.20200628114359-a40c51a9891d - github.com/unifi-poller/promunifi v0.0.9-0.20200623073250-24621ebb306a + github.com/unifi-poller/promunifi v0.0.9-0.20200628124811-17c74bc966ba github.com/unifi-poller/unifi v0.0.6-0.20200625090439-421046871a37 - github.com/unifi-poller/webserver v0.0.0-20200628114213-2b89a50ff1c0 + github.com/unifi-poller/webserver v0.0.0-20200628115531-e071827d7598 golang.org/x/net v0.0.0-20200625001655-4c5254603344 // indirect golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae // indirect golift.io/cnfg v0.0.5 // indirect diff --git a/go.sum b/go.sum index fd244e5d..f380e8d7 100644 --- a/go.sum +++ b/go.sum @@ -108,13 +108,19 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/unifi-poller/influxunifi v0.0.10-0.20200626040446-8fe783775415 h1:0rYv6/Ykayeyl9zzCERwrwrWa15ES2/ctDmmr0paQ9c= github.com/unifi-poller/influxunifi v0.0.10-0.20200626040446-8fe783775415/go.mod h1:HO6WuWoUwuz9Hj4m9hJ8Sh7U9O1Sd62FPV+loEdCDqY= +github.com/unifi-poller/influxunifi v0.0.10-0.20200628124841-cb2762a27193 h1:GZsJAFb2ihLSluA6yVQCbfu0msFIepU8Aa4cuID0ymU= +github.com/unifi-poller/influxunifi v0.0.10-0.20200628124841-cb2762a27193/go.mod h1:ZlpigLCYu5/l1Wu8nYEIFNWZnAqg+YV3mbSuZCmcsJE= github.com/unifi-poller/inputunifi v0.0.8-0.20200626052630-dabd0510075e h1:gJyoFh49X/9Q8DxsFe2H48DjfZ46/Aw/GBxl7izKDEo= github.com/unifi-poller/inputunifi v0.0.8-0.20200626052630-dabd0510075e/go.mod h1:nFr8uB4zJtCLiQvYPypGK3aWfQ9y4cC4iIeS9PyecrU= github.com/unifi-poller/inputunifi v0.0.8-0.20200628114724-8b60ff573a49 h1:ce5cXC4eWs5TfrjvlN8ZEemKcnv7KfbUbzXDr2fHnso= github.com/unifi-poller/inputunifi v0.0.8-0.20200628114724-8b60ff573a49/go.mod h1:Rb9C8xi/qgxOO/IbwyO4Uu77qVkIhGiQv4cA2jnmNMI= +github.com/unifi-poller/inputunifi v0.0.8-0.20200628124735-b6af0039a275 h1:pbC+9LglWSAg6EE0AQPxk/Z2WowrVvEzH6cVVi/mcGo= +github.com/unifi-poller/inputunifi v0.0.8-0.20200628124735-b6af0039a275/go.mod h1:Rb9C8xi/qgxOO/IbwyO4Uu77qVkIhGiQv4cA2jnmNMI= github.com/unifi-poller/lokiunifi v0.0.0-20200626040346-12af563d2a99/go.mod h1:7+uUJT6nnXVPad/Omsj+lPD80Cshg4L8TPUkV72JNM8= github.com/unifi-poller/lokiunifi v0.0.0-20200626052645-b0336442237e h1:MoyVcBNks+p1tYCu67UyQycyHpeCqzafWpjMir/Mjh8= github.com/unifi-poller/lokiunifi v0.0.0-20200626052645-b0336442237e/go.mod h1:7+uUJT6nnXVPad/Omsj+lPD80Cshg4L8TPUkV72JNM8= +github.com/unifi-poller/lokiunifi v0.0.0-20200628124714-778a1a77f311 h1:WBuMSFL4YpkRtwynKZU6+OcKWtuxnjenJafJDv8516o= +github.com/unifi-poller/lokiunifi v0.0.0-20200628124714-778a1a77f311/go.mod h1:vmXYivAPW6jBzKAwBYsBcNeuROxaar6gvlsoZ3RQZhs= github.com/unifi-poller/poller v0.0.8-0.20200621214016-5d1ed3324a46/go.mod h1:pJ/MeYaakLOOpbyc7s4zeZ92UzNK/rir5jkA7t5jIjo= github.com/unifi-poller/poller v0.0.8-0.20200622041812-dd79a3e3073e h1:pSkgIalhDdb1N0/9uTAVh7emolfFxjCxo68IXIsZzII= github.com/unifi-poller/poller v0.0.8-0.20200622041812-dd79a3e3073e/go.mod h1:pJ/MeYaakLOOpbyc7s4zeZ92UzNK/rir5jkA7t5jIjo= @@ -128,6 +134,8 @@ github.com/unifi-poller/poller v0.0.8-0.20200628114359-a40c51a9891d h1:wS7GngTfp github.com/unifi-poller/poller v0.0.8-0.20200628114359-a40c51a9891d/go.mod h1:fObadG7weiVnSpFu8pFpGfo2bYYFc7hUMe770FovSc8= github.com/unifi-poller/promunifi v0.0.9-0.20200623073250-24621ebb306a h1:7CmCHHFUrxzaGVMRINmplAosW8BNXlWIPm05LxCPClU= github.com/unifi-poller/promunifi v0.0.9-0.20200623073250-24621ebb306a/go.mod h1:mlvfj4DRFVx12ewi6BcT4XOG2bxC7sFasl08RlYih8Y= +github.com/unifi-poller/promunifi v0.0.9-0.20200628124811-17c74bc966ba h1:JkCbMKjUORMImfKJ0uZFomVsPJjR8fUI+tZzpnbeGds= +github.com/unifi-poller/promunifi v0.0.9-0.20200628124811-17c74bc966ba/go.mod h1:ibeILb7ndzfT+vzucBRCTCLv19TaKOcds8sKGv2ZwGA= github.com/unifi-poller/unifi v0.0.5-0.20200620103801-b927287ea1cd/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= github.com/unifi-poller/unifi v0.0.6-0.20200625090439-421046871a37 h1:T2y8JWkjZd1vz2ZKu4vmmAk9s6PUwupuTldwhfww5xY= github.com/unifi-poller/unifi v0.0.6-0.20200625090439-421046871a37/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= @@ -141,6 +149,8 @@ github.com/unifi-poller/webserver v0.0.0-20200627080325-7ddac80e969e h1:whQsHnJJ github.com/unifi-poller/webserver v0.0.0-20200627080325-7ddac80e969e/go.mod h1:0kv/xON8tow9YE0ZmODW0Migxx2Q7vZZ+c5OVTW/kfU= github.com/unifi-poller/webserver v0.0.0-20200628114213-2b89a50ff1c0 h1:hJ+DZonWxH7KybGDIs66U64/HZyY3obuxqyO1LUiWEE= github.com/unifi-poller/webserver v0.0.0-20200628114213-2b89a50ff1c0/go.mod h1:rlM8tRx7wCxqj4+6ZkuFVt2voFoAlHhS/XTrHd7T57s= +github.com/unifi-poller/webserver v0.0.0-20200628115531-e071827d7598 h1:Nmo1arOOln7V7YhjcwrT2AEFN0dl43tl5NgoNF4SgiA= +github.com/unifi-poller/webserver v0.0.0-20200628115531-e071827d7598/go.mod h1:rlM8tRx7wCxqj4+6ZkuFVt2voFoAlHhS/XTrHd7T57s= 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/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= diff --git a/init/docker/Dockerfile b/init/docker/Dockerfile index d981281b..48bd8749 100644 --- a/init/docker/Dockerfile +++ b/init/docker/Dockerfile @@ -52,6 +52,7 @@ LABEL org.opencontainers.image.created="${BUILD_DATE}" \ COPY --from=builder /${BINARY}/${BINARY}.${ARCH}.${OS} /image COPY --from=builder /${BINARY}/examples/${CONFIG_FILE}.example /etc/${BINARY}/${CONFIG_FILE} +COPY --from=builder /${BINARY}/init/webserver /usr/lib/unifi-poller/web COPY --from=builder /etc/ssl /etc/ssl COPY --from=builder /usr/share/zoneinfo /usr/share/zoneinfo diff --git a/init/webserver/index.html b/init/webserver/index.html new file mode 100644 index 00000000..b2aa1c0b --- /dev/null +++ b/init/webserver/index.html @@ -0,0 +1,2 @@ +This is the main page.
+And it's empty. diff --git a/init/webserver/static/css/index.html b/init/webserver/static/css/index.html new file mode 100644 index 00000000..43759d9a --- /dev/null +++ b/init/webserver/static/css/index.html @@ -0,0 +1 @@ +You found style sheets. diff --git a/init/webserver/static/images/index.html b/init/webserver/static/images/index.html new file mode 100644 index 00000000..0426d5b9 --- /dev/null +++ b/init/webserver/static/images/index.html @@ -0,0 +1 @@ +You found images. diff --git a/init/webserver/static/index.html b/init/webserver/static/index.html new file mode 100644 index 00000000..cdf1eeb5 --- /dev/null +++ b/init/webserver/static/index.html @@ -0,0 +1 @@ +You found an empty cup of noodles. diff --git a/init/webserver/static/js/index.html b/init/webserver/static/js/index.html new file mode 100644 index 00000000..d6efd456 --- /dev/null +++ b/init/webserver/static/js/index.html @@ -0,0 +1 @@ +You found javascript. From 3b72cde2c3fcf99033680e280a8459d426288825 Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Sun, 28 Jun 2020 06:11:20 -0700 Subject: [PATCH 22/39] fix --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 1d963b1d..8f4d8977 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/unifi-poller/influxunifi v0.0.10-0.20200628124841-cb2762a27193 github.com/unifi-poller/inputunifi v0.0.8-0.20200628124735-b6af0039a275 github.com/unifi-poller/lokiunifi v0.0.0-20200628124714-778a1a77f311 - github.com/unifi-poller/poller v0.0.8-0.20200628114359-a40c51a9891d + github.com/unifi-poller/poller v0.0.8-0.20200628130947-4a647d6555ef github.com/unifi-poller/promunifi v0.0.9-0.20200628124811-17c74bc966ba github.com/unifi-poller/unifi v0.0.6-0.20200625090439-421046871a37 github.com/unifi-poller/webserver v0.0.0-20200628115531-e071827d7598 diff --git a/go.sum b/go.sum index f380e8d7..b190b111 100644 --- a/go.sum +++ b/go.sum @@ -132,6 +132,8 @@ github.com/unifi-poller/poller v0.0.8-0.20200627082257-8f95941300de h1:GQqHkp9+j github.com/unifi-poller/poller v0.0.8-0.20200627082257-8f95941300de/go.mod h1:pJ/MeYaakLOOpbyc7s4zeZ92UzNK/rir5jkA7t5jIjo= github.com/unifi-poller/poller v0.0.8-0.20200628114359-a40c51a9891d h1:wS7GngTfpX4Ngmm2+r1uJsECmiAglSOzEInwF/S4dW8= github.com/unifi-poller/poller v0.0.8-0.20200628114359-a40c51a9891d/go.mod h1:fObadG7weiVnSpFu8pFpGfo2bYYFc7hUMe770FovSc8= +github.com/unifi-poller/poller v0.0.8-0.20200628130947-4a647d6555ef h1:iUI85Mx7ee5MIdk4Ge9eDLovge10rM/j50PHc24+N08= +github.com/unifi-poller/poller v0.0.8-0.20200628130947-4a647d6555ef/go.mod h1:fObadG7weiVnSpFu8pFpGfo2bYYFc7hUMe770FovSc8= github.com/unifi-poller/promunifi v0.0.9-0.20200623073250-24621ebb306a h1:7CmCHHFUrxzaGVMRINmplAosW8BNXlWIPm05LxCPClU= github.com/unifi-poller/promunifi v0.0.9-0.20200623073250-24621ebb306a/go.mod h1:mlvfj4DRFVx12ewi6BcT4XOG2bxC7sFasl08RlYih8Y= github.com/unifi-poller/promunifi v0.0.9-0.20200628124811-17c74bc966ba h1:JkCbMKjUORMImfKJ0uZFomVsPJjR8fUI+tZzpnbeGds= From 277830b292ef8c05274d43cc61c3f872caca99b5 Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Sun, 28 Jun 2020 06:16:07 -0700 Subject: [PATCH 23/39] another fix --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 8f4d8977..d5d6912e 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/unifi-poller/influxunifi v0.0.10-0.20200628124841-cb2762a27193 github.com/unifi-poller/inputunifi v0.0.8-0.20200628124735-b6af0039a275 github.com/unifi-poller/lokiunifi v0.0.0-20200628124714-778a1a77f311 - github.com/unifi-poller/poller v0.0.8-0.20200628130947-4a647d6555ef + github.com/unifi-poller/poller v0.0.8-0.20200628131550-26430cac16c1 github.com/unifi-poller/promunifi v0.0.9-0.20200628124811-17c74bc966ba github.com/unifi-poller/unifi v0.0.6-0.20200625090439-421046871a37 github.com/unifi-poller/webserver v0.0.0-20200628115531-e071827d7598 diff --git a/go.sum b/go.sum index b190b111..9402deef 100644 --- a/go.sum +++ b/go.sum @@ -134,6 +134,8 @@ github.com/unifi-poller/poller v0.0.8-0.20200628114359-a40c51a9891d h1:wS7GngTfp github.com/unifi-poller/poller v0.0.8-0.20200628114359-a40c51a9891d/go.mod h1:fObadG7weiVnSpFu8pFpGfo2bYYFc7hUMe770FovSc8= github.com/unifi-poller/poller v0.0.8-0.20200628130947-4a647d6555ef h1:iUI85Mx7ee5MIdk4Ge9eDLovge10rM/j50PHc24+N08= github.com/unifi-poller/poller v0.0.8-0.20200628130947-4a647d6555ef/go.mod h1:fObadG7weiVnSpFu8pFpGfo2bYYFc7hUMe770FovSc8= +github.com/unifi-poller/poller v0.0.8-0.20200628131550-26430cac16c1 h1:SHKYtAu4yB5bVhMuRkoHr8Ss1Ffu5dKLJ13rGWufLFI= +github.com/unifi-poller/poller v0.0.8-0.20200628131550-26430cac16c1/go.mod h1:fObadG7weiVnSpFu8pFpGfo2bYYFc7hUMe770FovSc8= github.com/unifi-poller/promunifi v0.0.9-0.20200623073250-24621ebb306a h1:7CmCHHFUrxzaGVMRINmplAosW8BNXlWIPm05LxCPClU= github.com/unifi-poller/promunifi v0.0.9-0.20200623073250-24621ebb306a/go.mod h1:mlvfj4DRFVx12ewi6BcT4XOG2bxC7sFasl08RlYih8Y= github.com/unifi-poller/promunifi v0.0.9-0.20200628124811-17c74bc966ba h1:JkCbMKjUORMImfKJ0uZFomVsPJjR8fUI+tZzpnbeGds= From a79f49ec03a18e7c93abe790595507d9c9247c56 Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Sun, 28 Jun 2020 14:28:53 -0700 Subject: [PATCH 24/39] add more logging --- go.mod | 8 ++++---- go.sum | 8 ++++++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index d5d6912e..5c3dfd31 100644 --- a/go.mod +++ b/go.mod @@ -14,13 +14,13 @@ require ( github.com/russross/blackfriday v2.0.0+incompatible // indirect github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/unifi-poller/influxunifi v0.0.10-0.20200628124841-cb2762a27193 + github.com/unifi-poller/influxunifi v0.0.10-0.20200628212559-02c131d5ab9f github.com/unifi-poller/inputunifi v0.0.8-0.20200628124735-b6af0039a275 - github.com/unifi-poller/lokiunifi v0.0.0-20200628124714-778a1a77f311 + github.com/unifi-poller/lokiunifi v0.0.0-20200628212531-964d320957e4 github.com/unifi-poller/poller v0.0.8-0.20200628131550-26430cac16c1 - github.com/unifi-poller/promunifi v0.0.9-0.20200628124811-17c74bc966ba + github.com/unifi-poller/promunifi v0.0.9-0.20200628212620-13ccb1ce3beb github.com/unifi-poller/unifi v0.0.6-0.20200625090439-421046871a37 - github.com/unifi-poller/webserver v0.0.0-20200628115531-e071827d7598 + github.com/unifi-poller/webserver v0.0.0-20200628212441-340749c94743 golang.org/x/net v0.0.0-20200625001655-4c5254603344 // indirect golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae // indirect golift.io/cnfg v0.0.5 // indirect diff --git a/go.sum b/go.sum index 9402deef..ad7b0d19 100644 --- a/go.sum +++ b/go.sum @@ -110,6 +110,8 @@ github.com/unifi-poller/influxunifi v0.0.10-0.20200626040446-8fe783775415 h1:0rY github.com/unifi-poller/influxunifi v0.0.10-0.20200626040446-8fe783775415/go.mod h1:HO6WuWoUwuz9Hj4m9hJ8Sh7U9O1Sd62FPV+loEdCDqY= github.com/unifi-poller/influxunifi v0.0.10-0.20200628124841-cb2762a27193 h1:GZsJAFb2ihLSluA6yVQCbfu0msFIepU8Aa4cuID0ymU= github.com/unifi-poller/influxunifi v0.0.10-0.20200628124841-cb2762a27193/go.mod h1:ZlpigLCYu5/l1Wu8nYEIFNWZnAqg+YV3mbSuZCmcsJE= +github.com/unifi-poller/influxunifi v0.0.10-0.20200628212559-02c131d5ab9f h1:wY8dYe9PRRh99MmNP08AXXR+XBRjiPo163QIqUoE5qg= +github.com/unifi-poller/influxunifi v0.0.10-0.20200628212559-02c131d5ab9f/go.mod h1:qbHllpoCWUfhk+WDvPluqn9k+czl4x16TefjdaCcmTc= github.com/unifi-poller/inputunifi v0.0.8-0.20200626052630-dabd0510075e h1:gJyoFh49X/9Q8DxsFe2H48DjfZ46/Aw/GBxl7izKDEo= github.com/unifi-poller/inputunifi v0.0.8-0.20200626052630-dabd0510075e/go.mod h1:nFr8uB4zJtCLiQvYPypGK3aWfQ9y4cC4iIeS9PyecrU= github.com/unifi-poller/inputunifi v0.0.8-0.20200628114724-8b60ff573a49 h1:ce5cXC4eWs5TfrjvlN8ZEemKcnv7KfbUbzXDr2fHnso= @@ -121,6 +123,8 @@ github.com/unifi-poller/lokiunifi v0.0.0-20200626052645-b0336442237e h1:MoyVcBNk github.com/unifi-poller/lokiunifi v0.0.0-20200626052645-b0336442237e/go.mod h1:7+uUJT6nnXVPad/Omsj+lPD80Cshg4L8TPUkV72JNM8= github.com/unifi-poller/lokiunifi v0.0.0-20200628124714-778a1a77f311 h1:WBuMSFL4YpkRtwynKZU6+OcKWtuxnjenJafJDv8516o= github.com/unifi-poller/lokiunifi v0.0.0-20200628124714-778a1a77f311/go.mod h1:vmXYivAPW6jBzKAwBYsBcNeuROxaar6gvlsoZ3RQZhs= +github.com/unifi-poller/lokiunifi v0.0.0-20200628212531-964d320957e4 h1:FA4rcjM648oDMn/Q7dH8j4Sj7bdQV9LQS8K77YP3Ye8= +github.com/unifi-poller/lokiunifi v0.0.0-20200628212531-964d320957e4/go.mod h1:dbV8ptSPzLrerEJxvPYhDk+HRn+GMYv1xaqgUOoretg= github.com/unifi-poller/poller v0.0.8-0.20200621214016-5d1ed3324a46/go.mod h1:pJ/MeYaakLOOpbyc7s4zeZ92UzNK/rir5jkA7t5jIjo= github.com/unifi-poller/poller v0.0.8-0.20200622041812-dd79a3e3073e h1:pSkgIalhDdb1N0/9uTAVh7emolfFxjCxo68IXIsZzII= github.com/unifi-poller/poller v0.0.8-0.20200622041812-dd79a3e3073e/go.mod h1:pJ/MeYaakLOOpbyc7s4zeZ92UzNK/rir5jkA7t5jIjo= @@ -140,6 +144,8 @@ github.com/unifi-poller/promunifi v0.0.9-0.20200623073250-24621ebb306a h1:7CmCHH github.com/unifi-poller/promunifi v0.0.9-0.20200623073250-24621ebb306a/go.mod h1:mlvfj4DRFVx12ewi6BcT4XOG2bxC7sFasl08RlYih8Y= github.com/unifi-poller/promunifi v0.0.9-0.20200628124811-17c74bc966ba h1:JkCbMKjUORMImfKJ0uZFomVsPJjR8fUI+tZzpnbeGds= github.com/unifi-poller/promunifi v0.0.9-0.20200628124811-17c74bc966ba/go.mod h1:ibeILb7ndzfT+vzucBRCTCLv19TaKOcds8sKGv2ZwGA= +github.com/unifi-poller/promunifi v0.0.9-0.20200628212620-13ccb1ce3beb h1:G8j4APUkcuogff5ihjeemJqeI7Hcwk3s598xbF63n9w= +github.com/unifi-poller/promunifi v0.0.9-0.20200628212620-13ccb1ce3beb/go.mod h1:hq4eItu10nOutQ0q/BRf1Mn/IvfRP+n0DlWsYPBlbm4= github.com/unifi-poller/unifi v0.0.5-0.20200620103801-b927287ea1cd/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= github.com/unifi-poller/unifi v0.0.6-0.20200625090439-421046871a37 h1:T2y8JWkjZd1vz2ZKu4vmmAk9s6PUwupuTldwhfww5xY= github.com/unifi-poller/unifi v0.0.6-0.20200625090439-421046871a37/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= @@ -155,6 +161,8 @@ github.com/unifi-poller/webserver v0.0.0-20200628114213-2b89a50ff1c0 h1:hJ+DZonW github.com/unifi-poller/webserver v0.0.0-20200628114213-2b89a50ff1c0/go.mod h1:rlM8tRx7wCxqj4+6ZkuFVt2voFoAlHhS/XTrHd7T57s= github.com/unifi-poller/webserver v0.0.0-20200628115531-e071827d7598 h1:Nmo1arOOln7V7YhjcwrT2AEFN0dl43tl5NgoNF4SgiA= github.com/unifi-poller/webserver v0.0.0-20200628115531-e071827d7598/go.mod h1:rlM8tRx7wCxqj4+6ZkuFVt2voFoAlHhS/XTrHd7T57s= +github.com/unifi-poller/webserver v0.0.0-20200628212441-340749c94743 h1:B0K4P+dCLW5qG8hRhdMlrNEU+Yy0kAm9C2lCUmfBhPI= +github.com/unifi-poller/webserver v0.0.0-20200628212441-340749c94743/go.mod h1:ekoFVYoCWwn2CjQVTC9PNF6OaXYzr7HSnfc1BDQxxjA= 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/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= From b92386518e8e6a6adf354c3be52241b9813f3e24 Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Sun, 28 Jun 2020 15:09:53 -0700 Subject: [PATCH 25/39] fixes --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 5c3dfd31..3cac4a19 100644 --- a/go.mod +++ b/go.mod @@ -20,7 +20,7 @@ require ( github.com/unifi-poller/poller v0.0.8-0.20200628131550-26430cac16c1 github.com/unifi-poller/promunifi v0.0.9-0.20200628212620-13ccb1ce3beb github.com/unifi-poller/unifi v0.0.6-0.20200625090439-421046871a37 - github.com/unifi-poller/webserver v0.0.0-20200628212441-340749c94743 + github.com/unifi-poller/webserver v0.0.0-20200628220857-bb444cf7da24 golang.org/x/net v0.0.0-20200625001655-4c5254603344 // indirect golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae // indirect golift.io/cnfg v0.0.5 // indirect diff --git a/go.sum b/go.sum index ad7b0d19..57b00066 100644 --- a/go.sum +++ b/go.sum @@ -163,6 +163,8 @@ github.com/unifi-poller/webserver v0.0.0-20200628115531-e071827d7598 h1:Nmo1arOO github.com/unifi-poller/webserver v0.0.0-20200628115531-e071827d7598/go.mod h1:rlM8tRx7wCxqj4+6ZkuFVt2voFoAlHhS/XTrHd7T57s= github.com/unifi-poller/webserver v0.0.0-20200628212441-340749c94743 h1:B0K4P+dCLW5qG8hRhdMlrNEU+Yy0kAm9C2lCUmfBhPI= github.com/unifi-poller/webserver v0.0.0-20200628212441-340749c94743/go.mod h1:ekoFVYoCWwn2CjQVTC9PNF6OaXYzr7HSnfc1BDQxxjA= +github.com/unifi-poller/webserver v0.0.0-20200628220857-bb444cf7da24 h1:1X1DPZdpjPamherE0mfcs+O+hl/M+stilDk5+88U9ak= +github.com/unifi-poller/webserver v0.0.0-20200628220857-bb444cf7da24/go.mod h1:08IX30eb93+VbhiFqgMBXQD52+djPwivBcx5C8fH92M= 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/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= From eacce79785f00f9d4e38ae49066d0564eddb74e6 Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Mon, 29 Jun 2020 22:36:05 -0700 Subject: [PATCH 26/39] updates --- examples/MANUAL.md | 19 +++++++++---- examples/README.md | 6 ++-- examples/up.conf.example | 36 ++++++++++++++++++++++++ examples/up.json.example | 12 ++++++++ examples/up.xml.example | 61 ---------------------------------------- examples/up.yaml.example | 10 +++++++ go.mod | 6 ++-- go.sum | 11 ++++++++ 8 files changed, 88 insertions(+), 73 deletions(-) delete mode 100644 examples/up.xml.example diff --git a/examples/MANUAL.md b/examples/MANUAL.md index 3296e3a2..49f264b1 100644 --- a/examples/MANUAL.md +++ b/examples/MANUAL.md @@ -24,12 +24,18 @@ examples and default configurations. OPTIONS --- -`unifi-poller [-c ,[config-file]] [-j ] [-h] [-v]` +`unifi-poller [-c ,[config-file]] [-j ] [-e ] [-h] [-v]` -c, --config ,[config-file] Provide a configuration file (instead of the default). You may provide multiple file paths separated by commas. The first file found is used. + -e, --encrypt + Encrypts a password with bcrypt. This is useful to make an account + password for the built-in web server. You may provide the password + on the CLI, or use "-" as the pass to be prompted for the password + without echo. + -v, --version Display version and exit. @@ -56,13 +62,14 @@ CONFIGURATION * Windows: `C:\\ProgramData\\unifi-poller\\up.conf` * Others: `/etc/unifi-poller/up.conf` * Config File Default Format: `TOML` -* Possible formats: `XML`, `JSON`, `TOML`, `YAML` +* Possible formats: `JSON`, `TOML`, `YAML` The config file can be written in four different syntax formats. The application -decides which one to use based on the file's name. If it contains `.xml` it will -be parsed as XML. The same goes for `.json` and `.yaml`. If the filename contains -none of these strings, then it is parsed as the default format, TOML. This option -is provided so the application can be easily adapted to any environment. +decides which one to use based on the file's name. If it contains `.json` it will +be parsed as JSON. The same goes for `.yaml`. If the filename contains neither +of these strings, then it is parsed as the default format, TOML. This feature +is provided so the application can be easily adapted to any environment. `XML` +used to work but no longer does. `Config File Parameters` diff --git a/examples/README.md b/examples/README.md index 82f81ae0..aa97d781 100644 --- a/examples/README.md +++ b/examples/README.md @@ -3,9 +3,9 @@ This folder contains example configuration files in four supported formats. You can use any format you want for the config file, just give it the appropriate suffix for -the format. An XML file should end with `.xml`, a JSON -file with `.json`, and YAML with `.yaml`. The default -format is always TOML and may have any _other_ suffix. +the format. A JSON file should end with `.json`, and +YAML with `.yaml`. The default format is always TOML and +may have any _other_ suffix. #### Dashboards diff --git a/examples/up.conf.example b/examples/up.conf.example index 3a9873be..06c5b59d 100644 --- a/examples/up.conf.example +++ b/examples/up.conf.example @@ -43,6 +43,42 @@ # If you're getting zeros now, set this to "1m" interval = "30s" +# To enable output of UniFi Events to Loki, add a URL. +# User, pass and tenant_id are optional and most folks wont set them. +# Pick which logs you want per-controller in the [unifi.controller] section. +# This is a new feature. Feedback welcome! +[loki] + url = "" + # The rest of this is advanced & optional. + user = "" + pass = "" + verify_ssl = false + tenant_id = "" + interval = "2m" + timeout = "10s" + +# Poller has an optional web server. To turn it on, set enable to true. If you +# wish to use SSL, provide SSL cert and key paths. This interface is currently +# read-only; it just displays information, like logs, devices and clients. +# Notice: Enabling the web server with many clients will increase memory usage. +# This is a new feature. Feedback welcome! +[webserver] + enable = false + port = 37288 + # The HTML path is different on Windows and BSD/macOS. + html_path = "/usr/lib/unifi-poller/web" + ssl_cert_path = "" + ssl_key_path = "" + # How many events per source to hold. 200-2000. Use fewer with many clients. + max_events = 200 + +# By default the web interface does not require authentication. You can change +# that by adding a username and password hash (or multiple) below. +# To create a hash, run unifi-poller with the -e CLI argument. +[webserver.accounts] +# username = "password-hash" +# captain = "$2a$04$mxw6i0LKH6u46oaLK2cq5eCTAAFkfNiRpzNbz.EyvJZZWNa2FzIlS" + #### INPUTS [unifi] diff --git a/examples/up.json.example b/examples/up.json.example index 63d05010..d67897d6 100644 --- a/examples/up.json.example +++ b/examples/up.json.example @@ -21,6 +21,18 @@ "interval": "30s" }, + "webserver": { + "enable": false, + "port": 37288, + "html_path": "/usr/lib/unifi-poller/web", + "ssl_cert_path": "" + "ssl_key_path": "" + "max_events": 200 + "accounts": { + "captain": "$2a$04$mxw6i0LKH6u46oaLK2cq5eCTAAFkfNiRpzNbz.EyvJZZWNa2FzIlS" + } + }, + "unifi": { "dynamic": false, "defaults": { diff --git a/examples/up.xml.example b/examples/up.xml.example deleted file mode 100644 index 4e9a6a26..00000000 --- a/examples/up.xml.example +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - 0.0.0.0:9130 - false - - - - 30s - http://127.0.0.1:8086 - unifipoller - unifipoller - unifi - false - - - - - all - unifipoller - unifipoller - https://127.0.0.1:8443 - false - false - false - false - false - true - false - false - - - - - all - unifipoller - unifipoller - https://127.0.0.1:8443 - false - false - false - false - false - true - false - false - - - - diff --git a/examples/up.yaml.example b/examples/up.yaml.example index a81b40d5..76eeac48 100644 --- a/examples/up.yaml.example +++ b/examples/up.yaml.example @@ -24,6 +24,16 @@ influxdb: db: "unifi" verify_ssl: false +webserver: + enable: false + port: 37288 + html_path: "/usr/lib/unifi-poller/web" + ssl_cert_path: "" + ssl_key_path: "" + max_events: 200 + accounts: + captain: "$2a$04$mxw6i0LKH6u46oaLK2cq5eCTAAFkfNiRpzNbz.EyvJZZWNa2FzIlS" + unifi: dynamic: false defaults: diff --git a/go.mod b/go.mod index 3cac4a19..b4c85d22 100644 --- a/go.mod +++ b/go.mod @@ -15,12 +15,12 @@ require ( github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/unifi-poller/influxunifi v0.0.10-0.20200628212559-02c131d5ab9f - github.com/unifi-poller/inputunifi v0.0.8-0.20200628124735-b6af0039a275 + github.com/unifi-poller/inputunifi v0.0.8-0.20200629074959-35d6603f1831 github.com/unifi-poller/lokiunifi v0.0.0-20200628212531-964d320957e4 github.com/unifi-poller/poller v0.0.8-0.20200628131550-26430cac16c1 github.com/unifi-poller/promunifi v0.0.9-0.20200628212620-13ccb1ce3beb - github.com/unifi-poller/unifi v0.0.6-0.20200625090439-421046871a37 - github.com/unifi-poller/webserver v0.0.0-20200628220857-bb444cf7da24 + github.com/unifi-poller/unifi v0.0.6-0.20200628213309-a22ea217874f + github.com/unifi-poller/webserver v0.0.0-20200630053536-1a5a6430daf4 golang.org/x/net v0.0.0-20200625001655-4c5254603344 // indirect golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae // indirect golift.io/cnfg v0.0.5 // indirect diff --git a/go.sum b/go.sum index 57b00066..a702b8d5 100644 --- a/go.sum +++ b/go.sum @@ -118,6 +118,10 @@ github.com/unifi-poller/inputunifi v0.0.8-0.20200628114724-8b60ff573a49 h1:ce5cX github.com/unifi-poller/inputunifi v0.0.8-0.20200628114724-8b60ff573a49/go.mod h1:Rb9C8xi/qgxOO/IbwyO4Uu77qVkIhGiQv4cA2jnmNMI= github.com/unifi-poller/inputunifi v0.0.8-0.20200628124735-b6af0039a275 h1:pbC+9LglWSAg6EE0AQPxk/Z2WowrVvEzH6cVVi/mcGo= github.com/unifi-poller/inputunifi v0.0.8-0.20200628124735-b6af0039a275/go.mod h1:Rb9C8xi/qgxOO/IbwyO4Uu77qVkIhGiQv4cA2jnmNMI= +github.com/unifi-poller/inputunifi v0.0.8-0.20200629073944-889691ff1096 h1:0e66nCzeonQtrzX/zdNJdQHcoo6z2/rCmUaiAJU0tIM= +github.com/unifi-poller/inputunifi v0.0.8-0.20200629073944-889691ff1096/go.mod h1:iJT8Y3KwSV/ceqOikamlhw2c0EMHTFv47TxKKFThx8I= +github.com/unifi-poller/inputunifi v0.0.8-0.20200629074959-35d6603f1831 h1:fBPfSPtGCmpv5BMwk+oorS672fd7L8vFbX/DTOC+2C4= +github.com/unifi-poller/inputunifi v0.0.8-0.20200629074959-35d6603f1831/go.mod h1:iJT8Y3KwSV/ceqOikamlhw2c0EMHTFv47TxKKFThx8I= github.com/unifi-poller/lokiunifi v0.0.0-20200626040346-12af563d2a99/go.mod h1:7+uUJT6nnXVPad/Omsj+lPD80Cshg4L8TPUkV72JNM8= github.com/unifi-poller/lokiunifi v0.0.0-20200626052645-b0336442237e h1:MoyVcBNks+p1tYCu67UyQycyHpeCqzafWpjMir/Mjh8= github.com/unifi-poller/lokiunifi v0.0.0-20200626052645-b0336442237e/go.mod h1:7+uUJT6nnXVPad/Omsj+lPD80Cshg4L8TPUkV72JNM8= @@ -149,6 +153,8 @@ github.com/unifi-poller/promunifi v0.0.9-0.20200628212620-13ccb1ce3beb/go.mod h1 github.com/unifi-poller/unifi v0.0.5-0.20200620103801-b927287ea1cd/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= github.com/unifi-poller/unifi v0.0.6-0.20200625090439-421046871a37 h1:T2y8JWkjZd1vz2ZKu4vmmAk9s6PUwupuTldwhfww5xY= github.com/unifi-poller/unifi v0.0.6-0.20200625090439-421046871a37/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= +github.com/unifi-poller/unifi v0.0.6-0.20200628213309-a22ea217874f h1:5aLy4Ac0vFhaEikq04oPAFqhygVv0lq77/ZJ4aBEnkc= +github.com/unifi-poller/unifi v0.0.6-0.20200628213309-a22ea217874f/go.mod h1:uqBaNCon8FTw6nwGsAYHz/HwBgEYepS0XB5XW+OdBts= github.com/unifi-poller/webserver v0.0.0-20200626113232-24ae3f02067d h1:iTp4YWGqBmDRxsMjLnJymmDzhO9b+Jvjly7hqLJnPdY= github.com/unifi-poller/webserver v0.0.0-20200626113232-24ae3f02067d/go.mod h1:Ydcz7GN8uSpIoAI7h7+v89Q4peWaeq7jIAfsG0vfQKE= github.com/unifi-poller/webserver v0.0.0-20200627075529-02f6c576d7bc h1:O5qrJOu2E+WB5b5vSDDFrxW/Y7KBm+QdTRHc2Bad30Y= @@ -163,8 +169,13 @@ github.com/unifi-poller/webserver v0.0.0-20200628115531-e071827d7598 h1:Nmo1arOO github.com/unifi-poller/webserver v0.0.0-20200628115531-e071827d7598/go.mod h1:rlM8tRx7wCxqj4+6ZkuFVt2voFoAlHhS/XTrHd7T57s= github.com/unifi-poller/webserver v0.0.0-20200628212441-340749c94743 h1:B0K4P+dCLW5qG8hRhdMlrNEU+Yy0kAm9C2lCUmfBhPI= github.com/unifi-poller/webserver v0.0.0-20200628212441-340749c94743/go.mod h1:ekoFVYoCWwn2CjQVTC9PNF6OaXYzr7HSnfc1BDQxxjA= +github.com/unifi-poller/webserver v0.0.0-20200628214116-5bead091e113/go.mod h1:08IX30eb93+VbhiFqgMBXQD52+djPwivBcx5C8fH92M= github.com/unifi-poller/webserver v0.0.0-20200628220857-bb444cf7da24 h1:1X1DPZdpjPamherE0mfcs+O+hl/M+stilDk5+88U9ak= github.com/unifi-poller/webserver v0.0.0-20200628220857-bb444cf7da24/go.mod h1:08IX30eb93+VbhiFqgMBXQD52+djPwivBcx5C8fH92M= +github.com/unifi-poller/webserver v0.0.0-20200629073701-8b95a5ac3e49 h1:8qVHNZg2Cf1dchBVCc8omU1ty56JQIQ9ZsyPg08EIs8= +github.com/unifi-poller/webserver v0.0.0-20200629073701-8b95a5ac3e49/go.mod h1:08IX30eb93+VbhiFqgMBXQD52+djPwivBcx5C8fH92M= +github.com/unifi-poller/webserver v0.0.0-20200630053536-1a5a6430daf4 h1:0II3Z/THLBBx8TCEYQkSlwn1KFLbGVe/OS/uNENvaS4= +github.com/unifi-poller/webserver v0.0.0-20200630053536-1a5a6430daf4/go.mod h1:08IX30eb93+VbhiFqgMBXQD52+djPwivBcx5C8fH92M= 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/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= From a3ccb7e36b55526679b1cfdf049e8703c8e3d7eb Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Tue, 30 Jun 2020 03:39:54 -0700 Subject: [PATCH 27/39] data hoarding --- go.mod | 8 ++++---- go.sum | 10 ++++++++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index b4c85d22..b57da512 100644 --- a/go.mod +++ b/go.mod @@ -14,13 +14,13 @@ require ( github.com/russross/blackfriday v2.0.0+incompatible // indirect github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/unifi-poller/influxunifi v0.0.10-0.20200628212559-02c131d5ab9f - github.com/unifi-poller/inputunifi v0.0.8-0.20200629074959-35d6603f1831 + github.com/unifi-poller/influxunifi v0.0.10-0.20200630103608-fb25b5bc3fa7 + github.com/unifi-poller/inputunifi v0.0.8-0.20200630101705-1f36fb078fcb github.com/unifi-poller/lokiunifi v0.0.0-20200628212531-964d320957e4 github.com/unifi-poller/poller v0.0.8-0.20200628131550-26430cac16c1 - github.com/unifi-poller/promunifi v0.0.9-0.20200628212620-13ccb1ce3beb + github.com/unifi-poller/promunifi v0.0.9-0.20200630103619-c2b0b27aa0c7 github.com/unifi-poller/unifi v0.0.6-0.20200628213309-a22ea217874f - github.com/unifi-poller/webserver v0.0.0-20200630053536-1a5a6430daf4 + github.com/unifi-poller/webserver v0.0.0-20200630103554-031c750c37a3 golang.org/x/net v0.0.0-20200625001655-4c5254603344 // indirect golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae // indirect golift.io/cnfg v0.0.5 // indirect diff --git a/go.sum b/go.sum index a702b8d5..ce78c8e0 100644 --- a/go.sum +++ b/go.sum @@ -112,6 +112,10 @@ github.com/unifi-poller/influxunifi v0.0.10-0.20200628124841-cb2762a27193 h1:GZs github.com/unifi-poller/influxunifi v0.0.10-0.20200628124841-cb2762a27193/go.mod h1:ZlpigLCYu5/l1Wu8nYEIFNWZnAqg+YV3mbSuZCmcsJE= github.com/unifi-poller/influxunifi v0.0.10-0.20200628212559-02c131d5ab9f h1:wY8dYe9PRRh99MmNP08AXXR+XBRjiPo163QIqUoE5qg= github.com/unifi-poller/influxunifi v0.0.10-0.20200628212559-02c131d5ab9f/go.mod h1:qbHllpoCWUfhk+WDvPluqn9k+czl4x16TefjdaCcmTc= +github.com/unifi-poller/influxunifi v0.0.10-0.20200630101653-6c02bd48f4d4 h1:FGp+6E7B2nBmH44EnjEY1qb88C3a9osyU5WPgzCtqBQ= +github.com/unifi-poller/influxunifi v0.0.10-0.20200630101653-6c02bd48f4d4/go.mod h1:qbHllpoCWUfhk+WDvPluqn9k+czl4x16TefjdaCcmTc= +github.com/unifi-poller/influxunifi v0.0.10-0.20200630103608-fb25b5bc3fa7 h1:UZ18xCI8bCSBhmeUFYJb78vwAjf8htsxbSI05GZvQIA= +github.com/unifi-poller/influxunifi v0.0.10-0.20200630103608-fb25b5bc3fa7/go.mod h1:qbHllpoCWUfhk+WDvPluqn9k+czl4x16TefjdaCcmTc= github.com/unifi-poller/inputunifi v0.0.8-0.20200626052630-dabd0510075e h1:gJyoFh49X/9Q8DxsFe2H48DjfZ46/Aw/GBxl7izKDEo= github.com/unifi-poller/inputunifi v0.0.8-0.20200626052630-dabd0510075e/go.mod h1:nFr8uB4zJtCLiQvYPypGK3aWfQ9y4cC4iIeS9PyecrU= github.com/unifi-poller/inputunifi v0.0.8-0.20200628114724-8b60ff573a49 h1:ce5cXC4eWs5TfrjvlN8ZEemKcnv7KfbUbzXDr2fHnso= @@ -122,6 +126,8 @@ github.com/unifi-poller/inputunifi v0.0.8-0.20200629073944-889691ff1096 h1:0e66n github.com/unifi-poller/inputunifi v0.0.8-0.20200629073944-889691ff1096/go.mod h1:iJT8Y3KwSV/ceqOikamlhw2c0EMHTFv47TxKKFThx8I= github.com/unifi-poller/inputunifi v0.0.8-0.20200629074959-35d6603f1831 h1:fBPfSPtGCmpv5BMwk+oorS672fd7L8vFbX/DTOC+2C4= github.com/unifi-poller/inputunifi v0.0.8-0.20200629074959-35d6603f1831/go.mod h1:iJT8Y3KwSV/ceqOikamlhw2c0EMHTFv47TxKKFThx8I= +github.com/unifi-poller/inputunifi v0.0.8-0.20200630101705-1f36fb078fcb h1:pMNmEeAaMpNvO1V96icOHqkVjbnwUJ1asCuoKIMdgac= +github.com/unifi-poller/inputunifi v0.0.8-0.20200630101705-1f36fb078fcb/go.mod h1:iJT8Y3KwSV/ceqOikamlhw2c0EMHTFv47TxKKFThx8I= github.com/unifi-poller/lokiunifi v0.0.0-20200626040346-12af563d2a99/go.mod h1:7+uUJT6nnXVPad/Omsj+lPD80Cshg4L8TPUkV72JNM8= github.com/unifi-poller/lokiunifi v0.0.0-20200626052645-b0336442237e h1:MoyVcBNks+p1tYCu67UyQycyHpeCqzafWpjMir/Mjh8= github.com/unifi-poller/lokiunifi v0.0.0-20200626052645-b0336442237e/go.mod h1:7+uUJT6nnXVPad/Omsj+lPD80Cshg4L8TPUkV72JNM8= @@ -150,6 +156,8 @@ github.com/unifi-poller/promunifi v0.0.9-0.20200628124811-17c74bc966ba h1:JkCbMK github.com/unifi-poller/promunifi v0.0.9-0.20200628124811-17c74bc966ba/go.mod h1:ibeILb7ndzfT+vzucBRCTCLv19TaKOcds8sKGv2ZwGA= github.com/unifi-poller/promunifi v0.0.9-0.20200628212620-13ccb1ce3beb h1:G8j4APUkcuogff5ihjeemJqeI7Hcwk3s598xbF63n9w= github.com/unifi-poller/promunifi v0.0.9-0.20200628212620-13ccb1ce3beb/go.mod h1:hq4eItu10nOutQ0q/BRf1Mn/IvfRP+n0DlWsYPBlbm4= +github.com/unifi-poller/promunifi v0.0.9-0.20200630103619-c2b0b27aa0c7 h1:0s8Z4xKUjGeT3qZ4/SyyzgK0KodYPxLx3zooe45+nGY= +github.com/unifi-poller/promunifi v0.0.9-0.20200630103619-c2b0b27aa0c7/go.mod h1:hq4eItu10nOutQ0q/BRf1Mn/IvfRP+n0DlWsYPBlbm4= github.com/unifi-poller/unifi v0.0.5-0.20200620103801-b927287ea1cd/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= github.com/unifi-poller/unifi v0.0.6-0.20200625090439-421046871a37 h1:T2y8JWkjZd1vz2ZKu4vmmAk9s6PUwupuTldwhfww5xY= github.com/unifi-poller/unifi v0.0.6-0.20200625090439-421046871a37/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= @@ -176,6 +184,8 @@ github.com/unifi-poller/webserver v0.0.0-20200629073701-8b95a5ac3e49 h1:8qVHNZg2 github.com/unifi-poller/webserver v0.0.0-20200629073701-8b95a5ac3e49/go.mod h1:08IX30eb93+VbhiFqgMBXQD52+djPwivBcx5C8fH92M= github.com/unifi-poller/webserver v0.0.0-20200630053536-1a5a6430daf4 h1:0II3Z/THLBBx8TCEYQkSlwn1KFLbGVe/OS/uNENvaS4= github.com/unifi-poller/webserver v0.0.0-20200630053536-1a5a6430daf4/go.mod h1:08IX30eb93+VbhiFqgMBXQD52+djPwivBcx5C8fH92M= +github.com/unifi-poller/webserver v0.0.0-20200630103554-031c750c37a3 h1:LCmfjv9C8vnq59rxxBxqdqSCYkwN2USfntprQQ9BABg= +github.com/unifi-poller/webserver v0.0.0-20200630103554-031c750c37a3/go.mod h1:08IX30eb93+VbhiFqgMBXQD52+djPwivBcx5C8fH92M= 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/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= From 7ed41de81d430b1cec40c5c699d5a273eb29571b Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Tue, 30 Jun 2020 04:00:18 -0700 Subject: [PATCH 28/39] make json easier --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index b57da512..8289b22d 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/unifi-poller/influxunifi v0.0.10-0.20200630103608-fb25b5bc3fa7 - github.com/unifi-poller/inputunifi v0.0.8-0.20200630101705-1f36fb078fcb + github.com/unifi-poller/inputunifi v0.0.8-0.20200630105934-93e63a1b6752 github.com/unifi-poller/lokiunifi v0.0.0-20200628212531-964d320957e4 github.com/unifi-poller/poller v0.0.8-0.20200628131550-26430cac16c1 github.com/unifi-poller/promunifi v0.0.9-0.20200630103619-c2b0b27aa0c7 From 1e0437c20b57c304307ef01d0ee0d135ffdd4422 Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Fri, 3 Jul 2020 02:48:27 -0700 Subject: [PATCH 29/39] fix race/crash --- go.mod | 2 +- go.sum | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 8289b22d..98a54267 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/russross/blackfriday v2.0.0+incompatible // indirect github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/unifi-poller/influxunifi v0.0.10-0.20200630103608-fb25b5bc3fa7 + github.com/unifi-poller/influxunifi v0.0.10-0.20200703094640-5683cb4d44fb github.com/unifi-poller/inputunifi v0.0.8-0.20200630105934-93e63a1b6752 github.com/unifi-poller/lokiunifi v0.0.0-20200628212531-964d320957e4 github.com/unifi-poller/poller v0.0.8-0.20200628131550-26430cac16c1 diff --git a/go.sum b/go.sum index ce78c8e0..472c79bd 100644 --- a/go.sum +++ b/go.sum @@ -116,6 +116,8 @@ github.com/unifi-poller/influxunifi v0.0.10-0.20200630101653-6c02bd48f4d4 h1:FGp github.com/unifi-poller/influxunifi v0.0.10-0.20200630101653-6c02bd48f4d4/go.mod h1:qbHllpoCWUfhk+WDvPluqn9k+czl4x16TefjdaCcmTc= github.com/unifi-poller/influxunifi v0.0.10-0.20200630103608-fb25b5bc3fa7 h1:UZ18xCI8bCSBhmeUFYJb78vwAjf8htsxbSI05GZvQIA= github.com/unifi-poller/influxunifi v0.0.10-0.20200630103608-fb25b5bc3fa7/go.mod h1:qbHllpoCWUfhk+WDvPluqn9k+czl4x16TefjdaCcmTc= +github.com/unifi-poller/influxunifi v0.0.10-0.20200703094640-5683cb4d44fb h1:lD5W/5JXoU+B6ZHueZMzSWSNlzeIwIYtEYG9LInUi/E= +github.com/unifi-poller/influxunifi v0.0.10-0.20200703094640-5683cb4d44fb/go.mod h1:qbHllpoCWUfhk+WDvPluqn9k+czl4x16TefjdaCcmTc= github.com/unifi-poller/inputunifi v0.0.8-0.20200626052630-dabd0510075e h1:gJyoFh49X/9Q8DxsFe2H48DjfZ46/Aw/GBxl7izKDEo= github.com/unifi-poller/inputunifi v0.0.8-0.20200626052630-dabd0510075e/go.mod h1:nFr8uB4zJtCLiQvYPypGK3aWfQ9y4cC4iIeS9PyecrU= github.com/unifi-poller/inputunifi v0.0.8-0.20200628114724-8b60ff573a49 h1:ce5cXC4eWs5TfrjvlN8ZEemKcnv7KfbUbzXDr2fHnso= @@ -128,6 +130,8 @@ github.com/unifi-poller/inputunifi v0.0.8-0.20200629074959-35d6603f1831 h1:fBPfS github.com/unifi-poller/inputunifi v0.0.8-0.20200629074959-35d6603f1831/go.mod h1:iJT8Y3KwSV/ceqOikamlhw2c0EMHTFv47TxKKFThx8I= github.com/unifi-poller/inputunifi v0.0.8-0.20200630101705-1f36fb078fcb h1:pMNmEeAaMpNvO1V96icOHqkVjbnwUJ1asCuoKIMdgac= github.com/unifi-poller/inputunifi v0.0.8-0.20200630101705-1f36fb078fcb/go.mod h1:iJT8Y3KwSV/ceqOikamlhw2c0EMHTFv47TxKKFThx8I= +github.com/unifi-poller/inputunifi v0.0.8-0.20200630105934-93e63a1b6752 h1:CPPu1EyUmRRNZHTIfYu9MiKABOBdOf7JgqjL8KF62pg= +github.com/unifi-poller/inputunifi v0.0.8-0.20200630105934-93e63a1b6752/go.mod h1:iJT8Y3KwSV/ceqOikamlhw2c0EMHTFv47TxKKFThx8I= github.com/unifi-poller/lokiunifi v0.0.0-20200626040346-12af563d2a99/go.mod h1:7+uUJT6nnXVPad/Omsj+lPD80Cshg4L8TPUkV72JNM8= github.com/unifi-poller/lokiunifi v0.0.0-20200626052645-b0336442237e h1:MoyVcBNks+p1tYCu67UyQycyHpeCqzafWpjMir/Mjh8= github.com/unifi-poller/lokiunifi v0.0.0-20200626052645-b0336442237e/go.mod h1:7+uUJT6nnXVPad/Omsj+lPD80Cshg4L8TPUkV72JNM8= From e655a425f3386b4e94661e5225d9e95598dcad27 Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Sat, 4 Jul 2020 00:43:02 -0700 Subject: [PATCH 30/39] web server updates --- go.mod | 4 ++-- go.sum | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 98a54267..90dae048 100644 --- a/go.mod +++ b/go.mod @@ -15,12 +15,12 @@ require ( github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/unifi-poller/influxunifi v0.0.10-0.20200703094640-5683cb4d44fb - github.com/unifi-poller/inputunifi v0.0.8-0.20200630105934-93e63a1b6752 + github.com/unifi-poller/inputunifi v0.0.8-0.20200704070012-feea252994f2 github.com/unifi-poller/lokiunifi v0.0.0-20200628212531-964d320957e4 github.com/unifi-poller/poller v0.0.8-0.20200628131550-26430cac16c1 github.com/unifi-poller/promunifi v0.0.9-0.20200630103619-c2b0b27aa0c7 github.com/unifi-poller/unifi v0.0.6-0.20200628213309-a22ea217874f - github.com/unifi-poller/webserver v0.0.0-20200630103554-031c750c37a3 + github.com/unifi-poller/webserver v0.0.0-20200704065911-79e4fe954ce1 golang.org/x/net v0.0.0-20200625001655-4c5254603344 // indirect golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae // indirect golift.io/cnfg v0.0.5 // indirect diff --git a/go.sum b/go.sum index 472c79bd..5ec11f24 100644 --- a/go.sum +++ b/go.sum @@ -132,6 +132,8 @@ github.com/unifi-poller/inputunifi v0.0.8-0.20200630101705-1f36fb078fcb h1:pMNmE github.com/unifi-poller/inputunifi v0.0.8-0.20200630101705-1f36fb078fcb/go.mod h1:iJT8Y3KwSV/ceqOikamlhw2c0EMHTFv47TxKKFThx8I= github.com/unifi-poller/inputunifi v0.0.8-0.20200630105934-93e63a1b6752 h1:CPPu1EyUmRRNZHTIfYu9MiKABOBdOf7JgqjL8KF62pg= github.com/unifi-poller/inputunifi v0.0.8-0.20200630105934-93e63a1b6752/go.mod h1:iJT8Y3KwSV/ceqOikamlhw2c0EMHTFv47TxKKFThx8I= +github.com/unifi-poller/inputunifi v0.0.8-0.20200704070012-feea252994f2 h1:mhjgdc2uAm4941rOxuHGalXf4Gm7VlkfPUextl1+Vfo= +github.com/unifi-poller/inputunifi v0.0.8-0.20200704070012-feea252994f2/go.mod h1:06CBPG9YAXgiGHhIk938uquEc3PQu5ysx8O2X1fFwSM= github.com/unifi-poller/lokiunifi v0.0.0-20200626040346-12af563d2a99/go.mod h1:7+uUJT6nnXVPad/Omsj+lPD80Cshg4L8TPUkV72JNM8= github.com/unifi-poller/lokiunifi v0.0.0-20200626052645-b0336442237e h1:MoyVcBNks+p1tYCu67UyQycyHpeCqzafWpjMir/Mjh8= github.com/unifi-poller/lokiunifi v0.0.0-20200626052645-b0336442237e/go.mod h1:7+uUJT6nnXVPad/Omsj+lPD80Cshg4L8TPUkV72JNM8= @@ -190,6 +192,8 @@ github.com/unifi-poller/webserver v0.0.0-20200630053536-1a5a6430daf4 h1:0II3Z/TH github.com/unifi-poller/webserver v0.0.0-20200630053536-1a5a6430daf4/go.mod h1:08IX30eb93+VbhiFqgMBXQD52+djPwivBcx5C8fH92M= github.com/unifi-poller/webserver v0.0.0-20200630103554-031c750c37a3 h1:LCmfjv9C8vnq59rxxBxqdqSCYkwN2USfntprQQ9BABg= github.com/unifi-poller/webserver v0.0.0-20200630103554-031c750c37a3/go.mod h1:08IX30eb93+VbhiFqgMBXQD52+djPwivBcx5C8fH92M= +github.com/unifi-poller/webserver v0.0.0-20200704065911-79e4fe954ce1 h1:xjUOu//OP3dOc1X0K9d86WCoG4ezlrMWoeJOTHxECk0= +github.com/unifi-poller/webserver v0.0.0-20200704065911-79e4fe954ce1/go.mod h1:08IX30eb93+VbhiFqgMBXQD52+djPwivBcx5C8fH92M= 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/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= From 8abf82114ce05fe96150e72e04411520fa2bb66e Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Sun, 5 Jul 2020 03:06:50 -0700 Subject: [PATCH 31/39] update config --- examples/up.conf.example | 149 ++++++++++++++++++++------------------- go.mod | 2 +- go.sum | 2 + 3 files changed, 81 insertions(+), 72 deletions(-) diff --git a/examples/up.conf.example b/examples/up.conf.example index 06c5b59d..ca161c6b 100644 --- a/examples/up.conf.example +++ b/examples/up.conf.example @@ -43,33 +43,36 @@ # If you're getting zeros now, set this to "1m" interval = "30s" -# To enable output of UniFi Events to Loki, add a URL. +# To enable output of UniFi Events to Loki, add a URL; it's disabled otherwise. # User, pass and tenant_id are optional and most folks wont set them. # Pick which logs you want per-controller in the [unifi.controller] section. # This is a new feature. Feedback welcome! [loki] url = "" - # The rest of this is advanced & optional. - user = "" - pass = "" + # The rest of this is advanced & optional. See wiki. + user = "" + pass = "" verify_ssl = false - tenant_id = "" - interval = "2m" - timeout = "10s" + tenant_id = "" + interval = "2m" + timeout = "10s" # Poller has an optional web server. To turn it on, set enable to true. If you # wish to use SSL, provide SSL cert and key paths. This interface is currently # read-only; it just displays information, like logs, devices and clients. -# Notice: Enabling the web server with many clients will increase memory usage. +# Notice: Enabling the web server with many sites will increase memory usage. # This is a new feature. Feedback welcome! [webserver] enable = false - port = 37288 + port = 37288 # The HTML path is different on Windows and BSD/macOS. - html_path = "/usr/lib/unifi-poller/web" + html_path = "/usr/lib/unifi-poller/web" ssl_cert_path = "" - ssl_key_path = "" - # How many events per source to hold. 200-2000. Use fewer with many clients. + ssl_key_path = "" + # How many events per event group to hold. 200-2000. Use fewer with many sites. + # With 1 site, you'll have a max total of 9 event groups; 1 per plugin, 4 per site. + # Each site adds 1 event group for each of these inputs that is enabled: + # save_ids, save_events, save_anomalies, save_alarms. max_events = 200 # By default the web interface does not require authentication. You can change @@ -94,75 +97,25 @@ # provide one and dynamic is disabled. In other words, you can just add your # controller here and delete the following section. The internal defaults are # shown below. Any missing values will assume these displayed defaults. + [unifi.defaults] - url = "https://127.0.0.1:8443" - user = "unifipoller" - pass = "unifipoller" - sites = ["all"] - save_ids = false - save_events = false - save_alarms = false - save_anomalies = false - save_dpi = false - save_sites = true - hash_pii = false - verify_ssl = false - -# The following is optional and used for configurations with multiple controllers. - -# You may repeat the following section to poll multiple controllers. -# Any omitted variables will have their values taken from the defaults, above. -#[[unifi.controller]] # URL for the UniFi Controller. Do not add any paths after the host:port. - # Do not use port 8443 if you have a UDM. - #url = "https://127.0.0.1:8443" + # Do not use port 8443 if you have a UDM; just use "https://ip". + url = "https://127.0.0.1:8443" # Make a read-only user in the UniFi Admin Settings, allow it access to all sites. - #user = "unifipoller" + user = "unifipoller" + # Password for UniFi controller user (above). # If the password provided here begins with file:// then the password is read in from # the file path that follows the file:// prefix. ex: file:///etc/unifi/password.file # ex: file:///etc/unifi/passwd.file - #pass = "unifipoller" + pass = "unifipoller" # If the controller has more than one site, specify which sites to poll here. # Set this to ["default"] to poll only the first site on the controller. # A setting of ["all"] will poll all sites; this works if you only have 1 site too. - #sites = ["all"] - - # Enable collection of Intrusion Detection System Data (InfluxDB/Loki only). - # Only useful if IDS or IPS are enabled on one of the sites. This may store - # a lot of information. Only recommended for testing and debugging. There - # may not be any dashboards to display this data. It can be used for annotations. - # Enable this only if using InfluxDB or Loki. This will leak PII data! - #save_ids = false - - # Enable collection of UniFi Events (InfluxDB/Loki only). - # This may store a lot of information. Only recommended for testing and debugging. - # There are no dashboards to display this data. It can be used for annotations. - # This is a new (June, 2020) feature. Please provide feedback if you try it out! - # Enable this only if using InfluxDB or Loki. This will leak PII data! - #save_events = false - - # Enable collection of UniFi Alarms (InfluxDB/Loki only). - # There are no dashboards to display this data. It can be used for annotations. - # This is a new (June, 2020) feature. Please provide feedback if you try it out! - # Enable this only if using InfluxDB or Loki. This will leak PII data! - #save_alarms = false - - # Enable collection of UniFi Anomalies (InfluxDB/Loki only). - # There are no dashboards to display this data. It can be used for annotations. - # This is a new (June, 2020) feature. Please provide feedback if you try it out! - # Enable this only if using InfluxDB or Loki. - #save_anomalies = false - - # Enable collection of Deep Packet Inspection data. This data breaks down traffic - # types for each client and site, it powers a dedicated DPI dashboard. - # Enabling this adds roughly 150 data points per client. That's 6000 metrics for - # 40 clients. This adds a little bit of poller run time per interval and causes - # more API requests to your controller(s). Don't let these "cons" sway you: - # it's cool data. Please provide feedback on your experience with this feature. - #save_dpi = false + sites = ["all"] # Enable collection of site data. This data powers the Network Sites dashboard. # It's not valuable to everyone and setting this to false will save resources. @@ -170,9 +123,63 @@ # Hash, with md5, client names and MAC addresses. This attempts to protect # personally identifiable information. Most users won't want to enable this. - #hash_pii = false + hash_pii = false + + # Enable collection of Intrusion Detection System Data (InfluxDB/Loki only). + # Only useful if IDS or IPS are enabled on one of the sites. This may store + # a lot of information. Only recommended for testing and debugging. There + # may not be any dashboards to display this data. It can be used for annotations. + # Enable this only if using InfluxDB or Loki. This will leak PII data! + save_ids = false + + # Enable collection of UniFi Events (InfluxDB/Loki only). + # This may store a lot of information. Only recommended for testing and debugging. + # There are no dashboards to display this data. It can be used for annotations. + # This is a new (June, 2020) feature. Please provide feedback if you try it out! + # Enable this only if using InfluxDB or Loki. This will leak PII data! + save_events = false + + # Enable collection of UniFi Alarms (InfluxDB/Loki only). + # There are no dashboards to display this data. It can be used for annotations. + # This is a new (June, 2020) feature. Please provide feedback if you try it out! + # Enable this only if using InfluxDB or Loki. This will leak PII data! + save_alarms = false + + # Enable collection of UniFi Anomalies (InfluxDB/Loki only). + # There are no dashboards to display this data. It can be used for annotations. + # This is a new (June, 2020) feature. Please provide feedback if you try it out! + # Enable this only if using InfluxDB or Loki. + save_anomalies = false + + # Enable collection of Deep Packet Inspection data. This data breaks down traffic + # types for each client and site, it powers a dedicated DPI dashboard. + # Enabling this adds roughly 150 data points per client. That's 6000 metrics for + # 40 clients. This adds a little bit of poller run time per interval and causes + # more API requests to your controller(s). Don't let these "cons" sway you: + # it's cool data. Please provide feedback on your experience with this feature. + save_dpi = false # If your UniFi controller has a valid SSL certificate (like lets encrypt), # you can enable this option to validate it. Otherwise, any SSL certificate is # valid. If you don't know if you have a valid SSL cert, then you don't have one. - #verify_ssl = false + verify_ssl = false + +# The following is optional and used for configurations with multiple UniFi controllers. + +# You may repeat the following [[unifi.controller]] section as many times as needed to +# poll multiple controllers. Uncomment the entire section including [[unifi.controller]]. +# Omitted variables will have their values taken from the defaults, above. +# +#[[unifi.controller]] +# url = "https://127.0.0.1:8443" +# user = "unifipoller" +# pass = "unifipoller" +# sites = ["all"] +# save_sites = true +# hash_pii = false +# save_ids = false +# save_events = false +# save_alarms = false +# save_anomalies = false +# save_dpi = false +# verify_ssl = false diff --git a/go.mod b/go.mod index 90dae048..1e6d5d41 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/unifi-poller/influxunifi v0.0.10-0.20200703094640-5683cb4d44fb - github.com/unifi-poller/inputunifi v0.0.8-0.20200704070012-feea252994f2 + github.com/unifi-poller/inputunifi v0.0.8-0.20200705100128-2a4815b03dfe github.com/unifi-poller/lokiunifi v0.0.0-20200628212531-964d320957e4 github.com/unifi-poller/poller v0.0.8-0.20200628131550-26430cac16c1 github.com/unifi-poller/promunifi v0.0.9-0.20200630103619-c2b0b27aa0c7 diff --git a/go.sum b/go.sum index 5ec11f24..4f23e96f 100644 --- a/go.sum +++ b/go.sum @@ -134,6 +134,8 @@ github.com/unifi-poller/inputunifi v0.0.8-0.20200630105934-93e63a1b6752 h1:CPPu1 github.com/unifi-poller/inputunifi v0.0.8-0.20200630105934-93e63a1b6752/go.mod h1:iJT8Y3KwSV/ceqOikamlhw2c0EMHTFv47TxKKFThx8I= github.com/unifi-poller/inputunifi v0.0.8-0.20200704070012-feea252994f2 h1:mhjgdc2uAm4941rOxuHGalXf4Gm7VlkfPUextl1+Vfo= github.com/unifi-poller/inputunifi v0.0.8-0.20200704070012-feea252994f2/go.mod h1:06CBPG9YAXgiGHhIk938uquEc3PQu5ysx8O2X1fFwSM= +github.com/unifi-poller/inputunifi v0.0.8-0.20200705100128-2a4815b03dfe h1:nImldZZrNb6WEmglam2IzTppmEKpsDn8Dm4LDxkV0D8= +github.com/unifi-poller/inputunifi v0.0.8-0.20200705100128-2a4815b03dfe/go.mod h1:06CBPG9YAXgiGHhIk938uquEc3PQu5ysx8O2X1fFwSM= github.com/unifi-poller/lokiunifi v0.0.0-20200626040346-12af563d2a99/go.mod h1:7+uUJT6nnXVPad/Omsj+lPD80Cshg4L8TPUkV72JNM8= github.com/unifi-poller/lokiunifi v0.0.0-20200626052645-b0336442237e h1:MoyVcBNks+p1tYCu67UyQycyHpeCqzafWpjMir/Mjh8= github.com/unifi-poller/lokiunifi v0.0.0-20200626052645-b0336442237e/go.mod h1:7+uUJT6nnXVPad/Omsj+lPD80Cshg4L8TPUkV72JNM8= From e0a9fe09b105929ce6af874c6a5b7301d95edf3c Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Mon, 6 Jul 2020 00:45:47 -0700 Subject: [PATCH 32/39] play with webserver data --- go.mod | 4 ++-- go.sum | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 1e6d5d41..268a58ce 100644 --- a/go.mod +++ b/go.mod @@ -15,12 +15,12 @@ require ( github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/unifi-poller/influxunifi v0.0.10-0.20200703094640-5683cb4d44fb - github.com/unifi-poller/inputunifi v0.0.8-0.20200705100128-2a4815b03dfe + github.com/unifi-poller/inputunifi v0.0.8-0.20200706074253-c9b60d7a4386 github.com/unifi-poller/lokiunifi v0.0.0-20200628212531-964d320957e4 github.com/unifi-poller/poller v0.0.8-0.20200628131550-26430cac16c1 github.com/unifi-poller/promunifi v0.0.9-0.20200630103619-c2b0b27aa0c7 github.com/unifi-poller/unifi v0.0.6-0.20200628213309-a22ea217874f - github.com/unifi-poller/webserver v0.0.0-20200704065911-79e4fe954ce1 + github.com/unifi-poller/webserver v0.0.0-20200706074454-a16e32b70121 golang.org/x/net v0.0.0-20200625001655-4c5254603344 // indirect golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae // indirect golift.io/cnfg v0.0.5 // indirect diff --git a/go.sum b/go.sum index 4f23e96f..c5ac6d3e 100644 --- a/go.sum +++ b/go.sum @@ -136,6 +136,8 @@ github.com/unifi-poller/inputunifi v0.0.8-0.20200704070012-feea252994f2 h1:mhjgd github.com/unifi-poller/inputunifi v0.0.8-0.20200704070012-feea252994f2/go.mod h1:06CBPG9YAXgiGHhIk938uquEc3PQu5ysx8O2X1fFwSM= github.com/unifi-poller/inputunifi v0.0.8-0.20200705100128-2a4815b03dfe h1:nImldZZrNb6WEmglam2IzTppmEKpsDn8Dm4LDxkV0D8= github.com/unifi-poller/inputunifi v0.0.8-0.20200705100128-2a4815b03dfe/go.mod h1:06CBPG9YAXgiGHhIk938uquEc3PQu5ysx8O2X1fFwSM= +github.com/unifi-poller/inputunifi v0.0.8-0.20200706074253-c9b60d7a4386 h1:NTC5ejGxV8zJQPiXC4JcIVwOlccWJFstKThmhvyolPU= +github.com/unifi-poller/inputunifi v0.0.8-0.20200706074253-c9b60d7a4386/go.mod h1:06CBPG9YAXgiGHhIk938uquEc3PQu5ysx8O2X1fFwSM= github.com/unifi-poller/lokiunifi v0.0.0-20200626040346-12af563d2a99/go.mod h1:7+uUJT6nnXVPad/Omsj+lPD80Cshg4L8TPUkV72JNM8= github.com/unifi-poller/lokiunifi v0.0.0-20200626052645-b0336442237e h1:MoyVcBNks+p1tYCu67UyQycyHpeCqzafWpjMir/Mjh8= github.com/unifi-poller/lokiunifi v0.0.0-20200626052645-b0336442237e/go.mod h1:7+uUJT6nnXVPad/Omsj+lPD80Cshg4L8TPUkV72JNM8= @@ -196,6 +198,8 @@ github.com/unifi-poller/webserver v0.0.0-20200630103554-031c750c37a3 h1:LCmfjv9C github.com/unifi-poller/webserver v0.0.0-20200630103554-031c750c37a3/go.mod h1:08IX30eb93+VbhiFqgMBXQD52+djPwivBcx5C8fH92M= github.com/unifi-poller/webserver v0.0.0-20200704065911-79e4fe954ce1 h1:xjUOu//OP3dOc1X0K9d86WCoG4ezlrMWoeJOTHxECk0= github.com/unifi-poller/webserver v0.0.0-20200704065911-79e4fe954ce1/go.mod h1:08IX30eb93+VbhiFqgMBXQD52+djPwivBcx5C8fH92M= +github.com/unifi-poller/webserver v0.0.0-20200706074454-a16e32b70121 h1:eK1wHVCUHcH9I8YzeWaiuS8kYgCqn1wXnyMmNH0g27A= +github.com/unifi-poller/webserver v0.0.0-20200706074454-a16e32b70121/go.mod h1:08IX30eb93+VbhiFqgMBXQD52+djPwivBcx5C8fH92M= 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/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= From 7e37bb5d6e28ad743a51bc6dae097f94c8d64ae2 Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Mon, 6 Jul 2020 02:39:38 -0700 Subject: [PATCH 33/39] minor updates --- README.md | 7 +++++-- examples/up.conf.example | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 04d7787e..cc8b9b35 100644 --- a/README.md +++ b/README.md @@ -36,8 +36,7 @@ you may use to get additional help. device configuration. This controller can be installed on Windows, macOS, FreeBSD, Linux or Docker. Ubiquiti also provides a dedicated hardware device called a [CloudKey](https://www.ui.com/unifi/unifi-cloud-key/) that runs the controller software. -More recently they've developed the Dream Machine; it's still in -beta / early access, but UniFi Poller can collect its data! +More recently they've developed the Dream Machine, and UniFi Poller can collect its data! UniFi Poller is a small Golang application that runs on Windows, macOS, FreeBSD, Linux or Docker. In Influx-mode it polls a UniFi controller every 30 seconds for @@ -53,6 +52,10 @@ a UniFi controller, there's no excuse not to install You'll have a plethora of data at your fingertips and the ability to craft custom graphs to slice the data any way you choose. Good luck! +Supported as of Poller v2.0.2, are [Loki](https://grafana.com/oss/loki/) +and the collection of UniFi events, alarms, anomalies and IDS data. +This data can be exported to Loki or InfluxDB, or both! + ## Backstory I found a simple piece of code on GitHub that sorta did what I needed; diff --git a/examples/up.conf.example b/examples/up.conf.example index ca161c6b..cb924290 100644 --- a/examples/up.conf.example +++ b/examples/up.conf.example @@ -77,7 +77,7 @@ # By default the web interface does not require authentication. You can change # that by adding a username and password hash (or multiple) below. -# To create a hash, run unifi-poller with the -e CLI argument. +# To create a hash, run unifi-poller with the -e CLI argument. See Wiki for more! [webserver.accounts] # username = "password-hash" # captain = "$2a$04$mxw6i0LKH6u46oaLK2cq5eCTAAFkfNiRpzNbz.EyvJZZWNa2FzIlS" From 1147693386ca28284fce4492f094a13d766f2cfa Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Tue, 7 Jul 2020 02:39:30 -0700 Subject: [PATCH 34/39] update api --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 268a58ce..527920a2 100644 --- a/go.mod +++ b/go.mod @@ -20,7 +20,7 @@ require ( github.com/unifi-poller/poller v0.0.8-0.20200628131550-26430cac16c1 github.com/unifi-poller/promunifi v0.0.9-0.20200630103619-c2b0b27aa0c7 github.com/unifi-poller/unifi v0.0.6-0.20200628213309-a22ea217874f - github.com/unifi-poller/webserver v0.0.0-20200706074454-a16e32b70121 + github.com/unifi-poller/webserver v0.0.0-20200707093910-adce7be3b1df golang.org/x/net v0.0.0-20200625001655-4c5254603344 // indirect golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae // indirect golift.io/cnfg v0.0.5 // indirect diff --git a/go.sum b/go.sum index c5ac6d3e..10035c83 100644 --- a/go.sum +++ b/go.sum @@ -200,6 +200,8 @@ github.com/unifi-poller/webserver v0.0.0-20200704065911-79e4fe954ce1 h1:xjUOu//O github.com/unifi-poller/webserver v0.0.0-20200704065911-79e4fe954ce1/go.mod h1:08IX30eb93+VbhiFqgMBXQD52+djPwivBcx5C8fH92M= github.com/unifi-poller/webserver v0.0.0-20200706074454-a16e32b70121 h1:eK1wHVCUHcH9I8YzeWaiuS8kYgCqn1wXnyMmNH0g27A= github.com/unifi-poller/webserver v0.0.0-20200706074454-a16e32b70121/go.mod h1:08IX30eb93+VbhiFqgMBXQD52+djPwivBcx5C8fH92M= +github.com/unifi-poller/webserver v0.0.0-20200707093910-adce7be3b1df h1:Opjv4SYuP595d0kb7tKzrX2aHH2EFrFER3Uu9cS7Frk= +github.com/unifi-poller/webserver v0.0.0-20200707093910-adce7be3b1df/go.mod h1:08IX30eb93+VbhiFqgMBXQD52+djPwivBcx5C8fH92M= 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/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= From cddf2942b04f17d704dfb50f217708af23453aad Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Sun, 19 Jul 2020 00:10:36 -0700 Subject: [PATCH 35/39] re-arrangement --- go.mod | 11 +++++------ go.sum | 23 +++++++++++++++++++++++ main.go | 3 +-- 3 files changed, 29 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 527920a2..9be3dbdf 100644 --- a/go.mod +++ b/go.mod @@ -14,13 +14,12 @@ require ( github.com/russross/blackfriday v2.0.0+incompatible // indirect github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/unifi-poller/influxunifi v0.0.10-0.20200703094640-5683cb4d44fb - github.com/unifi-poller/inputunifi v0.0.8-0.20200706074253-c9b60d7a4386 - github.com/unifi-poller/lokiunifi v0.0.0-20200628212531-964d320957e4 - github.com/unifi-poller/poller v0.0.8-0.20200628131550-26430cac16c1 - github.com/unifi-poller/promunifi v0.0.9-0.20200630103619-c2b0b27aa0c7 + github.com/unifi-poller/influxunifi v0.0.10-0.20200719070803-1fb36a5a9829 + github.com/unifi-poller/inputunifi v0.0.8-0.20200719070501-75a24241ef36 + github.com/unifi-poller/lokiunifi v0.0.0-20200719070442-d6d2338713d6 + github.com/unifi-poller/poller v0.0.8-0.20200719070110-8d67d8eb73d5 + github.com/unifi-poller/promunifi v0.0.9-0.20200719070533-e4b440d85f53 github.com/unifi-poller/unifi v0.0.6-0.20200628213309-a22ea217874f - github.com/unifi-poller/webserver v0.0.0-20200707093910-adce7be3b1df golang.org/x/net v0.0.0-20200625001655-4c5254603344 // indirect golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae // indirect golift.io/cnfg v0.0.5 // indirect diff --git a/go.sum b/go.sum index 10035c83..8765460d 100644 --- a/go.sum +++ b/go.sum @@ -118,6 +118,10 @@ github.com/unifi-poller/influxunifi v0.0.10-0.20200630103608-fb25b5bc3fa7 h1:UZ1 github.com/unifi-poller/influxunifi v0.0.10-0.20200630103608-fb25b5bc3fa7/go.mod h1:qbHllpoCWUfhk+WDvPluqn9k+czl4x16TefjdaCcmTc= github.com/unifi-poller/influxunifi v0.0.10-0.20200703094640-5683cb4d44fb h1:lD5W/5JXoU+B6ZHueZMzSWSNlzeIwIYtEYG9LInUi/E= github.com/unifi-poller/influxunifi v0.0.10-0.20200703094640-5683cb4d44fb/go.mod h1:qbHllpoCWUfhk+WDvPluqn9k+czl4x16TefjdaCcmTc= +github.com/unifi-poller/influxunifi v0.0.10-0.20200707102535-eac44b814550 h1:a8oJkKF/3EsIhgvhMvST0kPhW6PH7eqcpgjj2UQUyp8= +github.com/unifi-poller/influxunifi v0.0.10-0.20200707102535-eac44b814550/go.mod h1:WqlfO21XwKf/axW2RclNpXYMOcYCtazhJMwnGKyZvMw= +github.com/unifi-poller/influxunifi v0.0.10-0.20200719070803-1fb36a5a9829 h1:Rd8envlb8mzu5a/hC3pS0hyqcdkoyEGRiCQluEHDh3E= +github.com/unifi-poller/influxunifi v0.0.10-0.20200719070803-1fb36a5a9829/go.mod h1:sYwt5HAR+ZQizq98BTeIXjujd5Ua6rbUhWui76xgF1A= github.com/unifi-poller/inputunifi v0.0.8-0.20200626052630-dabd0510075e h1:gJyoFh49X/9Q8DxsFe2H48DjfZ46/Aw/GBxl7izKDEo= github.com/unifi-poller/inputunifi v0.0.8-0.20200626052630-dabd0510075e/go.mod h1:nFr8uB4zJtCLiQvYPypGK3aWfQ9y4cC4iIeS9PyecrU= github.com/unifi-poller/inputunifi v0.0.8-0.20200628114724-8b60ff573a49 h1:ce5cXC4eWs5TfrjvlN8ZEemKcnv7KfbUbzXDr2fHnso= @@ -138,6 +142,12 @@ github.com/unifi-poller/inputunifi v0.0.8-0.20200705100128-2a4815b03dfe h1:nImld github.com/unifi-poller/inputunifi v0.0.8-0.20200705100128-2a4815b03dfe/go.mod h1:06CBPG9YAXgiGHhIk938uquEc3PQu5ysx8O2X1fFwSM= github.com/unifi-poller/inputunifi v0.0.8-0.20200706074253-c9b60d7a4386 h1:NTC5ejGxV8zJQPiXC4JcIVwOlccWJFstKThmhvyolPU= github.com/unifi-poller/inputunifi v0.0.8-0.20200706074253-c9b60d7a4386/go.mod h1:06CBPG9YAXgiGHhIk938uquEc3PQu5ysx8O2X1fFwSM= +github.com/unifi-poller/inputunifi v0.0.8-0.20200707102527-ecb82ee5d9f6 h1:MyjVlGVaO5UhXbKeOyPMGGrHZzTuNqxBKLpblzkYvIw= +github.com/unifi-poller/inputunifi v0.0.8-0.20200707102527-ecb82ee5d9f6/go.mod h1:mag/wh3jcfGeYa1Xkc0RsnR/SzB9JqVOBfwb2+ouZc4= +github.com/unifi-poller/inputunifi v0.0.8-0.20200719070501-75a24241ef36 h1:BOP5EGT+5EoM3gfvwpBNF97fKoX7oTHzprRRRe6rXeI= +github.com/unifi-poller/inputunifi v0.0.8-0.20200719070501-75a24241ef36/go.mod h1:79iZjsCmupDPXq/ffNCauAyqBJxug/h2MGJLt0pTsmU= +github.com/unifi-poller/lokiunifi v0.0.0-20200623055806-bef9501a2240 h1:5TkGeJiY4IvsQ29LvvoJ45zDpaaGIigKveyuodSWhcY= +github.com/unifi-poller/lokiunifi v0.0.0-20200623055806-bef9501a2240/go.mod h1:F1xYSsn1D+sVgvVuL8FhjMj8GTFbbSTxxEi7Bg6DzG8= github.com/unifi-poller/lokiunifi v0.0.0-20200626040346-12af563d2a99/go.mod h1:7+uUJT6nnXVPad/Omsj+lPD80Cshg4L8TPUkV72JNM8= github.com/unifi-poller/lokiunifi v0.0.0-20200626052645-b0336442237e h1:MoyVcBNks+p1tYCu67UyQycyHpeCqzafWpjMir/Mjh8= github.com/unifi-poller/lokiunifi v0.0.0-20200626052645-b0336442237e/go.mod h1:7+uUJT6nnXVPad/Omsj+lPD80Cshg4L8TPUkV72JNM8= @@ -145,6 +155,10 @@ github.com/unifi-poller/lokiunifi v0.0.0-20200628124714-778a1a77f311 h1:WBuMSFL4 github.com/unifi-poller/lokiunifi v0.0.0-20200628124714-778a1a77f311/go.mod h1:vmXYivAPW6jBzKAwBYsBcNeuROxaar6gvlsoZ3RQZhs= github.com/unifi-poller/lokiunifi v0.0.0-20200628212531-964d320957e4 h1:FA4rcjM648oDMn/Q7dH8j4Sj7bdQV9LQS8K77YP3Ye8= github.com/unifi-poller/lokiunifi v0.0.0-20200628212531-964d320957e4/go.mod h1:dbV8ptSPzLrerEJxvPYhDk+HRn+GMYv1xaqgUOoretg= +github.com/unifi-poller/lokiunifi v0.0.0-20200707102508-fa1084a386c8 h1:6eSiVjtO9E6hGE30B0QQ8TuIb3+35BnQXlm52xPYqFg= +github.com/unifi-poller/lokiunifi v0.0.0-20200707102508-fa1084a386c8/go.mod h1:qaf/3nErsTc9XzOgp3vX6JmYxR0GbhRCBbpI9NcUnJA= +github.com/unifi-poller/lokiunifi v0.0.0-20200719070442-d6d2338713d6 h1:NQBxe9MwR8k12L3+FGbv8WpKV9RzqcB6F8jJAwGjN2o= +github.com/unifi-poller/lokiunifi v0.0.0-20200719070442-d6d2338713d6/go.mod h1:XxvXFCXKxeTG0UNpQPh6JQ5vmHuug6kAkXWxTsFBg04= github.com/unifi-poller/poller v0.0.8-0.20200621214016-5d1ed3324a46/go.mod h1:pJ/MeYaakLOOpbyc7s4zeZ92UzNK/rir5jkA7t5jIjo= github.com/unifi-poller/poller v0.0.8-0.20200622041812-dd79a3e3073e h1:pSkgIalhDdb1N0/9uTAVh7emolfFxjCxo68IXIsZzII= github.com/unifi-poller/poller v0.0.8-0.20200622041812-dd79a3e3073e/go.mod h1:pJ/MeYaakLOOpbyc7s4zeZ92UzNK/rir5jkA7t5jIjo= @@ -160,6 +174,10 @@ github.com/unifi-poller/poller v0.0.8-0.20200628130947-4a647d6555ef h1:iUI85Mx7e github.com/unifi-poller/poller v0.0.8-0.20200628130947-4a647d6555ef/go.mod h1:fObadG7weiVnSpFu8pFpGfo2bYYFc7hUMe770FovSc8= github.com/unifi-poller/poller v0.0.8-0.20200628131550-26430cac16c1 h1:SHKYtAu4yB5bVhMuRkoHr8Ss1Ffu5dKLJ13rGWufLFI= github.com/unifi-poller/poller v0.0.8-0.20200628131550-26430cac16c1/go.mod h1:fObadG7weiVnSpFu8pFpGfo2bYYFc7hUMe770FovSc8= +github.com/unifi-poller/poller v0.0.8-0.20200707102001-a78974b290b0 h1:PRhR0XJ+ajhYOnzRhIdgbjvbASteLA+NRTrvQUubJi4= +github.com/unifi-poller/poller v0.0.8-0.20200707102001-a78974b290b0/go.mod h1:MiuDGaMWDOAv2SqzqgV5P8t8KWzN00say/Cd5LbiFTI= +github.com/unifi-poller/poller v0.0.8-0.20200719070110-8d67d8eb73d5 h1:16SKHzP5jNBiMhiVxZwGwewSvdP2f5lUToT474roNn0= +github.com/unifi-poller/poller v0.0.8-0.20200719070110-8d67d8eb73d5/go.mod h1:MiuDGaMWDOAv2SqzqgV5P8t8KWzN00say/Cd5LbiFTI= github.com/unifi-poller/promunifi v0.0.9-0.20200623073250-24621ebb306a h1:7CmCHHFUrxzaGVMRINmplAosW8BNXlWIPm05LxCPClU= github.com/unifi-poller/promunifi v0.0.9-0.20200623073250-24621ebb306a/go.mod h1:mlvfj4DRFVx12ewi6BcT4XOG2bxC7sFasl08RlYih8Y= github.com/unifi-poller/promunifi v0.0.9-0.20200628124811-17c74bc966ba h1:JkCbMKjUORMImfKJ0uZFomVsPJjR8fUI+tZzpnbeGds= @@ -168,6 +186,10 @@ github.com/unifi-poller/promunifi v0.0.9-0.20200628212620-13ccb1ce3beb h1:G8j4AP github.com/unifi-poller/promunifi v0.0.9-0.20200628212620-13ccb1ce3beb/go.mod h1:hq4eItu10nOutQ0q/BRf1Mn/IvfRP+n0DlWsYPBlbm4= github.com/unifi-poller/promunifi v0.0.9-0.20200630103619-c2b0b27aa0c7 h1:0s8Z4xKUjGeT3qZ4/SyyzgK0KodYPxLx3zooe45+nGY= github.com/unifi-poller/promunifi v0.0.9-0.20200630103619-c2b0b27aa0c7/go.mod h1:hq4eItu10nOutQ0q/BRf1Mn/IvfRP+n0DlWsYPBlbm4= +github.com/unifi-poller/promunifi v0.0.9-0.20200707102516-6a68904c123a h1:9GrgOUGk/cZOMr2v9AnolxT2yncsahxo8K7qNFw4g9s= +github.com/unifi-poller/promunifi v0.0.9-0.20200707102516-6a68904c123a/go.mod h1:kEA9Ih8V4PsO7pg2WPlr06wHY7DC9HeUmQ/RDS1vjf0= +github.com/unifi-poller/promunifi v0.0.9-0.20200719070533-e4b440d85f53 h1:WmRxd8grVH80h5fqtc8U1oQ0SqYh3oQO7lXj+qlr4Gg= +github.com/unifi-poller/promunifi v0.0.9-0.20200719070533-e4b440d85f53/go.mod h1:c6WkMKQzC6XgNdJHldBUHsMGzqPN9kNXWIMwortw3N4= github.com/unifi-poller/unifi v0.0.5-0.20200620103801-b927287ea1cd/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= github.com/unifi-poller/unifi v0.0.6-0.20200625090439-421046871a37 h1:T2y8JWkjZd1vz2ZKu4vmmAk9s6PUwupuTldwhfww5xY= github.com/unifi-poller/unifi v0.0.6-0.20200625090439-421046871a37/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= @@ -278,6 +300,7 @@ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.5 h1:ymVxjfMaHvXD8RqPRmzHHsB3VvucivSkIAvJFDI5O3c= gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/main.go b/main.go index c3543353..7e34f9e0 100644 --- a/main.go +++ b/main.go @@ -5,7 +5,7 @@ import ( "os" "time" - "github.com/unifi-poller/poller" + "github.com/unifi-poller/poller/pkg/poller" // Load input plugins! _ "github.com/unifi-poller/inputunifi" @@ -14,7 +14,6 @@ import ( _ "github.com/unifi-poller/influxunifi" _ "github.com/unifi-poller/lokiunifi" _ "github.com/unifi-poller/promunifi" - _ "github.com/unifi-poller/webserver" ) // Keep it simple. From 6197177a4579bfaa0ba95af76ad43f11556d4c84 Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Sun, 19 Jul 2020 00:17:47 -0700 Subject: [PATCH 36/39] update config file options --- examples/up.conf.example | 4 ++++ examples/up.json.example | 8 +++++--- examples/up.yaml.example | 6 ++++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/examples/up.conf.example b/examples/up.conf.example index cb924290..d7eab6d1 100644 --- a/examples/up.conf.example +++ b/examples/up.conf.example @@ -23,6 +23,10 @@ # This controls on which ip and port /metrics is exported when mode is "prometheus". # This has no effect in other modes. Must contain a colon and port. http_listen = "0.0.0.0:9130" + # Adding an SSL Cert and Cert Key will make Poller listen with SSL/https. + ssl_cert_path = "" + ssl_key_path = "" + # Errors are rare. Setting this to true will report them to Prometheus. report_errors = false [influxdb] diff --git a/examples/up.json.example b/examples/up.json.example index d67897d6..e547f8c9 100644 --- a/examples/up.json.example +++ b/examples/up.json.example @@ -8,6 +8,8 @@ "prometheus": { "disable": false, "http_listen": "0.0.0.0:9130", + "ssl_cert_path": "", + "ssl_key_path": "", "report_errors": false }, @@ -25,9 +27,9 @@ "enable": false, "port": 37288, "html_path": "/usr/lib/unifi-poller/web", - "ssl_cert_path": "" - "ssl_key_path": "" - "max_events": 200 + "ssl_cert_path": "", + "ssl_key_path": "", + "max_events": 200, "accounts": { "captain": "$2a$04$mxw6i0LKH6u46oaLK2cq5eCTAAFkfNiRpzNbz.EyvJZZWNa2FzIlS" } diff --git a/examples/up.yaml.example b/examples/up.yaml.example index 76eeac48..9c44996a 100644 --- a/examples/up.yaml.example +++ b/examples/up.yaml.example @@ -11,8 +11,10 @@ poller: plugins: [] prometheus: - disable: false - http_listen: "0.0.0.0:9130" + disable: false + http_listen: "0.0.0.0:9130" + ssl_cert_path: "" + ssl_key_path: "" report_errors: false influxdb: From 39014fb124b7b70caa7c88e62b006c3f65641cbf Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Sun, 19 Jul 2020 12:41:07 -0700 Subject: [PATCH 37/39] bug fix --- go.mod | 6 +++--- go.sum | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 9be3dbdf..41fdda76 100644 --- a/go.mod +++ b/go.mod @@ -15,10 +15,10 @@ require ( github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/unifi-poller/influxunifi v0.0.10-0.20200719070803-1fb36a5a9829 - github.com/unifi-poller/inputunifi v0.0.8-0.20200719070501-75a24241ef36 + github.com/unifi-poller/inputunifi v0.0.8-0.20200719194021-3d07f5886bf0 github.com/unifi-poller/lokiunifi v0.0.0-20200719070442-d6d2338713d6 - github.com/unifi-poller/poller v0.0.8-0.20200719070110-8d67d8eb73d5 - github.com/unifi-poller/promunifi v0.0.9-0.20200719070533-e4b440d85f53 + github.com/unifi-poller/poller v0.0.8-0.20200719081209-e80aa9ed401d + github.com/unifi-poller/promunifi v0.0.9-0.20200719071215-657f39d26691 github.com/unifi-poller/unifi v0.0.6-0.20200628213309-a22ea217874f golang.org/x/net v0.0.0-20200625001655-4c5254603344 // indirect golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae // indirect diff --git a/go.sum b/go.sum index 8765460d..5cda1d90 100644 --- a/go.sum +++ b/go.sum @@ -146,6 +146,8 @@ github.com/unifi-poller/inputunifi v0.0.8-0.20200707102527-ecb82ee5d9f6 h1:MyjVl github.com/unifi-poller/inputunifi v0.0.8-0.20200707102527-ecb82ee5d9f6/go.mod h1:mag/wh3jcfGeYa1Xkc0RsnR/SzB9JqVOBfwb2+ouZc4= github.com/unifi-poller/inputunifi v0.0.8-0.20200719070501-75a24241ef36 h1:BOP5EGT+5EoM3gfvwpBNF97fKoX7oTHzprRRRe6rXeI= github.com/unifi-poller/inputunifi v0.0.8-0.20200719070501-75a24241ef36/go.mod h1:79iZjsCmupDPXq/ffNCauAyqBJxug/h2MGJLt0pTsmU= +github.com/unifi-poller/inputunifi v0.0.8-0.20200719194021-3d07f5886bf0 h1:Jfz3i2jLZMGdvbDhf9ESOtXYoS+uIeGJu+w0sMrQib4= +github.com/unifi-poller/inputunifi v0.0.8-0.20200719194021-3d07f5886bf0/go.mod h1:79iZjsCmupDPXq/ffNCauAyqBJxug/h2MGJLt0pTsmU= github.com/unifi-poller/lokiunifi v0.0.0-20200623055806-bef9501a2240 h1:5TkGeJiY4IvsQ29LvvoJ45zDpaaGIigKveyuodSWhcY= github.com/unifi-poller/lokiunifi v0.0.0-20200623055806-bef9501a2240/go.mod h1:F1xYSsn1D+sVgvVuL8FhjMj8GTFbbSTxxEi7Bg6DzG8= github.com/unifi-poller/lokiunifi v0.0.0-20200626040346-12af563d2a99/go.mod h1:7+uUJT6nnXVPad/Omsj+lPD80Cshg4L8TPUkV72JNM8= @@ -178,6 +180,8 @@ github.com/unifi-poller/poller v0.0.8-0.20200707102001-a78974b290b0 h1:PRhR0XJ+a github.com/unifi-poller/poller v0.0.8-0.20200707102001-a78974b290b0/go.mod h1:MiuDGaMWDOAv2SqzqgV5P8t8KWzN00say/Cd5LbiFTI= github.com/unifi-poller/poller v0.0.8-0.20200719070110-8d67d8eb73d5 h1:16SKHzP5jNBiMhiVxZwGwewSvdP2f5lUToT474roNn0= github.com/unifi-poller/poller v0.0.8-0.20200719070110-8d67d8eb73d5/go.mod h1:MiuDGaMWDOAv2SqzqgV5P8t8KWzN00say/Cd5LbiFTI= +github.com/unifi-poller/poller v0.0.8-0.20200719081209-e80aa9ed401d h1:sOaaR5ylJTjbv+RSO7fOXnKPzw5PDtyzz/Z1P8qyDZk= +github.com/unifi-poller/poller v0.0.8-0.20200719081209-e80aa9ed401d/go.mod h1:MiuDGaMWDOAv2SqzqgV5P8t8KWzN00say/Cd5LbiFTI= github.com/unifi-poller/promunifi v0.0.9-0.20200623073250-24621ebb306a h1:7CmCHHFUrxzaGVMRINmplAosW8BNXlWIPm05LxCPClU= github.com/unifi-poller/promunifi v0.0.9-0.20200623073250-24621ebb306a/go.mod h1:mlvfj4DRFVx12ewi6BcT4XOG2bxC7sFasl08RlYih8Y= github.com/unifi-poller/promunifi v0.0.9-0.20200628124811-17c74bc966ba h1:JkCbMKjUORMImfKJ0uZFomVsPJjR8fUI+tZzpnbeGds= @@ -190,6 +194,8 @@ github.com/unifi-poller/promunifi v0.0.9-0.20200707102516-6a68904c123a h1:9GrgOU github.com/unifi-poller/promunifi v0.0.9-0.20200707102516-6a68904c123a/go.mod h1:kEA9Ih8V4PsO7pg2WPlr06wHY7DC9HeUmQ/RDS1vjf0= github.com/unifi-poller/promunifi v0.0.9-0.20200719070533-e4b440d85f53 h1:WmRxd8grVH80h5fqtc8U1oQ0SqYh3oQO7lXj+qlr4Gg= github.com/unifi-poller/promunifi v0.0.9-0.20200719070533-e4b440d85f53/go.mod h1:c6WkMKQzC6XgNdJHldBUHsMGzqPN9kNXWIMwortw3N4= +github.com/unifi-poller/promunifi v0.0.9-0.20200719071215-657f39d26691 h1:CivVAOaiLfFlaRhRb20YRtRitUHZncUI5Z7nyg7wL6E= +github.com/unifi-poller/promunifi v0.0.9-0.20200719071215-657f39d26691/go.mod h1:c6WkMKQzC6XgNdJHldBUHsMGzqPN9kNXWIMwortw3N4= github.com/unifi-poller/unifi v0.0.5-0.20200620103801-b927287ea1cd/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= github.com/unifi-poller/unifi v0.0.6-0.20200625090439-421046871a37 h1:T2y8JWkjZd1vz2ZKu4vmmAk9s6PUwupuTldwhfww5xY= github.com/unifi-poller/unifi v0.0.6-0.20200625090439-421046871a37/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= From 79abe7512ae56ceb95fe34a7aa3c2aa6b5861e5f Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Sun, 19 Jul 2020 20:16:53 -0700 Subject: [PATCH 38/39] fix webserver output --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 41fdda76..d9f93409 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/unifi-poller/influxunifi v0.0.10-0.20200719070803-1fb36a5a9829 github.com/unifi-poller/inputunifi v0.0.8-0.20200719194021-3d07f5886bf0 github.com/unifi-poller/lokiunifi v0.0.0-20200719070442-d6d2338713d6 - github.com/unifi-poller/poller v0.0.8-0.20200719081209-e80aa9ed401d + github.com/unifi-poller/poller v0.0.8-0.20200720031633-f6348e2bc478 github.com/unifi-poller/promunifi v0.0.9-0.20200719071215-657f39d26691 github.com/unifi-poller/unifi v0.0.6-0.20200628213309-a22ea217874f golang.org/x/net v0.0.0-20200625001655-4c5254603344 // indirect diff --git a/go.sum b/go.sum index 5cda1d90..cb007960 100644 --- a/go.sum +++ b/go.sum @@ -182,6 +182,8 @@ github.com/unifi-poller/poller v0.0.8-0.20200719070110-8d67d8eb73d5 h1:16SKHzP5j github.com/unifi-poller/poller v0.0.8-0.20200719070110-8d67d8eb73d5/go.mod h1:MiuDGaMWDOAv2SqzqgV5P8t8KWzN00say/Cd5LbiFTI= github.com/unifi-poller/poller v0.0.8-0.20200719081209-e80aa9ed401d h1:sOaaR5ylJTjbv+RSO7fOXnKPzw5PDtyzz/Z1P8qyDZk= github.com/unifi-poller/poller v0.0.8-0.20200719081209-e80aa9ed401d/go.mod h1:MiuDGaMWDOAv2SqzqgV5P8t8KWzN00say/Cd5LbiFTI= +github.com/unifi-poller/poller v0.0.8-0.20200720031633-f6348e2bc478 h1:d8lKimaUqRMFthCLmAE/DdYdzGV1KYF1b8V7T5F9Ixg= +github.com/unifi-poller/poller v0.0.8-0.20200720031633-f6348e2bc478/go.mod h1:MiuDGaMWDOAv2SqzqgV5P8t8KWzN00say/Cd5LbiFTI= github.com/unifi-poller/promunifi v0.0.9-0.20200623073250-24621ebb306a h1:7CmCHHFUrxzaGVMRINmplAosW8BNXlWIPm05LxCPClU= github.com/unifi-poller/promunifi v0.0.9-0.20200623073250-24621ebb306a/go.mod h1:mlvfj4DRFVx12ewi6BcT4XOG2bxC7sFasl08RlYih8Y= github.com/unifi-poller/promunifi v0.0.9-0.20200628124811-17c74bc966ba h1:JkCbMKjUORMImfKJ0uZFomVsPJjR8fUI+tZzpnbeGds= From 08d42c2b488089469993ac11bd2357fdb70f40bd Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Sun, 19 Jul 2020 21:14:58 -0700 Subject: [PATCH 39/39] lowercase --- go.mod | 8 ++++---- go.sum | 8 ++++++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index d9f93409..bdc49969 100644 --- a/go.mod +++ b/go.mod @@ -14,11 +14,11 @@ require ( github.com/russross/blackfriday v2.0.0+incompatible // indirect github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/unifi-poller/influxunifi v0.0.10-0.20200719070803-1fb36a5a9829 + github.com/unifi-poller/influxunifi v0.0.10-0.20200720041222-5932808647e8 github.com/unifi-poller/inputunifi v0.0.8-0.20200719194021-3d07f5886bf0 - github.com/unifi-poller/lokiunifi v0.0.0-20200719070442-d6d2338713d6 - github.com/unifi-poller/poller v0.0.8-0.20200720031633-f6348e2bc478 - github.com/unifi-poller/promunifi v0.0.9-0.20200719071215-657f39d26691 + github.com/unifi-poller/lokiunifi v0.0.0-20200720041215-6b4aaa3bd40f + github.com/unifi-poller/poller v0.0.8-0.20200720041241-4068a5bfcdfd + github.com/unifi-poller/promunifi v0.0.9-0.20200720041230-cd67f20aa182 github.com/unifi-poller/unifi v0.0.6-0.20200628213309-a22ea217874f golang.org/x/net v0.0.0-20200625001655-4c5254603344 // indirect golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae // indirect diff --git a/go.sum b/go.sum index cb007960..bfe78cd2 100644 --- a/go.sum +++ b/go.sum @@ -122,6 +122,8 @@ github.com/unifi-poller/influxunifi v0.0.10-0.20200707102535-eac44b814550 h1:a8o github.com/unifi-poller/influxunifi v0.0.10-0.20200707102535-eac44b814550/go.mod h1:WqlfO21XwKf/axW2RclNpXYMOcYCtazhJMwnGKyZvMw= github.com/unifi-poller/influxunifi v0.0.10-0.20200719070803-1fb36a5a9829 h1:Rd8envlb8mzu5a/hC3pS0hyqcdkoyEGRiCQluEHDh3E= github.com/unifi-poller/influxunifi v0.0.10-0.20200719070803-1fb36a5a9829/go.mod h1:sYwt5HAR+ZQizq98BTeIXjujd5Ua6rbUhWui76xgF1A= +github.com/unifi-poller/influxunifi v0.0.10-0.20200720041222-5932808647e8 h1:8qMoVDUTmxMqYEcggnmRZQnUfue7/Fh+Z77IhyJIFWU= +github.com/unifi-poller/influxunifi v0.0.10-0.20200720041222-5932808647e8/go.mod h1:sYwt5HAR+ZQizq98BTeIXjujd5Ua6rbUhWui76xgF1A= github.com/unifi-poller/inputunifi v0.0.8-0.20200626052630-dabd0510075e h1:gJyoFh49X/9Q8DxsFe2H48DjfZ46/Aw/GBxl7izKDEo= github.com/unifi-poller/inputunifi v0.0.8-0.20200626052630-dabd0510075e/go.mod h1:nFr8uB4zJtCLiQvYPypGK3aWfQ9y4cC4iIeS9PyecrU= github.com/unifi-poller/inputunifi v0.0.8-0.20200628114724-8b60ff573a49 h1:ce5cXC4eWs5TfrjvlN8ZEemKcnv7KfbUbzXDr2fHnso= @@ -161,6 +163,8 @@ github.com/unifi-poller/lokiunifi v0.0.0-20200707102508-fa1084a386c8 h1:6eSiVjtO github.com/unifi-poller/lokiunifi v0.0.0-20200707102508-fa1084a386c8/go.mod h1:qaf/3nErsTc9XzOgp3vX6JmYxR0GbhRCBbpI9NcUnJA= github.com/unifi-poller/lokiunifi v0.0.0-20200719070442-d6d2338713d6 h1:NQBxe9MwR8k12L3+FGbv8WpKV9RzqcB6F8jJAwGjN2o= github.com/unifi-poller/lokiunifi v0.0.0-20200719070442-d6d2338713d6/go.mod h1:XxvXFCXKxeTG0UNpQPh6JQ5vmHuug6kAkXWxTsFBg04= +github.com/unifi-poller/lokiunifi v0.0.0-20200720041215-6b4aaa3bd40f h1:piHd4wzOw/zpYFGT0HeA8JgmBq6Ublvi+gk383c7lAg= +github.com/unifi-poller/lokiunifi v0.0.0-20200720041215-6b4aaa3bd40f/go.mod h1:XxvXFCXKxeTG0UNpQPh6JQ5vmHuug6kAkXWxTsFBg04= github.com/unifi-poller/poller v0.0.8-0.20200621214016-5d1ed3324a46/go.mod h1:pJ/MeYaakLOOpbyc7s4zeZ92UzNK/rir5jkA7t5jIjo= github.com/unifi-poller/poller v0.0.8-0.20200622041812-dd79a3e3073e h1:pSkgIalhDdb1N0/9uTAVh7emolfFxjCxo68IXIsZzII= github.com/unifi-poller/poller v0.0.8-0.20200622041812-dd79a3e3073e/go.mod h1:pJ/MeYaakLOOpbyc7s4zeZ92UzNK/rir5jkA7t5jIjo= @@ -184,6 +188,8 @@ github.com/unifi-poller/poller v0.0.8-0.20200719081209-e80aa9ed401d h1:sOaaR5ylJ github.com/unifi-poller/poller v0.0.8-0.20200719081209-e80aa9ed401d/go.mod h1:MiuDGaMWDOAv2SqzqgV5P8t8KWzN00say/Cd5LbiFTI= github.com/unifi-poller/poller v0.0.8-0.20200720031633-f6348e2bc478 h1:d8lKimaUqRMFthCLmAE/DdYdzGV1KYF1b8V7T5F9Ixg= github.com/unifi-poller/poller v0.0.8-0.20200720031633-f6348e2bc478/go.mod h1:MiuDGaMWDOAv2SqzqgV5P8t8KWzN00say/Cd5LbiFTI= +github.com/unifi-poller/poller v0.0.8-0.20200720041241-4068a5bfcdfd h1:BrKxti28eGeBIQJf1gtNE8kUf3wE92ToAWKDNRMMmIw= +github.com/unifi-poller/poller v0.0.8-0.20200720041241-4068a5bfcdfd/go.mod h1:MiuDGaMWDOAv2SqzqgV5P8t8KWzN00say/Cd5LbiFTI= github.com/unifi-poller/promunifi v0.0.9-0.20200623073250-24621ebb306a h1:7CmCHHFUrxzaGVMRINmplAosW8BNXlWIPm05LxCPClU= github.com/unifi-poller/promunifi v0.0.9-0.20200623073250-24621ebb306a/go.mod h1:mlvfj4DRFVx12ewi6BcT4XOG2bxC7sFasl08RlYih8Y= github.com/unifi-poller/promunifi v0.0.9-0.20200628124811-17c74bc966ba h1:JkCbMKjUORMImfKJ0uZFomVsPJjR8fUI+tZzpnbeGds= @@ -198,6 +204,8 @@ github.com/unifi-poller/promunifi v0.0.9-0.20200719070533-e4b440d85f53 h1:WmRxd8 github.com/unifi-poller/promunifi v0.0.9-0.20200719070533-e4b440d85f53/go.mod h1:c6WkMKQzC6XgNdJHldBUHsMGzqPN9kNXWIMwortw3N4= github.com/unifi-poller/promunifi v0.0.9-0.20200719071215-657f39d26691 h1:CivVAOaiLfFlaRhRb20YRtRitUHZncUI5Z7nyg7wL6E= github.com/unifi-poller/promunifi v0.0.9-0.20200719071215-657f39d26691/go.mod h1:c6WkMKQzC6XgNdJHldBUHsMGzqPN9kNXWIMwortw3N4= +github.com/unifi-poller/promunifi v0.0.9-0.20200720041230-cd67f20aa182 h1:gLNy6aaQwgDESLxqXhqiPsEGg/fWkBFS43vIsNh34sA= +github.com/unifi-poller/promunifi v0.0.9-0.20200720041230-cd67f20aa182/go.mod h1:c6WkMKQzC6XgNdJHldBUHsMGzqPN9kNXWIMwortw3N4= github.com/unifi-poller/unifi v0.0.5-0.20200620103801-b927287ea1cd/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= github.com/unifi-poller/unifi v0.0.6-0.20200625090439-421046871a37 h1:T2y8JWkjZd1vz2ZKu4vmmAk9s6PUwupuTldwhfww5xY= github.com/unifi-poller/unifi v0.0.6-0.20200625090439-421046871a37/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8=