From fc7d8761588c7dde089b8b0707b239b6d776f6eb Mon Sep 17 00:00:00 2001 From: Sven Klemm Date: Thu, 3 May 2018 00:17:18 +0200 Subject: [PATCH 1/4] try to fix table --- docs/sources/guides/whats-new-in-v5-1.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/sources/guides/whats-new-in-v5-1.md b/docs/sources/guides/whats-new-in-v5-1.md index 66b04ce3d50..ecab274bd32 100644 --- a/docs/sources/guides/whats-new-in-v5-1.md +++ b/docs/sources/guides/whats-new-in-v5-1.md @@ -100,7 +100,7 @@ In the table below you can see some examples and you can find all different opti Filter Option | Example | Raw | Interpolated | Description ------------ | ------------- | ------------- | ------------- | ------------- `glob` | ${servers:glob} | `'test1', 'test2'` | `{test1,test2}` | Formats multi-value variable into a glob -`regex` | ${servers:regex} | `'test.', 'test2'` | `(test\\.|test2)` | Formats multi-value variable into a regex string +`regex` | ${servers:regex} | `'test.', 'test2'` | ```(test\\.|test2)``` | Formats multi-value variable into a regex string `pipe` | ${servers:pipe} | `'test.', 'test2'` | `test.|test2` | Formats multi-value variable into a pipe-separated string `csv`| ${servers:csv} | `'test1', 'test2'` | `test1,test2` | Formats multi-value variable as a comma-separated string @@ -122,4 +122,4 @@ More information in the [Provisioning documentation](/features/datasources/prome ## Changelog Checkout the [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md) file for a complete list -of new features, changes, and bug fixes. \ No newline at end of file +of new features, changes, and bug fixes. From 7f8dacd0879ff31e1d016ee1b066733062ca4c26 Mon Sep 17 00:00:00 2001 From: Sven Klemm Date: Thu, 3 May 2018 00:19:47 +0200 Subject: [PATCH 2/4] use ascii code for pipe symbol to not mess up markdown table --- docs/sources/guides/whats-new-in-v5-1.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/sources/guides/whats-new-in-v5-1.md b/docs/sources/guides/whats-new-in-v5-1.md index ecab274bd32..19317074d6e 100644 --- a/docs/sources/guides/whats-new-in-v5-1.md +++ b/docs/sources/guides/whats-new-in-v5-1.md @@ -100,8 +100,8 @@ In the table below you can see some examples and you can find all different opti Filter Option | Example | Raw | Interpolated | Description ------------ | ------------- | ------------- | ------------- | ------------- `glob` | ${servers:glob} | `'test1', 'test2'` | `{test1,test2}` | Formats multi-value variable into a glob -`regex` | ${servers:regex} | `'test.', 'test2'` | ```(test\\.|test2)``` | Formats multi-value variable into a regex string -`pipe` | ${servers:pipe} | `'test.', 'test2'` | `test.|test2` | Formats multi-value variable into a pipe-separated string +`regex` | ${servers:regex} | `'test.', 'test2'` | `(test\\.|test2)` | Formats multi-value variable into a regex string +`pipe` | ${servers:pipe} | `'test.', 'test2'` | `test.|test2` | Formats multi-value variable into a pipe-separated string `csv`| ${servers:csv} | `'test1', 'test2'` | `test1,test2` | Formats multi-value variable as a comma-separated string ## Improved workflow for provisioned dashboards From f52920aa01c4c304b393a677b3194c321ca7caaa Mon Sep 17 00:00:00 2001 From: Sven Klemm Date: Thu, 3 May 2018 00:23:35 +0200 Subject: [PATCH 3/4] pipe escape try #3 --- docs/sources/guides/whats-new-in-v5-1.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/sources/guides/whats-new-in-v5-1.md b/docs/sources/guides/whats-new-in-v5-1.md index 19317074d6e..64b9a73eb9b 100644 --- a/docs/sources/guides/whats-new-in-v5-1.md +++ b/docs/sources/guides/whats-new-in-v5-1.md @@ -100,8 +100,8 @@ In the table below you can see some examples and you can find all different opti Filter Option | Example | Raw | Interpolated | Description ------------ | ------------- | ------------- | ------------- | ------------- `glob` | ${servers:glob} | `'test1', 'test2'` | `{test1,test2}` | Formats multi-value variable into a glob -`regex` | ${servers:regex} | `'test.', 'test2'` | `(test\\.|test2)` | Formats multi-value variable into a regex string -`pipe` | ${servers:pipe} | `'test.', 'test2'` | `test.|test2` | Formats multi-value variable into a pipe-separated string +`regex` | ${servers:regex} | `'test.', 'test2'` | `(test\\.`|`test2)` | Formats multi-value variable into a regex string +`pipe` | ${servers:pipe} | `'test.', 'test2'` | `test.`|`test2` | Formats multi-value variable into a pipe-separated string `csv`| ${servers:csv} | `'test1', 'test2'` | `test1,test2` | Formats multi-value variable as a comma-separated string ## Improved workflow for provisioned dashboards From ed4dc241cc1dc1e48eaef72cf06642cd32f7ef68 Mon Sep 17 00:00:00 2001 From: Sven Klemm Date: Sat, 5 May 2018 10:47:44 +0200 Subject: [PATCH 4/4] escape pipe symbol same way as in templating docs --- docs/sources/guides/whats-new-in-v5-1.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/sources/guides/whats-new-in-v5-1.md b/docs/sources/guides/whats-new-in-v5-1.md index 64b9a73eb9b..d992fd9062a 100644 --- a/docs/sources/guides/whats-new-in-v5-1.md +++ b/docs/sources/guides/whats-new-in-v5-1.md @@ -100,8 +100,8 @@ In the table below you can see some examples and you can find all different opti Filter Option | Example | Raw | Interpolated | Description ------------ | ------------- | ------------- | ------------- | ------------- `glob` | ${servers:glob} | `'test1', 'test2'` | `{test1,test2}` | Formats multi-value variable into a glob -`regex` | ${servers:regex} | `'test.', 'test2'` | `(test\\.`|`test2)` | Formats multi-value variable into a regex string -`pipe` | ${servers:pipe} | `'test.', 'test2'` | `test.`|`test2` | Formats multi-value variable into a pipe-separated string +`regex` | ${servers:regex} | `'test.', 'test2'` | (test\.|test2) | Formats multi-value variable into a regex string +`pipe` | ${servers:pipe} | `'test.', 'test2'` | test.|test2 | Formats multi-value variable into a pipe-separated string `csv`| ${servers:csv} | `'test1', 'test2'` | `test1,test2` | Formats multi-value variable as a comma-separated string ## Improved workflow for provisioned dashboards