From c2beb64a790d169171c1d184ff453072e85dc061 Mon Sep 17 00:00:00 2001
From: Alex Vandiver <alexmv@zulip.com>
Date: Thu, 30 Mar 2023 18:02:42 +0000
Subject: [PATCH] prometheus: Consistently import the base class and
 supervisor, if needed.

---
 puppet/zulip_ops/manifests/prometheus/rabbitmq.pp | 2 ++
 puppet/zulip_ops/manifests/prometheus/redis.pp    | 3 +++
 puppet/zulip_ops/manifests/prometheus/tornado.pp  | 3 +++
 puppet/zulip_ops/manifests/prometheus/uwsgi.pp    | 3 +++
 4 files changed, 11 insertions(+)

diff --git a/puppet/zulip_ops/manifests/prometheus/rabbitmq.pp b/puppet/zulip_ops/manifests/prometheus/rabbitmq.pp
index c266523c62..8f585f41f6 100644
--- a/puppet/zulip_ops/manifests/prometheus/rabbitmq.pp
+++ b/puppet/zulip_ops/manifests/prometheus/rabbitmq.pp
@@ -3,6 +3,8 @@
 # https://www.rabbitmq.com/prometheus.html
 #
 class zulip_ops::prometheus::rabbitmq {
+  include zulip_ops::prometheus::base
+
   exec { 'enable rabbitmq-prometheus':
     command => 'rabbitmq-plugins enable rabbitmq_prometheus',
     unless  => 'grep -q rabbitmq_prometheus /etc/rabbitmq/enabled_plugins',
diff --git a/puppet/zulip_ops/manifests/prometheus/redis.pp b/puppet/zulip_ops/manifests/prometheus/redis.pp
index 84ae3b8e32..224adcea2f 100644
--- a/puppet/zulip_ops/manifests/prometheus/redis.pp
+++ b/puppet/zulip_ops/manifests/prometheus/redis.pp
@@ -1,6 +1,9 @@
 # @summary Prometheus monitoring of redis servers
 #
 class zulip_ops::prometheus::redis {
+  include zulip_ops::prometheus::base
+  include zulip::supervisor
+
   $version = $zulip::common::versions['redis_exporter']['version']
   $dir = "/srv/zulip-redis_exporter-${version}"
   $bin = "${dir}/redis_exporter"
diff --git a/puppet/zulip_ops/manifests/prometheus/tornado.pp b/puppet/zulip_ops/manifests/prometheus/tornado.pp
index 97fbbc7806..61001f2fa0 100644
--- a/puppet/zulip_ops/manifests/prometheus/tornado.pp
+++ b/puppet/zulip_ops/manifests/prometheus/tornado.pp
@@ -1,6 +1,9 @@
 # @summary Prometheus monitoring of tornado processes
 #
 class zulip_ops::prometheus::tornado {
+  include zulip_ops::prometheus::base
+  include zulip::supervisor
+
   $version = $zulip::common::versions['process_exporter']['version']
   $dir = "/srv/zulip-process_exporter-${version}"
   $bin = "${dir}/process-exporter"
diff --git a/puppet/zulip_ops/manifests/prometheus/uwsgi.pp b/puppet/zulip_ops/manifests/prometheus/uwsgi.pp
index 5280d88e83..13c08a7ed3 100644
--- a/puppet/zulip_ops/manifests/prometheus/uwsgi.pp
+++ b/puppet/zulip_ops/manifests/prometheus/uwsgi.pp
@@ -1,6 +1,9 @@
 # @summary Prometheus monitoring of uwsgi servers
 #
 class zulip_ops::prometheus::uwsgi {
+  include zulip_ops::prometheus::base
+  include zulip::supervisor
+
   $version = $zulip::common::versions['uwsgi_exporter']['version']
   $dir = "/srv/zulip-uwsgi_exporter-${version}"
   $bin = "${dir}/uwsgi_exporter"