Skip to content

Commit d67a628

Browse files
ryan4yinehbello
authored andcommitted
fix(cloudnative-pg): queries identation in cnpg-default-monitoring (cloudnative-pg#650)
Signed-off-by: Ryan Yin <xiaoyin_c@qq.com>
1 parent 163420d commit d67a628

File tree

1 file changed

+72
-71
lines changed

1 file changed

+72
-71
lines changed

charts/cloudnative-pg/values.yaml

Lines changed: 72 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -210,30 +210,30 @@ monitoringQueriesConfigMap:
210210
queries: |
211211
backends:
212212
query: |
213-
SELECT sa.datname
214-
, sa.usename
215-
, sa.application_name
216-
, states.state
217-
, COALESCE(sa.count, 0) AS total
218-
, COALESCE(sa.max_tx_secs, 0) AS max_tx_duration_seconds
219-
FROM ( VALUES ('active')
220-
, ('idle')
221-
, ('idle in transaction')
222-
, ('idle in transaction (aborted)')
223-
, ('fastpath function call')
224-
, ('disabled')
225-
) AS states(state)
226-
LEFT JOIN (
227-
SELECT datname
228-
, state
229-
, usename
230-
, COALESCE(application_name, '') AS application_name
231-
, COUNT(*)
232-
, COALESCE(EXTRACT (EPOCH FROM (max(now() - xact_start))), 0) AS max_tx_secs
233-
FROM pg_catalog.pg_stat_activity
234-
GROUP BY datname, state, usename, application_name
235-
) sa ON states.state = sa.state
236-
WHERE sa.usename IS NOT NULL
213+
SELECT sa.datname
214+
, sa.usename
215+
, sa.application_name
216+
, states.state
217+
, COALESCE(sa.count, 0) AS total
218+
, COALESCE(sa.max_tx_secs, 0) AS max_tx_duration_seconds
219+
FROM ( VALUES ('active')
220+
, ('idle')
221+
, ('idle in transaction')
222+
, ('idle in transaction (aborted)')
223+
, ('fastpath function call')
224+
, ('disabled')
225+
) AS states(state)
226+
LEFT JOIN (
227+
SELECT datname
228+
, state
229+
, usename
230+
, COALESCE(application_name, '') AS application_name
231+
, COUNT(*)
232+
, COALESCE(EXTRACT (EPOCH FROM (max(now() - xact_start))), 0) AS max_tx_secs
233+
FROM pg_catalog.pg_stat_activity
234+
GROUP BY datname, state, usename, application_name
235+
) sa ON states.state = sa.state
236+
WHERE sa.usename IS NOT NULL
237237
metrics:
238238
- datname:
239239
usage: "LABEL"
@@ -256,22 +256,22 @@ monitoringQueriesConfigMap:
256256
257257
backends_waiting:
258258
query: |
259-
SELECT count(*) AS total
260-
FROM pg_catalog.pg_locks blocked_locks
261-
JOIN pg_catalog.pg_locks blocking_locks
262-
ON blocking_locks.locktype = blocked_locks.locktype
263-
AND blocking_locks.database IS NOT DISTINCT FROM blocked_locks.database
264-
AND blocking_locks.relation IS NOT DISTINCT FROM blocked_locks.relation
265-
AND blocking_locks.page IS NOT DISTINCT FROM blocked_locks.page
266-
AND blocking_locks.tuple IS NOT DISTINCT FROM blocked_locks.tuple
267-
AND blocking_locks.virtualxid IS NOT DISTINCT FROM blocked_locks.virtualxid
268-
AND blocking_locks.transactionid IS NOT DISTINCT FROM blocked_locks.transactionid
269-
AND blocking_locks.classid IS NOT DISTINCT FROM blocked_locks.classid
270-
AND blocking_locks.objid IS NOT DISTINCT FROM blocked_locks.objid
271-
AND blocking_locks.objsubid IS NOT DISTINCT FROM blocked_locks.objsubid
272-
AND blocking_locks.pid != blocked_locks.pid
273-
JOIN pg_catalog.pg_stat_activity blocking_activity ON blocking_activity.pid = blocking_locks.pid
274-
WHERE NOT blocked_locks.granted
259+
SELECT count(*) AS total
260+
FROM pg_catalog.pg_locks blocked_locks
261+
JOIN pg_catalog.pg_locks blocking_locks
262+
ON blocking_locks.locktype = blocked_locks.locktype
263+
AND blocking_locks.database IS NOT DISTINCT FROM blocked_locks.database
264+
AND blocking_locks.relation IS NOT DISTINCT FROM blocked_locks.relation
265+
AND blocking_locks.page IS NOT DISTINCT FROM blocked_locks.page
266+
AND blocking_locks.tuple IS NOT DISTINCT FROM blocked_locks.tuple
267+
AND blocking_locks.virtualxid IS NOT DISTINCT FROM blocked_locks.virtualxid
268+
AND blocking_locks.transactionid IS NOT DISTINCT FROM blocked_locks.transactionid
269+
AND blocking_locks.classid IS NOT DISTINCT FROM blocked_locks.classid
270+
AND blocking_locks.objid IS NOT DISTINCT FROM blocked_locks.objid
271+
AND blocking_locks.objsubid IS NOT DISTINCT FROM blocked_locks.objsubid
272+
AND blocking_locks.pid != blocked_locks.pid
273+
JOIN pg_catalog.pg_stat_activity blocking_activity ON blocking_activity.pid = blocking_locks.pid
274+
WHERE NOT blocked_locks.granted
275275
metrics:
276276
- total:
277277
usage: "GAUGE"
@@ -309,16 +309,17 @@ monitoringQueriesConfigMap:
309309
description: "Time at which postgres started (based on epoch)"
310310
311311
pg_replication:
312-
query: "SELECT CASE WHEN (
313-
NOT pg_catalog.pg_is_in_recovery()
314-
OR pg_catalog.pg_last_wal_receive_lsn() = pg_catalog.pg_last_wal_replay_lsn())
315-
THEN 0
316-
ELSE GREATEST (0,
317-
EXTRACT(EPOCH FROM (now() - pg_catalog.pg_last_xact_replay_timestamp())))
318-
END AS lag,
319-
pg_catalog.pg_is_in_recovery() AS in_recovery,
320-
EXISTS (TABLE pg_stat_wal_receiver) AS is_wal_receiver_up,
321-
(SELECT count(*) FROM pg_catalog.pg_stat_replication) AS streaming_replicas"
312+
query: |
313+
SELECT CASE WHEN (
314+
NOT pg_catalog.pg_is_in_recovery()
315+
OR pg_catalog.pg_last_wal_receive_lsn() = pg_catalog.pg_last_wal_replay_lsn())
316+
THEN 0
317+
ELSE GREATEST (0,
318+
EXTRACT(EPOCH FROM (now() - pg_catalog.pg_last_xact_replay_timestamp())))
319+
END AS lag,
320+
pg_catalog.pg_is_in_recovery() AS in_recovery,
321+
EXISTS (TABLE pg_stat_wal_receiver) AS is_wal_receiver_up,
322+
(SELECT count(*) FROM pg_catalog.pg_stat_replication) AS streaming_replicas
322323
metrics:
323324
- lag:
324325
usage: "GAUGE"
@@ -586,20 +587,20 @@ monitoringQueriesConfigMap:
586587
pg_stat_replication:
587588
primary: true
588589
query: |
589-
SELECT usename
590-
, COALESCE(application_name, '') AS application_name
591-
, COALESCE(client_addr::text, '') AS client_addr
592-
, COALESCE(client_port::text, '') AS client_port
593-
, EXTRACT(EPOCH FROM backend_start) AS backend_start
594-
, COALESCE(pg_catalog.age(backend_xmin), 0) AS backend_xmin_age
595-
, pg_catalog.pg_wal_lsn_diff(pg_catalog.pg_current_wal_lsn(), sent_lsn) AS sent_diff_bytes
596-
, pg_catalog.pg_wal_lsn_diff(pg_catalog.pg_current_wal_lsn(), write_lsn) AS write_diff_bytes
597-
, pg_catalog.pg_wal_lsn_diff(pg_catalog.pg_current_wal_lsn(), flush_lsn) AS flush_diff_bytes
598-
, COALESCE(pg_catalog.pg_wal_lsn_diff(pg_catalog.pg_current_wal_lsn(), replay_lsn),0) AS replay_diff_bytes
599-
, COALESCE((EXTRACT(EPOCH FROM write_lag)),0)::float AS write_lag_seconds
600-
, COALESCE((EXTRACT(EPOCH FROM flush_lag)),0)::float AS flush_lag_seconds
601-
, COALESCE((EXTRACT(EPOCH FROM replay_lag)),0)::float AS replay_lag_seconds
602-
FROM pg_catalog.pg_stat_replication
590+
SELECT usename
591+
, COALESCE(application_name, '') AS application_name
592+
, COALESCE(client_addr::text, '') AS client_addr
593+
, COALESCE(client_port::text, '') AS client_port
594+
, EXTRACT(EPOCH FROM backend_start) AS backend_start
595+
, COALESCE(pg_catalog.age(backend_xmin), 0) AS backend_xmin_age
596+
, pg_catalog.pg_wal_lsn_diff(pg_catalog.pg_current_wal_lsn(), sent_lsn) AS sent_diff_bytes
597+
, pg_catalog.pg_wal_lsn_diff(pg_catalog.pg_current_wal_lsn(), write_lsn) AS write_diff_bytes
598+
, pg_catalog.pg_wal_lsn_diff(pg_catalog.pg_current_wal_lsn(), flush_lsn) AS flush_diff_bytes
599+
, COALESCE(pg_catalog.pg_wal_lsn_diff(pg_catalog.pg_current_wal_lsn(), replay_lsn),0) AS replay_diff_bytes
600+
, COALESCE((EXTRACT(EPOCH FROM write_lag)),0)::float AS write_lag_seconds
601+
, COALESCE((EXTRACT(EPOCH FROM flush_lag)),0)::float AS flush_lag_seconds
602+
, COALESCE((EXTRACT(EPOCH FROM replay_lag)),0)::float AS replay_lag_seconds
603+
FROM pg_catalog.pg_stat_replication
603604
metrics:
604605
- usename:
605606
usage: "LABEL"
@@ -659,13 +660,13 @@ monitoringQueriesConfigMap:
659660
pg_extensions:
660661
query: |
661662
SELECT
662-
current_database() as datname,
663-
name as extname,
664-
default_version,
665-
installed_version,
666-
CASE
667-
WHEN default_version = installed_version THEN 0
668-
ELSE 1
663+
current_database() as datname,
664+
name as extname,
665+
default_version,
666+
installed_version,
667+
CASE
668+
WHEN default_version = installed_version THEN 0
669+
ELSE 1
669670
END AS update_available
670671
FROM pg_catalog.pg_available_extensions
671672
WHERE installed_version IS NOT NULL

0 commit comments

Comments
 (0)