fix variable insertion (#79)

VictoriaMetrics · Oct 7, 2024 · 518eca5 · 518eca5
1 parent fa90658
commit 518eca5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## tip
 
+* BUGFIX: fix variable substitution in queries. See [this issue](https://github.com/VictoriaMetrics/victorialogs-datasource/issues/77).
+
 ## v0.5.0
 
 * FEATURE: add support of the `$__interval` variable in queries. See [this issue](https://github.com/VictoriaMetrics/victorialogs-datasource/issues/61).

diff --git a/src/datasource.ts b/src/datasource.ts
@@ -1,4 +1,4 @@
-import { defaults, map as lodashMap } from 'lodash';
+import { defaults } from 'lodash';
 import { Observable, lastValueFrom } from "rxjs";
 import { map } from 'rxjs/operators';
 
@@ -166,16 +166,13 @@ export class VictoriaLogsDatasource
   }
 
   interpolateQueryExpr(value: any, _variable: any) {
-    const wrapInQuotes = (v: string) => `"${v}"`;
-
     if (typeof value === 'string') {
-      return wrapInQuotes(value);
+      return value;
     }
 
     if (Array.isArray(value)) {
-      const escapedAndQuotedValues = lodashMap(value, wrapInQuotes);
-      const combinedValues = escapedAndQuotedValues.join(' OR ');
-      return escapedAndQuotedValues.length > 1 ? `(${combinedValues})` : combinedValues;
+      const combinedValues = value.join(' OR ');
+      return value.length > 1 ? `(${combinedValues})` : combinedValues;
     }
 
     return value;