The pg_database metric is now builtin

[chef.git] / cookbooks / postgresql / templates / default / postgres_queries.yml.erb

diff --git a/cookbooks/postgresql/templates/default/postgres_queries.yml.erb b/cookbooks/postgresql/templates/default/postgres_queries.yml.erb
index a61359d19ada2a6620830fd1ee8d7e13000ddf90..da8b7bbc962a564bfa15433c50e478aeebdf89fa 100644 (file)
--- a/cookbooks/postgresql/templates/default/postgres_queries.yml.erb
+++ b/cookbooks/postgresql/templates/default/postgres_queries.yml.erb
@@ -13,6 +13,7 @@ pg_postmaster:
     - start_time_seconds:
         usage: "GAUGE"
         description: "Time at which postmaster started"
+<% if node[:postgresql][:monitor_tables] -%>
 
 pg_stat_user_tables:
   query: "SELECT current_database() datname, schemaname, relname, seq_scan, seq_tup_read, idx_scan, idx_tup_fetch, n_tup_ins, n_tup_upd, n_tup_del, n_tup_hot_upd, n_live_tup, n_dead_tup, n_mod_since_analyze, COALESCE(last_vacuum, '1970-01-01Z'), COALESCE(last_vacuum, '1970-01-01Z') as last_vacuum, COALESCE(last_autovacuum, '1970-01-01Z') as last_autovacuum, COALESCE(last_analyze, '1970-01-01Z') as last_analyze, COALESCE(last_autoanalyze, '1970-01-01Z') as last_autoanalyze, vacuum_count, autovacuum_count, analyze_count, autoanalyze_count FROM pg_stat_user_tables"
@@ -120,18 +121,17 @@ pg_statio_user_tables:
     - tidx_blks_hit:
         usage: "COUNTER"
         description: "Number of buffer hits in this table's TOAST table indexes (if any)"
-        
-pg_database:
-  query: "SELECT pg_database.oid AS datid, pg_database.datname, pg_database_size(pg_database.datname) AS size_bytes FROM pg_database"
-  master: true
-  cache_seconds: 30
+<% end -%>
+
+pg_unfrozen_ids:
+  query: "SELECT current_database() AS datname, max(age(relfrozenxid)) AS xid_age, max(mxid_age(relminmxid)) AS mxid_age FROM pg_class WHERE relkind IN ('r', 'm')"
   metrics:
-    - datid:
-        usage: "LABEL"
-        description: "ID of the database"
     - datname:
         usage: "LABEL"
         description: "Name of the database"
-    - size_bytes:
+    - xid_age:
+        usage: "GAUGE"
+        description: "Age of the oldest unfrozen transaction ID in this database"
+    - mxid_age:
         usage: "GAUGE"
-        description: "Disk space used by the database"
+        description: "Age of the oldest unfrozen multixact ID in this database"