From 4c17f2bccce1ff06a2095e3e645f91b8dfc715e5 Mon Sep 17 00:00:00 2001
From: Alex Vandiver <alexmv@zulip.com>
Date: Mon, 13 Jun 2022 16:09:08 -0700
Subject: [PATCH] nagios: The frontends hostgroup now includes prod and staging
 frontends.

This lets the config file remove some repetition.
---
 puppet/zulip_ops/files/nagios4/conf.d/hostgroups.cfg      | 1 +
 puppet/zulip_ops/templates/nagios4/hosts.cfg.template.erb | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/puppet/zulip_ops/files/nagios4/conf.d/hostgroups.cfg b/puppet/zulip_ops/files/nagios4/conf.d/hostgroups.cfg
index ddf63364df..e8bf945351 100644
--- a/puppet/zulip_ops/files/nagios4/conf.d/hostgroups.cfg
+++ b/puppet/zulip_ops/files/nagios4/conf.d/hostgroups.cfg
@@ -37,6 +37,7 @@ define hostgroup {
 define hostgroup {
         hostgroup_name          frontends
         alias                   Frontend web servers
+        hostgroup_members       staging_frontends, prod_frontends
 }
 
 define hostgroup {
diff --git a/puppet/zulip_ops/templates/nagios4/hosts.cfg.template.erb b/puppet/zulip_ops/templates/nagios4/hosts.cfg.template.erb
index 0d34a23623..c761a8513c 100644
--- a/puppet/zulip_ops/templates/nagios4/hosts.cfg.template.erb
+++ b/puppet/zulip_ops/templates/nagios4/hosts.cfg.template.erb
@@ -4,7 +4,7 @@ define host{
        host_name        <%= host %>
        alias            <%= host %>
        address          <%= host %>.<%= @default_host_domain %>
-       hostgroups       all,aws_host,web,frontends,prod_frontends,pageable_servers
+       hostgroups       all,aws_host,web,prod_frontends,pageable_servers
        }
 <% end -%>
 
@@ -24,7 +24,7 @@ define host{
        host_name        <%= host %>
        alias            <%= host %>
        address          <%= host %>.<%= @default_host_domain %>
-       hostgroups       all,aws_host,web,frontends,staging_frontends,not_pageable_servers
+       hostgroups       all,aws_host,web,staging_frontends,not_pageable_servers
        }
 <% end -%>