File tree Expand file tree Collapse file tree 1 file changed +2
-12
lines changed Expand file tree Collapse file tree 1 file changed +2
-12
lines changed Original file line number Diff line number Diff line change @@ -18,25 +18,18 @@ import (
1818 "database/sql"
1919 "errors"
2020 "fmt"
21- << << << < HEAD
22- == == == =
23- "github.com/form3tech-oss/postgres_exporter/tools/src/gopkg.in/alecthomas/kingpin.v3-unstable"
2421 "io/ioutil"
25- >> >> >> > 2 cb1f0f (adds vault auth )
2622 "math"
2723 "os"
2824 "regexp"
2925 "strings"
3026 "time"
3127
32- << << << < HEAD
33- "github.com/blang/semver/v4"
34- "github.com/go-kit/log/level"
35- == == == =
3628 "github.com/blang/semver"
29+ "github.com/blang/semver/v4"
3730 "github.com/form3tech-oss/go-vault-client/pkg/vaultclient"
31+ "github.com/go-kit/log/level"
3832 "github.com/lib/pq"
39- >> >> >> > 2 cb1f0f (adds vault auth )
4033 "github.com/prometheus/client_golang/prometheus"
4134)
4235
@@ -712,8 +705,6 @@ func (e *Exporter) scrape(ch chan<- prometheus.Metric) {
712705 e .error .Set (1 )
713706 }
714707}
715- << << << < HEAD
716- == == == =
717708
718709func (e * Exporter ) discoverDatabaseDSNs () []string {
719710 dsns := make (map [string ]struct {})
@@ -916,4 +907,3 @@ func main() {
916907 log .Infof ("Starting Server: %s" , * listenAddress )
917908 log .Fatal (http .ListenAndServe (* listenAddress , nil ))
918909}
919- >> >> >> > 2 cb1f0f (adds vault auth )
You can’t perform that action at this time.
0 commit comments