From 422bbe4c35c2ba513861aa2851b952cdc047db10 Mon Sep 17 00:00:00 2001 From: Felix Hamme Date: Mon, 11 Dec 2023 10:56:00 +0100 Subject: [PATCH] add client_addr to metric pg_stat_activity_max_tx_duration --- cmd/postgres_exporter/postgres_exporter.go | 1 + cmd/postgres_exporter/queries.go | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/cmd/postgres_exporter/postgres_exporter.go b/cmd/postgres_exporter/postgres_exporter.go index fa34eecc5..b2c9813a5 100644 --- a/cmd/postgres_exporter/postgres_exporter.go +++ b/cmd/postgres_exporter/postgres_exporter.go @@ -252,6 +252,7 @@ var builtinMetricMaps = map[string]intermediateMetricMap{ "state": {LABEL, "connection state", nil, semver.MustParseRange(">=9.2.0")}, "usename": {LABEL, "connection usename", nil, nil}, "application_name": {LABEL, "connection application_name", nil, nil}, + "client_addr": {LABEL, "connection client_addr", nil, nil}, "count": {GAUGE, "number of connections in this state", nil, nil}, "max_tx_duration": {GAUGE, "max duration in seconds any active transaction has been running", nil, nil}, }, diff --git a/cmd/postgres_exporter/queries.go b/cmd/postgres_exporter/queries.go index fa0b5c272..e8561d61e 100644 --- a/cmd/postgres_exporter/queries.go +++ b/cmd/postgres_exporter/queries.go @@ -114,6 +114,7 @@ var queryOverrides = map[string][]OverrideQuery{ tmp.state, tmp2.usename, tmp2.application_name, + tmp2.client_addr, COALESCE(count,0) as count, COALESCE(max_tx_duration,0) as max_tx_duration FROM @@ -132,9 +133,10 @@ var queryOverrides = map[string][]OverrideQuery{ state, usename, application_name, + client_addr, count(*) AS count, MAX(EXTRACT(EPOCH FROM now() - xact_start))::float AS max_tx_duration - FROM pg_stat_activity GROUP BY datname,state,usename,application_name) AS tmp2 + FROM pg_stat_activity GROUP BY datname,state,usename,application_name, client_addr) AS tmp2 ON tmp.state = tmp2.state AND pg_database.datname = tmp2.datname `, },