diff --git a/src/widgets/grafana/component.jsx b/src/widgets/grafana/component.jsx
index 32d2a98e5..ecedac8ee 100755
--- a/src/widgets/grafana/component.jsx
+++ b/src/widgets/grafana/component.jsx
@@ -10,12 +10,23 @@ export default function Component({ service }) {
const { widget } = service;
const { data: statsData, error: statsError } = useWidgetAPI(widget, "stats");
const { data: alertsData, error: alertsError } = useWidgetAPI(widget, "alerts");
+ const { data: alertmanagerData, error: alertmanagerError } = useWidgetAPI(widget, "alertmanager");
- if (statsError || alertsError) {
+ let alertsInt = 0;
+
+ if (alertsError || !alertsData || alertsData.length === 0) {
+ if (alertmanagerData) {
+ alertsInt = alertmanagerData.length;
+ }
+ } else {
+ alertsInt = alertsData.filter((a) => a.state === "alerting").length;
+ }
+
+ if (statsError || (alertsError && alertmanagerError)) {
return ;
}
- if (!statsData || !alertsData) {
+ if (!statsData || (!alertsData && !alertmanagerData)) {
return (
@@ -31,10 +42,7 @@ export default function Component({ service }) {
- a.state === "alerting").length })}
- />
+
);
}
diff --git a/src/widgets/grafana/widget.js b/src/widgets/grafana/widget.js
index af3e56eaa..2805555f8 100755
--- a/src/widgets/grafana/widget.js
+++ b/src/widgets/grafana/widget.js
@@ -8,6 +8,9 @@ const widget = {
alerts: {
endpoint: "alerts",
},
+ alertmanager: {
+ endpoint: "alertmanager/grafana/api/v2/alerts",
+ },
stats: {
endpoint: "admin/stats",
validate: ["dashboards"],