90 Commits (3cad9331fa311621648090ae706d0b98ea67a9a7)

Author	SHA1	Message	Date
github-actions[bot]	3cad9331fa	apply security patch: release-11.5.6/432-202505231913.patch	2 weeks ago
grafana-delivery-bot[bot]	7abc79cb2e	[release-11.5.3] Alerting: Re-encrypt existing contact points before get and patch in legacy config API (#101819) ... 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 (cherry picked from commit b73c59547c) Co-authored-by: Matthew Jacobson <matthew.jacobson@grafana.com>	4 months ago
Steve Simpson	dd3c3b5857	Alerting: Update grafana/alerting. (#88914)	1 year ago
Dave Henderson	e21d357d67	chore: Updating linter, fixing some new warnings (#88863)	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
Gaurav Agrawal	fdaa091a4d	Alerting: Support custom API URL for PagerDuty integration (#88007) ... * fix assert in LINE * fix pagerduty asserts --------- Co-authored-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com>	1 year 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	1 year ago
George Robinson	9f827a8278	Update grafana/alerting to 0025eb4 (#73808)	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
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	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	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>	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
ismail simsek	91221bc436	Expressions: Fixes the issue showing expressions editor (#62510) ... * Use suggested value for uid * update the snapshot * use __expr__ * replace all -100 with __expr__ * update snapshot * more changes * revert redundant change * Use expr.DatasourceUID where it's possible * generate files	2 years ago
gotjosh	0bfe150928	Alerting: Fix Test Receivers when settings are non-strings (#62156) ... * Alerting: Fix Test Receivers when settings are non-strings As part of the Alerting extraction, we want to make sure we don't have circular depedencies. As such, I had to move `PostableGrafanaReceiver` to a new struct in `grafana/alerting` called `GrafanaReceiver`. `PostableGrafanaReceiver` has an attribute called `Settings` that uses a Grafana-propietary struct called `RawMessage`, this struct shadows `json.RawMessage`. When I created `GrafanaReceiver`, I turned settings into a `map[string]string` thinking all settings would end up as strings. This was a mistake, and this test proves that it doesn't work, and breaks the API.	2 years ago
Kristin Laemmert	f6e3252c00	chore: move notifications models into notifications service (#61638)	2 years ago
Yuri Tseretyan	f990be58cb	Alerting: Use all notifiers from alerting repository (#60655)	3 years ago
Yuri Tseretyan	f0cabe14d5	Alerting: import Grafana alerting package and update usages (#60490) ... * update remaining notifiers to use alerting package	3 years ago
Yuri Tseretyan	07b5043222	Alerting: Add support for settings parse_mode and disable_notifications to Telegram reciever (#60198)	3 years ago
Alexander Weaver	821614fb43	Alerting: Align notifier truncation and logging with prometheus/alertmanager (#59339) ... * Move truncation code to util to mirror upstream * Resolve merge conflicts * Align logging of alert key * Update tests and fix field passing bug * Remove superfluous newline in test now that we trim whitespace * Uptake minor log changes from upstream	3 years ago
Marcus Efraimsson	2db8ed9441	Chore: All tests under pkg/tests should be integration tests (#59521) ... * Chore: All tests under pkg/tests should be integrationtests * run alerting integration tests only for sqlite	3 years ago
George Robinson	ec1d93c8ab	Alerting: Upload images to Slack via files.upload (#59163) ... This commit makes a number of changes to how images work in Slack notifications. It adds support for uploading images to Slack via the files.upload API when the contact point has a token. Images are no longer linked via a URL if a token is present. Each image uploaded to Slack is posted as a reply to the original notification. Up to maxImagesPerThreadTs images can be posted as replies before a final message is sent with: There are no images than can be shown here. To see the panels for all firing and resolved alerts please check Grafana Incoming Webhooks cannot upload files via files.upload and so webhooks require the image to be uploaded to cloud storage and linked via URL.	3 years ago
matt abrams	74010fd05d	Admin: Fix broken links to image assets in email templates (#58729) ... fix broken links to image assets	3 years ago
Neel	db1fd10ff1	Alerting: Append org ID to alert notification URLs (#57123)	3 years ago
Will Jordan	d581b368bd	Alerting: Remove duplicate Slack notification title (#58107) ... Move mentions to a markdown-formatted pretext field to prevent issues mixing blocks and legacy-attachment content.	3 years ago
Santiago	a3f828de8a	Alerting: Fix flaky test in notifiers (#57927) ... * Alerting: Fix flaky test in notifiers * remove TODO comment	3 years ago
Alex Moreno	10fdfa8583	Alerting: Change handling of settings to pagerduty contact point (#57524) ... * Add custom title to pagerduty contact point * Fix tests by saving decrypted key * Use simplejson	3 years ago
Kristin Laemmert	05709ce411	chore: remove sqlstore & mockstore dependencies from (most) packages (#57087) ... * chore: add alias for InitTestDB and Session Adds an alias for the sqlstore InitTestDB and Session, and updates tests using these to reduce dependencies on the sqlstore.Store. * next pass of removing sqlstore imports * last little bit * remove mockstore where possible	3 years ago
Santiago	6ad405e256	fix swagger spec for receivers API response (#57124)	3 years ago
Santiago	9996dbd577	use Prometheus' format for notification attempts durations (#56822)	3 years ago
George Robinson	802d67eeca	Alerting: Support values in notification templates (#56457) ... We have received a lot of feedback regarding the ValueString in alert notifications. Perhaps one of the most frequent complaints about ValueString is that it is difficult to read because it contains a lot of information, and the information is shown as a JSON-like string. Users have often asked how it can be templated and the answer is that it can't. Until now users have been able to add custom annotations to their alert rules which contains values via the $values variable added in previous versions of Grafana. However, these custom annotations must be added for each of the user's alert rule, instead of once in a template that all of their alerts can be notified via. This commit adds then the much requested feature to support values in notification templates. Users can then create a single template that prints the annotations, labels and values of their alerts in a format of their choice!	3 years ago
Joe Blubaugh	b1df15c4b9	Alerting: Add basic test wrappers to notification channel API test. (#56432) ... Adds t.Run calls that supply the name of a receiver and its integrations when the API response is being verified. This test has a rare flake and it's difficult to track down without more context for the test failure.	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
Marcus Efraimsson	862a6a2fa6	Logging: Introduce API for contextual logging (#55198) ... Introduces a FromContext method on the log.Logger interface that allows contextual key/value pairs to be attached, e.g. per request, so that any logger using this API will automatically get the per request context attached. The proposal makes the traceID available for contextual logger , if available, and would allow logs originating from a certain HTTP request to be correlated with traceID. In addition, when tracing not enabled, skip adding traceID=00000000000000000000000000000000 to logs.	3 years ago
Emil Tullstedt	b287047052	Chore: Upgrade Go to 1.19.1 (#54902) ... * WIP * Set public_suffix to a pre Ruby 2.6 version * we don't need to install python * Stretch->Buster * Bump versions in lib.star * Manually update linter Sort of messy, but the .mod-file need to contain all dependencies that use 1.16+ features, otherwise they're assumed to be compiled with -lang=go1.16 and cannot access generics et al. Bingo doesn't seem to understand that, but it's possible to manually update things to get Bingo happy. * undo reformatting * Various lint improvements * More from the linter * goimports -w ./pkg/ * Disable gocritic * Add/modify linter exceptions * lint + flatten nested list Go 1.19 doesn't support nested lists, and there wasn't an obvious workaround. https://go.dev/doc/comment#lists	3 years ago
George Robinson	e163a976fa	Alerting: Fix width of Adapative Cards in Teams notifications (#53996)	3 years ago
George Robinson	6d69d7acb8	Alerting: Fix notifications for Microsoft Teams (#53810) ... This commit fixes notifications for Microsoft Teams where notifications would just contain "Card" rather than the title.	3 years ago
George Robinson	5e1d628f21	Alerting: Use Adaptive Cards in Teams notifications (#53532) ... This commit changes the cards in Teams notifications from Office 365 Connector cards to Adaptive Cards to fix an issue where images were not shown in Teams for desktop and web. Since Office 365 Connector cards are deprecated, it made sense to move to Adapative Cards and fix this bug at the same time. The Adaptive Card messages maintain the design of the Office 365 Connector Card with a number of minor differences: - In Adaptive Card messages the color of the title is red or green depending on the status of the alerts, where as with Office 365 connector cards there was a colored border at the top of the title - In Adaptive Card messages the title is bold to make it easier to read when the color is red or green - In Adaptive Card messages the thumbnails for images are medium size if there are more than two images, otherwise large size	3 years ago
Jo	062d255124	Handle ioutil deprecations (#53526) ... * replace ioutil.ReadFile -> os.ReadFile * replace ioutil.ReadAll -> io.ReadAll * replace ioutil.TempFile -> os.CreateTemp * replace ioutil.NopCloser -> io.NopCloser * replace ioutil.WriteFile -> os.WriteFile * replace ioutil.TempDir -> os.MkdirTemp * replace ioutil.Discard -> io.Discard	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
George Robinson	094dfd0d4d	Alerting: Fix Slack push notifications (#52391) ... This commit fixes push notifications for Slack which used to show "This content cannot be displayed". The text field is shown in both the message and the push notification.	3 years ago
idafurjes	6c43eb0b4d	Split Create User (#50502) ... * Split Create User * Use new create user and User from package user * Add service to wire * Making create user work * Replace user from user pkg * One more * Move Insert to orguser Service/Store * Remove unnecessary conversion * Cleaunp * Fix Get User and add fakes * Fixing get org id for user logic, adding fakes and other adjustments * Add some tests for ourguser service and store * Fix insert org logic * Add comment about deprecation * Fix after merge with main * Move orguser service/store to org service/store * Remove orguser from wire * Unimplement new Create user and use User from pkg user * Fix wire generation * Fix lint * Fix lint - use only User and CrateUserCommand from user pkg * Remove User and CreateUserCommand from models * Fix lint 2	3 years ago
George Robinson	5053468c65	Alerting: Add support for images in Telegram (#51433)	3 years ago
Yuriy Tseretyan	4a9872d108	reload permissions after create folder (#51288)	3 years ago
Yuriy Tseretyan	53d03aec78	Alerting: Add api client to integration tests (#50970)	3 years ago
Matthew Jacobson	5dee2ed24c	Alerting: Add first Grafana reserved label grafana_folder (#50262) ... * Alerting: Add first Grafana reserved label g_label g_label holds the title of the folder container the alert. The intention of this label is to use it as part of the new default notification policy groupBy. * Add nil check on updateRule labels map * Disable gocyclo lint on schedule.ruleRoutine will remove later in a separate refactoring PR to reduce complexity. * Address doc suggestions * Update g_folder for rules in folder when folder title changes * Remove global bus in FolderService * Modify tests to fit new common g_folder label * Add changelog entry * Fix merge conflicts * Switch GrafanaReservedLabelPrefix from `g_` to `grafana_`	3 years ago
Serge Zaitsev	ae9491c3a7	Chore: Make test tracer noop and return no errors (#50797)	3 years ago
Ieva	f256f625d8	AccessControl: Enable RBAC by default (#48813) ... * Add RBAC section to settings * Default to RBAC enabled settings to true * Update tests to respect RBAC Co-authored-by: Karl Persson <kalle.persson@grafana.com>	3 years ago
idafurjes	abb1618291	Add OTLP exporter for OpenTelemetry (#47987) ... * Add OTLP exporter for OpenTelemtry * Fix lint * Refactore parse settings * Add configuration for propagation + fix tests * Fix tests and lint * Fix alerting tests * Add coments to config * Add propagation to custom.ini	3 years ago
Alexander Weaver	a96510d03c	Alerting: Fix test intermittency caused by port conflicts (#48552) ... * Get golang to find an open port for us * Update pkg/tests/api/alerting/api_notification_channel_test.go Co-authored-by: gotjosh <josue.abreu@gmail.com> * Fix merge Co-authored-by: gotjosh <josue.abreu@gmail.com>	3 years ago