Replace custom query with process_idle collector

diff --git a/cookbooks/postgresql/recipes/default.rb b/cookbooks/postgresql/recipes/default.rb
index 3bf0ad154e6ca39e09a1819a4ca5e06c5bad386c..7b5269b071be2bdd927f97fd120b9eb324acd18f 100644 (file)
--- a/cookbooks/postgresql/recipes/default.rb
+++ b/cookbooks/postgresql/recipes/default.rb
@@ -108,11 +108,8 @@ ohai_plugin "postgresql" do
   template "ohai.rb.erb"
 end
 
-template "/etc/prometheus/exporters/postgres_queries.yml" do
-  source "postgres_queries.yml.erb"
-  owner "root"
-  group "root"
-  mode "644"
+file "/etc/prometheus/exporters/postgres_queries.yml" do
+  action :delete
 end
 
 package "pgtop"
@@ -131,7 +128,7 @@ clusters.each do |name, details|
     scrape_interval "1m"
     scrape_timeout "1m"
     user "postgres"
-    options "--no-collector.process_idle --extend.query-path=/etc/prometheus/exporters/postgres_queries.yml"
+    options "--collector.process_idle"
     environment "DATA_SOURCE_NAME" => "postgres:///#{prometheus_database}?host=/run/postgresql&port=#{details[:port]}"
     restrict_address_families "AF_UNIX"
     remove_ipc false

diff --git a/cookbooks/postgresql/templates/default/postgres_queries.yml.erb b/cookbooks/postgresql/templates/default/postgres_queries.yml.erb
deleted file mode 100644 (file)
index a92382e..0000000
--- a/cookbooks/postgresql/templates/default/postgres_queries.yml.erb
+++ /dev/null
@@ -1,58 +0,0 @@
-pg_process_idle:
-  query: |
-    WITH
-      metrics AS (
-        SELECT
-          state,
-          application_name,
-          SUM(EXTRACT(EPOCH FROM (CURRENT_TIMESTAMP - state_change))::bigint)::float AS process_idle_seconds_sum,
-          COUNT(*) AS process_idle_seconds_count
-        FROM pg_stat_activity
-        WHERE state ~ '^idle'
-        GROUP BY state, application_name
-      ),
-      buckets AS (
-        SELECT
-          state,
-          application_name,
-          le,
-          SUM(
-            CASE WHEN EXTRACT(EPOCH FROM (CURRENT_TIMESTAMP - state_change)) <= le
-              THEN 1
-              ELSE 0
-            END
-          )::bigint AS bucket
-        FROM
-          pg_stat_activity,
-          UNNEST(ARRAY[1, 2, 5, 15, 30, 60, 90, 120, 300]) AS le
-        GROUP BY state, application_name, le
-        ORDER BY state, application_name, le
-      )
-    SELECT
-      state,
-      application_name,
-      process_idle_seconds_sum as seconds_sum,
-      process_idle_seconds_count as seconds_count,
-      ARRAY_AGG(le) AS seconds,
-      ARRAY_AGG(bucket) AS seconds_bucket
-    FROM metrics JOIN buckets USING (state, application_name)
-    GROUP BY 1, 2, 3, 4
-  master: true
-  metrics:
-    - state:
-        usage: "LABEL"
-        description: "State"
-    - application_name:
-        usage: "LABEL"
-        description: "Application Name"
-    - seconds:
-        usage: "HISTOGRAM"
-        description: "Idle time of server processes"
-
-pg_wal:
-  query: "SELECT count(*) AS segment_count FROM pg_ls_waldir() WHERE name ~ '^[0-9A-Z]{24}$'"
-  master: true
-  metrics:
-    - segment_count:
-        usage: "GAUGE"
-        description: "Number of WAL segments"