jprdonnelly/redash
1
0
Fork 0
mirror of https://github.com/getredash/redash.git synced 2025-12-19 17:37:19 -05:00
Code Issues Projects Releases Wiki Activity

Only evaluate the next state if there's a value (#7222)

Browse Source 
I've experience this on my Redash in production. I'm not sure what can cause the value to exist, but be None. I guess it depends on the SQL query.

I followed the same idea of returning a self.UNKNOWN_STATE for cases that we can't know what's happening.
This commit is contained in:
thiagogds
2024-11-26 18:57:34 +01:00
committed by GitHub
parent baa9bbd505
commit c12e68f5d1
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
redash/models/__init__.py
View File

@@ -969,6 +969,7 @@ class Alert(TimestampMixin, BelongsToOrgMixin, db.Model):
def evaluate(self): def evaluate(self):
data = self.query_rel.latest_query_data.data if self.query_rel.latest_query_data else None data = self.query_rel.latest_query_data.data if self.query_rel.latest_query_data else None
new_state = self.UNKNOWN_STATE
if data and data["rows"] and self.options["column"] in data["rows"][0]: if data and data["rows"] and self.options["column"] in data["rows"][0]:
op = OPERATORS.get(self.options["op"], lambda v, t: False) op = OPERATORS.get(self.options["op"], lambda v, t: False)
@@ -997,9 +998,8 @@ class Alert(TimestampMixin, BelongsToOrgMixin, db.Model):
threshold = self.options["value"] threshold = self.options["value"]
if value is not None:
new_state = next_state(op, value, threshold) new_state = next_state(op, value, threshold)
else:
new_state = self.UNKNOWN_STATE
return new_state return new_state

4
tests/models/test_alerts.py
View File

@@ -118,6 +118,10 @@ class TestAlertEvaluate(BaseTestCase):
) )
self.assertEqual(alert.evaluate(), Alert.UNKNOWN_STATE) self.assertEqual(alert.evaluate(), Alert.UNKNOWN_STATE)
def test_evaluate_return_unknown_when_value_is_none(self):
alert = self.create_alert(get_results(None))
self.assertEqual(alert.evaluate(), Alert.UNKNOWN_STATE)
class TestNextState(TestCase): class TestNextState(TestCase):
def test_numeric_value(self): def test_numeric_value(self):