From cd7d7ba729eae91e337e721a0ded3ef6d0590cb5 Mon Sep 17 00:00:00 2001 From: Mbarmem Date: Mon, 13 Feb 2023 15:20:22 +0300 Subject: [PATCH 1/3] Add Grafana widget --- src/widgets/components.js | 1 + src/widgets/grafana/component.jsx | 40 +++++++++++++++++++++++++++++++ src/widgets/grafana/widget.js | 14 +++++++++++ src/widgets/widgets.js | 2 ++ 4 files changed, 57 insertions(+) create mode 100755 src/widgets/grafana/component.jsx create mode 100755 src/widgets/grafana/widget.js diff --git a/src/widgets/components.js b/src/widgets/components.js index 9623c63d..8c5c42e7 100644 --- a/src/widgets/components.js +++ b/src/widgets/components.js @@ -18,6 +18,7 @@ const components = { flood: dynamic(() => import("./flood/component")), gluetun: dynamic(() => import("./gluetun/component")), gotify: dynamic(() => import("./gotify/component")), + grafana: dynamic(() => import("./grafana/component")), hdhomerun: dynamic(() => import("./hdhomerun/component")), homebridge: dynamic(() => import("./homebridge/component")), jackett: dynamic(() => import("./jackett/component")), diff --git a/src/widgets/grafana/component.jsx b/src/widgets/grafana/component.jsx new file mode 100755 index 00000000..2aba23ba --- /dev/null +++ b/src/widgets/grafana/component.jsx @@ -0,0 +1,40 @@ +import { useTranslation } from "next-i18next"; + +import Container from "components/services/widget/container"; +import Block from "components/services/widget/block"; +import useWidgetAPI from "utils/proxy/use-widget-api"; + +export default function Component({ service }) { + const { t } = useTranslation(); + + const { widget } = service; + const { data: alertsData, error: alertsError } = useWidgetAPI(widget, "alerts"); + + if (alertsError) { + return ; + } + + if (!alertsData) { + return ( + + + + + ); + } + + const totalAlerts = Object.keys(alertsData).length; + let alertsTriggered = 0; + Object.keys(alertsData).forEach((key) => { + if (alertsData[key].state === "alerting") { + alertsTriggered += 1; + } + }); + + return ( + + + + + ); +} diff --git a/src/widgets/grafana/widget.js b/src/widgets/grafana/widget.js new file mode 100755 index 00000000..6ab53db0 --- /dev/null +++ b/src/widgets/grafana/widget.js @@ -0,0 +1,14 @@ +import genericProxyHandler from "utils/proxy/handlers/generic"; + +const widget = { + api: "{url}/api/{endpoint}", + proxyHandler: genericProxyHandler, + + mappings: { + alerts: { + endpoint: "alerts", + }, + }, +}; + +export default widget; \ No newline at end of file diff --git a/src/widgets/widgets.js b/src/widgets/widgets.js index ff2a2787..111da7eb 100644 --- a/src/widgets/widgets.js +++ b/src/widgets/widgets.js @@ -13,6 +13,7 @@ import fileflows from "./fileflows/widget"; import flood from "./flood/widget"; import gluetun from "./gluetun/widget"; import gotify from "./gotify/widget"; +import grafana from "./grafana/widget"; import hdhomerun from "./hdhomerun/widget"; import homebridge from "./homebridge/widget"; import jackett from "./jackett/widget"; @@ -80,6 +81,7 @@ const widgets = { flood, gluetun, gotify, + grafana, hdhomerun, homebridge, jackett, 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 2/3] 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 ( - - + + a.state === "alerting").length })} /> ); } From 460983b74126fc5251b9dde5cf920607bf76dfec Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Mon, 13 Feb 2023 20:53:45 -0800 Subject: [PATCH 3/3] Add grafana stats --- public/locales/en/common.json | 2 ++ src/widgets/grafana/component.jsx | 13 +++++++++---- src/widgets/grafana/widget.js | 6 ++++++ 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/public/locales/en/common.json b/public/locales/en/common.json index c902f91c..98f2b796 100644 --- a/public/locales/en/common.json +++ b/public/locales/en/common.json @@ -485,6 +485,8 @@ "time": "Time" }, "grafana": { + "dashboards": "Dashboards", + "datasources": "Data Sources", "totalalerts": "Total Alerts", "alertstriggered": "Alerts Triggered" } diff --git a/src/widgets/grafana/component.jsx b/src/widgets/grafana/component.jsx index 2d6520dd..98d4c42b 100755 --- a/src/widgets/grafana/component.jsx +++ b/src/widgets/grafana/component.jsx @@ -8,15 +8,18 @@ export default function Component({ service }) { const { t } = useTranslation(); const { widget } = service; + const { data: statsData, error: statsError } = useWidgetAPI(widget, "stats"); const { data: alertsData, error: alertsError } = useWidgetAPI(widget, "alerts"); - if (alertsError) { - return ; + if (statsError || alertsError) { + return ; } - if (!alertsData) { + if (!statsData || !alertsData) { return ( + + @@ -25,7 +28,9 @@ export default function Component({ service }) { return ( - + + + a.state === "alerting").length })} /> ); diff --git a/src/widgets/grafana/widget.js b/src/widgets/grafana/widget.js index 6ab53db0..64051925 100755 --- a/src/widgets/grafana/widget.js +++ b/src/widgets/grafana/widget.js @@ -8,6 +8,12 @@ const widget = { alerts: { endpoint: "alerts", }, + stats: { + endpoint: "admin/stats", + validate: [ + "dashboards" + ] + }, }, };