Use 'pipe' variable format instead of default

Previously, when user selected multiple variables, this query

```
service ~= "$service"
```

was expanded into

```
service ~= "{svc1, svc2}"
```

After the change, it will be turned correctly into

```
service ~= "svc1|svc2"
```

We use `pipe` instead of `regex` because there seems to be a bug in
riemann that will make the following fail

```
host ~= "host1\.example\.com|host2\.example\.com"
```

pipe doesn't backslash the dot but this is a workaround

i

Author: faxm0dem

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 2022-09-21 Release v0.1.6
+
+* Improve variable handling by interpolating multiple selections as "regex"
+
 ## 2021-04-30 Release v0.1.5
 
 * Add support for events with numeric time (in seconds)

Changes.md

@@ -126,6 +126,8 @@ This is the query text that will define the websocket subscription.
 The riemann query language doesn't have proper documentation yet, but there are lots of examples on its [website](https://riemann.io)
 and on the [test suite](https://github.com/riemann/riemann/blob/master/test/riemann/query_test.clj).
 
+If you use variable interpolation and use multiple selections, make sure to use the regexp match.
+
 #### Examples
 
 ```
@@ -135,6 +137,12 @@ metric and state = "ok"
 metric = 42
 ```
 
+```
+service ~= "$service"
+# When multiple services are selected, this will expand to
+# service ~= "service1|service2|service3"
+```
+
 ### GroupBy
 
 Riemann will potentially send you a truckload of unrelated events, unless your query is specific enough.

README.md

@@ -1,6 +1,6 @@
 {
   "name": "ccin2p3-riemann-datasource",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "Subscribe to riemann.io websocket streams!",
   "scripts": {
     "build": "grafana-toolkit plugin:build",

package.json

@@ -42,7 +42,7 @@ export class DataSource extends DataSourceApi<MyQuery, MyDataSourceOptions> {
   query(options: DataQueryRequest<MyQuery>): Observable<DataQueryResponse> {
     const streams = options.targets.map(target => {
       const query = defaults(target, defaultQuery);
-      const queryText = getTemplateSrv().replace(query.queryText, options.scopedVars);
+      const queryText = getTemplateSrv().replace(query.queryText, options.scopedVars, 'pipe');
       let ws: WebSocket;
       if (queryText in this.wsList) {
         cons.trace('Using existing ws for query', queryText);