Problems: Able to select tags evaluation type, fixes #1600

This commit is contained in:
Alexander Zobnin
2023-08-01 15:53:13 +02:00
parent e33812427e
commit 7af3dca545
5 changed files with 33 additions and 4 deletions

View File

@@ -8,7 +8,7 @@ import { QueryEditorRow } from './QueryEditorRow';
import { MetricPicker } from '../../../components';
import { getVariableOptions } from './utils';
import { ZabbixDatasource } from '../../datasource';
import { ZabbixMetricsQuery } from '../../types';
import { ZabbixMetricsQuery, ZabbixTagEvalType } from '../../types';
const showProblemsOptions: Array<SelectableValue<string>> = [
{ label: 'Problems', value: 'problems' },
@@ -25,6 +25,11 @@ const severityOptions: Array<SelectableValue<number>> = [
{ value: 5, label: 'Disaster' },
];
const evaltypeOptions: Array<SelectableValue<ZabbixTagEvalType>> = [
{ label: 'AND/OR', value: ZabbixTagEvalType.AndOr },
{ label: 'OR', value: ZabbixTagEvalType.Or },
];
export interface Props {
query: ZabbixMetricsQuery;
datasource: ZabbixDatasource;
@@ -206,6 +211,15 @@ export const ProblemsQueryEditor = ({ query, datasource, onChange }: Props) => {
onBlur={onTextFilterChange('tags')}
/>
</InlineField>
<InlineField>
<Select
isSearchable={false}
width={15}
value={query.evaltype}
options={evaltypeOptions}
onChange={onPropChange('evaltype')}
/>
</InlineField>
</QueryEditorRow>
<QueryEditorRow>
<InlineField label="Show" labelWidth={12}>