Merge pull request #555 from sysadmind/release-v0.10.0

SuperQ · web-flow · commit 57719ba53cac · 2021-07-09T13:37:56.000+02:00
Release v0.10.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.10.0 / 2021-07-08
+
+* [ENHANCEMENT] Add ability to set included databases when autoDiscoverDatabases is enabled #499
+* [BUGFIX] fix pg_replication_slots on postgresql versions 9.4 <> 10.0 #537
+
 ## 0.9.0 / 2021-03-01
 
 First release under the Prometheus Community organisation.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.9.0
+0.10.0
diff --git a/cmd/postgres_exporter/util.go b/cmd/postgres_exporter/util.go
@@ -184,7 +184,10 @@ func parseFingerprint(url string) (string, error) {
 		if len(splitted) != 2 {
 			return "", fmt.Errorf("malformed dsn %q", dsn)
 		}
-		kv[splitted[0]] = splitted[1]
+		// Newer versions of pq.ParseURL quote values so trim them off if they exist
+		key := strings.Trim(splitted[0], "'\"")
+		value := strings.Trim(splitted[1], "'\"")
+		kv[key] = value
 	}
 
 	var fingerprint string
diff --git a/go.mod b/go.mod
@@ -4,12 +4,12 @@ go 1.14
 
 require (
 	github.com/blang/semver v3.5.1+incompatible
-	github.com/go-kit/kit v0.10.0
-	github.com/lib/pq v1.9.0
-	github.com/prometheus/client_golang v1.9.0
+	github.com/go-kit/kit v0.11.0
+	github.com/lib/pq v1.10.1
+	github.com/prometheus/client_golang v1.11.0
 	github.com/prometheus/client_model v0.2.0
-	github.com/prometheus/common v0.17.0
-	github.com/prometheus/exporter-toolkit v0.5.1
+	github.com/prometheus/common v0.29.0
+	github.com/prometheus/exporter-toolkit v0.6.0
 	gopkg.in/alecthomas/kingpin.v2 v2.2.6
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c
 	gopkg.in/yaml.v2 v2.4.0
diff --git a/go.sum b/go.sum

Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,10 @@ func parseFingerprint(url string) (string, error) {`
`184`	`184`	`if len(splitted) != 2 {`
`185`	`185`	`return "", fmt.Errorf("malformed dsn %q", dsn)`
`186`	`186`	`}`
`187`		`- kv[splitted[0]] = splitted[1]`
	`187`	`+ // Newer versions of pq.ParseURL quote values so trim them off if they exist`
	`188`	`+ key := strings.Trim(splitted[0], "'\"")`
	`189`	`+ value := strings.Trim(splitted[1], "'\"")`
	`190`	`+ kv[key] = value`
`188`	`191`	`}`
`189`	`192`
`190`	`193`	`var fingerprint string`
-Original file line number
+Diff line change
 require (
 	github.com/blang/semver v3.5.1+incompatible
 -	github.com/go-kit/kit v0.10.0
 -	github.com/lib/pq v1.9.0
 -	github.com/prometheus/client_golang v1.9.0
 +	github.com/go-kit/kit v0.11.0
 +	github.com/lib/pq v1.10.1
 +	github.com/prometheus/client_golang v1.11.0
 	github.com/prometheus/client_model v0.2.0
 -	github.com/prometheus/common v0.17.0
 -	github.com/prometheus/exporter-toolkit v0.5.1
 +	github.com/prometheus/common v0.29.0
 +	github.com/prometheus/exporter-toolkit v0.6.0
 	gopkg.in/alecthomas/kingpin.v2 v2.2.6
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c
 	gopkg.in/yaml.v2 v2.4.0