OpenSource/homepage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make work with either api mapping to alerts variable

Browse Source
This commit is contained in:
myztillx 2023-12-19 14:44:26 -05:00
parent 8bef6b0183
commit eabc742b7e
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/widgets/services/grafana.md
View File

@ -3,9 +3,7 @@ title: Grafana
description: Grafana Widget Configuration description: Grafana Widget Configuration
--- ---
Allowed fields: `["dashboards", "datasources", "totalalerts", "alertstriggered", "alertmanager"]`. Allowed fields: `["dashboards", "datasources", "totalalerts", "alertstriggered"]`.
`alertmanager` is for the new grafana alerts api since the api used by `alertstriggered` has been deprecated. If `alertstriggered` does not work, try `alertmanager`.
```yaml ```yaml
widget: widget:

3
public/locales/en/common.json
View File

@ -662,8 +662,7 @@
"dashboards": "Dashboards", "dashboards": "Dashboards",
"datasources": "Data Sources", "datasources": "Data Sources",
"totalalerts": "Total Alerts", "totalalerts": "Total Alerts",
"alertstriggered": "Alerts Triggered", "alertstriggered": "Alerts Triggered"
"alertmanager": "Alerts Triggered"
}, },
"nextcloud": { "nextcloud": {
"cpuload": "Cpu Load", "cpuload": "Cpu Load",

21
src/widgets/grafana/component.jsx
View File

@ -12,18 +12,27 @@ export default function Component({ service }) {
const { data: alertsData, error: alertsError } = useWidgetAPI(widget, "alerts"); const { data: alertsData, error: alertsError } = useWidgetAPI(widget, "alerts");
const { data: alertmanagerData, error: alertmanagerError } = useWidgetAPI(widget, "alertmanager"); const { data: alertmanagerData, error: alertmanagerError } = useWidgetAPI(widget, "alertmanager");
if (statsError || alertsError || alertmanagerError) { let alertsInt = 0;
if ((alertsError && alertsError.message === "HTTP Error") || !alertsData || alertsData.length === 0) {
if (alertmanagerData) {
alertsInt = alertmanagerData.length;
}
} else {
alertsInt = alertsData.filter((a) => a.state === "alerting").length;
}
if (statsError || (alertsError && alertmanagerError)) {
return <Container service={service} error={statsError ?? alertsError} />; return <Container service={service} error={statsError ?? alertsError} />;
} }
if (!statsData || !alertsData || !alertmanagerData) { if (!statsData || (!alertsData && !alertmanagerData)) {
return ( return (
<Container service={service}> <Container service={service}>
<Block label="grafana.dashboards" /> <Block label="grafana.dashboards" />
<Block label="grafana.datasources" /> <Block label="grafana.datasources" />
<Block label="grafana.totalalerts" /> <Block label="grafana.totalalerts" />
<Block label="grafana.alertstriggered" /> <Block label="grafana.alertstriggered" />
<Block label="grafana.alertmanager" />
</Container> </Container>
); );
} }
@ -33,11 +42,7 @@ export default function Component({ service }) {
<Block label="grafana.dashboards" value={t("common.number", { value: statsData.dashboards })} /> <Block label="grafana.dashboards" value={t("common.number", { value: statsData.dashboards })} />
<Block label="grafana.datasources" value={t("common.number", { value: statsData.datasources })} /> <Block label="grafana.datasources" value={t("common.number", { value: statsData.datasources })} />
<Block label="grafana.totalalerts" value={t("common.number", { value: statsData.alerts })} /> <Block label="grafana.totalalerts" value={t("common.number", { value: statsData.alerts })} />
<Block <Block label="grafana.alertstriggered" value={t("common.number", { value: alertsInt })} />
label="grafana.alertstriggered"
value={t("common.number", { value: alertsData.filter((a) => a.state === "alerting").length })}
/>
<Block label="grafana.alertmanager" value={t("common.number", { value: alertmanagerData.length })} />
</Container> </Container>
); );
} }