Merge remote-tracking branch 'origin/master'

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
 ```

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]+)
+```