IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-26 19:00:54 -06:00
Code Issues Packages Projects Releases Wiki Activity
5,936 Commits 5,093 Branches 538 Tags 1.9 GiB
eae4bb74dd
Commit Graph

1637 Commits

Author SHA1 Message Date
bergquist
1210fca8e5 fix(singlestat): fix bug in threshold calculations 2016-01-28 01:11:52 +01:00
Torkel Ödegaard
97ac81aa9c feat(panels): upgradede singlestat panel 2016-01-27 19:07:39 -05:00
Torkel Ödegaard
57d22fb93f Merge remote-tracking branch 'origin/master' into panelbase 2016-01-27 17:33:33 -05:00
Torkel Ödegaard
f0f7da9ff0 feat(panels): fixing broken stuff 2016-01-27 17:16:00 -05:00
Torkel Ödegaard
9c1217cd2c updated 2016-01-27 14:32:19 -05:00
Carl Bergquist
251bf7a2b4 Merge pull request #3840 from utkarshcmu/stats 
Grafana stats view as mentioned in #3812
 2016-01-27 19:41:10 +01:00
Torkel Ödegaard
f1efce56aa feat(panels): fixed duplicate and remove panel 2016-01-27 13:22:37 -05:00
Torkel Ödegaard
34b82caaa8 feat(panels): fixed unit tests 2016-01-27 12:51:01 -05:00
Carl Bergquist
a1b5aae958 Merge pull request #3866 from daniellee/issue3852 
fix(graph): narrow panels shows correct date format on x-axis
 2016-01-27 17:45:31 +01:00
sgarg7
75ab2e026d test(spelling): fix spelling/typo in string 2016-01-27 17:38:02 +01:00
Daniel Lee
f43e1ab2ff fix(graph): narrow panels shows right date format on x-axis 
fixes #3852. The function that calculates the date format for
the x-axis on a panel takes the panel width into account and
can be wrong for certain date ranges if the panel is too
narrow. E.g. can show dates in format %m/%d %H:%M when it
should show it as %H:%M
 2016-01-27 17:23:02 +01:00
bergquist
12dfee544f Merge branch 'master' into playlist_tags 2016-01-27 15:22:16 +01:00
Carl Bergquist
0ea651f1df Merge pull request #3856 from Gueust/elasticsearc_fix_error 
Serialize an elasticsearch error previously printed as 'Object'
 2016-01-27 15:08:00 +01:00
utkarshcmu
a352af5b9f Fixed broken tags search 2016-01-26 18:48:13 -08:00
Torkel Ödegaard
51a32a2bfa feat(panels): fixes 2016-01-26 18:08:08 -05:00
Torkel Ödegaard
e6013353d2 fix series overrides 2016-01-26 17:54:57 -05:00
Torkel Ödegaard
aac190eaa9 feat(panels): graph panel starting to work 2016-01-26 17:50:18 -05:00
Torkel Ödegaard
ebba7a0327 feat(graph): updating graph panel to new format progress 2016-01-26 17:28:07 -05:00
bergquist
13d993a836 fix(search): remove old search ctrl 2016-01-26 23:28:06 +01:00
bergquist
f384538959 fix(search): fixes broken esc button in search 2016-01-26 23:18:10 +01:00
Gueust
269583a6a1 Serialize an elasticsearch error previously printed as 'Object' 2016-01-26 23:15:54 +01:00
bergquist
0b05d39804 fix(search): fixes missing tags in result 2016-01-26 23:03:03 +01:00
bergquist
2ca7da06a3 Merge branch 'master' into playlist_tags 2016-01-26 22:36:06 +01:00
bergquist
4b59cee17a fix(search): add missing ctrl property in view 2016-01-26 21:12:20 +01:00
bergquist
add7078f66 tech(playlist): convert to typescript 2016-01-26 20:37:44 +01:00
Torkel Ödegaard
aa251fc9ce feat(panels): upgraded dashlist panel to new format 2016-01-26 12:22:46 -05:00
bergquist
c105a07bab Merge branch 'playlist_tags' 2016-01-26 17:56:30 +01:00
bergquist
09de46e5ac tech(search): convert search to typescript 2016-01-26 17:54:19 +01:00
Torkel Ödegaard
cc375f48c7 feat(panels): minor fix 2016-01-26 11:34:58 -05:00
utkarshcmu
e59b0c0694 Fixed ts file comment 2016-01-25 18:10:48 -08:00
utkarshcmu
07fee0a810 Converted adminStatsCtrl to typescript 2016-01-25 17:49:39 -08:00
Pablo Fischer
29185eeef7 If OpenTSDB is 3rd-party hosted (or by another team) and does not support OPTIONS, send the request as POST (urlencoded) 2016-01-26 00:12:56 +00:00
Torkel Ödegaard
53dc21c69b feat(panels): minor fixes 2016-01-25 17:58:41 -05:00
Torkel Ödegaard
b0dd79cbfd feat(panels): MetricsPanelCtrl is starting to work 2016-01-25 17:51:18 -05:00
Daniel Lee
be2e2577b8 fixes #3839 
Uses width set to 800px for invite div instead of position fixed. It
looks the same for desktop and makes the button clickable on smaller
resolutions and mobile. Although it is not really responsive so the
text will be small on mobiles. Better that though than a non-clickable
button.
 2016-01-25 22:59:48 +01:00
Torkel Ödegaard
c30b1b126d feat(panels): minor progress 2016-01-25 15:58:24 -05:00
Torkel Ödegaard
9c6698e87b feat(panels): progress on new panel infrastructure, base classes 2016-01-25 15:09:37 -05:00
bergquist
b939a27a8d revert f3bc726001bfbc707597bce5fa169b46e992eb7ao 
This change have caused alot of questions. So we revert
 2016-01-25 18:40:28 +01:00
Torkel Ödegaard
73af4df96d feat(panels): upgraded text panel 2016-01-25 11:41:20 -05:00
bergquist
cd1b2e2841 feat(singlestat): reduce max thresholds to two. 
closes #3248
 2016-01-25 16:27:58 +01:00
bergquist
b0a24ae4aa tech(singlestat): move singlestat test to plugin 
and change to typescript
 2016-01-25 16:13:45 +01:00
Torkel Ödegaard
11e35f7b68 Merge remote-tracking branch 'origin/master' into panelbase 2016-01-25 10:00:25 -05:00
Torkel Ödegaard
8f4cf6c797 feat(panels): updated text panel to new format 2016-01-25 09:56:17 -05:00
utkarshcmu
2190392e05 Added grafana_admins count 2016-01-25 00:39:31 -08:00
utkarshcmu
4c12703e0c Integrated angularjs with go api 2016-01-24 21:39:30 -08:00
Torkel Ödegaard
3e14f8a0e5 feat(): panel refactoring 2016-01-24 18:44:21 -05:00
Torkel Ödegaard
a950ff9795 feat(panel): more panel base infrastructure 2016-01-24 17:58:08 -05:00
Torkel Ödegaard
4132cf12e3 feat(panels): more panel refactoring 2016-01-24 17:30:29 -05:00
Torkel Ödegaard
4f7fb40d9b feat(panel plugin): improving panel plugin model 2016-01-24 16:39:25 -05:00
bergquist
42802ac710 tech(singlestat): convert singlestat panel to typescript 2016-01-24 18:56:10 +01:00
Torkel Ödegaard
ecdc730de7 poc(): new panel system 2016-01-23 15:40:30 -05:00
Torkel Ödegaard
8927042421 more new panel stuff 2016-01-23 01:44:38 +01:00
Anthony Woods
32f78d465b add secureJsonData to appSettings model. 
- adds the new column to the DB table.
- data stored in the DB is encrypted
- update appRouteHeaders templates to use the jsonData and
decrypted secureJsonData
 2016-01-23 06:17:22 +08:00
Torkel Ödegaard
94a7e9b185 poc(panel): experimental panel stuff 2016-01-22 19:59:36 +01:00
Torkel Ödegaard
0796b2c0e3 poc(panel as isolated compoennts): experimental panel stuff 2016-01-21 17:46:57 +01:00
Ivan Babrou
bbfdbaf952 Support OpenTSDB 2.2 fill policies, closes #3802 2016-01-21 16:38:46 +00:00
Torkel Ödegaard
7b4fe824ec Merge branch 'master' into panelbase 2016-01-21 15:29:14 +01:00
bergquist
28fabadeae style: remove empty row 2016-01-21 15:13:06 +01:00
Volker Fröhlich
e5e8e2021f Fix dashboard sorting in playlists 2016-01-21 14:58:15 +01:00
bergquist
08f02397b6 fix(fileexport): tslint fix 2016-01-21 14:31:20 +01:00
bergquist
d3f90dcfcc style(fileexport): remove commented code 2016-01-21 14:26:31 +01:00
bergquist
ba65b89bbb feat(csv export): extract csv export into a new file 2016-01-21 14:22:39 +01:00
Torkel Ödegaard
3d353c7d6d fix(mixed datasource): fixed issue with mixed data source in optimized build 2016-01-21 13:14:25 +01:00
Torkel Ödegaard
bc05cc4977 fix(phantomjs): another fix for phantomjs rendering, #3804 2016-01-21 12:57:03 +01:00
Torkel Ödegaard
cbb5811d8b fix(cleanup): removed unused js file 2016-01-21 11:40:04 +01:00
utkarshcmu
c260c319ee Started Grafana stats poc 2016-01-21 01:48:29 -08:00
Carl Bergquist
d13957cb72 Merge pull request #3803 from xadhoom/table_export_csv 
add export to csv in table panel
 2016-01-21 10:33:18 +01:00
Torkel Ödegaard
4a8f82ca9b fix(image rendering): fixed issue with image rendering, fixes #3804 2016-01-21 10:10:32 +01:00
matteo brancaleoni
cdcc7a7172 add export to csv in table panel 2016-01-21 10:02:23 +01:00
Torkel Ödegaard
b150452db3 Merge pull request #3807 from raintank/apiPlugin 
allow saving changes to appModel made by configView directive
 2016-01-20 19:27:57 +01:00
Anthony Woods
9e121ef0c8 add save button to config page 
configView directives can update the appModel object.  We need
a save button to persist the updates.
 2016-01-21 02:21:30 +08:00
Torkel Ödegaard
5f5fcc0e04 fix(submenu): added ngInject comment to dashboard submenu 2016-01-20 11:57:56 +01:00
utkarshcmu
a854f0c4d4 Switched snapshot ctrl to angularjs2 2016-01-20 02:35:24 -08:00
Torkel Ödegaard
1979143e7c fix(export): fix export dashboard to json, been broken in master for 2-3 weeks 2016-01-20 11:20:33 +01:00
Torkel Ödegaard
4f7f03a28c fix(playlist): fix for memory leak when running playlist for a long period, fixes #3794 2016-01-20 10:39:58 +01:00
Torkel Ödegaard
8dd118bd86 updated 2016-01-20 09:45:24 +01:00
utkarshcmu
aa1d28835d Fixed angularjs variable names 2016-01-19 23:23:44 -08:00
utkarshcmu
281ec60085 UI and backend working 2016-01-19 22:04:38 -08:00
utkarshcmu
09f5e6f4dc Merge branch 'master' of https://github.com/utkarshcmu/grafana into snapshot-view 2016-01-19 21:05:50 -08:00
utkarshcmu
e26cd21048 Converted ctrl to typescript 2016-01-19 21:04:53 -08:00
utkarshcmu
1c5be92259 Removed unused component from playlist code 2016-01-19 17:15:24 -08:00
utkarshcmu
6e99eed417 Moved snapshot route to core routes 2016-01-19 17:00:54 -08:00
Torkel Ödegaard
3e3b996963 feat(plugin): experimental work on plugin architecture 2016-01-19 21:57:58 +01:00
Torkel Ödegaard
7a26d309b1 feat(apps): more work on apps and how apps can include panels 2016-01-19 18:18:53 +01:00
utkarshcmu
41fd0ed467 Merge branch 'master' of https://github.com/grafana/grafana into snapshot-view 2016-01-19 05:05:03 -08:00
utkarshcmu
bcb44b7b31 UI and backend connectivity implemented 2016-01-19 05:02:22 -08:00
Torkel Ödegaard
6b85a6fd78 feat(apps): minor design update for apps view 2016-01-19 11:54:35 +01:00
utkarshcmu
70481953fd Snapshot name is saved in DB now 2016-01-19 00:26:20 -08:00
utkarshcmu
54383a9a0c Fix failing circleci 2016-01-19 00:08:55 -08:00
Torkel Ödegaard
510a21195a feat(influxdb): support for policy selection in query editor, closes #2018 2016-01-18 18:38:36 +01:00
Torkel Ödegaard
3b5a583903 Merge branch 'master' into influxdb-policy-selector 2016-01-18 18:10:01 +01:00
bergquist
eb8871a4bd fix(playlist): add nginject for prod build 2016-01-18 17:31:33 +01:00
Carl Bergquist
389dd12ab4 Merge pull request #3779 from bergquist/playlist_stop_playing 
feat(playlist): clicks outside control stops playlist
 2016-01-18 17:23:20 +01:00
bergquist
4a54edd8bb feat(playlist): clicks outside control stops playlist 
fixes #3711
 2016-01-18 17:17:13 +01:00
Torkel Ödegaard
1d4803cff0 fix(singlestat): fixed issue with singlestat and drilldown link introduced in recent commit, fixes #3777 2016-01-18 16:18:04 +01:00
Torkel Ödegaard
6fc972ab1e feat(playlists): merge sync with RP 2016-01-18 16:05:38 +01:00
Torkel Ödegaard
66eebd1ac3 refactor(playlist): refactor of playlist feature, and PR #3776 2016-01-18 16:01:14 +01:00
bergquist
568832c5af style(playlist): improves variable name 2016-01-18 14:58:46 +01:00
Torkel Ödegaard
4ff7b0f49b Merge branch 'playlist_reload' of https://github.com/bergquist/grafana into bergquist-playlist_reload 2016-01-18 14:51:54 +01:00
bergquist
88e9161e57 style(playlist): fixes some TS hint errors 2016-01-18 14:13:11 +01:00
bergquist
10adc57b3f style(playlist): fixes some TS hint errors 2016-01-18 14:05:48 +01:00
bergquist
62ae02bdd1 feat(playlist): reload all dashboards every cycle 
closes #3706
 2016-01-18 13:54:32 +01:00
bergquist
dca503bcbd feat(playlist): playlistsrv is now started by id 2016-01-18 13:40:51 +01:00
bergquist
bc21862661 tech(playlist): refactor playlistSrv to typescript 2016-01-18 13:21:48 +01:00
Torkel Ödegaard
1e06f3f5f4 Merge branch 'master' of github.com:grafana/grafana 2016-01-18 12:19:54 +01:00
Torkel Ödegaard
00802d035a refactor(): refactoring submenu to directive 2016-01-18 12:19:46 +01:00
Torkel Ödegaard
edcef7d078 fix(graph): fixed for graph series color selector popover, broken in recent 3.0-pre1 build, fixes #3774 2016-01-18 12:12:05 +01:00
bergquist
899a44a735 feat(units): add more data rate options 2016-01-18 10:02:46 +01:00
bergquist
6a95963c89 Revert "feat(units): add more data rate units" 
This reverts commit a35bf497be.
 2016-01-18 09:47:01 +01:00
bergquist
a35bf497be feat(units): add more data rate units 
closes #3759
 2016-01-18 09:26:24 +01:00
Torkel Ödegaard
1adb7b286c updated 2016-01-18 07:28:01 +01:00
Torkel Ödegaard
30c19d525e ux(): minor page rename 2016-01-17 20:32:37 +01:00
Torkel Ödegaard
8161a0943d ux(password): minor fix for change password page 2016-01-17 20:16:39 +01:00
Torkel Ödegaard
a8e3f731b7 feat(influxdb): began work on influxdb policy selector 2016-01-17 17:53:38 +01:00
Torkel Ödegaard
0cb68b86fc refactor(): minor change 2016-01-17 17:24:10 +01:00
Torkel Ödegaard
723be4f612 refactoring(): unified dashboard top nav to a single dashnav component, uses new navbar component 2016-01-17 11:34:51 +01:00
Torkel Ödegaard
070af40487 refactor(): began refactoring topnav directive to be more like the new style of components, and also make it usable on all pages including dashboard 2016-01-16 23:26:29 +01:00
Torkel Ödegaard
0a58404584 fix(build): minor build script fix, fixes #3756 2016-01-16 19:16:49 +01:00
Torkel Ödegaard
c201f4c63e feat(sidemenu): added handling of click outside to hide sidemenu, also refactored grafana_ctrl to a more general grafana component 2016-01-16 18:55:13 +01:00
Torkel Ödegaard
317b5e6d86 fix(sidemenu): fixed issue with new sidemenu in optimized build, #3687 2016-01-16 16:17:29 +01:00
Torkel Ödegaard
7ad72ba905 ux(): minor style fixes to pages 2016-01-15 15:51:30 +01:00
Torkel Ödegaard
36e8af05a2 ux(more style updates) 2016-01-15 15:05:13 +01:00
Torkel Ödegaard
2bfded3c5f ux(): general ux polish 2016-01-15 14:42:59 +01:00
Torkel Ödegaard
842a59535d feat(sidenav): more polish to new sidenamv 2016-01-15 13:20:32 +01:00
Torkel Ödegaard
d4e1a715eb fix(datasources): many datasources did not work in optimized build due to missing ngInject comment 2016-01-15 12:51:55 +01:00
Torkel Ödegaard
954c0e9fae Merge branch 'master' into new-nav 2016-01-15 11:23:22 +01:00
Torkel Ödegaard
f6a3b53fb5 fix(firefox): fixed js issue that made master build break in firefox 2016-01-15 11:23:08 +01:00
Torkel Ödegaard
dfcb82d233 feat(sidenav): more work on new side nav 2016-01-15 11:13:02 +01:00
Torkel Ödegaard
aa9a92d2e0 poc(new nav): added new menu button to other pages that dashboard 2016-01-14 22:30:39 +01:00
Torkel Ödegaard
4f227ae92e poc(new sidenav/topnaav) 2016-01-14 22:26:41 +01:00
Torkel Ödegaard
cd0256d40d poc(new nav): beginings.... 2016-01-14 21:20:56 +01:00
Torkel Ödegaard
2ccc19185c fix(text panel): fix for text panel in optimized builds, introduced in recent commit due to plugin api changes 2016-01-14 19:14:02 +01:00
Torkel Ödegaard
88a132b878 Merge branch 'dynamic-directives' 2016-01-14 18:57:34 +01:00
Torkel Ödegaard
b5726a8d5a feat(plugins): completed upgrade of all built in panels 2016-01-14 18:57:02 +01:00
Torkel Ödegaard
1d9ad9be33 feat(plugins): upgraded singlestat to new plugin format 2016-01-14 17:20:50 +01:00
Torkel Ödegaard
a233570777 feat(plugins): upgraded opentsdb and prometheus to new plugin module return format 2016-01-14 16:01:17 +01:00
Torkel Ödegaard
6fae264222 feat(plugins): upgraded influxdb to new plugin format 2016-01-14 15:35:14 +01:00
Torkel Ödegaard
8699d49f93 feat(plugins): updated cloudwatch to new plugin style 2016-01-14 15:15:45 +01:00
Torkel Ödegaard
c4ce3293a2 feat(plugins): now solved all cases of loading plugin directives, now just have to upgrade all panels and data sources 2016-01-14 14:37:04 +01:00
Torkel Ödegaard
dbafc8c9db feat(plugins): work on plugin directive loading 2016-01-14 13:21:05 +01:00
Torkel Ödegaard
6c6c3a5081 feat(plugins): more work on how plugins expose directives 2016-01-14 12:35:31 +01:00
Torkel Ödegaard
d420cb38d1 feat(plugins): work on plugin directives loading 2016-01-14 11:21:56 +01:00
Torkel Ödegaard
b55f8215ec feat(apps): work on plugin directives loading 2016-01-13 22:31:29 +01:00
Torkel Ödegaard
08caf4bbde feat(tslint): more tslint work 2016-01-13 21:22:39 +01:00
Torkel Ödegaard
59c928acc2 feat(tslint): added more tslint rules 2016-01-13 21:07:57 +01:00
Torkel Ödegaard
77c362af8d fix(sidemenu): added missing login link 2016-01-13 15:48:12 +01:00
Torkel Ödegaard
534bc83173 temp work on dynamic directives 2016-01-13 14:03:50 +01:00
Torkel Ödegaard
f70252f013 Merge pull request #3661 from mtanda/prometheus_fill_null 
(prometheus) fill null for missing data point
 2016-01-13 11:03:34 +01:00
Torkel Ödegaard
ed989ecc8d Merge branch 'master' of github.com:grafana/grafana 2016-01-13 10:40:58 +01:00
Torkel Ödegaard
a147015e96 fix(playlists): fixed url in playlist view when using sub url, fixes #3711 2016-01-13 10:36:00 +01:00
Mitsuhiro Tanda
c317149a08 add test for prometheus fill null 2016-01-13 15:59:59 +09:00
Mitsuhiro Tanda
ff8b25a50a fix, should fill null at end timestamp 2016-01-13 15:59:59 +09:00
Mitsuhiro Tanda
afa539368f fill null in Prometheus 2016-01-13 15:59:59 +09:00
Torkel Ödegaard
a87b5f757d fix(datasources): minor fix to data sources after apps branch merge 2016-01-12 20:05:40 +01:00
Torkel Ödegaard
e5b3f27a30 Merge branch 'apps' 2016-01-12 15:41:15 +01:00
Torkel Ödegaard
a15984b663 feat(apps): pages work 2016-01-12 15:39:29 +01:00
Carl Bergquist
f7fecdc6de Merge pull request #3655 from grafana/playlist 
Persistable playlists

closes #515
closes #1137
 2016-01-12 15:20:43 +01:00
bergquist
cabefa4fff fix(playlist): fix for timespan -> interval 2016-01-12 14:38:14 +01:00
bergquist
1ec97e5199 feat(playlist): shortens urls 2016-01-12 14:36:04 +01:00
bergquist
e8786b0747 feat(playlist): renames timespan to interval 2016-01-12 13:56:47 +01:00
bergquist
d0bcd1d87c feat(playlist): move playlistSrv to playlist folder 2016-01-12 13:44:23 +01:00
bergquist
c8bd9fd6cc style(playlist): renames variable 2016-01-12 13:42:27 +01:00
Torkel Ödegaard
4c59e48cc2 feat(apps): worked on apps edit view styles 2016-01-12 12:25:07 +01:00
bergquist
85a463faab fix(playlist): remove only parameter to describe 2016-01-12 12:01:27 +01:00
bergquist
feca2871eb tests(playlist): adds ctrl test for playlist edit 2016-01-12 11:57:16 +01:00
Torkel Ödegaard
144c703c7b Merge pull request #3703 from mtanda/cloudwatch_seoul 
(cloudwatch) add seoul region
 2016-01-12 10:51:34 +01:00
Torkel Ödegaard
ae6cae0771 Merge branch 'master' of github.com:grafana/grafana 2016-01-12 10:32:49 +01:00
Torkel Ödegaard
2b99b64ec5 fix(table panel): fixed issue with table panel in optimized builds, closes #3702 2016-01-12 10:32:19 +01:00
Mitsuhiro Tanda
7d8519f5f0 add seoul region 2016-01-12 18:15:29 +09:00
bergquist
07fdf6491c fix(playlist): new url for viewing playlist 2016-01-12 08:17:44 +01:00
bergquist
fb4bb7f53e fix(playlist): remove start button from edit page 2016-01-12 08:17:44 +01:00
bergquist
1da1849de6 fix(playlist): fixes broken search filter 2016-01-12 08:17:44 +01:00
bergquist
98dccb8641 feat(playlist): refactor FE to support playlistitems 2016-01-12 08:17:44 +01:00
Torkel Ödegaard
2fe58461d5 feat(apps): minor fix for images 2016-01-11 22:51:40 +01:00
Torkel Ödegaard
e081a5c5a0 feat(apps): worked on pinning apps 2016-01-11 18:03:08 +01:00
Torkel Ödegaard
66f7a2be15 Merge branch 'snapshot_annotation' of https://github.com/mtanda/grafana into mtanda-snapshot_annotation 2016-01-11 16:35:45 +01:00
Torkel Ödegaard
908b2d151f Merge pull request #3681 from byronmwong/master 
Fix elasticsearch hourly indexes
 2016-01-11 16:29:46 +01:00
Mitsuhiro Tanda
d3bc52278d annotation snapshot fix 2016-01-11 19:26:48 +09:00
Mitsuhiro Tanda
012d1378d4 snapshot annotation 2016-01-11 19:26:48 +09:00
Torkel Ödegaard
4da31291d2 feat(apps): minor progress to apps list 2016-01-11 10:44:04 +01:00
Torkel Ödegaard
c1e94e61d0 feat(apps): lots of more work on apps, changed app_plugin to app_settings in order to to confuse the app plugin model (definition) and app org settings 2016-01-10 21:37:11 +01:00
Torkel Ödegaard
d83e24572a feat(plugins): more refactoring 2016-01-09 23:52:13 +01:00
Torkel Ödegaard
1ffcea1952 feat(plugins): major improvement in plugins golang code 2016-01-09 23:34:20 +01:00
Torkel Ödegaard
35f40b7312 feat(plugins): upgraded opentsdb 2016-01-09 21:54:03 +01:00
Torkel Ödegaard
b76449d151 feat(plugins): upgraded influxdb to new data source plugin model 2016-01-09 21:42:26 +01:00
Torkel Ödegaard
15546dd84e feat(plugins): added better error message when trying to load data source plugin module that is missing datasource constructor 2016-01-09 19:14:59 +01:00
Torkel Ödegaard
ca3405afc5 feat(plugins): moved http settings to directive instad of just ng-include partial 2016-01-09 19:03:03 +01:00
Torkel Ödegaard
36ebfc747a feat(plugins): more upgrading work 2016-01-09 18:44:13 +01:00
Torkel Ödegaard
bc328cbed7 feat(plugins): upgraded Cloudwatch to new plugin schema 2016-01-09 18:36:25 +01:00
Torkel Ödegaard
7ae81a2195 feat(plugins): annotations view work again for elasticsearch 2016-01-09 18:20:43 +01:00
Torkel Ödegaard
cf98a16db0 feat(plugins): made data source custom edit view into a directive instead of html path config in plugin.json 2016-01-09 18:07:42 +01:00
Torkel Ödegaard
f813b4c58f feat(plugins): converted graphite plugin to new format 2016-01-09 13:30:02 +01:00
Torkel Ödegaard
c5635f9c89 feat(plugins): changed what datasources should return, they should now return the datasource constructor 2016-01-09 13:21:16 +01:00
Torkel Ödegaard
d932653c7f feat(apps): minor progress on apps edit view 2016-01-09 11:07:34 +01:00
Torkel Ödegaard
3bb20dbf2e feat(plugins): changed plugin schema, pluginType -> type, type -> id 2016-01-08 23:15:44 +01:00
Torkel Ödegaard
7a8b3c419b feat(apps): lots of progress 2016-01-08 20:57:58 +01:00
Torkel Ödegaard
60e7c6d150 Merge branch 'master' into apps 
Conflicts:
	public/app/partials/sidemenu.html
 2016-01-08 18:10:53 +01:00
Torkel Ödegaard
a9aaa5ad73 Merge branch 'master' of github.com:grafana/grafana 2016-01-08 18:01:20 +01:00
Torkel Ödegaard
6c1fee736b feat(sidemenu): improved user dropdown and sidemenu, will be improved further, #3687 2016-01-08 17:58:46 +01:00
Torkel Ödegaard
f81d2595f9 Merge branch 'sidebar-consolidation' of github.com:nchristus/grafana into sidebar-consolidation 2016-01-08 16:29:10 +01:00
bergquist
455948ad14 fix(playlist): fix broken build. unused vars 2016-01-08 16:24:35 +01:00
bergquist
0918063c55 fix(playlist): move dashboard uri cration to Backend 2016-01-08 16:13:49 +01:00
bergquist
d15b0bf4c4 fix(playlist): move backend code to ctrl 
data loading should be done in the ctrl
 2016-01-08 13:57:00 +01:00
bergquist
01a910fedc style(playlists): use backendsrv direct 
There is no point resolving the playlists in the routes file.
Loading playlists is what the controller is suppose to do
 2016-01-08 13:33:24 +01:00
bergquist
8c05067f88 style(playlist): rename files to match new format 2016-01-08 13:25:30 +01:00
Torkel Ödegaard
f67563e9ee feat(apps): moving things around 2016-01-08 12:45:12 +01:00
Torkel Ödegaard
69d0e82453 Merge branch 'master' into apps 
Conflicts:
	pkg/services/sqlstore/migrations/migrations.go
 2016-01-08 10:20:46 +01:00
Nick Christus
0ee0ea554d sidebar-consolidation: added new org menu to sidebar 2016-01-07 22:49:14 -06:00
Byron
40845578c6 Fix elasticsearch hourly indexes 2016-01-07 14:39:20 -08:00
Volker Fröhlich
f4e22e49b6 Color the annotation bolt (#3590) 
Makes it easier to distinguish between annotations while
editing and using them; Uses the icon color.
 2016-01-07 22:28:03 +01:00
Torkel Ödegaard
8a2af9b818 Merge branch 'v2.6.x' 2016-01-07 22:00:21 +01:00
Torkel Ödegaard
255901ca7c fix(graph panel): fixed bug in typeahead when adding series style override, fixes #3554 2016-01-07 21:59:55 +01:00
Torkel Ödegaard
52644bb28a fix(timepicker): fixed recent breaking of datetime picker when swithing from requirejs to systemjs 2016-01-07 20:52:48 +01:00
bergquist
bcdddfe4e8 style(tooltip): removed comment and extrated sort 2016-01-07 18:09:51 +01:00
bergquist
c4ca1444f9 Merge branch 'hover-order' of https://github.com/hcooper/grafana into hcooper-hover-order 2016-01-07 17:43:04 +01:00
Carl Bergquist
412e7bcdae Merge pull request #3664 from utkarshcmu/recorded 
Improvized dashboard sorting UI
 2016-01-07 10:19:13 +01:00
utkarshcmu
6a9f451091 Better heading 2016-01-06 22:50:25 -08:00
utkarshcmu
a559d59d80 Improvized dashboard sorting 2016-01-06 22:13:22 -08:00
nikita-graf
3fabd2ea1b basic playlist dashboards sort support 2016-01-06 02:05:23 +03:00
bergquist
5de69b288f feat(singlestat): make sparkline height dynamic 
closes #3553
 2016-01-05 19:21:12 +01:00
bergquist
be1fb13162 feat(playlist): minor ux changes for playlists 2016-01-04 15:11:05 +01:00
bergquist
aa83dc15e2 feat(playlist): add search result count 2016-01-04 14:23:24 +01:00
bergquist
7c482064df feat(playlist): improve header 2016-01-04 10:16:00 +01:00
bergquist
c93a3ce227 feat(playlist): make default timespan placeholder 2016-01-04 09:17:47 +01:00
Mitsuhiro Tanda
ebf0bd5fc9 fix end time of Prometheus link 2015-12-31 16:05:04 +09:00
Mitsuhiro Tanda
be48caf59f fix Prometheus link, expand template variable in expression 2015-12-31 16:05:04 +09:00
Qtax
c0cf0cb802 Added an option to set a min-width for the graphs side table/area. 2015-12-29 14:42:52 +01:00
utkarshcmu
b68df56b03 Made Playlist UI user friendly 2015-12-28 04:24:38 -08:00
utkarshcmu
5877e5e11a Merged with master, resolved conflicts 2015-12-24 02:24:59 -08:00
utkarshcmu
71febeb71f Playlist can be run without saving too 2015-12-23 02:38:27 -08:00
utkarshcmu
a292aedd9c Made playlist URL clickable 2015-12-23 02:15:28 -08:00
utkarshcmu
b58e605b99 Added play button 2015-12-23 02:02:48 -08:00
utkarshcmu
7776803890 Removed unused components 2015-12-23 01:46:23 -08:00
Torkel Ödegaard
aa32459bc2 feat(apps): mini update to apps config view 2015-12-22 17:00:21 +01:00
Torkel Ödegaard
41a0995db7 feat(apps): minor progress on app meta data 2015-12-22 16:32:17 +01:00
Torkel Ödegaard
d1145ed3fb Merge branch 'master' into apps 2015-12-22 13:59:25 +01:00
Torkel Ödegaard
f074c1eaff refactor(lodash): changed how lodash is referenced from typescript 2015-12-22 13:59:11 +01:00
Torkel Ödegaard
b8cb5e0367 feat(apps): WIP progress app views 2015-12-22 13:42:48 +01:00
Torkel Ödegaard
7a87c900ee Merge branch 'master' into apps 2015-12-22 12:41:52 +01:00
Torkel Ödegaard
e95170e9fd tech(angularjs): upgrade to angularjs 1.5 2015-12-22 12:24:36 +01:00
Torkel Ödegaard
d0dead0a08 feat(apps): rewrote appsCtrl to app_list_ctrl and to typescript 2015-12-22 12:13:55 +01:00
Torkel Ödegaard
71d718a6e2 fix(systemjs): systemjs config fix for plugins 2015-12-22 11:46:41 +01:00
Torkel Ödegaard
ad94f99d57 refactor(apps): more WIP work on apps 2015-12-22 11:37:44 +01:00
utkarshcmu
bcaaedf2ff Resurrected nikita-graf's work and added playlistType for future use 2015-12-22 02:07:15 -08:00
bergquist
690a6e1a59 feat(graphs): zoom out on double click 2015-12-22 09:56:24 +01:00
woodsaj
0903d5541b Merge branch 'master' of github.com:grafana/grafana into externalPlugin 
Conflicts:
	pkg/api/api.go
	pkg/api/api_plugin.go
	pkg/api/datasources.go
	pkg/api/frontendsettings.go
	pkg/api/index.go
	pkg/plugins/models.go
	pkg/plugins/plugins.go
 2015-12-22 00:23:24 +08:00
Torkel Ödegaard
c19a2e5b45 fix(influxdb): systemjs fix 2015-12-21 16:48:12 +01:00
Torkel Ödegaard
10a764c4f2 fix(less): minor less fix 2015-12-21 16:42:28 +01:00
Torkel Ödegaard
0a9f705308 tech(systemjs): more fixes for optmized build 2015-12-21 16:34:18 +01:00
Torkel Ödegaard
dabd680d6b tech(systemjs): merged sync with master, all tests are passing 2015-12-21 16:13:24 +01:00