extended /probe path metrics

Signed-off-by: Ildar Valiullin <[email protected]>

Author: preved911

cmd/postgres_exporter/probe.go

@@ -78,6 +78,23 @@ func handleProbe(logger log.Logger) http.HandlerFunc {
 		registry.MustRegister(probeSuccessGauge)
 		registry.MustRegister(probeDurationGauge)
 
+		opts := []ExporterOpt{
+			DisableDefaultMetrics(*disableDefaultMetrics),
+			DisableSettingsMetrics(*disableSettingsMetrics),
+			AutoDiscoverDatabases(*autoDiscoverDatabases),
+			WithUserQueriesPath(*queriesPath),
+			WithConstantLabels(*constantLabelsList),
+			ExcludeDatabases(*excludeDatabases),
+			IncludeDatabases(*includeDatabases),
+		}
+
+		dsns := []string{dsn}
+		exporter := NewExporter(dsns, opts...)
+		defer func() {
+			exporter.servers.Close()
+		}()
+		registry.MustRegister(exporter)
+
 		// Run the probe
 		pc, err := collector.NewProbeCollector(tl, registry, dsn)
 		if err != nil {

config/config.go

@@ -17,7 +17,6 @@ import (
 	"fmt"
 	"net/url"
 	"os"
-	"strings"
 	"sync"
 
 	"github.com/go-kit/log"
@@ -99,7 +98,7 @@ func (ch *ConfigHandler) ReloadConfig(f string, logger log.Logger) error {
 
 func (m AuthModule) ConfigureTarget(target string) (string, error) {
 	// ip:port urls do not parse properly and that is the typical way users interact with postgres
-	t := fmt.Sprintf("exporter://%s", target)
+	t := fmt.Sprintf("postgresql://%s", target)
 	u, err := url.Parse(t)
 	if err != nil {
 		return "", err
@@ -115,8 +114,5 @@ func (m AuthModule) ConfigureTarget(target string) (string, error) {
 	}
 	u.RawQuery = query.Encode()
 
-	parsed := u.String()
-	trim := strings.TrimPrefix(parsed, "exporter://")
-
-	return trim, nil
+	return u.String(), nil
 }