IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-16 18:34:52 -06:00
Code Issues Packages Projects Releases Wiki Activity
5,894 Commits 5,454 Branches 554 Tags 1.9 GiB
fac51d92c5
Commit Graph

1520 Commits

Author SHA1 Message Date
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
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
Torkel Ödegaard
78598df96e fixes(): fixes for changed app -> public/app paths and fixes for optimized build 2016-02-01 19:00:40 +01:00
Torkel Ödegaard
e737dab5ca removed /app route, confusing when some assets use public/app/.. route and some use just app/... all public static assets should no use public route, app route is no more 2016-02-01 18:19:02 +01:00
Torkel Ödegaard
84609a4a3b fix(panel links): changed icon back 2016-02-01 17:18:39 +01:00
Torkel Ödegaard
0b25a29a9c Merge branch 'panelbase' 2016-02-01 17:11:08 +01:00
Torkel Ödegaard
b1bfd35968 feat(datasources): last fixes for data sources 2016-02-01 17:06:44 +01:00
Torkel Ödegaard
a053552fee fixes to data source query editors 2016-02-01 13:51:47 +01:00
Torkel Ödegaard
6886faa944 feat(plugins): fixed cloudwatch query editor 2016-02-01 13:30:20 +01:00
Torkel Ödegaard
c843637a6a more progress on some experimental stuff 2016-02-01 13:02:11 +01:00
Torkel Ödegaard
2f78584cdb poc(plugin editors): experimential test for plugin editors 2016-02-01 12:42:10 +01:00
Torkel Ödegaard
2e20c680cb Merge pull request #3892 from pfischermx/master 
Allow the use of auth and credentials in opentsdb
 2016-02-01 11:01:15 +01:00
Pablo Fischer
f33de8e911 Fix lint/syntax (grunt test) 2016-02-01 09:29:57 +00:00
Torkel Ödegaard
3f945e886b merge sync with master 2016-01-31 19:51:23 +01:00
Torkel Ödegaard
931d7cd039 Merge branch 'master' into panelbase 2016-01-31 16:57:04 +01:00
Torkel Ödegaard
fa63d26485 feat(timepicker): added validation to timepicker, and validation state to apply button, fixes #3870 2016-01-31 11:30:18 +01:00
Torkel Ödegaard
d617d029d2 fix(css): fixed issues introduced in recent sidemenu enhancements, fixes #3893, fixes #3894 2016-01-30 12:55:47 -05:00
Pablo Fischer
98082a940c Allow the use of auth and credentials in opentsdb 2016-01-30 01:09:55 +00:00
Torkel Ödegaard
12460af0ec Merge pull request #3830 from raintank/apiPlugin 
Add secureJsonData field to appSettings model
 2016-01-29 17:17:37 -05:00
Torkel Ödegaard
9ec3216ab0 Merge branch 'master' of github.com:grafana/grafana 2016-01-29 16:52:44 -05:00
Torkel Ödegaard
92c2f8d556 feat(pinned sidemenu): completed side menu pinned stuff 2016-01-29 16:52:30 -05:00
bergquist
eef506d8c4 tests(playlist): add more test for playlist ui 2016-01-29 22:31:53 +01:00
Daniel Lee
7f15e2c167 Merge pull request #3889 from grafana/dashboard-share-menu 
New dropdown menu to surface the snapshot feature, basic styling in p…
 2016-01-29 21:58:05 +01:00
Torkel Ödegaard
03aea09ce9 feat(pinned): updated 2016-01-29 15:49:13 -05:00
Daniel Lee
2897f618a6 Merge pull request #3880 from vitorboschi/fix3877 
add default value for fill policy
 2016-01-29 21:44:08 +01:00
Torkel Ödegaard
5f2aba6c5b feat(sidemenu): pinned state 2016-01-29 15:36:41 -05:00
Daniel Lee
21632d22ab Merge pull request #3882 from bergquist/playlist_tags 
Add support for playlist based on tags
 2016-01-29 21:32:58 +01:00
Matt Toback
f59f6a5486 Standardized on fa-link icon for Link instead of external-link, which generally means Open In New Window or Go Offsite 2016-01-29 15:27:42 -05:00
Torkel Ödegaard
32989f4cca Merge branch 'master' into pinned 2016-01-29 15:13:35 -05:00
Torkel Ödegaard
b5ef793ae4 feat(sidemenu): pinned work started 2016-01-29 15:12:56 -05:00
Trent White
339e73ee3d change file names to remove the rt reference in the icon files 2016-01-29 13:57:48 -05:00
Trent White
6da3f87736 use svg icon instead of png file 2016-01-29 12:52:29 -05:00
Trent White
6ae464f33a add rt-fonts file and point refs to snapshot icon to it 2016-01-29 12:46:57 -05:00
Anthony Woods
2e9272c778 Merge remote-tracking branch 'upstream/master' into apiPlugin 2016-01-30 01:38:01 +08:00
Matt Toback
6fe850e2c1 New dropdown menu to surface the snapshot feature, basic styling in place. Want to extend menu to include summary text of each feature 2016-01-29 11:48:57 -05:00
Vitor Boschi
bb3360e92a add default value for fill policy 2016-01-29 07:50:30 -02:00
bergquist
5a4e48fa99 style(playlist_spec): rename to underscore standard 2016-01-29 02:42:23 +01:00
bergquist
35071649e0 tests(playlist): refactor playlist edit ctrl 2016-01-29 02:37:07 +01:00
Torkel Ödegaard
05e8c576a2 feat(panels): updated influxdb editor to use panelCtrl 2016-01-28 19:07:53 -05:00
bergquist
ea7c2e73ad style(playlist): remove console logging 2016-01-29 00:38:50 +01:00
bergquist
b6f276265d style(playlist): remove semi colons for functions in TS 2016-01-29 00:13:29 +01:00
Torkel Ödegaard
3c3d3c9ec6 feat(): fixed share modal 2016-01-28 18:05:49 -05:00
Torkel Ödegaard
34141363ae feat(panels): fixed panel time 2016-01-28 17:17:56 -05:00
bergquist
3ccf7c8006 feat(playlist): improve the look of tag playlist items 2016-01-28 23:04:22 +01:00
Torkel Ödegaard
56c76f380b feat(panels): fixes 2016-01-28 16:48:37 -05:00
bergquist
f36ade2959 chore(playlist): cleanup some code 2016-01-28 22:43:54 +01:00
bergquist
85ad5f1d37 Merge branch 'master' into playlist_tags 2016-01-28 22:32:59 +01:00
bergquist
64fa9a6394 fix(singlestat): add ngInject for controller 
fixes #3879
 2016-01-28 22:27:17 +01:00