Query option to override use trends option, fixes #1442

This commit is contained in:
Alexander Zobnin
2022-12-29 14:07:02 +01:00
parent 1cee6f0ae3
commit cf6b19e189
6 changed files with 39 additions and 15 deletions

View File

@@ -69,6 +69,7 @@ const getDefaultQuery: () => Partial<ZabbixMetricsQuery> = () => ({
skipEmptyValues: false,
disableDataAlignment: false,
useZabbixValueMapping: false,
useTrends: 'default',
},
table: {
skipEmptyValues: false,
@@ -103,7 +104,9 @@ export interface ZabbixQueryEditorProps
extends QueryEditorProps<ZabbixDatasource, ZabbixMetricsQuery, ZabbixDSOptions> {}
export const QueryEditor = ({ query, datasource, onChange, onRunQuery }: ZabbixQueryEditorProps) => {
query = { ...getDefaultQuery(), ...query };
const queryDefaults = getDefaultQuery();
query = { ...queryDefaults, ...query };
query.options = { ...queryDefaults.options, ...query.options };
const { queryType } = query;
if (queryType === c.MODE_PROBLEMS || queryType === c.MODE_TRIGGERS) {
const defaults = getProblemsQueryDefaults();