Commit Graph

290 Commits

Author SHA1 Message Date
Alexander Zobnin
14737737d9 Merge pull request #140 from jangaraj/master
README info about Dockerized Grafana with Zabbix plugin
2016-01-21 19:24:26 +04:00
Jan Garaj
56a2af99a8 Info about Dockerized Grafana with Zabbix plugin 2016-01-09 17:26:30 +00:00
Alexander Zobnin
b846d0ec28 Update README.md 2015-11-20 23:29:17 +03:00
Alexander Zobnin
24639e58cb Fixed UI styles in query.options.html. 2015-11-06 21:10:38 +03:00
Alexander Zobnin
eb964d9e2a Update README.md 2015-11-06 20:56:10 +03:00
Alexander Zobnin
cc6c02cdec Fixed #109 - Annotations editor don't work in 2.5. 2015-11-06 20:53:43 +03:00
Alexander Zobnin
73a1e85372 Merge branch 'master' into develop 2015-11-06 19:47:57 +03:00
Alexander Zobnin
0f0e851d80 Merge branch 'master' of github.com:alexanderzobnin/grafana-zabbix 2015-10-31 20:19:13 +03:00
Alexander Zobnin
f9df0ee18e Merge branch 'develop' 2015-10-31 20:16:13 +03:00
Alexander Zobnin
b7396b9af5 Removed deprecated settings from plugin.json. All configuration now at datasource edit page. 2015-10-31 20:14:19 +03:00
Alexander Zobnin
1cfb8ddceb Merge branch 'fix-query_editor_in_2.5' into develop 2015-10-31 19:25:30 +03:00
Alexander Zobnin
4314c3f1e3 Merge pull request #91 from volter/fix-query_editor_in_2.5
Remove invalid comma from JSON structure
2015-10-05 22:46:25 +03:00
Volker Fröhlich
566bad624a Remove invalid comma from JSON structure 2015-10-05 17:41:25 +02:00
Alexander Zobnin
b98526ec2a Merge pull request #85 from Sotfo/fix-query_editor_in_2.5
path fix & use dateMath instead of kbn
2015-09-26 17:46:34 +03:00
鲁晓敏
c3c3791104 delete useless query and annotations config 2015-09-24 10:34:25 +08:00
鲁晓敏
536dc237fb path fix & use dateMath instead of kbn 2015-09-23 15:35:36 +08:00
Alexander Zobnin
c20d91018f iss #73 - fix query editor initializing. 2015-09-22 21:32:51 +03:00
Alexander Zobnin
76c08e6006 iss #73 - UI fixes: target letters and datasource name in mixed mode. 2015-09-22 21:31:33 +03:00
Alexander Zobnin
d9dea1e825 iss #73 - start to fixing query editor. 2015-09-22 17:36:31 +03:00
Alexander Zobnin
144e27d475 Update README.md 2015-09-17 21:58:49 +03:00
Alexander Zobnin
51f92079f0 Merge branch 'develop' 2015-09-09 14:29:19 +03:00
Alexander Zobnin
693cbe1d61 Added connection error handling to testDatasource() method. 2015-08-19 14:26:58 +03:00
Alexander Zobnin
b5bd3fffe5 Resolved #71 - Text metrics support for singlestat panel. 2015-08-18 23:31:19 +03:00
Alexander Zobnin
1f6ecd5aed iss #71 - Implemented text metrics query. 2015-08-18 23:24:15 +03:00
Alexander Zobnin
9ec32b26e8 iss #71 - Added text metrics editor. 2015-08-18 20:39:01 +03:00
Alexander Zobnin
5961978828 Merge branch 'feature-improve_annotations' into develop 2015-08-16 15:10:12 +03:00
Alexander Zobnin
a27f3fa165 iss #61 - Redesign annotations editor. 2015-08-16 15:08:13 +03:00
Alexander Zobnin
3793de5ed9 iss #61 - Support templated variables in annotations. 2015-08-16 13:48:02 +03:00
Alexander Zobnin
ad83ecfe69 iss #61 - Improved annotations editor. Able to specify Group and Host for triggers search. 2015-08-15 22:32:14 +03:00
Alexander Zobnin
d6300a47b0 Merge branch 'feature-aggregation' into develop 2015-08-14 21:24:49 +03:00
Alexander Zobnin
bf07637fc1 Resolved #69 - Able to select min, max or avg value for downsampling. 2015-08-14 21:24:35 +03:00
Alexander Zobnin
53f20fe417 Merge branch 'develop' into feature-aggregation 2015-08-14 20:20:53 +03:00
Alexander Zobnin
877cadecae Fixed #68 - Option "Use trends from" at configuration page don't work 2015-08-14 19:44:45 +03:00
Alexander Zobnin
cda2636ad7 Merge pull request #67 from jbfavre/feat_scoped_vars_for_zabbix_datasource
Enable scoped variables in Zabbix datasource
2015-08-12 23:22:03 +03:00
Jean Baptiste Favre
3c7b016012 Enable scoped variables in Zabbix datasource 2015-08-12 22:11:56 +02:00
Alexander Zobnin
221d42c172 iss #60 - Added processing functions for downsampling: min, max, avg. 2015-08-11 22:55:45 +03:00
Alexander Zobnin
12a3a2b6b0 Modify annotations editor. 2015-08-06 22:36:14 +03:00
Alexander Zobnin
6d4f63aadc Update README.md 2015-07-30 13:07:19 +03:00
Alexander Zobnin
ffa57f11de Update README.md 2015-07-30 12:27:33 +03:00
Alexander Zobnin
3dc231af5c Update README.md 2015-07-30 12:06:44 +03:00
Alexander Zobnin
411eaa38e5 Update README.md 2015-07-30 12:06:19 +03:00
Alexander Zobnin
7c9c27e15d Update README.md 2015-07-30 12:04:47 +03:00
Alexander Zobnin
9bc6089b83 Update README.md 2015-07-30 12:01:45 +03:00
Alexander Zobnin
377ea8281f Resolved #19 - Zabbix IT services metrics. 2015-07-27 19:01:15 +03:00
Alexander Zobnin
4ea5c2ac0c iss #19 - Add help info for IT services mode selection. 2015-07-27 18:54:38 +03:00
Alexander Zobnin
5b5f200a51 Max data points to uppercase. 2015-07-27 18:47:43 +03:00
Alexander Zobnin
b61e715d6a iss #19 - Fix panel update when IT service property changed. 2015-07-27 18:23:12 +03:00
Alexander Zobnin
126e50a171 iss #19 - Add help info for IT service properties. 2015-07-27 18:20:28 +03:00
Alexander Zobnin
72478c0bc6 iss #19 - Rewrite query editor switching for more scalability. 2015-07-27 17:49:30 +03:00
Alexander Zobnin
fd67ed6194 iss #19 - Added divider for editor mode in menu. 2015-07-27 17:30:54 +03:00