From da31418b3aaf83931466656f1801f093491941b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Depriester?= Date: Thu, 8 Jul 2021 14:09:10 +0200 Subject: [PATCH] feat: display active alerts by default --- src/DataSource.ts | 3 ++- src/QueryEditor.tsx | 4 ++-- src/types.ts | 4 +++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/DataSource.ts b/src/DataSource.ts index 711e590..f1473c4 100644 --- a/src/DataSource.ts +++ b/src/DataSource.ts @@ -6,7 +6,7 @@ import { MutableDataFrame, } from '@grafana/data'; import { getBackendSrv, getTemplateSrv } from '@grafana/runtime'; -import { GenericOptions, CustomQuery, QueryRequest } from './types'; +import { GenericOptions, CustomQuery, QueryRequest, defaultQuery } from './types'; export class AlertmanagerDataSource extends DataSourceApi { url: string; @@ -27,6 +27,7 @@ export class AlertmanagerDataSource extends DataSourceApi { const promises = options.targets.map((query) => { + query = { ...defaultQuery, ...query }; if (query.hide) { return Promise.resolve(new MutableDataFrame()); } diff --git a/src/QueryEditor.tsx b/src/QueryEditor.tsx index 55bdcdc..256b8ab 100644 --- a/src/QueryEditor.tsx +++ b/src/QueryEditor.tsx @@ -4,7 +4,7 @@ import { LegacyForms } from '@grafana/ui'; import React, { ChangeEvent, PureComponent } from 'react'; import { AlertmanagerDataSource } from './DataSource'; -import { GenericOptions, CustomQuery } from './types'; +import { GenericOptions, CustomQuery, defaultQuery } from './types'; import './css/json-editor.css'; @@ -47,7 +47,7 @@ export class QueryEditor extends PureComponent { }; render() { - const { receiver, filters, active, silenced, inhibited } = this.props.query; + const { receiver, filters, active, silenced, inhibited } = { ...defaultQuery, ...this.props.query }; return ( <> diff --git a/src/types.ts b/src/types.ts index 24da034..0d1e6ae 100644 --- a/src/types.ts +++ b/src/types.ts @@ -15,6 +15,8 @@ export interface CustomQuery extends DataQuery { inhibited: boolean; } -export const defaultQuery: Partial = {}; +export const defaultQuery: Partial = { + active: true, +}; export interface GenericOptions extends DataSourceJsonData {}