Merge branch 'master' of github.com:percona/postgres_exporter

Author: askomorokhov

.travis.yml

@@ -17,7 +17,7 @@ branches:
 
 env:
   global:
-    secure: "eLcr0XXYX0MOiddypI8ypKF38Sw/f0m56mfmwqeEScsCaaBebp/XOOXXt5omMLnSRsrgYwUu9jvFLQau2GCOL2mEzubCkh6UhYsvpsyfYabhqGRh7KFiOocIlvIPwuY9/CnEa31gQnk9icf0s8tcdwyGQtvew/vKQ9aRi8tX1rmdA0B0RLN6P9LfrVIUkon0I+xxgSqP4Dj9rcOS5Vas4oVKjzaI0fAtKE0tmt6vP5+R42kV0ZqVv2FCwJ7MMdA6oTueY31Az5UwK3VgERBHL7BPoPq+GrhBW7aIe1yrmd3rUaauRfpjhjd6AYjyKpcZyyjzAhKk0Y5yXTiMZ7YE23y/3wtcsQXpFiUK/no/LxjqhrN330zKhklHqBdDgvirR6NzU8WFaSI3lV17XxLcvTMMoMaWnoN8SKeLd1bEYu4js88e44sOLQ0PGkMPVQifhamRDGDhFT+ZONV/L7dDtebnPRgrG5Jkf+l2reYXTG6spMAofZvlfbtKN3N6EkWAr+u6c+Suxld4dqyipvb3UatM9y0bQlSiC76/VLUAug9D4J86RKuDoIdapumED1hX+odZLkfT6teFRw+RJpFeU34phW9mRy1wIUHTc4mWfev6dEDCfqjxWGZRNBvUhSHoJFjvvVX0E/NtUSFLxOf89vShFLd+6M7EyktRxBvFl9A="
+    secure: "StREa6T4uZpBih6GSTshs+UWkaP8OQz7UHkuti8Ghlih6HbOnLUmPdADxrWpuMyLg2iXhJc5XFqmgHzsQAxYRjHFvBqeW8UerJqPzmU4pFWzLNoBDnTyNmeuRJCIyodf0DzmJWptM7a2wc7To3Zyv6hcObh5v7bKO/TfjU30EAVFaO3IOalYSLKc2ftJulZmXUpcrhzmo5L/89qSyCpLMCnVgymYLNhMtw4U4JDUmo7iQ48bWHhaIIoln5erT5DNV4n54shOARZihUfyWBolmqYYfyrDYSem23tWjzuWKM2w0HT3RSTYzjDj21jifKNvi3qCiEhBDZY1cQ1E7uuMoXqUAmzFAw7w8dSSddddMcH0cZDRNDPnqq0fRvhN2ZVKe333E+2NTOf9KYvZ13xhxraHsq5BBWEzVTUjgkNJ44o6QJFI+d5D5rvT18X2gnZbCSh/P5Vv41z67lZWDEWyNT1h3ZxxlnNFQPvGb+mYIFehmGjVfbgfI3ju4+DIXHnWdVKIgpt0yCXXByFZdqK3lP9cTb/2TgXEG2abwr5zi0rW8mn31602t6g3qO1pLzvSsTy93mWtI2jpYLzDvPCTdDxH2dW6/Xq0CJr03mtUUISBFYiO77ZdjjHoNV69LVt+6Pa721H4kV2l65+aH5jmzSUdMMqMug63L9GvpCLX5Hc="
   matrix:
     - POSTGRESQL_IMAGE=postgres:9.4
     - POSTGRESQL_IMAGE=postgres:9.5

Gopkg.lock

@@ -716,7 +716,7 @@ func parseFingerprint(url string) (string, error) {
 	pairs := strings.Split(dsn, " ")
 	kv := make(map[string]string, len(pairs))
 	for _, pair := range pairs {
-		splitted := strings.Split(pair, "=")
+		splitted := strings.SplitN(pair, "=", 2)
 		if len(splitted) != 2 {
 			return "", fmt.Errorf("malformed dsn %q", dsn)
 		}
@@ -1539,6 +1539,7 @@ func (h *handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		w.Write([]byte(fmt.Sprintf("Couldn't create filtered metrics handler: %s", err)))
 		return
 	}
+
 	filteredHandler.ServeHTTP(w, r)
 }
 

cmd/postgres_exporter/postgres_exporter.go

@@ -1,3 +1,7 @@
+## ######################################################
+## WARNING: This is an example. Do not edit this file. 
+## To create your own Custom Queries - create a new file
+## ######################################################
 ## Custom query example.
 #pg_replication:
 #  query: "SELECT EXTRACT(EPOCH FROM (now() - pg_last_xact_replay_timestamp())) as lag"