Merge ~pjdc/ubuntu-mirror-charm/+git/ubuntu-mirror-charm:rsync-max-processes-round-2 into ubuntu-mirror-charm:master

[Paul Collins]

bump ceiling over max client connections to account for all roles syncing simultaneously

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Haw Loeung (hloeung)]

LGTM

review: Approve (+1)

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 8c059eedae3228dcbbcf8d255ddcc161d896572e

diff --git a/hooks/hooks.py b/hooks/hooks.py
index 375076c..894760f 100755
--- a/hooks/hooks.py
+++ b/hooks/hooks.py
@@ -750,9 +750,9 @@ def configure_nrpe(conf, hostname):  # noqa: C901
             tmpl_data["use"] = "active-service"
             tmpl_data["nagios_hostname"] = conf.nagios_hostname()
             # One extra for the rsync daemon itself, another two
-            # for pulling from syncproxy, one more for luck.
-            tmpl_data["rsync_crit"] = int(conf.rsync_max_connections() + 4)
-            tmpl_data["rsync_warn"] = int(conf.rsync_max_connections() + 1)  # all client slots used
+            # per role for pulling from syncproxy, one more for luck.
+            tmpl_data["rsync_crit"] = conf.rsync_max_connections() + 1 + len(roles[hostname]) * 2 + 1
+            tmpl_data["rsync_warn"] = conf.rsync_max_connections() + 1  # all client slots used
             tmpl_data["tracepath"] = os.path.join(mirror["path"], ".trace", mirror["base_role"] + "-" + hostname)
 
             for check, check_details in role_checks.items():