Carl Bergquist
1fb38abf6b
Merge pull request #4063 from mtanda/timeshift_template
...
timeFrom and timeShift templating
2016-02-29 11:11:45 +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
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
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
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
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
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
godfreyhe
8e7a127792
fix bug: can't get the aggregators from opentsdb server
2016-02-26 20:47:22 +08:00
bergquist
6afe2c4e9f
ux(influxdb): query options minor changes
2016-02-26 13:25:31 +01:00
bergquist
be69e2c02c
ux(influxdb): tight-form -> gf-form
2016-02-26 11:58:59 +01:00
Torkel Ödegaard
30f3b55baf
fix(prometheus): set default templating format to pipe
2016-02-25 10:26:07 +01:00
Torkel Ödegaard
f6c49daaa6
Merge branch 'master' of github.com:grafana/grafana
2016-02-24 19:33:08 +01:00
Torkel Ödegaard
22ae259cf5
ux(): varios tweaks and polish
2016-02-24 17:49:08 +01:00
bergquist
0525bf5d4e
ux(table): tight-form -> gf-form
2016-02-24 10:42:53 +01:00
bergquist
59d2fe8aa4
ux(dashlist_options): tight-form -> gf-form
2016-02-24 10:09:12 +01:00
Torkel Ödegaard
a11396c901
Merge branch 'annotations-v2'
2016-02-23 08:42:08 +01:00
Torkel Ödegaard
cd52c24e87
feat(annotations): more work on new annotations
2016-02-23 08:42:03 +01:00
Torkel Ödegaard
2e52008542
feat(annotations): updated editor, removed line color and icon size
2016-02-23 08:22:00 +01:00
Torkel Ödegaard
a6a5f393cc
feat(annotations): updated flot events lib and refactored it to use tether-drop lib
2016-02-23 08:09:56 +01:00
Carl Bergquist
f788c8cb37
Merge pull request #3632 from mtanda/cloudwatch_annotation_describe_alarms
...
(cloudwatch) multiple CloudWatch alarm annotation support
2016-02-23 07:41:10 +01:00
Torkel Ödegaard
fa5cf602f5
removed old popover and unused boostrap components
2016-02-22 18:56:35 +01:00
Torkel Ödegaard
c94659f552
ux(color popover): refactored color popover to use drop lib
2016-02-22 18:46:58 +01:00
Torkel Ödegaard
3f05b4bb1e
fix(annotations): updated annotations query editor
2016-02-22 14:54:19 +01:00
Torkel Ödegaard
9eabd956b7
ux(): tweak to help popover annimation and fixed pull-right state
2016-02-22 14:20:43 +01:00
Torkel Ödegaard
cb83c237f4
Merge branch 'master' of github.com:grafana/grafana
...
Conflicts:
public/sass/_grafana.scss
2016-02-22 12:00:57 +01:00
bergquist
f225bb0032
ux(annotations): migrate annotations editors to new form
2016-02-22 10:07:02 +01:00
Torkel Ödegaard
363f36dfae
ux(): tweaks
2016-02-21 15:21:01 +01:00
Torkel Ödegaard
ac45ccbad7
fix(panel): fixed text panel issue due to recent style changes, fixes #4095
2016-02-21 08:51:01 +01:00
Torkel Ödegaard
9c47fdeb2f
ux(): tweaks to light theme
2016-02-21 00:31:35 +01:00
Torkel Ödegaard
52241b8e0b
ux(): completed gf-size class rename
2016-02-20 14:48:10 +01:00
Torkel Ödegaard
701a2fdcf3
ux(): tweaks and polish, and also simpifying width classes, gf-size-xxx and gf-size-max-xx are now width-(1-30), and max-width-(1-30)
2016-02-20 14:21:39 +01:00
Torkel Ödegaard
995f17493e
ux(): updated influxdb datasource edit forms
2016-02-20 12:55:47 +01:00
Torkel Ödegaard
2f2326006d
Merge remote-tracking branch 'origin/master' into style-changes-bulletfactory
2016-02-18 13:37:31 +01:00
Torkel Ödegaard
3003a8cb6e
ux(sass): a lot of polish on headings and margins, ONLY USE bottom margins, othewise margin collapse causes issues
2016-02-18 12:16:47 +01:00
bergquist
63ca9f6f5a
fix(legend): only add overflow scroll when needed
...
In firefox the scrollbar is always show when setting
overflow: scroll. This commit makes sure the overflow
setting is only applied when needed.
closes #4049
2016-02-18 11:08:13 +01:00
Torkel Ödegaard
ffc9a8322b
Merge pull request #4054 from mtanda/cloudwatch_template_dimension_fix
...
(cloudwatch) fix template replace in legend
2016-02-17 06:11:26 +01:00
