IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-25 02:10:45 -06:00
Code Issues Packages Projects Releases Wiki Activity

Alerting: Fix detail view not showing instances nor history tab (#94424)

Browse Source 
* Fix detail view not showing instances nor history tab

* small refactor

* Update public/app/features/alerting/unified/hooks/useCombinedRule.ts

Co-authored-by: Konrad Lalik <konrad.lalik@grafana.com>

* refactor

---------

Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
Co-authored-by: Konrad Lalik <konrad.lalik@grafana.com>
This commit is contained in:
Sonia Aguilar 2024-10-09 10:50:05 +02:00 committed by GitHub
parent c183a8930b
commit 3924751827
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
public/app/features/alerting/unified/hooks/useCombinedRule.ts
View File

@ -1,6 +1,7 @@
import { useEffect, useMemo } from 'react';
import { useAsync } from 'react-use';
import { isGrafanaRulesSource } from 'app/features/alerting/unified/utils/datasource';
import { CombinedRule, RuleIdentifier, RulesSource, RuleWithLocation } from 'app/types/unified-alerting';
import { RulerRuleGroupDTO } from 'app/types/unified-alerting-dto';
@ -10,7 +11,8 @@ import { getDataSourceByName } from '../utils/datasource';
import * as ruleId from '../utils/rule-id';
import { isCloudRuleIdentifier, isGrafanaRuleIdentifier, isPrometheusRuleIdentifier } from '../utils/rules';
import { attachRulerRulesToCombinedRules, combineRulesNamespaces } from './useCombinedRuleNamespaces';
import { attachRulerRulesToCombinedRules, combineRulesNamespace } from './useCombinedRuleNamespaces';
import { stringifyFolder, useFolder } from './useFolder';
export function useCloudCombinedRulesMatching(
ruleName: string,
@ -116,6 +118,10 @@ export function useCombinedRule({ ruleIdentifier, limitAlerts }: Props): Request
refetchOnMountOrArgChange: true,
}
);
// in case of Grafana folder, we need to use the folder name instead of uid, as in promrules we don't use uid
const isGrafanaRule = isGrafanaRulesSource(ruleSourceName);
const folder = useFolder(isGrafanaRule ? ruleLocation?.namespace : undefined);
const namespaceName = isGrafanaRule && folder.folder ? stringifyFolder(folder.folder) : ruleLocation?.namespace;
const [
fetchRulerRuleGroup,
@ -139,9 +145,9 @@ export function useCombinedRule({ ruleIdentifier, limitAlerts }: Props): Request
return;
}
const rulerConfig = rulerRuleGroup ? { [ruleLocation.namespace]: [rulerRuleGroup] } : {};
const rulerConfig = rulerRuleGroup && namespaceName ? { [namespaceName]: [rulerRuleGroup] } : {};
const combinedNamespaces = combineRulesNamespaces(ruleSource, promRuleNs, rulerConfig);
const combinedNamespaces = combineRulesNamespace(ruleSource, promRuleNs, rulerConfig);
const combinedRules = combinedNamespaces.flatMap((ns) => ns.groups).flatMap((group) => group.rules);
const matchingRule = combinedRules.find((rule) =>
@ -149,7 +155,7 @@ export function useCombinedRule({ ruleIdentifier, limitAlerts }: Props): Request
);
return matchingRule;
}, [ruleIdentifier, ruleSourceName, promRuleNs, rulerRuleGroup, ruleSource, ruleLocation]);
}, [ruleIdentifier, ruleSourceName, promRuleNs, rulerRuleGroup, ruleSource, ruleLocation, namespaceName]);
return {
loading: isLoadingDsFeatures || isLoadingPromRules || isLoadingRulerGroup,

2
public/app/features/alerting/unified/hooks/useCombinedRuleNamespaces.ts
View File

@ -126,7 +126,7 @@ export function useCombinedRuleNamespaces(
}, [promRulesResponses, rulerRulesResponses, rulesSources, grafanaPromRuleNamespaces]);
}
export function combineRulesNamespaces(
export function combineRulesNamespace(
rulesSource: RulesSource,
promNamespaces: RuleNamespace[],
rulerRules?: RulerRulesConfigDTO

4
public/app/features/alerting/unified/hooks/useFolder.ts
View File

@ -32,3 +32,7 @@ export function useFolder(uid?: string): ReturnBag {
loading: false,
};
}
export function stringifyFolder({ title, parents }: FolderDTO) {
return parents && parents?.length ? [...parents.map((p) => p.title), title].join('/') : title;
}