add random jitter to check run interval #2040

api/tacticalrmm/agents/models.py

@@ -1,5 +1,6 @@
 import asyncio
 import logging
+import random
 import re
 from collections import Counter
 from contextlib import suppress
@@ -584,7 +585,9 @@ def check_run_interval(self) -> int:
                 # don't allow check runs less than 15s
                 interval = 15 if check.run_interval < 15 else check.run_interval
 
-        return interval
+        return interval + random.randint(
+            *getattr(settings, "CHECK_INTERVAL_JITTER", (1, 60))
+        )
 
     def run_script(
         self,

api/tacticalrmm/apiv3/tests/tests.py

@@ -1,3 +1,5 @@
+from unittest.mock import patch
+
 from django.utils import timezone as djangotime
 from model_bakery import baker
 
@@ -12,7 +14,8 @@ def setUp(self):
         self.setup_coresettings()
         self.agent = baker.make_recipe("agents.agent")
 
-    def test_get_checks(self):
+    @patch("agents.models.random.randint", return_value=0)
+    def test_get_checks(self, mock_randint):
         agent = baker.make_recipe("agents.agent")
         url = f"/api/v3/{agent.agent_id}/checkrunner/"
 
@@ -67,7 +70,8 @@ def test_get_checks(self):
 
         self.check_not_authenticated("get", url)
 
-    def test_checkrunner_interval(self):
+    @patch("agents.models.random.randint", return_value=0)
+    def test_checkrunner_interval(self, mock_randint):
         url = f"/api/v3/{self.agent.agent_id}/checkinterval/"
         r = self.client.get(url, format="json")
         self.assertEqual(r.status_code, 200)