7b6713b094
Updated windows dependencies
Updated the windows dependencies so that the versions matched the
dependencies for Mac OS and Linux. Additionally added some that were
complained about being missing at compile time.
Incorporated kardianos/service for management
Incorporated the library github.com/kardianos/service to manage the
service on the various platforms (including Windows). This required an
alternate main function.
The original main function was renamed to reloadLoop (as that is what
the main loop in it does) (it also got a couple of parameters). The
service management library calls it as the main body of the program.
Merged service.go into telegraf.go
Due to compilation issues on Windows, moved the code from service.go
into telegraf.go and removed service.go entirely.
Updated dependencies and fixed Windows service
Updated the dependencies so that it builds properly on Windows,
additionally, fixed the registered command for starting it as
a service (needed to add the config file option). This currently
standardizes it as a C:\telegraf\telegraf.conf on Windows.
Added dependency for github.com/kardianos/service
Removed the common dependencies from _windows file
Removed all the common dependencies from the Godeps_windows file and
modified Makefile to load Godeps and then Godeps_windows when building
for Windows. This should reduce problems caused by the Godeps_windows
file being forgotten when updating dependencies.
Updated CHANGELOG.md with changes
Ran `go fmt ./...` to format code
Removed service library on all but Windows
The service library [kardianos/service](github.com/kardianos/service)
has been disabled on all platforms but windows, as there is already
existing infrastructure for other platforms.
Removed the dependency line for itself
It appears that gdm accidentally added the project itself to the
dependency list. This caused the dependency restoration to select an
earlier version of the project during build.
This only affected windows.
This only affected builds after 020b2c70
Updated documentation for Windows Service
Removed the documentation about using NSSM and added documentation on
installing telegraf directly as a Windows Service.
Added license info for kardianos/service
Added the license information for github.com/kardianos/service which is
licensed under the ZLib license, although that name is never mentioned
the license text matches word for word.
Changed the Windows Config file default location
Updated the default location of the configuration file on Windows from
C:\telegraf\telegraf.conf to C:\Program Files\Telegraf\telegraf.conf.
With this change includes updating the directions, including directing
that the executable be put into that same directory. Additionally, as
noted in the instructions, the location of the config file for the
service may be changed by specifying the location with the `-config`
flag at install time.
Fixed bug - Wrong data type: svcConfig
svcConfig service.Config => svcConfig *service.Config
(It needed to be a pointer)
94 lines
2.9 KiB
Makefile
94 lines
2.9 KiB
Makefile
VERSION := $(shell sh -c 'git describe --always --tags')
|
|
ifdef GOBIN
|
|
PATH := $(GOBIN):$(PATH)
|
|
else
|
|
PATH := $(subst :,/bin:,$(GOPATH))/bin:$(PATH)
|
|
endif
|
|
|
|
# Standard Telegraf build
|
|
default: prepare build
|
|
|
|
# Windows build
|
|
windows: prepare-windows build-windows
|
|
|
|
# Only run the build (no dependency grabbing)
|
|
build:
|
|
go install -ldflags "-X main.version=$(VERSION)" ./...
|
|
|
|
build-windows:
|
|
go build -o telegraf.exe -ldflags \
|
|
"-X main.version=$(VERSION)" \
|
|
./cmd/telegraf/telegraf.go
|
|
|
|
build-for-docker:
|
|
CGO_ENABLED=0 GOOS=linux go build -installsuffix cgo -o telegraf -ldflags \
|
|
"-s -X main.version=$(VERSION)" \
|
|
./cmd/telegraf/telegraf.go
|
|
|
|
# run package script
|
|
package:
|
|
./scripts/build.py --package --version="$(VERSION)" --platform=linux --arch=all --upload
|
|
|
|
# Get dependencies and use gdm to checkout changesets
|
|
prepare:
|
|
go get github.com/sparrc/gdm
|
|
gdm restore
|
|
|
|
# Use the windows godeps file to prepare dependencies
|
|
prepare-windows:
|
|
go get github.com/sparrc/gdm
|
|
gdm restore
|
|
gdm restore -f Godeps_windows
|
|
|
|
# Run all docker containers necessary for unit tests
|
|
docker-run:
|
|
docker run --name kafka \
|
|
-e ADVERTISED_HOST=localhost \
|
|
-e ADVERTISED_PORT=9092 \
|
|
-p "2181:2181" -p "9092:9092" \
|
|
-d spotify/kafka
|
|
docker run --name mysql -p "3306:3306" -e MYSQL_ALLOW_EMPTY_PASSWORD=yes -d mysql
|
|
docker run --name memcached -p "11211:11211" -d memcached
|
|
docker run --name postgres -p "5432:5432" -d postgres
|
|
docker run --name rabbitmq -p "15672:15672" -p "5672:5672" -d rabbitmq:3-management
|
|
docker run --name redis -p "6379:6379" -d redis
|
|
docker run --name aerospike -p "3000:3000" -d aerospike/aerospike-server
|
|
docker run --name nsq -p "4150:4150" -d nsqio/nsq /nsqd
|
|
docker run --name mqtt -p "1883:1883" -d ncarlier/mqtt
|
|
docker run --name riemann -p "5555:5555" -d blalor/riemann
|
|
docker run --name snmp -p "31161:31161/udp" -d titilambert/snmpsim
|
|
|
|
# Run docker containers necessary for CircleCI unit tests
|
|
docker-run-circle:
|
|
docker run --name kafka \
|
|
-e ADVERTISED_HOST=localhost \
|
|
-e ADVERTISED_PORT=9092 \
|
|
-p "2181:2181" -p "9092:9092" \
|
|
-d spotify/kafka
|
|
docker run --name aerospike -p "3000:3000" -d aerospike/aerospike-server
|
|
docker run --name nsq -p "4150:4150" -d nsqio/nsq /nsqd
|
|
docker run --name mqtt -p "1883:1883" -d ncarlier/mqtt
|
|
docker run --name riemann -p "5555:5555" -d blalor/riemann
|
|
docker run --name snmp -p "31161:31161/udp" -d titilambert/snmpsim
|
|
|
|
# Kill all docker containers, ignore errors
|
|
docker-kill:
|
|
-docker kill nsq aerospike redis rabbitmq postgres memcached mysql kafka mqtt riemann snmp
|
|
-docker rm nsq aerospike redis rabbitmq postgres memcached mysql kafka mqtt riemann snmp
|
|
|
|
# Run full unit tests using docker containers (includes setup and teardown)
|
|
test: vet docker-kill docker-run
|
|
# Sleeping for kafka leadership election, TSDB setup, etc.
|
|
sleep 60
|
|
# SUCCESS, running tests
|
|
go test -race ./...
|
|
|
|
# Run "short" unit tests
|
|
test-short: vet
|
|
go test -short ./...
|
|
|
|
vet:
|
|
go vet ./...
|
|
|
|
.PHONY: test test-short vet build default
|