Merge branch 'master' into master

Author: wrouesnel

.travis.yml

@@ -21,6 +21,7 @@ after_success:
 # Push a tagged build if a tag is found.
 - if [ ! -z "$TRAVIS_TAG" ]; then 
     docker tag wrouesnel/postgres_exporter:latest wrouesnel/postgres_exporter:$TRAVIS_TAG ;
+    docker push wrouesnel/postgres_exporter:$TRAVIS_TAG ;
   fi
 # Push a latest version
 - if [ "$TRAVIS_BRANCH" == "master" ]; then docker push wrouesnel/postgres_exporter ; fi

README.md

@@ -40,10 +40,6 @@ Package vendoring is handled with [`govendor`](https://github.com/kardianos/gove
 * `web.telemetry-path`
   Path under which to expose metrics.
 
-* `config.expect-replication-stats`
-  The target database has replication turned on - log errors when
-  replication stats are missing.
-
 ### Setting the Postgres server's data source name
 
 The PostgresSQL server's [data source name](http://en.wikipedia.org/wiki/Data_source_name)

postgres_exporter.go

@@ -985,7 +985,7 @@ func (e *Exporter) scrape(ch chan<- prometheus.Metric) {
 
 	// Check if map versions need to be updated
 	if err := e.checkMapVersions(ch, db); err != nil {
-		log.Warnln("Postgres version could not be determined. Proceeding with outdated query maps.")
+		log.Warnln("Proceeding with outdated query maps, as the Postgres version could not be determined:", err)
 		e.error.Set(1)
 	}