Merge pull request #787 from mothership/fix/mothershipper/support-alt-scheme

Supports alternate postgres:// prefix in URLs

cmd/postgres_exporter/datasource.go

@@ -35,7 +35,7 @@ func (e *Exporter) discoverDatabaseDSNs() []string {
 		var dsnURI *url.URL
 		var dsnConnstring string
 
-		if strings.HasPrefix(dsn, "postgresql://") {
+		if strings.HasPrefix(dsn, "postgresql://") || strings.HasPrefix(dsn, "postgres://") {
 			var err error
 			dsnURI, err = url.Parse(dsn)
 			if err != nil {

config/dsn.go

@@ -65,7 +65,7 @@ func (d DSN) GetConnectionString() string {
 // dsnFromString parses a connection string into a dsn. It will attempt to parse the string as
 // a URL and as a set of key=value pairs. If both attempts fail, dsnFromString will return an error.
 func dsnFromString(in string) (DSN, error) {
-	if strings.HasPrefix(in, "postgresql://") {
+	if strings.HasPrefix(in, "postgresql://") || strings.HasPrefix(in, "postgres://") {
 		return dsnFromURL(in)
 	}
 

config/dsn_test.go

@@ -186,6 +186,19 @@ func Test_dsnFromString(t *testing.T) {
 			},
 			wantErr: false,
 		},
+		{
+			name:  "Alternative URL prefix",
+			input: "postgres://user:s3cret@host.example.com:5432/tsdb?user=postgres",
+			want: DSN{
+				scheme:   "postgres",
+				host:     "host.example.com:5432",
+				path:     "/tsdb",
+				query:    url.Values{},
+				username: "user",
+				password: "s3cret",
+			},
+			wantErr: false,
+		},
 		{
 			name:  "URL with user and password in query string",
 			input: "postgresql://host.example.com:5432/tsdb?user=postgres&password=s3cr3t",