PMM-2705: Add security code. Rebrand exporter.

.promu.yml

@@ -0,0 +1,14 @@
+repository:
+    path: github.com/percona/postgres_exporter/cmd/postgres_exporter
+build:
+    flags: -a -tags netgo
+    ldflags: |
+        -X {{repoPath}}/vendor/github.com/prometheus/common/version.Version={{.Version}}
+        -X {{repoPath}}/vendor/github.com/prometheus/common/version.Revision={{.Revision}}
+        -X {{repoPath}}/vendor/github.com/prometheus/common/version.Branch={{.Branch}}
+        -X {{repoPath}}/vendor/github.com/prometheus/common/version.BuildUser={{user}}@{{host}}
+        -X {{repoPath}}/vendor/github.com/prometheus/common/version.BuildDate={{date "20060102-15:04:05"}}
+tarball:
+    files:
+        - LICENSE
+        - NOTICE

.travis.yml

@@ -1,38 +1,25 @@
-sudo: required
-services:
-- docker
 language: go
+
 go:
-- '1.10'
-before_install:
-- go get -v github.com/mattn/goveralls
-- sudo wget -O /usr/local/bin/p2 https://github.com/wrouesnel/p2cli/releases/download/r4/p2
-  && sudo chmod +x /usr/local/bin/p2
-- sudo wget -O /usr/local/bin/docker-compose https://github.com/docker/compose/releases/download/1.9.0-rc4/docker-compose-Linux-x86_64
-  && sudo chmod +x /usr/local/bin/docker-compose
-- sudo apt-get update && sudo apt-get install postgresql-client-common
-script:
-- go run mage.go -v all
-- "$HOME/gopath/bin/goveralls -coverprofile=cover.out -service=travis-ci"
-- go run mage.go docker
-after_success:
-- docker login -u $DOCKER_USER -p $DOCKER_PASS
-- if [ ! -z "$TRAVIS_TAG" ]; then docker tag wrouesnel/postgres_exporter:latest wrouesnel/postgres_exporter:$TRAVIS_TAG
-  ; docker push wrouesnel/postgres_exporter:$TRAVIS_TAG ; fi
-- if [ "$TRAVIS_BRANCH" == "master" ]; then docker push wrouesnel/postgres_exporter
-  ; fi
+- 1.10.x
+
 env:
-  global:
-  - DOCKER_USER=wrouesnel
-  - secure: f0H5HKL/5f/ZZVGZ7puegWZ6eig0TmruihuSEJCx1+Y6yDZn7l8lH+eETP9KAzH27c3CG1F9ytu/3gnnTOafXnDLlCve3fL5sKF3+pNQRwi3IojsODjdfPW+KEbG+1RD7IgkCn+DSRmvvpLr4zGOmZFEM1ZtLL878u4Hsrv/X5pDbKJgG/cXDRJfsu/EcpviO4WM8zOakBY8QihXhGpZiRtpRDCXWjW49PdCkW9hsfzFaU1yjvih9EJ0cfcH+9CFCRkezwAPlCETbOv288uHXc6bCuEEX1bgJ0ZzEXYAyoO00+12ePbQZEGNikSVT55nfC+jZLLTavQkFi862Hcx/lmJpA/7aeNYOrDcomwWMRRc4Ava2+cod7acVvo45SHRq+Jj9ofDhj9s0T/aZwV+2doc9GwDN9J6aEs9Nham2G955K1H0fmMW9lv0ThSVEZ3XbzCHyR4nPAwJQXrzauqbbihCim/g/YC5gbVs7O/4GkN2Z9LK30IJr1/NtJdIa6fMk3Zdhp6LGbXCvVFRbE0rMiTLbB8O3ll2smCu3aFYv7J9IfvI0ol0ww7kULpyf/vqxkK0NJXsKgoK/Uo1lM9gNpJBHsMt9nWnDvLj2DKZNTqkxzJeG8O98ADrQWEGFhpcsSsbW9pAMsrp6D4LQikN8KoFvh9F8h9lBsYpafzlOA=
-deploy:
-  skip_cleanup: true
-  provider: releases
-  api_key:
-    secure: rwlge/Rs3wnWyfKRhD9fd5GviVe0foYUp20DY3AjKdDjhtwScA1EeR9QHOkB3raze52en0+KkpqlLCWbt3q4CRT7+ku1DNKhd6VWALdTZ1RPJYvNlU6CKJdRnWUJsECmSBsShXlbiYR8axqNVedzFPFGKzS9gYlFN6rr7pez/JZhxqucopZ6I+TkRHMELrFXyQK7/Y2bNRCLC4a+rGsjKeLLtYXbRXCmS0G4BSJEBRk7d69fIRzBApCMfrcLftgHzPuPth616yyUusQSCQYvaZ5tlwrPP8/E0wG3SVJVeDCMuDOSBZ9M6vNzR8W8VR/hxQamegn1OQgC5kNOaLZCTcJ5xguRouqb+FNFBqrd/Zi6vESo7RiVLULawzwxkh9sIPa3WZYDb3VK/Z/cpggUeR7wAu0S5ZYEvJHRefIZpqofZEHzDE3Blqp5yErz05e/zmjpd6HHK3f/UHmRRYfbulkvGT3aL/dlq5GcFvuxVC/vTL2VPvg9cGbqtf7PakC5IhoHpDs35tOyLxifOBLHvkwtGSxEfsCohIG8Hz2XFD83EsxgOiKSXVPLNd6yxjdqZj7OeAKFFU3bzGndnRbDIXaf987IN1imgUtP6wegfImoRStqxN4gEwwIMFsZCF86Ug4eLhlajLbWhudriDxDPBM/F9950aVxLwmWh9l5cRI=
-  file_glob: true
-  file: release/*
-  on:
-    tags: true
-    branch: master
-    repo: wrouesnel/postgres_exporter
+- POSTGRESQL_IMAGE=postgres
+
+services:
+- docker
+
+go_import_path: github.com/percona/postgres_exporter
+
+before_script:
+- sudo service postgresql stop
+- docker --version
+- docker-compose --version
+- docker-compose up -d
+
+script:
+- make
+- make test
+
+notifications:
+  email: false

Gopkg.toml

@@ -0,0 +1,3 @@
+[prune]
+  go-tests = true
+  unused-packages = true

Makefile

@@ -1,117 +1,18 @@
-
-COVERDIR = .coverage
-TOOLDIR = tools
-BINDIR = bin
-RELEASEDIR = release
-
-DIRS = $(BINDIR) $(RELEASEDIR)
-
-GO_SRC := $(shell find . -name '*.go' ! -path '*/vendor/*' ! -path 'tools/*' ! -path 'bin/*' ! -path 'release/*' )
-GO_DIRS := $(shell find . -type d -name '*.go' ! -path '*/vendor/*' ! -path 'tools/*' ! -path 'bin/*' ! -path 'release/*' )
-GO_PKGS := $(shell go list ./... | grep -v '/vendor/')
-
-CONTAINER_NAME ?= wrouesnel/postgres_exporter:latest
-BINARY := $(shell basename $(shell pwd))
-VERSION ?= $(shell git describe --dirty 2>/dev/null)
-VERSION_SHORT ?= $(shell git describe --abbrev=0 2>/dev/null)
-
-ifeq ($(VERSION),)
-VERSION := v0.0.0
-endif
-
-ifeq ($(VERSION_SHORT),)
-VERSION_SHORT := v0.0.0
-endif
-
-# By default this list is filtered down to some common platforms.
-platforms := $(subst /,-,$(shell go tool dist list | grep -e linux -e windows -e darwin | grep -e 386 -e amd64))
-PLATFORM_BINS_TMP := $(patsubst %,$(BINDIR)/$(BINARY)_$(VERSION_SHORT)_%/$(BINARY),$(platforms))
-PLATFORM_BINS := $(patsubst $(BINDIR)/$(BINARY)_$(VERSION_SHORT)_windows-%/$(BINARY),$(BINDIR)/$(BINARY)_$(VERSION_SHORT)_windows-%/$(BINARY).exe,$(PLATFORM_BINS_TMP))
-PLATFORM_DIRS := $(patsubst %,$(BINDIR)/$(BINARY)_$(VERSION_SHORT)_%,$(platforms))
-PLATFORM_TARS := $(patsubst %,$(RELEASEDIR)/$(BINARY)_$(VERSION_SHORT)_%.tar.gz,$(platforms))
-
-# These are evaluated on use, and so will have the correct values in the build
-# rule (https://vic.demuzere.be/articles/golang-makefile-crosscompile/)
-PLATFORMS_TEMP = $(subst /, ,$(subst -, ,$(patsubst $(BINDIR)/$(BINARY)_$(VERSION_SHORT)_%,%,$@)))
-GOOS = $(word 1, $(PLATFORMS_TEMP))
-GOARCH = $(word 2, $(PLATFORMS_TEMP))
-
-CURRENT_PLATFORM_TMP := $(BINDIR)/$(BINARY)_$(VERSION_SHORT)_$(shell go env GOOS)-$(shell go env GOARCH)/$(BINARY)
-CURRENT_PLATFORM := $(patsubst $(BINDIR)/$(BINARY)_$(VERSION_SHORT)_windows-%/$(BINARY),$(BINDIR)/$(BINARY)_$(VERSION_SHORT)_windows-%/$(BINARY).exe,$(CURRENT_PLATFORM_TMP))
-
-CONCURRENT_LINTERS ?=
-ifeq ($(CONCURRENT_LINTERS),)
-CONCURRENT_LINTERS = $(shell gometalinter --help | grep -o 'concurrency=\w*' | cut -d= -f2 | cut -d' ' -f1)
-endif
-
-LINTER_DEADLINE ?= 30s
-
-$(shell mkdir -p $(DIRS))
-
-export PATH := $(TOOLDIR)/bin:$(PATH)
-SHELL := env PATH=$(PATH) /bin/bash
-
-all: style lint test binary
-
-binary: $(BINARY)
-
-$(BINARY): $(CURRENT_PLATFORM)
-	ln -sf $< $@
-
-$(PLATFORM_BINS): $(GO_SRC)
-	CGO_ENABLED=0 GOOS=$(GOOS) GOARCH=$(GOARCH) go build -a \
-		-ldflags "-extldflags '-static' -X main.Version=$(VERSION)" \
-		-o $@ .
-
-$(PLATFORM_DIRS): $(PLATFORM_BINS)
-
-$(PLATFORM_TARS): $(RELEASEDIR)/%.tar.gz : $(BINDIR)/%
-	tar -czf $@ -C $(BINDIR) $$(basename $<)
-
-release-bin: $(PLATFORM_BINS)
-
-release: $(PLATFORM_TARS)
-
-# Take a go build and turn it into a minimal container
-docker: $(CURRENT_PLATFORM)
-	docker build --build-arg=binary=$(CURRENT_PLATFORM) -t $(CONTAINER_NAME) .
-
-style: tools
-	gometalinter --disable-all --enable=gofmt --vendor
-
-lint: tools
-	@echo Using $(CONCURRENT_LINTERS) processes
-	gometalinter -j $(CONCURRENT_LINTERS) --deadline=$(LINTER_DEADLINE) --disable=gotype --disable=gocyclo $(GO_DIRS)
-
-fmt: tools
-	gofmt -s -w $(GO_SRC)
-
-postgres_exporter_integration_test: $(GO_SRC)
-	CGO_ENABLED=0 go test -c -tags integration \
-		-a -ldflags "-extldflags '-static' -X main.Version=$(VERSION)" \
-		-o postgres_exporter_integration_test -cover -covermode count .
-
-test: tools
-	@mkdir -p $(COVERDIR)
-	@rm -f $(COVERDIR)/*
-	for pkg in $(GO_PKGS) ; do \
-		go test -v -covermode count -coverprofile=$(COVERDIR)/$$(echo $$pkg | tr '/' '-').out $$pkg || exit 1 ; \
-	done
-	gocovmerge $(shell find $(COVERDIR) -name '*.out') > cover.test.out
-
-test-integration: postgres_exporter postgres_exporter_integration_test
-	tests/test-smoke "$(shell pwd)/postgres_exporter" "$(shell pwd)/postgres_exporter_integration_test_script $(shell pwd)/postgres_exporter_integration_test $(shell pwd)/cover.integration.out"
-
-cover.out: tools
-	gocovmerge cover.*.out > cover.out
-
-clean:
-	[ ! -z $(BINDIR) ] && [ -e $(BINDIR) ] && find $(BINDIR) -print -delete || /bin/true
-	[ ! -z $(COVERDIR) ] && [ -e $(COVERDIR) ] && find $(COVERDIR) -print -delete || /bin/true
-	[ ! -z $(RELEASEDIR) ] && [ -e $(RELEASEDIR) ] && find $(RELEASEDIR) -print -delete || /bin/true
-	rm -f postgres_exporter postgres_exporter_integration_test
-
-tools:
-	$(MAKE) -C $(TOOLDIR)
-
-.PHONY: tools style fmt test all release binary clean
+# Copyright 2015 The Prometheus Authors
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+all: vet
+
+include Makefile.common
+
+DOCKER_IMAGE_NAME ?= postgres-exporter