IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity
6,443 Commits 5,454 Branches 554 Tags 1.9 GiB
3af4b1ff98
Commit Graph

2013 Commits

Author SHA1 Message Date
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
Torkel Ödegaard
c051cb8be1 Merge branch 'tag-box-shadow' 2016-02-23 17:48:29 +01:00
Torkel Ödegaard
6f51fc34c3 ux(): mini tweak to page header gradient line opacity 2016-02-23 17:48:22 +01:00
Torkel Ödegaard
02b02c51e8 ux(): minor change to dashboard header style 2016-02-23 17:40:39 +01:00
Torkel Ödegaard
a414dd028c updated panel edit view 2016-02-23 17:31:19 +01:00
utkarshcmu
c2439b04c9 keyboard shortcut for taking snapshot 2016-02-23 08:11:04 -08:00
bergquist
ed550a894f ux(reset_password): tight-form -> gf-form 2016-02-23 16:14:29 +01:00
bergquist
8b51f58fe7 ux(row_editor): tight-form -> gf-form 2016-02-23 15:48:39 +01:00
bergquist
310b0e888d ux(dashboard_timepicker): tight-form -> gf-form 2016-02-23 15:26:44 +01:00
bergquist
c189c20164 ux(modal): tight-form -> gf-form 2016-02-23 14:49:10 +01:00
Torkel Ödegaard
0811338370 ux(): updated dashboard settings view 2016-02-23 14:05:12 +01:00
Torkel Ödegaard
ecc22757b8 ux(): added dashboard-padding variable 2016-02-23 13:32:14 +01:00
Torkel Ödegaard
5e553e40fa ux(): restored style for tabbed-view-title 2016-02-23 13:29:26 +01:00
Torkel Ödegaard
26c5029256 ux(): new dashboard tabs view 2016-02-23 13:20:59 +01:00
bergquist
bbc079e57b ux(snapshots): migrates to gf-form 2016-02-23 13:05:47 +01:00
Carl Bergquist
83bbffd491 Merge pull request #4127 from utkarshcmu/export-shortcut 
Export shortcut
 2016-02-23 12:37:29 +01:00
bergquist
fc5e1d97af ux(dashboard_links): start migration to gf-form 2016-02-23 10:25:58 +01:00
bergquist
85041d297c ux(import): minor fixes 2016-02-23 10:24:47 +01:00
utkarshcmu
17c7ce9b40 Added export option in Help modal 2016-02-23 00:57:39 -08:00
utkarshcmu
6506161107 Added keyboard shortcut to export dashboard 2016-02-23 00:55:34 -08:00
Torkel Ödegaard
590da0cab3 ux(): fixes to light theme popover / tooltip colors 2016-02-23 09:48:52 +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
bergquist
b3f2f0fa1e ux(import): migrate to gf-form 2016-02-23 07:55:24 +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
utkarshcmu
16656af847 some more nav fixes 2016-02-22 14:03:05 -08:00
Matt
3b279983e6 Tried to reduce the opacity of the header bottom-border some to make it seem less intense. Want to get some feedback. Also added a box-shadow to the tags to smooth out the edges (something we've done at raintank) 2016-02-22 17:01:58 -05:00
Torkel Ödegaard
55d4392d90 fix(annotations editor): fixed lagging annotations editor view 2016-02-22 21:55:03 +01:00
Torkel Ödegaard
acfc119409 ux(): added New and Import under divider to dashboard subnav 2016-02-22 21:51:31 +01:00
Matt
2215095be8 adjusted button copy on New playlist page 2016-02-22 14:30:35 -05:00
Matt
28d2966819 Merge branch 'master' of https://github.com/grafana/grafana into select-form-updates 2016-02-22 14:25:34 -05:00
Torkel Ödegaard
92efd17952 fix(ux): fixed panel json edit view 2016-02-22 19:03:53 +01:00
Torkel Ödegaard
3a7ec2a26e fixed unit test 2016-02-22 19:00:48 +01:00
Torkel Ödegaard
56a05d78bd Merge branch 'popover-to-drop' 2016-02-22 18:56:54 +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
bergquist
1164510004 ux(dashboard): migrate view json to gf-form 2016-02-22 18:03:51 +01:00
Matt
f24867029c Merge branch 'master' of https://github.com/grafana/grafana into select-form-updates 2016-02-22 11:47:50 -05:00
Matt
680ff95b8e Form adjustments and startting to add sidemenu 2016-02-22 11:39:11 -05:00
bergquist
31ea5f550f feat(playlist): changes tag result into a list 2016-02-22 16:45:14 +01:00
bergquist
fc62af6b3a style(admin): remove white spaces 2016-02-22 16:21:14 +01:00
Carl Bergquist
f8533e6641 Merge pull request #4083 from marknmel/patch-1 
Update kbn.js - correct typo for megabits/sec
 2016-02-22 16:08:25 +01:00
Carl Bergquist
87fec9d434 Merge pull request #4093 from utkarshcmu/minor-nav 
some nav fixes
 2016-02-22 16:07:39 +01:00
bergquist
b1e9327a2b ux(admin): migrates edit org page 2016-02-22 16:05:55 +01:00
bergquist
0aa4b47d59 ux(admin): migrated admin new user page to gf-form 2016-02-22 15:56:18 +01:00
bergquist
b9d50fa144 ux(admin): migrates admin edit user page 2016-02-22 15:32:55 +01:00
Torkel Ödegaard
3231d767d5 in progress work 2016-02-22 15:15:01 +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
eb58414600 ux(): fixed sidemenu submenu hover issue that caused it to be hidden as the mouse tried to move on to the submenu 2016-02-22 12:39:56 +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
Torkel Ödegaard
773a13dc26 fix(): fixed systemjs config for test 2016-02-22 11:45:10 +01:00
Torkel Ödegaard
8c2f7ac083 Merge branch 'master' of github.com:grafana/grafana 2016-02-22 11:42:11 +01:00
Torkel Ödegaard
f375c3000d ux(): help popover 2016-02-22 11:41:50 +01:00
bergquist
ea4ce0ce1f ux(playlist): finalize the ux for playlists 2016-02-22 11:29:09 +01:00
benrubson
c9fe2bab60 make it more smartly 2016-02-22 10:27:08 +01:00
bergquist
6c617ba28c fix(annotations): rearrange missplaced save button 2016-02-22 10:21:22 +01:00
Torkel Ödegaard
b98c826e95 ux(): worked on new popover 2016-02-22 10:17:35 +01:00
benrubson
2034d4b971 update kbn specs to make tests OK 2016-02-22 10:12:02 +01:00
bergquist
f225bb0032 ux(annotations): migrate annotations editors to new form 2016-02-22 10:07:02 +01:00
benrubson
69b87fdb9a make auto interval calculation more accurate 2016-02-22 08:55:52 +01:00
benrubson
6f70445654 Add some more auto interval steps 2016-02-22 08:02:01 +01:00
Torkel Ödegaard
145c14ed57 Merge branch 'master' of github.com:grafana/grafana 
Conflicts:
	public/sass/.sass-lint.yml
	tasks/options/sasslint.js
 2016-02-22 05:52:02 +01:00
benrubson
b9843fe6d1 Code style typo 2016-02-21 22:07:01 +01:00
benrubson
ab9757082e Code style typo 2016-02-21 22:00:00 +01:00
benrubson
d6e4fb46cf Add a minimum value option for template auto interval 2016-02-21 21:48:09 +01:00
Torkel Ödegaard
a93fe5b2b2 poc(): tether drop 2016-02-21 18:08:44 +01:00
Torkel Ödegaard
8f9c3c8381 lib(): added teather lib and tested it with the panel menu 2016-02-21 16:44:11 +01:00
Torkel Ödegaard
363f36dfae ux(): tweaks 2016-02-21 15:21:01 +01:00
Torkel Ödegaard
7328f4d3fd ux(): minor tweak 2016-02-21 13:07:17 +01:00
Torkel Ödegaard
8f3b6a23f6 fix(): gradient hover only on main submenu item 2016-02-21 12:49:30 +01:00
Torkel Ödegaard
cc4fdd6d0c ux(): fixed issue with cach buster for temlpates, and updated on hover style for sidemenu to look better 2016-02-21 12:47:57 +01:00
Torkel Ödegaard
3781a099dd fix(): removed css background that should not have been there in last commit 2016-02-21 09:06:59 +01:00