fix applying Custom query parameters when querying from Grafana variables (#413)

Related issue: #405

Author: arturminchukov

CHANGELOG.md

@@ -2,7 +2,8 @@
 
 ## tip
 
-* BUGFIX: fix an issue with parsings of the logs lines when in the logs line empty `_stream` and missed `_msg` fields. See [#330](https://github.com/VictoriaMetrics/victorialogs-datasource/issues/330)
+* BUGFIX: fix an issue with parsings of the logs lines when in the logs line empty `_stream` and missed `_msg` fields. See [#330](https://github.com/VictoriaMetrics/victorialogs-datasource/issues/330).
+* BUGFIX: fix applying `Custom query parameters` when querying from Grafana variables. See [#405](https://github.com/VictoriaMetrics/victorialogs-datasource/issues/405).
 
 ## v0.21.0
 

pkg/plugin/fields_query.go

@@ -8,11 +8,12 @@ import (
 )
 
 type FieldsQuery struct {
-	Query string `json:"query"`
-	Limit string `json:"limit"`
-	Start string `json:"start"`
-	End   string `json:"end"`
-	Field string `json:"field"`
+	Query        string `json:"query"`
+	Limit        string `json:"limit"`
+	Start        string `json:"start"`
+	End          string `json:"end"`
+	Field        string `json:"field"`
+	ExtraFilters string `json:"extra_filters"`
 }
 
 // getFieldsQueryFromRaw parses the field values query json from the raw message.
@@ -41,5 +42,8 @@ func (fv *FieldsQuery) queryParams() url.Values {
 	if fv.Field != "" {
 		params.Set("field", fv.Field)
 	}
+	if fv.ExtraFilters != "" {
+		params.Set("extra_filters", fv.ExtraFilters)
+	}
 	return params
 }

src/components/QueryEditor/QueryBuilder/components/QueryBuilderFilters/QueryBuilderFieldFilter.tsx

@@ -72,7 +72,7 @@ const QueryBuilderFieldFilter = ({ datasource, filter, query, indexPath, timeRan
     const filtersWithoutCurrent = deleteByIndexPath(query.filters, indexPath)
     const currentOperator = query.filters.operators[indexPath[0] - 1] || "AND"
     const filters = currentOperator === "AND" ? filterVisualQueryToString(filtersWithoutCurrent, true) : ""
-    const list = await datasource.languageProvider?.getFieldList({ type, timeRange, field, limit, query: filters });
+    const list = await datasource.languageProvider?.getFieldList({ type, timeRange, field, limit, query: filters }, datasource.customQueryParameters);
     const result = list ? list.map(({ value, hits }) => ({
       value,
       label: value || " ",

src/components/VariableQueryEditor/VariableQueryEditor.tsx

@@ -83,7 +83,7 @@ export const VariableQueryEditor = ({ onChange, query, datasource, range }: Prop
           timeRange: range,
           limit,
           query: getTemplateSrv().replace(queryFilter),
-        });
+        }, datasource.customQueryParameters);
 
         const result = list
           ? list.map(({ value, hits }) => ({

src/datasource.ts

@@ -254,7 +254,7 @@ export class VictoriaLogsDatasource
       type: FilterFieldType.FieldName,
       timeRange: options?.timeRange,
       limit: DEFAULT_FIELD_DISPLAY_VALUES_LIMIT,
-    })
+    }, this.customQueryParameters)
     return list
       ? list.map(({ value }) => ({ text: value || " " }))
       : []
@@ -266,7 +266,7 @@ export class VictoriaLogsDatasource
       timeRange: options.timeRange,
       limit: DEFAULT_FIELD_DISPLAY_VALUES_LIMIT,
       field: options.key,
-    })
+    }, this.customQueryParameters)
     return list
       ? list.map(({ value }) => ({ text: value || " " }))
       : []
@@ -301,7 +301,7 @@ export class VictoriaLogsDatasource
       field: query.field,
       query: query.query,
       limit: query.limit,
-    });
+    }, this.customQueryParameters);
     return (list ? list.map(({ value }) => ({ text: value })) : [])
   }
 

src/language_provider.ts

@@ -38,13 +38,18 @@ export default class LogsQlLanguageProvider extends LanguageProvider {
     return Promise.all([]);
   };
 
-  async getFieldList(options: FetchFieldsOptions): Promise<FieldHits[]> {
+  async getFieldList(options: FetchFieldsOptions, customParams?: URLSearchParams): Promise<FieldHits[]> {
     if (options.type === FilterFieldType.FieldValue && !options.field) {
       console.warn('getFieldList: field is required for FieldValue type');
       return [];
     }
 
     const urlParams = new URLSearchParams();
+    if (customParams) {
+      for (const [key, value] of customParams) {
+          urlParams.append(key, value);
+      }
+    }
     urlParams.append('query', options.query || '*');
 
     const timeRange = this.getTimeRangeParams(options.timeRange);