Query option to override use trends option, fixes #1442

pkg/datasource/models.go

@@ -75,9 +75,10 @@ type QueryFilter struct {
 
 // QueryOptions model
 type QueryOptions struct {
-	ShowDisabledItems     bool `json:"showDisabledItems"`
+	ShowDisabledItems     bool   `json:"showDisabledItems"`
-	DisableDataAlignment  bool `json:"disableDataAlignment"`
+	DisableDataAlignment  bool   `json:"disableDataAlignment"`
-	UseZabbixValueMapping bool `json:"useZabbixValueMapping"`
+	UseZabbixValueMapping bool   `json:"useZabbixValueMapping"`
+	UseTrends             string `json:"useTrends"`
 }
 
 // QueryOptions model

pkg/datasource/zabbix.go

@@ -108,7 +108,7 @@ func (ds *ZabbixDatasourceInstance) queryNumericDataForItems(ctx context.Context
 
 func (ds *ZabbixDatasourceInstance) applyDataProcessing(ctx context.Context, query *QueryModel, series []*timeseries.TimeSeriesData, DBPostProcessing bool) ([]*data.Frame, error) {
 	consolidateBy := ds.getConsolidateBy(query)
-	useTrend := ds.isUseTrend(query.TimeRange)
+	useTrend := ds.isUseTrend(query.TimeRange, query)
 
 	// Sort trend data (in some cases Zabbix API returns it unsorted)
 	if useTrend {
@@ -199,7 +199,7 @@ func (ds *ZabbixDatasourceInstance) getConsolidateBy(query *QueryModel) string {
 
 func (ds *ZabbixDatasourceInstance) getHistotyOrTrend(ctx context.Context, query *QueryModel, items []*zabbix.Item, trendValueType string) (zabbix.History, error) {
 	timeRange := query.TimeRange
-	useTrend := ds.isUseTrend(timeRange)
+	useTrend := ds.isUseTrend(timeRange, query)
 
 	if useTrend {
 		result, err := ds.zabbix.GetTrend(ctx, items, timeRange)
@@ -212,8 +212,8 @@ func (ds *ZabbixDatasourceInstance) getHistotyOrTrend(ctx context.Context, query
 	return ds.zabbix.GetHistory(ctx, items, timeRange)
 }
 
-func (ds *ZabbixDatasourceInstance) isUseTrend(timeRange backend.TimeRange) bool {
+func (ds *ZabbixDatasourceInstance) isUseTrend(timeRange backend.TimeRange, query *QueryModel) bool {
-	if !ds.Settings.Trends {
+	if query.Options.UseTrends == "false" {
 		return false
 	}
 
@@ -223,8 +223,7 @@ func (ds *ZabbixDatasourceInstance) isUseTrend(timeRange backend.TimeRange) bool
 	toSec := timeRange.To.Unix()
 	rangeSec := float64(toSec - fromSec)
 
-	if (fromSec < time.Now().Add(-trendsFrom).Unix()) || (rangeSec > trendsRange.Seconds()) {
+	trendTimeRange := (fromSec < time.Now().Add(-trendsFrom).Unix()) || (rangeSec > trendsRange.Seconds())
-		return true
+	useTrendsToggle := query.Options.UseTrends == "true" || ds.Settings.Trends
-	}
+	return trendTimeRange && useTrendsToggle
-	return false
 }

src/datasource/components/QueryEditor.tsx

@@ -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();

src/datasource/components/QueryEditor/QueryOptionsEditor.tsx

@@ -26,6 +26,12 @@ const sortOptions: Array<SelectableValue<string>> = [
   { label: 'Severity', value: 'severity' },
 ];
 
+const trendsOptions: Array<SelectableValue<string>> = [
+  { label: 'Default', value: 'default' },
+  { label: 'True', value: 'true' },
+  { label: 'False', value: 'false' },
+];
+
 interface Props {
   queryType: string;
   queryOptions: ZabbixQueryOptions;
@@ -93,6 +99,15 @@ export const QueryOptionsEditor = ({ queryType, queryOptions, onChange }: Props)
   const renderMetricOptions = () => {
     return (
       <>
+        <InlineField label="Trends" labelWidth={24}>
+          <Select
+            isSearchable={false}
+            width={16}
+            value={queryOptions.useTrends}
+            options={trendsOptions}
+            onChange={onPropChange('useTrends')}
+          />
+        </InlineField>
         <InlineField label="Show disabled items" labelWidth={24}>
           <InlineSwitch
             value={queryOptions.showDisabledItems}

src/datasource/datasource.ts

@@ -279,7 +279,7 @@ export class ZabbixDatasource extends DataSourceApi<ZabbixMetricsQuery, ZabbixDS
         request.scopedVars = Object.assign({}, request.scopedVars, utils.getRangeScopedVars(request.range));
         this.replaceTargetVariables(target, request);
         const timeRange = this.buildTimeRange(request, target);
-        const useTrends = this.isUseTrends(timeRange);
+        const useTrends = this.isUseTrends(timeRange, target);
 
         if (!target.queryType || target.queryType === c.MODE_METRICS) {
           return this.queryNumericData(target, timeRange, useTrends, request);
@@ -857,11 +857,16 @@ export class ZabbixDatasource extends DataSourceApi<ZabbixMetricsQuery, ZabbixDS
     });
   }
 
-  isUseTrends(timeRange) {
+  isUseTrends(timeRange, target: ZabbixMetricsQuery) {
+    if (target.options.useTrends === 'false') {
+      return false;
+    }
     const [timeFrom, timeTo] = timeRange;
     const useTrendsFrom = Math.ceil(dateMath.parse('now-' + this.trendsFrom) / 1000);
     const useTrendsRange = Math.ceil(utils.parseInterval(this.trendsRange) / 1000);
-    const useTrends = this.trends && (timeFrom < useTrendsFrom || timeTo - timeFrom > useTrendsRange);
+    const useTrendsToggle = target.options.useTrends === 'true';
+    const useTrends =
+      (useTrendsToggle || this.trends) && (timeFrom < useTrendsFrom || timeTo - timeFrom > useTrendsRange);
     return useTrends;
   }
 

src/datasource/types.ts

@@ -67,6 +67,7 @@ export interface ZabbixQueryOptions {
   skipEmptyValues?: boolean;
   disableDataAlignment?: boolean;
   useZabbixValueMapping?: boolean;
+  useTrends?: 'default' | 'true' | 'false';
   // Problems options
   minSeverity?: number;
   sortProblems?: string;