Skip to content

Commit da31418

Browse files
committed
feat: display active alerts by default
1 parent b420606 commit da31418

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

src/DataSource.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
MutableDataFrame,
77
} from '@grafana/data';
88
import { getBackendSrv, getTemplateSrv } from '@grafana/runtime';
9-
import { GenericOptions, CustomQuery, QueryRequest } from './types';
9+
import { GenericOptions, CustomQuery, QueryRequest, defaultQuery } from './types';
1010

1111
export class AlertmanagerDataSource extends DataSourceApi<CustomQuery, GenericOptions> {
1212
url: string;
@@ -27,6 +27,7 @@ export class AlertmanagerDataSource extends DataSourceApi<CustomQuery, GenericOp
2727

2828
async query(options: QueryRequest): Promise<DataQueryResponse> {
2929
const promises = options.targets.map((query) => {
30+
query = { ...defaultQuery, ...query };
3031
if (query.hide) {
3132
return Promise.resolve(new MutableDataFrame());
3233
}

src/QueryEditor.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { LegacyForms } from '@grafana/ui';
44
import React, { ChangeEvent, PureComponent } from 'react';
55
import { AlertmanagerDataSource } from './DataSource';
66

7-
import { GenericOptions, CustomQuery } from './types';
7+
import { GenericOptions, CustomQuery, defaultQuery } from './types';
88

99
import './css/json-editor.css';
1010

@@ -47,7 +47,7 @@ export class QueryEditor extends PureComponent<Props> {
4747
};
4848

4949
render() {
50-
const { receiver, filters, active, silenced, inhibited } = this.props.query;
50+
const { receiver, filters, active, silenced, inhibited } = { ...defaultQuery, ...this.props.query };
5151

5252
return (
5353
<>

src/types.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ export interface CustomQuery extends DataQuery {
1515
inhibited: boolean;
1616
}
1717

18-
export const defaultQuery: Partial<CustomQuery> = {};
18+
export const defaultQuery: Partial<CustomQuery> = {
19+
active: true,
20+
};
1921

2022
export interface GenericOptions extends DataSourceJsonData {}

0 commit comments

Comments
 (0)