From 1146ce0c096c3a1a60a97519e6201eb6ea4696f7 Mon Sep 17 00:00:00 2001 From: David Newhall II Date: Mon, 24 Jun 2019 01:06:38 -0700 Subject: [PATCH 1/4] Re-arrange travis build. --- integrations/influxunifi/.travis.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/integrations/influxunifi/.travis.yml b/integrations/influxunifi/.travis.yml index cd34e7b0..5cbb840d 100644 --- a/integrations/influxunifi/.travis.yml +++ b/integrations/influxunifi/.travis.yml @@ -13,7 +13,7 @@ go: - 1.12.x services: - docker -before_install: +install: - mkdir -p $GOPATH/bin # Download the `dep` binary to bin folder in $GOPATH - curl -sLo $GOPATH/bin/dep https://github.com/golang/dep/releases/download/v0.5.3/dep-linux-amd64 @@ -22,15 +22,11 @@ before_install: - curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin latest #- curl -sL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin latest - rvm install 2.0.0 -install: - rvm 2.0.0 do gem install --no-document fpm - make docker script: # Test built docker image. -- docker run -d --name unifi-poller golift/unifi-poller | tee docker_id - # Once we figure out how to keep it running we can remove the -a in ps args. -- docker ps -a | grep -q unifi-poller -- docker logs $(&1 | grep -Eq "Loading Configuration File[:] /etc/unifi-poller/up.conf" +- docker run golift/unifi-poller 2>&1 | grep -Eq "Loading Configuration File[:] /etc/unifi-poller/up.conf" # test and build everything - rvm 2.0.0 do make release after_success: From a8ee2e25adff4102fa87b7111a1f2c2a5b6887b1 Mon Sep 17 00:00:00 2001 From: David Newhall II Date: Mon, 24 Jun 2019 01:07:52 -0700 Subject: [PATCH 2/4] Move library. --- integrations/influxunifi/README.md | 2 +- integrations/influxunifi/cmd/unifi-poller/main.go | 2 +- .../influxunifi/{pkg/unifi-poller => unifipoller}/config.go | 0 .../influxunifi/{pkg/unifi-poller => unifipoller}/dumper.go | 0 .../influxunifi/{pkg/unifi-poller => unifipoller}/helpers.go | 0 .../influxunifi/{pkg/unifi-poller => unifipoller}/unifi.go | 0 .../{pkg/unifi-poller => unifipoller}/unifipoller.go | 0 7 files changed, 2 insertions(+), 2 deletions(-) rename integrations/influxunifi/{pkg/unifi-poller => unifipoller}/config.go (100%) rename integrations/influxunifi/{pkg/unifi-poller => unifipoller}/dumper.go (100%) rename integrations/influxunifi/{pkg/unifi-poller => unifipoller}/helpers.go (100%) rename integrations/influxunifi/{pkg/unifi-poller => unifipoller}/unifi.go (100%) rename integrations/influxunifi/{pkg/unifi-poller => unifipoller}/unifipoller.go (100%) diff --git a/integrations/influxunifi/README.md b/integrations/influxunifi/README.md index 12bce32c..32058e2b 100644 --- a/integrations/influxunifi/README.md +++ b/integrations/influxunifi/README.md @@ -85,7 +85,7 @@ means, if you wanted to do something like make telegraf collect your data instea of UniFi Poller you can achieve that with a little bit of Go code. You could write a small app that acts as a telegraf input plugin using the [unifi](https://github.com/golift/unifi) library to grab the data from your controller. As a bonus, all of the code in UniFi Poller is -[also a library](https://godoc.org/github.com/davidnewhall/unifi-poller/pkg/unifi-poller) +[also a library](https://godoc.org/github.com/davidnewhall/unifi-poller/unifipoller) and can be used in other projects. # What now... diff --git a/integrations/influxunifi/cmd/unifi-poller/main.go b/integrations/influxunifi/cmd/unifi-poller/main.go index 8f17b276..cf4a1095 100644 --- a/integrations/influxunifi/cmd/unifi-poller/main.go +++ b/integrations/influxunifi/cmd/unifi-poller/main.go @@ -3,7 +3,7 @@ package main import ( "log" - unifipoller "github.com/davidnewhall/unifi-poller/pkg/unifi-poller" + "github.com/davidnewhall/unifi-poller/pkg/unifipoller" ) // Keep it simple. diff --git a/integrations/influxunifi/pkg/unifi-poller/config.go b/integrations/influxunifi/unifipoller/config.go similarity index 100% rename from integrations/influxunifi/pkg/unifi-poller/config.go rename to integrations/influxunifi/unifipoller/config.go diff --git a/integrations/influxunifi/pkg/unifi-poller/dumper.go b/integrations/influxunifi/unifipoller/dumper.go similarity index 100% rename from integrations/influxunifi/pkg/unifi-poller/dumper.go rename to integrations/influxunifi/unifipoller/dumper.go diff --git a/integrations/influxunifi/pkg/unifi-poller/helpers.go b/integrations/influxunifi/unifipoller/helpers.go similarity index 100% rename from integrations/influxunifi/pkg/unifi-poller/helpers.go rename to integrations/influxunifi/unifipoller/helpers.go diff --git a/integrations/influxunifi/pkg/unifi-poller/unifi.go b/integrations/influxunifi/unifipoller/unifi.go similarity index 100% rename from integrations/influxunifi/pkg/unifi-poller/unifi.go rename to integrations/influxunifi/unifipoller/unifi.go diff --git a/integrations/influxunifi/pkg/unifi-poller/unifipoller.go b/integrations/influxunifi/unifipoller/unifipoller.go similarity index 100% rename from integrations/influxunifi/pkg/unifi-poller/unifipoller.go rename to integrations/influxunifi/unifipoller/unifipoller.go From a797e63542526f08eddd6b0d50feac94d72324d2 Mon Sep 17 00:00:00 2001 From: David Newhall II Date: Mon, 24 Jun 2019 01:12:24 -0700 Subject: [PATCH 3/4] missed these --- integrations/influxunifi/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/integrations/influxunifi/Makefile b/integrations/influxunifi/Makefile index 8fc00a07..e2053896 100644 --- a/integrations/influxunifi/Makefile +++ b/integrations/influxunifi/Makefile @@ -62,23 +62,23 @@ README.html: md2roff build: $(BINARY) $(BINARY): - go build -o $(BINARY) -ldflags "-w -s -X github.com/davidnewhall/unifi-poller/pkg/unifi-poller.Version=$(VERSION)" $(PACKAGE) + go build -o $(BINARY) -ldflags "-w -s -X github.com/davidnewhall/unifi-poller/unifipoller.Version=$(VERSION)" $(PACKAGE) linux: $(BINARY).linux $(BINARY).linux: # Building linux binary. - GOOS=linux go build -o $(BINARY).linux -ldflags "-w -s -X github.com/davidnewhall/unifi-poller/pkg/unifi-poller.Version=$(VERSION)" $(PACKAGE) + GOOS=linux go build -o $(BINARY).linux -ldflags "-w -s -X github.com/davidnewhall/unifi-poller/unifipoller.Version=$(VERSION)" $(PACKAGE) macos: $(BINARY).macos $(BINARY).macos: # Building darwin binary. - GOOS=darwin go build -o $(BINARY).macos -ldflags "-w -s -X github.com/davidnewhall/unifi-poller/pkg/unifi-poller.Version=$(VERSION)" $(PACKAGE) + GOOS=darwin go build -o $(BINARY).macos -ldflags "-w -s -X github.com/davidnewhall/unifi-poller/unifipoller.Version=$(VERSION)" $(PACKAGE) exe: $(BINARY).exe windows: $(BINARY).exe $(BINARY).exe: # Building windows binary. - GOOS=windows go build -o $(BINARY).exe -ldflags "-w -s -X github.com/davidnewhall/unifi-poller/pkg/unifi-poller.Version=$(VERSION)" $(PACKAGE) + GOOS=windows go build -o $(BINARY).exe -ldflags "-w -s -X github.com/davidnewhall/unifi-poller/unifipoller.Version=$(VERSION)" $(PACKAGE) # Packages From 3110821b287325e1d9153d051d5455065629ffad Mon Sep 17 00:00:00 2001 From: David Newhall II Date: Mon, 24 Jun 2019 01:20:35 -0700 Subject: [PATCH 4/4] move more --- integrations/influxunifi/Makefile | 9 ++++----- integrations/influxunifi/{cmd/unifi-poller => }/main.go | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) rename integrations/influxunifi/{cmd/unifi-poller => }/main.go (72%) diff --git a/integrations/influxunifi/Makefile b/integrations/influxunifi/Makefile index e2053896..c481c89a 100644 --- a/integrations/influxunifi/Makefile +++ b/integrations/influxunifi/Makefile @@ -6,7 +6,6 @@ URL:=https://github.com/davidnewhall/$(BINARY) MAINT=David Newhall II DESC=This daemon polls a UniFi controller at a short interval and stores the collected measurements in an Influx Database. GOLANGCI_LINT_ARGS=--enable-all -D gochecknoglobals -PACKAGE:=./cmd/$(BINARY) DOCKER_REPO=golift MD2ROFF_BIN=github.com/github/hub/md2roff-bin @@ -62,23 +61,23 @@ README.html: md2roff build: $(BINARY) $(BINARY): - go build -o $(BINARY) -ldflags "-w -s -X github.com/davidnewhall/unifi-poller/unifipoller.Version=$(VERSION)" $(PACKAGE) + go build -o $(BINARY) -ldflags "-w -s -X github.com/davidnewhall/unifi-poller/unifipoller.Version=$(VERSION)" linux: $(BINARY).linux $(BINARY).linux: # Building linux binary. - GOOS=linux go build -o $(BINARY).linux -ldflags "-w -s -X github.com/davidnewhall/unifi-poller/unifipoller.Version=$(VERSION)" $(PACKAGE) + GOOS=linux go build -o $(BINARY).linux -ldflags "-w -s -X github.com/davidnewhall/unifi-poller/unifipoller.Version=$(VERSION)" macos: $(BINARY).macos $(BINARY).macos: # Building darwin binary. - GOOS=darwin go build -o $(BINARY).macos -ldflags "-w -s -X github.com/davidnewhall/unifi-poller/unifipoller.Version=$(VERSION)" $(PACKAGE) + GOOS=darwin go build -o $(BINARY).macos -ldflags "-w -s -X github.com/davidnewhall/unifi-poller/unifipoller.Version=$(VERSION)" exe: $(BINARY).exe windows: $(BINARY).exe $(BINARY).exe: # Building windows binary. - GOOS=windows go build -o $(BINARY).exe -ldflags "-w -s -X github.com/davidnewhall/unifi-poller/unifipoller.Version=$(VERSION)" $(PACKAGE) + GOOS=windows go build -o $(BINARY).exe -ldflags "-w -s -X github.com/davidnewhall/unifi-poller/unifipoller.Version=$(VERSION)" # Packages diff --git a/integrations/influxunifi/cmd/unifi-poller/main.go b/integrations/influxunifi/main.go similarity index 72% rename from integrations/influxunifi/cmd/unifi-poller/main.go rename to integrations/influxunifi/main.go index cf4a1095..768d4af6 100644 --- a/integrations/influxunifi/cmd/unifi-poller/main.go +++ b/integrations/influxunifi/main.go @@ -3,7 +3,7 @@ package main import ( "log" - "github.com/davidnewhall/unifi-poller/pkg/unifipoller" + "github.com/davidnewhall/unifi-poller/unifipoller" ) // Keep it simple.