IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-26 19:00:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

Alerting: revert #60728 (#61222)

Browse Source
This commit is contained in:
Gilles De Mey 2023-01-11 12:37:11 +01:00 committed by GitHub
parent 87ccf10ffe
commit db6d0464e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
public/app/features/alerting/unified/components/amroutes/AmRoutesTable.test.tsx → public/app/features/alerting/unified/components/amroutes/AmRoutesTable.test.ts
View File

@ -1,13 +1,9 @@
import { render, screen } from '@testing-library/react';
import { noop } from 'lodash';
import React from 'react';
import { MatcherOperator } from 'app/plugins/datasource/alertmanager/types';
import { FormAmRoute } from '../../types/amroutes';
import { MatcherFieldValue } from '../../types/silence-form';
import { AmRoutesTable, deleteRoute, getFilteredRoutes, updatedRoute } from './AmRoutesTable';
import { deleteRoute, getFilteredRoutes, updatedRoute } from './AmRoutesTable';
const defaultAmRoute: FormAmRoute = {
id: '',
@ -193,24 +189,4 @@ describe('deleteRoute', () => {
expect(updatedRoutes[1].id).toBe('2');
expect(updatedRoutes[2].id).toBe('3');
});
it('Should warn about policies with no contact point', () => {
const routes: FormAmRoute[] = [
buildAmRoute({ id: 'no-contact-point' }),
buildAmRoute({ id: 'with-contact-point', receiver: 'TestContactPoint' }),
];
render(
<AmRoutesTable
onChange={noop}
onCancelAdd={noop}
routes={routes}
isAddMode={false}
alertManagerSourceName={'grafana'}
receivers={[]}
/>
);
expect(screen.getByText('None')).toBeInTheDocument();
expect(screen.getByText('TestContactPoint')).toBeInTheDocument();
});
});

30
public/app/features/alerting/unified/components/amroutes/AmRoutesTable.tsx
View File

@ -1,7 +1,7 @@
import { intersectionWith, isEqual } from 'lodash';
import React, { FC, useCallback, useEffect, useMemo, useState } from 'react';
import { Badge, Button, ConfirmModal, HorizontalGroup, IconButton, Tooltip } from '@grafana/ui';
import { Button, ConfirmModal, HorizontalGroup, IconButton } from '@grafana/ui';
import { contextSrv } from 'app/core/services/context_srv';
import { FormAmRoute } from '../../types/amroutes';
@ -95,10 +95,6 @@ export const AmRoutesTable: FC<AmRoutesTableProps> = ({
const expandItem = useCallback((item: RouteTableItemProps) => setExpandedId(item.id), []);
const collapseItem = useCallback(() => setExpandedId(undefined), []);
const missingReceiver = (route: FormAmRoute) => {
return Boolean(route.receiver) === false;
};
const cols: RouteTableColumnProps[] = [
{
id: 'matchingCriteria',
@ -124,24 +120,12 @@ export const AmRoutesTable: FC<AmRoutesTableProps> = ({
label: 'Contact point',
renderCell: (item) => {
const type = getGrafanaAppReceiverType(receivers, item.data.receiver);
if (!missingReceiver(item.data)) {
return (
<>
{item.data.receiver} {type && <GrafanaAppBadge grafanaAppType={type} />}
</>
);
}
return (
<Tooltip
content={'No notifications will be delivered for this policy until a contact point is configured.'}
placement="top"
>
<span>
<Badge color="orange" icon="exclamation-triangle" text="None" />
</span>
</Tooltip>
return item.data.receiver ? (
<>
{item.data.receiver} {type && <GrafanaAppBadge grafanaAppType={type} />}
</>
) : (
'-'
);
},
size: 5,