Merge remote-tracking branch 'origin/master'

2017-03-05 14:20:05 +03:00
parent 5192e8648d 9009862be6
commit 3cd80e7aec
2 changed files with 13 additions and 1 deletions
--- a/docs/sources/installation/index.md
+++ b/docs/sources/installation/index.md
@@ -37,7 +37,7 @@ service grafana-server restart

 Using this way you can easy upgrade plugin just running
 ```sh
-cd /var/lib/grafana/plugins/grafana-zabbix-app
+cd /var/lib/grafana/plugins/grafana-zabbix
 git pull
 service grafana-server restart
 ```
--- a/docs/sources/reference/functions.md
+++ b/docs/sources/reference/functions.md
@@ -146,3 +146,15 @@ Examples:
 ```
 setAlias(load)
 ```
+
+### setAliasByRegex
+```
+setAliasByRegex(regex)
+```
+
+Returns part of the metric name matched by regex.
+
+Examples:
+```
+setAlias(Zabbix busy [a-zA-Z]+)
+```