feat: Rebase on upstream v0.14.0

Update go-vault-client

.github/workflows/ci.yaml

@@ -0,0 +1,33 @@
+name: CI
+on:
+  push:
+    branches:
+      - master
+    tags:
+      - '**'
+  pull_request:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
+      - name: Setup Golang
+        uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 # v4.0.0
+        with:
+          go-version-file: go.mod
+      - name: Test
+        run: make test
+  publish:
+    if: startsWith(github.ref, 'refs/tags')
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
+      - name: Publish
+        run: make publish
+        env:
+          DOCKER_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
+          DOCKER_TAG: ${{ github.ref_name }}

.gitignore

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

.promu.yml

@@ -2,7 +2,7 @@ go:
     # This must match .circle/config.yml.
     version: 1.20
 repository:
-    path: github.com/prometheus-community/postgres_exporter
+    path: github.com/form3tech-oss/postgres_exporter
 build:
     binaries:
         - name: postgres_exporter

Makefile

@@ -2,9 +2,9 @@
 all::
 
 # Needs to be defined before including Makefile.common to auto-generate targets
-DOCKER_ARCHS ?= amd64 armv7 arm64 ppc64le
-DOCKER_REPO  ?= prometheuscommunity
+DOCKER_ARCHS ?= amd64 arm64
+DOCKER_REPO  ?= form3tech
 
 include Makefile.common
 
-DOCKER_IMAGE_NAME       ?= postgres-exporter
+DOCKER_IMAGE_NAME       ?= postgres-exporter

cmd/postgres_exporter/datasource.go

@@ -20,6 +20,7 @@ import (
 	"regexp"
 	"strings"
 
+	"github.com/form3tech-oss/go-vault-client/v4/pkg/vaultclient"
 	"github.com/go-kit/log/level"
 	"github.com/prometheus/client_golang/prometheus"
 )
@@ -149,6 +150,21 @@ func getDataSources() ([]string, error) {
 		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()
 	dataSrouceURIFile := os.Getenv("DATA_SOURCE_URI_FILE")
 	if len(dataSrouceURIFile) != 0 {
@@ -171,3 +187,46 @@ func getDataSources() ([]string, error) {
 
 	return []string{dsn}, nil
 }
+
+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 {
+		level.Warn(logger).Log("error reading vault secrets from /secret/application", err)
+	}
+
+	secret, err = client.Logical().Read("/secret/postgres_exporter")
+	if err == nil && secret != nil {
+		for key, value := range secret.Data {
+			result[key] = value
+		}
+	} else {
+		level.Warn(logger).Log("error reading vault secrets from /secret/postgres_exporter", err)
+	}
+
+	dbCredsPath := os.Getenv("VAULT_DB_CREDENTIALS_PATH")
+	secret, err = client.Logical().Read(dbCredsPath)
+	if err == nil {
+		for key, value := range secret.Data {
+			result[key] = value
+		}
+	} else {
+		level.Warn(logger).Log("error reading vault secrets from "+dbCredsPath, err)
+	}
+
+	return result, nil
+}

cmd/postgres_exporter/main.go

@@ -20,10 +20,10 @@ import (
 	"strings"
 
 	"github.com/alecthomas/kingpin/v2"
+	"github.com/form3tech-oss/postgres_exporter/collector"
+	"github.com/form3tech-oss/postgres_exporter/config"
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
-	"github.com/prometheus-community/postgres_exporter/collector"
-	"github.com/prometheus-community/postgres_exporter/config"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"github.com/prometheus/common/promlog"

cmd/postgres_exporter/pg_setting.go

@@ -132,7 +132,7 @@ func (s *pgSetting) normaliseUnit() (val float64, unit string, err error) {
 	case "B", "kB", "MB", "GB", "TB", "4kB", "8kB", "16kB", "32kB", "64kB", "16MB", "32MB", "64MB":
 		unit = "bytes"
 	default:
-		err = fmt.Errorf("Unknown unit for runtime variable: %q", s.unit)
+		err = fmt.Errorf("unknown unit for runtime variable: %q", s.unit)
 		return
 	}
 

cmd/postgres_exporter/pg_setting_test.go

@@ -214,7 +214,7 @@ var fixtures = []fixture{
 		n: normalised{
 			val:  10,
 			unit: "",
-			err:  `Unknown unit for runtime variable: "nonexistent"`,
+			err:  `unknown unit for runtime variable: "nonexistent"`,
 		},
 	},
 }
@@ -240,7 +240,7 @@ func (s *PgSettingSuite) TestNormaliseUnit(c *C) {
 func (s *PgSettingSuite) TestMetric(c *C) {
 	defer func() {
 		if r := recover(); r != nil {
-			if r.(error).Error() != `Unknown unit for runtime variable: "nonexistent"` {
+			if r.(error).Error() != `unknown unit for runtime variable: "nonexistent"` {
 				panic(r)
 			}
 		}