grafana

Commit Graph

Author	SHA1	Message	Date
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	6 years ago
Oleg Gaidarenko	c1289b308f	Chore: revise some of the gosec rules (#16713 )	6 years ago
Carl Bergquist	9660356638	Auth: Enable retries and transaction for some db calls for auth tokens (#16785 ) the WithSession wrapper handles retries and connection management so the caller dont have to worry about it.	6 years ago
Andrej Ocenas	eb82a75668	Provisioning: Show file path of provisioning file in save/delete dialogs (#16706 ) * Add file path to metadata and show it in dialogs * Make path relative to config directory * Fix tests * Add test for the relative path * Refactor to use path relative to provisioner path * Change return types * Rename attribute * Small fixes from review	6 years ago
Andrej Ocenas	0433af6385	Config: Fixes bug where timeouts for alerting was not parsed correctly (#16784 ) * Fix parsing of the config * Remove unnecessary conversion * Remove timeout modification Co-Authored-By: aocenas <mr.ocenas@gmail.com> * Remove unused import	6 years ago
Torkel Ödegaard	9b68952482	Provisioning: Trying to fix failing test (#16800 ) * Provisioning: Trying to fix test * Use better sync strategy for test * Lower the timeout * Remove commented code Co-Authored-By: aocenas <mr.ocenas@gmail.com>	6 years ago
bergquist	f7c8d90d1a	phantomjs: set web-security to true	6 years ago
Oleg Gaidarenko	66c9297c36	Feature: introduce LdapActiveSyncEnabled setting (#16787 ) * Feature: introduce LdapActiveSyncEnabled setting We probably remove it after the active sync is done. But at the moment we do not want to affect the current users with not fully tested feature * Chore: move settings in more logical order	6 years ago
Oleg Gaidarenko	62b85a886e	LDAP Refactoring to support syncronizing more than one user at a time. (#16705 ) * Feature: add cron setting for the ldap settings * Move ldap configuration read to special function * Introduce cron setting (no docs for it yet, pending approval) * Chore: duplicate ldap module as a service * Feature: implement active sync This is very early preliminary implementation of active sync. There is only one thing that's going right for this code - it works. Aside from that, there is no tests, error handling, docs, transactions, it's very much duplicative and etc. But this is the overall direction with architecture I'm going for * Chore: introduce login service * Chore: gradually switch to ldap service * Chore: use new approach for auth_proxy * Chore: use new approach along with refactoring * Chore: use new ldap interface for auth_proxy * Chore: improve auth_proxy and subsequently ldap * Chore: more of the refactoring bits * Chore: address comments from code review * Chore: more refactoring stuff * Chore: make linter happy * Chore: add cron dep for grafana enterprise * Chore: initialize config package var * Chore: disable gosec for now * Chore: update dependencies * Chore: remove unused module * Chore: address review comments * Chore: make linter happy	6 years ago
Ryan McKinley	470634e2d6	Streaming: support streaming and a javascript test datasource (#16729 )	6 years ago
Oleg Gaidarenko	78cd9058a3	Feature: add cron setting for the ldap settings (#16673 ) * Feature: add cron setting for the ldap settings * Move ldap configuration read to special function * Introduce cron setting (no docs for it yet, pending approval) * Chore: address code review comments	6 years ago
Alcides Viamontes E	cff2be0d66	elasticsearch: add 7.x version support (#16646 ) Adds a new version option 7.0+ (70 internally). Version 7.0+ doesn't include document types in index mappings so support for handling this have been added. Version 7.0+ returns number of hits in a different way so support for handling this have been added. Version 7.0+ doesn't support sending max_concurrent_shard_requests in multisearch header so support for sending this in query string have been added. Update elastic6 docker block and dashboards (devenv) to use 6.7.1 images, filebeat index name is now filebeat-YYYY.MM.DD and dashboard include correct tags and links. Add elastic7 docker block and provisioning (devenv). Updates documentation regarding new version. Closes #15622	6 years ago
Andrej Ocenas	42b745a098	Provisioning: Add API endpoint to reload provisioning configs (#16579 ) * Add api to reaload provisioning * Refactor and simplify the polling code * Add test for the provisioning service * Fix provider initialization and move some code to file reader * Simplify the code and move initialization * Remove unused code * Update comment * Add comment * Change error messages * Add DashboardProvisionerFactory type * Update imports * Use new assert lib * Use mutext for synchronizing the reloading * Fix typo Co-Authored-By: aocenas <mr.ocenas@gmail.com> * Add docs about the new api	6 years ago
Hofls	b3bfbc6f77	Config: Show user-friendly error message instead of stack trace (#16564 ) Fixes #16283	6 years ago
Tom Petr	2d6b33ab61	sqlstore: use column name in order by (#16583 ) Use column name in ORDER BY in GetDashboardAclInfoList().	6 years ago
Andrej Ocenas	fcebd713a5	Provisioning: Interpolate env vars in provisioning files (#16499 ) * Add value types with custom unmarshalling logic * Add env support for notifications config * Use env vars in json data tests for values * Add some more complexities to value tests * Update comment with example usage * Set env directly in the tests, removing patching * Update documentation * Add env var to the file reader tests * Add raw value * Post merge fixes * Add comment	6 years ago
Carl Bergquist	eb8af01a8a	admin: add more stats about roles (#16667 ) closes #14967	6 years ago
Marcus Efraimsson	7dadebb3f0	playlist: fix loading dashboards by tag (#16727 ) Fixes #16704	6 years ago
Utkarsh Bhatnagar	89a01a680c	CloudWatch: Use default alias if there is no alias for metrics (#16732 ) Fixes #16605	6 years ago
Josh	fca5ee4bea	Provisioning: Support FolderUid in Dashboard Provisioning Config (#16559 ) * add folderUid to DashbaordsAsConfig structs and DashbardProviderConfigs struct, set these values in mapping func look for new folderUid values in config_reader tests set dashboard folder Uid explicitly in file_reader, which has no affect when not given * formatting and docstrings * add folderUid to DashbaordsAsConfig structs and DashbardProviderConfigs struct, set these values in mapping func look for new folderUid values in config_reader tests set dashboard folder Uid explicitly in file_reader, which has no affect when not given * formatting and docstrings * add folderUid option, as well as documentation for the rest of the fields * add blank folderUid in devenv example. * add folderUid to provisioning sample yaml * instead of just warning, return error if unmarshalling dashboard provisioning file fails * Removing the error handling and adding comment * Add duplicity check for folder Uids Co-authored-by: swtch1 <joshua.thornton@protonmail.com>	6 years ago
Andrej Ocenas	e4f649e2c8	Chore: Small improvements to grafana-cli (#16670 ) * Small improvements * Better error handling	6 years ago
Andrej Ocenas	c429934a66	Chore: Use x/xerrors instead of pkg/errors (#16668 ) * Use xerrors instead of pkg/errors * Add Wrap util func * Move Wrap to errutil package	6 years ago
Oleg Gaidarenko	54c1bf0cc9	Chore: a bit of spring cleaning (#16710 ) * Chore: use early return technic everywhere And enable "indent-error-flow" revive rule * Chore: remove if-return rule from revive config * Chore: improve error messages And enable "error-strings" revive rule * Chore: enable "error-naming" revive rule * Chore: make linter happy * Chore: do not duplicate gofmt execution * Chore: make linter happy * Chore: address the pull review comments	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	36d64fecea	Search: Fixed search issue introduced in recent PR (#16652 )	6 years ago
Carl Bergquist	e4eb0817e4	Cloudwatch: fix for flaky tests (#16649 ) The iteration order over maps is not specified and is not guaranteed to be the same from one iteration to the next. If a map entry that has not yet been reached is removed during iteration, the corresponding iteration value will not be produced. If a map entry is created during iteration, that entry may be produced during the iteration or may be skipped. The choice may vary for each entry created and from one iteration to the next. If the map is nil, the number of iterations is 0. https://golang.org/ref/spec#For_range	6 years ago
Torkel Ödegaard	8b0dd4244b	Search: Fixes search limits and adds a page parameter (#16458 ) * Search: Fixes search limits and adds a page parameter This adds a page parameter to search api without adding any major breaking change. It does at an api validation error when trying to use a limit beyond 5000. This is a breaking change. We could remove this and have it only in the docs and describe that this is a limit that grafana will apply silently. Fixes #16049 * Fix: Corrected wrong array slice change * Docs: minor docs fix * Search: fixed folder tests * Fixed: Moved limit to correct inner query * Search: moving limit check and page check * Search: limit in handler is no longer needed	6 years ago
Carl Bergquist	3f136e0da9	tech: replace bmizerany/assert with stretchr/testify (#16625 ) bmizerany is old and unsupported. so we are replacing it with stretchr which is an drop in replacement and something we want to use more in Grafana.	6 years ago
Torkel Ödegaard	75f9adf44f	Build: adding dependency used by extensions (#16622 )	6 years ago
Oleg Gaidarenko	318182ccc9	Chore: refactor auth proxy (#16504 ) * Chore: refactor auth proxy Introduced the helper struct for auth_proxy middleware. Added couple unit-tests, but it seems "integration" tests already cover most of the code paths. Although it might be good idea to test every bit of it, hm. Haven't refactored the extraction of the header logic that much Fixes #16147 * Fix: make linters happy	6 years ago
Carl Bergquist	68f5ddf18c	replace dep with go modules (#16017 ) - guide shamelessly stolen from prometheus/prometheus - updates local interface of oauth exchange - updates local impl of hclogger - bump jaeger client version closes #16088	6 years ago
Carl Bergquist	490515aec6	build: partially replace gometalinter with golangci-lint (#16610 ) we still use gometalinter for goconst since it doesn't report errors for duplicated in test files	6 years ago
Mitsuhiro Tanda	864a6262fe	CloudWatch: GetMetricData refactoring & fix label handling (#16383 ) * fix label handling * SEARCH() results could have multiple namespace, remove from legend * divide GetMetricStatistics related code * divide GetMetricData related code * divide parseGetMetricDataResponse() * divide parseGetMetricDataQuery() * divide test code * add test for GetMetricData * add test for GetMetricData parse response * fix bug of terminating gap * fix gofmt	6 years ago
Oleg Gaidarenko	b37ee65bd3	Chore: prepare our SQL for cockroach db (#16471 ) This is basically implementation of the https://github.com/grafana/grafana/issues/8900#issuecomment-435437167 points, except for the type conversion bit. I tried to implement idea mentioned in cockroachdb ticket (see below). And it is possible, but it complicates things as lot - not only we have to have 4 SQL statements instead of one, but we would have to copy the column structure as well - PK, FG, indexes and stuff, plus there will be additional downtime with this approach. So idea for this pull is to prepare our SQL as much as possible, so when cockroachdb will add support for full type conversions, we could easilly add support for it as well. * Add `CASCADE` to `DROP INDEX` statement * Make string conversions explicit Thanks @Luit Ref #8900 Ref cockroach/cockroach#9851	6 years ago
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	6 years ago
Carl Bergquist	9134251417	build: upgrades to golang 1.12.4 (#16545 ) fix govet issue in golang 1.12.4	6 years ago
Hofls	c17226af95	Pushover alert, support for different sound for OK (#16525 ) Closes #15889	6 years ago
Ryan McKinley	3c21a121eb	Plugins: Unifying alpha state & options for all plugins (#16530 ) * app pages * app pages * workign example * started alpha support * remove app stuff * show warning on alpha/beta panels * put app back on plugin file * fix go * add enum for PluginType and PluginIncludeType * Refactoring and moving settings to plugins section fixes #16529	6 years ago
Carl Bergquist	30dcf0f6c5	Revert "Build: Upgrades to go 1.12.3 (#16491 )" (#16544 ) This reverts commit `44b365028f`.	6 years ago
Carl Bergquist	44b365028f	Build: Upgrades to go 1.12.3 (#16491 ) fixes go vet issue that 1.12.3 detects	6 years ago
Dan Cech	b9cc476eb7	Update jwt regexp to include = (#16521 ) Fixes #16501	6 years ago
Ryan McKinley	d6887bf77f	Plugins: Optionally preload some plugins during frontend app boot (#15266 ) * auto load * update comments * gofmt * use preload from json * fix formatting * change general plugin loader to app * Refactoring: Plugin preloading #15266	6 years ago
Andrej Ocenas	2d7fc55df7	Provisioning: Do not allow deletion of provisioned dashboards (#16211 ) * Unprovision dashboard in case of DisableDeletion = true * Rename command struct * Handle removed provision files * Allow html in confirm-modal * Do not show confirm button without onConfirm * Show dialog on deleting provisioned dashboard * Changed DeleteDashboard to DeleteProvisionedDashboard * Remove unreachable return * Add provisioned checks to API * Remove filter func * Fix and add tests for deleting dashboards * Change delete confirm text * Added and used pkg/errors for error wrapping	6 years ago
Oleg Gaidarenko	67cbc7d4cf	Chore: use remote cache instead of session storage (#16114 ) Replaces session storage in auth_proxy middleware with remote cache Fixes #15161	6 years ago
Marcus Efraimsson	5da1faf454	Alerting: Notification channel http api fixes (#16379 ) Fixes so it's possible to create new notification channel and providing uid. Fixes better error/result handling when updating a notifcation channel. Fixes #16372 Ref #16219 #16012	6 years ago
Andrej Ocenas	08ce7f6c93	Chore: Add task to find FocusConvey tests (#16381 )	6 years ago
The Rock Guy	335aa7c9f2	CloudWatch: Update AWS/IoT metric and dimensions (#16337 ) Closes #16334	6 years ago
Marcus Efraimsson	79b86466fd	Fix: Alerting Notification channel http api fixes (#16288 ) Fix so that uid can be changed when updating notification channels through the http api. Update documentation	6 years ago
Zzy	1b84a924a3	Alerting: Makes timeouts and retries configurable (#16259 ) Adds new alert settings for configuring timeouts and retries named evaluation_timeout_seconds, notification_timeout_seconds and max_attempts. Closes #16240	6 years ago
Oleg Gaidarenko	1d955a8762	Chore: Implement gosec (#16261 ) See https://github.com/securego/gosec for more info. Disabled a lot of rules. I guess we should go through them and recheck if we really need to disable some Fixes #16204	6 years ago

1 2 3 4 5 ...

4702 Commits (2596ce50768c2a1c0ee16cbab59f4006bcba81c8)