grafana

Commit Graph

Author	SHA1	Message	Date
Serge Zaitsev	84a5910e56	Chore: Remove bus from ngalert (#44465 ) * pass notification service down to the notifiers * add ns to all notifiers * remove bus from ngalert notifiers * use smaller interfaces for notificationservice * attempt to fix the tests * remove unused struct field * simplify notification service mock * trying to resolve issues in the tests * make linter happy * make linter even happier * linter, you are annoying	3 years ago
Gabriel MABILLE	d4f682190f	AccessControl: Implement teams resource service (#43951 ) * AccessControl: cover team permissions Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com> * Add background service as a consumer to resource_services Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com> * Define actions in roles.go Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com> * Remove action from accesscontrol model Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com> * As suggested by kalle * move some changes from branch to the skeleton PR * Add background service as a consumer to resource_services Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com> * moving resourceservice to the main wire file pt2 * move team related actions so that they can be reused * PR feedback * fix * typo * Access Control: adding hooks for team member endpoints (#43991) * AccessControl: cover team permissions Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com> * Add background service as a consumer to resource_services Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com> * Define actions in roles.go Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com> * Remove action from accesscontrol model Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com> * As suggested by kalle * add access control to list and add team member endpoint, and hooks for adding team members * member permission type is 0 * add ID scope for team permission checks * add more team actions, use Member for member permission name * protect team member update endpoint with FGAC permissions * update SQL functions for teams and the corresponding tests * also protect team member removal endpoint with FGAC permissions and add a hook to permission service * a few small fixes, provide team permission service to test setup * AccessControl: cover team permissions Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com> * Add background service as a consumer to resource_services Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com> * Define actions in roles.go Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com> * Remove action from accesscontrol model Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com> * As suggested by kalle * move some changes from branch to the skeleton PR * remove resource services from wireexts * remove unneeded actions * linting fix * remove comments * feedback fixes * feedback * simplifying * remove team member within the same transaction * fix a mistake with the error * call the correct sql fction * linting * Access control: tests for team member endpoints (#44177) * tests for team member endpoints * clean up and fix the tests * fixing tests take 2 * don't import enterprise test license * don't import enterprise test license * remove unused variable Co-authored-by: gamab <gabi.mabs@gmail.com> Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com> Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com>	3 years ago
Katarina Yang	92ca38bedf	Refactor: Change sqlstore.inTransaction to SQLStore.WithTransactionalDBSession in misc files (#43926 ) * Refactor: Change sqlstore.inTransaction to SQLStore.WithTransactionalDBSession in misc files * Refactor: Change .inTransaction in org.go file * Refactor: Update init() to proper SQLStore handlers * Refactor: Update funcs in tests to be sqlStore methods * Refactor: Update API funcs to receive HTTPServer * Fix: define methods on sqlstore * Adjust GetSignedInUser calls * Refactor: Add sqlStore to Service struct * Chore: Add back black spaces to remove file from PR Co-authored-by: Ida Furjesova <ida.furjesova@grafana.com>	3 years ago
Marcus Efraimsson	62b69a0b90	Revert "Search: Fix only searching for folder id zero (#44175 )" (#44424 ) This reverts commit `007cd144a9` from #44175.	3 years ago
Agnès Toulet	65bdb3a899	FeatureFlags: Revert managing feature flags outside of settings.Cfg (#44382 ) * Revert "FeatureToggles: register all enterprise feature toggles (#44336)" This reverts commit `f53b3fb007`. * Revert "FeatureFlags: manage feature flags outside of settings.Cfg (#43692)" This reverts commit `f94c0decbd`.	3 years ago
idafurjes	00c389933b	Chore: Remove bus from team (#44218 ) * Remove bus from team * Fix api team test * Remove bus from team members	3 years ago
Yuriy Tseretyan	ce0ef0ef5e	create only one folder per dashboard with acl (#44283 )	3 years ago
Marcus Efraimsson	007cd144a9	Search: Fix only searching for folder id zero (#44175 ) Fixes so that searching for folder id zero in folder/dashboard search returns dashboards located in the general folder and not including all folders as it did before. Fixes #40273	3 years ago
Ryan McKinley	f94c0decbd	FeatureFlags: manage feature flags outside of settings.Cfg (#43692 )	3 years ago
idafurjes	30aa24a183	Chore: Implement OpenTelemtry in Grafana (#42674 ) * Separate Tracer interface to TracerService and Tracer * Fix lint * Fix:Make it possible to start spans for both opentracing and opentelemetry in ds proxy * Add span methods, use span interface for rest of tracing * Fix logs in tracing * Fix tests that are related to tracing * Fix resourcepermissions test * Fix some tests * Fix more tests * Add TracingService to wire cli runner * Remove GlobalTracer from bus * Renaming test function * Remove GlobalTracer from TSDB * Replace GlobalTracer in api * Adjust tests to the InitializeForTests func * Remove GlobalTracer from services * Remove GlobalTracer * Remove bus.NewTest * Remove Tracer interface * Add InitializeForBus * Simplify tests * Clean up tests * Rename TracerService to Tracer * Update pkg/middleware/request_tracing.go Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com> * Initialize tracer before passing it to SQLStore initialization in commands * Remove tests for opentracing * Set span attributes correctly, remove unnecessary trace initiliazation form test * Add tracer instance to newSQLStore * Fix changes due to rebase * Add modified tracing middleware test * Fix opentracing implementation tags Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>	3 years ago
Katarina Yang	61974383d7	Refactor: Change sqlstore.inTransaction to SQLStore.WithTransactionalDBSession in alert files (#43815 ) * Refactor: Change sqlstore.inTransaction to SQLStore.WithTransactionalDBSession in alert files * Fix: Revert second SaveAlerts back to normal func * Refactor: Update tests so functions are now SQLStore methods * Fix: Refactor pauseAlert and pauseAllAlerts to be SQLStore methods * Fix: Refactor SaveAlerts to be SQLStore method * Refactor: Update SaveAlerts func signature to have correct arguments * Refactor: Define sqlStore * Chore: Delete commented out code * Chore: Remove unused SaveAlertsCommand	3 years ago
J Guerreiro	7dab52869e	ServiceAccounts: Add detail view of service account (#44164 ) * ServiceAccounts: Add detail view of service account Co-authored-by: eleijonmarck <eric.leijonmarck@gmail.com> * ServiceAccount: Make detail view scopeID Co-authored-by: eleijonmarck <eric.leijonmarck@gmail.com> * ServiceAccount: fix lint error Co-authored-by: eleijonmarck <eric.leijonmarck@gmail.com> Co-authored-by: eleijonmarck <eric.leijonmarck@gmail.com>	3 years ago
Jeremy Price	6ae7b0c3b2	Accesscontrol: list tokens for service account (#43809 ) * Add list tokens endpoint * Update api.go Co-authored-by: J Guerreiro <joao.guerreiro@grafana.com>	3 years ago
Yuriy Tseretyan	8114f6b065	Use stack trace context in XORM trace logger (#43780 ) * add caller and stack Valuer functions * Add WithPrefix and WithSuffix similar to what go-kit offers * replace New with just `with`. Remove filter wrapper because the first argument of the context argument is not logger but additional context. * update Xorm logger to use custom depth to display the datastore code instead of xorm	3 years ago
Karl Persson	f999910dc6	Access control: Add access control sql filter to org user queries (#43961 ) * Add access control SQL filter to org user queries	3 years ago
Eric Leijonmarck	6409e761b5	List serviceaccounts (#43672 ) * Serviceaccounts: feat - tabview for serviceaccounts * WIP * feat: listing all service accounts * refactor: needed to remove showInvitees as not present in serviceaccounts * add token column in the list * add token to orgserviceaccount * Update pkg/services/serviceaccounts/api/api.go	3 years ago
Katarina Yang	5bab02c7ef	Refactor: Change sqlstore.inTransaction to SQLStore.WithTransactional… (#43823 ) * Refactor: Change sqlstore.inTransaction to SQLStore.WithTransactionalDBSession in user files * update milesone	3 years ago
Katarina Yang	a30ca86084	Refactor: Change sqlstore.inTransaction to SQLStore.WithTransactional… (#43772 ) * Refactor: Change sqlstore.inTransaction to SQLStore.WithTransactionalDBSession in dashboard * Fix: Fix failing lint and BE tests	3 years ago
Katarina Yang	7f8daa0eae	Refactor: Change sqlstore.inTransaction to .WithTransactionalDBSession (#43245 ) * Refactor: Change sqlstore.inTransaction(...) to SQLStore.WithTransactionalDBSession(...) in alert_notification.go * Chore: Fix BE lint err * fix: fix failing sqlstore nil error * chore: remove unecessary setup() * fix: use appropriate ctx	3 years ago
Selene	bdbd199910	Remove unnecesary joins from queries (#43626 )	3 years ago
idafurjes	65e60759fb	Rename AddEventListenerCtx to AddEventListener and PublishCtx to Publish (#43566 )	3 years ago
idafurjes	8e6d6af744	Rename DispatchCtx to Dispatch (#43563 )	3 years ago
idafurjes	7936c4c522	Rename AddHandlerCtx to AddHandler (#43557 )	3 years ago
Ryan McKinley	4233a62aeb	DashboardPreviews: add dashboard previews behind feature flag (#43226 ) Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com> Co-authored-by: Artur Wierzbicki <artur@arturwierzbicki.com>	3 years ago
J Guerreiro	a1b8b5d123	Usage stats: Count API keys (#42883 ) * Stats: add api key count to usage stats * Chore: correctly capitalize struct member	3 years ago
idafurjes	b8852ef6a3	Chore: Remove context.TODO() (#43409 ) * Remove context.TODO() from services * Fix live test * Remove context.TODO	3 years ago
Daniel Lee	93de61f690	fix for CWE-89 (#43407 ) The sqlOrArgs unpacking seems to confuse CodeQL. Trying something simpler	3 years ago
Sofia Papagiannaki	c4aaf5f9d1	API: prevent provisioned dashboard from being updated (#41894 )	3 years ago
Jeremy Price	13fdc5231d	AccessControl: upgrade apikeys by adding service accounts (#42425 ) Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com> Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com> * Change default options for cloned service account * Run in background * Add endpoint to upgrade api keys to service accounts	3 years ago
Leonard Gram	5d18834deb	OAuth: persisting the id token (#42938 ) * OAuth: persisting the id token * OAuth: verifies that the idtoken gets persistet in the database	4 years ago
Yuriy Tseretyan	b63595b47f	Alerting: fix sqlstore.GetFolderByTitle to search for folder (#42898 ) * a test to reproduce the bug	4 years ago
Yuriy Tseretyan	9139f61105	Alerting: Update alert rule migration to use expanded queries (#42493 ) * move targetData to target * use constants instead of literals. * Update comments and add tests Co-authored-by: gotjosh <josue.abreu@gmail.com>	4 years ago
idafurjes	a65e0be110	Replace AddEventListener with AddEventListenerCtx and Publish with PublishCtx (#42284 )	4 years ago
idafurjes	725dbf8d95	Chore: Add context to datasource service (#42294 ) * Add context to datasource service * Adjust wire for ShouldBeReported method * Replace inTransactionCtx	4 years ago
George Robinson	1b26d4d88e	Alerting: Create DatasourceError alert if evaluation returns error (#41869 ) * Alerting: Create DatasourceError alert if evaluation returns error * Alerting: Add docs for DatasourceError alert * Alerting: Fix DatasourceError alert does not have dashboard_uid label * Alerting: Add break when datasource_uid found * Alerting: Update TestProcessEvalResults	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
Eric Leijonmarck	9c11040c3e	Serviceaccounts: Filtering service accounts from user queries (#41410 ) * Add extra fields to OSS types to support enterprise * WIP service accounts * Update public/app/features/api-keys/ApiKeysForm.tsx Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.com> * Create a service account at the same time as the API key * Use service account credentials when accessing API with APIkey * Throw better error * Use Boolean for "create service account button" * Add GetRole to service, merge RoleDTO and Role structs This patch merges the identical OSS and Enterprise data structures, which improves the code for two reasons: 1. Makes switching between OSS and Enterprise easier 2. Reduces the chance of incompatibilities developing between the same functions in OSS and Enterprise * Start work cloning permissions onto service account * If API key is not linked to a service account, continue login as usual * Fallback to old auth if no service account linked to key * Commented * Add CloneUserToServiceAccount * Update mock.go * Put graphical bits behind a feature toggle * Start adding LinkAPIKeyToServiceAccount * Update pkg/models/user.go Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com> * Update pkg/api/apikey.go Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com> * Update pkg/api/apikey.go Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com> * Finish LinkAPIKeyToServiceAccount * Update comment * Handle api key link error * Update pkg/services/sqlstore/apikey.go Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com> * Feature toggle * Update pkg/services/accesscontrol/accesscontrol.go Co-authored-by: Ieva <ieva.vasiljeva@grafana.com> * Not needed (yet) * Better error messages for OSS accesscontrol * Set an invalid user id as default * ServiceAccountId should be string * Re-arrange field names * ServiceAccountId is integer * Update ossaccesscontrol.go * Linter * Remove fronend edits * Remove console log * Update ApiKeysForm.tsx * feat: add serviceaccount deletion * feat: make sure we do not accidently delete serviceaccount * feat: ServiceAccount Type * refactor: userDeletions function * refactor: serviceaccount deletions\ * refactor: error name and removed attribute for userDeletecommand * refactor:: remove serviceaccount type for now * WIP * add mocked function * Remove unnecessary db query, move to right place * Update pkg/services/accesscontrol/mock/mock.go Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com> * Update pkg/services/accesscontrol/mock/mock.go Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com> * Update pkg/services/accesscontrol/mock/mock.go Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com> * Better error messages * Better and correcter error messages * add mocked function * refactor: move function call, add error msg * add IsServiceAccount and fix table * add service accounts package * WIP * WIP * working serviceaccountsapi registration * WIP tests * test * test working * test running for service * moved the error out of the models package * fixed own review * linting errors * Update pkg/services/serviceaccounts/database/database.go Co-authored-by: Jeremy Price <Jeremy.price@grafana.com> * tests running for api * WIP * WIP * removed unused secrets background svc * removed background svc for serviceaccount infavor or wire.go * serviceaccounts manager tests * wip * Filtering service accounts from the user queries in frontend * clean up * Update pkg/services/sqlstore/org_test.go * methods on same type should have same receiver * _ unused variable and comment * add additional join for results query * remove unused code * remove error fmt * refactor: change to only have false * no new variable to the left hand side * refactor: create serviceaccount cmd * dialect fix Co-authored-by: Jeremy Price <jeremy.price@grafana.com> Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.com> Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com> Co-authored-by: Ieva <ieva.vasiljeva@grafana.com> Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>	4 years ago
Will Browne	96b1776856	Chore: Fix pass context for SetAlertStateCommand (#42135 ) * fix pass ctx for SetAlertStateCommand * fix integration test	4 years ago
idafurjes	87f148aa27	Chore: Add context to playlist (#41337 ) * Add context to playlist * Add AddEventListenerCtx and more context * Update pkg/services/sqlstore/playlist.go Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com> * Update pkg/services/sqlstore/playlist.go Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com> * Update pkg/services/sqlstore/playlist.go Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com> * Fix lint * Rename listener help function Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>	4 years ago
idafurjes	f40c1d0808	Chore: Add context apikey (#41698 ) * Add context apikey * Rename DeleteApiKeyCtx to DeleteApiKey	4 years ago
idafurjes	bb01f8c4cf	Chore: Add context dashboard version (#41672 ) * Add context dashboard version * Fix codeql	4 years ago
Ieva	dcae138379	Access Control: adding group field to roles (#41465 ) * add group field to roles in AC models * change to using group_name as the column name * add a migration for group column	4 years ago
Gabriel MABILLE	0f36152127	UserCacheService: Use value instead of pointer (#41549 )	4 years ago
Eric Leijonmarck	4fd3dd41bc	ServiceAccounts: Delete ServiceAccount (#40470 ) * Add extra fields to OSS types to support enterprise * WIP service accounts * Update public/app/features/api-keys/ApiKeysForm.tsx Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.com> * Create a service account at the same time as the API key * Use service account credentials when accessing API with APIkey * Throw better error * Use Boolean for "create service account button" * Add GetRole to service, merge RoleDTO and Role structs This patch merges the identical OSS and Enterprise data structures, which improves the code for two reasons: 1. Makes switching between OSS and Enterprise easier 2. Reduces the chance of incompatibilities developing between the same functions in OSS and Enterprise * Start work cloning permissions onto service account * If API key is not linked to a service account, continue login as usual * Fallback to old auth if no service account linked to key * Commented * Add CloneUserToServiceAccount * Update mock.go * Put graphical bits behind a feature toggle * Start adding LinkAPIKeyToServiceAccount * Update pkg/models/user.go Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com> * Update pkg/api/apikey.go Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com> * Update pkg/api/apikey.go Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com> * Finish LinkAPIKeyToServiceAccount * Update comment * Handle api key link error * Update pkg/services/sqlstore/apikey.go Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com> * Feature toggle * Update pkg/services/accesscontrol/accesscontrol.go Co-authored-by: Ieva <ieva.vasiljeva@grafana.com> * Not needed (yet) * Better error messages for OSS accesscontrol * Set an invalid user id as default * ServiceAccountId should be string * Re-arrange field names * ServiceAccountId is integer * Update ossaccesscontrol.go * Linter * Remove fronend edits * Remove console log * Update ApiKeysForm.tsx * feat: add serviceaccount deletion * feat: make sure we do not accidently delete serviceaccount * feat: ServiceAccount Type * refactor: userDeletions function * refactor: serviceaccount deletions\ * refactor: error name and removed attribute for userDeletecommand * refactor:: remove serviceaccount type for now * WIP * add mocked function * Remove unnecessary db query, move to right place * Update pkg/services/accesscontrol/mock/mock.go Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com> * Update pkg/services/accesscontrol/mock/mock.go Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com> * Update pkg/services/accesscontrol/mock/mock.go Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com> * Better error messages * Better and correcter error messages * add mocked function * refactor: move function call, add error msg * add IsServiceAccount and fix table * add service accounts package * WIP * WIP * working serviceaccountsapi registration * WIP tests * test * test working * test running for service * moved the error out of the models package * fixed own review * linting errors * Update pkg/services/serviceaccounts/database/database.go Co-authored-by: Jeremy Price <Jeremy.price@grafana.com> * tests running for api * WIP * WIP * removed unused secrets background svc * removed background svc for serviceaccount infavor or wire.go * serviceaccounts manager tests * registering as backend service Co-authored-by: Jeremy Price <jeremy.price@grafana.com> Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.com> Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com> Co-authored-by: Ieva <ieva.vasiljeva@grafana.com> Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>	4 years ago
Karl Persson	3c659f1ea0	Access Control: Move part of access control database (#40483 ) * Add accesscontrol migrations * Add ResourceStore interface and related structs * Add team/user/builtin-role * Add accesscontrol database with functions to handle managed roles and permissions * Add ResourceManager * Add GetUserPermissions * Update pkg/services/accesscontrol/accesscontrol.go Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>	4 years ago
Jeremy Price	69c5370e94	Accesscontrol: Add additional API keys to service account, move cloneserviceaccount to sqlstore (#41189 ) * Add additional api key, move cloneserviceaccount * Remove TODOs, for now * Error messages * Linter * Security check * Add comments * Take service account id from correct variable * Update user.go	4 years ago
Hugo Häggmark	4e1059649a	Admin: Fix so Timezone is saved when saving preferences (#41583 ) * Configuration: Fix so Timezone is saved when saving preferences * Updating package.json and yarn.lock * Chore: force drone reload * Chore: trying with the git protocol * Chore: revert back to main * Chore: deleted cached pa11y file * Chore: revert * Chore: trying with YARN_CHECKSUM_BEHAVIOR=reset * Chore: YARN_CHECKSUM_BEHAVIOR=reset worked but reverting back waiting for other fix	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
Katarina Yang	c4306f9b3e	Chore: add context to login (#41316 ) * Chore: add context to login attempt file and tests * Chore: add context * Chore: add context to login and login tests * Chore: continue adding context to login * Chore: add context to login query	4 years ago
ying-jeanne	a404a311da	add context in the alert_notification (#41307 )	4 years ago

1 2 3 4 5 ...

1496 Commits (38dc34359b9a5550997b0a4eee2342c43714962c)