4799 Commits (c2affdee1e01202c91c3c8afbe3c2c6ce0d1b86f)

Author	SHA1	Message	Date
Alexander Zobnin	c2affdee1e	OAuth: return github teams as a part of user info (enable team sync) (#17797) ... * OAuth: github team sync POC * OAuth: minor refactor of github module * OAuth: able to use team shorthands for github team sync * support passing a list of groups via auth-proxy header	6 years ago
Marcus Efraimsson	0a3f977ea2	Usage Stats: Update known datasource plugins (#17787)	6 years ago
Sofia Papagiannaki	dc9ec7dc91	Auth: Allow expiration of API keys (#17678) ... * Modify backend to allow expiration of API Keys * Add middleware test for expired api keys * Modify frontend to enable expiration of API Keys * Fix frontend tests * Fix migration and add index for `expires` field * Add api key tests for database access * Substitude time.Now() by a mock for test usage * Front-end modifications * Change input label to `Time to live` * Change input behavior to comply with the other similar * Add tooltip * Modify AddApiKey api call response Expiration should be *time.Time instead of string * Present expiration date in the selected timezone * Use kbn for transforming intervals to seconds * Use `assert` library for tests * Frontend fixes Add checks for empty/undefined/null values * Change expires column from datetime to integer * Restrict api key duration input It should be interval not number * AddApiKey must complain if SecondsToLive is negative * Declare ErrInvalidApiKeyExpiration * Move configuration to auth section * Update docs * Eliminate alias for models in modified files * Omit expiration from api response if empty * Eliminate Goconvey from test file * Fix test Do not sleep, use mocked timeNow() instead * Remove index for expires from api_key table The index should be anyway on both org_id and expires fields. However this commit eliminates completely the index for now since not many rows are expected to be in this table. * Use getTimeZone function * Minor change in api key listing The frontend should display a message instead of empty string if the key does not expire.	6 years ago
Alexander Zobnin	dad894f1cc	API: get list of users with additional auth info (#17305) ... * batch disable users * batch revoke users tokens * split batch disable user and revoke token * API: get users with auth info and isExternal flag * fix tests for batch disable users * Users: refactor /api/users/search endpoint * Users: use alias for "user" table * Chore: add BatchDisableUsers() to the bus * Users: order user list by id explicitly * Users: return AuthModule from /api/users/:id endpoint * Users: do not return unused fields * Users: fix SearchUsers method after last changes * User: return auth module as array for future purposes * User: tests for SearchUsers() * User: return only latest auth module in SearchUsers() * User: fix JOIN, get only most recent auth module	6 years ago
Marcus Efraimsson	5713048f48	Alerting: Improve alert rule testing (#16286) ... * tsdb: add support for setting debug flag of tsdb query * alerting: adds debug flag in eval context Debug flag is set when testing an alert rule and this debug flag is used to return more debug information in test aler rule response. This debug flag is also provided to tsdb queries so datasources can optionally add support for returning additional debug data * alerting: improve test alert rule ui Adds buttons for expand/collapse json and copy json to clipboard, very similar to how the query inspector works. * elasticsearch: implement support for tsdb query debug flag * elasticsearch: embedding client response in struct * alerting: return proper query model when testing rule	6 years ago
Marcus Efraimsson	eecd8d1064	Elasticsearch: Visualize logs in Explore (#17605) ... * explore: try to use existing mode when switching datasource * elasticsearch: initial explore logs support * Elasticsearch: Adds ElasticsearchOptions type Updates tests accordingly * Elasticsearch: Adds typing to query method * Elasticsearch: Makes maxConcurrentShardRequests optional * Explore: Allows empty query for elasticsearch datasource * Elasticsearch: Unifies ElasticsearchQuery interface definition Removes check for context === 'explore' * Elasticsearch: Removes context property from ElasticsearchQuery interface Adds field property Removes metricAggs property Adds typing to metrics property * Elasticsearch: Runs default 'empty' query when 'clear all' button is pressed * Elasticsearch: Removes index property from ElasticsearchOptions interface * Elasticsearch: Removes commented code from ElasticsearchQueryField.tsx * Elasticsearch: Adds comment warning usage of for...in to elastic_response.ts * Elasticsearch: adds tests related to log queries	6 years ago
gotjosh	2fb45eeec8	Grafana-CLI: Wrapper for `grafana-cli` within RPM/DEB packages and config/homepath are now global flags (#17695) ... * Feature: Introduce a grafana-cli wrapper When our users install the *nix packed version of grafana, tendency is to use the services and scripts installed as part of the package for grafana-server. These leverage the default configuration options by specifying the several default paths. This introduces a similar approach for the grafana-cli binary. We exposed it through a wrapper to ensure a proper configuration is in place. To enable that, we add the .real suffix to the original binary (grafana-cli.real) and then use a bash script named grafana-cli as the wrapper. * Make the config and homepath flags global * Introduce `configOverrides` as a global flag This flag allows us to pass configuration overrides as a string. The string follows the convention of configuration arguments separated by a space e.g. "cfg:default.paths.data=/dev/nullX cfg:default.paths.logs=/dev/nullX" Also, it is backwards compatible with similar the previous configuration method through tailing arguments. Tailing arguments take presedence over the configuration options string. * Only log configuration information in debug mode * Move the grafana-cli binary to $GRAFANA_HOME/bin As part of the package install process, we copy all the release files and directories into the grafana home directory. This includes the /bin folder from where we copied the binaries into their respective destinations. After that, the /bin folder gets deleted as we don't want to keep duplicates of the binaries around. As part of this commit, we moved the re-creation of /bin within grafana-home and the copy of the original binary (again) after the folder gets deleted.	6 years ago
Sofia Papagiannaki	e7e9d3619e	Add guidelines for SQL date comparisons (#17732)	6 years ago
Leonard Gram	4c97d26102	Docs: clarified usage of go get and go mod (#17637)	6 years ago
Kyle Brandt	0adbb001db	RemoteCache: redis connection string parsing test (#17702)	6 years ago
Sofia Papagiannaki	d0852f0618	Fix link in pkg/README (#17714) ... Remove leading backslash from url	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
Oleg Gaidarenko	1c08e58605	LDAP: small improvements to various LDAP parts (#17662) ... * Add multildap config example * Publicize mocks for multildap module	6 years ago
Kyle Brandt	bd08d8ce8e	middleware: fix Strict-Transport-Security header (#17644) ... fixes #17641	6 years ago
gotjosh	7d68d6ede2	grafana-cli: Fix receiving flags via command line (#17617) ... `grafana-cli` uses the third-party library to define the flags and not the standard library. Using `flag.Parse` conflicts with the defined flags from our third-party library. In the case where `flag.Parse` is used, the CLI assumes that definitions provided are not needed and will not define them; producing errors of the kind `flag provided but not defined --example-flag`. Using the context to read any arguments (including flags) is the recommended approach by the third-party library.	6 years ago
Carl Bergquist	b98bb48d59	codestyle: styleguide and arch for grafanas backend (#17545)	6 years ago
Yann Verry	ed613194ac	HTTPServer: Fix X-XSS-Protection header formatting (#17620) ... Fixes #17619	6 years ago
gotjosh	6fbca90269	cli: grafana-cli should receive flags from the command line (#17606) ... grafana-cli should allow configuration overrides to be received from the command line. e.g. ``` grafana-cli admin reset-password cfg:default.paths.logs=custom/log/directory/ ``` Seems like we missed the inclusion of `flag.Parse` as we run the command, to be able to consume them. Additionally, it'll be useful for the user to know whenever these are being overriden or not - hence the addition of logging the configuration to be used as we run the command.	6 years ago
Oleg Gaidarenko	c853ef7318	SQLStore: extend `user.SearchUsers` method (#17514) ... * SQLStore: extend `user.SearchUsers` method Allow `user.SearchUsers` to search users based on their auth type	6 years ago
Leonard Gram	37e9988e95	ldap: makes mocks available for testing. (#17576) ... * ldap: makes mocks available for testing.	6 years ago
Oleg Gaidarenko	1b1d951495	LDAP: refactoring (#17479) ... * LDAP: use only one struct * Use only models.ExternalUserInfo * Add additional helper method :/ * Move all the helpers to one module * LDAP: refactoring * Rename some of the public methods and change their behaviour * Remove outdated methods * Simplify logic * More tests There is no and never were tests for settings.go, added tests for helper methods (cover is now about 100% for them). Added tests for the main LDAP logic, but there is some stuff to add. Dial() is not tested and not decoupled. It might be a challenge to do it properly * Restructure tests: * they wouldn't depend on external modules * more consistent naming * logical division * More guards for erroneous paths * Login: make login service an explicit dependency * LDAP: remove no longer needed test helper fns * LDAP: remove useless import * LDAP: Use new interface in multildap module * LDAP: corrections for the groups of multiple users * In case there is several users their groups weren't detected correctly * Simplify helpers module	6 years ago
Sofia Papagiannaki	7b70e7db2d	AuthProxy: Optimistic lock pattern for remote cache Set (#17485) ... * Implementation of optimistic lock pattern Try to insert the remote cache key and handle integrity error * Remove transaction Integrity error inside a transaction results in deadlock * Remove check for existing remote cache key Is no longer needed since integrity constrain violations are handled * Add check for integrity constrain violation Do not update the row if the insert statement fails for other than an integrity constrain violation * Handle failing inserts because of deadlocks If the insert statement fails because of a deadlock try to update the row * Add utility function for returning SQL error code Useful for debugging * Add logging for failing expired cache key deletion Do not shallow it completely * Revert "Add utility function for returning SQL error code" This reverts commit 8e0b82c79633e7d8bc350823cbbab2ac7a58c0a5. * Better log for failing deletion of expired cache key * Add some comments * Remove check for existing cache key Attempt to insert the key without checking if it's already there and handle the error situations * Do not propagate deadlocks created during update Most probably somebody else is trying to insert/update the key at the same time so it is safe enough to ignore it	6 years ago
Marcus Efraimsson	e1df51109e	Fix so that correct cache is provided to di registry (#17566) ... This fix prevents Grafana from crashing after being logged in. Ref #17519	6 years ago
Carl Bergquist	6809d2bb29	codestyle: moves cache to infra (#17519)	6 years ago
Maxim Ivanov	151fe240fc	OAuth: Fix for wrong user token updated on OAuth refresh in DS proxy (#17541)	6 years ago
Kyle Brandt	599514ad68	middleware: add security related HTTP(S) response headers (#17522) ... * x_xss_protection * strict_transport_security (HSTS) * x_content_type_options these are currently defaulted to false (off) until the next minor release. fixes #17509	6 years ago
Mario Trangoni	ab4e1526b3	Codestyle: Fix some goconst issues (#17530) ... Signed-off-by: Mario Trangoni <mjtrangoni@gmail.com>	6 years ago
Shavonn Brown	a20309d7d2	Feature: Parse user agent string in user auth token api response (#16… (#17504) ... * Feature: Parse user agent string in user auth token api response (#16222) * Adding UA Parser Go modules attempt (#16222) * Bring user agent vals up per req * fix tests * doc update * update to flatten, no maps * update doc	6 years ago
Kyle Brandt	c09fe3c3b4	remote_cache: Fix redis (#17483) ... * wip: fix remote cache for redis connstr parsing and non-negative expires for #17377 TODO: finish parse, check zero case, find out why negative duration in the first place * finish parse. Still TODO, find out negative value, and decide if would be better to make database specific entries in the .ini file * update ini files * remove accidental uncomment in defaults.ini * auth_proxy: expiration non-negative so expiration is not in the past * fix test, revert neg in redis * review: use errutil	6 years ago
Kyle Brandt	826d33ea37	auth_proxy: non-negative cache TTL (#17495) ... fixes setex error with redis on #17377	6 years ago
Kyle Brandt	a95c7bfa6f	sqlstore: clean quota and user_auth_tokens when removing users (#17487) ... fixes #17392	6 years ago
Oleg Kovalov	6a76a92aff	Prometheus: Preallocate data for Prometheus backend response parsing (#17490)	6 years ago
Carl Bergquist	912df2e284	gtime: some code style refactoring (#17369)	6 years ago
Oleg Gaidarenko	2316414786	Add tests for multildap (#17358) ... That should get us to 100% coverage	6 years ago
Carl Bergquist	1aadb4426a	metrics: expose stats about roles as metrics (#17469)	6 years ago
Thibault Chataigner	e06abb30aa	Alerting: Add tags to alert rules (#10989) ... Ref #6552	6 years ago
Jonathan Rockway	02975256d1	Tracing: allow propagation with Zipkin headers (#17009) ... Closes #17006	6 years ago
Andrej Ocenas	1c3ad78672	Perf: Fix slow dashboards ACL query (#17427) ... Fix slow ACL query for dashboards that was used as subquery on multiple places slowing down search and login in instances with many dashboards.	6 years ago
Utkarsh Bhatnagar	a9da7b5f1f	Cloudwatch: Add AWS DocDB metrics (#17241) ... Closes #16535	6 years ago
Augustin Husson	c8382ba435	Provisioning: Support folder that doesn't exist yet in dashboard provisioning (#17407) ... closes #17320	6 years ago
Mario Trangoni	87760d4fde	Codestyle: Fix govet issues (#17178) ... ref #10381 Signed-off-by: Mario Trangoni <mjtrangoni@gmail.com>	6 years ago
Marcus Efraimsson	b7a9533476	Database: Initialize xorm with an empty schema for postgres (#17357) ... xorm introduced some changes in https://github.com/go-xorm/xorm/pull/824 and https://github.com/go-xorm/xorm/pull/876 which by default will use public as the postgres schema and this was a breaking change compared to before. Grafana has implemented a custom postgres dialect so above changes wasn't a problem here. However, Grafana's custom database migration was using xorm dialect to check if the migration table exists or not. For those using a custom search_path (schema) in postgres configured on server, database or user level the migration table check would not find the migration table since it was looking in public schema due to xorm changes above. This had the consequence that Grafana's database migration failed the second time since migration had already run migrations in another schema. This change will make xorm use an empty default schema for postgres and by that mimic the functionality of how it was functioning before xorm's changes above. Fixes #16720 Co-Authored-By: Carl Bergquist <carl@grafana.com>	6 years ago
Hugo Häggmark	fb39831df2	Explore: Queries the datasource once per run query and uses DataStreamObserver (#17263) ... * Refactor: Removes replaceUrl from actions * Refactor: Moves saveState thunk to epic * Refactor: Moves thunks to epics * Wip: removes resulttype and queries once * Refactor: LiveTailing uses observer in query * Refactor: Creates epics folder for epics and move back actioncreators * Tests: Adds tests for epics and reducer * Fix: Checks for undefined as well * Refactor: Cleans up previous live tailing implementation * Chore: merge with master * Fix: Fixes url issuses and prom graph in Panels * Refactor: Removes supportsStreaming and adds sockets to DataSourcePluginMeta instead * Refactor: Changes the way we create TimeSeries * Refactor: Renames sockets to streaming * Refactor: Changes the way Explore does incremental updates * Refactor: Removes unused method * Refactor: Adds back Loading indication	6 years ago
Carl Bergquist	d8736a2547	Alerting: golint fixes for alerting (#17246)	6 years ago
Alexander Zobnin	60ddad8fdb	Batch disable users (#17254) ... * batch disable users * batch revoke users tokens * split batch disable user and revoke token * fix tests for batch disable users * Chore: add BatchDisableUsers() to the bus	6 years ago
Bernard Duggan	a0bb01103e	MySQL/Postgres/MSSQL: Add parsing for day, weeks and year intervals in macros (#13086) ... closes #11431	6 years ago
Oleg Gaidarenko	a3092dc57b	LDAP: remove unused function (#17351)	6 years ago
Oleg Gaidarenko	d4ef19737e	Enterprise: remove gofakeit dep (#17344) ... * Enterprise: remove gofakeit dep Since we decided to use our uuid generation inside util module * Enterprise: result of execution of `go mod ...`	6 years ago
Abhilash Gnan	04d473b3e5	HTTP Server: Serve Grafana with a custom URL path prefix (#17048) ... Adds a new [server] setting `serve_from_sub_path`. By enabling this setting and using a subpath in `root_url` setting, e.g. `root_url = http://localhost:3000/grafana`, Grafana will be accessible on `http://localhost:3000/grafana`. By default it is set to `false` for compatibility reasons. Closes #16623	6 years ago
Andrej Ocenas	151b24b95f	CLI: Add command to migrate all datasources to use encrypted password fields (#17118) ... closes: #17107	6 years ago