public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into alerting

Browse Source
This commit is contained in:
Torkel Ödegaard
2016-08-11 10:31:15 +02:00
parent 95c1a4a936 da6ac07b1d
commit 8878a55dc6
6 changed files with 55 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/sources/installation/mac.md
+13
View File
@@ -24,4 +24,17 @@ brew update
brew reinstall grafana
```
-------------
You can also install the latest unstable grafana from git:
```
brew install --HEAD grafana/grafana/grafana
```
To upgrade grafana if you've installed from HEAD:
```
brew reinstall --HEAD grafana/grafana/grafana
```
docs/sources/plugins/installation.md
+1 -1
View File
@@ -9,7 +9,7 @@ page_keywords: grafana, plugins, documentation
The easiest way to install plugins is by using the CLI tool grafana-cli which is bundled with grafana. Before any modification take place after modifying plugins, grafana-server needs to be restarted.
### Grafana plugin directory
On Linux systems the grafana-cli will assume that the grafana plugin directory is `/var/lib/grafana/plugins`. It's possible to override the directory which grafana-cli will operate on by specifying the --path flag. On Windows systems this parameter have to be specified for every call.
On Linux systems the grafana-cli will assume that the grafana plugin directory is `/var/lib/grafana/plugins`. It's possible to override the directory which grafana-cli will operate on by specifying the --pluginsDir flag. On Windows systems this parameter have to be specified for every call.
### Grafana-cli commands