Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

nagios: Fold single- and multitornado_frontends back into frontends. 

5abf4dee92 made this distinction, then multitornado_frontends was
never used; the singletornado_frontends alerting worked even for the
multiple-Tornado instances.

Remove the useless and misleading distinction.
This commit is contained in:
Alex Vandiver 2022-06-13 14:35:39 -07:00 committed by Alex Vandiver
parent 27b63d0baf
commit 872efdee58
3 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
puppet/zulip_ops/files/nagios4/conf.d/hostgroups.cfg
View File

@ -35,16 +35,6 @@ define hostgroup {
alias Production frontend web servers alias Production frontend web servers
} }
define hostgroup {
hostgroup_name multitornado_frontends
alias Frontend web servers with multiple Tornado processes
}
define hostgroup {
hostgroup_name singletornado_frontends
alias Frontend web servers with a single Tornado process
}
define hostgroup { define hostgroup {
hostgroup_name redis hostgroup_name redis
alias Redis servers alias Redis servers

2
puppet/zulip_ops/files/nagios4/conf.d/services.cfg
View File

@ -312,7 +312,7 @@ define service {
# Workaround weird checks 40s after first error causing alerts # Workaround weird checks 40s after first error causing alerts
# from a single failure because cron hasn't run again yet # from a single failure because cron hasn't run again yet
max_check_attempts 3 max_check_attempts 3
hostgroup_name singletornado_frontends hostgroup_name frontends
contact_groups page_admins contact_groups page_admins
} }

6
puppet/zulip_ops/templates/nagios4/hosts.cfg.template.erb
View File

@ -4,7 +4,7 @@ define host{
host_name <%= host %> host_name <%= host %>
alias <%= host %> alias <%= host %>
address <%= host %>.<%= @default_host_domain %> address <%= host %>.<%= @default_host_domain %>
hostgroups all,web,frontends,prod_frontends,singletornado_frontends,pageable_servers hostgroups all,web,frontends,prod_frontends,pageable_servers
} }
<% end -%> <% end -%>
@ -14,7 +14,7 @@ define host{
host_name <%= host %> host_name <%= host %>
alias <%= host %> alias <%= host %>
address <%= host %> address <%= host %>
hostgroups all,web,frontends,staging_frontends,singletornado_frontends,not_pageable_servers,postgresql,postgresql_primary hostgroups all,web,frontends,staging_frontends,not_pageable_servers,postgresql,postgresql_primary
} }
<% end -%> <% end -%>
@ -24,7 +24,7 @@ define host{
host_name <%= host %> host_name <%= host %>
alias <%= host %> alias <%= host %>
address <%= host %>.<%= @default_host_domain %> address <%= host %>.<%= @default_host_domain %>
hostgroups all,web,frontends,staging_frontends,singletornado_frontends,not_pageable_servers hostgroups all,web,frontends,staging_frontends,not_pageable_servers
} }
<% end -%> <% end -%>