Merge pull request #1 from form3tech-oss/vault-auth

adds vault auth

Author: sam-io

.gitignore

@@ -19,3 +19,4 @@
 /.metrics.*.added
 /.metrics.*.removed
 /tools/src
+/assets

.travis.yml

@@ -3,7 +3,7 @@ services:
 - docker
 language: go
 go:
-- '1.11'
+- 1.13.4
 before_install:
 - go get -v github.com/mattn/goveralls
 - sudo wget -O /usr/local/bin/p2 https://github.com/wrouesnel/p2cli/releases/download/r4/p2
@@ -17,7 +17,20 @@ script:
 - go run mage.go docker
 env:
   global:
-    - GIT_ASSETS_BRANCH=assets
+  - GO111MODULE=off
+  - GIT_ASSETS_BRANCH=assets
 branches:
   except:
-  - assets
+  - assets
+before_deploy:
+- find bin -maxdepth 1 -mindepth 1 -type d -exec tar cvf {}.tar {}  \;
+deploy:
+  provider: releases
+  skip_cleanup: true
+  file_glob: true
+  api_key:
+    secure: JgV78D/cxddwX6hB7Qh5SENteYt/mlKE+E3yU4UP6p1CY74jIoFdCxvBa4/GhVLHbJCxsQReC3LA5Xdj6VEyBmh/gUSHlqo4+Z9V6+dyqgpMahOGBalpmR7UHXjZxPUs3C8kF7JIYoUReYU50K2Ij9y0JadPGptdgpuJfZHHMq1YtYpoeCyZ1BjxNEHB1CxFSjlm4IQ+lP7HgzCk8jvP7j5ELV5aUhDH2fP9uHVAU2cg5a2iSucWThQqBXDIvAy3hYWbsRMOQZesmbqVlWMqzfMkIRNmhBONHBRwayOSEIbkgZTVMEzUvz0lB4eCojJXmnmudkku/kdk0O/k53R4tVstXVBmel30ro0f8d9VS/auLAx7h1u/FfhipyewXINf8iQ9wtpDeq7vr+MGhg7iPHVeydpUACzVd4GRB6ptCEZLWgR9Qypoz8nXXCoTUuo/41zisJBULU2sWLaxrMx7CPo78jMSEKgTstQbx8ZmkilikcUCgd9Cm3v8ySYEKOdGeKkHjHHLzwZd1fRG3Wpe46OY9UM58qDDK7vzGRo584xW/C4XaFgFKaFf2Cbj++fPv9hNH+CYsUykrthRhHyzjmXloB2j/ELYWDxO0zlmChqh6dTDMHlHo9Hzx9EGp5rEWoPjXyoW4KoBYOl5ik6rXmytWusaIKu+2GuMKRRYZzg=
+  file: bin/*
+  on:
+    repo: form3tech-oss/postgres_exporter
+    branch: master

cmd/postgres_exporter/postgres_exporter.go

@@ -18,6 +18,7 @@ import (
 	"time"
 
 	"github.com/blang/semver"
+	"github.com/form3tech-oss/go-vault-client/pkg/vaultclient"
 	"github.com/lib/pq"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
@@ -1479,6 +1480,39 @@ func (e *Exporter) scrapeDSN(ch chan<- prometheus.Metric, dsn string) error {
 	return server.Scrape(ch, e.disableSettingsMetrics)
 }
 
+func loadSecrets() (map[string]interface{}, error) {
+	result := make(map[string]interface{})
+	vaultAuth, err := vaultclient.NewVaultAuth(vaultclient.NewDefaultConfig())
+	if err != nil {
+		return nil, err
+	}
+
+	client, err := vaultAuth.VaultClient()
+	if err != nil {
+		return nil, err
+	}
+
+	secret, err := client.Logical().Read("/secret/application")
+	if err == nil {
+		for key, value := range secret.Data {
+			result[key] = value
+		}
+	} else {
+		log.Warnln("error reading vault secrets from /secret/application", err)
+	}
+
+	secret, err = client.Logical().Read("/secret/postgres_exporter")
+	if err == nil {
+		for key, value := range secret.Data {
+			result[key] = value
+		}
+	} else {
+		log.Warnln("error reading vault secrets from /secret/postgres_exporter", err)
+	}
+
+	return result, nil
+}
+
 // try to get the DataSource
 // DATA_SOURCE_NAME always wins so we do not break older versions
 // reading secrets from files wins over secrets in environment variables
@@ -1509,6 +1543,21 @@ func getDataSources() []string {
 			pass = os.Getenv("DATA_SOURCE_PASS")
 		}
 
+		if len(user) == 0 || len(pass) == 0 {
+			secrets, err := loadSecrets()
+			if err != nil {
+				panic(err)
+			}
+
+			if len(user) == 0 {
+				user = secrets["database-username"].(string)
+			}
+
+			if len(pass) == 0 {
+				pass = secrets["database-password"].(string)
+			}
+		}
+
 		ui := url.UserPassword(user, pass).String()
 		uri := os.Getenv("DATA_SOURCE_URI")
 		dsn = "postgresql://" + ui + "@" + uri