From a0081eee46e5b348e47607e1c7a63b890205e126 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Wed, 6 Apr 2016 21:27:16 +0300 Subject: [PATCH 1/4] Updated installation docs. --- docs/sources/installation/index.md | 57 +++++++++++++++++++----------- 1 file changed, 37 insertions(+), 20 deletions(-) diff --git a/docs/sources/installation/index.md b/docs/sources/installation/index.md index 3f10253..4f5c02a 100644 --- a/docs/sources/installation/index.md +++ b/docs/sources/installation/index.md @@ -3,11 +3,38 @@ page_description: Installation instructions for Grafana-Zabbix. # Installation -## From release package -Download [latest release](https://github.com/alexanderzobnin/grafana-zabbix/releases/latest) -for relative Grafana version. Unpack archive and copy *grafana-zabbix* into your grafana -plugins directory (default `/var/lib/grafana/plugins` if your installing grafana with package). -Restart grafana-server and the plugin should be automatically detected and used. +## From special repo +You can use [grafana-zabbix-app](https://github.com/alexanderzobnin/grafana-zabbix-app) repo, +which contains latest builded version of plugin. + +```sh +cd /var/lib/grafana/plugins +git clone https://github.com/alexanderzobnin/grafana-zabbix-app +``` + +Then restart grafana server. + +Using this way you can easy upgrade plugin just running +```sh +cd /var/lib/grafana/plugins/grafana-zabbix-app +git pull +service grafana-server restart +``` + +## Using grafana-cli tool +Get list of available plugins + +```sh +grafana-cli plugins list-remote +``` + +Install zabbix plugin + +```sh +grafana-cli plugins install zabbix-app +``` + +Read more in [Grafana docs](http://docs.grafana.org/plugins/installation/) ## Building from sources You need NodeJS, npm and Grunt for building plugin from sources. Read more about required versions @@ -43,18 +70,8 @@ sudo service grafana-server restart systemctl restart grafana-server ``` -## Using grafana-cli tool - -Get list of available plugins - -```sh -grafana-cli plugins list-remote -``` - -Install zabbix plugin - -```sh -grafana-cli plugins install zabbix-app -``` - -Read more in [Grafana docs](http://docs.grafana.org/plugins/installation/) +## From release package +Download [latest release](https://github.com/alexanderzobnin/grafana-zabbix/releases/latest) +for relative Grafana version. Unpack archive and copy *grafana-zabbix* into your grafana +plugins directory (default `/var/lib/grafana/plugins` if your installing grafana with package). +Restart grafana-server and the plugin should be automatically detected and used. From 2e4e1c0287b62935cfaadf358fe889b53b5fd9e9 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Mon, 11 Apr 2016 20:40:31 +0300 Subject: [PATCH 2/4] Updated installation docs. --- docs/sources/installation/index.md | 43 +++++++++++++++--------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/docs/sources/installation/index.md b/docs/sources/installation/index.md index 4f5c02a..0c3f0ad 100644 --- a/docs/sources/installation/index.md +++ b/docs/sources/installation/index.md @@ -3,6 +3,26 @@ page_description: Installation instructions for Grafana-Zabbix. # Installation +## Using grafana-cli tool +Get list of available plugins + +```sh +grafana-cli plugins list-remote +``` + +Install zabbix plugin + +```sh +grafana-cli plugins install alexanderzobnin-zabbix-app +``` + +Restart grafana after installing plugins +```sh +service grafana-server restart +``` + +Read more about installing plugins in [Grafana docs](http://docs.grafana.org/plugins/installation/) + ## From special repo You can use [grafana-zabbix-app](https://github.com/alexanderzobnin/grafana-zabbix-app) repo, which contains latest builded version of plugin. @@ -21,21 +41,6 @@ git pull service grafana-server restart ``` -## Using grafana-cli tool -Get list of available plugins - -```sh -grafana-cli plugins list-remote -``` - -Install zabbix plugin - -```sh -grafana-cli plugins install zabbix-app -``` - -Read more in [Grafana docs](http://docs.grafana.org/plugins/installation/) - ## Building from sources You need NodeJS, npm and Grunt for building plugin from sources. Read more about required versions in [Grafana docs](http://docs.grafana.org/project/building_from_source/). @@ -66,12 +71,6 @@ grunt Restart Grafana server ```sh -sudo service grafana-server restart +service grafana-server restart systemctl restart grafana-server ``` - -## From release package -Download [latest release](https://github.com/alexanderzobnin/grafana-zabbix/releases/latest) -for relative Grafana version. Unpack archive and copy *grafana-zabbix* into your grafana -plugins directory (default `/var/lib/grafana/plugins` if your installing grafana with package). -Restart grafana-server and the plugin should be automatically detected and used. From 0d85644442bf4b56e2a6f8c79b2c2781f9ac7a43 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Mon, 11 Apr 2016 20:54:58 +0300 Subject: [PATCH 3/4] Updated images for configuration docs. --- docs/sources/img/installation-enable_app.png | 4 ++-- docs/sources/img/installation-plugin-dashboards.png | 4 ++-- docs/sources/img/installation-plugins-apps.png | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/sources/img/installation-enable_app.png b/docs/sources/img/installation-enable_app.png index 781e297..0c8db7b 100644 --- a/docs/sources/img/installation-enable_app.png +++ b/docs/sources/img/installation-enable_app.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6c46b44d6db23e898c29e72a3c3df3f36d62d712206b3453c18c173fcbcc5529 -size 139772 +oid sha256:dc8ff42dbfa78458edcf931377156775973b87037b358daf82ecd5a3e49787b7 +size 138620 diff --git a/docs/sources/img/installation-plugin-dashboards.png b/docs/sources/img/installation-plugin-dashboards.png index 2b82016..e1cdbd5 100644 --- a/docs/sources/img/installation-plugin-dashboards.png +++ b/docs/sources/img/installation-plugin-dashboards.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:98e41015ed5e6738645065a057af30ce46482ec6797e4cbe85d9990e1fdce5be -size 140142 +oid sha256:4932343924aa2416b72e46344e61335f2c0c4472575b919ee0629933d2c74b3e +size 139070 diff --git a/docs/sources/img/installation-plugins-apps.png b/docs/sources/img/installation-plugins-apps.png index c931d73..ec3ca67 100644 --- a/docs/sources/img/installation-plugins-apps.png +++ b/docs/sources/img/installation-plugins-apps.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fcaa6263d827d3344eb88fec28b1b3b084856af80174551e8c0725c3fd99e982 -size 132477 +oid sha256:ef6860cefddd6ead2fe97d1ff3ebaa14320e8b0366fc094c13a47a6502e62f42 +size 131496 From 1af072fd0da3ce726bcb9fb4c69d2c08dea9a320 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Tue, 12 Apr 2016 10:51:07 +0300 Subject: [PATCH 4/4] Added explanations for HTTP settings. --- docs/sources/installation/configuration.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/docs/sources/installation/configuration.md b/docs/sources/installation/configuration.md index 9ef80e3..3f16aa7 100644 --- a/docs/sources/installation/configuration.md +++ b/docs/sources/installation/configuration.md @@ -17,14 +17,20 @@ select _Zabbix_ from dropdown list. ![Configure Zabbix data source](../img/installation-datasource_config.png) -### Http settings +### HTTP settings - **Url**: set Zabbix API url (full path with `api_jsonrpc.php`). -- **Access**: can be either _proxy_ or _direct_. +- **Access**: + - **Proxy**: access via Grafana backend + - **Direct**: access from browser. - **Http Auth**: configure if you use proxy authentication. - **Basic Auth**: - **With Credentials**: +Proxy access means that the Grafana backend will proxy all requests from the browser, and send them on to the Data Source. This is useful because it can eliminate CORS (Cross Origin Site Resource) issues, as well as eliminate the need to disseminate authentication details to the Data Source to the browser. + +Direct access is still supported because in some cases it may be useful to access a Data Source directly depending on the use case and topology of Grafana, the user, and the Data Source. + ### Zabbix API details - **User** and **Password**: setup login for access to Zabbix API. Also check user's permissions