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: upgrade preview enable folder alert tab and dashboard alert panel (#81992)

Browse Source 
* Alerting: upgrade preview enable folder alert tab and dashboard alert panel

Enable the folder alert tab and the dashboard alert panel when the
alertingPreviewUpgrade feature flag is enabled

* Link directly to folder alerts in upgrade page
This commit is contained in:
Matthew Jacobson
2024-02-07 16:14:56 -05:00
committed by GitHub
parent b25ffe2b15
commit 4b609f1121
4 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
public/app/features/alerting/Upgrade.tsx
View File

@@ -42,7 +42,7 @@ import { DynamicTable, DynamicTableColumnProps, DynamicTableItemProps } from './
import { DynamicTableWithGuidelines } from './unified/components/DynamicTableWithGuidelines'; import { DynamicTableWithGuidelines } from './unified/components/DynamicTableWithGuidelines';
import { Matchers } from './unified/components/notification-policies/Matchers'; import { Matchers } from './unified/components/notification-policies/Matchers';
import { ActionIcon } from './unified/components/rules/ActionIcon'; import { ActionIcon } from './unified/components/rules/ActionIcon';
import { createContactPointLink, makeDashboardLink, makeFolderLink } from './unified/utils/misc'; import { createContactPointLink, makeDashboardLink, makeFolderAlertsLink } from './unified/utils/misc';
import { createUrl } from './unified/utils/url'; import { createUrl } from './unified/utils/url';
export const UpgradePage = () => { export const UpgradePage = () => {
@@ -1011,7 +1011,7 @@ const useAlertColumns = (): Array<DynamicTableColumnProps<DashboardUpgrade>> =>
rel="noreferrer" rel="noreferrer"
target="_blank" target="_blank"
className={styles.textLink} className={styles.textLink}
href={makeFolderLink(dashUpgrade.folderUid)} href={makeFolderAlertsLink(dashUpgrade.folderUid, dashUpgrade.folderName)}
> >
{dashUpgrade.folderName} {dashUpgrade.folderName}
</Link> </Link>
@@ -1075,7 +1075,7 @@ const useAlertColumns = (): Array<DynamicTableColumnProps<DashboardUpgrade>> =>
rel="noreferrer" rel="noreferrer"
target="_blank" target="_blank"
className={styles.textLink} className={styles.textLink}
href={makeFolderLink(migratedFolderUid)} href={makeFolderAlertsLink(migratedFolderUid, dashUpgrade.newFolderName)}
> >
{dashUpgrade.newFolderName} {dashUpgrade.newFolderName}
</Link> </Link>

2
public/app/features/alerting/unified/initAlerting.tsx
View File

@@ -10,7 +10,7 @@ const AlertRulesToolbarButton = React.lazy(
export function initAlerting() { export function initAlerting() {
addCustomRightAction({ addCustomRightAction({
show: () => config.unifiedAlertingEnabled, show: () => config.unifiedAlertingEnabled || (config.featureToggles.alertingPreviewUpgrade ?? false),
component: ({ dashboard }) => ( component: ({ dashboard }) => (
<React.Suspense fallback={null} key="alert-rules-button"> <React.Suspense fallback={null} key="alert-rules-button">
{dashboard && <AlertRulesToolbarButton dashboardUid={dashboard.uid} />} {dashboard && <AlertRulesToolbarButton dashboardUid={dashboard.uid} />}

4
public/app/features/alerting/unified/utils/misc.ts
View File

@@ -145,6 +145,10 @@ export function makeFolderLink(folderUID: string): string {
return createUrl(`/dashboards/f/${folderUID}`); return createUrl(`/dashboards/f/${folderUID}`);
} }
export function makeFolderAlertsLink(folderUID: string, title: string): string {
return createUrl(`/dashboards/f/${folderUID}/${title}/alerting`);
}
export function makeFolderSettingsLink(folder: FolderDTO): string { export function makeFolderSettingsLink(folder: FolderDTO): string {
return createUrl(`/dashboards/f/${folder.uid}/${folder.title}/settings`); return createUrl(`/dashboards/f/${folder.uid}/${folder.title}/settings`);
} }

5
public/app/features/folders/state/navModel.ts
View File

@@ -45,7 +45,10 @@ export function buildNavModel(folder: FolderDTO, parents = folder.parents): NavM
url: `${folder.url}/library-panels`, url: `${folder.url}/library-panels`,
}); });
if (contextSrv.hasPermission(AccessControlAction.AlertingRuleRead) && config.unifiedAlertingEnabled) { if (
contextSrv.hasPermission(AccessControlAction.AlertingRuleRead) &&
(config.unifiedAlertingEnabled || config.featureToggles.alertingPreviewUpgrade)
) {
model.children!.push({ model.children!.push({
active: false, active: false,
icon: 'bell', icon: 'bell',