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

nagios: Rename `zmirror_main` into `zmirror` hostgroup. 

`zmirror` itself was `zmirror_main` + `zmirrorp` but was unused; we
consistently just use the term `zmirror` for the non-personals server,
so use it as the hostgroup name.
This commit is contained in:
Alex Vandiver 2022-06-13 16:17:21 -07:00 committed by Alex Vandiver
parent 70c36985b4
commit d9d0014fb4
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,19 +55,14 @@ define hostgroup {
alias Redis servers alias Redis servers
} }
define hostgroup {
hostgroup_name zmirror
alias Zephyr mirror servers
}
define hostgroup { define hostgroup {
hostgroup_name zmirrorp hostgroup_name zmirrorp
alias Zephyr mirror personals servers alias Zephyr mirror personals servers
} }
define hostgroup { define hostgroup {
hostgroup_name zmirror_main hostgroup_name zmirror
alias Zephyr mirror main servers alias Zephyr mirror classes servers
} }
define hostgroup { define hostgroup {

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

@ -152,7 +152,7 @@ define service {
define service { define service {
use generic-service use generic-service
service_description zephyr mirror forwarding service_description zephyr mirror forwarding
hostgroup_name zmirror_main hostgroup_name zmirror
check_command check_zephyr_mirror_forwarding!22 check_command check_zephyr_mirror_forwarding!22
normal_check_interval 2 normal_check_interval 2
# Note: the actual check is run via cron, so retry_check_interval # Note: the actual check is run via cron, so retry_check_interval
@ -165,7 +165,7 @@ define service {
define service { define service {
use generic-service use generic-service
service_description zmirror subscriptions syncing service_description zmirror subscriptions syncing
hostgroup_name zmirror_main hostgroup_name zmirror
check_command check_sync_public_streams!22 check_command check_sync_public_streams!22
normal_check_interval 2 normal_check_interval 2
retry_check_interval 2 retry_check_interval 2

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

@ -34,7 +34,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,non_aws_host,zmirror,zmirror_main,flaky_servers hostgroups all,non_aws_host,zmirror,flaky_servers
} }
<% end -%> <% end -%>
@ -44,7 +44,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,non_aws_host,zmirror,zmirrorp,flaky_servers hostgroups all,non_aws_host,zmirrorp,flaky_servers
} }
<% end -%> <% end -%>