Merge branch 'master' into docs-5.1

2018-04-16 09:58:46 +02:00
parent 48143d6caf 738fb29134
commit 92ac1fbb5b
101 changed files with 1077 additions and 712 deletions
@@ -77,7 +77,7 @@ the existing time series data in OpenTSDB, you need to run `tsdb uid metasync` o

 ### Nested Templating

-One template variable can be used to filter tag values for another template varible. First parameter is the metric name,
+One template variable can be used to filter tag values for another template variable. First parameter is the metric name,
 second parameter is the tag key for which you need to find tag values, and after that all other dependent template variables.
 Some examples are mentioned below to make nested template queries work successfully.

@@ -105,4 +105,4 @@ datasources:
    jsonData:
      tsdbResolution: 1
      tsdbVersion: 1
-```
+```