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
|
1f70b10b38
|
Some refactoring of annotationQuery() method.
|
2016-01-09 21:48:16 +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
|
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 |
|