IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Alerting: make alert state indicator in panel header work with Grafana 8 alerts (#38713)

Browse Source
This commit is contained in:
Domas
2021-10-11 16:55:45 +03:00
committed by GitHub
parent 8318e45452
commit 571257226e
23 changed files with 442 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/features/alerting/unified/components/rule-editor/AlertTypeStep.tsx
View File

@@ -130,7 +130,7 @@ export const AlertTypeStep: FC<Props> = ({ editingExistingRule }) => {
)}
</div>
{(ruleFormType === RuleFormType.cloudRecording || ruleFormType === RuleFormType.cloudAlerting) &&
dataSourceName && <GroupAndNamespaceFields dataSourceName={dataSourceName} />}
dataSourceName && <GroupAndNamespaceFields rulesSourceName={dataSourceName} />}
{ruleFormType === RuleFormType.grafana && (
<Field

10
public/app/features/alerting/unified/components/rule-editor/GroupAndNamespaceFields.tsx
View File

@@ -10,10 +10,10 @@ import { Field, InputControl, useStyles2 } from '@grafana/ui';
import { css } from '@emotion/css';
interface Props {
dataSourceName: string;
rulesSourceName: string;
}
export const GroupAndNamespaceFields: FC<Props> = ({ dataSourceName }) => {
export const GroupAndNamespaceFields: FC<Props> = ({ rulesSourceName }) => {
const {
control,
watch,
@@ -28,10 +28,10 @@ export const GroupAndNamespaceFields: FC<Props> = ({ dataSourceName }) => {
const rulerRequests = useUnifiedAlertingSelector((state) => state.rulerRules);
const dispatch = useDispatch();
useEffect(() => {
dispatch(fetchRulerRulesAction(dataSourceName));
}, [dataSourceName, dispatch]);
dispatch(fetchRulerRulesAction({ rulesSourceName }));
}, [rulesSourceName, dispatch]);
const rulesConfig = rulerRequests[dataSourceName]?.result;
const rulesConfig = rulerRequests[rulesSourceName]?.result;
const namespace = watch('namespace');