711 Commits (c4d3eb1cd03f30ea8e6aab71b2597bf3c6a6f46f)

Author	SHA1	Message	Date
Matheus Macabu	36c31ce841	NGAlert: Revert change to use math/rand/v2 in tests (#105661)	2 months ago
Alexander Akhmetov	c58ac15031	Alerting: Remove grafanaManagedRecordingRules feature flag (#105569)	2 months ago
Ieva	2cddaf0781	RBAC: Remove dashboard and folder guardians (#104646) ... * replace usage of folder guardians with access control evaluators * remove NewByFolderUID guardian * bring up to date * fix test * more test fixes, and don't fetch the folder before evaluating lib element access * change what error is returned * fix alerting test * try to fix linter errors * replace the use of newByFolder guardian with direct access control evaluator checks * remove newByFolder guardian * get rid of dashboard and folder guardians * undo unwanted change * undo unwanted change * undo unwanted change * update code owners	2 months ago
Matheus Macabu	4b426238bd	Dependencies: Bump github.com/openfga/openfga from v1.8.6 to v1.8.12 (#105193) ... * Dependencies: Bump github.com/openfga/openfga from v1.8.6 to v1.8.12 * Linter: Replace x/exp/rand with math/rand/v2 * NGAlert: Fix test after linter fixes	2 months ago
Alexander Akhmetov	9fe523b9e6	Alerting: API to pause all alert rules in a folder (#104674)	2 months ago
Alexander Akhmetov	c17b019ab1	Alerting: Support simplified routing receivers in Prometheus conversion API (#105135) ... Adds ability to set notifications settings using the Prometheus conversion API. The API now supports a new optional header: X-Grafana-Alerting-Notification-Settings which can be used to specify notification settings. The value of the header is the AlertRuleNotificationSettings structure in JSON: mimirtool rules load alerts.yaml --extra-headers 'X-Grafana-Alerting-Notification-Settings: {"receiver": "my-webhook", "group_by": ["cluster", "pod"]}'	2 months ago
Sonia Aguilar	0ceea29787	Alerting: Remove alertingSimplifiedRouting feature toggle (#104980) ... Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>	2 months ago
Yuri Tseretyan	3e2296acd3	Alerting: Support for active time intervals in notification policies (#104252) ... * add active_time_intervals to route model * update k8s compat layer * update notification policies service to validate active time intervals * update integration tests * update openapi * add active time interval to model * update route generator to include active time interval * Update storage list and rename methods to handle active intervals * update api model * update provisioning and export models * update ui to allow active timing config * update i18n * fix snapshots for ui tests * run prettier * Alerting: Active time intervals UI naming (#104402) * update naming in UI * update naming in the edit page title * update translations * update alerting module --------- Signed-off-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com> Co-authored-by: Sonia Aguilar <33540275+soniaAguilarPeiron@users.noreply.github.com> Co-authored-by: Sonia Aguilar <soniaaguilarpeiron@gmail.com>	2 months ago
Moustafa Baiou	9f07e49cdd	Alerting: Add extended definition to prometheus alert rules api (#103320) ... * Alerting: Add extended definition to prometheus alert rules api This adds `isPaused` and `notificationSettings` to the paginated rules api to enable the paginated view of GMA rules. refactor: make alert rule status and state retrieval extensible This lets us get status from other sources than the local ruler. * update swagger spec * add safety checks in test	3 months ago
Moustafa Baiou	5ddcac8678	Alerting: Add back time interval items to the API spec (#104306)	3 months ago
Fayzal Ghantiwala	3a054d5e00	Alerting: Add FiredAt field to State (#104046) ... * Add FiredAt field to the State * Update featuretoggle files * Fix lint errors * Fix test compilation * Remove random print line + formatting * Address PR comments	3 months ago
Marco de Abreu	163a8d5f0c	NGAlert: Fix flaky test (#104070) ... Fix flaky test Co-authored-by: Marco de Abreu <18629099+marcoabreu@users.noreply.github.com>	3 months ago
Moustafa Baiou	54d4b7842b	Alerting: Fix flaky tests (#104017) ... Alerting: fix flaky tests Some test conditions introduced in #103403 are flaky because they rely on random behavior of the generator. Sometimes rules are generated with an updated by (which warrants the lookup of the users). This makes it so those tests which are checking the user lookup always have rules with updated by.	3 months ago
William Wernert	a5288db624	Alerting: Remove the POST endpoint for the internal Grafana Alertmanager config (#103819) ... * Remove POST config for Grafana Alertmanager * Delete auth + test for removed path * Alerting: Remove check for `alertingApiServer` toggle in UI (#103805) * Remove check for alertingApiServer in UI * Update tests to no longer care about alertingApiServer * Add contact points handlers now that we use alertingApiServer all the time * Fix test broken from removing camelCase for UIDs --------- Co-authored-by: Tom Ratcliffe <tom.ratcliffe@grafana.com>	3 months ago
Matthew Jacobson	9e933882ed	Alerting: Webhook Improvements - Templateable Payloads (#103818) ... * Template editor syntax highlighting when preview is json-like * Add new template editor language examples, snippets, and functions * Use updated NewTemplate function * Add new fields to webhook notifier - CustomPayload - ExtraHeaders * Documentation * Update grafana/alerting to in-progress PR (needs updating after merge) * Fix integration test * Remove docs reference to .Extra template context No longer exists, was part of a previous iteration * make update-workspace * Update grafana/alerting to actual merged commit	3 months ago
Matthew Jacobson	9f9c4b3da3	Alerting: Template preview enhancements (#103817) ... API Changes: - Fixes validation in template CRUD API to be closer to how the running alertmanager will use the template. Should remove some incorrect validation errors. - Adds some missing default placeholder labels to receiver testing that are used during template testing but missing during receiver testing Template Preview: - Replaced basic preview with a readonly CodeEditor for better whitespace and alignment clarity (also adds support for future syntax highlighting in template previews for upcoming webhook payload templates) Template Selector (Receiver Form): - Refactored to use same components as Template editor for preview. - Fixed preview to work with multi-definition templates - Fixed copy to correctly copy the template contents instead of {{ template "<name>" . }}. Template Editor: - Fixed detection of when to display functions vs snippets in multi-line expressions	3 months ago
Konrad Lalik	0a8dccc19a	Alerting: New alert list filter improvements (#103107) ... * Move filtering code to generators for performance reasons Discarding rules and groups early in the iterable chain limits the number of promises we need to wait for which improves performance significantly * Add error handling for generators * Add support for data source filter for GMA rules * search WIP fix * Fix datasource filter * Move filtering back to filtered rules hook, use paged groups for improved performance * Add queriedDatasources field to grafana managed rules and update filtering logic to rely on it - Introduced a new field `queriedDatasources` in the AlertingRule struct to track data sources used in rules. - Updated the Prometheus API to populate `queriedDatasources` when creating alerting rules. - Modified filtering logic in the ruleFilter function to utilize the new `queriedDatasources` field for improved data source matching. - Adjusted related tests to reflect changes in rule structure and filtering behavior. * Add FilterView performance logging * Improve GMA Prometheus types, rename queried datasources property * Use custom generator helpers for flattening and filtering rule groups * Fix lint errors, add missing translations * Revert test condition * Refactor api prom changes * Fix lint errors * Update backend tests * Refactor rule list components to improve error handling and data source management - Enhanced error handling in FilterViewResults by logging errors before returning an empty iterable. - Simplified conditional rendering in GrafanaRuleLoader for better readability. - Updated data source handling in PaginatedDataSourceLoader and PaginatedGrafanaLoader to use new individual rule group generator. - Renamed toPageless function to toIndividualRuleGroups for clarity in prometheusGroupsGenerator. - Improved filtering logic in useFilteredRulesIterator to utilize a dedicated function for data source type validation. - Added isRulesDataSourceType utility function for better data source type checks. - Removed commented-out code in PromRuleDTOBase for cleaner interface definition. * Fix abort controller on FilterView * Improve generators filtering * fix abort controller * refactor cancelSearch * make states exclusive * Load full page in one loadResultPage call * Update tests, update translations * Refactor filter status into separate component * hoist hook * Use the new function for supported rules source type --------- Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>	3 months ago
Moustafa Baiou	032299011a	Alerting: Relax permissions for access a rule (#103664) ... This makes it so that it is: - No longer required to have datasource permissions to delete a rule. - No longer required to have datasource permissions to update non-query related fields of a rule.	3 months ago
Kevin Yu	fd6fd91115	Prometheus: Add support for cloud partners Prometheus data sources (#103482) ... * wip * Add prom flavor support for data source variables and export/import dashboards (#103321) * add dashboard and data source var selection * use match plugin id instead * use updated matchpluginid * formatting * cleanup * regex anchor * update error msg * Alerting: Clean up prometheus-flavored types and functions (#103703) * clean up types and utility functions for dealing with prometheus-flavored data sources * Refactor alerting datasource types to use constants as source of truth * Alerting: Clean up prometheus-flavored types and functions on the bac… (#103716) Alerting: Clean up prometheus-flavored types and functions on the backend * add matchPluginId tests * Update matchPluginId func to bidirectional (#103746) * update matchpluginid func to bidirectional * lint * formatting * use actual isSupportedExternalRulesSourceType in test * add tests in datasource_srv * betterer * remove type assertion * remove unnecessary case * use satisifies to not have to convert tuple to an array of string * add prometheus_flavor test --------- Co-authored-by: Andrew Hackmann <5140848+bossinc@users.noreply.github.com> Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com> Co-authored-by: Alexander Akhmetov <me@alx.cx>	3 months ago
Mariell Hoversholm	757be6365a	CI: Bump golangci-lint to 2.0.2 (#103572)	3 months ago
Alexander Akhmetov	97897b796e	Alerting: Do not export MissingSeriesEvalsToResolve if it is not set (#103736)	3 months ago
Alexander Akhmetov	babe188e31	Alerting: Fix path for cortex-style Prometheus namespaces conversion endpoint (#103655)	3 months ago
Will Assis	9bc4fbe900	alerting: batch user service calls (#103403) ... * update alerting endpoints to batch requests to the user service via ListByIdOrUID	3 months ago
Alexander Akhmetov	cf5da1d366	Alerting: Fix swagger in pkg/services/ngalert/api/tooling (#103500)	3 months ago
Alexander Akhmetov	bdbe94abc8	Alerting: Remove alertingConversionAPI feature flag (#103380)	4 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
Fayzal Ghantiwala	68d8810ecb	Alerting: API to convert submitted Prometheus rules to GMA (#102231) ... * placeholder commit * Complete function in api_convert_prometheus.go * MVP before extensive testing * Cleanup * Updated tests * cleanup * Fix random logs and lint * Remove comment * Fix errors after rebase * Update test * Update swagger * swagger * Refactor to accept groups in body * Fix auth tests and some cleanup * Some cleanup before refactoring * Remove unnecessary fields * Also refactor RouteConvertPrometheusPostRuleGroup * Remove unused code * Rebase + cleanup * Update authorization_test * address comments * Regen swagger files * Remove namespace and group filters * Final comments	4 months ago
Mariell Hoversholm	d0d7078953	App Platform: Remove mutable globals (#102962) ... * App Platform: Remove mutable globals * chore: clarify why this exists * fix: support multi-tenant mode * refactor: call builder providers directly * CI: Force re-build	4 months ago
William Wernert	88d23fe5be	Alerting: Remove transitional notifications API endpoints (#102713) ... * Remove transitional notifications API endpoints * Fix openapi spec * Fix path test * Remove API tests related to removed endpoints	4 months ago
Alexander Akhmetov	f49a88ab72	Alerting: Add MissingSeriesEvalsToResolve to the APIs (#102150) ... What is this feature? A follow-up for #101184, adds AlertRule.MissingSeriesEvalsToResolve to the APIs. missing_series_evals_to_resolve must be specified too and it must be > 0. POST /api/ruler/grafana/api/v1/rules/{folderUID} works in the following way: If missing_series_evals_to_resolve is not sent or null, the rule keeps its existing value If missing_series_evals_to_resolve > 0: updates to that value If missing_series_evals_to_resolve = 0: resets to default (nil). AlertRule.MissingSeriesEvalsToResolve can't be 0, so I used it to reset In the Provisioning API, the value is just set if present and > 0. Otherwise it's reset: PUT to /api/v1/provisioning/alert-rules/{UID}: If missing_series_evals_to_resolve is nil, it's reset to the default value If missing_series_evals_to_resolve > 0, it's updated	4 months ago
Alexander Akhmetov	b4758d06a3	Alerting: Support JSON Content-Type in the Prometheus conversion API (#102627) ... Alerting: Support content-type: json in conversion API	4 months ago
Alexander Akhmetov	ad71270ee0	Alerting: Support query_offset in the Prometheus conversion (#102499) ... Adds support for rule group-level query_offset in Prometheus to Grafana rule conversion. It allows specifying a time offset for rule evaluation, which gets applied and saved during the conversion.	4 months ago
Alexander Akhmetov	756b45402c	Alerting: Add rule_query_offset setting for Prometheus rule conversion (#102500) ... Adds a new configuration option to specify a time offset for rule evaluation, which gets applied and saved during the Prometheus -> Grafana conversion. For example: [unified_alerting.prometheus_conversion] rule_query_offset = 1m Changing this option affects only the rules imported after the change. If query_offset is set at the group level, it takes precedence over this setting. Default is set to 1m.	4 months ago
Matthew Jacobson	371ea5cda7	Alerting: Fix loss of TimeInterval location on remote AM apply (#102510) ... * Alerting: Fix loss of TimeInterval location on remote AM apply deepcopy.Copy does not correctly copy PostableUserConfig because it ignores unexported fields. As a result, TimeInterval locations default to UTC instead of retaining their original values. * make update-workspace	4 months ago
Alexander Akhmetov	a8a88f858a	Alerting: Remove uniqueness checks from the Prometheus conversion (#102261)	4 months ago
Yuri Tseretyan	e39b17d701	Alerting: Remove constraints for uniqueness of rule title (#102067) ... * fix having duplicated names in same group in the UI --------- Co-authored-by: Sonia Aguilar <soniaaguilarpeiron@gmail.com>	4 months ago
Alexander Akhmetov	695ac91290	Alerting: Add backend support for keep_firing_for (#100750) ... What is this feature? This PR introduces a new alert rule configuration option, keep_firing_for (Prometheus documentation). keep_firing_for prevents alerts from resolving immediately after the alert condition returns to normal. Instead, they transition into a "Recovering" state and are not considered resolved by the Alertmanager. Once the recovery period ends (or after the next evaluation if it is bigger than keep_firing_for), the alert transitions to "Normal" if it doesn't start alerting again: Before +----------+ +----------+ | Alerting |---->| Normal | +----------+ +----------+ ----- After +----------+ +------------+ +----------+ | Alerting |----->| Recovering |---->| Normal | +----------+ +------------+ +----------+ Why do we need this feature? This feature prevents flapping alerts by adding a recovery period. This helps avoid false resolutions caused by brief alert	4 months ago
Alexander Akhmetov	1d0a86252e	Alerting: Add target datasource support to Prometheus conversion (#102307)	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
Steve Simpson	87638c0170	Alerting: Start splitting apart ngalert/api package. (#102075)	4 months ago
Alexander Akhmetov	85b0b47efd	Alerting: Allow disabling provenance in the Prometheus conversion API (#101573) ... When creating Grafana-managed alerts from Prometheus rule definitions with mimirtool or cortextool, the rules are marked as "provisioned" and are not editable in the Grafana UI. This PR allows changing this by providing an extra header: --extra-header="X-Disable-Provenance=true". When provenance is disabled, we do not keep the original rule definition in YAML, so it is impossible to read it back using the Prometheus conversion API (mimirtool/cortextool). This is intentional because if we did keep it and the rule was later changed in the UI, its Prometheus YAML definition would no longer reflect the latest version of the alert rule, as it would be unchanged.	4 months ago
Yuri Tseretyan	7e4beb2074	Alerting: API to return deleted rules (#101429)	4 months ago
Matthew Jacobson	b73c59547c	Alerting: Re-encrypt existing contact points before get and patch in legacy config API (#101263) ... * Test covering Get+Save interaction for newly secret fields * Alerting: Re-encrypt existing contact points before get and patch	5 months ago
Alexander Akhmetov	48ea9b08a2	Alerting: Add recording rule target datasource support to Prometheus conversion API (#101799) ... What is this feature? Adds target datasource UID to the recording rules so that they write to the same datasource used for alerting rule queries after the import. Why do we need this feature? Target datasourse support was added in #101678, and under a feature flag grafanaManagedRecordingRulesDatasources (#101778). This PR makes the importing process: Check if the import contains recording rules Verify both recording rules and the grafanaManagedRecordingRulesDatasources feature flag are enabled If either check fails, return an error If both checks pass, create recording rules with the provided datasource UID set as both the query and target datasource	5 months ago
Steve Simpson	b7dcfcedcb	Alerting: Extend recording rule definitions/interfaces with data source. (#101678) ... Extend the recording rule definition to include the target data source, allowing configuration of where the output of the recording rule is written to. Also extends the relevant interfaces in preparation for the next set of changes.	5 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	60827fe499	Alerting: Return 403 if no datasource access or quota has been exceeded (#101522)	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
Matthew Jacobson	2466685a41	Alerting: Improve template testing by trying non-root scopes (#101471) ... Expand template testing to try additional scopes if the root scope fails. This mitigates errors for definitions like pagerduty.default.instances, which require the .Alerts scope. Added support for .Alerts and .Alert scopes.	5 months ago