grafana

Commit Graph

Author	SHA1	Message	Date
Vadim Stepanov	bccc980b90	Alerting: Notifiication history (#107644 ) * Add unified_alerting.notification_history to ini files * Parse notification history settings * Move Loki client to a separate package * Loki client: add params for metrics and traces * add NotificationHistorian * rm writeDuration * remove RangeQuery stuff * wip * wip * wip * wip * pass notification historian in tests * unify loki settings * unify loki settings * add test * update grafana/alerting * make update-workspace * add feature toggle * fix configureNotificationHistorian * Revert "add feature toggle" This reverts commit `de7af8f7` * add feature toggle * more tests * RuleUID * fix metrics test * met.Info.Set(0)	3 days ago
Santiago	d4670b1cee	Alertmanager: Add methods to merge nflog and silences (#108006 )	6 days ago
Santiago	a314b99589	Remote Alertmanager: Use the same struct for Grafana state and Mimir full state (#107791 ) Remote Alertmanager: Use the same struct for Grafana stat and Mimir full state	1 week ago
Ryan McKinley	3f502f305d	Chore: Update mocks with recent mockery (#107816 )	2 weeks ago
Fayzal Ghantiwala	de50c5a497	Alerting: Fix crypto_test.go errors in CI (#107759 ) Fix test	2 weeks ago
Yuri Tseretyan	c93fd3ee9e	Alerting: idempotent decrypt\encrypt operations on extra configs (#107592 ) * add prefix to encrypted string to distinguish between unencrypted and encrypted ones --------- Co-authored-by: Alexander Akhmetov <me@alx.cx>	2 weeks ago
Yuri Tseretyan	d15e1ad8d0	Alerting: Fix route validation in provisioning service (#107550 ) * introduce ExtraConfigsCrypto * delete getLastConfiguration and move all code into method Get * update legacy store to encrypt ExtraConfigs same way we do in MultiOrgAlertmanager * update legacy store init * delete PersistConfig * remove unnecessary unmarshalling * add better error * add tests for legacy store * add tests that cover extra config validation * add integration test for conflicting routes --------- Signed-off-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com>	2 weeks ago
Alexander Akhmetov	b483a04aec	Alerting: Send merged configuration to the remote alertmanager (#107004 )	3 weeks ago
Serge Zaitsev	f66a693438	Chore: Rename integration tests to follow the common convention (#105987 ) * automatically rename integration tests to follow the common convention * name tests differently * alter column type to bigint * update another column to bigint * add another alter * fix subquery for mysql	3 weeks ago
Alexander Akhmetov	894944dcb0	Alerting: Refactor remote alertmanager to use Crypto interface (#107228 )	3 weeks ago
Matthew Jacobson	5520f48153	Alerting: Use new receiver models for encrypt/decrypt in remote AM (#107042 ) Several niche bugs have surfaced as a result of the decrypt code Grafana uses in receivers API being different than what is used to decrypt secrets before sending to remote AM. Example: - Dingding notifier not abiding by new Patching added to local AM, thus causing missing url errors. * noop refactor to simplify decryptConfiguration * Move compat function package * Use new receiver models to encrypt/decrypt in remote AM	4 weeks 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	def5d889d0	Alerting: API to delete extra Alertmanager configurations (#106892 )	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
Kevin Minehart	910eb1dd9e	Security: apply patch 428 (#106710 ) * declare dingding url as secret patch raw settings before parsing because DingDing's config parser does not know about secrets * fix integration test --------- Co-authored-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com>	1 month ago
Pepe Cano	98ea0193e4	alerting(ui): update the descriptions of the MQTT Message settings (#106601 ) alerting(ui): update the description of the MQTT Message settings	1 month ago
Matthew Jacobson	0016b57486	Alerting: Add OAuth2 Support for Webhook Receiver (#106302 ) * Add to available channels * Export * Fix bug in deeply nested secrets BE: Slice re-use bug when traversing deeply. FE: Only at most one level of nesting was being taken into account when determining secureFields keys. This change adds a new field on NotificationChannelOption: secureFieldKey. This is populated on API GET via transform. This change gives us the option to hardcode secureFieldKey in the backend and no longer calculate the key via settings topology. * Update grafana/alerting to 3e20fda3b872 * Prettier * Linting * Fix IntegrationConfig test to catch secure field mismatch	1 month ago
Vadim Stepanov	5137995830	Alerting: Add support for Redis Sentinel for Alerting HA (#106322 ) * Alerting: Add support for Redis Sentinel * docs * docs * Use minisentinel in test * Apply suggestions from code review Co-authored-by: Johnny Kartheiser <140559259+JohnnyK-Grafana@users.noreply.github.com> Co-authored-by: Fayzal Ghantiwala <114010985+fayzal-g@users.noreply.github.com> * "address(es)" -> "address or addresses" * make update-workspace * make lint-go-diff --------- Co-authored-by: Johnny Kartheiser <140559259+JohnnyK-Grafana@users.noreply.github.com> Co-authored-by: Fayzal Ghantiwala <114010985+fayzal-g@users.noreply.github.com>	1 month ago
Yuri Tseretyan	33298550b4	Update Alerting module (#106272 ) * set kind in TemplateDefinition	2 months ago
Yuri Tseretyan	d019b4ff1b	Alerting: Change logging in Alertmanager (#105704 ) * change logger to ngalert.notifier and use component label * update alerting module --------- Signed-off-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com>	2 months ago
Yuri Tseretyan	7dc13d63b9	Alerting: Refactor Grafana Alertmanager (#105568 ) * update alerting module * use NotificationsConfiguration * update to use opts and configure new fields * use TenantID instead of orgId	2 months ago
alerting-team[bot]	44c3c5a29d	Alerting: Update alerting module to 2484dbaf55cfe9236e296e113ddbc35136f2feb3 (#105350 ) * [create-pull-request] automated change * populate Image ID Signed-off-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com> --------- Signed-off-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com> Co-authored-by: yuri-tceretian <25988953+yuri-tceretian@users.noreply.github.com> Co-authored-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com>	2 months ago
Santiago	7edace5e88	Remote Alertmanager: Remove comparison before sending the state (#104930 ) * Remote Alertmanager: Remove comparison before sending the state * fix test * fix test	2 months ago
Matthew Jacobson	5795ba34f9	Alerting: Update grafana/alerting from de176b4a0309 to 83b6de6b0a35 (#105157 ) * Update grafana alerting from de176b4a0309 to 83b6de6b0a35 Includes: - https://github.com/grafana/alerting/pull/319 - https://github.com/grafana/alerting/pull/317 * Remove unused SendWebhook method from sender struct grafana/alerting hasn't used the grafana webhook sender for a while now, so this method is no longer used anywhere. - Removed SendWebhook from the sender struct and rename it to emailSender so that its use is clearer. - Also, for similar reasons, the Webhook method on Grafana's webhook sender `sendWebRequestSync` should not call grafana/alerting code for NewTLSClient. The previous grafana/alerting function is vendored into grafana. * Use BuildReceiverIntegrations new func signature	2 months ago
Sonia Aguilar	0ceea29787	Alerting: Remove alertingSimplifiedRouting feature toggle (#104980 ) Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>	2 months ago
Santiago	57640e40a2	Remote Alertmanager: Consider auto-gen routes when flagging a config as "default" (#105120 ) * Remote Alertmanager: Consider auto-gen routes when flagging a config as 'default' * remove always-nil error from isDefaultConfiguration * remove unnecessary context.Background() in test * pass orgID to autogenFn call during AM creation * fix test * make update-workspace	2 months ago
Yuri Tseretyan	3e2296acd3	Alerting: Support for active time intervals in notification policies (#104252 ) * add active_time_intervals to route model * update k8s compat layer * update notification policies service to validate active time intervals * update integration tests * update openapi * add active time interval to model * update route generator to include active time interval * Update storage list and rename methods to handle active intervals * update api model * update provisioning and export models * update ui to allow active timing config * update i18n * fix snapshots for ui tests * run prettier * Alerting: Active time intervals UI naming (#104402) * update naming in UI * update naming in the edit page title * update translations * update alerting module --------- Signed-off-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com> Co-authored-by: Sonia Aguilar <33540275+soniaAguilarPeiron@users.noreply.github.com> Co-authored-by: Sonia Aguilar <soniaaguilarpeiron@gmail.com>	2 months ago
Yuri Tseretyan	c8d92ee06a	Alerting: Refactor applyConfig in Alertmanager (#104970 ) * refactor: remove applyAndMarkConfig --------- Signed-off-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com>	2 months ago
Fayzal Ghantiwala	f29941c335	Alerting: Use value of ha_redis_cluster_mode_enabled in redisPeer config (#104269 ) fix assignment of redis cluster mode cfg	3 months ago
Matthew Jacobson	9e933882ed	Alerting: Webhook Improvements - Templateable Payloads (#103818 ) * Template editor syntax highlighting when preview is json-like * Add new template editor language examples, snippets, and functions * Use updated NewTemplate function * Add new fields to webhook notifier - CustomPayload - ExtraHeaders * Documentation * Update grafana/alerting to in-progress PR (needs updating after merge) * Fix integration test * Remove docs reference to .Extra template context No longer exists, was part of a previous iteration * make update-workspace * Update grafana/alerting to actual merged commit	3 months ago
Matthew Jacobson	9f9c4b3da3	Alerting: Template preview enhancements (#103817 ) API Changes: - Fixes validation in template CRUD API to be closer to how the running alertmanager will use the template. Should remove some incorrect validation errors. - Adds some missing default placeholder labels to receiver testing that are used during template testing but missing during receiver testing Template Preview: - Replaced basic preview with a readonly CodeEditor for better whitespace and alignment clarity (also adds support for future syntax highlighting in template previews for upcoming webhook payload templates) Template Selector (Receiver Form): - Refactored to use same components as Template editor for preview. - Fixed preview to work with multi-definition templates - Fixed copy to correctly copy the template contents instead of {{ template "<name>" . }}. Template Editor: - Fixed detection of when to display functions vs snippets in multi-line expressions	3 months ago
Mariell Hoversholm	757be6365a	CI: Bump golangci-lint to 2.0.2 (#103572 )	3 months ago
Steve Simpson	870d401f75	Alerting: Update grafana/alerting (#103607 ) * Alerting: Update grafana/alerting * Run make update-workspace	3 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>	4 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	4 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.	4 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	4 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
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
Pepe Cano	2585fec99e	Alerting: Clarify that the AWS SNS subject field cannot be empty (#100780 ) * Alerting: Clarify that the AWS SNS subject field cannot be empty * minor copy change	5 months ago
Yuri Tseretyan	d1dfa0576b	Alerting: Support Jira Integration (#100480 )	5 months ago
Matthew Jacobson	b78a63b0ad	Alerting: Use new image TokenProvider and send image url in annotation (#99989 ) * Send new annotation containing image url * Use new image TokenProvider with TokenStore New abstraction GetImage no longer needs to support parsing both token and url from annotations, as remote AM will use the new URLProvider. Instead, we use the new generic TokenProvider and give it a TokenStore backed by the grafana database. That means we revert back to always using token simplifying code and security considerations. * Upgrade grafana/alerting to merged commit SHA	5 months ago
Matthew Jacobson	75c4c5ca0f	Alerting: Upgrade grafana/alerting to 92d5f29 (#100982 ) * Alerting: Upgrade grafana/alerting to 92d5f29 Includes: - Add more context to log in PipelineAndStateTimestampCoordinationStage (#277) - Update Alertmanager fork to latest commit (#279) - Copy http client from Grafana (#281) * Satisfy signature change from grafana/alerting #281 (http client)	5 months ago
Matthew Jacobson	ccb0e9222a	Alerting: Upgrade grafana/alerting to use EmbeddedContents (#99983 ) * Upgrade grafana/alerting to include EmbeddedContents for email images	5 months ago
Alexander Akhmetov	d6c1e3bb45	Alerting: Use org store to read organization IDs (#99938 )	6 months ago
Yuri Tseretyan	0be6e1bb86	Alerting: Extra dedup stage in Grafana Alertmanager (#99825 ) * add feature flags * update alerting module * update grafana alertmanager to configure the extra dedup stage --------- Co-authored-by: Santiago <santiagohernandez.1997@gmail.com>	6 months ago
Yuri Tseretyan	7007342704	Alerting: k8s receivers api encrypt existing unencrypted secureFields on update (#99784 ) * apply security patch: v11.5.x/305-202501232115.patch commit 874ce8d12caad3742857ca86d2da7d5f81f3f825 Author: Matt Jacobson <matthew.jacobson@grafana.com> Date: Thu Jan 23 16:14:28 2025 -0500 linting commit c4b6d9194cc8b79e252e562a27a2d09a42d7a5e8 Author: Matt Jacobson <matthew.jacobson@grafana.com> Date: Thu Jan 23 14:56:35 2025 -0500 CVE-2024-11741 - victorops url	6 months ago
Garret Wyman	cf177776bf	Alerting: Adding color option for slack receiver (#99615 )	6 months ago
Matthew Jacobson	a6dffd7552	Upgrade grafana/alerting to 209e052dba64 (#99118 ) Update grafana/alerting to 209e052dba64 Includes: - Add NoopDecode function for non-base64-encoded secrets (#264) - Log duplicated receivers (#265)	6 months ago

1 2 3 4 5 ...

493 Commits (bccc980b902987fc9a2707deca766412b47bbe2a)