Merge branch 'master' into master

Author: tmc

.gitignore

@@ -8,4 +8,6 @@ postgres_exporter_integration_test
 *.iml
 cover.out
 cover.*.out
+.coverage
 *.prom
+.metrics.*.*.prom

.travis.yml

@@ -3,7 +3,7 @@ services:
 - docker
 language: go
 go:
-- '1.7.5'
+- '1.8'
 # Make sure we have p2 and the postgres client.
 before_install:
 - go get -v github.com/mattn/goveralls
@@ -17,7 +17,7 @@ script:
 - make all
 - make docker
 - make test-integration
-- ./concatenate_coverage cover.out cover.test.out cover.integration.out
+- make cover.out
 - $HOME/gopath/bin/goveralls -coverprofile=cover.out -service=travis-ci
 after_success:
 - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS

Makefile

@@ -1,10 +1,21 @@
 
-GO_SRC := $(shell find -type f -name '*.go' ! -path '*/vendor/*')
+COVERDIR = .coverage
+TOOLDIR = tools
+
+GO_SRC := $(shell find . -name '*.go' ! -path '*/vendor/*' ! -path 'tools/*' )
+GO_DIRS := $(shell find . -type d -name '*.go' ! -path '*/vendor/*' ! -path 'tools/*' )
+GO_PKGS := $(shell go list ./... | grep -v '/vendor/')
 
 CONTAINER_NAME ?= wrouesnel/postgres_exporter:latest
 VERSION ?= $(shell git describe --dirty)
 
-all: vet test postgres_exporter
+CONCURRENT_LINTERS ?= $(shell cat /proc/cpuinfo | grep processor | wc -l)
+LINTER_DEADLINE ?= 30s
+
+export PATH := $(TOOLDIR)/bin:$(PATH)
+SHELL := env PATH=$(PATH) /bin/bash
+
+all: style lint test postgres_exporter
 
 # Cross compilation (e.g. if you are on a Mac)
 cross: docker-build docker
@@ -21,35 +32,48 @@ postgres_exporter_integration_test: $(GO_SRC)
 docker: postgres_exporter
 	docker build -t $(CONTAINER_NAME) .
 
-vet:
-	go vet
+style: tools
+	gometalinter --disable-all --enable=gofmt --vendor
 
-# Check code conforms to go fmt
-style:
-	! gofmt -s -l $(GO_SRC) 2>&1 | read 2>/dev/null
+lint: tools
+	@echo Using $(CONCURRENT_LINTERS) processes
+	gometalinter -j $(CONCURRENT_LINTERS) --deadline=$(LINTER_DEADLINE) --disable=gotype --disable=gocyclo $(GO_DIRS)
 
-# Format the code
-fmt:
+fmt: tools
 	gofmt -s -w $(GO_SRC)
 
-test:
-	go test -v -covermode count -coverprofile=cover.test.out
+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 ; \
+	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
+
 # Do a self-contained docker build - we pull the official upstream container
 # and do a self-contained build.
 docker-build:
 	docker run -v $(shell pwd):/go/src/github.com/wrouesnel/postgres_exporter \
 	    -v $(shell pwd):/real_src \
 	    -e SHELL_UID=$(shell id -u) -e SHELL_GID=$(shell id -g) \
 	    -w /go/src/github.com/wrouesnel/postgres_exporter \
-		golang:1.7-wheezy \
+		golang:1.8-wheezy \
 		/bin/bash -c "make >&2 && chown $$SHELL_UID:$$SHELL_GID ./postgres_exporter"
 	docker build -t $(CONTAINER_NAME) .
 
 push:
 	docker push $(CONTAINER_NAME)
 
-.PHONY: docker-build docker test vet push cross
+tools:
+	$(MAKE) -C $(TOOLDIR)
+
+clean:
+	rm -f postgres_exporter postgres_exporter_integration_test
+
+.PHONY: tools docker-build docker lint fmt test vet push cross clean

README.md

@@ -2,9 +2,9 @@
 [![Coverage Status](https://coveralls.io/repos/github/wrouesnel/postgres_exporter/badge.svg?branch=master)](https://coveralls.io/github/wrouesnel/postgres_exporter?branch=master)
 [![Go Report Card](https://goreportcard.com/badge/github.com/wrouesnel/postgres_exporter)](https://goreportcard.com/report/github.com/wrouesnel/postgres_exporter)
 
-# PostgresSQL Server Exporter
+# PostgreSQL Server Exporter
 
-Prometheus exporter for PostgresSQL server metrics.
+Prometheus exporter for PostgreSQL server metrics.
 Supported Postgres versions: 9.1 and up.
 
 ## Quick Start
@@ -44,7 +44,7 @@ Package vendoring is handled with [`govendor`](https://github.com/kardianos/gove
 
 ### Setting the Postgres server's data source name
 
-The PostgresSQL server's [data source name](http://en.wikipedia.org/wiki/Data_source_name)
+The PostgreSQL server's [data source name](http://en.wikipedia.org/wiki/Data_source_name)
 must be set via the `DATA_SOURCE_NAME` environment variable.
 
 For running it locally on a default Debian/Ubuntu install, this will work (transpose to init script as appropriate):
@@ -81,6 +81,8 @@ To be able to collect metrics from pg_stat_activity and pg_stat_replication as n
 CREATE USER postgres_exporter PASSWORD 'password';
 ALTER USER postgres_exporter SET SEARCH_PATH TO postgres_exporter,pg_catalog;
 
+-- If deploying as non-superuser (for example in AWS RDS)
+-- GRANT postgres_exporter TO :MASTER_USER;
 CREATE SCHEMA postgres_exporter AUTHORIZATION postgres_exporter;
 
 CREATE FUNCTION postgres_exporter.f_select_pg_stat_activity()

concatenate_coverage

@@ -26,7 +26,7 @@ func querySettings(ch chan<- prometheus.Metric, db *sql.DB) error {
 	if err != nil {
 		return errors.New(fmt.Sprintln("Error running query on database: ", namespace, err))
 	}
-	defer rows.Close()
+	defer rows.Close() // nolint: errcheck
 
 	for rows.Next() {
 		s := &pgSetting{}
@@ -51,7 +51,7 @@ func (s *pgSetting) metric() prometheus.Metric {
 	var (
 		err       error
 		name      = strings.Replace(s.name, ".", "_", -1)
-		unit      = s.unit
+		unit      = s.unit // nolint: ineffassign
 		shortDesc = s.shortDesc
 		subsystem = "settings"
 		val       float64
@@ -85,7 +85,7 @@ func (s *pgSetting) metric() prometheus.Metric {
 func (s *pgSetting) normaliseUnit() (val float64, unit string, err error) {
 	val, err = strconv.ParseFloat(s.setting, 64)
 	if err != nil {
-		return val, unit, errors.New(fmt.Sprintf("Error converting setting %q value %q to float: %s", s.name, s.setting, err))
+		return val, unit, fmt.Errorf("Error converting setting %q value %q to float: %s", s.name, s.setting, err)
 	}
 
 	// Units defined in: https://www.postgresql.org/docs/current/static/config-setting.html
@@ -97,7 +97,7 @@ func (s *pgSetting) normaliseUnit() (val float64, unit string, err error) {
 	case "kB", "MB", "GB", "TB", "8kB", "16MB":
 		unit = "bytes"
 	default:
-		err = errors.New(fmt.Sprintf("Unknown unit for runtime variable: %q", s.unit))
+		err = fmt.Errorf("Unknown unit for runtime variable: %q", s.unit)
 		return
 	}
 

pg_setting.go

@@ -12,7 +12,7 @@ type PgSettingSuite struct{}
 var _ = Suite(&PgSettingSuite{})
 
 var fixtures = []fixture{
-	fixture{
+	{
 		p: pgSetting{
 			name:      "seconds_fixture_metric",
 			setting:   "5",
@@ -28,7 +28,7 @@ var fixtures = []fixture{
 		d: "Desc{fqName: \"pg_settings_seconds_fixture_metric_seconds\", help: \"Foo foo foo [Units converted to seconds.]\", constLabels: {}, variableLabels: []}",
 		v: 5,
 	},
-	fixture{
+	{
 		p: pgSetting{
 			name:      "milliseconds_fixture_metric",
 			setting:   "5000",
@@ -44,7 +44,7 @@ var fixtures = []fixture{
 		d: "Desc{fqName: \"pg_settings_milliseconds_fixture_metric_seconds\", help: \"Foo foo foo [Units converted to seconds.]\", constLabels: {}, variableLabels: []}",
 		v: 5,
 	},
-	fixture{
+	{
 		p: pgSetting{
 			name:      "eight_kb_fixture_metric",
 			setting:   "17",
@@ -60,7 +60,7 @@ var fixtures = []fixture{
 		d: "Desc{fqName: \"pg_settings_eight_kb_fixture_metric_bytes\", help: \"Foo foo foo [Units converted to bytes.]\", constLabels: {}, variableLabels: []}",
 		v: 139264,
 	},
-	fixture{
+	{
 		p: pgSetting{
 			name:      "16_mb_real_fixture_metric",
 			setting:   "3.0",
@@ -76,7 +76,7 @@ var fixtures = []fixture{
 		d: "Desc{fqName: \"pg_settings_16_mb_real_fixture_metric_bytes\", help: \"Foo foo foo [Units converted to bytes.]\", constLabels: {}, variableLabels: []}",
 		v: 5.0331648e+07,
 	},
-	fixture{
+	{
 		p: pgSetting{
 			name:      "bool_on_fixture_metric",
 			setting:   "on",
@@ -92,7 +92,7 @@ var fixtures = []fixture{
 		d: "Desc{fqName: \"pg_settings_bool_on_fixture_metric\", help: \"Foo foo foo\", constLabels: {}, variableLabels: []}",
 		v: 1,
 	},
-	fixture{
+	{
 		p: pgSetting{
 			name:      "bool_off_fixture_metric",
 			setting:   "off",
@@ -108,7 +108,7 @@ var fixtures = []fixture{
 		d: "Desc{fqName: \"pg_settings_bool_off_fixture_metric\", help: \"Foo foo foo\", constLabels: {}, variableLabels: []}",
 		v: 0,
 	},
-	fixture{
+	{
 		p: pgSetting{
 			name:      "special_minus_one_value",
 			setting:   "-1",
@@ -124,7 +124,7 @@ var fixtures = []fixture{
 		d: "Desc{fqName: \"pg_settings_special_minus_one_value_seconds\", help: \"foo foo foo [Units converted to seconds.]\", constLabels: {}, variableLabels: []}",
 		v: -1,
 	},
-	fixture{
+	{
 		p: pgSetting{
 			name:      "rds.rds_superuser_reserved_connections",
 			setting:   "2",
@@ -140,7 +140,7 @@ var fixtures = []fixture{
 		d: "Desc{fqName: \"pg_settings_rds_rds_superuser_reserved_connections\", help: \"Sets the number of connection slots reserved for rds_superusers.\", constLabels: {}, variableLabels: []}",
 		v: 2,
 	},
-	fixture{
+	{
 		p: pgSetting{
 			name:      "unknown_unit",
 			setting:   "10",
@@ -186,7 +186,7 @@ func (s *PgSettingSuite) TestMetric(c *C) {
 	for _, f := range fixtures {
 		d := &dto.Metric{}
 		m := f.p.metric()
-		m.Write(d)
+		m.Write(d) // nolint: errcheck
 
 		c.Check(m.Desc().String(), Equals, f.d)
 		c.Check(d.GetGauge().GetValue(), Equals, f.v)