From b7c83eebbbe9ee8059c0e927c7a703fe5008fd4f Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Sat, 13 Jun 2020 18:46:02 -0700 Subject: [PATCH 01/15] Add TZ env usage to set local time zone. --- .travis.yml | 9 +--- go.mod | 11 +++-- go.sum | 108 +++++++++++++++++++++++++++++++++++++++++ init/docker/Dockerfile | 3 ++ main.go | 17 +++++++ 5 files changed, 135 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 82e79a31..9f765bf7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,16 +16,10 @@ addons: - gnupg - expect go: -- 1.13.x +- 1.14.x services: - docker install: - - mkdir -p $GOPATH/bin - # Download the `dep` binary to bin folder in $GOPATH - - curl -sLo $GOPATH/bin/dep https://github.com/golang/dep/releases/download/v0.5.3/dep-linux-amd64 - - chmod +x $GOPATH/bin/dep - # 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 - rvm install 2.0.0 - rvm 2.0.0 do gem install --no-document fpm before_script: @@ -38,7 +32,6 @@ 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 aa09663d..534d3454 100644 --- a/go.mod +++ b/go.mod @@ -1,16 +1,17 @@ module github.com/unifi-poller/unifi-poller -go 1.13 +go 1.14 require ( github.com/github/hub v2.11.2+incompatible // 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/russross/blackfriday v2.0.0+incompatible // indirect github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect - github.com/unifi-poller/influxunifi v0.0.8 - github.com/unifi-poller/inputunifi v0.0.6-0.20200205010458-a1783e28d08a - github.com/unifi-poller/poller v0.0.5 - github.com/unifi-poller/promunifi v0.0.6 + github.com/unifi-poller/influxunifi v0.0.9-0.20200614012101-da8e25b3e1c0 + github.com/unifi-poller/inputunifi v0.0.7-0.20200614011400-ccef115c2def + github.com/unifi-poller/poller v0.0.6 + github.com/unifi-poller/promunifi v0.0.7-0.20200614002236-2fc578d330d8 github.com/unifi-poller/unifi v0.0.4 ) diff --git a/go.sum b/go.sum index a4909ad7..7392450c 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,5 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= @@ -5,10 +7,16 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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/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= @@ -16,14 +24,31 @@ github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= 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= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +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/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/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= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= @@ -35,6 +60,7 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= 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/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= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -43,23 +69,40 @@ github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3Rllmb github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= 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_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/russross/blackfriday v2.0.0+incompatible/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= 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= +github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -72,6 +115,10 @@ github.com/unifi-poller/influxunifi v0.0.8-0.20200205011639-5c4a3be8cbc7 h1:LWHA 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/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= @@ -90,6 +137,10 @@ github.com/unifi-poller/inputunifi v0.0.6-0.20200204205922-001fafad6c50 h1:4E51D 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/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= @@ -97,10 +148,16 @@ github.com/unifi-poller/poller v0.0.5-0.20200203042411-c58679b76f5c h1:x1EiLvLx9 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/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/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= @@ -115,26 +172,72 @@ github.com/unifi-poller/unifi v0.0.4 h1:NDTxHTdF0MAt1y1RU8J+MSqdYlO0CEIqlrktcj3y github.com/unifi-poller/unifi v0.0.4/go.mod h1:bTUtctrf56aapjKH+L+98eThBaVFbQXw5iNGZI0g/+E= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/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= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= 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-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/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= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= 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-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/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= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golift.io/cnfg v0.0.5 h1:HnMU8Z9C/igKvir1dqaHx5BPuNGZrp99FCtdJyP2Z4I= golift.io/cnfg v0.0.5/go.mod h1:ScFDIJg/rJGHbRaed/i7g1lBhywEjB0JiP2uZr3xC3A= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +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= 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= @@ -142,4 +245,9 @@ 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= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/init/docker/Dockerfile b/init/docker/Dockerfile index ecb0f212..d981281b 100644 --- a/init/docker/Dockerfile +++ b/init/docker/Dockerfile @@ -53,5 +53,8 @@ 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 /etc/ssl /etc/ssl +COPY --from=builder /usr/share/zoneinfo /usr/share/zoneinfo + +ENV TZ=UTC ENTRYPOINT [ "/image" ] diff --git a/main.go b/main.go index c2a5dfc3..e37f1138 100644 --- a/main.go +++ b/main.go @@ -2,6 +2,8 @@ package main import ( "log" + "os" + "time" "github.com/unifi-poller/poller" @@ -16,7 +18,22 @@ import ( // Keep it simple. func main() { + // Set time zone based on TZ env variable. + setTimeZone(os.Getenv("TZ")) + if err := poller.New().Start(); err != nil { log.Fatalln("[ERROR]", err) } } + +func setTimeZone(tz string) { + if tz == "" { + return + } + + var err error + + if time.Local, err = time.LoadLocation(tz); err != nil { + log.Printf("[ERROR] Loading TZ Location '%s': %v\n", tz, err) + } +} From 26cfb171f7cd8deffce8c0f1547a59771fb0de1a Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Sat, 13 Jun 2020 20:30:47 -0700 Subject: [PATCH 02/15] More updates --- .travis.yml | 6 +++--- go.mod | 4 ++-- go.sum | 4 ++++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9f765bf7..2040b26d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,8 +20,8 @@ go: services: - docker install: - - rvm install 2.0.0 - - rvm 2.0.0 do gem install --no-document fpm + - rvm install 2.3.0 + - rvm 2.3.0 do gem install --no-document fpm 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. @@ -36,7 +36,7 @@ script: # Test built docker image. - docker run $BINARY -v 2>&1 | grep -Eq "^$BINARY v$VERSION" # Build everything - - rvm 2.0.0 do make release + - rvm 2.3.0 do make release after_success: # Display Release Folder - ls -l release/ diff --git a/go.mod b/go.mod index 534d3454..89628608 100644 --- a/go.mod +++ b/go.mod @@ -12,6 +12,6 @@ require ( github.com/unifi-poller/influxunifi v0.0.9-0.20200614012101-da8e25b3e1c0 github.com/unifi-poller/inputunifi v0.0.7-0.20200614011400-ccef115c2def github.com/unifi-poller/poller v0.0.6 - github.com/unifi-poller/promunifi v0.0.7-0.20200614002236-2fc578d330d8 - github.com/unifi-poller/unifi v0.0.4 + github.com/unifi-poller/promunifi v0.0.7-0.20200614032856-bb7f58485c41 + github.com/unifi-poller/unifi v0.0.5-0.20200614031431-bd4934fc585b ) diff --git a/go.sum b/go.sum index 7392450c..eb181c15 100644 --- a/go.sum +++ b/go.sum @@ -158,6 +158,8 @@ github.com/unifi-poller/promunifi v0.0.7-0.20200312082356-2f200a8d7632 h1:/oaYSA 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/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= @@ -170,6 +172,8 @@ github.com/unifi-poller/unifi v0.0.4-0.20200205010421-c48a6fc3abb7 h1:NulSYl6Ky9 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= 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 98019d0801799604c6b39f58302b584e18b24d08 Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Sat, 13 Jun 2020 21:33:01 -0700 Subject: [PATCH 03/15] fix homebrew and arm docker builds --- .metadata.sh | 5 ++++- Makefile | 8 ++------ go.mod | 8 ++++---- go.sum | 14 ++++++++++++++ init/docker/hooks/README.md | 6 +++--- init/docker/hooks/build | 2 +- init/docker/hooks/push | 7 ++++--- 7 files changed, 32 insertions(+), 18 deletions(-) diff --git a/.metadata.sh b/.metadata.sh index fe0f91d1..cf0b92e1 100755 --- a/.metadata.sh +++ b/.metadata.sh @@ -17,7 +17,10 @@ LICENSE="MIT" # This affects the homebrew formula (launchd) and linux packages (systemd). FORMULA="service" -export BINARY HBREPO MAINT VENDOR DESC GOLANGCI_LINT_ARGS CONFIG_FILE LICENSE FORMULA +# Defines docker manifest/build types. +BUILDS="linux:armhf:arm linux:arm64:arm64 linux:amd64:amd64 linux:i386:386" + +export BINARY HBREPO MAINT VENDOR DESC GOLANGCI_LINT_ARGS CONFIG_FILE LICENSE FORMULA BUILDS # The rest is mostly automatic. # Fix the repo if it doesn't match the binary name. diff --git a/Makefile b/Makefile index 68709229..b723851c 100644 --- a/Makefile +++ b/Makefile @@ -80,18 +80,15 @@ clean: # This also turns the repo readme into an html file. # md2roff is needed to build the man file and html pages from the READMEs. man: $(BINARY).1.gz -$(BINARY).1.gz: md2roff +$(BINARY).1.gz: # Building man page. Build dependency first: md2roff go run $(MD2ROFF_BIN) --manual $(BINARY) --version $(VERSION) --date "$(DATE)" examples/MANUAL.md gzip -9nc examples/MANUAL > $@ mv examples/MANUAL.html $(BINARY)_manual.html -md2roff: - go get $(MD2ROFF_BIN) - # TODO: provide a template that adds the date to the built html file. readme: README.html -README.html: md2roff +README.html: # This turns README.md into README.html go run $(MD2ROFF_BIN) --manual $(BINARY) --version $(VERSION) --date "$(DATE)" README.md @@ -359,7 +356,6 @@ install: man readme $(BINARY) plugins_darwin # 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 -cp $(BINARY) $(PREFIX)/bin/$(BINARY) - /usr/bin/install -m 0755 -cp *darwin.so $(PREFIX)/lib/$(BINARY)/ /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)/ [ -f $(ETC)/$(BINARY)/$(CONFIG_FILE) ] || /usr/bin/install -m 0644 -cp examples/$(CONFIG_FILE).example $(ETC)/$(BINARY)/$(CONFIG_FILE) diff --git a/go.mod b/go.mod index 89628608..d7f8678b 100644 --- a/go.mod +++ b/go.mod @@ -9,9 +9,9 @@ require ( github.com/mattn/go-isatty v0.0.11 // indirect github.com/russross/blackfriday v2.0.0+incompatible // indirect github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect - github.com/unifi-poller/influxunifi v0.0.9-0.20200614012101-da8e25b3e1c0 - github.com/unifi-poller/inputunifi v0.0.7-0.20200614011400-ccef115c2def + github.com/unifi-poller/influxunifi v0.0.9-0.20200614034715-291e3c246d65 + github.com/unifi-poller/inputunifi v0.0.7-0.20200614024217-51cd08a0421e github.com/unifi-poller/poller v0.0.6 - github.com/unifi-poller/promunifi v0.0.7-0.20200614032856-bb7f58485c41 - github.com/unifi-poller/unifi v0.0.5-0.20200614031431-bd4934fc585b + github.com/unifi-poller/promunifi v0.0.7-0.20200614034834-a8547d57cfdc + github.com/unifi-poller/unifi v0.0.5 ) diff --git a/go.sum b/go.sum index eb181c15..e4c7db91 100644 --- a/go.sum +++ b/go.sum @@ -17,6 +17,7 @@ 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= @@ -57,8 +58,10 @@ 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= @@ -98,7 +101,9 @@ github.com/prometheus/procfs v0.0.10/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+G 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/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= @@ -119,6 +124,8 @@ github.com/unifi-poller/influxunifi v0.0.9-0.20200312080614-979ea0c9c1a0 h1:QV/w 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/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= @@ -141,6 +148,8 @@ github.com/unifi-poller/inputunifi v0.0.6 h1:3x44qhCl3TXZ0KACQczgsxhI+oHBrcUih8Z 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/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= @@ -160,6 +169,8 @@ github.com/unifi-poller/promunifi v0.0.7-0.20200614002236-2fc578d330d8 h1:Kh76SX 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/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= @@ -174,6 +185,9 @@ github.com/unifi-poller/unifi v0.0.4 h1:NDTxHTdF0MAt1y1RU8J+MSqdYlO0CEIqlrktcj3y 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 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= 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= diff --git a/init/docker/hooks/README.md b/init/docker/hooks/README.md index 7bf127f6..f01d91f7 100644 --- a/init/docker/hooks/README.md +++ b/init/docker/hooks/README.md @@ -12,10 +12,10 @@ follow the example provided here. All of the hooks are generic, and will work wi any build. Two environment variables must be passed in from Docker Cloud config. 1. `BUILDS` must be set to the builds you're trying to perform. This repo is currently set to: - - `linux:armhf:arm: linux:arm64:arm64:armv8 linux:amd64:amd64: linux:i386:386:` - - The format is `os:name:arch:variant`. + - `linux:armhf:arm linux:arm64:arm64 linux:amd64:amd64 linux:i386:386` + - The format is `os:name:arch`. - `os` and `name` are passed into the Dockerfile. - - `os`, `arch` and `variant` are passed into `docker manifest annotate`. + - `os`, `arch` are passed into `docker manifest annotate`. - This does not yet work with an OS other than `linux`. 1. Set `DOCKER_CLI_EXPERIMENTAL` to `enabled`. Not optional. diff --git a/init/docker/hooks/build b/init/docker/hooks/build index c8f2796f..2fcdfc4d 100755 --- a/init/docker/hooks/build +++ b/init/docker/hooks/build @@ -13,7 +13,7 @@ source .metadata.sh # Build each configured image from Docker Cloud. for build in $BUILDS; do - # os:name:arch:variant + # os:name:arch os=$(echo $build | cut -d: -f1) name=$(echo $build | cut -d: -f2) echo "Building Image ${IMAGE_NAME}_${os}_${name}" diff --git a/init/docker/hooks/push b/init/docker/hooks/push index d1e5fad2..f3f695da 100755 --- a/init/docker/hooks/push +++ b/init/docker/hooks/push @@ -10,10 +10,12 @@ pushd ../.. source .metadata.sh popd -if [ "$BUILDS" != "" ]; then +if [ "$TAGS" == "" ]; then TAGS=$DOCKER_TAG fi +export DOCKER_CLI_EXPERIMENTAL=enabled + # Push the extra custom images that were created. for build in $BUILDS; do os=$(echo $build | cut -d: -f1) @@ -45,9 +47,8 @@ for tag in $TAGS; do os=$(echo $build | cut -d: -f1) name=$(echo $build | cut -d: -f2) arch=$(echo $build | cut -d: -f3) - vari=$(echo $build | cut -d: -f4) # Annotating updates the manifest to describe each images' capabilities. - docker manifest annotate ${DOCKER_REPO}:${tag} ${IMAGE_NAME}_${os}_${name} --os ${os} --arch ${arch} --variant "${vari}" + docker manifest annotate ${DOCKER_REPO}:${tag} ${IMAGE_NAME}_${os}_${name} --os ${os} --arch ${arch} done echo "Pushing Manifest ${DOCKER_REPO}:${tag}" docker manifest push ${DOCKER_REPO}:${tag} From 0eab18a84575aa6d44c2f94f32f9a9309c517166 Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Sun, 14 Jun 2020 01:45:28 -0700 Subject: [PATCH 04/15] fix porttable --- go.mod | 3 ++- go.sum | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index d7f8678b..b0526a8b 100644 --- a/go.mod +++ b/go.mod @@ -7,9 +7,10 @@ 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/procfs v0.1.2 // 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-0.20200614034715-291e3c246d65 + github.com/unifi-poller/influxunifi v0.0.9-0.20200614084044-5974cdc8af4f github.com/unifi-poller/inputunifi v0.0.7-0.20200614024217-51cd08a0421e github.com/unifi-poller/poller v0.0.6 github.com/unifi-poller/promunifi v0.0.7-0.20200614034834-a8547d57cfdc diff --git a/go.sum b/go.sum index e4c7db91..57ae3cfc 100644 --- a/go.sum +++ b/go.sum @@ -101,6 +101,8 @@ github.com/prometheus/procfs v0.0.10/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+G 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/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= @@ -126,6 +128,10 @@ github.com/unifi-poller/influxunifi v0.0.9-0.20200614012101-da8e25b3e1c0 h1:zh0w 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/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= From 5a2e21a1f688c2c92f71c5cdda28f13cf4f677cb Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Sun, 14 Jun 2020 02:42:08 -0700 Subject: [PATCH 05/15] add type to port table --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index b0526a8b..0c5cf631 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/prometheus/procfs v0.1.2 // 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-0.20200614084044-5974cdc8af4f + github.com/unifi-poller/influxunifi v0.0.9-0.20200614094130-d25a8fece6bc github.com/unifi-poller/inputunifi v0.0.7-0.20200614024217-51cd08a0421e github.com/unifi-poller/poller v0.0.6 github.com/unifi-poller/promunifi v0.0.7-0.20200614034834-a8547d57cfdc diff --git a/go.sum b/go.sum index 57ae3cfc..ff2cd79b 100644 --- a/go.sum +++ b/go.sum @@ -132,6 +132,8 @@ github.com/unifi-poller/influxunifi v0.0.9-0.20200614082629-2a147938375e h1:PvuH 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/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= From 9f58c65acc04a4de11190b7d563df3de94c7948f Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Mon, 15 Jun 2020 02:19:09 -0700 Subject: [PATCH 06/15] update docs and examples --- examples/README.md | 7 ++++--- examples/up.conf.example | 20 ++++++++++++++++---- examples/up.json.example | 4 +++- examples/up.xml.example | 8 +++++--- examples/up.yaml.example | 6 ++++-- go.mod | 8 ++++---- go.sum | 8 ++++++++ 7 files changed, 44 insertions(+), 17 deletions(-) diff --git a/examples/README.md b/examples/README.md index 93e490f2..82f81ae0 100644 --- a/examples/README.md +++ b/examples/README.md @@ -8,6 +8,7 @@ file with `.json`, and YAML with `.yaml`. The default format is always TOML and may have any _other_ suffix. #### Dashboards -This folder used to contain Grafana Dashboards. -**They are now located at [Grafana.com](https://grafana.com/dashboards?search=unifi-poller).** -Also see [Grafana Dashboards](https://github.com/unifi-poller/unifi-poller/wiki/Grafana-Dashboards) Wiki. + +- This folder used to contain Grafana Dashboards. +- **They are now located at [Grafana.com](https://grafana.com/dashboards?search=unifi-poller).** +- [Grafana Dashboards Wiki](https://github.com/unifi-poller/unifi-poller/wiki/Grafana-Dashboards) diff --git a/examples/up.conf.example b/examples/up.conf.example index 018a4131..b78204c3 100644 --- a/examples/up.conf.example +++ b/examples/up.conf.example @@ -53,7 +53,9 @@ # The following section contains the default credentials/configuration for any # 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. +# 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. [unifi.defaults] #role = "main controller" url = "https://127.0.0.1:8443" @@ -63,21 +65,27 @@ save_ids = 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 ommitted variables will have their values taken from the defaults, above. #[[unifi.controller]] - # Friendly name used in dashboards. Uses URL if left empty; which is fine. + # 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. - #role = "" + # --- 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" # Make a read-only user in the UniFi Admin Settings, allow it access to all sites. #user = "unifipoller" - #pass = "4BB9345C-2341-48D7-99F5-E01B583FF77F" + #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. @@ -100,6 +108,10 @@ # It's not valuable to everyone and setting this to false will save resources. #save_sites = true + # 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 + # 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. diff --git a/examples/up.json.example b/examples/up.json.example index a98f27cc..386475e4 100644 --- a/examples/up.json.example +++ b/examples/up.json.example @@ -32,6 +32,7 @@ "save_ids": false, "save_dpi": false, "save_sites": true, + "hash_pii": false, "verify_ssl": false }, "controllers": [ @@ -41,9 +42,10 @@ "pass": "unifipoller", "url": "https://127.0.0.1:8443", "sites": ["all"], - "save_dpi": 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 b8b1fb0e..97d1372d 100644 --- a/examples/up.xml.example +++ b/examples/up.xml.example @@ -6,7 +6,7 @@ # See up.conf.example! v2 # ############################################# - and are lists of strings and may be repeated. +NOTE: and are lists of strings and may be repeated. --> @@ -31,10 +31,11 @@ unifipoller unifipoller https://127.0.0.1:8443 - false false false true + false + false @@ -43,10 +44,11 @@ unifipoller unifipoller https://127.0.0.1:8443 - false false false true + false + false diff --git a/examples/up.yaml.example b/examples/up.yaml.example index d82e7989..358f3e73 100644 --- a/examples/up.yaml.example +++ b/examples/up.yaml.example @@ -33,10 +33,11 @@ unifi: url: "https://127.0.0.1:8443" sites: - all - verify_ssl: false save_ids: false save_dpi: false save_sites: true + hash_pii: false + verify_ssl: false controllers: @@ -47,7 +48,8 @@ unifi: url: "https://127.0.0.1:8443" sites: - all - verify_ssl: false save_ids: false save_dpi: false + hash_pii: false save_sites: true + verify_ssl: false diff --git a/go.mod b/go.mod index 0c5cf631..ed303f6b 100644 --- a/go.mod +++ b/go.mod @@ -7,12 +7,12 @@ 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/procfs v0.1.2 // 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/unifi-poller/influxunifi v0.0.9-0.20200614094130-d25a8fece6bc - github.com/unifi-poller/inputunifi v0.0.7-0.20200614024217-51cd08a0421e + github.com/unifi-poller/influxunifi v0.0.9 + github.com/unifi-poller/inputunifi v0.0.7-0.20200615090539-b2b14e56a5ee github.com/unifi-poller/poller v0.0.6 - github.com/unifi-poller/promunifi v0.0.7-0.20200614034834-a8547d57cfdc + github.com/unifi-poller/promunifi v0.0.7 github.com/unifi-poller/unifi v0.0.5 ) diff --git a/go.sum b/go.sum index ff2cd79b..7cba990b 100644 --- a/go.sum +++ b/go.sum @@ -103,6 +103,8 @@ github.com/prometheus/procfs v0.1.1 h1:/ZKcW+ixpq2dOl4yeH4qvACNXnkiDCp5e/F5Tq07X 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= @@ -134,6 +136,8 @@ github.com/unifi-poller/influxunifi v0.0.9-0.20200614084044-5974cdc8af4f h1:09QF 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/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= @@ -158,6 +162,8 @@ github.com/unifi-poller/inputunifi v0.0.7-0.20200614011400-ccef115c2def h1:rInzM 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/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= @@ -179,6 +185,8 @@ github.com/unifi-poller/promunifi v0.0.7-0.20200614032856-bb7f58485c41 h1:cdqSEw 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/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 2333e44e4f571ed7885340508ce8533d70ee16f4 Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Mon, 15 Jun 2020 02:22:32 -0700 Subject: [PATCH 07/15] fix --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index ed303f6b..ac6cba38 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( 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-0.20200615090539-b2b14e56a5ee + github.com/unifi-poller/inputunifi v0.0.7-0.20200615092048-70c79f08efca github.com/unifi-poller/poller v0.0.6 github.com/unifi-poller/promunifi v0.0.7 github.com/unifi-poller/unifi v0.0.5 diff --git a/go.sum b/go.sum index 7cba990b..fa5fcd4a 100644 --- a/go.sum +++ b/go.sum @@ -164,6 +164,8 @@ github.com/unifi-poller/inputunifi v0.0.7-0.20200614024217-51cd08a0421e h1:cF6YN 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/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 bb2f24d8b1c75062a2e97df30c14f5aab7e4f6f6 Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Mon, 15 Jun 2020 03:23:49 -0700 Subject: [PATCH 08/15] log controller data --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index ac6cba38..0cd109a1 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( 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-0.20200615092048-70c79f08efca + github.com/unifi-poller/inputunifi v0.0.7-0.20200615102105-baf0b7ccd782 github.com/unifi-poller/poller v0.0.6 github.com/unifi-poller/promunifi v0.0.7 github.com/unifi-poller/unifi v0.0.5 diff --git a/go.sum b/go.sum index fa5fcd4a..f9cc0607 100644 --- a/go.sum +++ b/go.sum @@ -166,6 +166,8 @@ github.com/unifi-poller/inputunifi v0.0.7-0.20200615090539-b2b14e56a5ee h1:AqEqr 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/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 768ff627ed41f28076e24c0bcc8163dbec23128d Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Mon, 15 Jun 2020 03:44:54 -0700 Subject: [PATCH 09/15] fix --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 0cd109a1..2f961729 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( 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-0.20200615102105-baf0b7ccd782 + github.com/unifi-poller/inputunifi v0.0.7-0.20200615104325-8b4dc0cbe7d2 github.com/unifi-poller/poller v0.0.6 github.com/unifi-poller/promunifi v0.0.7 github.com/unifi-poller/unifi v0.0.5 diff --git a/go.sum b/go.sum index f9cc0607..cf1707fa 100644 --- a/go.sum +++ b/go.sum @@ -168,6 +168,8 @@ github.com/unifi-poller/inputunifi v0.0.7-0.20200615092048-70c79f08efca h1:XuGR4 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/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 d4287b205da9cfdd87901fbadf64d5ed33f47d85 Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Mon, 15 Jun 2020 04:40:45 -0700 Subject: [PATCH 10/15] deprecate role parameter --- go.mod | 4 ++-- go.sum | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 2f961729..2d8e4a9c 100644 --- a/go.mod +++ b/go.mod @@ -11,8 +11,8 @@ require ( 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-0.20200615104325-8b4dc0cbe7d2 + github.com/unifi-poller/inputunifi v0.0.7-0.20200615113835-aa28027f96ca github.com/unifi-poller/poller v0.0.6 - github.com/unifi-poller/promunifi v0.0.7 + github.com/unifi-poller/promunifi v0.0.8-0.20200615113800-d557827276cb github.com/unifi-poller/unifi v0.0.5 ) diff --git a/go.sum b/go.sum index cf1707fa..3b33e08a 100644 --- a/go.sum +++ b/go.sum @@ -170,6 +170,8 @@ github.com/unifi-poller/inputunifi v0.0.7-0.20200615102105-baf0b7ccd782 h1:niMlF 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/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= @@ -193,6 +195,8 @@ github.com/unifi-poller/promunifi v0.0.7-0.20200614034834-a8547d57cfdc h1:XoSJxz 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/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 bfa70b42bc2efc83b968d55c12518034de18553f Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Mon, 15 Jun 2020 04:56:40 -0700 Subject: [PATCH 11/15] fixes --- go.mod | 4 ++-- go.sum | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 2d8e4a9c..bcbf7f13 100644 --- a/go.mod +++ b/go.mod @@ -11,8 +11,8 @@ require ( 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-0.20200615113835-aa28027f96ca + github.com/unifi-poller/inputunifi v0.0.7-0.20200615115520-4de38005d9e4 github.com/unifi-poller/poller v0.0.6 - github.com/unifi-poller/promunifi v0.0.8-0.20200615113800-d557827276cb + github.com/unifi-poller/promunifi v0.0.8-0.20200615115528-b94f4ea4c7fe github.com/unifi-poller/unifi v0.0.5 ) diff --git a/go.sum b/go.sum index 3b33e08a..db65c2d1 100644 --- a/go.sum +++ b/go.sum @@ -172,6 +172,8 @@ github.com/unifi-poller/inputunifi v0.0.7-0.20200615104325-8b4dc0cbe7d2 h1:JVy7R 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/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= @@ -197,6 +199,8 @@ github.com/unifi-poller/promunifi v0.0.7 h1:VylwjZ0qdY6yifMlPTzhvsfaDwdiYgvulKXf 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/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 cea6fe03a8f227176bc8d8562d32ab7a1f17f741 Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Mon, 15 Jun 2020 05:08:50 -0700 Subject: [PATCH 12/15] fixes --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index bcbf7f13..8e8d03a1 100644 --- a/go.mod +++ b/go.mod @@ -13,6 +13,6 @@ require ( github.com/unifi-poller/influxunifi v0.0.9 github.com/unifi-poller/inputunifi v0.0.7-0.20200615115520-4de38005d9e4 github.com/unifi-poller/poller v0.0.6 - github.com/unifi-poller/promunifi v0.0.8-0.20200615115528-b94f4ea4c7fe + github.com/unifi-poller/promunifi v0.0.8-0.20200615120614-b01d14f701d5 github.com/unifi-poller/unifi v0.0.5 ) diff --git a/go.sum b/go.sum index db65c2d1..11a794eb 100644 --- a/go.sum +++ b/go.sum @@ -201,6 +201,8 @@ github.com/unifi-poller/promunifi v0.0.8-0.20200615113800-d557827276cb h1:/vksKD 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/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 8057ef296efd5d5b200e869f29be0b76034e9e97 Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Mon, 15 Jun 2020 05:24:17 -0700 Subject: [PATCH 13/15] fixes --- go.mod | 4 ++-- go.sum | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 8e8d03a1..30e63245 100644 --- a/go.mod +++ b/go.mod @@ -11,8 +11,8 @@ require ( 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-0.20200615115520-4de38005d9e4 + github.com/unifi-poller/inputunifi v0.0.7-0.20200615121955-129eacb5681d github.com/unifi-poller/poller v0.0.6 - github.com/unifi-poller/promunifi v0.0.8-0.20200615120614-b01d14f701d5 + 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 11a794eb..a5f8ecfa 100644 --- a/go.sum +++ b/go.sum @@ -174,6 +174,8 @@ github.com/unifi-poller/inputunifi v0.0.7-0.20200615113835-aa28027f96ca h1:R1ubB 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/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= @@ -203,6 +205,8 @@ github.com/unifi-poller/promunifi v0.0.8-0.20200615115528-b94f4ea4c7fe h1:J4UP0V 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/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 b32a9edebfb42843f5fe03158c36358e6b857d1a Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Mon, 15 Jun 2020 06:05:37 -0700 Subject: [PATCH 14/15] fix --- examples/up.conf.example | 10 +--------- examples/up.json.example | 2 -- examples/up.xml.example | 4 ++-- examples/up.yaml.example | 6 ++---- go.mod | 2 +- go.sum | 2 ++ 6 files changed, 8 insertions(+), 18 deletions(-) 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= From 129ab1286b00e9a55dbaf9815d3f8b005ba40009 Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Mon, 15 Jun 2020 06:44:27 -0700 Subject: [PATCH 15/15] release --- go.mod | 6 +++--- go.sum | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index a7d585ae..8fd69c7e 100644 --- a/go.mod +++ b/go.mod @@ -11,8 +11,8 @@ require ( 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-0.20200615121955-129eacb5681d - 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/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 ) diff --git a/go.sum b/go.sum index ce24c0d4..1ae37013 100644 --- a/go.sum +++ b/go.sum @@ -176,6 +176,8 @@ github.com/unifi-poller/inputunifi v0.0.7-0.20200615115520-4de38005d9e4 h1:KG0Yr 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/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= @@ -187,6 +189,8 @@ github.com/unifi-poller/poller v0.0.6 h1:KhOWUeYI029Nn/4NOIk/yblQ3tEd9QhS+u/8/S9 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/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= @@ -209,6 +213,8 @@ github.com/unifi-poller/promunifi v0.0.8-0.20200615120614-b01d14f701d5 h1:UwZ7oO 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/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=