root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 243 Packages Projects Releases Wiki Activity
19,409 Commits 1,396 Branches 636 Tags 2.4 GiB
Commit Graph

37 Commits

Author SHA1 Message Date
Julien Pivotto 62417ca69f Remove Origin and Referer headers while proxying requests 
Fix #13949
Fix #13328

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2018-11-08 14:57:47 +01:00
Erik Sundell 56e8e50497 Stackdriver: Use ds_auth_provider in stackdriver. This will make sure the token is renewed when it has exporired 2018-09-14 09:38:16 +02:00
Erik Sundell 6a610558c4 Stackdriver: Start breaking out apply route to its own file 2018-09-14 09:38:16 +02:00
Erik Sundell 23339e4322 Stackdriver: Use new access token API 2018-09-14 09:35:28 +02:00
Daniel Lee e7648c4070 dsproxy: implements support for plugin routes with jwt file 
Google Cloud service accounts use a JWT token to get an
oauth access token. This adds support for that.
 2018-09-14 09:35:27 +02:00
Erik Sundell a4ef4792bc Stackdriver: Add scope for google resource manager 2018-09-14 09:35:26 +02:00
Erik Sundell 350bcf4f56 Fixed broken if statement 2018-09-14 09:35:26 +02:00
Erik Sundell 7197a4c17f Adds jwt token signing google auth 2018-09-14 09:35:26 +02:00
Erik Sundell ef3beb1f0e Adds poc code for retrieving google auth accesstoken 2018-09-14 09:33:50 +02:00
Daniel Lee c75e071213 dsproxy: interpolate route url 
Allows for dynamic urls for plugin routes. There are a few plugins
where the route url should be configurable and this change allows
using jsonData fields in the url field for a route in the
plugin.json file for a plugin.
 2018-08-18 16:02:49 +02:00
Marcus Efraimsson 13921902b5
Set User-Agent header in all proxied datasource requests 
Header value will be Grafana/%version%, i.e. Grafana/5.3.0
 2018-08-15 09:46:59 +02:00
Torkel Ödegaard 2459b177f9 change: Set User-Agent to Grafana/%Version% Proxied-DS-Request %DS-Type% in all proxied ds requests 2018-08-13 18:09:01 +02:00
Carl Bergquist 828fb39ee2
Merge pull request #11643 from mrsiano/generic_oauth 
Pass configured/auth headers to a Datasource.
 2018-06-21 14:21:59 +02:00
mrsiano cc1e3a0e3c Pass configured/auth headers to a Datasource. 
In some setups (ex openshift), the Datasource will require Grafana
to pass oauth token as header when sending queries.
Also, this PR allow to send any header which is something
Grafana currently does not support.
 2018-06-21 14:58:05 +03:00
Daniel Lee 10d30f0b73 dsproxy: move http client variable back 
After refactoring to be able to mock the client in
a test, the client wasn't a global variable anymore.
This change moves the client back to being a package-
level variable.
 2018-06-14 13:39:46 +02:00
Daniel Lee 719ebdc24d dsproxy: allow multiple access tokens per datasource 
Changes the cache key for tokens to cache on datasource id +
route path + http method instead of just datasource id.
 2018-06-12 17:39:38 +02:00
Daniel Lee 9413ce5ef6
Merge pull request #8096 from ryantxu/influx-db-query2 
let the influxdb API set a database
 2018-04-13 18:22:12 +02:00
Carl Bergquist 980e078222
Merge pull request #11326 from bergquist/more_traces 
dataproxy: adds dashboardid and panelid as tags
 2018-03-23 17:13:15 +01:00
Julian Kornberger 0a415c50d0 Make golint happier 2018-03-22 22:38:44 +01:00
bergquist f142548969 dataproxy: adds dashboardid and panelid as tags 
closes #11315
 2018-03-20 22:23:28 +01:00
ryan a04c4ba454 allow any database for influx proxy 2018-03-15 13:01:17 +01:00
ryan ad88e5398c remove 2018-03-15 12:57:09 +01:00
ryan 4f8ee9f5a7 merge with master 2018-03-14 23:52:24 +01:00
Mitsuhiro Tanda a83ede0193 support POST for query and query_range 2018-03-12 13:25:05 +09:00
Dan Cech c0ecdee375
rename Context to ReqContext 2018-03-07 11:54:50 -05:00
Dan Cech 338655dd37
move Context and session out of middleware 2018-03-06 18:16:49 -05:00
Robin Gustafsson cf7a49977f proxyds: delete cookies except those listed in keepCookies 2017-12-14 11:46:44 +01:00
ryan fb9c714a9a run go fmt 2017-10-18 23:49:33 +02:00
ryan 4440133f4d Add a setting to allow DB queries 2017-10-18 23:33:10 +02:00
Mitsuhiro Tanda 4f5f38f41b remove old handler 2017-09-29 13:45:11 +09:00
bergquist ee2e4c6567 add trace headers for outgoing requests 2017-09-18 11:08:58 +02:00
bergquist 3c8133aa4b add traces for datasource reverse proxy requests 2017-09-18 11:08:58 +02:00
Torkel Ödegaard 71c22fdbff dataproxy: removed some logging, closes #9078 2017-08-24 11:18:06 +02:00
Torkel Ödegaard 71c9582944 data source with token auth is starting to work, #9078 2017-08-24 11:07:37 +02:00
Torkel Ödegaard 3c9798bec9 datasource-proxy: token exchange 2017-08-23 17:18:43 +02:00
Torkel Ödegaard 8bf49c51b9 dataproxy: refactoring data source proxy to support route templates and wrote more tests for data proxy code, #9078 2017-08-23 10:52:31 +02:00
Torkel Ödegaard 63d6ab476a feat: data source proxy refactoring and route handling, #9078 2017-08-22 17:14:15 +02:00