From 378b3adbfe2a8203796dff118078f23fbbc86f3a Mon Sep 17 00:00:00 2001
From: Tom Grumet <tom.grumet@cloudcheckr.com>
Date: Wed, 30 Oct 2019 17:17:54 -0400
Subject: [PATCH] #212 fixing prometheus module

---
 manifests/init.pp           | 4 ++--
 manifests/omnibus_config.pp | 2 +-
 templates/gitlab.rb.erb     | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 5ec4382d..82c96075 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -217,7 +217,7 @@
 #   Default: undef
 #   Hash of 'prometheus' config parameters.
 #
-# [*prometheus_monitoring_enable*]
+# [*prometheus_monitoring*]
 #   Default: undef
 #   Enable/disable prometheus support.
 #
@@ -430,7 +430,7 @@
   Optional[Hash]                 $pgbouncer                       = undef,
   Optional[Hash]                 $postgresql                      = undef,
   Optional[Hash]                 $prometheus                      = undef,
-  Optional[Boolean]              $prometheus_monitoring_enable    = undef,
+  Optional[Boolean]              $prometheus_monitoring           = undef,
   Optional[Hash]                 $redis                           = undef,
   Optional[Boolean]              $redis_master_role               = undef,
   Optional[Boolean]              $redis_slave_role                = undef,
diff --git a/manifests/omnibus_config.pp b/manifests/omnibus_config.pp
index 686d95c2..53a0cbbd 100644
--- a/manifests/omnibus_config.pp
+++ b/manifests/omnibus_config.pp
@@ -48,7 +48,7 @@
   $pgbouncer = $gitlab::pgbouncer
   $postgresql = $gitlab::postgresql
   $prometheus = $gitlab::prometheus
-  $prometheus_monitoring_enable = $gitlab::prometheus_monitoring_enable
+  $prometheus_monitoring = $gitlab::prometheus_monitoring
   $redis = $gitlab::redis
   $redis_master_role = $gitlab::redis_master_role
   $redis_slave_role = $gitlab::redis_slave_role
diff --git a/templates/gitlab.rb.erb b/templates/gitlab.rb.erb
index 3dbd1306..7d04bc42 100644
--- a/templates/gitlab.rb.erb
+++ b/templates/gitlab.rb.erb
@@ -294,14 +294,14 @@ ci_unicorn['<%= k -%>'] = <%= decorate(@ci_unicorn[k]) %>
 <%- @ci_redis.keys.sort.each do |k| -%>
 ci_redis['<%= k -%>'] = <%= decorate(@ci_redis[k]) %>
 <%- end end -%>
-<%- if @prometheus or defined?(@prometheus_monitoring_enable) -%>
+<%- if @prometheus or defined?(@prometheus_monitoring) -%>
 
 ##############
 # Prometheus #
 ##############
 ##! Docs: https://docs.gitlab.com/ce/administration/monitoring/performance/prometheus.html
 
-<%- if defined?(@prometheus_monitoring_enable) -%>prometheus_monitoring['enable'] = <%= @prometheus_monitoring_enable %>
+<%- if defined?(@prometheus_monitoring) -%>prometheus_monitoring['enable'] = <%= @prometheus_monitoring %>
 <%- end -%>
 <%- if @prometheus %>
 <%- @prometheus.keys.sort.each do |k| -%>