Merge branch 'bjk/bump_prometheus_2_15' into 'master'

Update monitoring components

See merge request gitlab-org/omnibus-gitlab!3874

changelogs/unreleased/bjk-bump_prometheus_2_15.yml

+---
+title: Update monitoring components
+merge_request: 3874
+author:
+type: other

config/software/alertmanager.rb

@@ -20,7 +20,7 @@ require "#{Omnibus::Config.project_root}/lib/gitlab/version"
 require "#{Omnibus::Config.project_root}/lib/gitlab/prometheus_helper"
 name 'alertmanager'
-version = Gitlab::Version.new('alertmanager', '0.18.0')
+version = Gitlab::Version.new('alertmanager', '0.20.0')
 default_version version.print
 license 'APACHE-2.0'

config/software/pgbouncer-exporter.rb

@@ -20,7 +20,7 @@ require "#{Omnibus::Config.project_root}/lib/gitlab/version"
 require "#{Omnibus::Config.project_root}/lib/gitlab/prometheus_helper"
 name 'pgbouncer-exporter'
-version = Gitlab::Version.new('pgbouncer-exporter', '0.0.7-gitlab')
+version = Gitlab::Version.new('pgbouncer-exporter', '0.1.2-gitlab')
 default_version version.print
 license 'MIT'

config/software/postgres-exporter.rb

@@ -19,7 +19,7 @@
 require "#{Omnibus::Config.project_root}/lib/gitlab/version"
 name 'postgres-exporter'
-version = Gitlab::Version.new('postgres-exporter', '0.5.1')
+version = Gitlab::Version.new('postgres-exporter', '0.8.0')
 default_version version.print
 license 'Apache-2.0'

config/software/prometheus.rb

@@ -20,7 +20,7 @@ require "#{Omnibus::Config.project_root}/lib/gitlab/version"
 require "#{Omnibus::Config.project_root}/lib/gitlab/prometheus_helper"
 name 'prometheus'
-version = Gitlab::Version.new('prometheus', '2.12.0')
+version = Gitlab::Version.new('prometheus', '2.15.2')
 default_version version.print
 license 'APACHE-2.0'

config/software/redis-exporter.rb

@@ -20,7 +20,7 @@ require "#{Omnibus::Config.project_root}/lib/gitlab/version"
 require 'time'
 name 'redis-exporter'
-version = Gitlab::Version.new('redis-exporter', '1.3.4')
+version = Gitlab::Version.new('redis-exporter', '1.3.5')
 default_version version.print
 license 'MIT'

files/gitlab-cookbooks/monitoring/templates/postgres-queries.yaml

@@ -16,8 +16,11 @@ pg_postmaster:
         description: "Time at which postmaster started"
 pg_stat_user_tables:
-  query: "SELECT 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, last_vacuum, last_autovacuum, last_analyze, last_autoanalyze, vacuum_count, autovacuum_count, analyze_count, autoanalyze_count FROM 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"
   metrics:
+    - datname:
+        usage: "LABEL"
+        description: "Name of current database"
     - schemaname:
         usage: "LABEL"
         description: "Name of the schema that this table is in"