Fix filter (#132)

* fixbug and add a ut of repace logic

* fixbug, stream field filter, syntax error

* add CHANGELOG.md

* fix CHANGELOG.md

---------

Co-authored-by: worker24h <[email protected]>

Author: dmitryk-dk

CHANGELOG.md

@@ -6,6 +6,8 @@
 * FEATURE: implement a toggle to switch between instant and range requests. See [this issue](https://github.com/VictoriaMetrics/victorialogs-datasource/issues/111).
 * FEATURE: add options to configure the legend template, limit for number of log lines, and step. See [this](https://github.com/VictoriaMetrics/victorialogs-datasource/issues/114) and [this](https://github.com/VictoriaMetrics/victorialogs-datasource/issues/124) issues.
 
+* BUGFIX: fix support mulit options with label values of stream-fields. See [this issue](https://github.com/VictoriaMetrics/victorialogs-datasource/issues/109).
+
 ## v0.9.0
 
 * FEATURE: Add support for the `$__range` variable in queries.  It will be transformed to the `[time_from, time_to]` in the Unix format. See [this issue](https://github.com/VictoriaMetrics/victorialogs-datasource/issues/112).
@@ -44,7 +46,7 @@
   Thanks to @yincongcyincong for [the pull request](https://github.com/VictoriaMetrics/victorialogs-datasource/pull/69).
 
 * BUGFIX: correctly pass time range filter when querying variable values. Before, time filter wasn't applied for `/field_values` and `/field_names` API calls. See [this](https://github.com/VictoriaMetrics/victorialogs-datasource/issues/71) and [this](https://github.com/VictoriaMetrics/victorialogs-datasource/issues/72) issues.
-* BUGFIX: fix the issue with displaying incorrect subfields when requesting logs with different set of fields. See [this issue](https://github.com/VictoriaMetrics/victorialogs-datasource/issues/60). 
+* BUGFIX: fix the issue with displaying incorrect subfields when requesting logs with different set of fields. See [this issue](https://github.com/VictoriaMetrics/victorialogs-datasource/issues/60).
 
 ## v0.4.0
 

src/datasource.test.ts

@@ -113,6 +113,21 @@ describe('VictoriaLogsDatasource', () => {
       expect(replacedQuery.expr).toBe('foo: "bar"');
     });
 
+    it('should replace $var with an | expression for stream field when given an array of values', () => {
+      const scopedVars = {
+        var: { text: 'foo,bar', value: ['foo', 'bar'] },
+      };
+      const templateSrvMock = {
+        replace: jest.fn((a: string) => a?.replace('$var', '("foo" OR "bar")')),
+      } as unknown as TemplateSrv;
+      const ds = createDatasource(templateSrvMock);
+      const replacedQuery = ds.applyTemplateVariables(
+        { expr: '_stream{val=~"$var"}', refId: 'A' },
+        scopedVars
+      );
+      expect(replacedQuery.expr).toBe('_stream{val=~"("foo"|"bar")"}');
+    });
+
     it('should replace $var with an OR expression when given an array of values', () => {
       const scopedVars = {
         var: { text: 'foo,bar', value: ['foo', 'bar'] },

src/datasource.ts

@@ -156,7 +156,7 @@ export class VictoriaLogsDatasource
     return {
       ...target,
       legendFormat: this.templateSrv.replace(target.legendFormat, rest),
-      expr: this.templateSrv.replace(exprWithAdHoc, variables, this.interpolateQueryExpr),
+      expr: this.interpolateString(exprWithAdHoc, variables),
     };
   }
 
@@ -256,7 +256,21 @@ export class VictoriaLogsDatasource
   }
 
   interpolateString(string: string, scopedVars?: ScopedVars) {
-    return this.templateSrv.replace(string, scopedVars, this.interpolateQueryExpr);
+    let expr: string = this.templateSrv.replace(string, scopedVars, this.interpolateQueryExpr);
+    if (expr) {
+      // Replace "OR" with "|" inside parentheses
+      // The stream field filter, uses "|" as the operator for multiple values.
+      // expr => {k="v", k2=~"(v2 OR v3 OR v4)"} Test
+      // newExpr => {k="v", k2=~"(v2|v3|v4)"} Test
+      expr = expr.replace(/\{([^}]+)\}/g, (outerMatch, outerContent) => {
+        const replacedContent = outerContent.replace(/\(([^)]+)\)/g, (match: string, content: string) => {
+          const replaced = content.replace(/\s*OR\s*/g, '|');
+          return `(${replaced})`;
+        });
+        return `{${replacedContent}}`;
+      });
+    }
+    return expr;
   }
 
   private async processMetricFindQuery(query: VariableQuery, timeRange?: TimeRange): Promise<MetricFindValue[]> {