Skip to content

Added alerts for ceph-storage-tab #1950

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.

Sign up for GitHub

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

Merged
openshift-merge-robot merged 1 commit into from
Jul 10, 2019
Merged

Added alerts for ceph-storage-tab #1950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 27 additions & 1 deletion ...kages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/health-card.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
import * as React from 'react';
import * as _ from 'lodash';

import {
AlertsBody,
AlertItem,
getAlerts,
} from '@console/internal/components/dashboard/health-card';
import { DashboardCard } from '@console/internal/components/dashboard/dashboard-card/card';
import { DashboardCardBody } from '@console/internal/components/dashboard/dashboard-card/card-body';
import { DashboardCardHeader } from '@console/internal/components/dashboard/dashboard-card/card-header';
Expand All @@ -14,6 +19,7 @@ import { HealthItem } from '@console/internal/components/dashboard/health-card/h
import { HealthState } from '@console/internal/components/dashboard/health-card/states';
import { STORAGE_HEALTH_QUERIES } from '../../../constants/queries';
import { CEPH_HEALTHY, CEPH_DEGRADED, CEPH_ERROR, CEPH_UNKNOWN } from '../../../constants';
import { filterCephAlerts } from '../../../selectors';

const CephHealthStatus = [
{
Expand Down Expand Up @@ -46,17 +52,23 @@ const HealthCard: React.FC<DashboardItemProps> = ({
watchPrometheus,
stopWatchPrometheusQuery,
prometheusResults,
watchAlerts,
stopWatchAlerts,
alertsResults,
}) => {
React.useEffect(() => {
watchAlerts();
watchPrometheus(STORAGE_HEALTH_QUERIES.CEPH_STATUS_QUERY);
return () => {
stopWatchAlerts();
stopWatchPrometheusQuery(STORAGE_HEALTH_QUERIES.CEPH_STATUS_QUERY);
};
}, [watchPrometheus, stopWatchPrometheusQuery]);
}, [watchPrometheus, stopWatchPrometheusQuery, watchAlerts, stopWatchAlerts]);

const queryResult = prometheusResults.getIn([STORAGE_HEALTH_QUERIES.CEPH_STATUS_QUERY, 'result']);

const cephHealthState = getCephHealthState(queryResult);
const alerts = filterCephAlerts(getAlerts(alertsResults));

return (
<DashboardCard>
Expand All @@ -68,6 +80,20 @@ const HealthCard: React.FC<DashboardItemProps> = ({
<HealthItem state={cephHealthState.state} message={cephHealthState.message} />
</HealthBody>
</DashboardCardBody>
{alerts.length > 0 && (
<React.Fragment>
<DashboardCardHeader className="co-alerts-card__border">
<DashboardCardTitle>Alerts</DashboardCardTitle>
</DashboardCardHeader>
<DashboardCardBody>
<AlertsBody>
{alerts.map((alert) => (
<AlertItem key={alert.fingerprint} alert={alert} />
))}
</AlertsBody>
</DashboardCardBody>
</React.Fragment>
)}
</DashboardCard>
);
};
Expand Down
5 changes: 5 additions & 0 deletions frontend/packages/ceph-storage-plugin/src/selectors/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import * as _ from 'lodash';
import { Alert } from '@console/internal/components/monitoring';

export const filterCephAlerts = (alerts: Alert[]): Alert[] =>
alerts.filter((alert) => _.get(alert, 'annotations.storage_type') === 'ceph');