grafana

Commit Graph

Author	SHA1	Message	Date
Yuri Tseretyan	d10fdc0f02	Alerting: ListDeletedRules to return rules sorted by date (#102945 ) --------- Signed-off-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com>	2 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	2 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	2 months ago
alerting-team[bot]	6df99a6224	Alerting: Update alerting module to 58ba6c617ff05eb1d6f65c59d369a6a16923dff6 (#102812 ) * remove feature flag alertingAlertmanagerExtraDedupStage * use most recent version of fork of alertmanager --------- Co-authored-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com>	2 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	2 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	2 months ago
Alexander Akhmetov	f7aa17f2e4	Alerting: Add default values to AlertRule.Data queries in Prometheus conversion (#102843 ) What is this feature? Prometheus conversion: ensures that AlertRule.Data queries always have default parameters set (intervalMs, maxDataPoints). Without this, updates of the same rule can cause version increments. Why do we need this feature? Currently, when converting Prometheus rules to Grafana alerts, some default parameters are not explicitly set in the query model. This creates a problem during rule updates: When a user updates a rule that hasn't changed, we still detect differences in the AlertQuery.Model because the newly converted rules are missing the default fields, such as intervalMs and maxDataPoints. This causes unnecessary version increments of alert rules.	2 months ago
Peter Štibraný	5b5f433a26	spanner: Disable running alerting integration tests when using spanner. (#102730 ) * Disable running alerting integration tests when using spanner. * Disable tests for templategroup.	2 months ago
Alexander Akhmetov	c54da8f955	Alerting: Make $value return the query value in case when a single datasource is used (#102301 ) What is this feature? This PR changes the behavior of the $value and .Value variables in alerting templating to be more compatible with Prometheus templating. When a single datasource is used in the alerting rule, these variables will now return the numeric value from the query instead of the evaluation string. Why do we need this feature? It makes Grafana templating more compatible with Prometheus templates. In Prometheus, $value returns the numeric value of the query, but in Grafana it's the evaluation string: [ var='A' labels={instance=instance1} value=81.234 ]. This is because in Grafana multiple datasources can be used in the alert rule, and it's not always possible to get a single value. This change makes Grafana's behavior consistent with Prometheus when a single datasource is used, and in case when multiple datasources are used in the query, it keeps the old behaviour. Both $value and .Value are not recommended to use (documentation), and it's better to use .Values instead.	2 months ago
Steve Simpson	0ffb7518cd	Alerting: Ignore external alert sending errors when shutting down. (#102705 )	2 months ago
Alexander Akhmetov	b4758d06a3	Alerting: Support JSON Content-Type in the Prometheus conversion API (#102627 ) Alerting: Support content-type: json in conversion API	2 months ago
Marco de Abreu	543c0bbccb	App platform: Add cleanup job for dashboards when going through /apis (kubectl) (#102506 ) * Add dashboard cleanup job Change log message Adjust logic to account for new head RV logic Don't update lastResourceVersion due to pagination Save improvements * Address review feedback * Update docs. * Remove docs * Rename config --------- Co-authored-by: Marco de Abreu <18629099+marcoabreu@users.noreply.github.com>	2 months ago
Alexander Akhmetov	3ef583aa05	Alerting: Set MissingSeriesEvalsToResolve to 1 for Prometheus-imported rules (#101973 )	2 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.	2 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.	2 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	2 months ago
Yuri Tseretyan	c3f00eb403	Alerting: log body of unexpected response from Mimir (#102382 ) log body of unexpected response Signed-off-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com>	2 months ago
Tito Lins	42472dbe7e	Alerting: handle mimir BadRequest write errors (#102027 )	2 months ago
Alexander Akhmetov	a8a88f858a	Alerting: Remove uniqueness checks from the Prometheus conversion (#102261 )	2 months ago
Yuri Tseretyan	69a62777c5	Fix flaky test TestIntegration_ListDeletedRules (#102383 ) Signed-off-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com>	2 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>	2 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	2 months ago
Alexander Akhmetov	1d0a86252e	Alerting: Add target datasource support to Prometheus conversion (#102307 )	2 months ago
Dominik Broj	f7e0f095a2	Alerting: use 'Grafana IRM' wording in alerting contact point (#102014 ) * chore: use 'Grafana IRM' wording in alerting contact point * revert temp condition change * remove unneeded ts assertion * more renaming * use translations * update test * running make i18n-extract * avoid "simple" word in copy	2 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>	3 months ago
Yuri Tseretyan	e30034a42a	Alerting: Remove feature flag `alertingNoDataErrorExecution` (#102156 ) * remove feature flag * remove feature flag in state manager * make sure no data with empty results is handled Signed-off-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com> --------- Signed-off-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com>	3 months ago
Alexander Akhmetov	ef5cc12b33	Alerting: Add HMAC signature config to the webhook integration (#100960 ) Adds HMAC-SHA256 signature support to webhook notifications, providing a way to verify the authenticity and integrity of webhook requests. The implementation allows to specify the header in which the signature will be sent. The signature is calculated from the request body. An optional timestamp header name can be provided. If set, the HMAC signature will be generated by concatenating the timestamp, a ":" and the request body: {timestamp}:{body}. The timestamp will also be sent in the provided header name.	3 months ago
Steve Simpson	87638c0170	Alerting: Start splitting apart ngalert/api package. (#102075 )	3 months ago
Alexander Akhmetov	7dd6f52630	Alerting: Add MissingSeriesEvalsToResolve option to the AlertRule (#101184 )	3 months ago
Yuri Tseretyan	943b73a682	Alerting: Add scheduled clean-up of deleted rules (#101963 ) * add scheduled clean up of deleted rules --------- Signed-off-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com>	3 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.	3 months ago
Yuri Tseretyan	7e4beb2074	Alerting: API to return deleted rules (#101429 )	3 months ago
Steve Simpson	bbab62ce39	Alerting: Select remote write path dependent on metrics backend type. (#101891 ) The remote write path differs based on whether the data source is actually Prometheus, Mimir, Cortex, or an older version of Cortex. We do not want users to have to specify the path, so this change determines the path as best it can. It may be in the future we have to make this configurable per-datasource to cater for setups where it's impossible to determine the correct path.	3 months ago
Matthew Jacobson	19b878ce66	Alerting: Include time range in template dashboard and panel urls (#101095 ) Alerting: Include time range in templated dashboard and panel urls Time range: from=Alert.StartsAt-1hr Firing Alerts: to=Current Timestamp Resolved Alerts: to=Alert.EndsAt	3 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	3 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	3 months ago
Steve Simpson	14ebec527c	Alerting: Allow selection of recording rule write target on per-rule basis. (#101778 ) * Alerting: Allow selection of recording rule write target on per-rule basis. Introduces a new feature flag (`grafanaManagedRecordingRulesDatasources`), disabled by default, to enable the ability to write recording rules data using data source settings, and selecting the data source to use on a per-rule basis. To cope with the scenario of users upgrading, a configuration file option allows setting the default data source to use, if none is specified in the rule, emulating the behaviour of recording rules without the flag enabled. * Lint * Update conf/sample.ini Co-authored-by: Alexander Akhmetov <me@alx.cx> --------- Co-authored-by: Alexander Akhmetov <me@alx.cx>	3 months ago
Steve Simpson	cc80681beb	Alerting: Extend recording rules test to exercise writing with data sources. (#101775 ) The change to use WriteDatasource was done in a previous commit, this adds a test case using DatasourceWriter, in addition to the one using PrometheusWriter.	3 months ago
Alexander Akhmetov	0fa2dbdcdc	Alerting: Generate deterministic UID for folders created for Prometheus rule conversion (#101760 )	3 months ago
Steve Simpson	872fbf0208	Alerting: Implement arbitrary data source remote writer. (#101735 ) * Alerting: Implement arbitrary data source remote writer. Recording rules currently remote write to the endpoint speficied in the configuration file, but we want to change this so that it can be specified on a per-rule basis. This change implements the updated RemoteWriter interface, and dispatches writes to the correct data source. Notes about the implementation: - There is a defaulting behaviour, because we will need to handle situations when upgrading from older Grafana versions, where recording rules do not a data source target specified. - In order to avoid re-creating the remote write clients for every request, a cache is used. The entries have a TTL of 30 seconds at which point they are recreated; this is the delay for picking up new data source settings. Known limitations: - There is no per data source configuration for the remote write path suffix. - Not all data source settings will be used, but basic auth and TLS will be. - There is no RBAC. This will be a follow up feature. * Lint	3 months ago
Alexander Akhmetov	aa5f2e43d4	Alerting: Use upsert to set or update provenance (#101688 ) Alerting: Use upsert to update provenance	3 months ago
Alexander Akhmetov	a93a05aebd	Alerting: Support group-level labels in Prometheus to Grafana conversion (#101624 )	3 months ago
Steve Simpson	eed07cf503	Alerting: Refactor NewPrometheusWriter function. (#101706 ) * Alerting: Refactor NewPrometheusWriter function. In order to re-use PrometheusWriter, changing the function take a PrometheusWriterConfig instead of RecordingRulesSettings, and adapt the old interface onto the new interface. * Make linter happy	3 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.	3 months ago
Alexander Akhmetov	ec7a0db54d	Alerting: Return 400 if the Prometheus rule has unsupported options (#101616 )	3 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	3 months ago
Alexander Akhmetov	d44728f4e5	Alerting: Metric to count imported from Prometheus rules (#100847 )	3 months ago
Yuri Tseretyan	67b44ad22a	Alerting: Fix state reason (#101530 ) --------- Signed-off-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com>	3 months ago
Alexander Akhmetov	60827fe499	Alerting: Return 403 if no datasource access or quota has been exceeded (#101522 )	3 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	3 months ago

1 2 3 4 5 ...

1789 Commits (991b016d63196b5bbb101ba48219e7c246ebd1e2)