public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,626 Commits 655 Branches 650 Tags
ef19e2edceda26fb58e86bb83aedba73e9246d2a
Commit Graph

61 Commits

Author SHA1 Message Date
Serge Zaitsev
e42a597e87 Remove unused Macaron code and interfaces (#37194) 2021-07-26 11:47:13 +02:00
idafurjes
60ac54d969 Chore: Refactor OAuth/social package to service (#35403) 
* Creating SocialService

* Add GetOAuthProviders as socialService method

* Add OAuthTokenService

* Add GetOAuthHttpClient method to SocialService

* Rename services, access socialMap from GetConnector

* Fix tests by mocking oauthtoken methods

* Move NewAuthService into Init

* Move OAuthService to social pkg

* Refactor OAuthService to OAuthProvider

* Fix nil map error, rename file, simplify tests

* Fix bug for Forward OAuth Identify

* Remove file after rebase
 2021-07-07 08:54:17 +02:00
Marcus Efraimsson
348e76fc8e Datasource: Shared HTTP client provider for core backend data sources and any data source using the data source proxy (#33439) 
Uses new httpclient package from grafana-plugin-sdk-go introduced 
via grafana/grafana-plugin-sdk-go#328. 
Replaces the GetHTTPClient, GetTransport, GetTLSConfig methods defined 
on DataSource model.
Longer-term the goal is to migrate core HTTP backend data sources to use the 
SDK contracts and using httpclient.Provider for creating HTTP clients and such.

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
 2021-05-19 23:53:41 +02:00
Sergey Kostrukov
81f6c806e1 Azure token provider with support for Managed Identities (#33807) 
* Azure token provider

* Configuration for Azure token provider

* Authentication via Azure SDK for Go

* Fix typo

* ConcurrentTokenCache for Azure credentials

* Resolve AAD authority for selected Azure cloud

* Fixes

* Generic AccessToken and fixes

* Tests and wordings

* Tests for getAccessToken

* Tests for getClientSecretCredential

* Tests for token cache
 2021-05-14 13:59:07 +02:00
Sergey Kostrukov
19f520d891 PluginProxy: Split implementations of token providers (#32820) 
* Split implementations of token providers

* Fix imports

* Fix code racing in unit tests
 2021-05-03 13:46:32 +01:00
Owen Diehl
dadccdda06 Allows posting to prom rules endpoints via ds_proxy (#32946) 
* allows posting to prom rules endpoints via ds_proxy

* prom proxy routes via plugin and fix proxy route matching bug

* bump ci
 2021-04-14 13:06:20 -04:00
Marcus Efraimsson
aad43869c3 Plugins: Support set body content in plugin routes (#32551) 
Adds support for overriding the body and length in plugin routes.
 2021-03-31 16:38:35 +02:00
Marcus Efraimsson
c0edf88f9f Data proxy: Fix encoded characters in URL path should be proxied encoded (#30597) 
Fix encoded characters in URL path should be proxied as encoded in the data proxy.

Fixes #26870 
Fixes #31438

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
 2021-03-17 12:17:41 +01:00
Arve Knudsen
b79e61656a Introduce TSDB service (#31520) 
* Introduce TSDB service

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

Co-authored-by: Erik Sundell <erik.sundell87@gmail.com>
Co-authored-by: Will Browne <will.browne@grafana.com>
Co-authored-by: Torkel Ödegaard <torkel@grafana.org>
Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>
 2021-03-08 07:02:49 +01:00
Arve Knudsen
ac09baae7d Chore: Use Header.Set method instead of Header.Add (#29804) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-12-14 15:13:01 +01:00
Arve Knudsen
e503188b6f Data source proxy: Convert 401 from data source to 400 (#28962) 
* Data source proxy: Convert 401 from data source to 400

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-11-13 13:21:43 +01:00
Arve Knudsen
cb62e69997 Chore: Convert API tests to standard Go lib (#29009) 
* Chore: Convert tests to standard Go lib

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
 2020-11-13 09:52:38 +01:00
Arve Knudsen
4084b53f91 plugins: Don't exit on duplicate plugin (#28390) 
* plugins: Don't exit on duplicate plugin

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Add missing files

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Fix test

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-10-21 12:39:41 +02:00
Domas
564d7ecea7 DataProxy: Ignore empty URL's in plugin routes (#27653) 
This adds a check to see if plugin route URL is empty, and in such case 
does not modify request schema and host of the request to be proxied.
This behavior is now the same as in the plugin proxy.
 2020-09-18 13:22:07 +02:00
Bill Oley
19caa100dc OAuth: Fix token refresh failure when custom SSL settings are configured for OAuth provider (#27523) 
OAuth token refresh fails when custom SSL settings are configured for 
oauth provider. These changes makes sure that custom SSL settings 
are applied for HTTP client before refreshing token.

Fixes #27514
 2020-09-11 17:25:03 +02:00
Arve Knudsen
41d432b5ae Chore: Enable whitespace linter (#25903) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-07-06 20:17:28 +02:00
Arve Knudsen
3651a8e976 Chore: Disable scopelint for tests (#25923) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-06-30 11:05:47 +02:00
Arve Knudsen
d1e6214a4a Chore: Enable scopelint Go linter (#25896) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-06-29 17:04:38 +02:00
Arve Knudsen
d352c213b3 API: Recognize MSSQL data source URLs (#25629) 
* API: Recognize MSSQL URLs

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Move MSSQL URL validation into mssql package

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-06-17 11:17:11 +02:00
Arve Knudsen
164242f5fd Data sources: Don't fail if URL doesn't specify protocol (#24497) 2020-05-12 13:04:18 +02:00
Mario Trangoni
5116420e9a Fix misspell issues (#23905) 
* Fix misspell issues

See,
$ golangci-lint run --timeout 10m --disable-all -E misspell ./...

Signed-off-by: Mario Trangoni <mjtrangoni@gmail.com>

* Fix codespell issues

See,
$ codespell -S './.git*' -L 'uint,thru,pres,unknwon,serie,referer,uptodate,durationm'

Signed-off-by: Mario Trangoni <mjtrangoni@gmail.com>

* ci please?

* non-empty commit - ci?

* Trigger build

Co-authored-by: bergquist <carl.bergquist@gmail.com>
Co-authored-by: Kyle Brandt <kyle@grafana.com>
 2020-04-29 21:37:21 +02:00
Daniel Lee
52154b465b dsproxy: adds support for url params for plugin routes (#23503) 
* dsproxy: adds support for url params for plugin routes

* docs: fixes after review

* pluginproxy: rename Params to URLParams

* Update pkg/plugins/app_plugin.go

Co-Authored-By: Arve Knudsen <arve.knudsen@gmail.com>

* Apply suggestions from code review

Co-Authored-By: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
Co-Authored-By: Arve Knudsen <arve.knudsen@gmail.com>

* pluginproxy: rename struct

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
 2020-04-24 10:32:13 +02:00
Arve Knudsen
7d88018531 DataSourceProxy: Handle URL parsing error (#23731) 
* pluginproxy: Handle URL parsing error
* pkg/api: Validate data source URLs
* pkg/api: Return 400 for URL validation error
 2020-04-22 10:30:06 +02:00
Carl Bergquist
3fdd2648b1 Chore: Avoid aliasing importing models in api package (#22492) 2020-03-04 12:57:20 +01:00
Marcus Efraimsson
3fc5f4552a CloudWatch: Fix high CPU load (#20579) 
* Cache decrypted securejsondata
* Models: Add datasource cache tests
 2019-11-22 14:21:23 +01:00
Weeco
8cd93f0b88 Datasource: Add custom headers on alerting queries (#19508) 
* Add custom headers on alerting queries

Reference issue #15381

Signed-off-by: Martin Schneppenheim <martin.schneppenheim@rewe-digital.com>

* Fix datasource transport tests

* Migrate decrypting header test to models pkg

* Check correct header

* Add HTTP transport test

Fixes #15381
 2019-10-11 14:28:52 +02:00
Arve Knudsen
0a2d5e16dd pkg/api: Check errors (#19657) 
* pkg/api: Check errors
* pkg/api: Remove unused function HashEmail
 2019-10-08 18:57:53 +02:00
Oleg Gaidarenko
caa1314f44 Build: use golangci-lint as a make command (#17739) 
* Build: use golangci-lint as a make command

* Since gometalinter was deprecated in favor of golangci-lint so it was
  replaced by it. Responsibilities held by the gometalinter was moved to
  golangci-lint

* There was some changes in implementation (that was also mentioned in
  the code comment) between the tools, which uncovered couple errors
  in the code. Those issues were either solved or disabled by
  the inline comments

* Introduce the golangci-lint config, to make their
  configuration more manageable

* Build: replace backend-lint.sh script with make
 2019-07-02 16:06:59 +03:00
zhulongcheng
2fff8f77dc move log package to /infra (#17023) 
ref #14679

Signed-off-by: zhulongcheng <zhulongcheng.me@gmail.com>
 2019-05-13 08:45:54 +02:00
Marcus Efraimsson
e210725d3d DataProxy: Restore Set-Cookie header after proxy request (#16838) 
If Grafana rotates the user's auth token during a request to the data 
source proxy it will set the Set-Cookie header with new auth token in 
response before proxying the request to the datasource.
Before this fix the Set-Cookie response header was cleared after the 
proxied request was finished to make sure that proxied datasources 
cannot affect cookies in users browsers. This had the consequence 
of accidentally also clearing the new auth token set in Set-Cookie 
header.
With this fix the original Set-Cookie value in response header is now 
restored after the proxied datasource request is finished. The existing
logic of clearing Set-Cookie response header from proxied request 
have been left intact.

Fixes #16757
 2019-05-01 16:32:03 +02:00
Andrej Ocenas
66f6e16916 Security: Store datasource passwords encrypted in secureJsonData (#16175) 
* Store passwords in secureJsonData

* Revert unnecessary refactors

* Fix for nil jsonSecureData value

* Remove copied encryption code from migration

* Fix wrong field reference

* Remove migration and provisioning changes

* Use password getters in datasource proxy

* Refactor password handling in datasource configs

* Add provisioning warnings

* Update documentation

* Remove migration command, moved to separate PR

* Remove unused code

* Set the upgrade version

* Remove unused code

* Remove double reference
 2019-04-15 11:11:17 +02:00
Sean Lafferty
3f9a19dcd5 Merge branch 'master' into 12556-oauth-pass-thru 2019-03-14 13:18:00 -04:00
Andrej Ocenas
697a87b7b2 Add check so that header is not sent for anonymous users 2019-03-14 16:33:21 +01:00
Andrej Ocenas
bbdc1c0e64 Add custom header with grafana user and a config switch for it 2019-03-14 16:33:19 +01:00
Sean Lafferty
fcc18d8121 Change import path for social in the tests 2019-03-13 14:55:22 -04:00
Sean Lafferty
4324a7f51a Remove auth module from ds_proxy oauth test 2019-03-13 13:28:49 -04:00
Sean Lafferty
5a59cdf0ef Add oauth pass-thru option for datasources 2019-02-01 19:40:57 -05:00
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
Marcus Efraimsson
2b1e4d001a Merge pull request #13326 from ryantxu/proxy-slash 
Keep trailing slash for datasource proxy requests
 2018-10-04 14:38:34 +02:00
Marcus Efraimsson
8bf4d68035 add datasource proxy test to verify trailing slashes are forwarded 2018-10-03 12:28:30 +02:00
Ryan McKinley
7c6227c061 remove the test that does not do anything 2018-09-18 11:18:55 -07:00
Ryan McKinley
71dfeff782 add a test 2018-09-17 12:28:36 -07: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
db170845b0 Stackdriver: Restructured ds proxy tests 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
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
4f704cec53 fix: ds_proxy test not initiating header 2018-08-14 09:18:23 +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