root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 31 Packages Projects Releases Wiki Activity

Alerting: text updates / replace panel (#76407) 

* Change text to remove "week" reference

* Add alertsByState for grafana alertmanager
This commit is contained in:
Virginia Cepeda 2023-10-12 13:26:05 +01:00 committed by GitHub
parent 97d54814a3
commit 358b395c2b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/app/features/alerting/unified/home/Insights.tsx
View File

@ -28,7 +28,7 @@ import { getMostFiredInstancesScene } from '../insights/grafana/MostFiredInstanc
import { getPausedGrafanaAlertsScene } from '../insights/grafana/Paused';
import { getGrafanaRulesByEvaluationScene } from '../insights/grafana/RulesByEvaluation';
import { getGrafanaRulesByEvaluationPercentageScene } from '../insights/grafana/RulesByEvaluationPercentage';
import { getGrafanaAlertmanagerNotificationsScene } from '../insights/grafana/alertmanager/NotificationsScene';
import { getAlertsByStateScene as getGrafanaAlertsByStateScene } from '../insights/grafana/alertmanager/AlertsByState';
import { getGrafanaAlertmanagerSilencesScene } from '../insights/grafana/alertmanager/SilencesByStateScene';
import { getAlertsByStateScene } from '../insights/mimir/AlertsByState';
import { getInvalidConfigScene } from '../insights/mimir/InvalidConfig';
@ -267,7 +267,8 @@ function getGrafanaAlertmanagerScenes() {
children: [
new SceneFlexLayout({
children: [
getGrafanaAlertmanagerNotificationsScene(cloudUsageDs, 'Notification delivery'),
getGrafanaAlertsByStateScene(cloudUsageDs, 'Firing alerts by state'),
// getGrafanaAlertmanagerNotificationsScene(cloudUsageDs, 'Notification delivery'),
getGrafanaAlertmanagerSilencesScene(cloudUsageDs, 'Silences'),
],
}),

2
public/app/features/alerting/unified/insights/grafana/MostFiredRulesTable.tsx
View File

@ -44,7 +44,7 @@ export function getMostFiredRulesScene(datasource: DataSourceRef, panelTitle: st
renameByName: {
group: 'Group',
labels_grafana_folder: 'Folder',
'Value #A': 'Fires this week',
'Value #A': 'Number of fires',
},
},
},

34
public/app/features/alerting/unified/insights/grafana/alertmanager/AlertsByState.tsx Normal file
View File

@ -0,0 +1,34 @@
import React from 'react';
import { PanelBuilders, SceneFlexItem, SceneQueryRunner } from '@grafana/scenes';
import { DataSourceRef, GraphDrawStyle, TooltipDisplayMode } from '@grafana/schema';
import { overrideToFixedColor, PANEL_STYLES } from '../../../home/Insights';
import { InsightsRatingModal } from '../../RatingModal';
export function getAlertsByStateScene(datasource: DataSourceRef, panelTitle: string) {
const query = new SceneQueryRunner({
datasource,
queries: [
{
refId: 'A',
expr: 'sum by (state) (grafanacloud_grafana_instance_alerting_alertmanager_alerts)',
range: true,
legendFormat: '{{state}}',
},
],
});
return new SceneFlexItem({
...PANEL_STYLES,
body: PanelBuilders.timeseries()
.setTitle(panelTitle)
.setDescription('A breakdown of all of your firing alert rule instances based on state')
.setData(query)
.setCustomFieldConfig('drawStyle', GraphDrawStyle.Line)
.setOption('tooltip', { mode: TooltipDisplayMode.Multi })
.setOverrides((b) => b.matchFieldsWithName('active').overrideColor(overrideToFixedColor('active')))
.setHeaderActions(<InsightsRatingModal panel={panelTitle} />)
.build(),
});
}

2
public/app/features/alerting/unified/insights/mimir/rules/MostFiredRules.tsx
View File

@ -31,7 +31,7 @@ export function getMostFiredRulesScene(datasource: DataSourceRef, panelTitle: st
},
indexByName: {},
renameByName: {
Value: 'Fires this week',
Value: 'Number of fires',
alertname: 'Alert Rule Name',
},
},