Torkel Ödegaard
|
d27a0f5b0c
|
ux(): small ux fix for inspector modal
|
2016-02-29 14:35:55 +01:00 |
|
Torkel Ödegaard
|
97c27668bc
|
fix(): fix failing build and removed panel icon from edit mode tabs
|
2016-02-29 14:15:46 +01:00 |
|
Torkel Ödegaard
|
d3c022f89e
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-02-29 13:43:18 +01:00 |
|
Torkel Ödegaard
|
3624587f08
|
misc(): added elasticsearch.yml config file to docker test env
|
2016-02-29 13:42:55 +01:00 |
|
Torkel Ödegaard
|
56c080417a
|
fix(logging): only log to xorm.log when in dev mode, fixes #4182
|
2016-02-29 13:42:07 +01:00 |
|
Torkel Ödegaard
|
da4e3784e9
|
Merge pull request #4190 from raintank/issue4185
fix app->plugin renamin in more places
|
2016-02-29 12:59:31 +01:00 |
|
Anthony Woods
|
35f7a71f9a
|
fix app->plugin renamin in more places
|
2016-02-29 19:54:36 +08:00 |
|
Torkel Ödegaard
|
bf22b4cbfe
|
Merge pull request #4189 from raintank/issue4185
correct path for app page links.
|
2016-02-29 12:50:13 +01:00 |
|
Anthony Woods
|
4741152f05
|
correct path for app page links.
|
2016-02-29 19:37:35 +08:00 |
|
bergquist
|
fb33cf4576
|
docs(changelog): add info about templated timeshift
|
2016-02-29 11:14:24 +01:00 |
|
Carl Bergquist
|
1fb38abf6b
|
Merge pull request #4063 from mtanda/timeshift_template
timeFrom and timeShift templating
|
2016-02-29 11:11:45 +01:00 |
|
bergquist
|
4299feee37
|
feat(templates): collapse submenu if none visable templates
|
2016-02-29 10:49:11 +01:00 |
|
bergquist
|
86b1906798
|
fix(templating): make checkboxes a new row
|
2016-02-29 10:29:40 +01:00 |
|
bergquist
|
18a0a85df6
|
Merge branch 'hide_template' of https://github.com/mtanda/grafana into mtanda-hide_template
|
2016-02-29 10:20:44 +01:00 |
|
bergquist
|
05ba32b552
|
feat(datasource): add type to datasource list
closes #4183
|
2016-02-29 10:18:50 +01:00 |
|
bergquist
|
c30c12d369
|
fix(single_stat): rounding bug in value => text
|
2016-02-29 10:05:41 +01:00 |
|
Mitsuhiro Tanda
|
09dfaf9875
|
timeFrom and timeShift templating
|
2016-02-29 17:53:41 +09:00 |
|
Torkel Ödegaard
|
ae604b6289
|
ux(annotations): minor polish to annotations editor
|
2016-02-29 09:50:40 +01:00 |
|
Anthony Woods
|
fc8146b53d
|
Merge pull request #4187 from raintank/issue4185
replace 'app' with 'plugins' where needed.
|
2016-02-29 15:59:30 +08:00 |
|
Anthony Woods
|
641845519d
|
replace 'app' with 'plugins' where needed.
|
2016-02-29 15:50:02 +08:00 |
|
Carl Bergquist
|
b32809d03f
|
Merge pull request #4105 from benrubson/issue3982-2
Add some more steps for template auto interval
|
2016-02-29 08:49:27 +01:00 |
|
Carl Bergquist
|
02b2c7482a
|
Merge pull request #4138 from utkarshcmu/tsdb-refac2
Opentsdb 2.2 support without breaking 2.1
|
2016-02-29 06:55:41 +01:00 |
|
Torkel Ödegaard
|
6fd0d5e267
|
Merge pull request #4178 from mtanda/prometheus_template_label
(prometheus) fix label_values() templating
|
2016-02-28 16:40:37 +01:00 |
|
benrubson
|
a4ecacb9b5
|
rebase against master
|
2016-02-28 15:32:34 +01:00 |
|
Torkel Ödegaard
|
b9e0fcdf85
|
Merge pull request #4103 from benrubson/issue3982
Add a minimum value option for template auto interval
|
2016-02-28 15:11:33 +01:00 |
|
utkarshcmu
|
18c57ea230
|
Made opentsdb query_ctrl robust
|
2016-02-28 01:50:50 -08:00 |
|
utkarshcmu
|
a883424d25
|
smooth upgrade from Grafana 2.6 to 3.0
|
2016-02-28 01:50:11 -08:00 |
|
utkarshcmu
|
7fa170cee9
|
Fixed the UI as per new UX convention
|
2016-02-28 01:50:10 -08:00 |
|
utkarshcmu
|
8925329950
|
Added default opentsdb version to datasource
|
2016-02-28 01:50:10 -08:00 |
|
utkarshcmu
|
4aa5dab62d
|
Added query ctrl tests for Opentsdb
|
2016-02-28 01:50:10 -08:00 |
|
utkarshcmu
|
936dd2eaaa
|
Added relevant docs and changes
|
2016-02-28 01:50:10 -08:00 |
|
utkarshcmu
|
09e80f0390
|
Labels fixed in legend for Filters
|
2016-02-28 01:49:34 -08:00 |
|
utkarshcmu
|
63dfa303e5
|
Datasource working with filters after fixing bugs
|
2016-02-28 01:49:34 -08:00 |
|
utkarshcmu
|
599b1eb689
|
Smooth transition from opentsdb 2.1 to 2.2
|
2016-02-28 01:49:34 -08:00 |
|
utkarshcmu
|
4a636b6da7
|
add, edit, remove filters functionality implemented
|
2016-02-28 01:49:34 -08:00 |
|
utkarshcmu
|
d92172f50c
|
Added Filters UI
|
2016-02-28 01:49:34 -08:00 |
|
utkarshcmu
|
2623240635
|
Fill Policy visible only in <=2.2
|
2016-02-28 01:49:34 -08:00 |
|
utkarshcmu
|
908e8577bb
|
Removed unused code from datasource.js
|
2016-02-28 01:49:33 -08:00 |
|
utkarshcmu
|
f90fda8e6f
|
Tracking opentsdb version in opentsdb config
|
2016-02-28 01:49:33 -08:00 |
|
benrubson
|
f4037667fa
|
rebase against master
|
2016-02-28 10:43:11 +01:00 |
|
benrubson
|
a1fd12ef42
|
rebase against master
|
2016-02-28 10:05:12 +01:00 |
|
Torkel Ödegaard
|
517721eaa4
|
Merge pull request #4108 from benrubson/issue3982-3
Make auto interval calculation more accurate
|
2016-02-28 07:58:48 +01:00 |
|
Torkel Ödegaard
|
b56a2c14bb
|
Merge pull request #4161 from godfreyhe/fix_bug_getAggregators
fix bug: can't get the aggregators from opentsdb server
|
2016-02-28 07:52:02 +01:00 |
|
Torkel Ödegaard
|
62d703fdf7
|
fix(snapshots): fixed share nav link in snapshots, fixes #4172
|
2016-02-28 07:39:24 +01:00 |
|
Torkel Ödegaard
|
f29899e566
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-02-28 07:29:09 +01:00 |
|
Torkel Ödegaard
|
9cebcc45c1
|
fix(unsaved changes): fix for unsaved changes warning when changing time range to relative rime range, #4176
|
2016-02-28 07:28:55 +01:00 |
|
Mitsuhiro Tanda
|
3125177e5c
|
(prometheus) fix label_values() templating
|
2016-02-28 13:33:29 +09:00 |
|
godfreyhe
|
7810413699
|
use ES6 arrow function instead of self var on getAggregators
|
2016-02-28 11:48:54 +08:00 |
|
Torkel Ödegaard
|
261db14c4b
|
Merge pull request #4169 from utkarshcmu/nav-fix
Playlist nav fix
|
2016-02-27 09:49:29 +01:00 |
|
utkarshcmu
|
16783bff16
|
Playlist nav fix
|
2016-02-27 00:40:39 -08:00 |
|