53 Commits (c4d3eb1cd03f30ea8e6aab71b2597bf3c6a6f46f)

Author	SHA1	Message	Date
Alexander Akhmetov	9fe523b9e6	Alerting: API to pause all alert rules in a folder (#104674)	2 months ago
maicon	d8c5c2d3b8	K8s: Folders: Modify GetChildren to return only Folder References (#103072) ... * Return FolderReference instead of Folder on GetChildren Signed-off-by: Maicon Costa <maiconscosta@gmail.com> --------- Signed-off-by: Maicon Costa <maiconscosta@gmail.com>	4 months ago
Yuri Tseretyan	309a2eb4e9	Alerting: Allow administrators delete rules permanently via UI (#101974) ... * add query parameter to existing APIs to control the permanent deletion of rules * add GUID to gettable rule * add new endpoint /ruler/grafana/api/v1/trash/rule/guid/{RuleGUID} to delete rules from trash permanently --------- Signed-off-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com>	4 months ago
Yuri Tseretyan	7e4beb2074	Alerting: API to return deleted rules (#101429)	4 months ago
Yuri Tseretyan	374380d1f6	Alerting: Keep the latest version of deleted rule in version table (#101481) ... * add feature toggle alertRuleRestore * Update delete rule to require UserUID, remove all versions and create "delete" version that holds information about who and when deleted the rule	5 months ago
Alexander Akhmetov	d44728f4e5	Alerting: Metric to count imported from Prometheus rules (#100847)	5 months ago
Alexander Akhmetov	c7c68322b1	Alerting: Allow specifying a folder for Prometheus rule import (#101406) ... What is this feature? Allows the creation of alert rules with mimirtool in a specified folder. Why do we need this feature? Currently, the APIs for mimirtool create namespaces and rule groups in the root folder without the ability to set a custom folder. For example, it could be a special "Imported" folder, etc. This PR makes it possible with a special header: mimirtool ... --extra-headers="X-Grafana-Alerting-Folder-UID=123". If it's not present, the root folder is used, otherwise, the specified one is used. mimirtool does not support nested folder structures, while Grafana allows folder nesting. To keep compatibility, we return only direct child folders of the working folder (as namespaces) with rule groups and rules that are directly in these child folders as if there are no nested folders. For example, given this folder structure in Grafana: ``` grafana/ ├── production/ │ ├── service1/ │ │ └── alerts/ │ └── service2/ └── testing/ └── service3/ ``` If the working folder is "grafana": Only namespaces "production" and "testing" are returned Only rule groups directly within these folders are included If the working folder is "production": - Only namespaces "service1" and "service2" are returned Only rule groups directly within these folders are included	5 months ago
Yuri Tseretyan	1d54850a68	Alerting: Get alert rule versions by GUID (#101469) ... * get alert rule versions by GUID * protect guid field from accidental update	5 months ago
Alexander Akhmetov	d947433d19	Alerting: API to delete rule groups using mimirtool (#100687) ... * Alerting: API to delete rule groups using mimirtool	5 months ago
Alexander Akhmetov	6eb335a8ce	Alerting: API to read rule groups using mimirtool (#100674)	5 months ago
Alexander Akhmetov	b641fd64f9	Alerting: API to create rule groups using mimirtool (#100558) ... What is this feature? Adds an API endpoint to create alert rules with mimirtool: - POST /convert/prometheus/config/v1/rules/{NamespaceTitle} - Accepts a single rule group in a Prometheus YAML format and creates or updates a Grafana rule group from it. The endpoint uses the conversion package from #100224. Key parts The API works similarly to the provisioning API. If the rule does not exist, it will be created, otherwise updated. Any rules not present in the new group will be deleted, ensuring the group is fully synchronized with the provided configuration. Since the API works with namespace titles (folders), the handler automatically creates a folder in the root based on the provided title if it does not exist. It also requires a special header, X-Grafana-Alerting-Datasource-UID. This header specifies which datasource to use for the new rules. If the rule group's evaluation interval is not specified, it uses the DefaultRuleEvaluationInterval from settings.	5 months ago
Yuri Tseretyan	ac41c19350	Alerting: Rule version history API (#99041) ... * implement store method to read rule versions * implement request handler * declare a new endpoint * fix fake to return correct response * add tests * add integration tests * rename history to versions * apply diff from swagger CI step Signed-off-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com> --------- Signed-off-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com>	6 months ago
Yuri Tseretyan	92d6762a3a	Alerting: Store information about user that created\updated alert rule (#99395) ... * introduce new fields created_by in rule tables * update domain model and compat layer to support UpdatedBy * add alert rule generator mutators for UpdatedBy * ignore UpdatedBy in diff and hash calculation * Add user context to alert rule insert/update operations Updated InsertAlertRules and UpdateAlertRules methods to accept a user context parameter. This change ensures auditability and better tracking of user actions when creating or updating alert rules. Adjusted all relevant calls and interfaces to pass the user context accordingly. * set UpdatedBy in PreSave because this is where Updated is set * Use nil userID for system-initiated updates This ensures differentiation between system and user-initiated changes for better traceability and clarity in update origins. --------- Signed-off-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com>	6 months ago
Yuri Tseretyan	b8df574aba	Alerting: Support optimistic concurrency in notification policies service (#93932) ... * update notification policy provisioning service to support optimistic concurrency * rewrite tests and include concurrency tests	10 months ago
Matthew Jacobson	6652233493	Alerting: Managed receiver resource permission in receiver_svc (#93556) ... * Alerting: Managed receiver resource permission in receiver_svc	10 months ago
Matthew Jacobson	32f06c6d9c	Alerting: Receiver API complete core implementation (#91738) ... * Replace global authz abstraction with one compatible with uid scope * Replace GettableApiReceiver with models.Receiver in receiver_svc * GrafanaIntegrationConfig -> models.Integration * Implement Create/Update methods * Add optimistic concurrency to receiver API * Add scope to ReceiversRead & ReceiversReadSecrets migrates existing permissions to include implicit global scope * Add receiver create, update, delete actions * Check if receiver is used by rules before delete * On receiver name change update in routes and notification settings * Improve errors * Linting * Include read permissions are requirements for create/update/delete * Alias ngalert/models to ngmodels to differentiate from v0alpha1 model * Ensure integration UIDs are valid, unique, and generated if empty * Validate integration settings on create/update * Leverage UidToName to GetReceiver instead of GetReceivers * Remove some unnecessary uses of simplejson * alerting.notifications.receiver -> alerting.notifications.receivers * validator -> provenanceValidator * Only validate the modified receiver stops existing invalid receivers from preventing modification of a valid receiver. * Improve error in Integration.Encrypt * Remove scope from alert.notifications.receivers:create * Add todos for receiver renaming * Use receiverAC precondition checks in k8s api * Linting * Optional optimistic concurrency for delete * make update-workspace * More specific auth checks in k8s authorize.go * Add debug log when delete optimistic concurrency is skipped * Improve error message on authorizer.DecisionDeny * Keep error for non-forbidden errutil errors	11 months ago
Alexander Akhmetov	b2eeb0dd6e	Alerting: update rule versions on folder move (#88376) ... * Alerting: update rule versions on folder move (#88361) * Add tracing to folder.Move and folder.Update	11 months ago
Matthew Jacobson	53cfdf0ef8	Alerting: Remove option to return settings from api/v1/receivers and restrict provisioning action access (#90861) ... * Remove provisioning action access to v1/receivers api * Separate ListOnly functionality to its own method without decryption	12 months ago
Ryan McKinley	99d8025829	Chore: Move identity and errutil to apimachinery module (#89116)	1 year ago
Matthew Jacobson	31d5dd0a12	Alerting: Prevent updating rule uid matcher for silences (#88519) ... Prevents updating the `__alert_rule_uid__` equality matcher (used for rule-specific silences) on existing silences	1 year ago
Matthew Jacobson	09cb3a6048	Alerting: Add optional metadata via query param to silence GET requests (#88000) ... * Alerting: Add optional metadata to GET silence responses - ruleMetadata: to request rule metadata. - accesscontrol: to request access control metadata.	1 year ago
Fayzal Ghantiwala	543f0ae37e	Alerting: Update ListAlertRulesQuery to take a slice of RuleGroups (#88385) ... * Change ListAlertRulesQuery to take RuleGroup slice instead * Change func name * Change func name * Fix fakes * Fix function arg	1 year ago
Matthew Jacobson	8418aca823	Alerting: Add single rule checks to alert rule access control (#88307) ... * Alerting: Add single rule checks to alert rule access control Modifies ruler api single rule read to no longer fetch entire groups and instead use the new single rule ac check. Simplifies provisioning api getAlertRuleAuthorized logic to always load a single rule instead of conditionally loading the entire group when provisioning permissions are not present. * Swap out Has/AuthorizeAccessToRule for Has/AuthorizeAccessInFolder	1 year ago
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.	1 year ago
Steve Simpson	54290f2ac4	Alerting: Fix TestRouteGetRuleStatuses as much as possible. (#86666) ... This test has been skipped for a long time, so it doesn't work anymore. I've fixed the test so it works again, but left some tests disabled which were apparently flaky. If we see the other test cases flaking, we'll have to disable it again. Fixes: - Use fake access control for most test cases, and real one for FGAC test cases. - Check that "file" in API responses the full folder path, not folder title.	1 year ago
Yuri Tseretyan	b9abb8cabb	Alerting: Update provisioning API to support regular permissions (#77007) ... * allow users with regular actions access provisioning API paths * update methods that read rules skip new authorization logic if user CanReadAllRules to avoid performance impact on file-provisioning update all methods to accept identity.Requester that contains all permissions and is required by access control. * create deltas for single rul e * update modify methods skip new authorization logic if user CanWriteAllRules to avoid performance impact on file-provisioning update all methods to accept identity.Requester that contains all permissions and is required by access control. * implement RuleAccessControlService in provisioning * update file provisioning user to have all permissions to bypass authz * update provisioning API to return errutil errors correctly --------- Co-authored-by: Alexander Weaver <weaver.alex.d@gmail.com>	1 year ago
Alexander Weaver	ccb4533a86	Alerting: Remove unused AlertRuleVersionWithPauseStatus (#82383) ... Remove unused AlertRuleVersionWithPauseStatus	1 year ago
Yuri Tseretyan	47546a4c72	Alerting: Update API to use folders' full paths (#81214) ... * update GetUserVisibleNamespaces to use FolderSeriver * update GetNamespaceByUID to use FolderService.GetFolders * update GetAlertRulesForScheduling to use FolderService.GetFolders * Update API and GetAlertRulesForScheduling to use the folder's full path * get full path of folder in RouteTestGrafanaRuleConfig * fix escaping of titles for MySQL	1 year ago
William Wernert	2ab7d3c725	Alerting: Receivers API (read only endpoints) (#81751) ... * Add single receiver method * Add receiver permissions * Add single/multi GET endpoints for receivers * Remove stable tag from time intervals See end of PR description here: https://github.com/grafana/grafana/pull/81672	1 year ago
William Wernert	7e939401dc	Alerting: Introduce initial common receiver service (#81211) ... * Create locking config store that mimics existing provisioning store * Rename existing receivers(_test).go * Introduce shared receiver group service * Fix test * Move query model to models package * ReceiverGroup -> Receiver * Remove locking config store * Move convert methods to compat.go * Cleanup	1 year ago
Sofia Papagiannaki	89d3b55bec	Folders: Reduce DB queries when counting and deleting resources under folders (#81153) ... * Add folder store method for fetching all folder descendants * Modify GetDescendantCounts() to fetch folder descendants at once * Reduce DB calls when counting library panels under dashboard * Reduce DB calls when counting dashboards under folder * Reduce DB calls during folder delete * Modify folder registry to count/delete entities under multiple folders * Reduce DB calls when counting * Reduce DB calls when deleting	1 year ago
idafurjes	7e5544ab21	Add MFolderIDsServiceCount to count folderIDs in services pkg (#81237)	2 years ago
William Wernert	2203bc2a3d	Alerting: Refactor provisioning tests/fakes (#81205) ... * Fix up test Alertmanager config JSON * Move fake AM config and provisioning stores to fakes package	2 years ago
Sofia Papagiannaki	d1dab5828d	Alerting: Update rule API to address folders by UID (#74600) ... * Change ruler API to expect the folder UID as namespace * Update example requests * Fix tests * Update swagger * Modify FIle field in /api/prometheus/grafana/api/v1/rules * Fix ruler export * Modify folder in responses to be formatted as <parent UID>/<title> * Add alerting test with nested folders * Apply suggestion from code review * Alerting: use folder UID instead of title in rule API (#77166) Co-authored-by: Sonia Aguilar <soniaaguilarpeiron@gmail.com> * Drop a few more latent uses of namespace_id * move getNamespaceKey to models package * switch GetAlertRulesForScheduling to use folder table * update GetAlertRulesForScheduling to return folder titles in format `parent_uid/title`. * fi tests * add tests for GetAlertRulesForScheduling when parent uid * fix integration tests after merge * fix test after merge * change format of the namespace to JSON array this is needed for forward compatibility, when we migrate to full paths * update EF code to decode nested folder --------- Co-authored-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com> Co-authored-by: Virginia Cepeda <virginia.cepeda@grafana.com> Co-authored-by: Sonia Aguilar <soniaaguilarpeiron@gmail.com> Co-authored-by: Alex Weaver <weaver.alex.d@gmail.com> Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>	2 years ago
Alexander Weaver	ab0ef5276f	Alerting: Decouple quota configuration logic from API interfaces and add tests (#78930) ... * Separate usage reporter from API * Extract quota registration * Decouple from API store interface * Move to ngalert package and add tests * linter	2 years ago
Santiago	01d274852c	Alerting: Add GetFullState method to FileStore (#78701) ... * Alerting: Add GetFullState method to FileStore * make tests compile, create stateStore in NewAlertmanager * return errors instead of logging, accept an arbitrary number of strings * make NewAlertmanager() accept a stateStore	2 years ago
Kat Yang	2f2ce3edbb	Chore: Deprecate ID from Folder (#78281) ... * Chore: Deprecate ID from Folder * chore: add more linter comments * chore: add missing lint comment	2 years ago
Jo	580477bf8e	NGAlerting: Use identity.Requester interface instead of SignedInUser (#76360) ... * unfurl SignedInUserAttrs services * replace signedInUser with Requester replace signedInUser with requester * fix tests * linting --------- Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>	2 years ago
Matthew Jacobson	82f3127e23	Alerting: Move legacy alert migration from sqlstore migration to service (#72702)	2 years ago
Alexander Weaver	f6649d7a97	Revert "Alerting: Remove vendored models in migration service" (#76387) ... Revert "Alerting: Remove vendored models in migration service (#74503)" This reverts commit 6a8649d544.	2 years ago
Matthew Jacobson	6a8649d544	Alerting: Remove vendored models in migration service (#74503) ... This PR replaces the vendored models in the migration with their equivalent ngalert models. It also replaces the raw SQL selects and inserts with service calls. It also fills in some gaps in the testing suite around: - Migration of alert rules: verifying that the actual data model (queries, conditions) are correct 9a7cfa9 - Secure settings migration: verifying that secure fields remain encrypted for all available notifiers and certain fields migrate from plain text to encrypted secure settings correctly e7d3993 Replacing the checks for custom dashboard ACLs will be replaced in a separate targeted PR as it will be complex enough alone.	2 years ago
Yuri Tseretyan	2497db4bd6	Alerting: Add UID of rules to response that were affected by update group request (#75985) ... * update storage's method InstertRules to return ids of added rules as slice to keep the same order as rules in the argument * schematize response of update rule group endpoint, add created, updated, deleted fields that contain UID of affected rules. * update integration tests to use the new fields	2 years ago
Jo	41bcb5e07f	Identity: Port folder library to identity.Requester (#76105) ... Port folders to identity.Requester	2 years ago
Ryan McKinley	025b2f3011	Chore: use any rather than interface{} (#74066)	2 years ago
Arati R	6cb1a5e368	Nested folders: Add alert rule counts and deletion to folder registry (#67259) ... * Let alert rule service implement registry service * Add count method to RuleStore interface * Add implementation for deletion of alert rules * Rename uid to folderUID in registry methods * Check forceDeleteRule value for registry deletion * Register alerting store with folder service * Move folder test functions to separate package * Add testing for alert rule counting, deletion * Remove redundant count method * Fix deleteChildrenInFolder signature * Update pkg/services/ngalert/store/alert_rule.go Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com> * Add tests for nested folder deletion * Refactor TestIntegrationNestedFolderService * Add rules store as parameter for alertng provider --------- Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>	2 years ago
Ieva	d8b66d5c4b	RBAC: remove some `IsDisabled` checks (#69272) ... * remove some access contorl IsDisabled() checks * cleaning up tests * update tests * linting	2 years ago
Serge Zaitsev	0beb768427	Chore: Remove result fields from ngalert (#65410) ... * remove result fields from ngalert * remove duplicate imports	2 years ago
Alex Moreno	531b439cf1	Alerting: Add alert pausing feature (#60734) ... * Add field in alert_rule model, add state to alert_instance model, and state to eval * Remove paused state from eval package * Skip paused alert rules in scheduler * Add migration to add is_paused field to alert_rule table * Convert to postable alerts only if not normal, pernding, or paused * Handle paused eval results in state manager * Add Paused state to eval package * Add paused alerts logic in scheduler * Skip alert on scheduler * Remove paused status from eval package * Apply suggestions from code review Co-authored-by: George Robinson <george.robinson@grafana.com> * Remove state * Rethink schedule and manager for paused alerts * Change return to continue * Remove unused var * Rethink alert pausing * Paused alerts storing annotations * Only add one state transition * Revert boolean method renaming refactor * Revert take image refactor * Make registry errors public * Revert method extraction for getting a folder title * Revert variable renaming refactor * Undo unnecessary changes * Revert changes in test * Remove IsPause check in PatchPartiLAlertRule function * Use SetNormal to set state * Fix text by returning to old behaviour on alert rule deletion * Add test in schedule_unit_test.go to test ticks with paused alerts * Add coment to clarify usage of context.Background() * Add comment to clarify resetStateByRuleUID method usage * Move rule get to a more limited scope * Update pkg/services/ngalert/schedule/schedule.go Co-authored-by: George Robinson <george.robinson@grafana.com> * rum gofmt on pkg/services/ngalert/schedule/schedule.go * Remove defer cancel for context * Update pkg/services/ngalert/models/instance_test.go Co-authored-by: Santiago <santiagohernandez.1997@gmail.com> * Update pkg/services/ngalert/models/testing.go Co-authored-by: Santiago <santiagohernandez.1997@gmail.com> * Update pkg/services/ngalert/schedule/schedule_unit_test.go Co-authored-by: Santiago <santiagohernandez.1997@gmail.com> * Update pkg/services/ngalert/schedule/schedule_unit_test.go Co-authored-by: Santiago <santiagohernandez.1997@gmail.com> * Update pkg/services/ngalert/models/instance_test.go Co-authored-by: Santiago <santiagohernandez.1997@gmail.com> * skip scheduler rule state clean up on paused alert rule * Update pkg/services/ngalert/schedule/schedule.go Co-authored-by: Santiago <santiagohernandez.1997@gmail.com> * Fix mock in test * Add (hopefully) final suggestions * Use error channel from recordAnnotationsSync to cancel context * Run make gen-cue * Place pause alert check in channel update after version check * Reduce branching un update channel select * Add if for error and move code inside if in state manager ResetStateByRuleUID * Add reason to logs * Update pkg/services/ngalert/schedule/schedule.go Co-authored-by: George Robinson <george.robinson@grafana.com> * Do not delete alert rule routine, just exit on eval if is paused * Reduce branching and create-close a channel to avoid deadlocks * Separate state deletion and state reset (includes history saving) * Add current pause state in rule route in scheduler * Split clearState and bring errCh closer to RecordStatesAsync call * Change rule to ruleMeta in RecordStatesAsync * copy state to be able to modify it * Add timeout to context creation * Shorten the timeout * Use resetState is rule is paused and deleteState if rule is not paused * Remove Empty state reason * Save every rule change in historian * Add tests for DeleteStateByRuleUID and ResetStateByRuleUID * Remove useless line * Remove outdated comment Co-authored-by: George Robinson <george.robinson@grafana.com> Co-authored-by: Santiago <santiagohernandez.1997@gmail.com> Co-authored-by: Armand Grillet <2117580+armandgrillet@users.noreply.github.com>	3 years ago
Sofia Papagiannaki	9855e74b92	Chore: Refactor quota service (#58643) ... Chore: Refactor quota service (#57586) * Chore: refactore quota service * Apply suggestions from code review	3 years ago
idafurjes	080ea88af7	Nested Folders: Support getting of nested folder in folder service wh… (#58597) ... * Nested Folders: Support getting of nested folder in folder service when feature flag is set * Fix lint * Fix some tests * Fix ngalert test * ngalert fix * Fix API tests * Fix some tests and lint * Fix lint 2 * Fix library elements and panels * Add access control to get folder * Cleanup and minor test change	3 years ago