69 Commits (2ed6ca360fcaf83ab2eb50f85240a19cd0ebc64d)

Author	SHA1	Message	Date
Matthew Jacobson	babfa2beac	Alerting: Hook up GMA silence APIs to new authentication handler (#86625) ... This PR connects the new RBAC authentication service to existing alertmanager API silence endpoints.	2 years ago
Santiago	b76a9e4d31	Alerting: Implement GetStatus in the remote Alertmanager struct (#84887) ... * Alerting: Implement GetStatus in the remote Alertmanager struct * update tests * fix tests, extract AlertmanagerConfig from PostableConfig * get the remote AM config instead of the Grafana one from the remote AM * pass grafana AM config in test * return error in GetStatus instead of logging it (internal AM)	2 years ago
Yuri Tseretyan	dff7cb9afb	Alerting: Move alertmanager api silence code to separate files (#86947) ... * Move alertmanager api silence code to separate files unchanged * Replace with silence model instead interface --------- Co-authored-by: Matt Jacobson <matthew.jacobson@grafana.com>	2 years ago
Matthew Jacobson	3397e8bf09	Alerting: Improve error when receiver or time interval used by rule is deleted (#86865) ... * Alerting: Improve error when receiver used by rule is deleted * Remove RuleUID from public error and data * Improve fallback error in am config post * Refactor to expand to time intervals * Fix message on unchecked errors to be same as before	2 years ago
Matthew Jacobson	f79dd7c7f9	Alerting: Persist silence state immediately on Create/Delete (#84705) ... * Alerting: Persist silence state immediately on Create/Delete Persists the silence state to the kvstore immediately instead of waiting for the next maintenance run. This is used after Create/Delete to prevent silences from being lost when a new Alertmanager is started before the state has persisted. This can happen, for example, in a rolling deployment scenario. * Fix test that requires real data * Don't error if silence state persist fails, maintenance will correct	2 years ago
Matthew Jacobson	fbd057b258	Alerting: Stop returning autogen routes for non-admin on api/v2/status (#84864) ... * Alerting: Stop returning autogen routes for non-admin on api/v2/status * Improve api/v2/status integration tests for user roles	2 years ago
Yuri Tseretyan	1eebd2a4de	Alerting: Support for simplified notification settings in rule API (#81011) ... * Add notification settings to storage\domain and API models. Settings are a slice to workaround XORM mapping * Support validation of notification settings when rules are updated * Implement route generator for Alertmanager configuration. That fetches all notification settings. * Update multi-tenant Alertmanager to run the generator before applying the configuration. * Add notification settings labels to state calculation * update the Multi-tenant Alertmanager to provide validation for notification settings * update GET API so only admins can see auto-gen	2 years ago
Yuri Tseretyan	2be7605794	Alerting: Fix fine-grained rule access control to use 403 for authorization error (#79239) ... * use 403 for authorization error * update silences API * add ForbiddenError to rule API responses	2 years ago
Santiago	a60ec150f9	Alerting: Fetch receivers from remote Alertmanager (#76841) ... * Alerting: fetch receivers from remote Alertmanager * make linter happy * change require.Eventually() timeout and tick	2 years ago
Santiago	61cb26711e	Alerting: Fetch alerts from a remote Alertmanager (#75844) ... * Alerting: post alerts to the remote Alertmanager and fetch them * fix broken tests * Alerting: Add Mimir Backend image to devenv (blocks) * add alerting as code owner for mimir_backend block * Alerting: Use Mimir image to run integration tests for the remote Alertmanager * skip integration test when running all tests * skipping integration test when no Alertmanager URL is provided * fix bad host for mimir_backend * remove basic auth testing until we have an nginx image in our CI * add integration tests for alerts * fix tests * change SendCtx -> Send, add context.Context to Send, fix CI * add reover() for functions from the Prometheus Alertmanager HTTP client that could panic * add TODO to implement PutAlerts in a way that mimicks what Prometheus does * fix log format	2 years ago
Jo	dcd0c6b11e	Identity: Unfurl OrgID in pkg/services to allow using identity.Requester interface (#76113) ... Unfurl OrgID in pkg/services to allow using identity.Requester interface	2 years ago
Santiago	73be9449d1	Alerting: Manage remote Alertmanager silences (#75452) ... * Alerting: Manage remote Alertmanager silences * fix typo * check errors when encoding json in fake external AM * take path from configured URL, check for nil responses	2 years ago
Santiago	93b9f9b537	Alerting: Use interfaces for the Alertmanager (#73900)	2 years ago
Serge Zaitsev	58f6648505	Chore: capitalise messages for alerting (#74335)	2 years ago
Matthew Jacobson	d31d175109	Alerting: Fix contact point testing with secure settings (#72235) ... * Alerting: Fix contact point testing with secure settings Fixes double encryption of secure settings during contact point testing and removes code duplication that helped cause the drift between alertmanager and test endpoint. Also adds integration tests to cover the regression. Note: provisioningStore is created to remove cycle and the unnecessary dependency.	2 years ago
Ieva	d98813796c	RBAC: Remove legacy AC from HasAccess permission check (#68995) ... * remove unused HasAdmin and HasEdit permission methods * remove legacy AC from HasAccess method * remove unused function * update alerting tests to work with RBAC	3 years ago
Matthew Jacobson	91471ac7ae	Alerting: Template Testing API (#67450)	3 years ago
Yuri Tseretyan	a8b4a4bb45	Alerting: Update alerting module to 20230418161049-5f374e58cb32 + refactoring (#66622) ... * update to alerting 20230418161049-5f374e58cb32 * rename renamed structs in https://github.com/grafana/alerting/pull/73 * update ValidateContactPoint to use BuildReceiverConfiguration * update logger factory according to changes * rewrite integration builder Co-authored-by: Santiago <santiagohernandez.1997@gmail.com>	3 years ago
Yuri Tseretyan	afd52d0866	Alerting: use alerting GrafanaReceiver and BuildReceiverConfiguration in Grafana (#65224) ... * replace receiver errors with one from alerting * add the converter to alerting models * update buildReceiverIntegration to accept GrafanaReceiver --------- Co-authored-by: George Robinson <george.robinson@grafana.com>	3 years ago
Matthew Jacobson	85f738cdf9	Alerting: Add endpoint to revert to a previous alertmanager configuration (#65751) ... * Alerting: Add endpoint to revert to a previous alertmanager configuration This endpoint is meant to be used in conjunction with /api/alertmanager/grafana/config/history to revert to a previously applied alertmanager configuration. This is done by ID instead of raw config string in order to avoid secure field complications.	3 years ago
Santiago	aba91d3053	Alerting: Fetch all applied alerting configurations (#65728) ... * WIP * skip invalid historic configurations instead of erroring * add warning log when bad historic config is found * remove unused custom marshaller for GettableHistoricUserConfig * add id to historic user config, move limit check to store, fix typo * swagger spec	3 years ago
Yuri Tseretyan	ec4152c7e5	Alerting: Remove dependency on secrets in definitions package (#65391)	3 years ago
Yuri Tseretyan	f066e8cdcd	Alerting: Update to alerting 20230203015918-0e4e2675d7aa (after refactoring) (#62823) ... * add alerting prefix to some packages from alerting that have similar names in prometheus alertmanager	3 years ago
idafurjes	6c5a573772	Chore: Move ReqContext to contexthandler service (#62102) ... * Chore: Move ReqContext to contexthandler service * Rename package to contextmodel * Generate ngalert files * Remove unused imports	3 years ago
gotjosh	e7cd6eb13c	Alerting: Use `alerting.GrafanaAlertmanager` instead of initialising Alertmanager components directly (#61230) ... * Alerting: Use `alerting.GrafanaAlertmanager` instead of initialising Alertmanager components directly	3 years ago
gotjosh	fd6f107ded	Alerting Unification: Use the errors from grafana/alerting in Alerts (#61425)	3 years ago
gotjosh	39e429a14b	Alerting Unification: Use the errors from grafana/alerting in Silences (#61334)	3 years ago
Santiago	cdb5d4230a	Alerting: Fix "Not Implemented" responses (#57710) ... * fix swagger spec, return 404 instead of 501 when an endpoint does not exist * update number of paths in authorization_test.go	3 years ago
Alexander Weaver	3ddb28bad9	Find-and-replace 'err' logs to 'error' to match log search conventions (#57309)	3 years ago
Yuriy Tseretyan	888bdfd4ad	Alerting: Use correct response body for silence post API (#57114)	3 years ago
Santiago	09f8e026a1	Alerting: Expose info about notification delivery errors in a new /receivers endpoint (#55429) ... * (WIP) switch to fork AM, first implementation of the API, generate spec * get receivers avoiding race conditions * use latest version of our forked AM, tests * make linter happy, delete TODO comment * update number of expected paths to += 2 * delete unused endpoint code, code review comments, tests * Update pkg/services/ngalert/notifier/alertmanager.go Co-authored-by: Matthew Jacobson <matthew.jacobson@grafana.com> * remove call to fmt.Println * clear naming for fields * shorter variable names in GetReceivers Co-authored-by: Matthew Jacobson <matthew.jacobson@grafana.com>	3 years ago
idafurjes	a14621fff6	Chore: Add user service method SetUsingOrg and GetSignedInUserWithCacheCtx (#53343) ... * Chore: Add user service method SetUsingOrg * Chore: Add user service method GetSignedInUserWithCacheCtx * Use method GetSignedInUserWithCacheCtx from user service * Fix lint after rebase * Fix lint * Fix lint error * roll back some changes * Roll back changes in api and middleware * Add xorm tags to SignedInUser ID fields	3 years ago
Alexander Weaver	0d9389e1f4	Alerting: Code-gen parsing of URL parameters and fix related bugs (#50731) ... * Extend template and generate * Generate and fix up alertmanager endpoints * Prometheus routes * fix up Testing endpoints * touch up ruler API * Update provisioning and fix 500 * Drop dead code * Remove more dead code * Resolve merge conflicts	4 years ago
Jean-Philippe Quéméner	4cc8c6f745	Alerting: Add provenance guard to config api (#50147) ... * Alerting: add provenance guard to config api * add tests * only guard if config valid * adapt error message * simplify logic * rename arguments * make logic more straight forward * rename opt to options * remove useless maps	4 years ago
Joe Blubaugh	103087a1a5	Unified Alerting: Validate PostableSilence API. (#46892) ... Invalid PostableSilences could be passed to the Alerting API - if they are passed all the way down into the alertmanager data layer, they can cause a panic. This change adds validation to avoid a panic in the alertmanager.	4 years ago
Alexander Weaver	758364e78b	Alerting: Refactor GET/POST alerting config routes to be more extensible (#47229) ... * Refactor GET am config to be extensible * Extract post config route * Fix tests * Remove temporary duplication * Fix broken test due to layer shift * Fix duplicated error message * Properly return 400 on config rejection * Revert weird half method extraction * Move things to notifier package and avoid redundant interface * Simplify documentation * Split encryption service and depend on minimal abstractions * Properly initialize things all the way up to the composition root * Encryption -> Crypto * Address misc feedback * Missing docstring * Few more simple polish improvements * Unify on MultiOrgAlertmanager. Discover bug in existing test * Fix rebase conflicts * Misc feedback, renames, docs * Access crypto hanging off MultiOrgAlertmanager rather than having a separate API to initialize	4 years ago
Alexander Weaver	c266a4ac81	Alerting: Remove mis-behaving fake and fix masked test failure in AM config API (#47747) ... * Remove misbehaving fake * Fix bug and inject logger	4 years ago
Yuriy Tseretyan	8a2c368031	check that user is authorized to create\update silences (#47163)	4 years ago
Yuriy Tseretyan	15e4556c2f	Alerting: update authorization logic to use proper legacy roles when fine-grained access is disabled (#46931) ... * require legacy Editor for post, put, delete endpoints * require user to be signed in on group level because handler that checks that user has role Editor does not check it is signed in	4 years ago
George Robinson	4e3a72fc2a	Add context.Context to AlertingStore (#45069)	4 years ago
Alexander Weaver	56b3dc5445	Alerting: Allow configuration of non-ready alertmanagers (#43063) ... * Create API test for overwriting invalid alertmanager config * Avoid requiring alertmanager readiness for config changes * AlertmanagerSrv depends on functionality rather than concrete types * Add test for non-ready alertmanagers * Additional cleanup and polish * Back out previous integration test changes * Refactor of tests incorrectly caused a test to become redundant * Use pre-existing fake secret service * Drop unused interface * Test against concrete MultiOrgAlertmanager re-using fake infra from other tests * Fix linter error * Empty commit to rerun checks	4 years ago
Sofia Papagiannaki	9c7b52fd36	Alerting: Fix API specification (#42282) ... * Alerting: Fix API specification	4 years ago
Tania B	5652bde447	Encryption: Use secrets service (#40251) ... * Use secrets service in pluginproxy * Use secrets service in pluginxontext * Use secrets service in pluginsettings * Use secrets service in provisioning * Use secrets service in authinfoservice * Use secrets service in api * Use secrets service in sqlstore * Use secrets service in dashboardshapshots * Use secrets service in tsdb * Use secrets service in datasources * Use secrets service in alerting * Use secrets service in ngalert * Break cyclic dependancy * Refactor service * Break cyclic dependancy * Add FakeSecretsStore * Setup Secrets Service in sqlstore * Fix * Continue secrets service refactoring * Fix cyclic dependancy in sqlstore tests * Fix secrets service references * Fix linter errors * Add fake secrets service for tests * Refactor SetupTestSecretsService * Update setting up secret service in tests * Fix missing secrets service in multiorg_alertmanager_test * Use fake db in tests and sort imports * Use fake db in datasources tests * Fix more tests * Fix linter issues * Attempt to fix plugin proxy tests * Pass secrets service to getPluginProxiedRequest in pluginproxy tests * Fix pluginproxy tests * Revert using secrets service in alerting and provisioning * Update decryptFn in alerting migration * Rename defaultProvider to currentProvider * Use fake secrets service in alert channels tests * Refactor secrets service test helper * Update setting up secrets service in tests * Revert alerting changes in api * Add comments * Remove secrets service from background services * Convert global encryption functions into vars * Revert "Convert global encryption functions into vars" This reverts commit 498eb19859. * Add feature toggle for envelope encryption * Rename toggle Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com> Co-authored-by: Joan López de la Franca Beltran <joanjan14@gmail.com>	4 years ago
George Robinson	967721068e	Alerting: Support custom annotations and labels when testing contact points ... Support custom annotations and labels when testing contact points	4 years ago
Serge Zaitsev	57fcfd578d	Chore: replace macaron with web package (#40136) ... * replace macaron with web package * add web.go	4 years ago
Joan López de la Franca Beltran	722c414fef	Encryption: Refactor securejsondata.SecureJsonData to stop relying on global functions (#38865) ... * Encryption: Add support to encrypt/decrypt sjd * Add datasources.Service as a proxy to datasources db operations * Encrypt ds.SecureJsonData before calling SQLStore * Move ds cache code into ds service * Fix tlsmanager tests * Fix pluginproxy tests * Remove some securejsondata.GetEncryptedJsonData usages * Add pluginsettings.Service as a proxy for plugin settings db operations * Add AlertNotificationService as a proxy for alert notification db operations * Remove some securejsondata.GetEncryptedJsonData usages * Remove more securejsondata.GetEncryptedJsonData usages * Fix lint errors * Minor fixes * Remove encryption global functions usages from ngalert * Fix lint errors * Minor fixes * Minor fixes * Remove securejsondata.DecryptedValue usage * Refactor the refactor * Remove securejsondata.DecryptedValue usage * Move securejsondata to migrations package * Move securejsondata to migrations package * Minor fix * Fix integration test * Fix integration tests * Undo undesired changes * Fix tests * Add context.Context into encryption methods * Fix tests * Fix tests * Fix tests * Trigger CI * Fix test * Add names to params of encryption service interface * Remove bus from CacheServiceImpl * Add logging * Add keys to logger Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com> * Add missing key to logger Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com> * Undo changes in markdown files * Fix formatting * Add context to secrets service * Rename decryptSecureJsonData to decryptSecureJsonDataFn * Name args in GetDecryptedValueFn * Add template back to NewAlertmanagerNotifier * Copy GetDecryptedValueFn to ngalert * Add logging to pluginsettings * Fix pluginsettings test Co-authored-by: Tania B <yalyna.ts@gmail.com> Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>	4 years ago
Serge Zaitsev	063160aae2	Chore: pass url parameters through context.Context (#38826) ... * pass url parameters through context.Context * fix url param names without colon prefix * change context params to vars * replace url vars in tests using new api * rename vars to params * add some comments * rename seturlvars to seturlparams	4 years ago
Serge Zaitsev	c3ab2fdeb7	Macaron: remove custom Request type (#37874) ... * remove macaron.Request, use http.Request instead * remove com dependency from bindings module * fix another c.Req.Request	4 years ago
David Parrott	7fbeefc090	Alerting: create wrapper for Alertmanager to enable org level isolation (#37320) ... Introduces org-level isolation for the Alertmanager and its components. Silences, Alerts and Contact points are not separated by org and are not shared between them. Co-authored with @davidmparrott and @papagian	4 years ago
George Robinson	3ca00f90b5	Contact point testing (#37308) ... This commit adds contact point testing to ngalerts via a new API endpoint. This endpoint accepts JSON containing a list of receiver configurations which are validated and then tested with a notification for a test alert. The endpoint returns JSON for each receiver with a status and error message. It accepts a configurable timeout via the Request-Timeout header (in seconds) up to a maximum of 30 seconds.	4 years ago