From 9aee233ee804539fc7162ecc33d570b5543f058c Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Sat, 20 Jun 2015 08:57:01 +0300 Subject: [PATCH 1/5] Update README.md --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e409859..48879a3 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,10 @@ If you use patch for trends support ([ZBXNEXT-1193](https://support.zabbix.com/b "trendsFrom": "7d", ``` -`trendsFrom` option define period when switch to trends from history. +`trendsFrom` option define period when switch to trends from history. You can set the time in Grafana format: `7d` for 7 days or for example `2d` for 2 days. Valid time specificators are: +`h` - hours +`d` - days +`M` - mounths If you don't use trend patch, change `trends` to `false`: ``` From 7aef9dc571974e0f0bfa35c873c9be2854c534de Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Sat, 20 Jun 2015 09:41:34 +0300 Subject: [PATCH 2/5] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 48879a3..9595d22 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,9 @@ # Grafana-Zabbix + ## Zabbix API datasource for Grafana dashboard +[![Donate](https://cloud.githubusercontent.com/assets/4932851/8266299/465f88a8-1730-11e5-9d89-379edd81967a.png)](https://money.yandex.ru/embed/shop.xml?account=41001684402290&quickpay=shop&payment-type-choice=off&writer=seller&targets=Grafana-Zabbix&targets-hint=&default-sum=100&button-text=03&comment=on&hint=%D0%92%D0%B0%D1%88%D0%B8+%D0%BF%D0%BE%D0%B6%D0%B5%D0%BB%D0%B0%D0%BD%D0%B8%D1%8F&mail=on) + Read more in Grafana-Zabbix [wiki](https://github.com/alexanderzobnin/grafana-zabbix/wiki). Display your Zabbix data directly in [Grafana](http://grafana.org) dashboards! From d1d5b08ef7d1a11ba87fbc85c4a5736a594dd883 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Sat, 20 Jun 2015 09:47:14 +0300 Subject: [PATCH 3/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9595d22..eb9f519 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ## Zabbix API datasource for Grafana dashboard -[![Donate](https://cloud.githubusercontent.com/assets/4932851/8266299/465f88a8-1730-11e5-9d89-379edd81967a.png)](https://money.yandex.ru/embed/shop.xml?account=41001684402290&quickpay=shop&payment-type-choice=off&writer=seller&targets=Grafana-Zabbix&targets-hint=&default-sum=100&button-text=03&comment=on&hint=%D0%92%D0%B0%D1%88%D0%B8+%D0%BF%D0%BE%D0%B6%D0%B5%D0%BB%D0%B0%D0%BD%D0%B8%D1%8F&mail=on) +[![Donate](https://cloud.githubusercontent.com/assets/4932851/8266321/38511d84-1731-11e5-826b-7f29bbebfbd8.png)](https://money.yandex.ru/embed/shop.xml?account=41001684402290&quickpay=shop&payment-type-choice=off&writer=seller&targets=Grafana-Zabbix&targets-hint=&default-sum=100&button-text=03&comment=on&hint=%D0%92%D0%B0%D1%88%D0%B8+%D0%BF%D0%BE%D0%B6%D0%B5%D0%BB%D0%B0%D0%BD%D0%B8%D1%8F&mail=on) Read more in Grafana-Zabbix [wiki](https://github.com/alexanderzobnin/grafana-zabbix/wiki). From 5b48a4ef8adec3c55947b36a48419be1ee912558 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Sat, 20 Jun 2015 09:52:12 +0300 Subject: [PATCH 4/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index eb9f519..1d4d76b 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ## Zabbix API datasource for Grafana dashboard -[![Donate](https://cloud.githubusercontent.com/assets/4932851/8266321/38511d84-1731-11e5-826b-7f29bbebfbd8.png)](https://money.yandex.ru/embed/shop.xml?account=41001684402290&quickpay=shop&payment-type-choice=off&writer=seller&targets=Grafana-Zabbix&targets-hint=&default-sum=100&button-text=03&comment=on&hint=%D0%92%D0%B0%D1%88%D0%B8+%D0%BF%D0%BE%D0%B6%D0%B5%D0%BB%D0%B0%D0%BD%D0%B8%D1%8F&mail=on) +[![Donate](https://cloud.githubusercontent.com/assets/4932851/8266321/38511d84-1731-11e5-826b-7f29bbebfbd8.png)](https://money.yandex.ru/embed/shop.xml?account=41001684402290&quickpay=shop&payment-type-choice=on&writer=seller&targets=Grafana-Zabbix&targets-hint=&default-sum=100&button-text=04&comment=on&hint=Your+suggestions&mail=on&successURL=) Read more in Grafana-Zabbix [wiki](https://github.com/alexanderzobnin/grafana-zabbix/wiki). From 672688b0337059d6c2e666a6b26bd7706eb207e0 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Sat, 20 Jun 2015 17:28:43 +0300 Subject: [PATCH 5/5] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1d4d76b..24931f1 100644 --- a/README.md +++ b/README.md @@ -8,11 +8,11 @@ Read more in Grafana-Zabbix [wiki](https://github.com/alexanderzobnin/grafana-za Display your Zabbix data directly in [Grafana](http://grafana.org) dashboards! -![2015-05-31 17-51-00 grafana - zabbix datasource - google chrome](https://cloud.githubusercontent.com/assets/4932851/7902354/fdf66368-07bf-11e5-991d-1e9892b2d0b0.png) +![Dashboard](https://cloud.githubusercontent.com/assets/4932851/8267599/857563e6-1771-11e5-83da-6b18b54f624c.png) Useful metric editor with host group and application filtering: -![2015-05-31 17-53-23](https://cloud.githubusercontent.com/assets/4932851/7902360/156a9366-07c0-11e5-905b-4c21b52f1f44.png) +![Query editor](https://cloud.githubusercontent.com/assets/4932851/7902360/156a9366-07c0-11e5-905b-4c21b52f1f44.png) ## Installation