Misthios/grafana-zabbix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
316 Commits 1 Branch 0 Tags
ca5d68a1c897b75de107d51409d6eee7a14a2290
Commit Graph

3 Commits

Author SHA1 Message Date
Alexander Zobnin
c7d30e03e4 Merge branch 'feature-text_metrics' into grafana-3.0 
Conflicts:
	zabbix/partials/query.editor.html
 2016-01-10 22:07:34 +03:00
Alexander Zobnin
84dd066aac Merge branch 'develop' into panel-triggers 
Conflicts:
	plugins/datasource-zabbix/datasource.js
 2016-01-09 21:42:31 +03:00
Alexander Zobnin
72ad872397 Move plugins to separate directories for support Grafana 
external plugins model.
 2015-12-28 13:08:17 +03:00