bergquist
|
5d5f5cd9a6
|
fix(impressionstorage): remove console logging
|
2016-02-29 19:52:52 +01:00 |
|
bergquist
|
ad9b2ab617
|
fix(impressionStorage): use title instead of slut
closes #4194
|
2016-02-29 19:51:35 +01:00 |
|
Torkel Ödegaard
|
cb8b038795
|
feat(templating): progress on templating rethink
|
2016-02-29 17:31:31 +01:00 |
|
Torkel Ödegaard
|
078e69d06d
|
feat(templating): simplified templating forms removed all formats
|
2016-02-29 17:07:53 +01:00 |
|
Torkel Ödegaard
|
f44d6e063c
|
Merge branch 'master' into variable-value-formatting-rethink
|
2016-02-29 16:42:25 +01:00 |
|
Torkel Ödegaard
|
113509a4e9
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-02-29 16:41:36 +01:00 |
|
Torkel Ödegaard
|
839c675cb9
|
ux(): minor tweak
|
2016-02-29 16:38:45 +01:00 |
|
bergquist
|
854c360def
|
Merge branch 'plopp-master'
|
2016-02-29 15:02:14 +01:00 |
|
bergquist
|
0cbb95ed1e
|
fix(export_csv): rename export to csv label
|
2016-02-29 15:01:26 +01:00 |
|
bergquist
|
d8929b1d3e
|
Merge branch 'master' of https://github.com/plopp/grafana into plopp-master
|
2016-02-29 14:58:38 +01:00 |
|
Carl Bergquist
|
fa99a6745d
|
Merge pull request #4192 from bergquist/last_viewed_dashboards
feat(dashlist): list last x viewed dashboards
|
2016-02-29 14:51:20 +01:00 |
|
bergquist
|
b79217be1e
|
feat(impressionStore): remove un needed js-ts bridge
|
2016-02-29 14:37:09 +01:00 |
|
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 |
|
bergquist
|
e5970e83ff
|
feat(dashlist): list last x viewed dashboards
closes #3896
|
2016-02-29 14:14:43 +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
|
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 |
|
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
|
4ef79d250d
|
feat(templating): initial work on rethink of value formating
|
2016-02-28 11:44:11 +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 |
|
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 |
|
utkarshcmu
|
16783bff16
|
Playlist nav fix
|
2016-02-27 00:40:39 -08:00 |
|
Torkel Ödegaard
|
352cdc137d
|
fix(ux): fixed select box appearance in firefox, fixes #4168
|
2016-02-27 07:12:05 +01:00 |
|
Torkel Ödegaard
|
7f970bbc7b
|
ux(): mini polish to forms, reducing padding between checkbox and label
|
2016-02-26 19:06:35 +01:00 |
|
Torkel Ödegaard
|
35609fe3d1
|
ux(): mini fix to alert close btn
|
2016-02-26 18:59:24 +01:00 |
|
Torkel Ödegaard
|
4fcca7c61b
|
Merge branch 'plugins-list-and-edit-view'
|
2016-02-26 18:55:33 +01:00 |
|
Torkel Ödegaard
|
d55dc92502
|
feat(plugins): restored config view functionality to plugin page
|
2016-02-26 18:55:17 +01:00 |
|
Torkel Ödegaard
|
c148d89004
|
feat(plugins): progress on plugins page
|
2016-02-26 18:25:39 +01: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 |
|
bergquist
|
e3be9f7fe9
|
ux(graph): widen input in general tab
|
2016-02-26 11:36:23 +01:00 |
|
bergquist
|
ca3cb07fcb
|
ux(settings_meta): add space to fill empty labels
|
2016-02-26 11:33:19 +01:00 |
|
Torkel Ödegaard
|
b98e5690eb
|
ux(): sidemenu, fix to hide subnav menu when you click on hover subnav items
|
2016-02-26 10:22:06 +01:00 |
|
Mitsuhiro Tanda
|
45e6187c1a
|
add hide template variable option
|
2016-02-26 00:43:48 +09:00 |
|
Torkel Ödegaard
|
c521182ceb
|
feat(plugins): more work on plugins list/edit view
|
2016-02-25 15:56:28 +01:00 |
|
Torkel Ödegaard
|
8db7cf49a6
|
feat(plugins): began refactoring AppSettings -> PluginSettings, and have the plugins list view and plugin edit view be common for all plugins
|
2016-02-25 14:55:31 +01:00 |
|
Torkel Ödegaard
|
30f3b55baf
|
fix(prometheus): set default templating format to pipe
|
2016-02-25 10:26:07 +01:00 |
|
Torkel Ödegaard
|
b5beac879e
|
Merge branch 'matt-tab-style-tweaks'
|
2016-02-25 09:32:06 +01:00 |
|
Torkel Ödegaard
|
e8b6995cc7
|
ux(): form tweaks
|
2016-02-25 09:28:58 +01:00 |
|
Matt
|
7ca8db15d9
|
Removed commented out old code
|
2016-02-25 12:36:03 +11:00 |
|
Matt
|
9d96382ecc
|
Reduced height of tabs and nav-tabs elsewhere
|
2016-02-25 12:30:36 +11:00 |
|
Matt
|
b86b8965f1
|
Reduced the heigh of the tabs, adjusted padding on h3
|
2016-02-25 12:05:19 +11:00 |
|
Torkel Ödegaard
|
f6c49daaa6
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-02-24 19:33:08 +01:00 |
|
Torkel Ödegaard
|
a129a6192a
|
ux(): fixed hight of top navbar
|
2016-02-24 18:34:31 +01:00 |
|
Torkel Ödegaard
|
22ae259cf5
|
ux(): varios tweaks and polish
|
2016-02-24 17:49:08 +01:00 |
|
Torkel Ödegaard
|
e627820d3d
|
ux(): padding / margin tweaks and polish
|
2016-02-24 17:06:02 +01:00 |
|
bergquist
|
65711f4bfe
|
ux(settings_meta): move create new button to bottom of page
|
2016-02-24 16:01:28 +01:00 |
|
bergquist
|
4531f39c30
|
ux(settings_rows): move create new button to bottom of page
|
2016-02-24 15:55:50 +01:00 |
|
bergquist
|
3db1188444
|
ux(templates): move create new button to bottom of page
|
2016-02-24 15:18:08 +01:00 |
|
bergquist
|
be3d38ac92
|
ux(annotations): move create new button to bottom of page
|
2016-02-24 15:07:34 +01:00 |
|
bergquist
|
b490bdfe33
|
ux(row_editor): tight-form -> gf-form
|
2016-02-24 13:49:42 +01:00 |
|
bergquist
|
f6457a2023
|
ux(templating): tight-form -> gf-form
|
2016-02-24 11:56:45 +01:00 |
|
bergquist
|
7dcb85010a
|
ux(annotations): change to new tab header
|
2016-02-24 11:19:09 +01:00 |
|
bergquist
|
0525bf5d4e
|
ux(table): tight-form -> gf-form
|
2016-02-24 10:42:53 +01:00 |
|
Torkel Ödegaard
|
7207068181
|
ux(): worked more on new tabs view
|
2016-02-24 10:32:22 +01:00 |
|
bergquist
|
59d2fe8aa4
|
ux(dashlist_options): tight-form -> gf-form
|
2016-02-24 10:09:12 +01:00 |
|
bergquist
|
a3e22091be
|
ux(submenu): tight-form -> gf-form
|
2016-02-24 08:32:09 +01:00 |
|
bergquist
|
17b7dfb27b
|
ux(api-keys): tight-form -> gf-form
|
2016-02-24 07:33:04 +01:00 |
|
bergquist
|
06173b9194
|
ux(admin): tight-form -> gf-form
|
2016-02-24 07:25:05 +01:00 |
|
bergquist
|
2a45e879bb
|
ux(panel_timesettings): tight-form -> gf-form
|
2016-02-24 07:20:54 +01:00 |
|
Carl Bergquist
|
87cb0c2aec
|
Merge pull request #4133 from utkarshcmu/snapshot-shortcut
keyboard shortcut for taking snapshot
|
2016-02-23 20:31:47 +01:00 |
|
utkarshcmu
|
d0b191af18
|
Changed snapshot shortcut to CTRL+I
|
2016-02-23 11:23:13 -08:00 |
|
bergquist
|
b607adadcf
|
ux(panel_links): tight-form -> gf-form
|
2016-02-23 19:04:54 +01:00 |
|
bergquist
|
e7828c1e5e
|
ux(templating): tight-form -> gf-form
|
2016-02-23 19:04:54 +01:00 |
|