Misthios/grafana-zabbix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
2,351 Commits 1 Branch 0 Tags
88ec24c94c0bc5f493febac6740eda6ca7716b2e
Commit Graph

2351 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Zobnin
84dd066aac Merge branch 'develop' into panel-triggers 
Conflicts:
	plugins/datasource-zabbix/datasource.js
 2016-01-09 21:42:31 +03:00
Jan Garaj
56a2af99a8 Info about Dockerized Grafana with Zabbix plugin 2016-01-09 17:26:30 +00:00
Alexander Zobnin
6118147623 Fixed "e is undefined" error. 2015-12-28 22:28:36 +03:00
Alexander Zobnin
c06a9082c2 Merge branch 'volter-new' into develop 2015-12-28 22:19:08 +03:00
Alexander Zobnin
e6c7046d07 Issue #133 - fixed time range parse. 2015-12-28 22:07:16 +03:00
Alexander Zobnin
7aa38e22db Fixed #133 - Annotations don't work at Grafana 2.6. 2015-12-28 14:15:21 +03:00
Alexander Zobnin
acedb806d9 Issue #72 - changed plugin.json files and fixed templates path 
for new plugin model. Can load plugins from any place.
 2015-12-28 14:00:03 +03:00
Alexander Zobnin
72ad872397 Move plugins to separate directories for support Grafana 
external plugins model.
 2015-12-28 13:08:17 +03:00
Alexander Zobnin
e95c61608b Issue #72 - merge triggers panel from https://github.com/alexanderzobnin/grafana/tree/zbx-trigger_panel. 
Can used as plugin since Grafana 3.0.
 2015-12-26 23:04:53 +03:00
Volker Fröhlich
46d656d49e Add a severity and acknowledgement filter for annotations 
Add a severity filter, much like it is present in various
places in Zabbix, as well as a filter for the acknowledgement
status. This brings the interface closer to what is asked for
in https://support.zabbix.com/browse/ZBXNEXT-410
 2015-11-30 14:52:52 +01:00
Volker Fröhlich
9dac49a3dc Option to show hostname in annotation 
A new checkbox in the annotation configuration form allows
to prefix the hostname to the title used in the annotation.

This option is relevant for people not stating the hostname
in their triggers. Within Zabbix, the hostname would be shown
redundantly everywhere, except in notifications.
 2015-11-27 13:48:55 +01:00
Volker Fröhlich
2cab3d0de0 Adapt annotations prototypes to calling convention of 2.5.1 
From public/app/plugins/PLUGIN_CHANGES.md:

2.5.1
datasource annotationQuery changed. now single options parameter with:
- range
- rangeRaw
- annotation
 2015-11-27 11:31:20 +01: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
530a833844 iss #71 - Able to use regex for extracting a part of the text value. 2015-08-19 20:25:59 +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