diff --git a/examples/up.conf.example b/examples/up.conf.example index b78204c3..93be68bd 100644 --- a/examples/up.conf.example +++ b/examples/up.conf.example @@ -54,10 +54,8 @@ # dynamic controller (see above section), or the primary controller if you do not # 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, except -# the role; if omitted the role is set to the url. See comments below for details. +# shown below. Any missing values will assume these displayed defaults. [unifi.defaults] - #role = "main controller" url = "https://127.0.0.1:8443" user = "unifipoller" pass = "unifipoller" @@ -73,12 +71,6 @@ # You may repeat the following section to poll multiple controllers. # Any ommitted variables will have their values taken from the defaults, above. #[[unifi.controller]] - # Role is a friendly name used in dashboards. Uses URL if left empty; which is fine. - # Avoid changing this later because it will live forever in your database. - # Multiple controllers may share a role. This allows grouping during scrapes. - # --- This will be deprecated in a future version of UniFi Poller. --- - #role = "https://127.0.0.1:8443" - # 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" diff --git a/examples/up.json.example b/examples/up.json.example index 386475e4..16c62b89 100644 --- a/examples/up.json.example +++ b/examples/up.json.example @@ -24,7 +24,6 @@ "unifi": { "dynamic": false, "defaults": { - "role": "main controller", "user": "unifipoller", "pass": "unifipoller", "url": "https://127.0.0.1:8443", @@ -37,7 +36,6 @@ }, "controllers": [ { - "role": "", "user": "unifipoller", "pass": "unifipoller", "url": "https://127.0.0.1:8443", diff --git a/examples/up.xml.example b/examples/up.xml.example index 97d1372d..5351257f 100644 --- a/examples/up.xml.example +++ b/examples/up.xml.example @@ -26,7 +26,7 @@ NOTE: and are lists of strings and may be repeated. - + all unifipoller unifipoller @@ -39,7 +39,7 @@ NOTE: and are lists of strings and may be repeated. - + all unifipoller unifipoller diff --git a/examples/up.yaml.example b/examples/up.yaml.example index 358f3e73..3235761b 100644 --- a/examples/up.yaml.example +++ b/examples/up.yaml.example @@ -27,10 +27,9 @@ influxdb: unifi: dynamic: false defaults: - role: "main controller" + url: "https://127.0.0.1:8443" user: "unifipoller" pass: "unifipoller" - url: "https://127.0.0.1:8443" sites: - all save_ids: false @@ -42,10 +41,9 @@ unifi: controllers: # Repeat the following stanza to poll multiple controllers. - - role: "" + - url: "https://127.0.0.1:8443" user: "unifipoller" pass: "unifipoller" - url: "https://127.0.0.1:8443" sites: - all save_ids: false diff --git a/go.mod b/go.mod index 30e63245..a7d585ae 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( 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-0.20200615121955-129eacb5681d - github.com/unifi-poller/poller v0.0.6 + github.com/unifi-poller/poller v0.0.7-0.20200615130505-b2becb340fdc github.com/unifi-poller/promunifi v0.0.8-0.20200615120918-62e66b15dc1a github.com/unifi-poller/unifi v0.0.5 ) diff --git a/go.sum b/go.sum index a5f8ecfa..ce24c0d4 100644 --- a/go.sum +++ b/go.sum @@ -185,6 +185,8 @@ github.com/unifi-poller/poller v0.0.5 h1:qnofARTx0JveNc9PqGJmNUs7xsjwFqCWpS8pwDS 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/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=