55 Commits (c47ab101d1e2e63b6cc8bd5871c0aeb724a9face)

Author	SHA1	Message	Date
Mariell Hoversholm	757be6365a	CI: Bump golangci-lint to 2.0.2 (#103572)	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	4 months ago
Alexander Zobnin	cbb688e910	Zanzana: Remove usage from legacy access control (#98883) ... * Zanzana: Remove usage from legacy access control * remove unused * remove zanzana client from services where it's not used * remove unused metrics * fix linter	6 months ago
Matthew Jacobson	e86929eb0a	Alerting: Managed receiver resource permission in config api (#93632) ... * Alerting: Managed receiver resource permission in config api	10 months ago
Matthew Jacobson	1ea873950b	Alerting: Reject receiver update in config API when FlagAlertingApiServer enabled (#93300) ... * Reject receiver update in config API when FlagAlertingApiServer enabled	10 months ago
Fayzal Ghantiwala	25dbb32cea	Alerting: Vendor in latest grafana/alerting package (#91786) ... * temp * vendor * Remove dead code * Vendoring	11 months ago
Alexander Zobnin	87d86e81ce	Zanzana: Evaluate permissions alongside with RBAC engine (#90064) ... * Zanzana: Evaluate permissions if feature flag enabled * Fix tests * adjust logs * fix spelling * remove unused * only evaluate implemented resources * refactor	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
Ieva	167151b211	Chore: Remove use of deprecated method in AC code (#87541) ... * switch from using cfg to using featuremgmt for checking a feature toggle in AC code * merge test fixes	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
Yuri Tseretyan	dff7cb9afb	Alerting: Move alertmanager api silence code to separate files (#86947) ... * Move alertmanager api silence code to separate files unchanged * Replace with silence model instead interface --------- Co-authored-by: Matt Jacobson <matthew.jacobson@grafana.com>	1 year ago
Santiago	529f55cfe8	Alerting: Remove isDefault field from receivers (Alertmanager configuration) (#86605) ... Alerting: Remove isDefault field from receivers in the Alertmanager configuration	1 year 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	1 year 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	1 year 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
Santiago	1f6575e65e	Alerting: Test MOA in remote secondary mode (#79828)	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
Santiago	f9fc2e4568	Alerting: Remove ConfigHash() from the Alertmanager interface (#77134)	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
Santiago	73be9449d1	Alerting: Manage remote Alertmanager silences (#75452) ... * Alerting: Manage remote Alertmanager silences * fix typo * check errors when encoding json in fake external AM * take path from configured URL, check for nil responses	2 years ago
Santiago	93b9f9b537	Alerting: Use interfaces for the Alertmanager (#73900)	2 years ago
Matthew Jacobson	e3787de470	Alerting: Fix Alertmanager change detection for receivers with secure settings (#71307) ... * Alerting: Make ApplyAlertmanagerConfiguration only decrypt/encrypt new/changed secure settings Previously, ApplyAlertmanagerConfiguration would decrypt and re-encrypt all secure settings. However, this caused re-encrypted secure settings to be included in the raw configuration when applied to the embedded alertmanager, resulting in changes to the hash. Consequently, even if no actual modifications were made, saving any alertmanager configuration triggered an apply/restart and created a new historical entry in the database. To address the issue, this modifies ApplyAlertmanagerConfiguration, which is called by POST `api/alertmanager/grafana/config/api/v1/alerts`, to decrypt and re-encrypt only new and updated secure settings. Unchanged secure settings are loaded directly from the database without alteration. We determine whether secure settings have changed based on the following (already in-use) assumption: Only new or updated secure settings are provided via the POST `api/alertmanager/grafana/config/api/v1/alerts` request, while existing unchanged settings are omitted. * Ensure saving a grafana-managed contact point will only send new/changed secure settings Previously, when saving a grafana-managed contact point, empty string values were transmitted for all unset secure settings. This led to potential backend issues, as it assumed that only newly added or updated secure settings would be provided. To address this, we now exclude empty ('', null, undefined) secure settings, unless there was a pre-existing entry in secureFields for that specific setting. In essence, this means we only transmit an empty secure setting if a previously configured value was cleared. * Fix linting * refactor omitEmptyUnlessExisting * fixup --------- Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>	2 years ago
Ieva	d98813796c	RBAC: Remove legacy AC from HasAccess permission check (#68995) ... * remove unused HasAdmin and HasEdit permission methods * remove legacy AC from HasAccess method * remove unused function * update alerting tests to work with RBAC	2 years ago
Matthew Jacobson	91471ac7ae	Alerting: Template Testing API (#67450)	2 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>	2 years ago
Yuri Tseretyan	afd52d0866	Alerting: use alerting GrafanaReceiver and BuildReceiverConfiguration in Grafana (#65224) ... * replace receiver errors with one from alerting * add the converter to alerting models * update buildReceiverIntegration to accept GrafanaReceiver --------- Co-authored-by: George Robinson <george.robinson@grafana.com>	2 years ago
Matthew Jacobson	85f738cdf9	Alerting: Add endpoint to revert to a previous alertmanager configuration (#65751) ... * Alerting: Add endpoint to revert to a previous alertmanager configuration This endpoint is meant to be used in conjunction with /api/alertmanager/grafana/config/history to revert to a previously applied alertmanager configuration. This is done by ID instead of raw config string in order to avoid secure field complications.	2 years ago
Santiago	aba91d3053	Alerting: Fetch all applied alerting configurations (#65728) ... * WIP * skip invalid historic configurations instead of erroring * add warning log when bad historic config is found * remove unused custom marshaller for GettableHistoricUserConfig * add id to historic user config, move limit check to store, fix typo * swagger spec	2 years ago
Yuri Tseretyan	f561e71de8	Alerting: decouple api models from domain\dto models: separate Provenance status + converters (#63594) ... * move conversions of domain models to api models and reverse from definition package to api package	2 years ago
Yuri Tseretyan	f066e8cdcd	Alerting: Update to alerting 20230203015918-0e4e2675d7aa (after refactoring) (#62823) ... * add alerting prefix to some packages from alerting that have similar names in prometheus alertmanager	2 years ago
Santiago	ba731f7865	Alerting: Mark AM configuration as applied (#61330) ... * Mark AM configuration as applied * add missing checks, make linter happy * fix deadlock, mark as valid on save and on load * mark configurations only if needed * check error after applyConfig() * code review comments * code review changes * more code review changes * clean HistoricConfigFromAlertConfig function	2 years ago
idafurjes	6c5a573772	Chore: Move ReqContext to contexthandler service (#62102) ... * Chore: Move ReqContext to contexthandler service * Rename package to contextmodel * Generate ngalert files * Remove unused imports	3 years ago
George Robinson	d4256b352d	Docs: Rename Message templates to Notification templates (#59477) ... This commit renames "Message templates" to "Notification templates" in the user interface as it suggests that these templates cannot be used to template anything other than the message. However, message templates are much more general and can be used to template other fields too such as the subject of an email, or the title of a Slack message.	3 years ago
gotjosh	e7cd6eb13c	Alerting: Use `alerting.GrafanaAlertmanager` instead of initialising Alertmanager components directly (#61230) ... * Alerting: Use `alerting.GrafanaAlertmanager` instead of initialising Alertmanager components directly	3 years ago
idafurjes	a14621fff6	Chore: Add user service method SetUsingOrg and GetSignedInUserWithCacheCtx (#53343) ... * Chore: Add user service method SetUsingOrg * Chore: Add user service method GetSignedInUserWithCacheCtx * Use method GetSignedInUserWithCacheCtx from user service * Fix lint after rebase * Fix lint * Fix lint error * roll back some changes * Roll back changes in api and middleware * Add xorm tags to SignedInUser ID fields	3 years ago
idafurjes	6afad51761	Move SignedInUser to user service and RoleType and Roles to org (#53445) ... * Move SignedInUser to user service and RoleType and Roles to org * Use go naming convention for roles * Fix some imports and leftovers * Fix ldap debug test * Fix lint * Fix lint 2 * Fix lint 3 * Fix type and not needed conversion * Clean up messages in api tests * Clean up api tests 2	3 years ago
Karl Persson	44ffbfd6aa	RBAC: Refactor GetUserPermissions to use []accesscontrol.Permission (#50683) ... * Return slice of permissions instead of slice of pointers for permissions	3 years ago
Jean-Philippe Quéméner	4b8a4449ed	Alerting: remove feature toggle for provisioning API (#50167) ... * Alerting: remove feature toggle for provisioning API * remove missed code parts * remove unused import * remove empty line * mark routes as stable	3 years ago
Alexander Weaver	25da759bf2	Indicate whether templates are provisioned (#49025)	3 years ago
Jean-Philippe Quéméner	a3256bafa7	Alerting: indicate whether contact point is provisioned (#48323)	3 years ago
Joe Blubaugh	103087a1a5	Unified Alerting: Validate PostableSilence API. (#46892) ... Invalid PostableSilences could be passed to the Alerting API - if they are passed all the way down into the alertmanager data layer, they can cause a panic. This change adds validation to avoid a panic in the alertmanager.	3 years ago
Alexander Weaver	078a578803	Drop ProvenanceOrgAdapter and build into store API instead (#48137)	3 years ago
Alexander Weaver	8310789ef1	Indicate whether routes are provisioned when GETting Alertmanager configuration (#47857) ... * Test composition simplification from last PR * Policies use proper API model everywhere * Expose policy provenance in API, miss some dep injection * Complete injection * fix args * Tests for provenance value * Extract test helpers so tests are very readable * Single source adapter struct that was copied in 3 places * Drop redundant test * Resolve merge conflicts on changelog	3 years ago
Vardan Torosyan	a0553de8dd	Rename FGAC to RBAC in the codebase (#48051)	3 years ago
Alexander Weaver	758364e78b	Alerting: Refactor GET/POST alerting config routes to be more extensible (#47229) ... * Refactor GET am config to be extensible * Extract post config route * Fix tests * Remove temporary duplication * Fix broken test due to layer shift * Fix duplicated error message * Properly return 400 on config rejection * Revert weird half method extraction * Move things to notifier package and avoid redundant interface * Simplify documentation * Split encryption service and depend on minimal abstractions * Properly initialize things all the way up to the composition root * Encryption -> Crypto * Address misc feedback * Missing docstring * Few more simple polish improvements * Unify on MultiOrgAlertmanager. Discover bug in existing test * Fix rebase conflicts * Misc feedback, renames, docs * Access crypto hanging off MultiOrgAlertmanager rather than having a separate API to initialize	3 years ago
Alexander Weaver	c266a4ac81	Alerting: Remove mis-behaving fake and fix masked test failure in AM config API (#47747) ... * Remove misbehaving fake * Fix bug and inject logger	3 years ago
Yuriy Tseretyan	8a2c368031	check that user is authorized to create\update silences (#47163)	3 years ago
Yuriy Tseretyan	15e4556c2f	Alerting: update authorization logic to use proper legacy roles when fine-grained access is disabled (#46931) ... * require legacy Editor for post, put, delete endpoints * require user to be signed in on group level because handler that checks that user has role Editor does not check it is signed in	3 years ago