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

grafana · Aug 1, 2023 · 7af3dca · 7af3dca
1 parent e338124
commit 7af3dca
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 4 deletions.
diff --git a/src/datasource/components/QueryEditor.tsx b/src/datasource/components/QueryEditor.tsx
@@ -4,7 +4,7 @@ import { InlineField, InlineFieldRow, Select } from '@grafana/ui';
 import * as c from '../constants';
 import { migrate, DS_QUERY_SCHEMA } from '../migrations';
 import { ZabbixDatasource } from '../datasource';
-import { ShowProblemTypes, ZabbixDSOptions, ZabbixMetricsQuery, ZabbixQueryOptions } from '../types';
+import { ShowProblemTypes, ZabbixDSOptions, ZabbixMetricsQuery, ZabbixQueryOptions, ZabbixTagEvalType } from '../types';
 import { MetricsQueryEditor } from './QueryEditor/MetricsQueryEditor';
 import { QueryFunctionsEditor } from './QueryEditor/QueryFunctionsEditor';
 import { QueryOptionsEditor } from './QueryEditor/QueryOptionsEditor';
@@ -68,6 +68,7 @@ const getDefaultQuery: () => Partial<ZabbixMetricsQuery> = () => ({
   tags: { filter: '' },
   proxy: { filter: '' },
   textFilter: '',
+  evaltype: ZabbixTagEvalType.AndOr,
   options: {
     showDisabledItems: false,
     skipEmptyValues: false,

diff --git a/src/datasource/components/QueryEditor/ProblemsQueryEditor.tsx b/src/datasource/components/QueryEditor/ProblemsQueryEditor.tsx
@@ -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}>

diff --git a/src/datasource/datasource.ts b/src/datasource/datasource.ts
@@ -675,6 +675,10 @@ export class ZabbixDatasource extends DataSourceApi<ZabbixMetricsQuery, ZabbixDS
       problemsOptions.tags = tags;
     }
 
+    if (target?.evaltype) {
+      problemsOptions.evaltype = target?.evaltype;
+    }
+
     if (target.options?.acknowledged === 0 || target.options?.acknowledged === 1) {
       problemsOptions.acknowledged = !!target.options?.acknowledged;
     }

diff --git a/src/datasource/types.ts b/src/datasource/types.ts
@@ -59,6 +59,7 @@ export interface ZabbixMetricsQuery extends DataQuery {
   tags?: { filter: string };
   triggers?: { minSeverity: number; acknowledged: number; count: boolean };
   countTriggersBy?: 'problems' | 'items' | '';
+  evaltype?: ZabbixTagEvalType;
   functions?: MetricFunc[];
   options?: ZabbixQueryOptions;
   // Problems
@@ -415,3 +416,8 @@ export enum ZabbixAuthType {
   UserLogin = 'userLogin',
   Token = 'token',
 }
+
+export enum ZabbixTagEvalType {
+  AndOr = '0',
+  Or = '2',
+}
diff --git a/src/datasource/zabbix/connectors/zabbix_api/zabbixAPIConnector.ts b/src/datasource/zabbix/connectors/zabbix_api/zabbixAPIConnector.ts
@@ -481,7 +481,7 @@ export class ZabbixAPIConnector {
   }
 
   getProblems(groupids, hostids, applicationids, options): Promise<ZBXProblem[]> {
-    const { timeFrom, timeTo, recent, severities, limit, acknowledged, tags } = options;
+    const { timeFrom, timeTo, recent, severities, limit, acknowledged, tags, evaltype } = options;
 
     const params: any = {
       output: 'extend',
@@ -492,7 +492,7 @@ export class ZabbixAPIConnector {
       object: '0',
       sortfield: ['eventid'],
       sortorder: 'DESC',
-      evaltype: '2',
+      evaltype: '0',
       // preservekeys: '1',
       groupids,
       hostids,
@@ -512,6 +512,10 @@ export class ZabbixAPIConnector {
       params.tags = tags;
     }
 
+    if (evaltype) {
+      params.evaltype = evaltype;
+    }
+
     if (limit) {
       params.limit = limit;
     }