puppet: Move zulip_ops supervisor config into /etc/supervisor/conf.d/zulip/.

This is similar cleanup to 3ab9b31d2f, but only affects zulip_ops
services; it serves to ensure that any of these services which are no
longer enabled are automatically removed from supervisor.

Note that this will cause a supervisor restart on all affected hosts,
which will restart all supervisor services.

puppet/zulip/manifests/supervisor.pp

@@ -32,7 +32,21 @@ class zulip::supervisor {
     "${zulip::common::supervisor_system_conf_dir}/thumbor.conf",
     "${zulip::common::supervisor_system_conf_dir}/zulip.conf",
     "${zulip::common::supervisor_system_conf_dir}/zulip_db.conf",
-  ]:
+    ]:
+    ensure => absent,
+  }
+
+  # These were similarly moved, but were only referenced in zulip_ops,
+  # and thus can be removed as soon as all relevant hosts have been
+  # updated:
+  file { [
+    "${zulip::common::supervisor_system_conf_dir}/grafana.conf",
+    "${zulip::common::supervisor_system_conf_dir}/munin_tunnels.conf",
+    "${zulip::common::supervisor_system_conf_dir}/prometheus.conf",
+    "${zulip::common::supervisor_system_conf_dir}/prometheus_node_exporter.conf",
+    "${zulip::common::supervisor_system_conf_dir}/redis_tunnel.conf",
+    "${zulip::common::supervisor_system_conf_dir}/zmirror.conf",
+    ]:
     ensure => absent,
   }
 

puppet/zulip_ops/manifests/app_frontend.pp

@@ -23,7 +23,7 @@ class zulip_ops::app_frontend {
     source => 'puppet:///modules/zulip/logrotate/zulip',
   }
 
-  file { '/etc/supervisor/conf.d/redis_tunnel.conf':
+  file { "${zulip::common::supervisor_conf_dir}/redis_tunnel.conf":
     ensure  => file,
     require => Package['supervisor', 'autossh'],
     owner   => 'root',

puppet/zulip_ops/manifests/profile/grafana.pp

@@ -44,7 +44,7 @@ class zulip_ops::profile::grafana {
 
   zulip_ops::teleport::application { 'monitoring': port => '3000' }
   zulip_ops::firewall_allow { 'grafana': port => '3000' }
-  file { '/etc/supervisor/conf.d/grafana.conf':
+  file { "${zulip::common::supervisor_conf_dir}/grafana.conf":
     ensure  => file,
     require => [
       Package[supervisor],

puppet/zulip_ops/manifests/profile/munin_server.pp

@@ -43,7 +43,7 @@ class zulip_ops::profile::munin_server {
     content => template('zulip_ops/munin/munin.conf.erb'),
   }
 
-  file { '/etc/supervisor/conf.d/munin_tunnels.conf':
+  file { "${zulip::common::supervisor_conf_dir}/munin_tunnels.conf":
     ensure  => file,
     require => Package['supervisor', 'autossh'],
     mode    => '0644',

puppet/zulip_ops/manifests/profile/prometheus_server.pp

@@ -31,7 +31,7 @@ class zulip_ops::profile::prometheus_server {
     group   => 'prometheus',
     require => [ User[prometheus], Group[prometheus] ],
   }
-  file { '/etc/supervisor/conf.d/prometheus.conf':
+  file { "${zulip::common::supervisor_conf_dir}/prometheus.conf":
     ensure  => file,
     require => [
       Package[supervisor],

puppet/zulip_ops/manifests/profile/zmirror.pp

@@ -23,7 +23,7 @@ class zulip_ops::profile::zmirror {
     require => Exec['setup_apt_repo_debathena'],
   }
 
-  file { '/etc/supervisor/conf.d/zmirror.conf':
+  file { "${zulip::common::supervisor_conf_dir}/zmirror.conf":
     ensure  => file,
     require => Package[supervisor],
     owner   => 'root',

puppet/zulip_ops/manifests/prometheus/node.pp

@@ -19,7 +19,7 @@ class zulip_ops::prometheus::node {
   }
 
   zulip_ops::firewall_allow { 'node_exporter': port => '9100' }
-  file { '/etc/supervisor/conf.d/prometheus_node_exporter.conf':
+  file { "${zulip::common::supervisor_conf_dir}/prometheus_node_exporter.conf":
     ensure  => file,
     require => [
       User[prometheus],