From c1f22b3e2cd023f41d53a718ea1f58e63180bf7d Mon Sep 17 00:00:00 2001
From: shamoon <4887959+shamoon@users.noreply.github.com>
Date: Mon, 13 Feb 2023 20:24:57 -0800
Subject: [PATCH] Cleanup grafana widget + fix labels

---
 public/locales/en/common.json     |  4 ++++
 src/widgets/grafana/component.jsx | 12 ++----------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/public/locales/en/common.json b/public/locales/en/common.json
index 37ff7baa..c902f91c 100644
--- a/public/locales/en/common.json
+++ b/public/locales/en/common.json
@@ -483,5 +483,9 @@
         "processing": "Processing",
         "processed": "Processed",
         "time": "Time"
+    },
+    "grafana": {
+        "totalalerts": "Total Alerts",
+        "alertstriggered": "Alerts Triggered"
     }
 }
\ No newline at end of file
diff --git a/src/widgets/grafana/component.jsx b/src/widgets/grafana/component.jsx
index 2aba23ba..2d6520dd 100755
--- a/src/widgets/grafana/component.jsx
+++ b/src/widgets/grafana/component.jsx
@@ -23,18 +23,10 @@ export default function Component({ service }) {
     );
   }
 
-  const totalAlerts = Object.keys(alertsData).length;
-  let alertsTriggered = 0;
-  Object.keys(alertsData).forEach((key) => {
-    if (alertsData[key].state === "alerting") {
-      alertsTriggered += 1;
-    }
-  });
-
   return (
     <Container service={service}>
-      <Block label="total alerts" value={t("common.number", { value: totalAlerts })} />
-      <Block label="alerts triggered" value={t("common.number", { value: alertsTriggered })} />
+      <Block label="grafana.totalalerts" value={t("common.number", { value: alertsData.length })} />
+      <Block label="grafana.alertstriggered" value={t("common.number", { value: alertsData.filter(a => a.state === "alerting").length })} />
     </Container>
   );
 }