From b5ecfc327fa809d8ec9860ae262debddd3b47deb Mon Sep 17 00:00:00 2001
From: Alex Vandiver <alexmv@zulip.com>
Date: Mon, 13 Jun 2022 16:30:07 -0700
Subject: [PATCH] nagios: Remove unnecessary `web` hostgroup.

This had identical membership to `frontends`.
---
 .../files/nagios4/conf.d/hostgroups.cfg       |  5 -----
 .../files/nagios4/conf.d/services.cfg         | 19 ++++++++-----------
 .../templates/nagios4/hosts.cfg.template.erb  |  6 +++---
 3 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/puppet/zulip_ops/files/nagios4/conf.d/hostgroups.cfg b/puppet/zulip_ops/files/nagios4/conf.d/hostgroups.cfg
index eb0d28ad38..625793ce31 100644
--- a/puppet/zulip_ops/files/nagios4/conf.d/hostgroups.cfg
+++ b/puppet/zulip_ops/files/nagios4/conf.d/hostgroups.cfg
@@ -29,11 +29,6 @@ define hostgroup {
         alias                   Servers for whom we do not page, and have flakier net
 }
 
-define hostgroup {
-        hostgroup_name          web
-        alias                   Web servers
-}
-
 define hostgroup {
         hostgroup_name          frontends
         alias                   Frontend web servers
diff --git a/puppet/zulip_ops/files/nagios4/conf.d/services.cfg b/puppet/zulip_ops/files/nagios4/conf.d/services.cfg
index a3577d38f5..c4f6723b05 100644
--- a/puppet/zulip_ops/files/nagios4/conf.d/services.cfg
+++ b/puppet/zulip_ops/files/nagios4/conf.d/services.cfg
@@ -136,17 +136,6 @@ define service {
 
 ### Service groups
 
-#### Web
-
-define service {
-        use                             generic-service
-        service_description             HTTPS
-        hostgroup_name                  web
-        check_command                   check_https_status
-        contact_groups                  page_admins
-}
-
-
 #### zmirror / zmirrorp
 
 define service {
@@ -184,6 +173,14 @@ define service {
 
 #### Application frontends
 
+define service {
+        use                             generic-service
+        service_description             HTTPS
+        hostgroup_name                  frontends
+        check_command                   check_https_status
+        contact_groups                  page_admins
+}
+
 define service {
         use                             generic-service
         service_description             Check send receive time
diff --git a/puppet/zulip_ops/templates/nagios4/hosts.cfg.template.erb b/puppet/zulip_ops/templates/nagios4/hosts.cfg.template.erb
index ba3404acdd..1e5f3a1e1b 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 %>
-       hostgroups       all,non_aws_host,web,frontends,not_pageable_servers,postgresql_primary
+       hostgroups       all,non_aws_host,frontends,not_pageable_servers,postgresql_primary
        }
 <% end -%>
 
@@ -14,7 +14,7 @@ define host{
        host_name        <%= host %>
        alias            <%= host %>
        address          <%= host %>.<%= @default_host_domain %>
-       hostgroups       all,aws_host,web,prod_frontends,pageable_servers
+       hostgroups       all,aws_host,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,staging_frontends,not_pageable_servers
+       hostgroups       all,aws_host,staging_frontends,not_pageable_servers
        }
 <% end -%>