233 Commits (41e4b95b51a00f44facbde969efe9a6229107a54)

Author	SHA1	Message	Date
Santiago	6a75a8f354	Alerting: Update grafana/alerting and use Upsert for creating silences (#85676) ... * Alerting: Update grafana/alerting and use Upsert for creating silences * go.work.sum * change error message in tests for silences (save -> upsert)	2 years ago
Serge Zaitsev	faa1244518	Chore: Replace sqlstore with db interface (#85366) ... * replace sqlstore with db interface in a few packages * remove from stats * remove sqlstore in admin test * remove sqlstore from api plugin tests * fix another createUser * remove sqlstore in publicdashboards * remove sqlstore from orgs * clean up orguser test * more clean up in sso * clean up service accounts * further cleanup * more cleanup in accesscontrol * last cleanup in accesscontrol * clean up teams * more removals * split cfg from db in testenv * few remaining fixes * fix test with bus * pass cfg for testing inside db as an option * set query retries when no opts provided * revert golden test data * rebase and rollback	2 years ago
Yuri Tseretyan	48de8657c9	Alerting: Editor role can access all provisioning API (#85022)	2 years ago
Matthew Jacobson	980b9a62c6	Alerting: Enable simplified routing FF by default (#84856)	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	e593d36ed8	Alerting: Update rule access control to explicitly check for permissions "alert.rules:read" and "folders:read" (#78289) ... * require "folders:read" and "alert.rules:read" in all rules API requests (write and read). * add check for permissions "folders:read" and "alert.rules:read" to AuthorizeAccessToRuleGroup and HasAccessToRuleGroup * check only access to datasource in rule testing API --------- Co-authored-by: William Wernert <william.wernert@grafana.com>	2 years ago
George Robinson	a564c8c439	Alerting: Keep order of time and mute time intervals consistent (#83257)	2 years ago
George Robinson	1ed1242358	Alerting: Basic support for time_intervals (#83216) ... This commit adds basic support for time_intervals, as mute_time_intervals is deprecated in Alertmanager and scheduled to be removed before 1.0. It does not add support for time_intervals in API or file provisioning, nor does it support exporting time intervals. This will be added in later commits to keep the changes as simple as possible.	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
Dan Cech	790e1feb93	Chore: Update test database initialization (#81673) ... * streamline initialization of test databases, support on-disk sqlite test db * clean up test databases * introduce testsuite helper * use testsuite everywhere we use a test db * update documentation * improve error handling * disable entity integration test until we can figure out locking error	2 years ago
Matthew Jacobson	dd0ca1263b	Alerting: Include rule uid, title, namespace in unique constraint errors (#82011) ... * Alerting: Include rule_uid, title, namespace_uid in unique constraint errors	2 years 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	2 years ago
George Robinson	c8ccc4649c	Alerting: Support UTF-8 (#81512) ... This pull request updates our fork of Alertmanager to commit 65bdab0, which is based on commit 5658f8c in Prometheus Alertmanager. It applies the changes from grafana/alerting#155 which removes the overrides for validation of alerts, labels and silences that we had put in place to allow alerts and silences to work for non-Prometheus datasources. However, as this is now supported in Alertmanager with the UTF-8 work, we can use the new upstream functions and remove these overrides. The compat package is a package in Alertmanager that takes care of backwards compatibility when parsing matchers, validating alerts, labels and silences. It has three modes: classic mode, UTF-8 strict mode, fallback mode. These modes are controlled via compat.InitFromFlags. Grafana initializes the compat package without any feature flags, which is the equivalent of fallback mode. Classic and UTF-8 strict mode are used in Mimir. While Grafana Managed Alerts have no need for fallback mode, Grafana can still be used as an interface to manage the configurations of Mimir Alertmanagers and view configurations of Prometheus Alertmanager, and those installations might not have migrated or being running on older versions. Such installations behave as if in classic mode, and Grafana must be able to parse their configurations to interact with them for some period of time. As such, Grafana uses fallback mode until we are ready to drop support for outdated installations of Mimir and the Prometheus Alertmanager.	2 years ago
Yuri Tseretyan	d1073deefd	Alerting: Time intervals API (read only endpoints) (#81672) ... * declare new API and models GettableTimeIntervals, PostableTimeIntervals * add new actions alert.notifications.time-intervals:read and alert.notifications.time-intervals:write. * update existing alerting roles with the read action. Add to all alerting roles. * add integration tests	2 years ago
George Robinson	0726c7c3fa	Alerting: Prevent inhibition rules in Grafana Alertmanager (#81712) ... This commit prevents saving configurations containing inhibition rules in Grafana Alertmanager. It does not reject inhibition rules when using external Alertmanagers, such as Mimir. This meant the validation had to be put in the MultiOrgAlertmanager instead of in the validation of PostableUserConfig. We can remove this when inhibition rules are supported in Grafana Managed Alerts.	2 years ago
Gabriel MABILLE	3df0611f81	RBAC: Fix authorize in org (#81552) ... * RBAC: Fix authorize in org * Implement option 2 * Fix typo * Fix alerting test * Add test to cover the not member case	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
Yuri Tseretyan	4b071f5452	Alerting: Fix MuteTiming Get API to return provenance status (#80494)	2 years ago
Yuri Tseretyan	4479e7218d	Alerting: MuteTiming service return errutil + GetTiming by name (#79772) ... * add get mute timing by name to MuteTimingService * update get mute timing request handler to use the service method * replace validation, uniqueness and used errors with errutils * update mute timing methods return errutil responses * use the term "time interval" in errors bevause mute timings are deprecated in Alertmanager and will be replaced by time intervals in the future. * update create and update methods to return struct instead of pointer	2 years ago
Yuri Tseretyan	f6a46744a6	Alerting: Support hysteresis command expression (#75189) ... Backend: * Update the Grafana Alerting engine to provide feedback to HysteresisCommand. The feedback information is stored in state.Manager as a fingerprint of each state. The fingerprint is persisted to the database. Only fingerprints that belong to Pending and Alerting states are considered as "loaded" and provided back to the command. - add ResultFingerprint to state.State. It's different from other fingerprints we store in the state because it is calculated from the result labels. - add rule_fingerprint column to alert_instance - update alerting evaluator to accept AlertingResultsReader via context, and update scheduler to provide it. - add AlertingResultsFromRuleState that implements the new interface in eval package - update getExprRequest to patch the hysteresis command. * Only one "Recovery Threshold" query is allowed to be used in the alert rule and it must be the Condition. Frontend: * Add hysteresis option to Threshold in UI. It's called "Recovery Threshold" * Add test for getUnloadEvaluatorTypeFromCondition * Hide hysteresis in panel expressions * Refactor isInvalid and add test for it * Remove unnecesary React.memo * Add tests for updateEvaluatorConditions --------- Co-authored-by: Sonia Aguilar <soniaaguilarpeiron@gmail.com>	2 years ago
Yuri Tseretyan	d160638c67	Alerting: Add integration tests for mute timings provisioning API (#79810)	2 years ago
Alexander Weaver	cf8e8852c3	Alerting: Drop NamespaceID from responses on unstable ngalert API endpoints in favor of NamespaceUID (#79359) ... * Drop from API response * Drop from swagger docs * Drop from integration tests * regenerate public swagger docs * Drop from frontend * Drop asserts for namespaceID field	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
Yuri Tseretyan	7e331c8507	Alerting: Support for `condition` field in /api/v1/eval (#79032) ... Co-authored-by: Sonia Aguilar <soniaaguilarpeiron@gmail.com>	2 years ago
Sofia Papagiannaki	6d4625ad52	Alerting: Fix deleting rules in a folder with matching UID in another organization (#78258) ... * Remove usage of obsolete function for deleting alert rules under folder * Apply suggestion from code review * Update tests	2 years ago
Yuri Tseretyan	64feeddc23	Alerting: Update rule access control to return errutil errors (#78284) ... * update rule access control to return errutil errors * use alerting in msgID	2 years ago
George Robinson	05e12e787b	Alerting: Add provenance field to /api/v1/provisioning/alert-rules (#76252) ... This commit adds the missing Provenance field to responses for /api/v1/provisioning/alert-rules.	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
Yuri Tseretyan	a66760f9f2	Alerting: Add integration tests for Rule Export API (#75896)	2 years ago
Ryan McKinley	025b2f3011	Chore: use any rather than interface{} (#74066)	2 years ago
George Robinson	9f827a8278	Update grafana/alerting to 0025eb4 (#73808)	2 years ago
Karl Persson	e53e22ef2a	Contexthandler: Remove code that is no longer used (#73101) ... * Contexthandler: remove dead code * Contexthandler: Add tests * Update pkg/tests/api/alerting/api_alertmanager_test.go Co-authored-by: Jo <joao.guerreiro@grafana.com> --------- Co-authored-by: Jo <joao.guerreiro@grafana.com>	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	cfa1a2c55f	RBAC: Split non-empty scopes into `kind`, `attribute` and `identifier` fields for better search performance (#71933) ... * add a feature toggle * add the fields for attribute, kind and identifier to permission Co-authored-by: Kalle Persson <kalle.persson@grafana.com> * set the new fields when new permissions are stored * add migrations Co-authored-by: Kalle Persson <kalle.persson@grafana.com> * remove comments * Update pkg/services/accesscontrol/migrator/migrator.go Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com> * feedback: put column migrations behind the feature toggle, added an index, changed how wildcard scopes are split * PR feedback: add a comment and revert an accidentally changed file * PR feedback: handle the case with : in resource identifier * switch from checking feature toggle through cfg to checking it through featuremgmt * don't put the column migrations behind a feature toggle after all - this breaks permission queries from db --------- Co-authored-by: Kalle Persson <kalle.persson@grafana.com> Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>	2 years ago
Santiago	ff9eff49bd	Alerting: Bump grafana/alerting and refactor the ImageStore/Provider to provide image URL/bytes (#70182) ... * implement alerting.images.Provider interface in our ImageStore * add URLExists() method to fakeConfigStore * make linter happy * update integration tests	3 years ago
Yuri Tseretyan	b963defa44	Alerting: update rules POST API to validate query and condition only for rules that changed. (#68667) ... * replace condition validation with just structural validation * validate conditions of only new and updated rules * add integration tests for rule update\delete API Co-authored-by: George Robinson <george.robinson@grafana.com>	3 years ago
Matthew Jacobson	555ebb891b	Chore: Skip flakey alerting auth enterpise test (#69928)	3 years ago
Matthew Jacobson	ba3994d338	Alerting: Repurpose rule testing endpoint to return potential alerts (#69755) ... * Alerting: Repurpose rule testing endpoint to return potential alerts This feature replaces the existing no-longer in-use grafana ruler testing API endpoint /api/v1/rule/test/grafana. The new endpoint returns a list of potential alerts created by the given alert rule, including built-in + interpolated labels and annotations. The key priority of this endpoint is that it is intended to be as true as possible to what would be generated by the ruler except that the resulting alerts are not filtered to only Resolved / Firing and ready to be sent. This means that the endpoint will, among other things: - Attach static annotations and labels from the rule configuration to the alert instances. - Attach dynamic annotations from the datasource to the alert instances. - Attach built-in labels and annotations created by the Grafana Ruler (such as alertname and grafana_folder) to the alert instances. - Interpolate templated annotations / labels and accept allowed template functions.	3 years ago
Matthew Jacobson	0c688190f7	Alerting: Fix unique violation when updating rule group with title chains/cycles (#67868) ... * Alerting: Fix unique violation when updating rule group with title chains/cycles The uniqueness constraint for titles within an org+folder is enforced on every update within a transaction instead of on commit (deferred constraint). This means that there could be a set of updates that will throw a unique constraint violation in an intermediate step even though the final state is valid. For example, a chain of updates RuleA -> RuleB -> RuleC could fail if not executed in the correct order, or a swap of titles RuleA <-> RuleB cannot be executed in any order without violating the constraint. The exact solution to this is complex and requires determining directed paths and cycles in the update graph, adding in temporary updates to break cycles, and then executing the updates in reverse topological order (see first commit in PR if curious). This is not implemented here. Instead, we choose a simpler solution that works in all cases but might perform more updates than necessary. This simpler solution makes a determination of whether an intermediate collision could occur and if so, adds a temporary title on all updated rules to break any cycles and remove the need for specific ordering. In addition, we make sure diffs are executed in the following order: DELETES, UPDATES, INSERTS.	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
George Robinson	19ebb079ba	Alerting: Add limits and filters to Prometheus Rules API (#66627) ... This commit adds support for limits and filters to the Prometheus Rules API. Limits: It adds a number of limits to the Grafana flavour of the Prometheus Rules API: - `limit` limits the maximum number of Rule Groups returned - `limit_rules` limits the maximum number of rules per Rule Group - `limit_alerts` limits the maximum number of alerts per rule It sorts Rule Groups and rules within Rule Groups such that data in the response is stable across requests. It also returns summaries (totals) for all Rule Groups, individual Rule Groups and rules. Filters: Alerts can be filtered by state with the `state` query string. An example of an HTTP request asking for just firing alerts might be `/api/prometheus/grafana/api/v1/rules?state=alerting`. A request can filter by two or more states by adding additional `state` query strings to the URL. For example `?state=alerting&state=normal`. Like the alert list panel, the `firing`, `pending` and `normal` state are first compared against the state of each alert rule. All other states are ignored. If the alert rule matches then its alert instances are filtered against states once more. Alerts can also be filtered by labels using the `matcher` query string. Like `state`, multiple matchers can be provided by adding additional `matcher` query strings to the URL. The match expression should be parsed using existing regular expression and sent to the API as URL-encoded JSON in the format: { "name": "test", "value": "value1", "isRegex": false, "isEqual": true } The `isRegex` and `isEqual` options work as follows: | IsEqual | IsRegex | Operator | | ------- | -------- | -------- | | true | false | = | | true | true | =~ | | false | true | !~ | | false | false | != |	3 years ago
George Robinson	bd29071a0d	Revert "Alerting: Add limits to the Prometheus Rules API" (#65842)	3 years ago
George Robinson	d96b0a71d3	Alerting: Add limits to the Prometheus Rules API (#65169) ... This commit adds a number of limits to the Grafana flavor of the Prometheus Rules API: 1. `limit` limits the maximum number of Rule Groups returned 2. `limit_rules` limits the maximum number of rules per Rule Group 3. `limit_alerts` limits the maximum number of alerts per rule It sorts Rule Groups and rules within Rule Groups such that data in the response is stable across requests. It also returns summaries (totals) for all Rule Groups, individual Rule Groups and rules.	3 years ago
Yuri Tseretyan	ed8628e39d	Alerting: Fix integration test for creating silences (#65722) ... * fix integration test for creating silences to create correct silence with endsAt in the future * Update api_alertmanager_test.go	3 years ago
Yuri Tseretyan	52a0f59706	Alerting: introduce AlertQuery in definitions package (#63825) ... * copy AlertQuery from ngmodels to the definition package * replaces usages of ngmodels.AlertQuery in API models * create a converter between models of AlertQuery --------- Co-authored-by: Alex Moreno <alexander.moreno@grafana.com>	3 years ago
Torkel Ödegaard	73ce20ab48	Table Panel: Add ability to use text color for value or hide value in gauge cell (#61477) ... * BarGauge: New value options * Fix typings for cell options, add new value mode option for bar gauge cells * Add BarGauge panel option, tests, and update test dashboard * Updated * Added default * Goodbye trusty console.log * Update * Merge changes from main * Update docs * Add valuemode doc changes * Update gdev dashboard * Update valueMode symbol name to valueDisplayMode * Use Enums as Opposed to literals, don't calculate values when hidden * Remove double import * Fix tests * One more test fix * Remove erroneous targets field, fix type of maxDataPoints * Strip nulls and add index field to Thresholds * Gen cue * remove bad targets again * Fixes --------- Co-authored-by: Kyle Cunningham <kyle@codeincarnate.com> Co-authored-by: sam boyer <sdboyer@grafana.com>	3 years ago
Sofia Papagiannaki	e6e8351ee9	Chore: Remove CreateUserForTests() (#64125) ... * Chore: Remove CreateUserForTests * Apply suggestion from code review	3 years ago
suntala	49b3027049	Chore: Remove Result field from datasources (#63048) ... * Remove Result field from AddDataSourceCommand * Remove DatasourcesPermissionFilterQuery Result * Remove GetDataSourceQuery Result * Remove GetDataSourcesByTypeQuery Result * Remove GetDataSourcesQuery Result * Remove GetDefaultDataSourceQuery Result * Remove UpdateDataSourceCommand Result	3 years ago
Jo	f9163351fd	Support bundles: Refactor registry into separate service (#62945) ... * add bundle registry service to avoid dependency cycles * move user support bundle collector to user service * move usage stat bundle implementation to usage stats * add info for background service * fix remaining imports * whitespace	3 years ago