From 42b30d511c56fc7875c3c91830a5cda11a71d019 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Wed, 6 May 2015 13:54:56 +0300 Subject: [PATCH 01/21] Update README.md --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index c02e1c2..e3ed8bc 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,10 @@ # grafana-zabbix Zabbix API datasource for Grafana dashboard + +Display your Zabbix data directly in Grafana dashboards + +![grafana - zabbix datasource](https://cloud.githubusercontent.com/assets/4932851/7454206/34bf9f8c-f27a-11e4-8e96-a73829f188c4.png) + +Useful metric editor with host group and application filtering + +![2015-05-02 15-52-53](https://cloud.githubusercontent.com/assets/4932851/7441162/4f6af788-f0e4-11e4-887b-34d987d00c40.png) From 20eb74f64ef19b939a7048784f41b1965db48fad Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Thu, 7 May 2015 20:48:17 +0300 Subject: [PATCH 02/21] Update README.md - add link to releases. --- .gitignore | 2 ++ README.md | 35 ++++++++++++++++++++++++++++++++--- 2 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0e379c5 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +*.sublime-project +*.sublime-workspace diff --git a/README.md b/README.md index e3ed8bc..9622bb6 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,37 @@ Zabbix API datasource for Grafana dashboard Display your Zabbix data directly in Grafana dashboards -![grafana - zabbix datasource](https://cloud.githubusercontent.com/assets/4932851/7454206/34bf9f8c-f27a-11e4-8e96-a73829f188c4.png) - Useful metric editor with host group and application filtering -![2015-05-02 15-52-53](https://cloud.githubusercontent.com/assets/4932851/7441162/4f6af788-f0e4-11e4-887b-34d987d00c40.png) +![grafana - zabbix datasource](https://cloud.githubusercontent.com/assets/4932851/7441162/4f6af788-f0e4-11e4-887b-34d987d00c40.png) + +## Installation + +### Grafana 1.9.x + +Download [latest release](https://github.com/alexanderzobnin/grafana-zabbix/releases) and unpack `zabbix` directory into `/plugins/datasource/`. Then edit Grafana config.js: + * Add dependencies + + ``` + plugins: { + panels: [], + dependencies: ['datasource/zabbix/datasource', 'datasource/zabbix/queryCtrl'], + } + ``` + * Add datasource and setup your Zabbix API url, username and password + + ``` + datasources: { + ... + }, + zabbix: { + type: 'ZabbixAPIDatasource', + url: 'http://www.zabbix.org/zabbix/api_jsonrpc.php', + username: 'guest', + password: '' + } + }, + ``` + +### Grafana 2.0.x +Now in development. \ No newline at end of file From 24fbff3c55bf5f24348c2ae84e39c05818911c8d Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Thu, 7 May 2015 20:48:17 +0300 Subject: [PATCH 03/21] Update README.md - add link to releases. --- .gitignore | 2 ++ README.md | 39 ++++++++++++++++++++++++++++++++++----- 2 files changed, 36 insertions(+), 5 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0e379c5 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +*.sublime-project +*.sublime-workspace diff --git a/README.md b/README.md index e3ed8bc..d47adeb 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,39 @@ # grafana-zabbix -Zabbix API datasource for Grafana dashboard -Display your Zabbix data directly in Grafana dashboards +#### Zabbix API datasource for Grafana dashboard -![grafana - zabbix datasource](https://cloud.githubusercontent.com/assets/4932851/7454206/34bf9f8c-f27a-11e4-8e96-a73829f188c4.png) +Display your Zabbix data directly in Grafana dashboards! +Useful metric editor with host group and application filtering: -Useful metric editor with host group and application filtering +![grafana - zabbix datasource](https://cloud.githubusercontent.com/assets/4932851/7441162/4f6af788-f0e4-11e4-887b-34d987d00c40.png) -![2015-05-02 15-52-53](https://cloud.githubusercontent.com/assets/4932851/7441162/4f6af788-f0e4-11e4-887b-34d987d00c40.png) +## Installation + +### Grafana 1.9.x + +Download [latest release](https://github.com/alexanderzobnin/grafana-zabbix/releases) and unpack `zabbix` directory into `/plugins/datasource/`. Then edit Grafana config.js: + * Add dependencies + + ``` + plugins: { + panels: [], + dependencies: ['datasource/zabbix/datasource', 'datasource/zabbix/queryCtrl'], + } + ``` + * Add datasource and setup your Zabbix API url, username and password + + ``` + datasources: { + ... + }, + zabbix: { + type: 'ZabbixAPIDatasource', + url: 'http://www.zabbix.org/zabbix/api_jsonrpc.php', + username: 'guest', + password: '' + } + }, + ``` + +### Grafana 2.0.x +Now in development. \ No newline at end of file From 91f2d147ea86c350a903deebbfc82bbe20ebab69 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Tue, 12 May 2015 17:51:29 +0300 Subject: [PATCH 04/21] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index eaca845..2450443 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Useful metric editor with host group and application filtering: ### Grafana 1.9.x -Download [latest release](https://github.com/alexanderzobnin/grafana-zabbix/releases) and unpack `zabbix` directory into `/plugins/datasource/`. Then edit Grafana config.js: +Download [latest release](https://github.com/alexanderzobnin/grafana-zabbix/releases/latest) and unpack `zabbix` directory into `/plugins/datasource/`. Then edit Grafana config.js: * Add dependencies ``` From 9a52a002b1faf6686344e4798000fef63c01480b Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Sun, 17 May 2015 10:14:10 +0300 Subject: [PATCH 05/21] Update README.md --- README.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 3b2d7db..3ba1aea 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,12 @@ # grafana-zabbix -#### Zabbix API datasource for Grafana dashboard +## Zabbix API datasource for Grafana dashboard Display your Zabbix data directly in Grafana dashboards! -Useful metric editor with host group and application filtering: ![alt tag](https://cloud.githubusercontent.com/assets/4932851/7454206/34bf9f8c-f27a-11e4-8e96-a73829f188c4.png) + +Useful metric editor with host group and application filtering: + ![alt tag](https://cloud.githubusercontent.com/assets/4932851/7441162/4f6af788-f0e4-11e4-887b-34d987d00c40.png) @@ -12,7 +14,7 @@ Useful metric editor with host group and application filtering: ### Grafana 1.9.x -Download latest release and unpack into `/plugins/datasource/`. Then edit Grafana config.js: +Download latest 1.x.x release and unpack into `/plugins/datasource/`. Then edit Grafana config.js: * Add dependencies ``` @@ -37,7 +39,7 @@ Download latest release and unpack into `/plugins/dat ``` ### Grafana 2.0.x -Download source code and put `zabbix` directory into `/public/app/plugins/datasource/`. +Download source code from master branch and put `zabbix` directory into `/public/app/plugins/datasource/`. * Edit plugin.json (located in `zabbix` directory) and set your `username` and `password` ``` From e49c0d2fb4a9b1b146113fd21e9ad647b4b35152 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Mon, 18 May 2015 12:55:21 +0300 Subject: [PATCH 06/21] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 3ba1aea..7a8cf95 100644 --- a/README.md +++ b/README.md @@ -69,3 +69,5 @@ Download source code from master branch and put `zabbix` directory into ` Date: Wed, 20 May 2015 00:54:26 +0300 Subject: [PATCH 07/21] Fix cross-domain requests. --- README.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/README.md b/README.md index 7a8cf95..2771124 100644 --- a/README.md +++ b/README.md @@ -71,3 +71,23 @@ Download source code from master branch and put `zabbix` directory into ` Date: Wed, 20 May 2015 00:57:51 +0300 Subject: [PATCH 08/21] Fix cross-domain requests. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2771124..63c4602 100644 --- a/README.md +++ b/README.md @@ -90,4 +90,4 @@ before require_once dirname(__FILE__).'/include/func.inc.php'; require_once dirname(__FILE__).'/include/classes/core/CHttpRequest.php'; ``` -[Full fix listing](https://gist.github.com/alexanderzobnin/f2348f318d7a93466a0c) +See [full listing](https://gist.github.com/alexanderzobnin/f2348f318d7a93466a0c). From 22d4120d118ccc1d791b9416be91bcd1edbca73f Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Wed, 20 May 2015 01:04:26 +0300 Subject: [PATCH 09/21] Fix cross-domain requests. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 63c4602..5a4b1ff 100644 --- a/README.md +++ b/README.md @@ -72,7 +72,7 @@ Download source code from master branch and put `zabbix` directory into ` Date: Wed, 20 May 2015 01:11:01 +0300 Subject: [PATCH 10/21] How to fix cross-domain requests. --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5a4b1ff..1d8f23a 100644 --- a/README.md +++ b/README.md @@ -90,4 +90,5 @@ before require_once dirname(__FILE__).'/include/func.inc.php'; require_once dirname(__FILE__).'/include/classes/core/CHttpRequest.php'; ``` -See [full listing](https://gist.github.com/alexanderzobnin/f2348f318d7a93466a0c). +[Full fix listing](https://gist.github.com/alexanderzobnin/f2348f318d7a93466a0c). +For more info see zabbix issues [ZBXNEXT-1377](https://support.zabbix.com/browse/ZBXNEXT-1377) and [ZBX-8459](https://support.zabbix.com/browse/ZBX-8459). From 6650fc54b12a5e928430403e564870e4619ba37b Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Wed, 20 May 2015 01:24:34 +0300 Subject: [PATCH 11/21] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 1d8f23a..6b2674c 100644 --- a/README.md +++ b/README.md @@ -92,3 +92,6 @@ require_once dirname(__FILE__).'/include/classes/core/CHttpRequest.php'; ``` [Full fix listing](https://gist.github.com/alexanderzobnin/f2348f318d7a93466a0c). For more info see zabbix issues [ZBXNEXT-1377](https://support.zabbix.com/browse/ZBXNEXT-1377) and [ZBX-8459](https://support.zabbix.com/browse/ZBX-8459). + +### Troubleshooting +See [Grafana troubleshooting](http://docs.grafana.org/installation/troubleshooting/) for general connection issues. If you have a problem with Zabbix datasource, you should open a [support issue](https://github.com/alexanderzobnin/grafana-zabbix/issues). Before you do that please search the existing closed or open issues. From 109ba0ef6cbcdc8104f693434305f21f5bc8df31 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Wed, 20 May 2015 09:54:19 +0300 Subject: [PATCH 12/21] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6b2674c..6c23dcb 100644 --- a/README.md +++ b/README.md @@ -93,5 +93,5 @@ require_once dirname(__FILE__).'/include/classes/core/CHttpRequest.php'; [Full fix listing](https://gist.github.com/alexanderzobnin/f2348f318d7a93466a0c). For more info see zabbix issues [ZBXNEXT-1377](https://support.zabbix.com/browse/ZBXNEXT-1377) and [ZBX-8459](https://support.zabbix.com/browse/ZBX-8459). -### Troubleshooting +## Troubleshooting See [Grafana troubleshooting](http://docs.grafana.org/installation/troubleshooting/) for general connection issues. If you have a problem with Zabbix datasource, you should open a [support issue](https://github.com/alexanderzobnin/grafana-zabbix/issues). Before you do that please search the existing closed or open issues. From 338c600001afa19265d47eebcda0442499263f9b Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Thu, 21 May 2015 18:38:28 +0300 Subject: [PATCH 13/21] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6c23dcb..8a3f281 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # grafana-zabbix ## Zabbix API datasource for Grafana dashboard -Display your Zabbix data directly in Grafana dashboards! +Display your Zabbix data directly in [Grafana](http://grafana.org) dashboards! ![alt tag](https://cloud.githubusercontent.com/assets/4932851/7454206/34bf9f8c-f27a-11e4-8e96-a73829f188c4.png) From 654b46d8ea8adb58f03899f6f0e35dcb2098282a Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Fri, 22 May 2015 01:11:54 +0300 Subject: [PATCH 14/21] Create Roadmap.md --- Roadmap.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 Roadmap.md diff --git a/Roadmap.md b/Roadmap.md new file mode 100644 index 0000000..dcae1b5 --- /dev/null +++ b/Roadmap.md @@ -0,0 +1,9 @@ +Development roadmap +=== + +Features +--- +- [ ] Annotations +- [ ] Zabbix trends support +- [ ] Templated dashboards support +- [ ] IT services support From ad1692a0cdb0d4c4b1a8a740fc2f450af00a591c Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Sun, 31 May 2015 14:21:34 +0300 Subject: [PATCH 15/21] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8a3f281..329e14f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# grafana-zabbix +# Grafana-Zabbix ## Zabbix API datasource for Grafana dashboard Display your Zabbix data directly in [Grafana](http://grafana.org) dashboards! From 00fd34002cb71a1e8b931d015563363c90a07f72 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Sun, 31 May 2015 17:38:47 +0300 Subject: [PATCH 16/21] Update README.md --- README.md | 29 ++++------------------------- 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index 329e14f..f753b00 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,9 @@ # Grafana-Zabbix ## Zabbix API datasource for Grafana dashboard -Display your Zabbix data directly in [Grafana](http://grafana.org) dashboards! +Read more in Grafana-Zabbix [wiki](https://github.com/alexanderzobnin/grafana-zabbix/wiki). + +Display your Zabbix data directly in [Grafana](http://grafana.org) dashboards! ![alt tag](https://cloud.githubusercontent.com/assets/4932851/7454206/34bf9f8c-f27a-11e4-8e96-a73829f188c4.png) @@ -13,31 +15,8 @@ Useful metric editor with host group and application filtering: ## Installation ### Grafana 1.9.x +See [grafana-1.9](../../tree/grafana-1.9) branch or Grafana-Zabbix [wiki](https://github.com/alexanderzobnin/grafana-zabbix/wiki). -Download latest 1.x.x release and unpack into `/plugins/datasource/`. Then edit Grafana config.js: - * Add dependencies - - ``` - plugins: { - panels: [], - dependencies: ['datasource/zabbix/datasource', 'datasource/zabbix/queryCtrl'], - } - ``` - * Add datasource and setup your Zabbix API url, username and password - - ``` - datasources: { - ... - }, - zabbix: { - type: 'ZabbixAPIDatasource', - url: 'http://www.zabbix.org/zabbix/api_jsonrpc.php', - username: 'guest', - password: '' - } - }, - ``` - ### Grafana 2.0.x Download source code from master branch and put `zabbix` directory into `/public/app/plugins/datasource/`. * Edit plugin.json (located in `zabbix` directory) and set your `username` and `password` From 78a06a7f531f5f465df5834ab5f640985a8c2ea4 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Sun, 31 May 2015 18:11:20 +0300 Subject: [PATCH 17/21] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f753b00..1241abe 100644 --- a/README.md +++ b/README.md @@ -5,11 +5,11 @@ Read more in Grafana-Zabbix [wiki](https://github.com/alexanderzobnin/grafana-za Display your Zabbix data directly in [Grafana](http://grafana.org) dashboards! -![alt tag](https://cloud.githubusercontent.com/assets/4932851/7454206/34bf9f8c-f27a-11e4-8e96-a73829f188c4.png) +![2015-05-31 17-51-00 grafana - zabbix datasource - google chrome](https://cloud.githubusercontent.com/assets/4932851/7902354/fdf66368-07bf-11e5-991d-1e9892b2d0b0.png) Useful metric editor with host group and application filtering: -![alt tag](https://cloud.githubusercontent.com/assets/4932851/7441162/4f6af788-f0e4-11e4-887b-34d987d00c40.png) +![2015-05-31 17-53-23](https://cloud.githubusercontent.com/assets/4932851/7902360/156a9366-07c0-11e5-905b-4c21b52f1f44.png) ## Installation From e1e6f647016bafe365570ffc0f6d687e840b32c7 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Wed, 3 Jun 2015 21:06:02 +0300 Subject: [PATCH 18/21] Update README.md --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 1241abe..805404c 100644 --- a/README.md +++ b/README.md @@ -48,8 +48,7 @@ Download source code from master branch and put `zabbix` directory into ` Date: Tue, 9 Jun 2015 15:30:58 +0300 Subject: [PATCH 19/21] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 805404c..de6c868 100644 --- a/README.md +++ b/README.md @@ -71,5 +71,8 @@ require_once dirname(__FILE__).'/include/classes/core/CHttpRequest.php'; [Full fix listing](https://gist.github.com/alexanderzobnin/f2348f318d7a93466a0c). For more info see zabbix issues [ZBXNEXT-1377](https://support.zabbix.com/browse/ZBXNEXT-1377) and [ZBX-8459](https://support.zabbix.com/browse/ZBX-8459). +#### Note about browser cache +After updating plugin, clear browser cache. See details for [Chrome](https://support.google.com/chrome/answer/95582), [Firefox](https://support.mozilla.org/en-US/kb/how-clear-firefox-cache). You need to clear cache only, not cookies, history and other data. + ## Troubleshooting See [Grafana troubleshooting](http://docs.grafana.org/installation/troubleshooting/) for general connection issues. If you have a problem with Zabbix datasource, you should open a [support issue](https://github.com/alexanderzobnin/grafana-zabbix/issues). Before you do that please search the existing closed or open issues. From 301bafe532bb7d9f3a880b2edef69000d43450f4 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Tue, 9 Jun 2015 15:33:05 +0300 Subject: [PATCH 20/21] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index de6c868..8d3174e 100644 --- a/README.md +++ b/README.md @@ -72,7 +72,7 @@ require_once dirname(__FILE__).'/include/classes/core/CHttpRequest.php'; For more info see zabbix issues [ZBXNEXT-1377](https://support.zabbix.com/browse/ZBXNEXT-1377) and [ZBX-8459](https://support.zabbix.com/browse/ZBX-8459). #### Note about browser cache -After updating plugin, clear browser cache. See details for [Chrome](https://support.google.com/chrome/answer/95582), [Firefox](https://support.mozilla.org/en-US/kb/how-clear-firefox-cache). You need to clear cache only, not cookies, history and other data. +After updating plugin, clear browser cache and reload application page. See details for [Chrome](https://support.google.com/chrome/answer/95582), [Firefox](https://support.mozilla.org/en-US/kb/how-clear-firefox-cache). You need to clear cache only, not cookies, history and other data. ## Troubleshooting See [Grafana troubleshooting](http://docs.grafana.org/installation/troubleshooting/) for general connection issues. If you have a problem with Zabbix datasource, you should open a [support issue](https://github.com/alexanderzobnin/grafana-zabbix/issues). Before you do that please search the existing closed or open issues. From 7c757ddfff44e0db097f11be314198e0cd12ef39 Mon Sep 17 00:00:00 2001 From: alexanderzobnin Date: Thu, 18 Jun 2015 16:30:33 +0300 Subject: [PATCH 21/21] Fix #25 - Authorization with zabbix is not initiated. --- zabbix/datasource.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/zabbix/datasource.js b/zabbix/datasource.js index d5f601f..bb3d3ed 100644 --- a/zabbix/datasource.js +++ b/zabbix/datasource.js @@ -225,7 +225,8 @@ function (angular, _, kbn) { // Handle auth errors if (response.data.error.data == "Session terminated, re-login, please." || - response.data.error.data == 'Not authorised.') { + response.data.error.data == "Not authorised." || + response.data.error.data == "Not authorized") { return self.performZabbixAPILogin().then(function (response) { self.auth = response; return self.performZabbixAPIRequest(method, params);