Alerting: enforce roles on frontend (#33997)

This commit is contained in:
Domas 2021-05-17 11:15:17 +03:00 committed by GitHub
parent a26507e9c4
commit 8a0dbd0127
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 281 additions and 125 deletions

View File

@ -101,8 +101,8 @@ func (hs *HTTPServer) registerRoutes() {
r.Get("/playlists/", reqSignedIn, hs.Index)
r.Get("/playlists/*", reqSignedIn, hs.Index)
r.Get("/alerting/", reqEditorRole, hs.Index)
r.Get("/alerting/*", reqEditorRole, hs.Index)
r.Get("/alerting/", reqSignedIn, hs.Index)
r.Get("/alerting/*", reqSignedIn, hs.Index)
// sign up
r.Get("/verify", hs.Index)

View File

@ -214,6 +214,7 @@ func (hs *HTTPServer) getNavTree(c *models.ReqContext, hasEditPerm bool) ([]*dto
Text: "Contact points", Id: "receivers", Url: hs.Cfg.AppSubURL + "/alerting/notifications",
Icon: "comment-alt-share",
})
alertChildNavs = append(alertChildNavs, &dtos.NavLink{Text: "Routes", Id: "am-routes", Url: hs.Cfg.AppSubURL + "/alerting/routes", Icon: "sitemap"})
} else {
alertChildNavs = append(alertChildNavs, &dtos.NavLink{
Text: "Notification channels", Id: "channels", Url: hs.Cfg.AppSubURL + "/alerting/notifications",
@ -222,10 +223,6 @@ func (hs *HTTPServer) getNavTree(c *models.ReqContext, hasEditPerm bool) ([]*dto
}
}
if c.OrgRole == models.ROLE_ADMIN && hs.Cfg.IsNgAlertEnabled() {
alertChildNavs = append(alertChildNavs, &dtos.NavLink{Text: "Routes", Id: "am-routes", Url: hs.Cfg.AppSubURL + "/alerting/routes", Icon: "sitemap"})
}
navTree = append(navTree, &dtos.NavLink{
Text: "Alerting",
SubTitle: "Alert rules and notifications",

View File

@ -43,7 +43,9 @@ export const PanelAlertTabContent: FC<Props> = ({ dashboard, panel }) => {
<div className={styles.innerWrapper}>
{alert}
<RulesTable rules={rules} />
{!!dashboard.meta.canSave && (
<NewRuleFromPanelButton className={styles.newButton} panel={panel} dashboard={dashboard} />
)}
</div>
</CustomScrollbar>
);
@ -52,12 +54,13 @@ export const PanelAlertTabContent: FC<Props> = ({ dashboard, panel }) => {
return (
<div className={styles.noRulesWrapper}>
{alert}
{!!dashboard.uid ? (
{!!dashboard.uid && (
<>
<p>There are no alert rules linked to this panel.</p>
<NewRuleFromPanelButton panel={panel} dashboard={dashboard} />
{!!dashboard.meta.canSave && <NewRuleFromPanelButton panel={panel} dashboard={dashboard} />}
</>
) : (
)}
{!dashboard.uid && !!dashboard.meta.canSave && (
<Alert severity="info" title="Dashboard not saved">
Dashboard must be saved before alerts can be added.
</Alert>

View File

@ -16,6 +16,7 @@ import { byLabelText, byRole, byTestId, byText } from 'testing-library-selector'
import userEvent from '@testing-library/user-event';
import { ALERTMANAGER_NAME_LOCAL_STORAGE_KEY, ALERTMANAGER_NAME_QUERY_KEY } from './utils/constants';
import store from 'app/core/store';
import { contextSrv } from 'app/core/services/context_srv';
jest.mock('./api/alertmanager');
jest.mock('./api/grafana');
@ -95,6 +96,7 @@ describe('Receivers', () => {
mocks.getAllDataSources.mockReturnValue(Object.values(dataSources));
mocks.api.fetchNotifiers.mockResolvedValue(grafanaNotifiersMock);
setDataSourceSrv(new MockDataSourceSrv(dataSources));
contextSrv.isEditor = true;
store.delete(ALERTMANAGER_NAME_LOCAL_STORAGE_KEY);
});

View File

@ -1,11 +1,15 @@
import { Alert, Button, LoadingPlaceholder } from '@grafana/ui';
import { css } from '@emotion/css';
import { GrafanaTheme2 } from '@grafana/data';
import { Alert, LinkButton, LoadingPlaceholder, useStyles2 } from '@grafana/ui';
import Page from 'app/core/components/Page/Page';
import { contextSrv } from 'app/core/services/context_srv';
import { useCleanup } from 'app/core/hooks/useCleanup';
import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
import { RuleIdentifier } from 'app/types/unified-alerting';
import React, { FC, useEffect } from 'react';
import { useDispatch } from 'react-redux';
import { AlertRuleForm } from './components/rule-editor/AlertRuleForm';
import { useIsRuleEditable } from './hooks/useIsRuleEditable';
import { useUnifiedAlertingSelector } from './hooks/useUnifiedAlertingSelector';
import { fetchExistingRuleAction } from './state/actions';
import { parseRuleIdentifier } from './utils/rules';
@ -18,13 +22,15 @@ const ExistingRuleEditor: FC<ExistingRuleEditorProps> = ({ identifier }) => {
useCleanup((state) => state.unifiedAlerting.ruleForm.existingRule);
const { loading, result, error, dispatched } = useUnifiedAlertingSelector((state) => state.ruleForm.existingRule);
const dispatch = useDispatch();
const { isEditable, loading: loadingEditableStatus } = useIsRuleEditable(result?.rule);
useEffect(() => {
if (!dispatched) {
dispatch(fetchExistingRuleAction(identifier));
}
}, [dispatched, dispatch, identifier]);
if (loading) {
if (loading || loadingEditableStatus) {
return (
<Page.Contents>
<LoadingPlaceholder text="Loading rule..." />
@ -41,16 +47,10 @@ const ExistingRuleEditor: FC<ExistingRuleEditorProps> = ({ identifier }) => {
);
}
if (!result) {
return (
<Page.Contents>
<Alert severity="warning" title="Rule not found">
<p>Sorry! This rule does not exist.</p>
<a href="/alerting/list">
<Button>To rule list</Button>
</a>
</Alert>
</Page.Contents>
);
return <AlertWarning title="Rule not found">Sorry! This rule does not exist.</AlertWarning>;
}
if (isEditable === false) {
return <AlertWarning title="Cannot edit rule">Sorry! You do not have permission to edit this rule.</AlertWarning>;
}
return <AlertRuleForm existing={result} />;
};
@ -63,7 +63,23 @@ const RuleEditor: FC<RuleEditorProps> = ({ match }) => {
const identifier = parseRuleIdentifier(decodeURIComponent(id));
return <ExistingRuleEditor key={id} identifier={identifier} />;
}
if (!(contextSrv.hasEditPermissionInFolders || contextSrv.isEditor)) {
return <AlertWarning title="Cannot create rules">Sorry! You are not allowed to create rules.</AlertWarning>;
}
return <AlertRuleForm />;
};
const AlertWarning: FC<{ title: string }> = ({ title, children }) => (
<Alert className={useStyles2(warningStyles).warning} severity="warning" title={title}>
<p>{children}</p>
<LinkButton href="alerting/list">To rule list</LinkButton>
</Alert>
);
const warningStyles = (theme: GrafanaTheme2) => ({
warning: css`
margin: ${theme.spacing(4)};
`,
});
export default RuleEditor;

View File

@ -18,6 +18,7 @@ import { RuleListGroupView } from './components/rules/RuleListGroupView';
import { RuleListStateView } from './components/rules/RuleListStateView';
import { useQueryParams } from 'app/core/hooks/useQueryParams';
import { useLocation } from 'react-router-dom';
import { contextSrv } from 'app/core/services/context_srv';
const VIEWS = {
groups: RuleListGroupView,
@ -128,12 +129,14 @@ export const RuleList: FC = () => {
</a>
</ButtonGroup>
<div />
{(contextSrv.hasEditPermissionInFolders || contextSrv.isEditor) && (
<LinkButton
href={urlUtil.renderUrl('alerting/new', { returnTo: location.pathname + location.search })}
icon="plus"
>
New alert rule
</LinkButton>
)}
</div>
</>
)}

View File

@ -16,7 +16,7 @@ import { saveRuleFormAction } from '../../state/actions';
import { RuleWithLocation } from 'app/types/unified-alerting';
import { useDispatch } from 'react-redux';
import { useCleanup } from 'app/core/hooks/useCleanup';
import { rulerRuleToFormValues, defaultFormValues, getDefaultQueries } from '../../utils/rule-form';
import { rulerRuleToFormValues, getDefaultFormValues, getDefaultQueries } from '../../utils/rule-form';
import { Link } from 'react-router-dom';
import { useQueryParams } from 'app/core/hooks/useQueryParams';
@ -36,7 +36,7 @@ export const AlertRuleForm: FC<Props> = ({ existing }) => {
return rulerRuleToFormValues(existing);
}
return {
...defaultFormValues,
...getDefaultFormValues(),
queries: getDefaultQueries(),
...(queryParams['defaults'] ? JSON.parse(queryParams['defaults'] as string) : {}),
};

View File

@ -10,6 +10,7 @@ import { DataSourcePicker } from '@grafana/runtime';
import { useRulesSourcesWithRuler } from '../../hooks/useRuleSourcesWithRuler';
import { RuleFolderPicker } from './RuleFolderPicker';
import { GroupAndNamespaceFields } from './GroupAndNamespaceFields';
import { contextSrv } from 'app/core/services/context_srv';
const alertTypeOptions: SelectableValue[] = [
{
@ -17,12 +18,15 @@ const alertTypeOptions: SelectableValue[] = [
value: RuleFormType.threshold,
description: 'Metric alert based on a defined threshold',
},
{
];
if (contextSrv.isEditor) {
alertTypeOptions.push({
label: 'System or application',
value: RuleFormType.system,
description: 'Alert based on a system or application behavior. Based on Prometheus.',
},
];
});
}
interface Props {
editingExistingRule: boolean;

View File

@ -1,7 +1,11 @@
import EmptyListCTA from 'app/core/components/EmptyListCTA/EmptyListCTA';
import { contextSrv } from 'app/core/services/context_srv';
import React, { FC } from 'react';
import { CallToActionCard } from '@grafana/ui';
export const NoRulesSplash: FC = () => (
export const NoRulesSplash: FC = () => {
if (contextSrv.hasEditPermissionInFolders || contextSrv.isEditor) {
return (
<EmptyListCTA
title="You haven`t created any alert rules yet"
buttonIcon="bell"
@ -12,4 +16,7 @@ export const NoRulesSplash: FC = () => (
proTipLinkTitle="Learn more"
proTipTarget="_blank"
/>
);
);
}
return <CallToActionCard message="No rules exist yet." callToActionElement={<div />} />;
};

View File

@ -1,10 +1,12 @@
import { css } from '@emotion/css';
import { GrafanaTheme2, urlUtil } from '@grafana/data';
import { Button, ConfirmModal, HorizontalGroup, LinkButton, useStyles2 } from '@grafana/ui';
import { contextSrv } from 'app/core/services/context_srv';
import { CombinedRule, RulesSource } from 'app/types/unified-alerting';
import React, { FC, useState } from 'react';
import { useDispatch } from 'react-redux';
import { useLocation } from 'react-router-dom';
import { useIsRuleEditable } from '../../hooks/useIsRuleEditable';
import { deleteRuleAction } from '../../state/actions';
import { Annotation } from '../../utils/constants';
import { getRulesSourceName, isCloudRulesSource } from '../../utils/datasource';
@ -26,6 +28,8 @@ export const RuleDetailsActionButtons: FC<Props> = ({ rule, rulesSource }) => {
const leftButtons: JSX.Element[] = [];
const rightButtons: JSX.Element[] = [];
const { isEditable } = useIsRuleEditable(rulerRule);
const deleteRule = () => {
if (ruleToDelete && ruleToDelete.rulerRule) {
dispatch(
@ -43,7 +47,7 @@ export const RuleDetailsActionButtons: FC<Props> = ({ rule, rulesSource }) => {
};
// explore does not support grafana rule queries atm
if (isCloudRulesSource(rulesSource)) {
if (isCloudRulesSource(rulesSource) && contextSrv.isEditor) {
leftButtons.push(
<LinkButton
className={style.button}
@ -108,8 +112,7 @@ export const RuleDetailsActionButtons: FC<Props> = ({ rule, rulesSource }) => {
}
}
// @TODO check roles
if (!!rulerRule) {
if (isEditable && rulerRule) {
const editURL = urlUtil.renderUrl(
`/alerting/${encodeURIComponent(
stringifyRuleIdentifier(

View File

@ -13,6 +13,7 @@ import { ActionIcon } from './ActionIcon';
import pluralize from 'pluralize';
import { useHasRuler } from '../../hooks/useHasRuler';
import kbn from 'app/core/utils/kbn';
import { useFolder } from '../../hooks/useFolder';
interface Props {
namespace: CombinedRuleNamespace;
@ -26,6 +27,9 @@ export const RulesGroup: FC<Props> = React.memo(({ group, namespace }) => {
const [isCollapsed, setIsCollapsed] = useState(true);
const hasRuler = useHasRuler();
const rulerRule = group.rules[0]?.rulerRule;
const folderUID = (rulerRule && isGrafanaRulerRule(rulerRule) && rulerRule.grafana_alert.namespace_uid) || undefined;
const { folder } = useFolder(folderUID);
const stats = useMemo(
(): Record<PromAlertingRuleState, number> =>
@ -65,11 +69,14 @@ export const RulesGroup: FC<Props> = React.memo(({ group, namespace }) => {
// for grafana, link to folder views
if (rulesSource === GRAFANA_RULES_SOURCE_NAME) {
const rulerRule = group.rules[0]?.rulerRule;
const folderUID = rulerRule && isGrafanaRulerRule(rulerRule) && rulerRule.grafana_alert.namespace_uid;
if (folderUID) {
const baseUrl = `/dashboards/f/${folderUID}/${kbn.slugifyForUrl(namespace.name)}`;
actionIcons.push(<ActionIcon key="edit" icon="pen" tooltip="edit" to={baseUrl + '/settings'} target="__blank" />);
if (folder?.canSave) {
actionIcons.push(
<ActionIcon key="edit" icon="pen" tooltip="edit" to={baseUrl + '/settings'} target="__blank" />
);
}
if (folder?.canAdmin) {
actionIcons.push(
<ActionIcon
key="manage-perms"
@ -79,6 +86,7 @@ export const RulesGroup: FC<Props> = React.memo(({ group, namespace }) => {
target="__blank"
/>
);
}
} else if (hasRuler(rulesSource)) {
actionIcons.push(<ActionIcon key="edit" icon="pen" tooltip="edit" />); // @TODO
}

View File

@ -1,4 +1,6 @@
import { CallToActionCard } from '@grafana/ui';
import EmptyListCTA from 'app/core/components/EmptyListCTA/EmptyListCTA';
import { contextSrv } from 'app/core/services/context_srv';
import React, { FC } from 'react';
import { makeAMLink } from '../../utils/misc';
@ -6,11 +8,16 @@ type Props = {
alertManagerSourceName: string;
};
export const NoSilencesSplash: FC<Props> = ({ alertManagerSourceName }) => (
export const NoSilencesSplash: FC<Props> = ({ alertManagerSourceName }) => {
if (contextSrv.isEditor) {
return (
<EmptyListCTA
title="You haven't created any silences yet"
buttonIcon="bell-slash"
buttonLink={makeAMLink('alerting/silence/new', alertManagerSourceName)}
buttonTitle="New silence"
/>
);
);
}
return <CallToActionCard callToActionElement={<div />} message="No silences found." />;
};

View File

@ -12,6 +12,7 @@ import { useDispatch } from 'react-redux';
import { Matchers } from './Matchers';
import { SilenceStateTag } from './SilenceStateTag';
import { makeAMLink } from '../../utils/misc';
import { contextSrv } from 'app/core/services/context_srv';
interface Props {
className?: string;
silence: Silence;
@ -35,6 +36,8 @@ const SilenceTableRow: FC<Props> = ({ silence, className, silencedAlerts, alertM
dispatch(expireSilenceAction(alertManagerSourceName, silence.id));
};
const detailsColspan = contextSrv.isEditor ? 4 : 3;
return (
<Fragment>
<tr className={className}>
@ -53,6 +56,7 @@ const SilenceTableRow: FC<Props> = ({ silence, className, silencedAlerts, alertM
<br />
{endsAtDate?.format(dateDisplayFormat)}
</td>
{contextSrv.isEditor && (
<td className={styles.actionsCell}>
{status.state === 'expired' ? (
<Link href={makeAMLink(`/alerting/silence/${silence.id}/edit`, alertManagerSourceName)}>
@ -71,36 +75,37 @@ const SilenceTableRow: FC<Props> = ({ silence, className, silencedAlerts, alertM
/>
)}
</td>
)}
</tr>
{!isCollapsed && (
<>
<tr className={className}>
<td />
<td>Comment</td>
<td colSpan={4}>{comment}</td>
<td colSpan={detailsColspan}>{comment}</td>
</tr>
<tr className={className}>
<td />
<td>Schedule</td>
<td colSpan={4}>{`${startsAtDate?.format(dateDisplayFormat)} - ${endsAtDate?.format(
<td colSpan={detailsColspan}>{`${startsAtDate?.format(dateDisplayFormat)} - ${endsAtDate?.format(
dateDisplayFormat
)}`}</td>
</tr>
<tr className={className}>
<td />
<td>Duration</td>
<td colSpan={4}>{duration}</td>
<td colSpan={detailsColspan}>{duration}</td>
</tr>
<tr className={className}>
<td />
<td>Created by</td>
<td colSpan={4}>{createdBy}</td>
<td colSpan={detailsColspan}>{createdBy}</td>
</tr>
{!!silencedAlerts.length && (
<tr className={cx(className, styles.alertRulesCell)}>
<td />
<td>Affected alerts</td>
<td colSpan={4}>
<td colSpan={detailsColspan}>
<SilencedAlertsTable silencedAlerts={silencedAlerts} />
</td>
</tr>

View File

@ -7,6 +7,7 @@ import SilenceTableRow from './SilenceTableRow';
import { getAlertTableStyles } from '../../styles/table';
import { NoSilencesSplash } from './NoSilencesCTA';
import { makeAMLink } from '../../utils/misc';
import { contextSrv } from 'app/core/services/context_srv';
interface Props {
silences: Silence[];
alertManagerAlerts: AlertmanagerAlert[];
@ -25,6 +26,7 @@ const SilencesTable: FC<Props> = ({ silences, alertManagerAlerts, alertManagerSo
<>
{!!silences.length && (
<>
{contextSrv.isEditor && (
<div className={styles.topButtonContainer}>
<Link href={makeAMLink('/alerting/silence/new', alertManagerSourceName)}>
<Button className={styles.addNewSilence} icon="plus">
@ -32,6 +34,7 @@ const SilencesTable: FC<Props> = ({ silences, alertManagerAlerts, alertManagerSo
</Button>
</Link>
</div>
)}
<table className={tableStyles.table}>
<colgroup>
<col className={tableStyles.colExpand} />
@ -39,7 +42,7 @@ const SilencesTable: FC<Props> = ({ silences, alertManagerAlerts, alertManagerSo
<col className={styles.colMatchers} />
<col />
<col />
<col />
{contextSrv.isEditor && <col />}
</colgroup>
<thead>
<tr>
@ -48,7 +51,7 @@ const SilencesTable: FC<Props> = ({ silences, alertManagerAlerts, alertManagerSo
<th>Matchers</th>
<th>Alerts</th>
<th>Schedule</th>
<th>Action</th>
{contextSrv.isEditor && <th>Action</th>}
</tr>
</thead>
<tbody>

View File

@ -0,0 +1,32 @@
import { FolderDTO } from 'app/types';
import { useDispatch } from 'react-redux';
import { useUnifiedAlertingSelector } from './useUnifiedAlertingSelector';
import { useEffect } from 'react';
import { fetchFolderIfNotFetchedAction } from '../state/actions';
import { initialAsyncRequestState } from '../utils/redux';
interface ReturnBag {
folder?: FolderDTO;
loading: boolean;
}
export function useFolder(uid?: string): ReturnBag {
const dispatch = useDispatch();
const folderRequests = useUnifiedAlertingSelector((state) => state.folders);
useEffect(() => {
if (uid) {
dispatch(fetchFolderIfNotFetchedAction(uid));
}
}, [dispatch, uid]);
if (uid) {
const request = folderRequests[uid] || initialAsyncRequestState;
return {
folder: request.result,
loading: request.loading,
};
}
return {
loading: false,
};
}

View File

@ -0,0 +1,38 @@
import { contextSrv } from 'app/core/services/context_srv';
import { isGrafanaRulerRule } from '../utils/rules';
import { RulerRuleDTO } from 'app/types/unified-alerting-dto';
import { useFolder } from './useFolder';
interface ResultBag {
isEditable?: boolean;
loading: boolean;
}
export function useIsRuleEditable(rule?: RulerRuleDTO): ResultBag {
const folderUID = rule && isGrafanaRulerRule(rule) ? rule.grafana_alert.namespace_uid : undefined;
const { folder, loading } = useFolder(folderUID);
if (!rule) {
return { isEditable: false, loading: false };
}
// grafana rules can be edited if user can edit the folder they're in
if (isGrafanaRulerRule(rule)) {
if (!folderUID) {
throw new Error(
`Rule ${rule.grafana_alert.title} does not have a folder uid, cannot determine if it is editable.`
);
}
return {
isEditable: folder?.canSave,
loading,
};
}
// prom rules are only editable by users with Editor role
return {
isEditable: contextSrv.isEditor,
loading: false,
};
}

View File

@ -8,7 +8,7 @@ import {
Silence,
SilenceCreatePayload,
} from 'app/plugins/datasource/alertmanager/types';
import { NotifierDTO, ThunkResult } from 'app/types';
import { FolderDTO, NotifierDTO, ThunkResult } from 'app/types';
import { RuleIdentifier, RuleNamespace, RuleWithLocation } from 'app/types/unified-alerting';
import {
PostableRulerRuleGroupDTO,
@ -48,6 +48,7 @@ import {
stringifyRuleIdentifier,
} from '../utils/rules';
import { addDefaultsToAlertmanagerConfig } from '../utils/alertmanager-config';
import { backendSrv } from 'app/core/services/backend_srv';
export const fetchPromRulesAction = createAsyncThunk(
'unifiedalerting/fetchPromRules',
@ -460,3 +461,16 @@ export const deleteTemplateAction = (templateName: string, alertManagerSourceNam
);
};
};
export const fetchFolderAction = createAsyncThunk(
'unifiedalerting/fetchFolder',
(uid: string): Promise<FolderDTO> => withSerializedError(backendSrv.getFolderByUid(uid))
);
export const fetchFolderIfNotFetchedAction = (uid: string): ThunkResult<void> => {
return (dispatch, getState) => {
if (!getState().unifiedAlerting.folders[uid]?.dispatched) {
dispatch(fetchFolderAction(uid));
}
};
};

View File

@ -11,6 +11,7 @@ import {
saveRuleFormAction,
updateAlertManagerConfigAction,
createOrUpdateSilenceAction,
fetchFolderAction,
} from './actions';
export const reducer = combineReducers({
@ -32,6 +33,7 @@ export const reducer = combineReducers({
updateSilence: createAsyncSlice('updateSilence', createOrUpdateSilenceAction).reducer,
amAlerts: createAsyncMapSlice('amAlerts', fetchAmAlertsAction, (alertManagerSourceName) => alertManagerSourceName)
.reducer,
folders: createAsyncMapSlice('folders', fetchFolderAction, (uid) => uid).reducer,
});
export type UnifiedAlertingState = ReturnType<typeof reducer>;

View File

@ -1,5 +1,6 @@
import { DataQuery, getDefaultTimeRange, rangeUtil, RelativeTimeRange } from '@grafana/data';
import { getDataSourceSrv } from '@grafana/runtime';
import { contextSrv } from 'app/core/services/context_srv';
import { getNextRefIdChar } from 'app/core/utils/query';
import { DashboardModel, PanelModel } from 'app/features/dashboard/state';
import { ExpressionDatasourceID, ExpressionDatasourceUID } from 'app/features/expressions/ExpressionDatasource';
@ -22,11 +23,13 @@ import { arrayToRecord, recordToArray } from './misc';
import { isAlertingRulerRule, isGrafanaRulerRule } from './rules';
import { parseInterval } from './time';
export const defaultFormValues: RuleFormValues = Object.freeze({
export const getDefaultFormValues = (): RuleFormValues =>
Object.freeze({
name: '',
labels: [{ key: '', value: '' }],
annotations: [{ key: '', value: '' }],
dataSourceName: null,
type: !contextSrv.isEditor ? RuleFormType.threshold : undefined, // viewers can't create prom alerts
// threshold
folder: null,
@ -43,7 +46,7 @@ export const defaultFormValues: RuleFormValues = Object.freeze({
expression: '',
forTime: 1,
forTimeUnit: 'm',
});
});
export function formValuesToRulerAlertingRuleDTO(values: RuleFormValues): RulerAlertingRuleDTO {
const { name, expression, forTime, forTimeUnit } = values;
@ -81,6 +84,8 @@ export function formValuesToRulerGrafanaRuleDTO(values: RuleFormValues): Postabl
export function rulerRuleToFormValues(ruleWithLocation: RuleWithLocation): RuleFormValues {
const { ruleSourceName, namespace, group, rule } = ruleWithLocation;
const defaultFormValues = getDefaultFormValues();
if (isGrafanaRulesSource(ruleSourceName)) {
if (isGrafanaRulerRule(rule)) {
const ga = rule.grafana_alert;

View File

@ -22,15 +22,15 @@
},
{
"method": "POST",
"reqRole": "Admin"
"reqRole": "Editor"
},
{
"method": "PUT",
"reqRole": "Admin"
"reqRole": "Editor"
},
{
"method": "DELETE",
"reqRole": "Admin"
"reqRole": "Editor"
},
{
"method": "GET",

View File

@ -350,7 +350,7 @@ export function getAppRoutes(): RouteDescriptor[] {
},
{
path: '/alerting/routes',
roles: () => ['Admin'],
roles: () => ['Admin', 'Editor'],
component: SafeDynamicImport(
() => import(/* webpackChunkName: "AlertAmRoutes" */ 'app/features/alerting/unified/AmRoutes')
),
@ -363,42 +363,49 @@ export function getAppRoutes(): RouteDescriptor[] {
},
{
path: '/alerting/silence/new',
roles: () => ['Editor', 'Admin'],
component: SafeDynamicImport(
() => import(/* webpackChunkName: "AlertSilences" */ 'app/features/alerting/unified/Silences')
),
},
{
path: '/alerting/silence/:id/edit',
roles: () => ['Editor', 'Admin'],
component: SafeDynamicImport(
() => import(/* webpackChunkName: "AlertSilences" */ 'app/features/alerting/unified/Silences')
),
},
{
path: '/alerting/notifications',
roles: config.featureToggles.ngalert ? () => ['Editor', 'Admin'] : undefined,
component: SafeDynamicImport(
() => import(/* webpackChunkName: "NotificationsListPage" */ 'app/features/alerting/NotificationsIndex')
),
},
{
path: '/alerting/notifications/templates/new',
roles: () => ['Editor', 'Admin'],
component: SafeDynamicImport(
() => import(/* webpackChunkName: "NotificationsListPage" */ 'app/features/alerting/NotificationsIndex')
),
},
{
path: '/alerting/notifications/templates/:id/edit',
roles: () => ['Editor', 'Admin'],
component: SafeDynamicImport(
() => import(/* webpackChunkName: "NotificationsListPage" */ 'app/features/alerting/NotificationsIndex')
),
},
{
path: '/alerting/notifications/receivers/new',
roles: () => ['Editor', 'Admin'],
component: SafeDynamicImport(
() => import(/* webpackChunkName: "NotificationsListPage" */ 'app/features/alerting/NotificationsIndex')
),
},
{
path: '/alerting/notifications/receivers/:id/edit',
roles: () => ['Editor', 'Admin'],
component: SafeDynamicImport(
() => import(/* webpackChunkName: "NotificationsListPage" */ 'app/features/alerting/NotificationsIndex')
),