Merge branch 'local_changes'

Author: wrouesnel

Dockerfile

@@ -1,17 +1,16 @@
-# 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.
 
-VERSION  := 0.1.0
-TARGET   := postgres_exporter
+# Simple go build
+postgres_exporter: postgres_exporter.go
+	go build -o postgres_exporter .
 
-include Makefile.COMMON
+# Do a self-contained docker build - we pull the official upstream container,
+# then template out a dockerfile which builds the real image.
+docker:
+	docker run -v $(shell pwd):/go/src/github.com/wrouesnel/postgres_exporter \
+		golang:1.6-wheezy \
+		/go/src/github.com/wrouesnel/postgres_exporter/docker-build.bsh /postgres_exporter /go/src/github.com/wrouesnel/postgres_exporter | \
+		docker import --change "EXPOSE 9113" \
+			--change 'ENTRYPOINT [ "/postgres_exporter" ]' \
+			- wrouesnel/postgres_exporter
+
+.PHONY: docker

Makefile

@@ -3,13 +3,29 @@
 Prometheus exporter for PostgresSQL server metrics.
 Supported Postgres versions: 9.1 and up.
 
+## Quick Start
+This package is available for Docker:
+```
+docker run -e DATA_SOURCE_NAME="login:password@(hostname:port)/dbname" -p 9113:9113 wrouesnel/postgres_exporter
+```
+
 ## Building and running
+The default make file behavior is to build the binary:
+```
+make
+export DATA_SOURCE_NAME="login:password@(hostname:port)/dbname"
+./postgres_exporter <flags>
+```
 
-    make
-    export DATA_SOURCE_NAME="postgres://postgres:password@localhost/?sslmode=disable"
-    ./postgres_exporter <flags>
+To build the dockerfile, run `make docker`. 
 
-See the [github.com/lib/pq](http://github.com/lib/pq) module for other ways to format the connection string.
+This will build the docker image as `wrouesnel/postgres_exporter:latest`. This 
+is a minimal docker image containing *just* postgres_exporter. By default no SSL 
+certificates are included, if you need to use SSL you should either bind-mount 
+`/etc/ssl/certs/ca-certificates.crt` or derive a new image containing them.
+
+### Vendoring
+Package vendoring is handled with [`govendor`](https://github.com/kardianos/govendor)
 
 ### Flags
 
@@ -27,6 +43,8 @@ For running it locally on a default Debian/Ubuntu install, this will work (trans
 
     sudo -u postgres DATA_SOURCE_NAME="user=postgres host=/var/run/postgresql/ sslmode=disable" postgres_exporter
 
+See the [github.com/lib/pq](http://github.com/lib/pq) module for other ways to format the connection string.
+
 ### Adding new metrics
 
 The exporter will attempt to dynamically export additional metrics if they are added in the

Makefile.COMMON

@@ -0,0 +1,4 @@
+#!/bin/bash
+cd $2
+CGO_ENABLED=0 GOOS=linux go build -a -ldflags '-extldflags "-static"' -o $1 . 1>&2
+tar -cf - $1