Merge pull request #5 from NextDeveloperTeam/slot-name-fix

pg_stat_replication - fix `slot_name` using the `pid` value

Author: kppullin-nt

cmd/postgres_exporter/postgres_exporter.go

@@ -271,15 +271,15 @@ var builtinMetricMaps = map[string]intermediateMetricMap{
 	},
 	"pg_stat_replication": {
 		map[string]ColumnMapping{
-			"procpid":          {DISCARD, "Process ID of a WAL sender process", nil, semver.MustParseRange("<9.2.0")},
-			"pid":              {DISCARD, "Process ID of a WAL sender process", nil, semver.MustParseRange(">=9.2.0")},
-			"usesysid":         {DISCARD, "OID of the user logged into this WAL sender process", nil, nil},
-			"usename":          {DISCARD, "Name of the user logged into this WAL sender process", nil, nil},
-			"application_name": {LABEL, "Name of the application that is connected to this WAL sender", nil, nil},
-			"client_addr":      {LABEL, "IP address of the client connected to this WAL sender. If this field is null, it indicates that the client is connected via a Unix socket on the server machine.", nil, nil},
-			"client_hostname":  {DISCARD, "Host name of the connected client, as reported by a reverse DNS lookup of client_addr. This field will only be non-null for IP connections, and only when log_hostname is enabled.", nil, nil},
-			"client_port":      {DISCARD, "TCP port number that the client is using for communication with this WAL sender, or -1 if a Unix socket is used", nil, nil},
-			"backend_start": {DISCARD, "with time zone	Time when this process was started, i.e., when the client connected to this WAL sender", nil, nil},
+			"procpid":                  {DISCARD, "Process ID of a WAL sender process", nil, semver.MustParseRange("<9.2.0")},
+			"pid":                      {DISCARD, "Process ID of a WAL sender process", nil, semver.MustParseRange(">=9.2.0")},
+			"usesysid":                 {DISCARD, "OID of the user logged into this WAL sender process", nil, nil},
+			"usename":                  {DISCARD, "Name of the user logged into this WAL sender process", nil, nil},
+			"application_name":         {LABEL, "Name of the application that is connected to this WAL sender", nil, nil},
+			"client_addr":              {LABEL, "IP address of the client connected to this WAL sender. If this field is null, it indicates that the client is connected via a Unix socket on the server machine.", nil, nil},
+			"client_hostname":          {DISCARD, "Host name of the connected client, as reported by a reverse DNS lookup of client_addr. This field will only be non-null for IP connections, and only when log_hostname is enabled.", nil, nil},
+			"client_port":              {DISCARD, "TCP port number that the client is using for communication with this WAL sender, or -1 if a Unix socket is used", nil, nil},
+			"backend_start":            {DISCARD, "with time zone	Time when this process was started, i.e., when the client connected to this WAL sender", nil, nil},
 			"backend_xmin":             {DISCARD, "The current backend's xmin horizon.", nil, nil},
 			"state":                    {LABEL, "Current WAL sender state", nil, nil},
 			"sent_location":            {DISCARD, "Last transaction log position sent on this connection", nil, semver.MustParseRange("<10.0.0")},
@@ -391,11 +391,12 @@ var queryOverrides = map[string][]OverrideQuery{
 		{
 			semver.MustParseRange(">=10.0.0"),
 			`
-			SELECT *,
+			SELECT stat.*, slots.slot_name,
 				(case pg_is_in_recovery() when 't' then null else pg_current_wal_lsn() end) AS pg_current_wal_lsn,
 				(case pg_is_in_recovery() when 't' then null else pg_wal_lsn_diff(pg_current_wal_lsn(), pg_lsn('0/0'))::float end) AS pg_current_wal_lsn_bytes,
 				(case pg_is_in_recovery() when 't' then null else pg_wal_lsn_diff(pg_current_wal_lsn(), replay_lsn)::float end) AS pg_wal_lsn_diff
-			FROM pg_stat_replication
+			FROM pg_stat_replication stat
+			JOIN pg_replication_slots slots on stat.pid = slots.active_pid
 			`,
 		},
 		{

magefile.go

@@ -1,4 +1,6 @@
+//go:build mage
 // +build mage
+
 // Self-contained go-project magefile.
 
 // nolint: deadcode
@@ -637,7 +639,7 @@ func Release() error {
 func makeBuilder(cmd string, platform Platform) func() error {
 	f := func() error {
 		// Depend on assets
-		mg.Deps(Assets)
+		//mg.Deps(Assets)
 
 		cmdSrc := fmt.Sprintf("./%s/%s", mustStr(filepath.Rel(curDir, cmdDir)), cmd)