Repository: prometheus/snmp_exporter
Pull request #697 (2021-10-28 08:52:37)

Update build
* Update to Go 1.17
* Update modules.
* Switch to go-kit/log.
* Fix mixin linting issues.

Signed-off-by: SuperQ <superq@gmail.com>


Patch:
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9ad9718..72e782e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,14 +2,14 @@
 version: 2.1
 
 orbs:
-  prometheus: prometheus/prometheus@0.11.0
+  prometheus: prometheus/prometheus@0.15.0
 
 executors:
   # Whenever the Go version is updated here, .promu.yml
   # should also be updated.
   golang:
     docker:
-    - image: circleci/golang:1.16
+    - image: circleci/golang:1.17
     parameters:
       working_dir:
         type: string
diff --git a/.promu.yml b/.promu.yml
index 7e3619b..8751a8e 100644
--- a/.promu.yml
+++ b/.promu.yml
@@ -1,7 +1,7 @@
 go:
     # Whenever the Go version is updated here,
     # .circle/config.yml should also be updated.
-    version: 1.16
+    version: 1.17
 repository:
     path: github.com/prometheus/snmp_exporter
 build:
diff --git a/Makefile.common b/Makefile.common
index ce80d53..bf7304e 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -78,17 +78,23 @@ ifneq ($(shell which gotestsum),)
 endif
 endif
 
-PROMU_VERSION ?= 0.12.0
+PROMU_VERSION ?= 0.13.0
 PROMU_URL     := https://github.com/prometheus/promu/releases/download/v$(PROMU_VERSION)/promu-$(PROMU_VERSION).$(GO_BUILD_PLATFORM).tar.gz
 
 GOLANGCI_LINT :=
 GOLANGCI_LINT_OPTS ?=
-GOLANGCI_LINT_VERSION ?= v1.39.0
+GOLANGCI_LINT_VERSION ?= v1.42.0
 # golangci-lint only supports linux, darwin and windows platforms on i386/amd64.
 # windows isn't included here because of the path separator being different.
 ifeq ($(GOHOSTOS),$(filter $(GOHOSTOS),linux darwin))
 	ifeq ($(GOHOSTARCH),$(filter $(GOHOSTARCH),amd64 i386))
-		GOLANGCI_LINT := $(FIRST_GOPATH)/bin/golangci-lint
+		# If we're in CI and there is an Actions file, that means the linter
+		# is being run in Actions, so we don't need to run it here.
+		ifeq (,$(CIRCLE_JOB))
+			GOLANGCI_LINT := $(FIRST_GOPATH)/bin/golangci-lint
+		else ifeq (,$(wildcard .github/workflows/golangci-lint.yml))
+			GOLANGCI_LINT := $(FIRST_GOPATH)/bin/golangci-lint
+		endif
 	endif
 endif
 
@@ -118,7 +124,7 @@ endif
 %: common-% ;
 
 .PHONY: common-all
-common-all: precheck style check_license lint unused build test
+common-all: precheck style check_license lint yamllint unused build test
 
 .PHONY: common-style
 common-style:
@@ -154,7 +160,7 @@ endif
 update-go-deps:
 	@echo ">> updating Go dependencies"
 	@for m in $$($(GO) list -mod=readonly -m -f '{{ if and (not .Indirect) (not .Main)}}{{.Path}}{{end}}' all); do \
-		$(GO) get $$m; \
+		$(GO) get -d $$m; \
 	done
 	GO111MODULE=$(GO111MODULE) $(GO) mod tidy
 ifneq (,$(wildcard vendor))
@@ -198,6 +204,15 @@ else
 endif
 endif
 
+.PHONY: common-yamllint
+common-yamllint:
+	@echo ">> running yamllint on all YAML files in the repository"
+ifeq (, $(shell which yamllint))
+	@echo "yamllint not installed so skipping"
+else
+	yamllint .
+endif
+
 # For backward-compatibility.
 .PHONY: common-staticcheck
 common-staticcheck: lint
diff --git a/collector/collector.go b/collector/collector.go
index a6c2329..d927de2 100644
--- a/collector/collector.go
+++ b/collector/collector.go
@@ -22,8 +22,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/go-kit/kit/log"
-	"github.com/go-kit/kit/log/level"
+	"github.com/go-kit/log"
+	"github.com/go-kit/log/level"
 	"github.com/gosnmp/gosnmp"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
diff --git a/generator/main.go b/generator/main.go
index 09ee6eb..a9c9f2a 100644
--- a/generator/main.go
+++ b/generator/main.go
@@ -20,8 +20,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/go-kit/kit/log"
-	"github.com/go-kit/kit/log/level"
+	"github.com/go-kit/log"
+	"github.com/go-kit/log/level"
 	"github.com/prometheus/common/promlog"
 	"github.com/prometheus/common/promlog/flag"
 	"gopkg.in/alecthomas/kingpin.v2"
diff --git a/generator/net_snmp.go b/generator/net_snmp.go
index 5ca1c3c..5cc7daa 100644
--- a/generator/net_snmp.go
+++ b/generator/net_snmp.go
@@ -71,8 +71,8 @@ import (
 	"os"
 	"sort"
 
-	"github.com/go-kit/kit/log"
-	"github.com/go-kit/kit/log/level"
+	"github.com/go-kit/log"
+	"github.com/go-kit/log/level"
 )
 
 // One entry in the tree of the MIB.
diff --git a/generator/tree.go b/generator/tree.go
index cb370fb..f596c99 100644
--- a/generator/tree.go
+++ b/generator/tree.go
@@ -20,8 +20,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/go-kit/kit/log"
-	"github.com/go-kit/kit/log/level"
+	"github.com/go-kit/log"
+	"github.com/go-kit/log/level"
 
 	"github.com/prometheus/snmp_exporter/config"
 )
diff --git a/go.mod b/go.mod
index ce56832..f6d0419 100644
--- a/go.mod
+++ b/go.mod
@@ -1,14 +1,14 @@
 module github.com/prometheus/snmp_exporter
 
 require (
-	github.com/go-kit/kit v0.10.0
-	github.com/gosnmp/gosnmp v1.32.0
-	github.com/prometheus/client_golang v1.10.0
+	github.com/go-kit/log v0.2.0
+	github.com/gosnmp/gosnmp v1.34.0
+	github.com/prometheus/client_golang v1.12.1
 	github.com/prometheus/client_model v0.2.0
-	github.com/prometheus/common v0.23.0
-	github.com/prometheus/exporter-toolkit v0.5.1
+	github.com/prometheus/common v0.32.1
+	github.com/prometheus/exporter-toolkit v0.7.1
 	gopkg.in/alecthomas/kingpin.v2 v2.2.6
 	gopkg.in/yaml.v2 v2.4.0
 )
 
-go 1.14
+go 1.15
diff --git a/go.sum b/go.sum
index 91d71a6..16a96bd 100644
--- a/go.sum
+++ b/go.sum
@@ -1,11 +1,38 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
+cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
+cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
+cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
+cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
+cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
+cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4=
+cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
+cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc=
+cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk=
+cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs=
+cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc=
+cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
+cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
+cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
+cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
+cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
+cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
+cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
+cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
+cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
+cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
+cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
+cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
+cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU=
+cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
+cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
+cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
+cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
+cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
+dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
-github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
-github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
-github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g=
-github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c=
+github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
@@ -13,140 +40,110 @@ 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/alecthomas/units v0.0.0-20190924025748-f65c72e2690d h1:UQZhZ2O0vMHr2cI+DC1Mbh0TJxzA3RcLoMsFw+aXw7E=
 github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
-github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
-github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
-github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
-github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
-github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
-github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A=
-github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU=
-github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
-github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
 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/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
-github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ=
-github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
 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/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE=
+github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
+github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
+github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
+github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
-github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
-github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
-github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
-github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
-github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
-github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
+github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
-github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
-github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
-github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
-github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
-github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
-github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g=
+github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
-github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4=
-github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20=
-github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 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=
-github.com/go-kit/kit v0.10.0 h1:dXFJfIHVvUcpSgDOV+Ne6t7jXri8Tfv2uOLHUZ2XNuo=
-github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o=
+github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
+github.com/go-kit/log v0.2.0 h1:7i2K3eKTos3Vc0enKCfnVcgHh2olr/MyfboYq7cAcFw=
+github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
-github.com/go-logfmt/logfmt v0.5.0 h1:TrB8swr/68K7m9CcGut2g3UOihhbcbiMAYiuTXdEih4=
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
-github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
-github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
+github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA=
+github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
-github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
-github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
+github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
 github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
+github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
 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/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
 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/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM=
 github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 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.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M=
+github.com/google/go-cmp v0.4.1/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/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
+github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
+github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
-github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
-github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
-github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
-github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
-github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
-github.com/gosnmp/gosnmp v1.32.0 h1:gctewmZx5qFI0oHMzRnjETqIZ093d9NgZy9TQr3V0iA=
-github.com/gosnmp/gosnmp v1.32.0/go.mod h1:EIp+qkEpXoVsyZxXKy0AmXQx0mCHMMcIhXXvNDMpgF0=
-github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
-github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
-github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
-github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE=
-github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
-github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
-github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
-github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
-github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
-github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
-github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU=
-github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
-github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
-github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
-github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90=
+github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
+github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
+github.com/gosnmp/gosnmp v1.34.0 h1:p96iiNTTdL4ZYspPC3leSKXiHfE1NiIYffMu9100p5E=
+github.com/gosnmp/gosnmp v1.34.0/go.mod h1:QWTRprXN9haHFof3P96XTDYc46boCGAh5IXp0DniEx4=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
-github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ=
-github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I=
-github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
-github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg=
-github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
-github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
-github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
-github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
+github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA=
 github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
-github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
+github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
+github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
+github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
-github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
@@ -156,117 +153,51 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM=
-github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4=
-github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ=
-github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
-github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
-github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
-github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
 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/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
-github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
-github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
-github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
-github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg=
-github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY=
-github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 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=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU=
 github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg=
-github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU=
-github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k=
-github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w=
-github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
-github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
-github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
-github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs=
-github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
-github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
-github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
-github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis=
-github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74=
-github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
-github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
-github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod h1:/wsWhb9smxSfWAKL3wpBW7V8scJMt8N8gnaMCS9E/cA=
-github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
-github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
-github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
-github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM=
-github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
-github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
-github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac=
-github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc=
-github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 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/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
-github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
-github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og=
 github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
-github.com/prometheus/client_golang v1.10.0 h1:/o0BDeWzLWXNZ+4q5gXltUvaMpJqckTa+jTNoB+z4cg=
-github.com/prometheus/client_golang v1.10.0/go.mod h1:WJM3cc3yu7XKBKa/I8WeZm+V3eltZnBwfENSU7mdogU=
+github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
+github.com/prometheus/client_golang v1.12.1 h1:ZiaPsmm9uiBeaSMRznKsCDNtPCS0T3JVDGF+06gjBzk=
+github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
-github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/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.1.0/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.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 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.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
-github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s=
-github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s=
-github.com/prometheus/common v0.23.0 h1:GXWvPYuTUenIa+BhOq/x+L/QZzCqASkVRny5KTlPDGM=
-github.com/prometheus/common v0.23.0/go.mod h1:H6QK/N6XVT42whUeIdI3dp36w49c+/iMDk7UAI2qm7Q=
-github.com/prometheus/exporter-toolkit v0.5.1 h1:9eqgis5er9xN613ZSADjypCJaDGj9ZlcWBvsIHa8/3c=
-github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg=
+github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
+github.com/prometheus/common v0.29.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
+github.com/prometheus/common v0.32.1 h1:hWIdL3N2HoUx3B8j3YN9mWor0qhY/NlEKZEaXxuIRh4=
+github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
+github.com/prometheus/exporter-toolkit v0.7.1 h1:c6RXaK8xBVercEeUQ4tRNL8UGWzDHfvj9dseo1FcK1Y=
+github.com/prometheus/exporter-toolkit v0.7.1/go.mod h1:ZUBIj498ePooX9t/2xtDjeQYwvRpiPP2lh5u4iblj2g=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/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.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
-github.com/prometheus/procfs v0.6.0 h1:mxy4L2jP6qMonqmq+aTtOx1ifVWUgG/TAmntgbh3xv4=
 github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
-github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
-github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
+github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU=
+github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
-github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E=
-github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
-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/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
-github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
-github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
-github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
-github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY=
-github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
-github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
-github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw=
-github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw=
-github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI=
 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=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
@@ -274,154 +205,284 @@ 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/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
-github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
-github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
-github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
-go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
-go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg=
-go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
-go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
+github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
+go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
+go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
-go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
-go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
-go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=
-go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=
-go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
-go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM=
+go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/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-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9 h1:sYNJzB4J8toYPQTM6pAkcmBRgw9SnQKP9oXCHfgy604=
-golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
+golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e h1:gsTQYXdTw2Gq7RBsWvlQ91b+aEQ6bXFUngBGuR8sPpI=
+golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
+golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
+golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
+golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
+golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
+golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
+golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
+golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
+golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
+golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 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-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
+golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
+golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
 golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
+golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 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-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/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-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/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-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200625001655-4c5254603344 h1:vGXIOMxbNfDTk/aXCmfdLgkrSV+Z2tcbze+pEc3v5W4=
+golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
+golang.org/x/net v0.0.0-20210525063256-abc453219eb5 h1:wjuX4b5yYQnEQHzd+CBcrcC6OVR2J1CN6mUy0oSxIPo=
+golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421 h1:Wo7BWFiOk0QRFMLYMqJGFMd9CgUAcGx7V+qEg/h5IBI=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c h1:pkQiBZBvdos9qq4wBAHqlzuZHEXo07pqV06ef90u1WI=
+golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 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-20190227155943-e225da77a7e6/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/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/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-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/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-20181122145206-62eef0e2fa9b/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-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 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-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+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-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210309074719-68d13333faf2 h1:46ULzRKLh1CwgRq2dC5SlBzEqqNCi8rreOZnNrbqcIY=
-golang.org/x/sys v0.0.0-20210309074719-68d13333faf2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
+golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0=
+golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
+golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 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-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
+golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
+golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
+golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
+google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
+google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
+google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
+google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
+google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
+google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
+google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
+google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
+google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM=
+google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
-google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
+google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+google.golang.org/appengine v1.6.6 h1:lMO5rYAqUxkmaj76jAkRUvt5JZgFymx/+Q5Mzfivuhc=
+google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s=
+google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
+google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
+google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA=
+google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=
+google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
+google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
+google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
-google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
-google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
-google.golang.org/grpc v1.22.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
-google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
+google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
+google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
 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.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM=
+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/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
+google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc=
 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-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
-gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
-gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o=
-gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
-gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
-gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
 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=
@@ -431,9 +492,13 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
-sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
-sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU=
+honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
+honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
+rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
+rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
+rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
diff --git a/main.go b/main.go
index 4f085cc..8ff80f9 100644
--- a/main.go
+++ b/main.go
@@ -23,8 +23,8 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/go-kit/kit/log"
-	"github.com/go-kit/kit/log/level"
+	"github.com/go-kit/log"
+	"github.com/go-kit/log/level"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
diff --git a/snmp-mixin/dashboards/snmp_ubiquiti_access_point.json b/snmp-mixin/dashboards/snmp_ubiquiti_access_point.json
index 194a218..b77b69d 100644
--- a/snmp-mixin/dashboards/snmp_ubiquiti_access_point.json
+++ b/snmp-mixin/dashboards/snmp_ubiquiti_access_point.json
@@ -13,7 +13,7 @@
       {
         "datasource": "default",
         "enable": false,
-        "expr": "ALERTS{instance=~\"$devices\",alertstate=\"firing\"}",
+        "expr": "ALERTS{instance=~\"$instance\",alertstate=\"firing\"}",
         "hide": false,
         "iconColor": "#8F3BB8",
         "limit": 100,
@@ -30,7 +30,7 @@
       {
         "datasource": "default",
         "enable": false,
-        "expr": "ALERTS{instance=~\"$devices\",alertstate=\"pending\"}",
+        "expr": "ALERTS{instance=~\"$instance\",alertstate=\"pending\"}",
         "hide": false,
         "iconColor": "#CA95E5",
         "limit": 100,
@@ -45,7 +45,7 @@
       {
         "datasource": "default",
         "enable": false,
-        "expr": "absent(snmp_scrape_walk_duration_seconds{instance=\"$devices\"})",
+        "expr": "absent(snmp_scrape_walk_duration_seconds{job=~\"$job\",instance=~\"$instance\"})",
         "hide": false,
         "iconColor": "#FF780A",
         "limit": 100,
@@ -62,7 +62,7 @@
       {
         "datasource": "default",
         "enable": false,
-        "expr": "absent(probe_success{job=\"blackbox_icmp\",instance=\"$devices\"} == 1)",
+        "expr": "absent(probe_success{job=~\"blackbox_icmp\",instance=~\"$instance\"} == 1)",
         "hide": false,
         "iconColor": "#3274D9",
         "limit": 100,
@@ -86,7 +86,7 @@
   "panels": [
     {
       "collapsed": false,
-      "datasource": null,
+      "datasource": "$datasource",
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -103,7 +103,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": null,
+      "datasource": "$datasource",
       "description": "How much traffic is on the air and going through this particular access point?",
       "fieldConfig": {
         "defaults": {
@@ -153,13 +153,13 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(irate(unifiVapRxBytes{job=~\"snmp.*\",instance=\"$devices\"}[5m]))*8",
+          "expr": "sum(rate(unifiVapRxBytes{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))*8",
           "interval": "",
           "legendFormat": "In",
           "refId": "A"
         },
         {
-          "expr": "sum(irate(unifiVapTxBytes{job=~\"snmp.*\",instance=\"$devices\"}[5m]))*8",
+          "expr": "sum(rate(unifiVapTxBytes{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))*8",
           "interval": "",
           "legendFormat": "Out",
           "refId": "B"
@@ -213,7 +213,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": null,
+      "datasource": "$datasource",
       "description": "How many packets are on the air and going through this particular access point?\n\nIf this graph spikes up relative to the traffic numbers, you might see degraded overall throughput.",
       "fieldConfig": {
         "defaults": {
@@ -263,37 +263,37 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(irate(unifiVapRxPackets{job=~\"snmp.*\",instance=\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapRxPackets{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "interval": "",
           "legendFormat": "In",
           "refId": "A"
         },
         {
-          "expr": "sum(irate(unifiVapRxDropped{job=~\"snmp.*\",instance=\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapRxDropped{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "interval": "",
           "legendFormat": "In, dropped",
           "refId": "B"
         },
         {
-          "expr": "sum(irate(unifiVapRxErrors{job=~\"snmp.*\",instance=\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapRxErrors{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "interval": "",
           "legendFormat": "In, errors",
           "refId": "C"
         },
         {
-          "expr": "sum(irate(unifiVapTxPackets{job=~\"snmp.*\",instance=\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapTxPackets{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "interval": "",
           "legendFormat": "Out",
           "refId": "D"
         },
         {
-          "expr": "sum(irate(unifiVapTxDropped{job=~\"snmp.*\",instance=\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapTxDropped{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "interval": "",
           "legendFormat": "Out, dropped",
           "refId": "E"
         },
         {
-          "expr": "sum(irate(unifiVapTxErrors{job=~\"snmp.*\",instance=\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapTxErrors{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "interval": "",
           "legendFormat": "Out, errors",
           "refId": "F"
@@ -347,7 +347,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "default",
+      "datasource": "$datasource",
       "description": "How much traffic is coming from and going to this particular access point into the wired network?\n\nIf this empty, the access point is likely in wireless relay mode.",
       "editable": true,
       "error": false,
@@ -407,7 +407,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(irate(ifHCInOctets{instance=\"$devices\",ifName=~\"eth.*\"}[5m]))*8",
+          "expr": "sum(rate(ifHCInOctets{job=~\"$job\",instance=~\"$instance\",ifName=~\"eth.*\"}[$__rate_interval]))*8",
           "format": "time_series",
           "hide": false,
           "interval": "",
@@ -417,7 +417,7 @@
           "step": 10
         },
         {
-          "expr": "sum(irate(ifHCOutOctets{instance=\"$devices\",ifName=~\"eth.*\"}[5m]))*8",
+          "expr": "sum(rate(ifHCOutOctets{job=~\"$job\",instance=~\"$instance\",ifName=~\"eth.*\"}[$__rate_interval]))*8",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 3,
@@ -483,7 +483,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": null,
+      "datasource": "$datasource",
       "description": "How many packets are coming from and going to this particular access point into the wired network?\n\nIf this empty, the access point is likely in wireless relay mode.\n\nIf this graph spikes up relative to the traffic numbers, you might see degraded overall throughput.",
       "fieldConfig": {
         "defaults": {
@@ -533,49 +533,49 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "irate(unifiIfRxPackets{job=~\"snmp.*\",instance=\"$devices\"}[5m])",
+          "expr": "rate(unifiIfRxPackets{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval])",
           "interval": "",
           "legendFormat": "In",
           "refId": "A"
         },
         {
-          "expr": "irate(unifiIfRxMulticast{job=~\"snmp.*\",instance=\"$devices\"}[5m])",
+          "expr": "rate(unifiIfRxMulticast{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval])",
           "interval": "",
           "legendFormat": "In, multicast",
           "refId": "B"
         },
         {
-          "expr": "irate(unifiIfRxDropped{job=~\"snmp.*\",instance=\"$devices\"}[5m])",
+          "expr": "rate(unifiIfRxDropped{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval])",
           "interval": "",
           "legendFormat": "In, dropped",
           "refId": "C"
         },
         {
-          "expr": "irate(unifiIfRxError{job=~\"snmp.*\",instance=\"$devices\"}[5m])",
+          "expr": "rate(unifiIfRxError{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval])",
           "interval": "",
           "legendFormat": "In, error",
           "refId": "D"
         },
         {
-          "expr": "irate(unifiIfTxPackets{job=~\"snmp.*\",instance=\"$devices\"}[5m])",
+          "expr": "rate(unifiIfTxPackets{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval])",
           "interval": "",
           "legendFormat": "Out",
           "refId": "E"
         },
         {
-          "expr": "irate(unifiIfTxMulticast{job=~\"snmp.*\",instance=\"$devices\"}[5m])",
+          "expr": "rate(unifiIfTxMulticast{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval])",
           "interval": "",
           "legendFormat": "Out, multicast",
           "refId": "F"
         },
         {
-          "expr": "irate(unifiIfTxDropped{job=~\"snmp.*\",instance=\"$devices\"}[5m])",
+          "expr": "rate(unifiIfTxDropped{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval])",
           "interval": "",
           "legendFormat": "Out, dropped",
           "refId": "G"
         },
         {
-          "expr": "irate(unifiIfTxError{job=~\"snmp.*\",instance=\"$devices\"}[5m])",
+          "expr": "rate(unifiIfTxError{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval])",
           "interval": "",
           "legendFormat": "Out, error",
           "refId": "H"
@@ -626,7 +626,7 @@
     },
     {
       "collapsed": false,
-      "datasource": null,
+      "datasource": "$datasource",
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -645,7 +645,7 @@
       "cacheTimeout": null,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "default",
+      "datasource": "$datasource",
       "description": "This is the Linux load average as per https://en.wikipedia.org/wiki/Load_(computing)",
       "fieldConfig": {
         "defaults": {
@@ -691,7 +691,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "laLoadFloat{instance=\"$devices\",laIndex=\"1\"}",
+          "expr": "laLoadFloat{job=~\"$job\",instance=~\"$instance\",laIndex=\"1\"}",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "1 minute",
@@ -699,14 +699,14 @@
           "step": 240
         },
         {
-          "expr": "laLoadFloat{instance=\"$devices\",laIndex=\"2\"}",
+          "expr": "laLoadFloat{job=~\"$job\",instance=~\"$instance\",laIndex=\"2\"}",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "5 minutes",
           "refId": "B"
         },
         {
-          "expr": "laLoadFloat{instance=\"$devices\",laIndex=\"3\"}",
+          "expr": "laLoadFloat{job=~\"$job\",instance=~\"$instance\",laIndex=\"3\"}",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "15 minutes",
@@ -761,7 +761,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": null,
+      "datasource": "$datasource",
       "fieldConfig": {
         "defaults": {
           "custom": {}
@@ -812,13 +812,13 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "memTotalReal{instance=\"$devices\"} - memTotalFree{instance=\"$devices\"}",
+          "expr": "memTotalReal{job=~\"$job\",instance=~\"$instance\"} - memTotalFree{job=~\"$job\",instance=~\"$instance\"}",
           "interval": "",
           "legendFormat": "Used, absolute",
           "refId": "A"
         },
         {
-          "expr": "(memTotalReal{instance=\"$devices\"} - memTotalFree{instance=\"$devices\"}) / memTotalReal{instance=\"$devices\"}",
+          "expr": "(memTotalReal{job=~\"$job\",instance=~\"$instance\"} - memTotalFree{job=~\"$job\",instance=~\"$instance\"}) / memTotalReal{job=~\"$job\",instance=~\"$instance\"}",
           "interval": "",
           "legendFormat": "Used, relative",
           "refId": "B"
@@ -869,7 +869,7 @@
       }
     },
     {
-      "datasource": null,
+      "datasource": "$datasource",
       "description": "",
       "fieldConfig": {
         "defaults": {
@@ -899,11 +899,11 @@
       ],
       "timeFrom": null,
       "timeShift": null,
-      "title": "$devices information",
+      "title": "$instance information",
       "type": "text"
     },
     {
-      "datasource": null,
+      "datasource": "$datasource",
       "description": "",
       "fieldConfig": {
         "defaults": {
@@ -933,11 +933,11 @@
       ],
       "timeFrom": null,
       "timeShift": null,
-      "title": "$devices ESSIDs",
+      "title": "$instance ESSIDs",
       "type": "text"
     },
     {
-      "datasource": null,
+      "datasource": "$datasource",
       "description": "",
       "fieldConfig": {
         "defaults": {
@@ -967,7 +967,7 @@
       ],
       "timeFrom": null,
       "timeShift": null,
-      "title": "$devices MAC",
+      "title": "$instance MAC",
       "type": "text"
     },
     {
@@ -975,7 +975,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": null,
+      "datasource": "$datasource",
       "description": "This is split into the internal parts of snmp_exporter to show where any timing problems come from.",
       "fieldConfig": {
         "defaults": {
@@ -1022,21 +1022,21 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "scrape_duration_seconds{job=~\"snmp.*\",instance=\"$devices\"}",
+          "expr": "scrape_duration_seconds{job=~\"$job\",instance=~\"$instance\"}",
           "interval": "",
           "intervalFactor": 4,
           "legendFormat": "Total job, Prometheus point of view",
           "refId": "A"
         },
         {
-          "expr": "snmp_scrape_duration_seconds{job=~\"snmp.*\",instance=\"$devices\"}",
+          "expr": "snmp_scrape_duration_seconds{job=~\"$job\",instance=~\"$instance\"}",
           "interval": "",
           "intervalFactor": 4,
           "legendFormat": "snmp_exporter, internal",
           "refId": "B"
         },
         {
-          "expr": "snmp_scrape_walk_duration_seconds{job=~\"snmp.*\",instance=\"$devices\"}",
+          "expr": "snmp_scrape_walk_duration_seconds{job=~\"$job\",instance=~\"$instance\"}",
           "interval": "",
           "intervalFactor": 4,
           "legendFormat": "snmp_exporter, just SNMP",
@@ -1088,7 +1088,7 @@
     },
     {
       "collapsed": false,
-      "datasource": null,
+      "datasource": "$datasource",
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -1106,7 +1106,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "default",
+      "datasource": "$datasource",
       "editable": true,
       "error": false,
       "fieldConfig": {
@@ -1187,14 +1187,14 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(irate(ifHCInOctets{instance=\"$devices\",ifName=\"$device_interfaces\"}[5m]))*8",
+          "expr": "sum(rate(ifHCInOctets{job=~\"$job\",instance=~\"$instance\",ifName=\"$device_interfaces\"}[$__rate_interval]))*8",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "In {{ifName}}",
           "refId": "E"
         },
         {
-          "expr": "sum(irate(ifHCOutOctets{instance=\"$devices\",ifName=\"$device_interfaces\"}[5m]))*8",
+          "expr": "sum(rate(ifHCOutOctets{job=~\"$job\",instance=~\"$instance\",ifName=\"$device_interfaces\"}[$__rate_interval]))*8",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "Out {{ifName}}",
@@ -1248,7 +1248,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "default",
+      "datasource": "$datasource",
       "editable": true,
       "error": false,
       "fieldConfig": {
@@ -1330,14 +1330,14 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(irate(ifHCInOctets{instance=\"$devices\",ifName=\"$device_interfaces\"}[5m]))*8",
+          "expr": "sum(rate(ifHCInOctets{job=~\"$job\",instance=~\"$instance\",ifName=\"$device_interfaces\"}[$__rate_interval]))*8",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "In {{ifName}}",
           "refId": "E"
         },
         {
-          "expr": "sum(irate(ifHCOutOctets{instance=\"$devices\",ifName=\"$device_interfaces\"}[5m]))*8",
+          "expr": "sum(rate(ifHCOutOctets{job=~\"$job\",instance=~\"$instance\",ifName=\"$device_interfaces\"}[$__rate_interval]))*8",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "Out {{ifName}}",
@@ -1391,7 +1391,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "default",
+      "datasource": "$datasource",
       "editable": true,
       "error": false,
       "fieldConfig": {
@@ -1473,14 +1473,14 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(irate(ifHCInOctets{instance=\"$devices\",ifName=\"$device_interfaces\"}[5m]))*8",
+          "expr": "sum(rate(ifHCInOctets{job=~\"$job\",instance=~\"$instance\",ifName=\"$device_interfaces\"}[$__rate_interval]))*8",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "In {{ifName}}",
           "refId": "E"
         },
         {
-          "expr": "sum(irate(ifHCOutOctets{instance=\"$devices\",ifName=\"$device_interfaces\"}[5m]))*8",
+          "expr": "sum(rate(ifHCOutOctets{job=~\"$job\",instance=~\"$instance\",ifName=\"$device_interfaces\"}[$__rate_interval]))*8",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "Out {{ifName}}",
@@ -1534,7 +1534,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "default",
+      "datasource": "$datasource",
       "editable": true,
       "error": false,
       "fieldConfig": {
@@ -1616,14 +1616,14 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(irate(ifHCInOctets{instance=\"$devices\",ifName=\"$device_interfaces\"}[5m]))*8",
+          "expr": "sum(rate(ifHCInOctets{job=~\"$job\",instance=~\"$instance\",ifName=\"$device_interfaces\"}[$__rate_interval]))*8",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "In {{ifName}}",
           "refId": "E"
         },
         {
-          "expr": "sum(irate(ifHCOutOctets{instance=\"$devices\",ifName=\"$device_interfaces\"}[5m]))*8",
+          "expr": "sum(rate(ifHCOutOctets{job=~\"$job\",instance=~\"$instance\",ifName=\"$device_interfaces\"}[$__rate_interval]))*8",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "Out {{ifName}}",
@@ -1677,7 +1677,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "default",
+      "datasource": "$datasource",
       "editable": true,
       "error": false,
       "fieldConfig": {
@@ -1759,14 +1759,14 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(irate(ifHCInOctets{instance=\"$devices\",ifName=\"$device_interfaces\"}[5m]))*8",
+          "expr": "sum(rate(ifHCInOctets{job=~\"$job\",instance=~\"$instance\",ifName=\"$device_interfaces\"}[$__rate_interval]))*8",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "In {{ifName}}",
           "refId": "E"
         },
         {
-          "expr": "sum(irate(ifHCOutOctets{instance=\"$devices\",ifName=\"$device_interfaces\"}[5m]))*8",
+          "expr": "sum(rate(ifHCOutOctets{job=~\"$job\",instance=~\"$instance\",ifName=\"$device_interfaces\"}[$__rate_interval]))*8",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "Out {{ifName}}",
@@ -1820,7 +1820,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "default",
+      "datasource": "$datasource",
       "editable": true,
       "error": false,
       "fieldConfig": {
@@ -1902,14 +1902,14 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(irate(ifHCInOctets{instance=\"$devices\",ifName=\"$device_interfaces\"}[5m]))*8",
+          "expr": "sum(rate(ifHCInOctets{job=~\"$job\",instance=~\"$instance\",ifName=\"$device_interfaces\"}[$__rate_interval]))*8",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "In {{ifName}}",
           "refId": "E"
         },
         {
-          "expr": "sum(irate(ifHCOutOctets{instance=\"$devices\",ifName=\"$device_interfaces\"}[5m]))*8",
+          "expr": "sum(rate(ifHCOutOctets{job=~\"$job\",instance=~\"$instance\",ifName=\"$device_interfaces\"}[$__rate_interval]))*8",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "Out {{ifName}}",
@@ -1963,7 +1963,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "default",
+      "datasource": "$datasource",
       "editable": true,
       "error": false,
       "fieldConfig": {
@@ -2045,14 +2045,14 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(irate(ifHCInOctets{instance=\"$devices\",ifName=\"$device_interfaces\"}[5m]))*8",
+          "expr": "sum(rate(ifHCInOctets{job=~\"$job\",instance=~\"$instance\",ifName=\"$device_interfaces\"}[$__rate_interval]))*8",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "In {{ifName}}",
           "refId": "E"
         },
         {
-          "expr": "sum(irate(ifHCOutOctets{instance=\"$devices\",ifName=\"$device_interfaces\"}[5m]))*8",
+          "expr": "sum(rate(ifHCOutOctets{job=~\"$job\",instance=~\"$instance\",ifName=\"$device_interfaces\"}[$__rate_interval]))*8",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "Out {{ifName}}",
@@ -2106,7 +2106,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "default",
+      "datasource": "$datasource",
       "editable": true,
       "error": false,
       "fieldConfig": {
@@ -2188,14 +2188,14 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(irate(ifHCInOctets{instance=\"$devices\",ifName=\"$device_interfaces\"}[5m]))*8",
+          "expr": "sum(rate(ifHCInOctets{job=~\"$job\",instance=~\"$instance\",ifName=\"$device_interfaces\"}[$__rate_interval]))*8",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "In {{ifName}}",
           "refId": "E"
         },
         {
-          "expr": "sum(irate(ifHCOutOctets{instance=\"$devices\",ifName=\"$device_interfaces\"}[5m]))*8",
+          "expr": "sum(rate(ifHCOutOctets{job=~\"$job\",instance=~\"$instance\",ifName=\"$device_interfaces\"}[$__rate_interval]))*8",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "Out {{ifName}}",
@@ -2249,7 +2249,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "default",
+      "datasource": "$datasource",
       "editable": true,
       "error": false,
       "fieldConfig": {
@@ -2331,14 +2331,14 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(irate(ifHCInOctets{instance=\"$devices\",ifName=\"$device_interfaces\"}[5m]))*8",
+          "expr": "sum(rate(ifHCInOctets{job=~\"$job\",instance=~\"$instance\",ifName=\"$device_interfaces\"}[$__rate_interval]))*8",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "In {{ifName}}",
           "refId": "E"
         },
         {
-          "expr": "sum(irate(ifHCOutOctets{instance=\"$devices\",ifName=\"$device_interfaces\"}[5m]))*8",
+          "expr": "sum(rate(ifHCOutOctets{job=~\"$job\",instance=~\"$instance\",ifName=\"$device_interfaces\"}[$__rate_interval]))*8",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "Out {{ifName}}",
@@ -2392,7 +2392,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "default",
+      "datasource": "$datasource",
       "editable": true,
       "error": false,
       "fieldConfig": {
@@ -2474,14 +2474,14 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(irate(ifHCInOctets{instance=\"$devices\",ifName=\"$device_interfaces\"}[5m]))*8",
+          "expr": "sum(rate(ifHCInOctets{job=~\"$job\",instance=~\"$instance\",ifName=\"$device_interfaces\"}[$__rate_interval]))*8",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "In {{ifName}}",
           "refId": "E"
         },
         {
-          "expr": "sum(irate(ifHCOutOctets{instance=\"$devices\",ifName=\"$device_interfaces\"}[5m]))*8",
+          "expr": "sum(rate(ifHCOutOctets{job=~\"$job\",instance=~\"$instance\",ifName=\"$device_interfaces\"}[$__rate_interval]))*8",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "Out {{ifName}}",
@@ -2535,7 +2535,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "default",
+      "datasource": "$datasource",
       "editable": true,
       "error": false,
       "fieldConfig": {
@@ -2617,14 +2617,14 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(irate(ifHCInOctets{instance=\"$devices\",ifName=\"$device_interfaces\"}[5m]))*8",
+          "expr": "sum(rate(ifHCInOctets{job=~\"$job\",instance=~\"$instance\",ifName=\"$device_interfaces\"}[$__rate_interval]))*8",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "In {{ifName}}",
           "refId": "E"
         },
         {
-          "expr": "sum(irate(ifHCOutOctets{instance=\"$devices\",ifName=\"$device_interfaces\"}[5m]))*8",
+          "expr": "sum(rate(ifHCOutOctets{job=~\"$job\",instance=~\"$instance\",ifName=\"$device_interfaces\"}[$__rate_interval]))*8",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "Out {{ifName}}",
@@ -2680,27 +2680,79 @@
   "tags": [],
   "templating": {
     "list": [
+      {
+        "current": {
+          "selected": false,
+          "text": "default",
+          "value": "default"
+        },
+        "description": "",
+        "hide": 0,
+        "includeAll": false,
+        "label": "Data Source",
+        "multi": false,
+        "name": "datasource",
+        "options": [],
+        "query": "prometheus",
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "type": "datasource"
+      },
       {
         "allFormat": "pipe",
-        "allValue": null,
+        "allValue": ".+",
         "current": {
           "selected": false,
           "text": "All",
           "value": "All"
         },
-        "datasource": "default",
-        "definition": "label_values(up{job=~\"snmp.*\"}, instance)",
+        "datasource": "$datasource",
+        "definition": "label_values(up{job=~\"snmp.*\"}, job)",
         "description": null,
         "error": null,
         "hide": 0,
         "includeAll": false,
-        "label": "Devices",
-        "multi": false,
+        "label": "job",
+        "multi": true,
         "multiFormat": "pipe",
-        "name": "devices",
+        "name": "job",
+        "options": [],
+        "query": { 
+          "query": "label_values(up{job=~\"snmp.*\"}, job)",
+          "refId": "default-job-Variable-Query"
+        },
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 1,
+        "tagValuesQuery": null,
+        "tags": [],
+        "tagsQuery": null,
+        "type": "query",
+        "useTags": false
+      },
+      {
+        "allFormat": "pipe",
+        "allValue": ".+",
+        "current": {
+          "selected": false,
+          "text": "All",
+          "value": "All"
+        },
+        "datasource": "$datasource",
+        "definition": "label_values(up{job=~\"$job\"}, instance)",
+        "description": null,
+        "error": null,
+        "hide": 0,
+        "includeAll": false,
+        "label": "instance",
+        "multi": true,
+        "multiFormat": "pipe",
+        "name": "instance",
         "options": [],
         "query": {
-          "query": "label_values(up{job=~\"snmp.*\"}, instance)",
+          "query": "label_values(up{job=~\"$job\"}, instance)",
           "refId": "default-devices-Variable-Query"
         },
         "refresh": 1,
@@ -2725,8 +2777,8 @@
             "$__all"
           ]
         },
-        "datasource": "default",
-        "definition": "query_result(ifOperStatus{job=~\"snmp.*\",instance=\"$devices\"}==1)",
+        "datasource": "$datasource",
+        "definition": "query_result(ifOperStatus{job=~\"$job\",instance=~\"$instance\"}==1)",
         "description": null,
         "error": null,
         "hide": 2,
@@ -2737,7 +2789,7 @@
         "name": "device_interfaces",
         "options": [],
         "query": {
-          "query": "query_result(ifOperStatus{job=~\"snmp.*\",instance=\"$devices\"}==1)",
+          "query": "query_result(ifOperStatus{job=~\"$job\",instance=~\"$instance\"}==1)",
           "refId": "default-device_interfaces-Variable-Query"
         },
         "refresh": 1,
@@ -2757,8 +2809,8 @@
           "text": "UAP-nanoHD",
           "value": "UAP-nanoHD"
         },
-        "datasource": "default",
-        "definition": "label_values(unifiApSystemModel{job=~\"snmp.*\",instance=\"$devices\"}, unifiApSystemModel)",
+        "datasource": "$datasource",
+        "definition": "label_values(unifiApSystemModel{job=~\"$job\",instance=~\"$instance\"}, unifiApSystemModel)",
         "description": null,
         "error": null,
         "hide": 2,
@@ -2768,7 +2820,7 @@
         "name": "device_model",
         "options": [],
         "query": {
-          "query": "label_values(unifiApSystemModel{job=~\"snmp.*\",instance=\"$devices\"}, unifiApSystemModel)",
+          "query": "label_values(unifiApSystemModel{job=~\"$job\",instance=~\"$instance\"}, unifiApSystemModel)",
           "refId": "default-device_model-Variable-Query"
         },
         "refresh": 1,
@@ -2788,8 +2840,8 @@
           "text": "5.43.23.12533",
           "value": "5.43.23.12533"
         },
-        "datasource": "default",
-        "definition": "label_values(unifiApSystemVersion{job=~\"snmp.*\",instance=\"$devices\"}, unifiApSystemVersion)",
+        "datasource": "$datasource",
+        "definition": "label_values(unifiApSystemVersion{job=~\"$job\",instance=~\"$instance\"}, unifiApSystemVersion)",
         "description": null,
         "error": null,
         "hide": 2,
@@ -2799,7 +2851,7 @@
         "name": "device_firmware_version",
         "options": [],
         "query": {
-          "query": "label_values(unifiApSystemVersion{job=~\"snmp.*\",instance=\"$devices\"}, unifiApSystemVersion)",
+          "query": "label_values(unifiApSystemVersion{job=~\"$job\",instance=~\"$instance\"}, unifiApSystemVersion)",
           "refId": "default-device_firmware_version-Variable-Query"
         },
         "refresh": 1,
@@ -2823,8 +2875,8 @@
             "$__all"
           ]
         },
-        "datasource": "default",
-        "definition": "label_values(ifPhysAddress{job=~\"snmp.*\",instance=\"$devices\"}, ifPhysAddress)",
+        "datasource": "$datasource",
+        "definition": "label_values(ifPhysAddress{job=~\"$job\",instance=~\"$instance\"}, ifPhysAddress)",
         "description": null,
         "error": null,
         "hide": 2,
@@ -2834,7 +2886,7 @@
         "name": "device_mac_addresses",
         "options": [],
         "query": {
-          "query": "label_values(ifPhysAddress{job=~\"snmp.*\",instance=\"$devices\"}, ifPhysAddress)",
+          "query": "label_values(ifPhysAddress{job=~\"$job\",instance=~\"$instance\"}, ifPhysAddress)",
           "refId": "default-device_mac_addresses-Variable-Query"
         },
         "refresh": 1,
@@ -2854,8 +2906,8 @@
           "text": "All",
           "value": "All"
         },
-        "datasource": "default",
-        "definition": "label_values(unifiApSystemIp{job=~\"snmp.*\",instance=\"$devices\"}, unifiApSystemIp)",
+        "datasource": "$datasource",
+        "definition": "label_values(unifiApSystemIp{job=~\"$job\",instance=~\"$instance\"}, unifiApSystemIp)",
         "description": null,
         "error": null,
         "hide": 2,
@@ -2865,7 +2917,7 @@
         "name": "device_main_ip",
         "options": [],
         "query": {
-          "query": "label_values(unifiApSystemIp{job=~\"snmp.*\",instance=\"$devices\"}, unifiApSystemIp)",
+          "query": "label_values(unifiApSystemIp{job=~\"$job\",instance=~\"$instance\"}, unifiApSystemIp)",
           "refId": "default-device_main_ip-Variable-Query"
         },
         "refresh": 1,
@@ -2890,8 +2942,8 @@
             "$__all"
           ]
         },
-        "datasource": "default",
-        "definition": "label_values(unifiVapEssId{job=~\"snmp.*\",instance=\"$devices\"}, unifiVapEssId)",
+        "datasource": "$datasource",
+        "definition": "label_values(unifiVapEssId{job=~\"$job\",instance=~\"$instance\"}, unifiVapEssId)",
         "description": null,
         "error": null,
         "hide": 2,
@@ -2902,7 +2954,7 @@
         "name": "device_ESSIDs",
         "options": [],
         "query": {
-          "query": "label_values(unifiVapEssId{job=~\"snmp.*\",instance=\"$devices\"}, unifiVapEssId)",
+          "query": "label_values(unifiVapEssId{job=~\"$job\",instance=~\"$instance\"}, unifiVapEssId)",
           "refId": "default-device_ESSIDs-Variable-Query"
         },
         "refresh": 1,
diff --git a/snmp-mixin/dashboards/snmp_ubiquiti_wifi.json b/snmp-mixin/dashboards/snmp_ubiquiti_wifi.json
index c8f5f2e..d293011 100644
--- a/snmp-mixin/dashboards/snmp_ubiquiti_wifi.json
+++ b/snmp-mixin/dashboards/snmp_ubiquiti_wifi.json
@@ -13,7 +13,7 @@
       {
         "datasource": "default",
         "enable": false,
-        "expr": "ALERTS{instance=~\"$devices\",alertstate=\"firing\"}",
+        "expr": "ALERTS{instance=~\"$instance\",alertstate=\"firing\"}",
         "hide": false,
         "iconColor": "#8F3BB8",
         "limit": 100,
@@ -30,7 +30,7 @@
       {
         "datasource": "default",
         "enable": false,
-        "expr": "ALERTS{instance=~\"$devices\",alertstate=\"pending\"}",
+        "expr": "ALERTS{instance=~\"$instance\",alertstate=\"pending\"}",
         "hide": false,
         "iconColor": "#CA95E5",
         "limit": 100,
@@ -45,7 +45,7 @@
       {
         "datasource": "default",
         "enable": false,
-        "expr": "absent(snmp_scrape_walk_duration_seconds{instance=\"$devices\"})",
+        "expr": "absent(snmp_scrape_walk_duration_seconds{instance=\"$instance\"})",
         "hide": false,
         "iconColor": "#FF780A",
         "limit": 100,
@@ -62,7 +62,7 @@
       {
         "datasource": "default",
         "enable": false,
-        "expr": "absent(probe_success{job=\"blackbox_icmp\",instance=\"$devices\"} == 1)",
+        "expr": "absent(probe_success{job=\"blackbox_icmp\",instance=\"$instance\"} == 1)",
         "hide": false,
         "iconColor": "#3274D9",
         "limit": 100,
@@ -86,7 +86,7 @@
   "panels": [
     {
       "collapsed": false,
-      "datasource": null,
+      "datasource": "$datasource",
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -104,7 +104,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": null,
+      "datasource": "$datasource",
       "description": "This is the global overview of all wireless traffic coming from and going to the access points.",
       "fieldConfig": {
         "defaults": {
@@ -154,13 +154,13 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(irate(unifiVapRxBytes{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))*8",
+          "expr": "sum(rate(unifiVapRxBytes{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))*8",
           "interval": "",
           "legendFormat": "In",
           "refId": "A"
         },
         {
-          "expr": "sum(irate(unifiVapTxBytes{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))*8",
+          "expr": "sum(rate(unifiVapTxBytes{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))*8",
           "interval": "",
           "legendFormat": "Out",
           "refId": "B"
@@ -214,7 +214,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": null,
+      "datasource": "$datasource",
       "description": "This is the global overview of all wireless traffic coming from and going to the access points.\n\nIf this graph spikes up relative to the traffic numbers, you might see degraded overall throughput.",
       "fieldConfig": {
         "defaults": {
@@ -264,37 +264,37 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(irate(unifiVapRxPackets{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapRxPackets{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "interval": "",
           "legendFormat": "In",
           "refId": "A"
         },
         {
-          "expr": "sum(irate(unifiVapRxDropped{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapRxDropped{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "interval": "",
           "legendFormat": "In, dropped",
           "refId": "B"
         },
         {
-          "expr": "sum(irate(unifiVapRxErrors{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapRxErrors{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "interval": "",
           "legendFormat": "In, errors",
           "refId": "C"
         },
         {
-          "expr": "sum(irate(unifiVapTxPackets{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapTxPackets{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "interval": "",
           "legendFormat": "Out",
           "refId": "D"
         },
         {
-          "expr": "sum(irate(unifiVapTxDropped{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapTxDropped{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "interval": "",
           "legendFormat": "Out, dropped",
           "refId": "E"
         },
         {
-          "expr": "sum(irate(unifiVapTxErrors{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapTxErrors{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "interval": "",
           "legendFormat": "Out, errors",
           "refId": "F"
@@ -348,7 +348,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "default",
+      "datasource": "$datasource",
       "description": "This is the global overview of all traffic coming from and going to the access points through the wired network.",
       "editable": true,
       "error": false,
@@ -408,7 +408,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(irate(ifHCInOctets{instance=~\"$devices\",ifName=~\"eth.*\"}[5m]))*8",
+          "expr": "sum(rate(ifHCInOctets{job=~\"$job\",instance=~\"$instance\",ifName=~\"eth.*\"}[$__rate_interval]))*8",
           "format": "time_series",
           "hide": false,
           "interval": "",
@@ -418,7 +418,7 @@
           "step": 10
         },
         {
-          "expr": "sum(irate(ifHCOutOctets{instance=~\"$devices\",ifName=~\"eth.*\"}[5m]))*8",
+          "expr": "sum(rate(ifHCOutOctets{job=~\"$job\",instance=~\"$instance\",ifName=~\"eth.*\"}[$__rate_interval]))*8",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 3,
@@ -484,7 +484,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": null,
+      "datasource": "$datasource",
       "description": "This is the global overview of all packets coming from and going to the access points through the wired network.\n\nIf this graph spikes up relative to the traffic numbers, you might see degraded overall throughput.",
       "fieldConfig": {
         "defaults": {
@@ -534,49 +534,49 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(irate(unifiIfRxPackets{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiIfRxPackets{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "interval": "",
           "legendFormat": "In",
           "refId": "A"
         },
         {
-          "expr": "sum(irate(unifiIfRxMulticast{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiIfRxMulticast{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "interval": "",
           "legendFormat": "In, multicast",
           "refId": "B"
         },
         {
-          "expr": "sum(irate(unifiIfRxDropped{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiIfRxDropped{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "interval": "",
           "legendFormat": "In, dropped",
           "refId": "C"
         },
         {
-          "expr": "sum(irate(unifiIfRxError{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiIfRxError{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "interval": "",
           "legendFormat": "In, error",
           "refId": "D"
         },
         {
-          "expr": "sum(irate(unifiIfTxPackets{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiIfTxPackets{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "interval": "",
           "legendFormat": "Out",
           "refId": "E"
         },
         {
-          "expr": "sum(irate(unifiIfTxMulticast{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiIfTxMulticast{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "interval": "",
           "legendFormat": "Out, multicast",
           "refId": "F"
         },
         {
-          "expr": "sum(irate(unifiIfTxDropped{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiIfTxDropped{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "interval": "",
           "legendFormat": "Out, dropped",
           "refId": "G"
         },
         {
-          "expr": "sum(irate(unifiIfTxError{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiIfTxError{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "interval": "",
           "legendFormat": "Out, error",
           "refId": "H"
@@ -626,7 +626,7 @@
       }
     },
     {
-      "datasource": null,
+      "datasource": "$datasource",
       "description": "",
       "fieldConfig": {
         "defaults": {
@@ -660,7 +660,7 @@
       "type": "text"
     },
     {
-      "datasource": null,
+      "datasource": "$datasource",
       "description": "",
       "fieldConfig": {
         "defaults": {
@@ -690,7 +690,7 @@
       ],
       "timeFrom": null,
       "timeShift": null,
-      "title": "$devices ESSIDs",
+      "title": "$instance ESSIDs",
       "type": "text"
     },
     {
@@ -698,7 +698,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": null,
+      "datasource": "$datasource",
       "description": "If any device is consistently above the others, this might indicate a problem. Consider rebooting that device, upgrading it, or putting another one nearby to reduce load.",
       "fieldConfig": {
         "defaults": {
@@ -745,7 +745,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "topk(3,scrape_duration_seconds{job=~\"snmp.*\",instance=~\"$devices\"})",
+          "expr": "topk(3,scrape_duration_seconds{job=~\"$job\",instance=~\"$instance\"})",
           "interval": "",
           "intervalFactor": 4,
           "legendFormat": "{{instance}}",
@@ -797,7 +797,7 @@
     },
     {
       "collapsed": false,
-      "datasource": null,
+      "datasource": "$datasource",
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -814,7 +814,7 @@
           "value": "All"
         }
       },
-      "title": "Device: $devices",
+      "title": "Device: $instance",
       "type": "row"
     },
     {
@@ -822,7 +822,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "default",
+      "datasource": "$datasource",
       "editable": true,
       "error": false,
       "fieldConfig": {
@@ -861,7 +861,7 @@
       "links": [
         {
           "targetBlank": true,
-          "title": "$devices drilldown",
+          "title": "$instance drilldown",
           "url": "d/RQ7zUC8Gk/snmp-ubiquiti-access-point?orgId=1?devices=${devices:queryparam}"
         }
       ],
@@ -909,14 +909,14 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(irate(unifiVapRxBytes{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))*8",
+          "expr": "sum(rate(unifiVapRxBytes{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))*8",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "In {{ifName}}",
           "refId": "E"
         },
         {
-          "expr": "sum(irate(unifiVapTxBytes{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))*8",
+          "expr": "sum(rate(unifiVapTxBytes{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))*8",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "Out {{ifName}}",
@@ -927,7 +927,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Traffic on air - $devices",
+      "title": "Traffic on air - $instance",
       "tooltip": {
         "msResolution": false,
         "shared": true,
@@ -970,7 +970,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "default",
+      "datasource": "$datasource",
       "editable": true,
       "error": false,
       "fieldConfig": {
@@ -1038,42 +1038,42 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(irate(unifiVapRxPackets{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapRxPackets{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "hide": false,
           "interval": "",
           "legendFormat": "In",
           "refId": "A"
         },
         {
-          "expr": "sum(irate(unifiVapRxDropped{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapRxDropped{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "hide": false,
           "interval": "",
           "legendFormat": "In, dropped",
           "refId": "B"
         },
         {
-          "expr": "sum(irate(unifiVapRxErrors{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapRxErrors{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "hide": false,
           "interval": "",
           "legendFormat": "In, errors",
           "refId": "C"
         },
         {
-          "expr": "sum(irate(unifiVapTxPackets{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapTxPackets{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "hide": false,
           "interval": "",
           "legendFormat": "Out",
           "refId": "D"
         },
         {
-          "expr": "sum(irate(unifiVapTxDropped{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapTxDropped{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "hide": false,
           "interval": "",
           "legendFormat": "Out, dropped",
           "refId": "E"
         },
         {
-          "expr": "sum(irate(unifiVapTxErrors{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapTxErrors{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "hide": false,
           "interval": "",
           "legendFormat": "Out, errors",
@@ -1084,7 +1084,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Packets on the air - $devices",
+      "title": "Packets on the air - $instance",
       "tooltip": {
         "msResolution": false,
         "shared": true,
@@ -1124,7 +1124,7 @@
     },
     {
       "collapsed": false,
-      "datasource": null,
+      "datasource": "$datasource",
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -1142,7 +1142,7 @@
           "value": "192.168.178.70"
         }
       },
-      "title": "Device: $devices",
+      "title": "Device: $instance",
       "type": "row"
     },
     {
@@ -1150,7 +1150,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "default",
+      "datasource": "$datasource",
       "editable": true,
       "error": false,
       "fieldConfig": {
@@ -1189,7 +1189,7 @@
       "links": [
         {
           "targetBlank": true,
-          "title": "$devices drilldown",
+          "title": "$instance drilldown",
           "url": "d/RQ7zUC8Gk/snmp-ubiquiti-access-point?orgId=1?devices=${devices:queryparam}"
         }
       ],
@@ -1240,14 +1240,14 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(irate(unifiVapRxBytes{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))*8",
+          "expr": "sum(rate(unifiVapRxBytes{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))*8",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "In {{ifName}}",
           "refId": "E"
         },
         {
-          "expr": "sum(irate(unifiVapTxBytes{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))*8",
+          "expr": "sum(rate(unifiVapTxBytes{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))*8",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "Out {{ifName}}",
@@ -1258,7 +1258,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Traffic on air - $devices",
+      "title": "Traffic on air - $instance",
       "tooltip": {
         "msResolution": false,
         "shared": true,
@@ -1301,7 +1301,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "default",
+      "datasource": "$datasource",
       "editable": true,
       "error": false,
       "fieldConfig": {
@@ -1372,42 +1372,42 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(irate(unifiVapRxPackets{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapRxPackets{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "hide": false,
           "interval": "",
           "legendFormat": "In",
           "refId": "A"
         },
         {
-          "expr": "sum(irate(unifiVapRxDropped{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapRxDropped{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "hide": false,
           "interval": "",
           "legendFormat": "In, dropped",
           "refId": "B"
         },
         {
-          "expr": "sum(irate(unifiVapRxErrors{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapRxErrors{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "hide": false,
           "interval": "",
           "legendFormat": "In, errors",
           "refId": "C"
         },
         {
-          "expr": "sum(irate(unifiVapTxPackets{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapTxPackets{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "hide": false,
           "interval": "",
           "legendFormat": "Out",
           "refId": "D"
         },
         {
-          "expr": "sum(irate(unifiVapTxDropped{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapTxDropped{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "hide": false,
           "interval": "",
           "legendFormat": "Out, dropped",
           "refId": "E"
         },
         {
-          "expr": "sum(irate(unifiVapTxErrors{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapTxErrors{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "hide": false,
           "interval": "",
           "legendFormat": "Out, errors",
@@ -1418,7 +1418,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Packets on the air - $devices",
+      "title": "Packets on the air - $instance",
       "tooltip": {
         "msResolution": false,
         "shared": true,
@@ -1458,7 +1458,7 @@
     },
     {
       "collapsed": false,
-      "datasource": null,
+      "datasource": "$datasource",
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -1476,7 +1476,7 @@
           "value": "All"
         }
       },
-      "title": "Device: $devices",
+      "title": "Device: $instance",
       "type": "row"
     },
     {
@@ -1484,7 +1484,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "default",
+      "datasource": "$datasource",
       "editable": true,
       "error": false,
       "fieldConfig": {
@@ -1523,7 +1523,7 @@
       "links": [
         {
           "targetBlank": true,
-          "title": "$devices drilldown",
+          "title": "$instance drilldown",
           "url": "d/RQ7zUC8Gk/snmp-ubiquiti-access-point?orgId=1?devices=${devices:queryparam}"
         }
       ],
@@ -1574,14 +1574,14 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(irate(unifiVapRxBytes{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))*8",
+          "expr": "sum(rate(unifiVapRxBytes{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))*8",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "In {{ifName}}",
           "refId": "E"
         },
         {
-          "expr": "sum(irate(unifiVapTxBytes{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))*8",
+          "expr": "sum(rate(unifiVapTxBytes{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))*8",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "Out {{ifName}}",
@@ -1592,7 +1592,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Traffic on air - $devices",
+      "title": "Traffic on air - $instance",
       "tooltip": {
         "msResolution": false,
         "shared": true,
@@ -1635,7 +1635,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "default",
+      "datasource": "$datasource",
       "editable": true,
       "error": false,
       "fieldConfig": {
@@ -1706,42 +1706,42 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(irate(unifiVapRxPackets{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapRxPackets{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "hide": false,
           "interval": "",
           "legendFormat": "In",
           "refId": "A"
         },
         {
-          "expr": "sum(irate(unifiVapRxDropped{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapRxDropped{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "hide": false,
           "interval": "",
           "legendFormat": "In, dropped",
           "refId": "B"
         },
         {
-          "expr": "sum(irate(unifiVapRxErrors{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapRxErrors{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "hide": false,
           "interval": "",
           "legendFormat": "In, errors",
           "refId": "C"
         },
         {
-          "expr": "sum(irate(unifiVapTxPackets{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapTxPackets{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "hide": false,
           "interval": "",
           "legendFormat": "Out",
           "refId": "D"
         },
         {
-          "expr": "sum(irate(unifiVapTxDropped{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapTxDropped{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "hide": false,
           "interval": "",
           "legendFormat": "Out, dropped",
           "refId": "E"
         },
         {
-          "expr": "sum(irate(unifiVapTxErrors{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapTxErrors{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "hide": false,
           "interval": "",
           "legendFormat": "Out, errors",
@@ -1752,7 +1752,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Packets on the air - $devices",
+      "title": "Packets on the air - $instance",
       "tooltip": {
         "msResolution": false,
         "shared": true,
@@ -1792,7 +1792,7 @@
     },
     {
       "collapsed": false,
-      "datasource": null,
+      "datasource": "$datasource",
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -1810,7 +1810,7 @@
           "value": "All"
         }
       },
-      "title": "Device: $devices",
+      "title": "Device: $instance",
       "type": "row"
     },
     {
@@ -1818,7 +1818,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "default",
+      "datasource": "$datasource",
       "editable": true,
       "error": false,
       "fieldConfig": {
@@ -1857,7 +1857,7 @@
       "links": [
         {
           "targetBlank": true,
-          "title": "$devices drilldown",
+          "title": "$instance drilldown",
           "url": "d/RQ7zUC8Gk/snmp-ubiquiti-access-point?orgId=1?devices=${devices:queryparam}"
         }
       ],
@@ -1908,14 +1908,14 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(irate(unifiVapRxBytes{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))*8",
+          "expr": "sum(rate(unifiVapRxBytes{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))*8",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "In {{ifName}}",
           "refId": "E"
         },
         {
-          "expr": "sum(irate(unifiVapTxBytes{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))*8",
+          "expr": "sum(rate(unifiVapTxBytes{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))*8",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "Out {{ifName}}",
@@ -1926,7 +1926,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Traffic on air - $devices",
+      "title": "Traffic on air - $instance",
       "tooltip": {
         "msResolution": false,
         "shared": true,
@@ -1969,7 +1969,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "default",
+      "datasource": "$datasource",
       "editable": true,
       "error": false,
       "fieldConfig": {
@@ -2040,42 +2040,42 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(irate(unifiVapRxPackets{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapRxPackets{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "hide": false,
           "interval": "",
           "legendFormat": "In",
           "refId": "A"
         },
         {
-          "expr": "sum(irate(unifiVapRxDropped{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapRxDropped{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "hide": false,
           "interval": "",
           "legendFormat": "In, dropped",
           "refId": "B"
         },
         {
-          "expr": "sum(irate(unifiVapRxErrors{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapRxErrors{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "hide": false,
           "interval": "",
           "legendFormat": "In, errors",
           "refId": "C"
         },
         {
-          "expr": "sum(irate(unifiVapTxPackets{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapTxPackets{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "hide": false,
           "interval": "",
           "legendFormat": "Out",
           "refId": "D"
         },
         {
-          "expr": "sum(irate(unifiVapTxDropped{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapTxDropped{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "hide": false,
           "interval": "",
           "legendFormat": "Out, dropped",
           "refId": "E"
         },
         {
-          "expr": "sum(irate(unifiVapTxErrors{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapTxErrors{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "hide": false,
           "interval": "",
           "legendFormat": "Out, errors",
@@ -2086,7 +2086,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Packets on the air - $devices",
+      "title": "Packets on the air - $instance",
       "tooltip": {
         "msResolution": false,
         "shared": true,
@@ -2126,7 +2126,7 @@
     },
     {
       "collapsed": false,
-      "datasource": null,
+      "datasource": "$datasource",
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -2144,7 +2144,7 @@
           "value": "All"
         }
       },
-      "title": "Device: $devices",
+      "title": "Device: $instance",
       "type": "row"
     },
     {
@@ -2152,7 +2152,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "default",
+      "datasource": "$datasource",
       "editable": true,
       "error": false,
       "fieldConfig": {
@@ -2191,7 +2191,7 @@
       "links": [
         {
           "targetBlank": true,
-          "title": "$devices drilldown",
+          "title": "$instance drilldown",
           "url": "d/RQ7zUC8Gk/snmp-ubiquiti-access-point?orgId=1?devices=${devices:queryparam}"
         }
       ],
@@ -2242,14 +2242,14 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(irate(unifiVapRxBytes{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))*8",
+          "expr": "sum(rate(unifiVapRxBytes{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))*8",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "In {{ifName}}",
           "refId": "E"
         },
         {
-          "expr": "sum(irate(unifiVapTxBytes{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))*8",
+          "expr": "sum(rate(unifiVapTxBytes{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))*8",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "Out {{ifName}}",
@@ -2260,7 +2260,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Traffic on air - $devices",
+      "title": "Traffic on air - $instance",
       "tooltip": {
         "msResolution": false,
         "shared": true,
@@ -2303,7 +2303,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "default",
+      "datasource": "$datasource",
       "editable": true,
       "error": false,
       "fieldConfig": {
@@ -2374,42 +2374,42 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(irate(unifiVapRxPackets{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapRxPackets{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "hide": false,
           "interval": "",
           "legendFormat": "In",
           "refId": "A"
         },
         {
-          "expr": "sum(irate(unifiVapRxDropped{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapRxDropped{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "hide": false,
           "interval": "",
           "legendFormat": "In, dropped",
           "refId": "B"
         },
         {
-          "expr": "sum(irate(unifiVapRxErrors{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapRxErrors{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "hide": false,
           "interval": "",
           "legendFormat": "In, errors",
           "refId": "C"
         },
         {
-          "expr": "sum(irate(unifiVapTxPackets{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapTxPackets{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "hide": false,
           "interval": "",
           "legendFormat": "Out",
           "refId": "D"
         },
         {
-          "expr": "sum(irate(unifiVapTxDropped{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapTxDropped{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "hide": false,
           "interval": "",
           "legendFormat": "Out, dropped",
           "refId": "E"
         },
         {
-          "expr": "sum(irate(unifiVapTxErrors{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapTxErrors{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "hide": false,
           "interval": "",
           "legendFormat": "Out, errors",
@@ -2420,7 +2420,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Packets on the air - $devices",
+      "title": "Packets on the air - $instance",
       "tooltip": {
         "msResolution": false,
         "shared": true,
@@ -2460,7 +2460,7 @@
     },
     {
       "collapsed": false,
-      "datasource": null,
+      "datasource": "$datasource",
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -2478,7 +2478,7 @@
           "value": "All"
         }
       },
-      "title": "Device: $devices",
+      "title": "Device: $instance",
       "type": "row"
     },
     {
@@ -2486,7 +2486,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "default",
+      "datasource": "$datasource",
       "editable": true,
       "error": false,
       "fieldConfig": {
@@ -2525,7 +2525,7 @@
       "links": [
         {
           "targetBlank": true,
-          "title": "$devices drilldown",
+          "title": "$instance drilldown",
           "url": "d/RQ7zUC8Gk/snmp-ubiquiti-access-point?orgId=1?devices=${devices:queryparam}"
         }
       ],
@@ -2576,14 +2576,14 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(irate(unifiVapRxBytes{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))*8",
+          "expr": "sum(rate(unifiVapRxBytes{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))*8",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "In {{ifName}}",
           "refId": "E"
         },
         {
-          "expr": "sum(irate(unifiVapTxBytes{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))*8",
+          "expr": "sum(rate(unifiVapTxBytes{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))*8",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "Out {{ifName}}",
@@ -2594,7 +2594,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Traffic on air - $devices",
+      "title": "Traffic on air - $instance",
       "tooltip": {
         "msResolution": false,
         "shared": true,
@@ -2637,7 +2637,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "default",
+      "datasource": "$datasource",
       "editable": true,
       "error": false,
       "fieldConfig": {
@@ -2708,42 +2708,42 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(irate(unifiVapRxPackets{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapRxPackets{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "hide": false,
           "interval": "",
           "legendFormat": "In",
           "refId": "A"
         },
         {
-          "expr": "sum(irate(unifiVapRxDropped{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapRxDropped{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "hide": false,
           "interval": "",
           "legendFormat": "In, dropped",
           "refId": "B"
         },
         {
-          "expr": "sum(irate(unifiVapRxErrors{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapRxErrors{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "hide": false,
           "interval": "",
           "legendFormat": "In, errors",
           "refId": "C"
         },
         {
-          "expr": "sum(irate(unifiVapTxPackets{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapTxPackets{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "hide": false,
           "interval": "",
           "legendFormat": "Out",
           "refId": "D"
         },
         {
-          "expr": "sum(irate(unifiVapTxDropped{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapTxDropped{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "hide": false,
           "interval": "",
           "legendFormat": "Out, dropped",
           "refId": "E"
         },
         {
-          "expr": "sum(irate(unifiVapTxErrors{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapTxErrors{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "hide": false,
           "interval": "",
           "legendFormat": "Out, errors",
@@ -2754,7 +2754,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Packets on the air - $devices",
+      "title": "Packets on the air - $instance",
       "tooltip": {
         "msResolution": false,
         "shared": true,
@@ -2794,7 +2794,7 @@
     },
     {
       "collapsed": false,
-      "datasource": null,
+      "datasource": "$datasource",
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -2812,7 +2812,7 @@
           "value": "All"
         }
       },
-      "title": "Device: $devices",
+      "title": "Device: $instance",
       "type": "row"
     },
     {
@@ -2820,7 +2820,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "default",
+      "datasource": "$datasource",
       "editable": true,
       "error": false,
       "fieldConfig": {
@@ -2859,7 +2859,7 @@
       "links": [
         {
           "targetBlank": true,
-          "title": "$devices drilldown",
+          "title": "$instance drilldown",
           "url": "d/RQ7zUC8Gk/snmp-ubiquiti-access-point?orgId=1?devices=${devices:queryparam}"
         }
       ],
@@ -2910,14 +2910,14 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(irate(unifiVapRxBytes{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))*8",
+          "expr": "sum(rate(unifiVapRxBytes{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))*8",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "In {{ifName}}",
           "refId": "E"
         },
         {
-          "expr": "sum(irate(unifiVapTxBytes{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))*8",
+          "expr": "sum(rate(unifiVapTxBytes{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))*8",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "Out {{ifName}}",
@@ -2928,7 +2928,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Traffic on air - $devices",
+      "title": "Traffic on air - $instance",
       "tooltip": {
         "msResolution": false,
         "shared": true,
@@ -2971,7 +2971,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "default",
+      "datasource": "$datasource",
       "editable": true,
       "error": false,
       "fieldConfig": {
@@ -3042,42 +3042,42 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(irate(unifiVapRxPackets{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapRxPackets{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "hide": false,
           "interval": "",
           "legendFormat": "In",
           "refId": "A"
         },
         {
-          "expr": "sum(irate(unifiVapRxDropped{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapRxDropped{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "hide": false,
           "interval": "",
           "legendFormat": "In, dropped",
           "refId": "B"
         },
         {
-          "expr": "sum(irate(unifiVapRxErrors{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapRxErrors{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "hide": false,
           "interval": "",
           "legendFormat": "In, errors",
           "refId": "C"
         },
         {
-          "expr": "sum(irate(unifiVapTxPackets{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapTxPackets{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "hide": false,
           "interval": "",
           "legendFormat": "Out",
           "refId": "D"
         },
         {
-          "expr": "sum(irate(unifiVapTxDropped{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapTxDropped{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "hide": false,
           "interval": "",
           "legendFormat": "Out, dropped",
           "refId": "E"
         },
         {
-          "expr": "sum(irate(unifiVapTxErrors{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapTxErrors{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "hide": false,
           "interval": "",
           "legendFormat": "Out, errors",
@@ -3088,7 +3088,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Packets on the air - $devices",
+      "title": "Packets on the air - $instance",
       "tooltip": {
         "msResolution": false,
         "shared": true,
@@ -3128,7 +3128,7 @@
     },
     {
       "collapsed": false,
-      "datasource": null,
+      "datasource": "$datasource",
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -3146,7 +3146,7 @@
           "value": "All"
         }
       },
-      "title": "Device: $devices",
+      "title": "Device: $instance",
       "type": "row"
     },
     {
@@ -3154,7 +3154,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "default",
+      "datasource": "$datasource",
       "editable": true,
       "error": false,
       "fieldConfig": {
@@ -3193,7 +3193,7 @@
       "links": [
         {
           "targetBlank": true,
-          "title": "$devices drilldown",
+          "title": "$instance drilldown",
           "url": "d/RQ7zUC8Gk/snmp-ubiquiti-access-point?orgId=1?devices=${devices:queryparam}"
         }
       ],
@@ -3244,14 +3244,14 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(irate(unifiVapRxBytes{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))*8",
+          "expr": "sum(rate(unifiVapRxBytes{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))*8",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "In {{ifName}}",
           "refId": "E"
         },
         {
-          "expr": "sum(irate(unifiVapTxBytes{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))*8",
+          "expr": "sum(rate(unifiVapTxBytes{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))*8",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "Out {{ifName}}",
@@ -3262,7 +3262,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Traffic on air - $devices",
+      "title": "Traffic on air - $instance",
       "tooltip": {
         "msResolution": false,
         "shared": true,
@@ -3305,7 +3305,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "default",
+      "datasource": "$datasource",
       "editable": true,
       "error": false,
       "fieldConfig": {
@@ -3376,42 +3376,42 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(irate(unifiVapRxPackets{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapRxPackets{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "hide": false,
           "interval": "",
           "legendFormat": "In",
           "refId": "A"
         },
         {
-          "expr": "sum(irate(unifiVapRxDropped{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapRxDropped{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "hide": false,
           "interval": "",
           "legendFormat": "In, dropped",
           "refId": "B"
         },
         {
-          "expr": "sum(irate(unifiVapRxErrors{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapRxErrors{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "hide": false,
           "interval": "",
           "legendFormat": "In, errors",
           "refId": "C"
         },
         {
-          "expr": "sum(irate(unifiVapTxPackets{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapTxPackets{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "hide": false,
           "interval": "",
           "legendFormat": "Out",
           "refId": "D"
         },
         {
-          "expr": "sum(irate(unifiVapTxDropped{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapTxDropped{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "hide": false,
           "interval": "",
           "legendFormat": "Out, dropped",
           "refId": "E"
         },
         {
-          "expr": "sum(irate(unifiVapTxErrors{job=~\"snmp.*\",instance=~\"$devices\"}[5m]))",
+          "expr": "sum(rate(unifiVapTxErrors{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
           "hide": false,
           "interval": "",
           "legendFormat": "Out, errors",
@@ -3422,7 +3422,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Packets on the air - $devices",
+      "title": "Packets on the air - $instance",
       "tooltip": {
         "msResolution": false,
         "shared": true,
@@ -3467,9 +3467,61 @@
   "tags": [],
   "templating": {
     "list": [
+      {
+        "current": {
+          "selected": false,
+          "text": "default",
+          "value": "default"
+        },
+        "description": "", 
+        "hide": 0,
+        "includeAll": false,
+        "label": "Data Source",
+        "multi": false,
+        "name": "datasource",
+        "options": [],
+        "query": "prometheus",
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "type": "datasource"
+      },
       {
         "allFormat": "pipe",
-        "allValue": null,
+        "allValue": ".+",
+        "current": {
+          "selected": false,
+          "text": "All",
+          "value": "All"
+        },
+        "datasource": "$datasource",
+        "definition": "label_values(up{job=~\"snmp.*\"}, job)",
+        "description": null,
+        "error": null,
+        "hide": 0,
+        "includeAll": false,
+        "label": "job",
+        "multi": true,
+        "multiFormat": "pipe",
+        "name": "job",
+        "options": [],
+        "query": {
+          "query": "label_values(up{job=~\"snmp.*\"}, job)",
+          "refId": "default-job-Variable-Query"
+        },
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 1,
+        "tagValuesQuery": null,
+        "tags": [],
+        "tagsQuery": null,
+        "type": "query",
+        "useTags": false
+      },
+      {
+        "allFormat": "pipe",
+        "allValue": ".+",
         "current": {
           "selected": false,
           "text": [
@@ -3479,19 +3531,19 @@
             "$__all"
           ]
         },
-        "datasource": "default",
-        "definition": "label_values(up{job=~\"snmp.*\"}, instance)",
+        "datasource": "$datasource",
+        "definition": "label_values(up{job=~\"$job\"}, instance)",
         "description": null,
         "error": null,
         "hide": 2,
         "includeAll": true,
-        "label": "Devices",
+        "label": "instance",
         "multi": true,
         "multiFormat": "pipe",
-        "name": "devices",
+        "name": "instance",
         "options": [],
         "query": {
-          "query": "label_values(up{job=~\"snmp.*\"}, instance)",
+          "query": "label_values(up{job=~\"$job\"}, instance)",
           "refId": "default-devices-Variable-Query"
         },
         "refresh": 1,
@@ -3516,8 +3568,8 @@
             "$__all"
           ]
         },
-        "datasource": "default",
-        "definition": "query_result(ifOperStatus{job=~\"snmp.*\",instance=~\"$devices\"}==1)",
+        "datasource": "$datasource",
+        "definition": "query_result(ifOperStatus{job=~\"$job\",instance=~\"$instance\"}==1)",
         "description": null,
         "error": null,
         "hide": 2,
@@ -3528,7 +3580,7 @@
         "name": "device_interfaces",
         "options": [],
         "query": {
-          "query": "query_result(ifOperStatus{job=~\"snmp.*\",instance=~\"$devices\"}==1)",
+          "query": "query_result(ifOperStatus{job=~\"$job\",instance=~\"$instance\"}==1)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 1,
@@ -3548,8 +3600,8 @@
           "text": "UAP-nanoHD",
           "value": "UAP-nanoHD"
         },
-        "datasource": "default",
-        "definition": "label_values(unifiApSystemModel{job=~\"snmp.*\",instance=~\"$devices\"}, unifiApSystemModel)",
+        "datasource": "$datasource",
+        "definition": "label_values(unifiApSystemModel{job=~\"$job\",instance=~\"$instance\"}, unifiApSystemModel)",
         "description": null,
         "error": null,
         "hide": 2,
@@ -3559,7 +3611,7 @@
         "name": "device_model",
         "options": [],
         "query": {
-          "query": "label_values(unifiApSystemModel{job=~\"snmp.*\",instance=~\"$devices\"}, unifiApSystemModel)",
+          "query": "label_values(unifiApSystemModel{job=~\"$job\",instance=~\"$instance\"}, unifiApSystemModel)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 1,
@@ -3579,8 +3631,8 @@
           "text": "5.43.23.12533",
           "value": "5.43.23.12533"
         },
-        "datasource": "default",
-        "definition": "label_values(unifiApSystemVersion{job=~\"snmp.*\",instance=~\"$devices\"}, unifiApSystemVersion)",
+        "datasource": "$datasource",
+        "definition": "label_values(unifiApSystemVersion{job=~\"$job\",instance=~\"$instance\"}, unifiApSystemVersion)",
         "description": null,
         "error": null,
         "hide": 2,
@@ -3590,7 +3642,7 @@
         "name": "device_firmware_version",
         "options": [],
         "query": {
-          "query": "label_values(unifiApSystemVersion{job=~\"snmp.*\",instance=~\"$devices\"}, unifiApSystemVersion)",
+          "query": "label_values(unifiApSystemVersion{job=~\"$job\",instance=~\"$instance\"}, unifiApSystemVersion)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 1,
@@ -3614,8 +3666,8 @@
             "$__all"
           ]
         },
-        "datasource": "default",
-        "definition": "label_values(ifPhysAddress{job=~\"snmp.*\",instance=~\"$devices\"}, ifPhysAddress)",
+        "datasource": "$datasource",
+        "definition": "label_values(ifPhysAddress{job=~\"$job\",instance=~\"$instance\"}, ifPhysAddress)",
         "description": null,
         "error": null,
         "hide": 2,
@@ -3625,7 +3677,7 @@
         "name": "device_mac_addresses",
         "options": [],
         "query": {
-          "query": "label_values(ifPhysAddress{job=~\"snmp.*\",instance=~\"$devices\"}, ifPhysAddress)",
+          "query": "label_values(ifPhysAddress{job=~\"$job\",instance=~\"$instance\"}, ifPhysAddress)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 1,
@@ -3645,8 +3697,8 @@
           "text": "All",
           "value": "All"
         },
-        "datasource": "default",
-        "definition": "label_values(unifiApSystemIp{job=~\"snmp.*\",instance=~\"$devices\"}, unifiApSystemIp)",
+        "datasource": "$datasource",
+        "definition": "label_values(unifiApSystemIp{job=~\"$job\",instance=~\"$instance\"}, unifiApSystemIp)",
         "description": null,
         "error": null,
         "hide": 2,
@@ -3656,7 +3708,7 @@
         "name": "device_main_ip",
         "options": [],
         "query": {
-          "query": "label_values(unifiApSystemIp{job=~\"snmp.*\",instance=~\"$devices\"}, unifiApSystemIp)",
+          "query": "label_values(unifiApSystemIp{job=~\"$job\",instance=~\"$instance\"}, unifiApSystemIp)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 1,
@@ -3681,8 +3733,8 @@
             "$__all"
           ]
         },
-        "datasource": "default",
-        "definition": "label_values(unifiVapEssId{job=~\"snmp.*\",instance=~\"$devices\"}, unifiVapEssId)",
+        "datasource": "$datasource",
+        "definition": "label_values(unifiVapEssId{job=~\"$job\",instance=~\"$instance\"}, unifiVapEssId)",
         "description": null,
         "error": null,
         "hide": 2,
@@ -3693,7 +3745,7 @@
         "name": "device_ESSIDs",
         "options": [],
         "query": {
-          "query": "label_values(unifiVapEssId{job=~\"snmp.*\",instance=~\"$devices\"}, unifiVapEssId)",
+          "query": "label_values(unifiVapEssId{job=~\"$job\",instance=~\"$instance\"}, unifiVapEssId)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 1,


Test patch:
diff --git a/collector/collector_test.go b/collector/collector_test.go
index 5760a75..f988e27 100644
--- a/collector/collector_test.go
+++ b/collector/collector_test.go
@@ -19,7 +19,7 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/go-kit/kit/log"
+	"github.com/go-kit/log"
 	"github.com/gosnmp/gosnmp"
 	"github.com/prometheus/client_model/go"
 	kingpin "gopkg.in/alecthomas/kingpin.v2"
diff --git a/generator/tree_test.go b/generator/tree_test.go
index feef745..ec7145a 100644
--- a/generator/tree_test.go
+++ b/generator/tree_test.go
@@ -18,7 +18,7 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/go-kit/kit/log"
+	"github.com/go-kit/log"
 	"github.com/prometheus/snmp_exporter/config"
 	yaml "gopkg.in/yaml.v2"
 )