Dieter Plaetinck
bf943ddba3
actually make use of the LogLevel type
...
why else would it be defined?
and this is sane anyway.
2016-02-01 17:48:42 +13:00
Torkel Ödegaard
3f945e886b
merge sync with master
2016-01-31 19:51:23 +01: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
bergquist
34eb5acee7
feat(dataproxy): remove 'SetCookie' from reponse
...
set cookie could potentialll leak information about the
datasource if in proxy mode.
closes #3845
2016-01-29 23:17:11 +01: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
bergquist
d405176367
chore(playlist): remove commented code
2016-01-29 20:33:01 +01:00
bergquist
15087251fb
test(playlist): add test for playlist sqlstoretest(playlist): add test for playlist sqlstoretest(playlist): add test for playlist sqlstoretest(playlist): add test for playlist sqlstoretest(playlist): add test for playlist sqlstoretest(playlist): add test for playlist sqlstoretest(playlist): add test for playlist sqlstoretest(playlist): add test for playlist sqlstoretest(playlist): add test for playlist sqlstore
2016-01-29 20:24:19 +01:00
bergquist
73d6b95339
chore(playlist): remove unused code
2016-01-29 20:24:06 +01:00
Daniel Lee
74decb4bdc
fix(dataproxy): no trailing slash if proxypath is empty
...
The JoinUrlFragments function adds a trailing slash if to the proxy url
if the proxy path is an empty string. This fix removes that trailing
slash. Fixes #3847
2016-01-29 18:44:33 +01:00
Anthony Woods
2e9272c778
Merge remote-tracking branch 'upstream/master' into apiPlugin
2016-01-30 01:38:01 +08:00
Anthony Woods
79e7ae4424
fix sql query in GetAdminStats. fixes #3883
2016-01-29 09:38:51 +08:00
bergquist
d27bb4d3fb
style(playlist): move dashboard access to dashboard.go
2016-01-29 01:41:23 +01:00
bergquist
64a18874e1
style(playlist): remove unused code
2016-01-29 01:23:51 +01:00
bergquist
d66932a8a2
chore(playlist): extract playlist start into new file
2016-01-28 23:56:56 +01:00
utkarshcmu
972ac99b7c
Added more metadata
2016-01-28 09:53:19 -08:00
utkarshcmu
b30dcce4bc
Added dtos and UI for more metadata
2016-01-28 00:52:52 -08:00
utkarshcmu
58121d89fc
Updated http_api docs
2016-01-27 22:02:33 -08:00
utkarshcmu
6a1192172d
Api stores dashboard creator
2016-01-27 21:55:54 -08:00
utkarshcmu
8bd07287f8
Fixed dashboard_tag query
2016-01-27 17:41:23 -08:00
utkarshcmu
753fd164d7
Added createdBy in metadata ui and dashboard table
2016-01-27 17:11:21 -08: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
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
utkarshcmu
442db7fee1
Changed sql query for grafana_admin_count
2016-01-25 14:30:36 -08:00
Anthony Woods
c8c337cead
use PBKDF2 to esnure key is 23bytes.
2016-01-26 05:15:29 +08:00
bergquist
92cba94031
tech(fmt): remove unused code
2016-01-25 22:11:24 +01:00
bergquist
52403ca17e
feat(playlist): add usage statisics
2016-01-25 21:39:45 +01:00
Anthony Woods
05868bc1df
fix typo
2016-01-26 04:24:44 +08:00
Anthony Woods
092bb69c41
instead of padding with 0's, cycle through the secret.
2016-01-26 04:18:44 +08:00
Anthony Woods
40d946a6e3
add drop table to ensure existing installs get new schema
2016-01-26 04:18:18 +08:00
Torkel Ödegaard
11e35f7b68
Merge remote-tracking branch 'origin/master' into panelbase
2016-01-25 10:00:25 -05:00
utkarshcmu
2190392e05
Added grafana_admins count
2016-01-25 00:39:31 -08:00
utkarshcmu
da67afa51e
Fixed api bugs, stats endpoint working
2016-01-24 21:18:17 -08:00
Torkel Ödegaard
4f7fb40d9b
feat(panel plugin): improving panel plugin model
2016-01-24 16:39:25 -05:00
utkarshcmu
c7fae5386d
Added backend API for stats
2016-01-24 11:01:33 -08: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
Anthony Woods
ab3b586838
add encryption util functions
2016-01-23 03:15:39 +08:00
Anthony Woods
f94599cd29
merge apiPlugins with appPlugins
2016-01-22 01:15:04 +08: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
Anthony Woods
1bca28ad12
include the jsonData in the AppSettings DTO
2016-01-21 02:23:24 +08: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
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
Torkel Ödegaard
7a26d309b1
feat(apps): more work on apps and how apps can include panels
2016-01-19 18:18:53 +01:00
