77 Commits (5097dd5c7d0048085798ae74daba26c2a7bc068c)

Author	SHA1	Message	Date
Yuri Tseretyan	5097dd5c7d	Alerting: Send templates from extra configuration to remote Alertmanager (#107981) ... * extract logging of MergedResult into method * convert GetMergedTemplateDefinitions to return PostableApiTemplate * update mergeExtracConfigs to return GrafanaAlertmanagerConfig * pass by value, not pointer * add template definition to payload * update tests * rename to Templates * log merge results * fix reference in workspace	1 day ago
Alexander Akhmetov	b483a04aec	Alerting: Send merged configuration to the remote alertmanager (#107004)	2 weeks ago
Alexander Akhmetov	700c9a857c	Alerting: Return extra alertmanager config as a string for mimirtool (#106959)	1 month ago
Alexander Akhmetov	426c334973	Alerting: API to create extra Alertmanager configurations (#106904) ... What is this feature? Implements the POST endpoint for deleting imported Mimir Alertmanager configurations: POST /api/convert/api/v1/alerts The API endpoint creates the extra Alertmanager configuration with the provided identifier and matchers.	1 month ago
Alexander Akhmetov	5a78ce8a4b	Alerting: Support saving extra Mimir configurations (#106721)	1 month ago
Yuri Tseretyan	b0ff51a903	Alerting: Support for Mimir configuration in Grafana Alertmanager (#106402)	1 month ago
Alexander Akhmetov	b51d70aad9	Alerting: Fix swagger generation (#106106)	2 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
Mariell Hoversholm	757be6365a	CI: Bump golangci-lint to 2.0.2 (#103572)	3 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
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
Yuri Tseretyan	e15fc984c3	Alerting: Deprecate Alertmanager config and receivers APIs (#98918)	6 months ago
Santiago	80611b381c	Alerting: Decrypt secure settings when testing receivers in the remote Alertmanager (#93864) ... * Alerting: Decrypt secure settings when testing receivers in the remote Alertmanager * go work sync * make update-workspace * point to latest main in grafana/alerting * unit test * import definitions only once	10 months ago
Steve Simpson	dd3c3b5857	Alerting: Update grafana/alerting. (#88914)	1 year ago
Alexander Weaver	f1dc63565e	Alerting: Fix go-swagger extraction and several embedded types from Alertmanager in Swagger docs (#88879) ... Drop redundant swagger model comments	1 year ago
Santiago	9f9928d41a	Alerting: Update grafana/alerting (#88363) ... * Alerting: Update grafana/alerting * make tests pass by implementing yaml unmarshallers and deleting fields with omitempty in their yaml tags * go mod tidy * fix tests by implementing not calling GettableApiAlertingConfig.UnmarshalYAML from GettableApiAlertingConfig.UnmarshalJSON * cleanup, reduce diff * fix more tests * update grafana/alerting to latest commit, delete global section from configs in tests * bring back YAML unmarshaller for GettableApiAlertingConfig * update alerting package dependency to point to main * skip test for sns notifier	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
Santiago	c9bb18101c	Alerting: Decrypt secrets before sending configuration to the remote Alertmanager (#83640) ... * (WIP) Alerting: Decrypt secrets before sending configuration to the remote Alertmanager * refactor, fix tests * test decrypting secrets * tidy up * test SendConfiguration, quote keys, refactor tests * make linter happy * decrypt configuration before comparing * copy configuration struct before decrypting * reduce diff in TestCompareAndSendConfiguration * clean up remote/alertmanager.go * make linter happy * avoid serializing into JSON to copy struct * codeowners	1 year ago
gotjosh	948c8c45d6	Alerting: Use Alertmanager types extracted into grafana/alerting (#83824) ... * Alerting: Use Alertmanager types extracted into grafana/alerting We're in the process of exporting all Alertmanager types into grafana/alerting so that they can be imported in the Mimir Alertmanager, without a neeed to import Grafana directly. This change introduces type aliasing for all Alertmanager types based on their 1:1 copy that now live in grafana/alerting. Signed-off-by: gotjosh <josue.abreu@gmail.com> --------- Signed-off-by: gotjosh <josue.abreu@gmail.com>	1 year ago
Matthew Jacobson	2e8c514cfd	Alerting: Stop persisting user-defined templates to disk (#83456) ... Updates Grafana Alertmanager to work with new interface from grafana/alerting#161. This change stops passing user-defined templates to the Grafana Alertmanager by persisting them to disk and instead passes them by string.	1 year ago
George Robinson	a564c8c439	Alerting: Keep order of time and mute time intervals consistent (#83257)	1 year 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.	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
Julien Duchesne	40312c527b	ngalert openapi: Fix ObjectMatchers definition (#79477) ... These don't get marshalled and unmarshalled in the same way as they are represented in Go This PR changes the OpenAPI spec to reflect what the API accepts and sends back	2 years ago
Julien Duchesne	c9211fbd69	ngalert openapi: Use same `basePath` as rest of Grafana (#79025) ... * ngalert openapi: Use same `basePath` as rest of Grafana Currently, there are two issues that prevent easily merging `ngalert` and grafana openapi specs: - The basePath is different. `grafana` has `/api` and `ngalert` has `/api/v1`. I changed `ngalert` to use `/api` - The `ngalert` endpoints have their basePath in the each operation path. The basePath should actually be omitted --------- Co-authored-by: Yuriy Tseretyan <yuriy.tseretyan@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
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
Yuri Tseretyan	ab5a3820d5	Alerting: Fix status code of successful response POST /api/alertmanager/grafana/api/v2/silences in swagger specs (#67951) ... * update status code to reflect reality * update docs	2 years ago
Matthew Jacobson	91471ac7ae	Alerting: Template Testing API (#67450)	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	ec4152c7e5	Alerting: Remove dependency on secrets in definitions package (#65391)	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
gotjosh	511dab3b4b	Update `grafana/alerting` to the latest main (#61810) ... * Update `grafana/alerting` to the latest main Also updates prometheus-alertmanager since we use that one directly for some structs.	3 years ago
Yuri Tseretyan	9ad45aedcf	Alerting: replace usage of simplejson to json.RawMessage in NotificationChannelConfig (#60423) ... * introduce alias for json.RawMessage with name RawMessage. This is needed to keep raw JSON and implement a marshaler for YAML, which does not seem to be used but there are tests that fail. * replace usage of simplejson with RawMessage in NotificationChannelConfig * remove usage of simplejson in tests * change migration code to convert simplejson to raw message	3 years ago
Santiago	cdb5d4230a	Alerting: Fix "Not Implemented" responses (#57710) ... * fix swagger spec, return 404 instead of 501 when an endpoint does not exist * update number of paths in authorization_test.go	3 years ago
Santiago	6ad405e256	fix swagger spec for receivers API response (#57124)	3 years ago
Yuriy Tseretyan	888bdfd4ad	Alerting: Use correct response body for silence post API (#57114)	3 years ago
Santiago	09f8e026a1	Alerting: Expose info about notification delivery errors in a new /receivers endpoint (#55429) ... * (WIP) switch to fork AM, first implementation of the API, generate spec * get receivers avoiding race conditions * use latest version of our forked AM, tests * make linter happy, delete TODO comment * update number of expected paths to += 2 * delete unused endpoint code, code review comments, tests * Update pkg/services/ngalert/notifier/alertmanager.go Co-authored-by: Matthew Jacobson <matthew.jacobson@grafana.com> * remove call to fmt.Println * clear naming for fields * shorter variable names in GetReceivers Co-authored-by: Matthew Jacobson <matthew.jacobson@grafana.com>	3 years ago
Yuriy Tseretyan	718620c197	Alerting: Update forking request handlers to use the same errors (#52965) ... * generalize error handling in forking request handlers * remove MatchesBackend and change test to test Can * add 404 to route specs * change backendTypeByUID to getDatasourceByUID of expected type * use common errors in api testing * handle 401 in errorToResponse * replace backend type error with "unexpected datasource type" * update swagger spec	3 years ago
Jean-Philippe Quéméner	d2f3631a47	Alerting: add mute timings provenance to config api (#50149)	3 years ago
gotjosh	1a50b0dbb7	Alerting: Remove double quotes from matchers (#50038) ... * Alerting: Remove double quotes from matchers With #38629 a new Alertmanager configuration object was introduced with `object_matchers`, it was meant to circumvent around the fact that Prometheus label names don't support a set of characters that Grafana needs to support for alerts, silences, matchers, etc. (with a common example being elasticsearch's `.`). This new object does not include the label of sanitzation or validation that its Prometheus equivalent supports in `matchers` and therefore are semantically not equivalent. This triggered the problem that when the migration is run, we use `matchers` as the object to populate in configuration for routing policies, but when the UI does its first save this object is transformed to `object_matchers`. Matchers that were previously running just fine would immediately stop working as soon as the configuration is saved. This problem surfaced with the introduction of #49952 where we stopped stripping double quotes from matchers (not just regex but _all_ of them). * Add comment explaining rationale and future removal Co-authored-by: Alex Weaver <weaver.alex.d@gmail.com>	3 years ago
Alexander Weaver	909ebcf979	Alerting: Endpoints for provisioning mute timings (#49635) ... * Add validator for mute timing and make it provisionable * Add tests to ensure prometheus validators are running and errors are propagated * Internal API for manipulating mute timings * Define and generate API layer * Wire up generated code * Implement API handlers * Tests for golang layer * Fix reference bug * Fix linter and auth tests * Resolve semantic errors and regenerate * Remove pointless comment * Extract out provisioning path param keys, simplify * Expected number of paths	3 years ago
Alexander Weaver	25da759bf2	Indicate whether templates are provisioned (#49025)	3 years ago
Sofia Papagiannaki	925784f514	Alerting: Modify endpoint for testing a datasource rule using the UID (#48070) ... * Modify testing endpoint to expect the datasource UID * Update docs	3 years ago
Sofia Papagiannaki	bb66c03f9a	Alerting: modify prometheus endpoints for proxying using the datasource UID (#48052) ... * Modify prometheus endpoints to expect the data source UID * Update frontend	3 years ago
Sofia Papagiannaki	610247d52a	Alerting: modify ruler endpoints for proxying using the datasource UID (#48046) ... * Modify ruler endpoints to expect the data source UID * Update frontend * Apply suggestion from code review	3 years ago
Sofia Papagiannaki	3e752a0db1	Alerting: modify alertmanager endpoints for proxying using the datasource UID (#47978) ... * Alerting: enable proxying alertmanager calls using the datasource UID * Remove use of datasource ID from the API * Update frontend	3 years ago
Alexander Weaver	60ec10566f	Extract Route validation from serialization methods so it can be re-used (#47649) ... * Extract validation and reject invalid policies * Validation in dedicated file * Tests for validation * Extract root route validation * Update call and drop TODO * empty commit to kick actions * Normalization should be idempotent * Cleaner representation of validation errors, chain errors properly * Make internal validate unexported * Fix missed rename * Genericize error message * Improve method names * Rebase, fix * Update asserts	3 years ago
Jean-Philippe Quéméner	a3256bafa7	Alerting: indicate whether contact point is provisioned (#48323)	3 years ago