fix web page issues
This commit is contained in:
+33
-13
@@ -308,19 +308,29 @@ class Host:
|
||||
d["dyn"] = str(self.dyn)
|
||||
d["num"] = self.num
|
||||
|
||||
# Add alert counts
|
||||
warning_count = 0
|
||||
critical_count = 0
|
||||
# Add alert counts (split by acknowledged status)
|
||||
warning_unacked = 0
|
||||
warning_acked = 0
|
||||
critical_unacked = 0
|
||||
critical_acked = 0
|
||||
for metric_path, alert_state in self.alert_states.items():
|
||||
# Import AlertLevel here to avoid circular imports
|
||||
from .threshold import AlertLevel
|
||||
if alert_state.level == AlertLevel.WARNING:
|
||||
warning_count += 1
|
||||
if alert_state.acknowledged:
|
||||
warning_acked += 1
|
||||
else:
|
||||
warning_unacked += 1
|
||||
elif alert_state.level == AlertLevel.CRITICAL:
|
||||
critical_count += 1
|
||||
if alert_state.acknowledged:
|
||||
critical_acked += 1
|
||||
else:
|
||||
critical_unacked += 1
|
||||
|
||||
d["alert_warning_count"] = warning_count
|
||||
d["alert_critical_count"] = critical_count
|
||||
d["alert_warning_unacked"] = warning_unacked
|
||||
d["alert_warning_acked"] = warning_acked
|
||||
d["alert_critical_unacked"] = critical_unacked
|
||||
d["alert_critical_acked"] = critical_acked
|
||||
|
||||
for c in ["IPv4", "IPv6"]:
|
||||
if c in self.connections:
|
||||
@@ -380,18 +390,28 @@ class Host:
|
||||
ddict[d] = self.__dict__[d]
|
||||
|
||||
# Add alert counts (computed from alert_states)
|
||||
warning_count = 0
|
||||
critical_count = 0
|
||||
warning_unacked = 0
|
||||
warning_acked = 0
|
||||
critical_unacked = 0
|
||||
critical_acked = 0
|
||||
if hasattr(self, 'alert_states'):
|
||||
from .threshold import AlertLevel
|
||||
for metric_path, alert_state in self.alert_states.items():
|
||||
if alert_state.level == AlertLevel.WARNING:
|
||||
warning_count += 1
|
||||
if alert_state.acknowledged:
|
||||
warning_acked += 1
|
||||
else:
|
||||
warning_unacked += 1
|
||||
elif alert_state.level == AlertLevel.CRITICAL:
|
||||
critical_count += 1
|
||||
if alert_state.acknowledged:
|
||||
critical_acked += 1
|
||||
else:
|
||||
critical_unacked += 1
|
||||
|
||||
ddict["alert_warning_count"] = warning_count
|
||||
ddict["alert_critical_count"] = critical_count
|
||||
ddict["alert_warning_unacked"] = warning_unacked
|
||||
ddict["alert_warning_acked"] = warning_acked
|
||||
ddict["alert_critical_unacked"] = critical_unacked
|
||||
ddict["alert_critical_acked"] = critical_acked
|
||||
|
||||
return ddict
|
||||
|
||||
|
||||
Reference in New Issue
Block a user