IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-26 02:40:26 -06:00
Code Issues Packages Projects Releases Wiki Activity
5,554 Commits 5,087 Branches 538 Tags 1.9 GiB
4a8f82ca9b
Commit Graph

5554 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Torkel Ödegaard
4a8f82ca9b fix(image rendering): fixed issue with image rendering, fixes #3804 2016-01-21 10:10:32 +01:00
Torkel Ödegaard
f2ce8f266b Merge pull request #3810 from raintank/apiPlugin 
ApiPlugin custom header support
 2016-01-21 08:32:26 +01:00
Anthony Woods
dcde1422b7 add support for apiPlugin headers. 
The header content uses text/Template.  If the apiPlugin is
bundled in an App, then the appSettings.JsonData is passed
to the header template.
 2016-01-21 11:41:59 +08:00
Anthony Woods
423eca6e7d add support for fetching appSettings by appId 2016-01-21 11:41:02 +08:00
Anthony Woods
fd52320460 set includedAppId of apiPlugins 2016-01-21 11:39:51 +08:00
Anthony Woods
462608517b set pluginDir of apiPlugin object 2016-01-21 11:38:27 +08:00
Anthony Woods
9586493632 add apiPluginHeader support 2016-01-21 11:37:48 +08: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
1bca28ad12 include the jsonData in the AppSettings DTO 2016-01-21 02:23:24 +08: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
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
32ffedccda Merge pull request #3798 from mtanda/prometheus_doc_metrics 
(prometheus) add explanation about incompatibility of metric find query
 2016-01-20 10:43:37 +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
Mitsuhiro Tanda
d0074b25db (prometheus) add explanation about incompatibility of metric find query 2016-01-20 18:30:17 +09:00
Torkel Ödegaard
fb82425d3e Merge pull request #3797 from utkarshcmu/playlist-unused 
Removed unused component from playlist code
 2016-01-20 08:59:03 +01:00
Torkel Ödegaard
f30df8bb57 Merge pull request #3795 from raintank/apiPlugin 
get apiPlugins working again.
 2016-01-20 07:42:36 +01:00
utkarshcmu
1c5be92259 Removed unused component from playlist code 2016-01-19 17:15:24 -08:00
Anthony Woods
92a085550e fix up imports 2016-01-20 06:17:48 +08:00
Anthony Woods
c4a0ec844c get apiPlugins working again. 2016-01-20 06:13:45 +08:00
bergquist
36e99ac531 feat(tech): force create symlinks 2016-01-19 21:46:43 +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
Torkel Ödegaard
6b85a6fd78 feat(apps): minor design update for apps view 2016-01-19 11:54:35 +01:00
Torkel Ödegaard
db1ba30df7 Merge pull request #3789 from utkarshcmu/snap-bug 
Snapshot name is saved in DB now Fixes #3768
 2016-01-19 10:34:04 +01:00
utkarshcmu
1952ebf7c4 Fixed failing gofmt tests 2016-01-19 00:33:30 -08:00
utkarshcmu
70481953fd Snapshot name is saved in DB now 2016-01-19 00:26:20 -08:00
Carl Bergquist
870775e863 Merge pull request #3788 from utkarshcmu/grunt-test 
Fix failing circleci
 2016-01-19 09:13:20 +01: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
Torkel Ödegaard
a9e05c77d1 Merge pull request #3780 from msambol/graphite_doc 
Fix grammatical error in graphite datasource doc
 2016-01-18 18:09:33 +01:00
Michael Sambol
3418db1dcd Fix grammatical error in graphite datasource doc 
Replace "you" with "your".
 2016-01-18 10:41:14 -06:00
bergquist
d94896cf10 feat(build): make symlink script executible 2016-01-18 17:31:53 +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
c12aa0e8ce feat(hooks): add scripts for symlinking git hooks 2016-01-18 14:41:17 +01:00
bergquist
61a655f199 feat(hooks): add grunt test to pre commit 2016-01-18 14:37:53 +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