config updates (#1800)

* cleanup

* update create plugin config and query help fix

* query types file

* Update docker-compose.yml

Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>

* addressed review comments

---------

Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>

src/datasource/components/AnnotationQueryEditor.tsx

@@ -3,7 +3,7 @@ import React, { useEffect, FormEvent } from 'react';
 import { useAsyncFn } from 'react-use';
 import { AnnotationQuery, SelectableValue } from '@grafana/data';
 import { InlineField, InlineSwitch, Input, Select } from '@grafana/ui';
-import { ZabbixMetricsQuery } from '../types';
+import { ZabbixMetricsQuery } from '../types/query';
 import { ZabbixQueryEditorProps } from './QueryEditor';
 import { QueryEditorRow } from './QueryEditor/QueryEditorRow';
 import { MetricPicker } from '../../components';

src/datasource/components/ConfigEditor.tsx

@@ -13,7 +13,7 @@ import {
   Tooltip,
   useStyles2,
 } from '@grafana/ui';
-import { ZabbixAuthType, ZabbixDSOptions, ZabbixSecureJSONData } from '../types';
+import { ZabbixAuthType, ZabbixDSOptions, ZabbixSecureJSONData } from '../types/config';
 import { gte } from 'semver';
 import {
   Auth,

src/datasource/components/FunctionEditor/AddZabbixFunction.tsx

@@ -2,7 +2,7 @@ import { css, cx } from '@emotion/css';
 import React, { useMemo, useState } from 'react';
 import { GrafanaTheme2 } from '@grafana/data';
 import { Button, ClickOutsideWrapper, Icon, Input, Menu, useStyles2, useTheme2 } from '@grafana/ui';
-import { FuncDef } from '../../types';
+import { FuncDef } from '../../types/query';
 import { getCategories } from '../../metricFunctions';
 
 // import { mapFuncDefsToSelectables } from './helpers';

src/datasource/components/FunctionEditor/FunctionEditor.tsx

@@ -4,7 +4,7 @@ import { FunctionEditorControlsProps, FunctionEditorControls } from './FunctionE
 
 import { useStyles2, Tooltip } from '@grafana/ui';
 import { GrafanaTheme2 } from '@grafana/data';
-import { MetricFunc } from '../../types';
+import { MetricFunc } from '../../types/query';
 
 interface FunctionEditorProps extends FunctionEditorControlsProps {
   func: MetricFunc;

src/datasource/components/FunctionEditor/FunctionEditorControls.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { Icon } from '@grafana/ui';
-import { MetricFunc } from '../../types';
+import { MetricFunc } from '../../types/query';
 
 const DOCS_FUNC_REF_URL = 'https://grafana.com/docs/plugins/alexanderzobnin-zabbix-app/latest/reference/functions/';
 

src/datasource/components/FunctionEditor/ZabbixFunctionEditor.tsx

@@ -7,7 +7,7 @@ import { HorizontalGroup, InlineLabel, useStyles2 } from '@grafana/ui';
 import { FunctionEditor } from './FunctionEditor';
 import { EditableParam, FunctionParamEditor } from './FunctionParamEditor';
 import { mapFuncInstanceToParams } from './helpers';
-import { MetricFunc } from '../../types';
+import { MetricFunc } from '../../types/query';
 
 export type FunctionEditorProps = {
   func: MetricFunc;

src/datasource/components/FunctionEditor/helpers.ts

@@ -1,5 +1,5 @@
 import { SelectableValue } from '@grafana/data';
-import { MetricFunc } from '../../types';
+import { MetricFunc } from '../../types/query';
 
 export type ParamDef = {
   name: string;

src/datasource/components/QueryEditor.tsx

@@ -4,7 +4,8 @@ import { InlineField, 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, ZabbixTagEvalType } from '../types';
+import { ShowProblemTypes, ZabbixMetricsQuery, ZabbixQueryOptions, ZabbixTagEvalType, QueryType } from '../types/query';
+import { ZabbixDSOptions } from '../types/config';
 import { MetricsQueryEditor } from './QueryEditor/MetricsQueryEditor';
 import { QueryFunctionsEditor } from './QueryEditor/QueryFunctionsEditor';
 import { QueryOptionsEditor } from './QueryEditor/QueryOptionsEditor';
@@ -16,7 +17,7 @@ import { TriggersQueryEditor } from './QueryEditor/TriggersQueryEditor';
 import { UserMacrosQueryEditor } from './QueryEditor/UserMacrosQueryEditor';
 import { QueryEditorRow } from './QueryEditor/QueryEditorRow';
 
-const zabbixQueryTypeOptions: Array<SelectableValue<string>> = [
+const zabbixQueryTypeOptions: Array<SelectableValue<QueryType>> = [
   {
     value: c.MODE_METRICS,
     label: 'Metrics',
@@ -200,7 +201,7 @@ export const QueryEditor = ({ query, datasource, onChange, onRunQuery }: ZabbixQ
     <>
       <QueryEditorRow>
         <InlineField label="Query type" labelWidth={12}>
-          <Select
+          <Select<QueryType>
             isSearchable={false}
             width={24}
             value={queryType}

src/datasource/components/QueryEditor/ItemIdQueryEditor.tsx

@@ -1,6 +1,6 @@
 import React, { FormEvent } from 'react';
 import { InlineField, Input } from '@grafana/ui';
-import { ZabbixMetricsQuery } from '../../types';
+import { ZabbixMetricsQuery } from '../../types/query';
 import { QueryEditorRow } from './QueryEditorRow';
 
 export interface Props {

src/datasource/components/QueryEditor/MetricsQueryEditor.tsx

@@ -8,7 +8,8 @@ import { QueryEditorRow } from './QueryEditorRow';
 import { MetricPicker } from '../../../components';
 import { getVariableOptions } from './utils';
 import { ZabbixDatasource } from '../../datasource';
-import { ZabbixMetricsQuery, ZBXItem, ZBXItemTag } from '../../types';
+import { ZabbixMetricsQuery } from '../../types/query';
+import { ZBXItem, ZBXItemTag } from '../../types';
 import { itemTagToString } from '../../utils';
 
 export interface Props {

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, ZabbixTagEvalType } from '../../types';
+import { ZabbixMetricsQuery, ZabbixTagEvalType } from '../../types/query';
 
 const showProblemsOptions: Array<SelectableValue<string>> = [
   { label: 'Problems', value: 'problems' },

src/datasource/components/QueryEditor/QueryFunctionsEditor.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { swap } from '../../utils';
 import { createFuncInstance } from '../../metricFunctions';
-import { FuncDef, MetricFunc, ZabbixMetricsQuery } from '../../types';
+import { FuncDef, MetricFunc, ZabbixMetricsQuery } from '../../types/query';
 import { QueryEditorRow } from './QueryEditorRow';
 import { InlineFormLabel } from '@grafana/ui';
 import { ZabbixFunctionEditor } from '../FunctionEditor/ZabbixFunctionEditor';

src/datasource/components/QueryEditor/QueryOptionsEditor.tsx

@@ -12,7 +12,7 @@ import {
   useStyles2,
 } from '@grafana/ui';
 import * as c from '../../constants';
-import { ZabbixQueryOptions } from '../../types';
+import { ZabbixQueryOptions } from '../../types/query';
 
 const ackOptions: Array<SelectableValue<number>> = [
   { label: 'all triggers', value: 2 },

src/datasource/components/QueryEditor/ServicesQueryEditor.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 } from '../../types/query';
 
 const slaPropertyList: Array<SelectableValue<string>> = [
   { label: 'Status', value: 'status' },

src/datasource/components/QueryEditor/TextMetricsQueryEditor.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 } from '../../types/query';
 
 export interface Props {
   query: ZabbixMetricsQuery;

src/datasource/components/QueryEditor/TriggersQueryEditor.tsx

@@ -9,7 +9,8 @@ import { MetricPicker } from '../../../components';
 import { getVariableOptions } from './utils';
 import { itemTagToString } from '../../utils';
 import { ZabbixDatasource } from '../../datasource';
-import { ZabbixMetricsQuery, ZBXItem, ZBXItemTag } from '../../types';
+import { ZabbixMetricsQuery } from '../../types/query';
+import { ZBXItem, ZBXItemTag } from '../../types';
 
 const countByOptions: Array<SelectableValue<string>> = [
   { value: '', label: 'All triggers' },

src/datasource/components/QueryEditor/UserMacrosQueryEditor.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 } from '../../types/query';
 
 export interface Props {
   query: ZabbixMetricsQuery;