Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NETOBSERV-908: Added query to get silenced alert and only display non silenced alert #313

Merged
merged 1 commit into from
Mar 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions web/src/api/alert.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,18 @@ export interface AlertsGroups {
limit?: number;
rules: Rule[];
}

export interface SilencedAlert {
id: string;
status: SilencedAlertStatus;
matchers: SilenceMatcher[];
}

export interface SilencedAlertStatus {
state: string;
}

export interface SilenceMatcher {
name: string;
value: string;
}
11 changes: 10 additions & 1 deletion web/src/api/routes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { Config, defaultConfig } from '../model/config';
import { TimeRange } from '../utils/datetime';
import { ContextSingleton } from '../utils/context';
import { parseMetrics } from '../utils/metrics';
import { AlertsResult } from './alert';
import { AlertsResult, SilencedAlert } from './alert';

export const getFlows = (params: FlowQuery): Promise<RecordsResult> => {
return axios.get(ContextSingleton.getHost() + '/api/loki/flows', { params }).then(r => {
Expand All @@ -37,6 +37,15 @@ export const getAlerts = (): Promise<AlertsResult> => {
});
};

export const getSilencedAlerts = (): Promise<SilencedAlert[]> => {
return axios.get('/api/alertmanager/api/v2/silences').then(r => {
if (r.status >= 400) {
throw new Error(`${r.statusText} [code=${r.status}]`);
}
return r.data;
});
};

export const getExportFlowsURL = (params: FlowQuery, columns?: string[]): string => {
const exportQuery = buildExportQuery(params, columns);
return `${ContextSingleton.getHost()}/api/loki/export?${exportQuery}`;
Expand Down
5 changes: 3 additions & 2 deletions web/src/components/__tests__/netflow-traffic.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { extensionsMock } from '../__tests-data__/extensions';
import { FlowsResultSample } from '../__tests-data__/flows';
import NetflowTrafficParent from '../netflow-traffic-parent';
import { TopologyResult } from '../../api/loki';
import { AlertsResult } from '../../api/alert';
import { AlertsResult, SilencedAlert } from '../../api/alert';
import { ConfigResultSample } from '../__tests-data__/config';

const useResolvedExtensionsMock = useResolvedExtensions as jest.Mock;
Expand All @@ -20,7 +20,8 @@ jest.mock('../../api/routes', () => ({
getTopology: jest.fn(() =>
Promise.resolve({ metrics: [], stats: { numQueries: 0, limitReached: false } } as TopologyResult)
),
getAlerts: jest.fn(() => Promise.resolve({ data: { groups: [] }, status: 'success' } as AlertsResult))
getAlerts: jest.fn(() => Promise.resolve({ data: { groups: [] }, status: 'success' } as AlertsResult)),
getSilencedAlerts: jest.fn(() => Promise.resolve([] as SilencedAlert[]))
}));
const getConfigMock = getConfig as jest.Mock;
const getFlowsMock = getFlows as jest.Mock;
Expand Down
30 changes: 28 additions & 2 deletions web/src/components/alerts/fetcher.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from 'react';
import AlertBanner from './banner';
import { getAlerts } from '../../api/routes';
import { getAlerts, getSilencedAlerts } from '../../api/routes';
import { Rule } from '@openshift-console/dynamic-plugin-sdk';

import { murmur3 } from 'murmurhash-js';
Expand All @@ -9,6 +9,7 @@ type AlertFetcherProps = {};

export const AlertFetcher: React.FC<AlertFetcherProps> = ({ children }) => {
const [alerts, setAlerts] = React.useState<Rule[]>([]);
const [silencedAlerts, setSilencedAlerts] = React.useState<string[] | null>(null);
React.useEffect(() => {
getAlerts()
.then(result => {
Expand Down Expand Up @@ -38,10 +39,35 @@ export const AlertFetcher: React.FC<AlertFetcherProps> = ({ children }) => {
});
return;
}, []);

React.useEffect(() => {
getSilencedAlerts()
.then(result => {
setSilencedAlerts(
result
.filter(rule => rule.status.state == 'active')
.map(rule => {
const matcher = rule.matchers.find(m => m.name == 'alertname');
return typeof matcher !== 'undefined' ? matcher.value : '';
})
);
})
.catch(() => {
console.log('Could not get silenced alerts');
// Showing all alerts since we could not get silenced alerts list
setSilencedAlerts([]);
});
return;
}, []);

let firingAlerts: Rule[] = [];
if (silencedAlerts != null) {
firingAlerts = alerts.filter(rule => !silencedAlerts.includes(rule.name));
}
return (
<>
<div className="netobserv-alerts-container">
{alerts.map(a => (
{firingAlerts.map(a => (
<AlertBanner key={a.name} rule={a} onDelete={() => setAlerts(alerts.filter(alert => alert.name != a.name))} />
))}
</div>
Expand Down