[fix] Fixed batch writing historical data for metrics #666

Related to #666

Author: pandafy

openwisp_monitoring/monitoring/base/models.py

@@ -449,6 +449,7 @@ def write(
             database=database,
             retention_policy=retention_policy,
             current=current,
+            metric=self,
         )
         # check can be disabled,
         # mostly for automated testing and debugging purposes
@@ -459,7 +460,6 @@ def write(
                 "retention_policy": retention_policy,
                 "send_alert": send_alert,
             }
-            options["metric"] = self
 
             # if alert_on_related_field then check threshold
             # on the related_field instead of field_name

openwisp_monitoring/monitoring/tasks.py

@@ -10,7 +10,7 @@
 from .signals import post_metric_write
 
 
-def _metric_post_write(name, values, metric, check_threshold_kwargs, **kwargs):
+def _metric_post_write(name, values, metric, check_threshold_kwargs=None, **kwargs):
     if not metric or not check_threshold_kwargs:
         return
     try:

openwisp_monitoring/monitoring/tests/test_models.py

@@ -179,6 +179,26 @@ def test_batch_metric_write_wrong_related_fields(self):
             '"reachable" not defined in metric configuration',
         )
 
+    def test_batch_write_historical_data(self):
+        m = self._create_general_metric(name="load")
+        self._create_alert_settings(
+            metric=m, custom_operator=">", custom_threshold=90, custom_tolerance=0
+        )
+        with catch_signal(threshold_crossed) as handler:
+            Metric.batch_write(
+                [
+                    (
+                        m,
+                        {
+                            "value": 91,
+                            "current": False,
+                            "time": start_time - timedelta(minutes=5),
+                        },
+                    )
+                ]
+            )
+        handler.assert_not_called()
+
     def test_tags(self):
         extra_tags = {"a": "a", "b": "b1"}
         metric = self._create_object_metric(extra_tags=extra_tags)