grafana

Commit Graph

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	7 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.	7 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	7 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	7 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	7 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	7 years ago
Carl Bergquist	6809d2bb29	codestyle: moves cache to infra (#17519 )	7 years ago
Maxim Ivanov	151fe240fc	OAuth: Fix for wrong user token updated on OAuth refresh in DS proxy (#17541 )	7 years ago
Mario Trangoni	ab4e1526b3	Codestyle: Fix some goconst issues (#17530 ) Signed-off-by: Mario Trangoni <mjtrangoni@gmail.com>	7 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	7 years ago
Mario Trangoni	87760d4fde	Codestyle: Fix govet issues (#17178 ) ref #10381 Signed-off-by: Mario Trangoni <mjtrangoni@gmail.com>	7 years ago
Carl Bergquist	d8736a2547	Alerting: golint fixes for alerting (#17246 )	7 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	7 years ago
Alexander Zobnin	a3a7916597	Auth: Logout disabled user (#17166 ) * Feature: revoke user token when disabled * Chore: fix linter error	7 years ago
Oleg Gaidarenko	9b7f9dd9be	LDAP: consistently name the LDAP entities (#17203 )	7 years ago
CodeLingo Bot	3ff3e0f2ac	Defer closing of files (#17213 ) Signed-off-by: CodeLingo Bot <bot@codelingo.io>	7 years ago
Alexander Zobnin	2d03815770	Users: Disable users removed from LDAP (#16820 ) * Users: add is_disabled column * Users: disable users removed from LDAP * Auth: return ErrInvalidCredentials for failed LDAP auth * User: return isDisabled flag in user search api * User: mark disabled users at the server admin page * Chore: refactor according to review * Auth: prevent disabled user from login * Auth: re-enable user when it found in ldap * User: add api endpoint for disabling user * User: use separate endpoints to disable/enable user * User: disallow disabling external users * User: able do disable users from admin UI * Chore: refactor based on review * Chore: use more clear error check when disabling user * Fix login tests * Tests for disabling user during the LDAP login * Tests for disable user API * Tests for login with disabled user * Remove disable user UI stub * Sync with latest LDAP refactoring	7 years ago
Marcus Efraimsson	c82df97bb2	testdata: scenarios returned are now sorted in a consistent way (#17181 ) This makes sure the scenarios returned from API are sorted in a consistent way and by that makes the values in scenario drop down always presented ordered instead of jumping around.	7 years ago
zhulongcheng	2fff8f77dc	move log package to /infra (#17023 ) ref #14679 Signed-off-by: zhulongcheng <zhulongcheng.me@gmail.com>	7 years ago
Ryan McKinley	1d7bb2a763	DataSourceApi: convert interface to abstract class (#16979 ) * DataSourceApi as class * add diff signature * Prometheus: moved directUrl to jsonData	7 years ago
Ryan McKinley	56702902a1	Plugins: Remove dataFormats key and add skipDataQuery (#16984 )	7 years ago
zhulongcheng	7ebbeb09cb	Snapshot: use given key and deleteKey (#16876 ) Signed-off-by: zhulongcheng <zhulongcheng.me@gmail.com>	7 years ago
Torkel Ödegaard	e1d408a66f	AddDataSource: Updated page design & categories (#16971 ) * minor refactoring * Added category * Minor progress * Progres * Updated descriptions * Added custom sort * NewDataSource: progress * Updated design * NewDataSource: Updated design * Updated link * Feedback changes	7 years ago
Carl Bergquist	a86b8c8a04	http: remove dualstack since its deprecated (#16940 ) Deprecated: Fast Fallback is enabled by default. To disable, set FallbackDelay to a negative value. https://golang.org/src/net/dial.go	7 years ago
Ryan McKinley	17ce1273ca	AppPlugin: Menu Edit Url Fix (#16934 )	7 years ago
Brian Gann	b07d0b1026	Plugins: Support templated urls in routes (#16599 ) This adds support for using templated/dynamic urls in routes. * refactor interpolateString into utils and add interpolation support for app plugin routes. * cleanup and add error check for url parse failure * add docs for interpolated route urls Closes #16835	7 years ago
Marcus Efraimsson	f778c1d971	Security: Responses from backend should not be cached (#16848 ) Currently all API requests set Cache-control: no-cache to avoid browsers caching sensitive data. This fixes so that all responses returned from backend not are cached using http headers. The exception is the data proxy where we don't add these http headers in case datasource backend needs to control whether data can be cached or not. Fixes #16845	7 years ago
Samuel	846b9327a5	LDAP: Added reload endpoint for LDAP config (#15470 ) * 4843 - Added reload endpoint for LDAP config closes #4843 * Refactor to make the reload work after master drifted	7 years ago
Ryan McKinley	013f1b8d19	App Plugins: support react pages and tabs (#16586 )	7 years ago
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	7 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.	7 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	7 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	7 years ago
Marcus Efraimsson	7dadebb3f0	playlist: fix loading dashboards by tag (#16727 ) Fixes #16704	7 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	7 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	7 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	7 years ago
Carl Bergquist	9134251417	build: upgrades to golang 1.12.4 (#16545 ) fix govet issue in golang 1.12.4	7 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	7 years ago
Carl Bergquist	30dcf0f6c5	Revert "Build: Upgrades to go 1.12.3 (#16491 )" (#16544 ) This reverts commit `44b365028f`.	7 years ago
Carl Bergquist	44b365028f	Build: Upgrades to go 1.12.3 (#16491 ) fixes go vet issue that 1.12.3 detects	7 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	7 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	7 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	7 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	7 years ago
Marcus Efraimsson	2ae63e70c0	Alerting: Notification channel http api enhancements (#16219 ) Now returns uid in response to get notification channel by id. Adds GET/PUT/DELETE support for notification channel by uid, /api/alert-notifications/uid/:uid. Break apart alerting and alert notification http api docs in two pages and update documentation to make it up to date with current implementation. Fixes #16012	7 years ago
Sean Lafferty	b696492891	Rename dispatched commands to make them easy to grok	7 years ago
Leonard Gram	a615b78f8a	permissions: removes global access to bus from MakeUserAdmin.	7 years ago
Leonard Gram	adf0390b2c	teams: local access to bus, moving away from dep on global.	7 years ago
Leonard Gram	6589a4e55f	teams: better names for api permissions.	7 years ago

1 2 3 4 5 ...

1730 Commits (c2affdee1e01202c91c3c8afbe3c2c6ce0d1b86f)