grafana

Commit Graph

Author	SHA1	Message	Date
Yuriy Tseretyan	4d02f73e5f	Alerting: Persist rule position in the group (#50051 ) Migrations: * add a new column alert_group_idx to alert_rule table * add a new column alert_group_idx to alert_rule_version table * re-index existing rules during migration API: * set group index on update. Use the natural order of items in the array as group index * sort rules in the group on GET * update the version of all rules of all affected groups. This will make optimistic lock work in the case of multiple concurrent request touching the same groups. UI: * update UI to keep the order of alerts in a group	3 years ago
Yuriy Tseretyan	81089b956a	Alerting: Update authorization rules for RouteGetNamespaceRulesConfig (#50965 ) * use authorizeAccessToRuleGroup * use toGettableRuleGroupConfig in get by namespace * add comments for controller methods	3 years ago
Yuriy Tseretyan	c1550d1f07	Alerting: Rule api to fail update if provisioned rules are affected (#50835 ) * add function that checks whether changes mention provisioned rules * update API that updates group of rules to fail if check does not pass	3 years ago
Yuriy Tseretyan	c314ce48c7	Alerting: Support for optimistic locking for alert rules (#50274 ) * add support for optimistic locking for alert_rule table * return 409 in the case of opitimistic lock	3 years ago
gotjosh	0cde283505	Alerting: Logs should not be capitalized and the errors key should be "err" (#50333 ) * Alerting: decapitalize log lines and use "err" as the key for errors Found using (logger\|log).(Warn\|Debug\|Info\|Error)\([A-Z] and (logger\|log).(Warn\|Debug\|Info\|Error)\(.+"error"	3 years ago
Jean-Philippe Quéméner	81d360529b	Alerting: Provisioning API - Alert rules (#47930 )	3 years ago
Yuriy Tseretyan	ad25e2a20c	Alerting: Update RBAC for alert rules to consider access to rule as access to group it belongs (#49033 ) * update authz to exclude entire group if user does not have access to rule * change rule update authz to not return changes because if user does not have access to any rule in group, they do not have access to the rule * a new query that returns alerts in group by UID of alert that belongs to that group * collect all affected groups during calculate changes * update authorize to check access to groups * update tests for calculateChanges to assert new fields * add authorization tests	3 years ago
Yuriy Tseretyan	3dfafbadef	Alerting: Fix access to alerts for viewer with editor permissions when RBAC is disabled (#49270 ) * Add folder edit permission for users with Viewer role * relax permissions required to create an alert when RBAC is disabled	3 years ago
Yuriy Tseretyan	f7f2253072	Alerting: Fix anonymous access to alerting (#49203 ) * introduce a fallback handler that checks that role is Viewer. * update UI nav links to allow alerting tabs for anonymous user * update rule api to check for Viewer role instead of SignedIn when RBAC is disabled	3 years ago
Yuriy Tseretyan	952cb4fc0b	Alerting: introduce AlertRuleGroupKey and use it in API handlers (#48945 ) * create AlertGroupKey structure * update PrometheusSrv. - extract creation of RuleGroup to a separate method. Use group key for grouping * update RuleSrv - update calculateChanges to use groupKey - authorize to use groupkey	3 years ago
Yuriy Tseretyan	186ba26b59	Alerting: refactor rule API to create rule group in a single place (#48915 ) * extract method toGettableRuleGroupConfig	3 years ago
Jean-Philippe Quéméner	30d9cc81ec	Alerting: check provenance of alert rules in current API (#48694 )	3 years ago
Jean-Philippe Quéméner	9e21e4d1c1	Alerting: indicate whether an alertrule is provisioned (#48458 )	3 years ago
George Robinson	c5547123bc	Remove redundant queries in GetAlertRules and GetOrgAlertRules and replace with ListAlertRules (#48108 )	3 years ago
Jean-Philippe Quéméner	060ccacbf9	Alerting: unwrap upsert into insert and update function (#47731 ) * Alerting: unwrap upsert into insert and update function * add changelog entry * remove changelog entry * rename upsertrule to updaterule * use directly alertrule model for inserts * add test for updating a rule with a conflicting name	3 years ago
Yuriy Tseretyan	af9353caec	Alerting: Add check for datasource permission in alert rule read API (#47087 ) * add check for access to rule's data source in GET APIs * use more general method GetAlertRules instead of GetNamespaceAlertRules. * remove unused GetNamespaceAlertRules. Tests: * create a method to generate permissions for rules * extract method to create RuleSrv * add tests for RouteGetNamespaceRulesConfig	3 years ago
Alexander Weaver	dde0b93cf1	Alerting: Provisioning API - Notification Policies (#46755 ) * Base-line API for provisioning notification policies * Wire API up, some simple tests * Return provenance status through API * Fix missing call * Transactions * Clarity in package dependencies * Unify receivers in definitions * Fix issue introduced by receiver change * Drop unused internal test implementation * FGAC hooks for provisioning routes * Polish, swap names * Asserting on number of exposed routes * Don't bubble up updated object * Integrate with new concurrency token feature in store * Back out duplicated changes * Remove redundant tests * Regenerate and create unit tests for API layer * Integration tests for auth * Address linter errors * Put route behind toggle * Use alternative store API and fix feature toggle in tests * Fixes, polish * Fix whitespace * Re-kick drone * Rename services to provisioning	3 years ago
Yuriy Tseretyan	51114527dc	Alerting: handle folder permissions when fine-grained access enabled (#47035 ) * Use alert:create action for folder search with edit permissions. This matches the action that is used to query dashboards (the update will be addressed later) * Update rule store to use FindDashboards instead of folder service to list folders the user has access to view alerts. Folder service does not support query type and additional filters. * Do not check whether the user can save to folder if FGAC is enabled because it is checked on API level.	3 years ago
Yuriy Tseretyan	e20d157a9b	Alerting: rules delete API to check data source authorization (#46906 ) * merge RuleSrv rule delete methods * remove unused store methods * implement delete by uid for fake store * add scheduler mock * implement tests for RouteDeleteAlertRules	3 years ago
Yuriy Tseretyan	8868848e93	Alerting: rule group update API to ignore deletes of rules user is not authorized to access (#46905 ) * verify that the user has access to all data sources used by the rule that needs to be deleted from the group * if a user is not authorized to access the rule, the rule is removed from the list to delete	3 years ago
Yuriy Tseretyan	60d4cd80bf	Alerting: update DeleteAlertRuleByUID to accept many UID (#46890 )	3 years ago
Yuriy Tseretyan	4ee48c2e77	Alerting: Update GetRuleGroupAlertRules to accept optional rule group (#46889 ) * rename GetRuleGroupAlertRules to GetAlertRules * make rule group optional in GetAlertRulesQuery * simplify FakeStore. the current structure did not support optional rule group	3 years ago
Yuriy Tseretyan	2ade8b56dd	Alerting: support fine-grained access control in ruler update API (#45749 ) * require Editor if FGAC is disabled. Otherwise, check `alert.rule:*` + `datasource:query` permissions when user changes rules.	3 years ago
Alexander Weaver	92716cb602	Alerting: Create abstraction for launching transactions and refactor existing transaction management to use it (#46216 ) * Remove InTransaction from RuleStore and make it its own interface * Ensure that ctx-based is clear from name * Resolve merge conflicts * Refactor tests to work in terms of the introduced abstraction rather than concrete dbstore	3 years ago
Yuriy Tseretyan	288e8eeb15	Alerting: Do not update rule in database if it was not changed (#45980 ) * do not include update if no diff * refactor calculate changes to include diff (and log) Co-authored-by: George Robinson <george.robinson@grafana.com>	3 years ago
Yuriy Tseretyan	f75bea481d	Alerting: validate rules and calculate changes in API controller (#45072 ) * Update API controller - add validation of rules API model - add function to calculate changes between the submitted alerts and existing alerts - update RoutePostNameRulesConfig to validate input models, calculate changes and apply in a transaction * Update DBStore - delete unused storage method. All the logic is moved upstream. - upsert to not modify fields of new by values from the existing alert - if rule has UID do not try to pull it from db. (it is done upstream) * Add rule generator	3 years ago
George Robinson	a9399ab3cd	Alerting: Add context.Context to RuleStore (#45004 ) Alerting: Add context.Context to RuleStore	3 years ago
Yuriy Tseretyan	ed5c664e4a	Alerting: Stop firing of alert when it is updated (#39975 ) * Update API to call the scheduler to remove\update an alert rule. When a rule is updated by a user, the scheduler will remove the currently firing alert instances and clean up the state cache. * Update evaluation loop in the scheduler to support one more channel that is used to communicate updates to it. * Improved rule deletion from the internal registry. * Move alert rule version from the internal registry (structure alertRuleInfo) closer rule evaluation loop (to evaluation task structure), which will make the registry values immutable. * Extract notification code to a separate function to reuse in update flow.	3 years ago
idafurjes	ff3cf94b56	Chore: Remove context.TODO() from services (#42555 ) * Remove context.TODO() from services * Fix live test	3 years ago
gotjosh	6220872633	Alerting: fix bug where user is able to access rules from namespaces user is not part of (#41403 ) * Add fix * Add tests Co-authored-by: Yuriy Tseretyan <yuriy.tseretyan@grafana.com> Co-authored-by: Armand Grillet <2117580+armandgrillet@users.noreply.github.com> Co-authored-by: Jean-Philippe Quéméner <JohnnyQQQQ@users.noreply.github.com> Co-authored-by: George Robinson <george.robinson@grafana.com>	4 years ago
Serge Zaitsev	57fcfd578d	Chore: replace macaron with web package (#40136 ) * replace macaron with web package * add web.go	4 years ago
George Robinson	2a4c1b1aa6	You can now get alert rules for a dashboard or a panel using /api/v1/rules endpoints. (#39476 ) Get alert rules for a dashboard and panel in /api/v1/rules	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
Marcus Efraimsson	fa9857499b	Chore: GetDashboardQuery should be dispatched using DispatchCtx (#36877 ) * Chore: GetDashboardQuery should be dispatched using DispatchCtx * Fix after merge * Changes after review * Various fixes * Use GetDashboardCtx function instead of GetDashboard	4 years ago
Sofia Papagiannaki	c19d65b1ad	Alerting: some fixes for updating rules via the API (#38764 ) * Alerting: Allow updating rules if quota are exceeded * Check for rule UID uniqueness in POST request	4 years ago
Arve Knudsen	78596a6756	Migrate to Wire for dependency injection (#32289 ) Fixes #30144 Co-authored-by: dsotirakis <sotirakis.dim@gmail.com> Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com> Co-authored-by: Ida Furjesova <ida.furjesova@grafana.com> Co-authored-by: Jack Westbrook <jack.westbrook@gmail.com> Co-authored-by: Will Browne <wbrowne@users.noreply.github.com> Co-authored-by: Leon Sorokin <leeoniya@gmail.com> Co-authored-by: Andrej Ocenas <mr.ocenas@gmail.com> Co-authored-by: spinillos <selenepinillos@gmail.com> Co-authored-by: Karl Persson <kalle.persson@grafana.com> Co-authored-by: Leonard Gram <leo@xlson.com>	4 years ago
Sofia Papagiannaki	7815ed511f	Alerting: Refactor API endpoints for fetching alert rules (#37055 ) * Refactor ruler API endpoint for listing rules * Refactor prometheus API endpoint for listing rules * Update HTTP API docs	4 years ago
Owen Diehl	9aca032d10	Alerting/consistent api errors (#34858 ) * consolidates alertmanager api errors * util & testing consistent errors * consistent errors for rest of ngalert apis * updates expected errors in testware * bump ci * linting * unrelated: dashboard.go lint	4 years ago
David Parrott	e58aca2d20	Alerting: remove instances from db and cache on rule update (#33722 ) * remove instances from db and cache on rule update * fix panic * rename	4 years ago
Sofia Papagiannaki	540f110220	[Alerting]: Extend quota service to optionally set limits on alerts (#33283 ) * Quota: Extend service to set limit on alerts * Add test for applying quota to alert rules * Apply suggestions from code review Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com> * Get used alert quota only if naglert is enabled * Set alert limit to zero if nglalert is not enabled Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>	4 years ago
Kyle Brandt	48358efc13	Alerting: remove State cache entries on Ruler Delete (#33638 ) for https://github.com/grafana/alerting-squad/issues/133	4 years ago
Kyle Brandt	b8f01fe034	Alerting: backend "ng" code cleanup (#33578 )	4 years ago
Sofia Papagiannaki	1e380e869e	[Alerting]: some fixes (#33538 ) * Fix fialure when adding state annotations * Fix get org rules API Do not fail response if user has no access to view a namespace. Do not include the namespace in the response instead. * lint	4 years ago
Sofia Papagiannaki	7ccb022c03	Alerting: validate condition before updating rulegroup (#33367 ) * Alerting: validate condition before updating rulegroup * Apply suggestions from code review	4 years ago
Sofia Papagiannaki	87a70af7eb	[Alerting]: Fix updating rule group and add tests (#33074 ) * [Alerting]: Fix updating rule group and add test * Fix updating rule labels * Set default values for rule no data and error states if they are missing * Add test for updating rule * Test updating annotations * Apply suggestions from code review Co-authored-by: gotjosh <josue@grafana.com> * add test for posting an unknown rule UID * Fix alert rule validation and add tests * Remove org id from PostableGrafanaRule This field was not used; each rule gets the organisation of the user making the rerquest * Update pkg/tests/api/alerting/api_alertmanager_test.go Co-authored-by: gotjosh <josue@grafana.com>	4 years ago
Owen Diehl	e37a780e14	Inhouse alerting api (#33129 ) * init * autogens AM route * POST dashboards/db spec * POST alert-notifications spec * fix description * re inits vendor, updates grafana to master * go mod updates * alerting routes * renames to receivers * prometheus endpoints * align config endpoint with cortex, include templates * Change grafana receiver type * Update receivers.go * rename struct to stop swagger thrashing * add rules API * index html * standalone swagger ui html page * Update README.md * Expose GrafanaManagedAlert properties * Some fixes - /api/v1/rules/{Namespace} should return a map - update ExtendedUpsertAlertDefinitionCommand properties * am alerts routes * rename prom swagger section for clarity, remove example endpoints * Add missing json and yaml tags * folder perms * make folders POST again * fix grafana receiver type * rename fodler->namespace for perms * make ruler json again * PR fixes * silences * fix Ok -> Ack * Add id to POST /api/v1/silences (#9) Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in> * Add POST /api/v1/alerts (#10) Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in> * fix silences * Add testing endpoints * removes grpc replace directives * [wip] starts validation * pkg cleanup * go mod tidy * ignores vendor dir * Change response type for Cortex/Loki alerts * receiver unmarshaling tests * ability to split routes between AM & Grafana * api marshaling & validation * begins work on routing lib * [hack] ignores embedded field in generation * path specific datasource for alerting * align endpoint names with cloud * single route per Alerting config * removes unused routing pkg * regens spec * adds datasource param to ruler/prom route paths * Modifications for supporting migration * Apply suggestions from code review * hack for cleaning circular refs in swagger definition * generates files * minor fixes for prom endpoints * decorate prom apis with required: true where applicable * Revert "generates files" This reverts commit `ef7e975584`. * removes server autogen * Update imported structs from ngalert * Fix listing rules response * Update github.com/prometheus/common dependency * Update get silence response * Update get silences response * adds ruler validation & backend switching * Fix GET /alertmanager/{DatasourceId}/config/api/v1/alerts response * Distinct gettable and postable grafana receivers * Remove permissions routes * Latest JSON specs * Fix testing routes * inline yaml annotation on apirulenode * yaml test & yamlv3 + comments * Fix yaml annotations for embedded type * Rename DatasourceId path parameter * Implement Backend.String() * backend zero value is a real backend * exports DiscoveryBase * Fix GO initialisms * Silences: Use PostableSilence as the base struct for creating silences * Use type alias instead of struct embedding * More fixes to alertmanager silencing routes * post and spec JSONs * Split rule config to postable/gettable * Fix empty POST /silences payload Recreating the generated JSON specs fixes the issue without further modifications * better yaml unmarshaling for nested yaml docs in cortex-am configs * regens spec * re-adds config.receivers * omitempty to align with prometheus API behavior * Prefix routes with /api * Update Alertmanager models * Make adjustments to follow the Alertmanager API * ruler: add for and annotations to grafana alert (#45) * Modify testing API routes * Fix grafana rule for field type * Move PostableUserConfig validation to this library * Fix PostableUserConfig YAML encoding/decoding * Use common fields for grafana and lotex rules * Add namespace id in GettableGrafanaRule * Apply suggestions from code review * fixup * more changes * Apply suggestions from code review * aligns structure pre merge * fix new imports & tests * updates tooling readme * goimports * lint * more linting!! * revive lint Co-authored-by: Sofia Papagiannaki <papagian@gmail.com> Co-authored-by: Domas <domasx2@gmail.com> Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com> Co-authored-by: Ganesh Vernekar <15064823+codesome@users.noreply.github.com> Co-authored-by: gotjosh <josue@grafana.com> Co-authored-by: David Parrott <stomp.box.yo@gmail.com> Co-authored-by: Kyle Brandt <kyle@grafana.com>	4 years ago
gotjosh	362c4d4276	Alerting: Integration test rule creation (#33047 ) * Alerting: Integration test rule creation * Appease the linter * Cleanup * Make anonymous user role a parameter	4 years ago
Sofia Papagiannaki	6bbb2fd4ba	[Alerting]: Several modifications in alert rules (#32983 ) * [Alerting]: Use common properties for all rules * Add Labels in rules * Fix update ruleGroup API Return 400 Bad Request response when the request contains a UID that does not exist * Check permissions and return namespace id * Apply suggestions from code review Co-authored-by: gotjosh <josue@grafana.com>	4 years ago
Sofia Papagiannaki	8848d825e0	[Alerting]: Use title instead of slug for retrieving the namespace (#32957 ) * [Alerting]: Use title instead of slug for retrieving the namespace * Apply suggestions from code review Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>	4 years ago
Kyle Brandt	80dfa83380	AlertingNG: Add For+Annotations to Grafana_Alert (#32793 ) * add db columns * Fix deserialisation issue of AlertRule For field (#32848) * Update to latest alerting-api Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>	4 years ago

1 2

53 Commits (80f6560c9c7639a3b02dd41bc1a66516903b175c)