Merge branch 'bjk/update_gl_monitor' into 'master'

Update gitlab-monitor

See merge request !1528

config/software/gitlab-monitor.rb

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-version = Gitlab::Version.new('gitlab-monitor', '1.3.0')
+version = Gitlab::Version.new('gitlab-monitor', '1.6.0')
 
 default_version version.print
 

files/gitlab-cookbooks/gitlab/templates/default/gitlab-monitor.yml.erb

@@ -17,7 +17,7 @@ server:
 
 # Probes config
 probes:
-  git_repos:
+  git:
     multiple: true
 <% node['gitlab']['gitlab-shell']['git_data_directories'].each do |repo_name, git_data_directory| -%>
     <%= repo_name %>:
@@ -54,6 +54,9 @@ probes:
     slow_queries:
       class_name: Database::SlowQueriesProber
       <<: *db_common
+    stuck_idle_in_transactions:
+      class_name: Database::StuckIdleInTransactionsProber
+      <<: *db_common
     vacuum_queries:
       class_name: Database::VacuumQueriesProber
       <<: *db_common
@@ -78,5 +81,6 @@ probes:
       - probe_jobs
       - probe_workers
       - probe_retries
+      - probe_dead
     opts:
       redis_url: "<%= @redis_url %>"