IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-14 17:43:35 -06:00
Code Issues Packages Projects Releases Wiki Activity
6,872 Commits 5,447 Branches 554 Tags 1.9 GiB
31441f0b43
Commit Graph

2066 Commits

Author SHA1 Message Date
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
7f970bbc7b ux(): mini polish to forms, reducing padding between checkbox and label 2016-02-26 19:06:35 +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
e8b6995cc7 ux(): form tweaks 2016-02-25 09:28:58 +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
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
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
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
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
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
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
cb83c237f4 Merge branch 'master' of github.com:grafana/grafana 
Conflicts:
	public/sass/_grafana.scss
 2016-02-22 12:00:57 +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
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
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
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
e4d52b2851 fix(snapshot): fixed snapshot header, fixes #4094 2016-02-21 09:02:32 +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
utkarshcmu
17904a6e8b some nav fixes 2016-02-20 15:33:58 -08:00
Torkel Ödegaard
9c47fdeb2f ux(): tweaks to light theme 2016-02-21 00:31:35 +01:00
Torkel Ödegaard
08f7ccff38 feat(avatar): added server side proxy and cache of gravatar requests 2016-02-21 00:06:28 +01:00
Torkel Ödegaard
f808baafa7 ux(): fixes to side menu and gravatar url 2016-02-20 17:43:26 +01:00
Torkel Ödegaard
1f28ff6890 ux(): added gf-form-select-wrapper 2016-02-20 17:21:35 +01:00
Matt
ab4957684f Merged with master, I think 2016-02-20 10:13:18 -05:00
Torkel Ödegaard
d42bfc2570 ux(): fixed compile issue with last commit 2016-02-20 15:48:42 +01:00
Torkel Ödegaard
9ed45ba761 ux(): clean / simplify markup and css for navbar button 2016-02-20 15:36:52 +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
eb787adccd ux(): added style guide to admin page 2016-02-20 11:35:10 +01:00
Torkel Ödegaard
57e6e0092d ux(): more work on style guide 2016-02-20 11:32:50 +01:00
Torkel Ödegaard
a685e46fb6 ux(): minor tweaks 2016-02-20 11:05:06 +01:00
Matt
1144988443 Merged trent's styles and added admin submenu 2016-02-19 22:00:29 -05:00
Matthew Toback
27dc32e2e8 Started moving select box styles into gf-form 2016-02-19 21:24:46 -05:00
Trent White
6721cec73f created secondary button style, added a couple of variables, played with the plugins page to get the underline in place. Worth a look, but check that I was building everything properly :) 2016-02-19 18:22:24 -05:00
Trent White
bd0357b637 added angular gradient to page and login. Tweaked header underline to not be so heavy. Tweaked stacked logo on login. Created an alternative to avatar when there's no connection to gravatar - could use work, but I think you get the idea. 2016-02-19 17:34:09 -05:00
marknmel
2c0b191ef5 Updated typos - Kilobits, Megabits and Gigabits 
Update typos - Kilobits, Megabits and Gigabits - not Kilobites, Megabites, or Gigabites
 2016-02-19 10:24:49 -05:00
marknmel
02ac7a4001 Update kbn.js 
data rate for Mbits has typo - should be megabits/sec - not megabites/sec
 2016-02-19 10:05:01 -05:00
bergquist
c78669353f ux(playlist): migrate playlists page to new styles 2016-02-19 15:19:01 +01:00
bergquist
afb62638a8 ux(import): convert to new css format 2016-02-19 15:04:49 +01:00
Torkel Ödegaard
4a062b6d00 ux(): colors refactoring 2016-02-19 14:24:19 +01:00
bergquist
6590e6fae8 feat(panel-menu): remove duplicate in fullscreen 
closes #4064
 2016-02-19 14:18:26 +01:00
bergquist
ab7bbd5a44 ux(datasource): align name and http settings 2016-02-19 14:08:23 +01:00
bergquist
317f2d043f ux(playlist): migrate to new stylesheet 2016-02-19 13:53:29 +01:00
bergquist
d769f6c084 ux(timepicker): fix css for the timepicker 2016-02-19 09:13:22 +01:00
Torkel Ödegaard
e24e34619a ux(): began long on tiresome work on color refactors, polished button styles, added buttons to styleguide 2016-02-18 20:41:23 +01:00
Torkel Ödegaard
65f9cc986a ux(): styleguide with auto generated colors generated from the sass variable files 2016-02-18 18:01:24 +01:00
Torkel Ödegaard
252cd4901b ux(): added style guide page 2016-02-18 18:01:23 +01:00
bergquist
a2b69e96b9 fix(playlist): give buttons more space to not squash 2016-02-18 15:58:02 +01:00
Torkel Ödegaard
cae975cb39 ux(): fixed login, signup, signup step2 and invite views 2016-02-18 14:44:36 +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
f4908b6315 feat(panel): disable span options in fullscreen 
closes #4018
 2016-02-18 11:19:29 +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
08c1def8b7 ux(): minor update 2016-02-18 09:44:40 +01:00
utkarshcmu
71210dd624 Merge branch 'master' of https://github.com/grafana/grafana into user-removal 2016-02-17 23:09:23 -08:00
Torkel Ödegaard
8193d50da7 ux(): updated graph form styles 2016-02-17 13:46:18 +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
Mitsuhiro Tanda
f28eec8be3 (cloudwatch) fix template replace with panel repeat 2016-02-17 11:59:53 +09:00
Mitsuhiro Tanda
807c052fea (cloudwatch) fix dimension template replace in legend 2016-02-17 11:55:11 +09:00
Torkel Ödegaard
5a67ca255f ux(): fixes to light theme 2016-02-16 15:03:33 +01:00
Torkel Ödegaard
c97dbf390e ux(): fixed invite box 2016-02-16 14:39:45 +01:00
Torkel Ödegaard
008a031493 ux(sass): fixes and tweaks 2016-02-16 14:07:41 +01:00
Torkel Ödegaard
b05939ec9a ux(sass): work on sass variables, getting messy 2016-02-16 12:15:09 +01:00
Torkel Ödegaard
7c917156ee ux(sass): variable refactoring 2016-02-16 10:42:06 +01:00
Carl Bergquist
1febd578a4 Merge pull request #4020 from AxelVoitier/master 
Adding units volt-ampere (VA), kilovolt-ampere (kVA) and volt-ampere reactive (var)
 2016-02-16 09:00:19 +01:00
Torkel Ödegaard
41b775561a ux(): datasource form tweaks 2016-02-16 07:57:58 +01:00
Marcus Kempe
14312d225c Added exporting graph data to CSV with series.alias in columns. 2016-02-15 22:49:25 +01:00
Torkel Ödegaard
262a03667e ux(): updated some forms with the new flexbox based classes 2016-02-15 22:37:48 +01:00
Torkel Ödegaard
422decde3b ux(): trying out flexbox for new form styles 2016-02-15 22:24:28 +01:00
Torkel Ödegaard
bc4c71a7c6 ux(sass): added bootstrap 4 grid and breakpoint system 2016-02-15 18:04:45 +01:00
utkarshcmu
b9b3b75c0c Fixing snapshot templating bug 2016-02-14 22:13:59 -08:00
Torkel Ödegaard
37b031afcf ux(css): more progress on css refactor / cleanup 2016-02-14 22:33:03 +01:00
Torkel Ödegaard
5836a6ec4b ux(less): more less refactoring and cleanup, consolidating alerts 2016-02-14 21:50:06 +01:00
Torkel Ödegaard
50c79df70f ux(less): less cleanup of unused styles, restructuring and consolidating 2016-02-14 20:44:41 +01:00
Torkel Ödegaard
5274f93db7 ux(less): began less / bootstrap less cleanup and restructuring 2016-02-14 18:02:53 +01:00
Torkel Ödegaard
e32ee9f02e ux(admin): admin pages overhaul 2016-02-14 17:37:05 +01:00
Torkel Ödegaard
48c936e9a9 Merge branch 'style-changes-bulletfactory' of github.com:grafana/grafana into style-changes-bulletfactory 2016-02-14 15:09:22 +01:00
Torkel Ödegaard
b77bce1961 Merge branch 'master' of github.com:grafana/grafana into style-changes-bulletfactory 2016-02-14 15:09:10 +01:00
Torkel Ödegaard
f3d277cbab ux(): general ux polish and experimental work on page header 2016-02-14 13:41:42 +01:00
Torkel Ödegaard
afa4ee9a28 Merge branch 'master' of github.com:grafana/grafana 2016-02-14 10:39:30 +01:00
Torkel Ödegaard
92f4442356 fix(influxdb): fixed annotations editor, broken recently in master due to plugin changes, fixes #4023 2016-02-14 10:39:20 +01:00
utkarshcmu
47b6f01c8b confirmation box added for user removal 2016-02-13 18:21:18 -08:00
utkarshcmu
68225d64aa Converted org_users_ctrl to typescript 2016-02-13 17:55:49 -08:00
Torkel Ödegaard
fa06040ed2 ux(): updated playlist, other other minor fixes 2016-02-13 22:12:15 +01:00
Torkel Ödegaard
eae4bb74dd ux(profile): update profile forms with new form markup and classes 2016-02-13 20:54:00 +01:00
Torkel Ödegaard
caa765ec32 ux(forms): major simplification of norm-form markup and css 2016-02-13 19:42:05 +01:00
Axel Voitier
e00f9611f4 Adding units volt-ampere (VA), kilovolt-ampere (kVA) and volt-ampere reactive (var). 2016-02-13 19:23:30 +01:00
Torkel Ödegaard
7d75e0e53c ux(): minor fixes and cleanup, fixes for white theme 2016-02-13 16:45:07 +01:00
Torkel Ödegaard
f7e3297a0f ux(): updated navbar on all pages to new style, no subnav/dropdown yet though 2016-02-13 14:32:20 +01:00
Trent White
f98dbd249e update navbar and elements on playlist snapshots and change apps to plugins 2016-02-12 17:20:58 -05:00
Torkel Ödegaard
b369b7e495 ux(): added page-dashboard body class 2016-02-12 18:55:45 +01:00
utkarshcmu
23167a0bb3 Viewers restricted to edit panel 2016-02-12 07:34:56 -08:00
Torkel Ödegaard
8c1195b277 refactor(): no change, only minor refactor, and update of fontsize to 14px 2016-02-12 15:00:47 +01:00
Torkel Ödegaard
6cdc1e4d37 feat(ux): minor tweaks and fixes, added hover submenu dropdowns 2016-02-12 11:21:42 +01:00
Torkel Ödegaard
e7a202fe4d Merge branch 'master' into style-changes-bulletfactory 2016-02-12 10:14:06 +01:00
Carl Bergquist
c483b2ff98 Merge pull request #3999 from mtanda/cloudwatch_custom_metrics_namespace 
(cloudwatch) custom metrics namespace support
 2016-02-12 09:47:42 +01:00
Matt Toback
055e5aff2a Merge branch 'style-changes-bulletfactory' of https://github.com/grafana/grafana into matt-updates-to-bulletactor 2016-02-11 15:47:50 -05:00
Matt Toback
692878b0c0 Checkbox fixes for light and dark themes, ready to hand over to trent for new images 2016-02-11 15:46:37 -05:00
Matt Toback
a6061ce555 Checkboxes working 2016-02-11 15:29:57 -05:00
Torkel Ödegaard
2ea548850e Merge branch 'master' into style-changes-bulletfactory 
Conflicts:
	pkg/api/index.go
	public/less/sidemenu.less
 2016-02-11 21:23:54 +01:00
Torkel Ödegaard
87fc83678c feat(imports): work on datasource dashboards 2016-02-11 21:02:01 +01:00
Trent White
d8b43a3d76 button size tweaks, user form tweaks 2016-02-11 14:41:21 -05:00
Trent White
6189208fa5 org and user form tweaks 2016-02-11 14:18:55 -05:00
Trent White
cd40362d47 sidenav tweaks, creating a content channel for the main content on non-dashboard pages 2016-02-11 12:02:12 -05:00
Mitsuhiro Tanda
81ad469533 (cloudwatch) custom metrics namespace support 2016-02-12 00:30:33 +09:00
utkarshcmu
bb77070aab Merge branch 'master' of https://github.com/grafana/grafana into ds-conf-box 2016-02-11 07:03:04 -08:00
utkarshcmu
c051ff3eac Removed unused commented code 2016-02-11 07:01:45 -08:00
Torkel Ödegaard
ac5f7ecdea fix(img): fixed img link on signup 2016-02-11 15:49:55 +01:00
Torkel Ödegaard
4e33e80957 fix(): clicking on items in graphites add function menu did not work, now works again, broken in recent panel refactorings 2016-02-11 15:25:34 +01:00
Torkel Ödegaard
bf1b60564e fix(png rendering): fixed broken png rendering due to recent panel change 2016-02-11 14:34:15 +01:00
Torkel Ödegaard
39bb9ce118 Merge branch 'master' of github.com:grafana/grafana 2016-02-11 13:42:33 +01:00
Torkel Ödegaard
2d8180fc9c fix(panels): restored panel name to edit mode 2016-02-11 13:42:18 +01:00
utkarshcmu
fac51d92c5 Added DS deletion confirmation modal 2016-02-11 00:06:04 -08:00
Trent White
0fa0b3b256 style changes to forms, icons updates and new buttons 2016-02-10 18:14:26 -05:00
utkarshcmu
4c35c83b84 Minor html fix 2016-02-10 11:13:17 -08:00
Torkel Ödegaard
ae39ec8585 feat(plugins): changed so that plugins can load css async via util function exposed from app/plugins/sdk 2016-02-10 13:09:39 +01:00
Torkel Ödegaard
dfe0e258cd feat(text and css): html partials and css can be loaded via systemjs 2016-02-10 11:54:17 +01:00
Torkel Ödegaard
eda23252e1 Merge branch 'master' of github.com:grafana/grafana 2016-02-10 11:03:26 +01:00
Torkel Ödegaard
257b824d4f feat(plugins): better logging and handling of loading plugins, try to create plugins dir if it does not exist, fixes #3974 2016-02-10 11:03:12 +01:00
bergquist
b469904c7f fix(login): hide divider if no oath 
closes #3980
 2016-02-10 10:41:43 +01:00
Torkel Ödegaard
1ce34ed907 Merge pull request #3968 from daniellee/issue3831 
Fixes when panel repeat is removed by clearing the templating variables
 2016-02-10 09:41:06 +01:00
Torkel Ödegaard
f9e7b14f2c cleanup(): removed old file 2016-02-10 08:32:16 +01:00
Torkel Ödegaard
dad394523f fix(build): fixed minor issue in systemjs builder, and added SystemJs cache buster 2016-02-10 06:50:17 +01:00
Mitsuhiro Tanda
5c7689388d fix template url for annotation editor 2016-02-10 11:42:59 +09:00
Torkel Ödegaard
fe2e6b8a80 feat(apps): began work on support for apps that contain data sources 2016-02-09 18:37:08 +01:00
Torkel Ödegaard
8784be9a14 feat(plugins): made it possible to have relative plugin template urls 2016-02-09 18:17:32 +01:00
Daniel Lee
72415be2db fix(dashboard): fixes when panel repeat with templating removed 
The original panel should clear all the templating variables and
    look like it did before repeat was selected. Fixes #3831. Also
cleans up after a row repeat is removed
 2016-02-09 14:59:24 +01:00
Torkel Ödegaard
1acbd5b7d8 :merge branch 'app-pages' 
Conflicts:
	examples/nginx-app/module.js
	examples/nginx-app/partials/stream.html
	examples/nginx-app/plugin.json
 2016-02-09 14:22:08 +01:00
Torkel Ödegaard
f0ecbd3878 feat(apps): removed some on hover stuff from sidemenu to make it ready to merge to master 2016-02-09 14:20:41 +01:00
Torkel Ödegaard
9dcfe6dc39 feat(apps): more work on app pages and sidemenu subnav 2016-02-09 14:06:23 +01:00
Torkel Ödegaard
397e4e4766 fix(img): img link on login 2016-02-09 12:20:09 +01:00
Torkel Ödegaard
5b9ed82d29 feat(plugins): working on plugin examples 2016-02-09 12:20:09 +01:00
Torkel Ödegaard
0def04ad34 feat(apps): more progress on app pages 2016-02-09 12:10:59 +01:00
Torkel Ödegaard
18eb9d6076 feat(apps): began work on app pages 2016-02-09 11:17:49 +01:00
bergquist
e7ff018487 feat(table): uses lodash to escape html 2016-02-09 11:16:07 +01:00
bergquist
ddb1d0c684 fix(table): escape / chars as well 2016-02-09 11:14:08 +01:00
bergquist
7d89cf228c fix(table): remove html for htmlencoding option 2016-02-09 11:14:08 +01:00
bergquist
5775c0a341 feat(table): remove option to disable html encoding 2016-02-09 11:14:08 +01:00
bergquist
d750908e36 feat(table): escape html by default 
closes #3673
 2016-02-09 11:14:08 +01:00
bergquist
b1a648608b test(table): rewrite invalid tests 2016-02-09 11:14:08 +01:00
Torkel Ödegaard
82d5d1b003 feat(plugins): working on plugin examples 2016-02-09 09:53:56 +01:00
Mitsuhiro Tanda
2cce057df1 (prometheus) add query result template query 2016-02-09 01:37:43 +09:00
Torkel Ödegaard
dea2234b14 Merge branch 'master' of github.com:grafana/grafana 2016-02-08 16:57:41 +01:00
Torkel Ödegaard
99a053bbdd feat(): removed unused routes and minor fixes 2016-02-08 16:57:29 +01:00
Carl Bergquist
a3b6efdbfa Merge pull request #2883 from mtanda/prometheus_annotation_support 
Prometheus annotation support
 2016-02-08 14:51:59 +01:00
Torkel Ödegaard
cf92011fb9 Merge branch 'master' of github.com:grafana/grafana 2016-02-08 14:35:45 +01:00
Torkel Ödegaard
0106033293 refactor(): removed stuff 2016-02-08 14:35:34 +01:00
Carl Bergquist
4a43cc1df6 Merge pull request #3958 from bergquist/ux_login 
Login: UX improvements
 2016-02-08 13:05:05 +01:00
bergquist
0f52b4397f feat(login): minor ux improvements 
make buttons bigger and introduce the login divider.

closes #3698
 2016-02-08 11:18:41 +01:00
Torkel Ödegaard
9c0da733e8 Merge branch 'master' of github.com:grafana/grafana 2016-02-08 10:31:36 +01:00
Torkel Ödegaard
de90ad8967 feat(influxdb): escape influxdb tag values, fixes #3950 2016-02-08 10:31:26 +01:00
bergquist
73bed3880f feat(graph): sets fixed height for right side legend 
closes #1277
 2016-02-08 09:49:53 +01:00
bergquist
edebdb166e fix(graph): add missing ctrl in variable 2016-02-08 09:24:30 +01:00
Torkel Ödegaard
42b1c8c80d Merge branch 'master' into style-changes-mattttt 2016-02-07 19:47:14 +01:00
Torkel Ödegaard
a5d1e9ee43 fix(singlestat): fix for singlestat background and sparklines, fixes #3955 2016-02-07 18:37:07 +01:00
Torkel Ödegaard
ff4dbea19d ux(navbar): worked on responsive breakpoints for navbar 2016-02-07 12:28:06 +01:00
Matthew Toback
21b0945d08 Beginnings of form restyling, nowhere near merge yet 2016-02-06 17:37:33 -05:00
Torkel Ödegaard
89ef019b7c fix(): back to dashboard link fix 2016-02-06 10:32:07 +01:00
Torkel Ödegaard
801129530e feat(plugins): base clases are now in app/plugins/sdk 2016-02-05 18:08:21 +01:00
bergquist
020277c045 style(panel): fix intendention issue 2016-02-05 15:10:55 +01:00
bergquist
f8b3c0a64c feat(influxdb): add default interval setting 
closes #1552
 2016-02-05 15:10:33 +01:00
Torkel Ödegaard
853cd16336 fix(search); fixes to dashboard search (using keyboard), and fix for singlestat in snapshot view 2016-02-05 13:48:10 +01:00
Torkel Ödegaard
0fab210ad2 feat(apps): changed edit apps view to use plugin-component for apps config view 2016-02-05 12:13:59 +01:00
Torkel Ödegaard
9fc0a83b83 Merge branch 'master' of github.com:grafana/grafana 2016-02-05 11:08:44 +01:00
Torkel Ödegaard
aa8bd044c5 fix(): various fixes to snapshots 2016-02-05 11:05:47 +01:00
Carl Bergquist
59cb429d2d Merge pull request #3949 from bergquist/table_panel_thresholds 
tablepanel: using two thresholds
 2016-02-05 10:38:31 +01:00
Torkel Ödegaard
273fbaac68 refactor(): minor changes 2016-02-05 10:37:14 +01:00
bergquist
8ff997594f fix(tablepanel): change to using two thresholds 
fixes #3878
 2016-02-05 10:30:46 +01:00
Torkel Ödegaard
f188900379 Merge branch 'master' of github.com:grafana/grafana 2016-02-05 08:50:31 +01:00
Torkel Ödegaard
f80d5f8c03 refactor(): minor refactor 2016-02-05 08:50:15 +01:00
Torkel Ödegaard
fcc960e9a2 Merge pull request #3792 from utkarshcmu/snapshot-view 
UI Review: Snapshot view
 2016-02-05 08:49:23 +01:00
Torkel Ödegaard
db27bbb162 Merge pull request #3918 from utkarshcmu/metadata 
Added metadata fields under Settings tab
 2016-02-05 08:47:57 +01:00
Torkel Ödegaard
1bce8f6669 Merge pull request #3736 from mtanda/cloudwatch_custom_metrics_alpha 
(cloudwatch) custom metrics support
 2016-02-05 08:44:50 +01:00
utkarshcmu
59a384b453 Merge branch 'master' of https://github.com/grafana/grafana into metadata 2016-02-04 13:34:32 -08:00
utkarshcmu
b5a5b7b912 Removed totalStats from PR 2016-02-04 13:34:23 -08:00
Torkel Ödegaard
a167eb4fa1 fix(row repeat): fix for row repeat where repeated row was added to the bottom and not next to the source row, fixes #2942 2016-02-04 22:33:53 +01:00
Torkel Ödegaard
660ce3a61d fix(row editor): row editor fix and cleanup of unused code 2016-02-04 22:19:46 +01:00
Torkel Ödegaard
edf5868c38 fix(panel timeshift): fixed so that panel time range works when dashboard time range does not end in now, like and , fixes #3941 2016-02-04 21:52:05 +01:00
Torkel Ödegaard
5588e7597c feat(inspector): minor fix for inspector making the error not clear when having dashboard refresh, fixes #3938 2016-02-04 15:31:54 +01:00
Torkel Ödegaard
68a5fb66ff ux(panel menu): changed remove icon to trash icon, closes #3939 2016-02-04 15:28:24 +01:00
Torkel Ödegaard
33dc9fdd76 fix(inspector): fixed broken panel error inspect 2016-02-04 15:23:40 +01:00
Torkel Ödegaard
316e1aac67 fix(build): minor fix 2016-02-04 15:12:44 +01:00
Torkel Ödegaard
2ed3cd7f1a Merge branch 'master' of github.com:grafana/grafana 2016-02-04 15:04:20 +01:00
Torkel Ödegaard
14cc771cbe feat(plugins): made panels loaded via plugin-componet directive 2016-02-04 15:04:07 +01:00
Torkel Ödegaard
2a8b96b680 feat(plugins): last refactoring of how panels are implemented, now the same way as plugin editors 2016-02-04 14:36:19 +01:00
Torkel Ödegaard
6f923ecd17 Merge pull request #3901 from bobrik/opentsdb-tag-name-suggestions 
Show relevant tag name suggestions for OpenTSDB, closes #3610
 2016-02-04 14:30:33 +01:00
Torkel Ödegaard
501f21b16c fix(dashlist): fix for entering dashboard list edit mode 2016-02-04 13:58:43 +01:00
Ivan Babrou
f4ad673b6d Show relevant tag name suggestions for OpenTSDB, closes #3610 2016-02-04 10:57:19 +00:00
Torkel Ödegaard
37ff432f9d fix(influxdb): fix for influxdb when using format as table and having group by time, fixes #2928 2016-02-04 09:48:17 +01:00
Mitsuhiro Tanda
20283a46f9 fix annotation editor error 2016-02-04 14:14:19 +09:00
Mitsuhiro Tanda
634699c8e2 fix prometheus datasource plugin 2016-02-04 14:10:27 +09:00
Mitsuhiro Tanda
7d97f381cf fix tslint error 2016-02-04 14:09:59 +09:00
Mitsuhiro Tanda
7a1326ff14 follow new plugin format 2016-02-04 14:06:01 +09:00
Mitsuhiro Tanda
ee84d4371b fix prometheus annotation, reflect API change 2016-02-04 14:05:51 +09:00
Mitsuhiro Tanda
f8b05e0f42 add prometheus annotation query 2016-02-04 14:05:44 +09:00
Mitsuhiro Tanda
a4e5b7ea37 fix cloudwatch test error 2016-02-04 13:21:29 +09:00
Mitsuhiro Tanda
a20443b577 (cloudwatch) refactor annotation query 2016-02-04 13:16:55 +09:00
Mitsuhiro Tanda
defb15bea1 CloudWatch multiple alarm annotation support 2016-02-04 13:16:55 +09:00
Mitsuhiro Tanda
10016d9d38 add CloudWatch DescribeAlarms API support 2016-02-04 13:14:03 +09:00
Mitsuhiro Tanda
73ec486434 (cloudwatch) custom metrics support 2016-02-04 13:07:02 +09:00
Torkel Ödegaard
80e15dd754 feat(css): minor css tweaks 2016-02-03 19:41:39 +01:00
Torkel Ödegaard
de394311e0 feat(datasources): minor fix for optimized build for the refactored query editors 2016-02-03 19:10:01 +01:00
Torkel Ödegaard
908765e0e7 feat(plugins): various fixes entering edit mode after adding a new panel 2016-02-03 18:49:36 +01:00
Torkel Ödegaard
0da733de9c feat(plugins): migrated opentsdb plugin 2016-02-03 18:25:39 +01:00
Torkel Ödegaard
2fc8da7a87 feat(plugins): migrated cloudwatch and fixed a bunch of issues with data source edit views 2016-02-03 17:01:53 +01:00
Torkel Ödegaard
0bea6aba63 feat(plugins): migrated elasticsearch to new plugin editor model, also minor fixes 2016-02-03 16:31:07 +01:00
Torkel Ödegaard
eecf844ca2 feat(plugins): migrated influxdb query editor to new plugin model 2016-02-02 22:58:37 +01:00
utkarshcmu
c6ab63ec47 Calculated total stats in frontend 2016-02-02 11:50:01 -08:00
Torkel Ödegaard
05dfccbb74 feat(plugins): moved annotation editor to new plugin component loader 2016-02-02 18:16:30 +01:00
Torkel Ödegaard
fc829b32d9 feat(plugins): minor fixes to breaking out query editor row into reusable component 2016-02-02 16:57:05 +01:00
Torkel Ödegaard
f2700822e9 feat(plugins): extracted first plugin row to its own component 2016-02-02 16:32:36 +01:00
Torkel Ödegaard
21f6c07686 feat(plugins): more progress on plugin editors 2016-02-02 15:15:20 +01:00
Torkel Ödegaard
356f7b9db6 feat(plugins): good progress on converting query editors, graphite's query ctrl is now working as is unit tests 2016-02-02 13:07:54 +01:00
Torkel Ödegaard
822c8f1575 feat(plugins): migrating graphite query editor to new model 2016-02-02 12:52:43 +01:00
Torkel Ödegaard
efdd4a6682 feat(plugins): more work on plugin editors,prometheus query editor is working 2016-02-02 10:19:15 +01:00
Torkel Ödegaard
eaaf9246b7 feat(plugins): more work on refining datasource editors 2016-02-02 09:12:58 +01:00
utkarshcmu
00a6efa15e Excluded total calculations from backend 2016-02-01 23:26:11 -08:00
utkarshcmu
c5377fb429 Merge branch 'master' of https://github.com/utkarshcmu/grafana into metadata 2016-02-01 23:12:36 -08:00
Torkel Ödegaard
0583ec0f93 feat(plugins): more work on plugin directives and isolation 2016-02-01 23:32:12 +01:00
Torkel Ödegaard
12f487e223 feat(plugin-editors): more work on plugin editor loading 2016-02-01 23:24:08 +01:00
Torkel Ödegaard
30a8a434a1 Merge branch 'master' into plugin-editors 
Conflicts:
	public/app/features/panel/panel.ts
	public/app/features/panel/panel_directive.js
	public/app/plugins/datasource/grafana/module.ts
 2016-02-01 21:37:36 +01:00
Torkel Ödegaard
79db997e8c login(): testing new login look on login page 2016-02-01 21:31:54 +01:00
utkarshcmu
338afc80d5 Merge branch 'master' of https://github.com/grafana/grafana into metadata 2016-02-01 10:32:36 -08:00