54 Commits (b9e53f628fa65664e92353d46fe90d6de66e9ddf)

Author	SHA1	Message	Date
venkatbvc	b9e53f628f	HTTP: Add TLS version configurability for Grafana server (#67482) ... Co-authored-by: Rao B V Chalapathi <b_v_chalapathi.rao@nokia.com> Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>	2 years ago
Serge Zaitsev	aebcecf538	Chore: Fix goimports grouping in other backend platform packages (#62422) ... * fix goimports * fix goimports order * fix goimports order * fix goimports order * fix goimports order * fix goimports order	2 years ago
Ben Sully	632ca67e3f	Add a separate grafana.com API URL setting (#59506) ... The GrafanaComURL setting is currently used in two places: - the /api/gnet endpoint, which proxies all requests to the URL configured in GrafanaComURL - OAuth logins using grafana.com, where the auth URL, token URL and redirect URL are all configured to use the GrafanaComURL. This has worked fine until now because almost all Grafana instances have just used the default value, https://grafana.com. However, we now have a few different grafana.com's, some of which are behind IAP. The IAP causes the /api/gnet proxy to fail because the required cookies are not present in the request (how could they be?). Setting the [grafana_net.url] setting to an internal-only URL improves the situation slightly - the proxy works again just fine - but breaks any OAuth logins using grafana.com, because the user must be redirected to a publicly accessible URL. This commit adds an additional setting, `[grafana_com.api_url]`, which can be used to tell Grafana to use the new API URL when proxying requests to the grafana.com API, while still using the existing `GrafanaComURL` setting for other things. The setting will fall back to the GrafanaComURL setting + "/api" if unset.	3 years ago
George Robinson	bda47df4ad	Alerting: Invalid setting of enabled for unified alerting should return error (#49876)	3 years ago
Emil Tullstedt	39096208ed	Settings: Sunset non-duration based login lifetime config (#49944)	3 years ago
Karl Persson	389eec089e	AuthProxy: Remove deprecated ldap_sync_ttl setting (#49902) ... * Remove deprecated ldap_sync_ttl	3 years ago
George Robinson	3b7f871bf4	Alerting: Enable Unified Alerting for open source and enterprise (#49834) ... This commit enables Unified Alerting for open source and enterprise unless disabled in configuration.	3 years ago
Yuriy Tseretyan	005c8f8894	Alerting: Disable unified alerting by default in Enterprise Grafana (#42476) ... * fallback to enable false if Enterprise is true * anyBoolean	4 years ago
Armand Grillet	6523486122	Alerting: Make Unified Alerting enabled by default for those who do not use legacy alerting (#42200) ... * update AlertingEnabled and UnifiedAlertingSettings.Enabled to be pointers * add a pseudo migration to fix the AlertingEnabled and UnifiedAlertingSettings.Enabled if the latter is not defined * update the default configuration file to make default value for both 'enabled' flags be undefined Misc * update Migrator to expose DB engine. This is needed for a ualert migration to access the database while the list of migrations is created. * add more verbose failure when migrations do not match Co-authored-by: gotjosh <josue@grafana.com> Co-authored-by: Yuriy Tseretyan <yuriy.tseretyan@grafana.com> Co-authored-by: gillesdemey <gilles.de.mey@gmail.com>	4 years ago
ying-jeanne	54de1078c8	remove the global log error/warn etc functions (#41404) ... * remove the global log error/warn etc functions and use request context logger whenever possible	4 years ago
Serge Zaitsev	22b428836e	Chore: Refactor GoConvey in setting package (#40861)	4 years ago
Sofia Papagiannaki	012d4f0905	Alerting: Remove `ngalert` feature toggle and introduce two new settings for enabling Grafana 8 alerts and disabling them for specific organisations (#38746) ... * Remove `ngalert` feature toggle * Update frontend Remove all references of ngalert feature toggle * Update docs * Disable unified alerting for specific orgs * Add backend tests * Apply suggestions from code review Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com> * Disabled unified alerting by default * Ensure backward compatibility with old ngalert feature toggle * Apply suggestions from code review Co-authored-by: gotjosh <josue@grafana.com>	4 years ago
Carl Bergquist	cbf16bebc6	CDN: always look for files in the root folder (#39092) ... Signed-off-by: bergquist <carl.bergquist@gmail.com>	4 years ago
Arve Knudsen	78596a6756	Migrate to Wire for dependency injection (#32289) ... Fixes #30144 Co-authored-by: dsotirakis <sotirakis.dim@gmail.com> Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com> Co-authored-by: Ida Furjesova <ida.furjesova@grafana.com> Co-authored-by: Jack Westbrook <jack.westbrook@gmail.com> Co-authored-by: Will Browne <wbrowne@users.noreply.github.com> Co-authored-by: Leon Sorokin <leeoniya@gmail.com> Co-authored-by: Andrej Ocenas <mr.ocenas@gmail.com> Co-authored-by: spinillos <selenepinillos@gmail.com> Co-authored-by: Karl Persson <kalle.persson@grafana.com> Co-authored-by: Leonard Gram <leo@xlson.com>	4 years ago
Alexander Emelin	6b2d33dc14	fix sample.ini (#37106)	4 years ago
kay delaney	8143991b94	Security: Update default CSP template and fix firefox CSP issues (#34836) ... * Security: Update default content_security_policy_template - Add 'strict-dynamic' back to script-src - Add ws(s)://$ROOT_PATH to connect-src - Change onEvent to on-event in angular templates to fix CSP issues in firefox. - Add blob: to style-src	4 years ago
Serge Zaitsev	da13f88862	Redact sensitive values before logging them (#33829) ... * use a common way to redact sensitive values before logging them * fix panic on missing testCase.err, simplify require checks * fix a silly typo * combine readConfig and buildConnectionString methods, as they are closely related	4 years ago
Torkel Ödegaard	64254eaa82	CDN: Fixes cdn path when Grafana is under sub path (#30822)	4 years ago
Torkel Ödegaard	c04bc805b5	CDN: Adds support for serving assets over a CDN (#30691) ... * CDN: Initial poc support for serving assets over a CDN * Minor fix * added build path and test * fix lint error * Added edition to cdn path * Move master builds to a separate path * Added error handling for the url parsing, changed setting name, and added docs * Updated sample.ini * Some property renames * updated * Minor update to html * index template improvements * Update docs/sources/administration/configuration.md Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com> * Update docs/sources/administration/configuration.md Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com> * Added ContentDeliveryPrefix to Licence service * updated docs * Updated test mock Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>	4 years ago
Sofia Papagiannaki	fd1b2904cd	Fix default maximum lifetime an authenticated user can be logged in (#30030)	5 years ago
Arve Knudsen	dd2d206d99	Backend: Remove more globals (#29644) ... Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	5 years ago
Arve Knudsen	c2cad26ca9	Chore: Disable default golangci-lint filter (#29751) ... * Disable default golangci-lint filter Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Chore: Fix linter warnings Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	5 years ago
Arve Knudsen	12661e8a9d	Move middleware context handler logic to service (#29605) ... * middleware: Move context handler to own service Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> Co-authored-by: Emil Tullsted <sakjur@users.noreply.github.com> Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>	5 years ago
Arve Knudsen	494c20db5f	gtime: Add ParseDuration function (#28525) ... * gtime: Make calculations independent of current time Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Introduce gtime.ParseDuration function Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * gtime: Fix ParseDuration Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	5 years ago
Hansuuuuuuuuuu	8d971ab2f2	Auth: Replace maximum inactive/lifetime settings of days to duration (#27150) ... Allows login_maximum_inactive_lifetime_duration and login_maximum_lifetime_duration to be configured using time.Duration-compatible values while retaining backward compatibility. Fixes #17554 Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>	5 years ago
Torkel Ödegaard	5c31f07904	Settings: Remove unnessary error handling code (#27420) ... * Settings: Remove unnecessary error handling code Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>	5 years ago
Joan López de la Franca Beltran	c91bfd8299	Core: Add loki/logproto dependency (#27124) ... * Add grafana/loki dependency and update its dependencies * Update grpcplugin log_wrapper to implement the latest version of hclog.Logger * Remove panic handling + test case no longer needed since the source of panics (bug) was fixed	5 years ago
Arve Knudsen	41d432b5ae	Chore: Enable whitespace linter (#25903) ... Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	5 years ago
Sofia Papagiannaki	be022d4239	API: Fix redirect issues (#22285) ... * Revert "API: Fix redirect issue when configured to use a subpath (#21652)" (#22671) This reverts commit 0e2d874ecf. * Fix redirect validation (#22675) * Chore: Add test for parse of app url and app sub url Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com> * Fix redirect: prepend subpath only if it's missing (#22676) * Validate redirect in login oauth (#22677) * Fix invalid redirect for authenticated user (#22678) * Login: Use correct path for OAuth logos Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>	5 years ago
Jon Gyllenswärd	53f8088316	Auth Proxy: replace ini setting ldap_sync_ttl with sync_ttl (#20191) ... * Renamed ttl config in code to be more consistent with behaviour * Introduced new setting `sync_ttl` in .ini file * Keeping the old setting `ldap_sync_ttl` in the .ini file as fallback and compatibility.	6 years ago
Arve Knudsen	8ba5509614	pkg/setting: Check errors (#19838) ... Check errors in pkg/setting.	6 years ago
Kyle Brandt	49f0f0e89e	config: fix connstr for remote_cache (#17675) ... fixes #17643 and adds test to check for commented out lines (but will only catch `;`, not `#`).	6 years ago
Mario Trangoni	ab4e1526b3	Codestyle: Fix some goconst issues (#17530) ... Signed-off-by: Mario Trangoni <mjtrangoni@gmail.com>	6 years ago
Hofls	b3bfbc6f77	Config: Show user-friendly error message instead of stack trace (#16564) ... Fixes #16283	6 years ago
Oleg Gaidarenko	db584b3d28	Chore: remove session storage references (#16445) ... * Chore: remove session storage references * Small refactoring of the settings module * Update docs - remove references for the session storage * Update config files (sample and default configs) * Add tests for warning during the config load on defined storage cache * Remove all references to session storage * Remove macaron session dependency * Remove leftovers * Fix: address review comments * Fix: remove old deps * Fix: add skipStaticRootValidation = true to tests * Fix: improve the docs and warning message As per discussion in here - https://github.com/grafana/grafana/pull/16445/files#r273026255 * Chore: make linter happy Fixes #16148 Ref #16114	6 years ago
Torkel Ödegaard	d5d8d7efa6	minor setting refactorings	7 years ago
Nick Triller	f8ca55bb1f	Fix setting test	7 years ago
bergquist	8e5000fb31	moves files from /tests to more appropriate folders ... ref #11433	7 years ago
Anthony Woods	5c0fbbf7c8	improve remote image rendering (#13102) ... * improve remote image rendering - determine "domain" during Init() so we are not re-parsing settings on every request - if using http-mode via a rednererUrl, then use the AppUrl for the page that the renderer loads. When in http-mode the renderer is likely running on another server so trying to use the localhost or even the specific IP:PORT grafana is listening on wont work. - apply the request timeout via a context rather then directly on the http client. - use a global http client so we can take advantage of connection re-use - log and handle errors better. * ensure imagesDir exists * allow users to define callback_url for remote rendering - allow users to define the url that a remote rendering service should use for connecting back to the grafana instance. By default the "root_url" is used. * improve remote image rendering - determine "domain" during Init() so we are not re-parsing settings on every request - if using http-mode via a rednererUrl, then use the AppUrl for the page that the renderer loads. When in http-mode the renderer is likely running on another server so trying to use the localhost or even the specific IP:PORT grafana is listening on wont work. - apply the request timeout via a context rather then directly on the http client. - use a global http client so we can take advantage of connection re-use - log and handle errors better. * ensure imagesDir exists * allow users to define callback_url for remote rendering - allow users to define the url that a remote rendering service should use for connecting back to the grafana instance. By default the "root_url" is used. * rendering: fixed issue with renderKey where userId and orgId was in mixed up, added test for RenderCallbackUrl reading logic	7 years ago
Torkel Ödegaard	fa7d7ed5df	Initial Baby Step to refactoring settings from global vars to instance (#11777) ... * wip: start on refactoring settings * settings: progress on settings refactor * refactor: progress on settings refactoring * fix: fixed failing test * settings: moved smtp settings from global to instance	7 years ago
Daniel Lee	533f3a9e8c	settings: fixes test ... For some reason, the url parse does not fail anymore for curly braces. Add a colon in the first segment to make sure the url parse fails.	7 years ago
bergquist	2ccbf12d1c	settings: return error instead of ignoring it ... closes #11281	7 years ago
Daniel Lee	8973b48f96	setting: add tests for windows	8 years ago
Anton Yackushev	bab21c9069	misspell: Corrected some misspelled words	8 years ago
Soulou	aa064b18e8	Test environment override for secret and url with credentials	9 years ago
Torkel Ödegaard	6b2a4fe8e8	feat(instrumentation): work on settings model for internal metrics publishing, #4696	9 years ago
Torkel Ödegaard	8174b9f041	fix(tests): fixed failling backend test	10 years ago
Torkel Ödegaard	89418a155a	More work on email and notification infra #1456	10 years ago
Torkel Ödegaard	6de584aafc	Updated to config file finding, and added homepath command line option	10 years ago
Torkel Ödegaard	2020fedfdb	Fixed issue with overriding default config values via command line	10 years ago