grafana

Commit Graph

Author	SHA1	Message	Date
Yuri Tseretyan	07b5043222	Alerting: Add support for settings parse_mode and disable_notifications to Telegram reciever (#60198 )	2 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	2 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	2 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
cianooooo	e8f4b58a8b	Alerting: Add additional customisation to ngalert MS Teams notifier (#46372 ) Makes the Title and Section Title of the Teams message customisable. Closes #46366	3 years ago
Joe Blubaugh	3d91047e6e	Alerting: Notification URL points to alert view page instead of alert edit page (#47752 ) Before this change, notifications generated by the Grafana Alertmanager pointed to '/alerting/:ruleID/edit'. This change instead points them to the view path '/alerting/grafana/:ruleID/view'. The view page has a better UX, including timeseries display. It's also where many alert state improvements will land in the next few versions of Grafana. Fixes #45301 Signed-off-by: Joe Blubaugh <joe.blubaugh@grafana.com>	3 years ago
Serge Zaitsev	41012af997	Tracing: Use common traceID context value for opentracing and opentelemetry (#46411 ) * use common traceID context value for opentracing and opentelemetry * support sampled trace IDs as well * inject traceID into NormalResponse on errors * Finally the test passed * fix the test * fix linter * change the function parameter Co-authored-by: Ying WANG <ying.wang@grafana.com>	3 years ago
Serge Zaitsev	e86b6662a1	Chore: Remove bus.Bus field (#47695 ) * Chore: Remove bus.Bus field * fix integration test	3 years ago
Konrad Lalik	aeec087065	Alerting: Fix silence url in notifications (#46031 ) * Update silence url generation * Update tests * Update test to the new silence params format * Fix tests	3 years ago
Jean-Philippe Quéméner	4fef791c7c	Alerting: enable e2e tests to run in production mode (#45073 ) * Alerting: run e2e tests in production mode * adapt expected messages * switch expected and actual to have the right order	3 years ago
idafurjes	12420260ef	Remove bus from org invite api (#44530 ) * Remove bus from org invite api * Fix lint * Remove comment	3 years ago
Serge Zaitsev	84a5910e56	Chore: Remove bus from ngalert (#44465 ) * pass notification service down to the notifiers * add ns to all notifiers * remove bus from ngalert notifiers * use smaller interfaces for notificationservice * attempt to fix the tests * remove unused struct field * simplify notification service mock * trying to resolve issues in the tests * make linter happy * make linter even happier * linter, you are annoying	3 years ago
idafurjes	30aa24a183	Chore: Implement OpenTelemtry in Grafana (#42674 ) * Separate Tracer interface to TracerService and Tracer * Fix lint * Fix:Make it possible to start spans for both opentracing and opentelemetry in ds proxy * Add span methods, use span interface for rest of tracing * Fix logs in tracing * Fix tests that are related to tracing * Fix resourcepermissions test * Fix some tests * Fix more tests * Add TracingService to wire cli runner * Remove GlobalTracer from bus * Renaming test function * Remove GlobalTracer from TSDB * Replace GlobalTracer in api * Adjust tests to the InitializeForTests func * Remove GlobalTracer from services * Remove GlobalTracer * Remove bus.NewTest * Remove Tracer interface * Add InitializeForBus * Simplify tests * Clean up tests * Rename TracerService to Tracer * Update pkg/middleware/request_tracing.go Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com> * Initialize tracer before passing it to SQLStore initialization in commands * Remove tests for opentracing * Set span attributes correctly, remove unnecessary trace initiliazation form test * Add tracer instance to newSQLStore * Fix changes due to rebase * Add modified tracing middleware test * Fix opentracing implementation tags Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>	3 years ago
idafurjes	7936c4c522	Rename AddHandlerCtx to AddHandler (#43557 )	3 years ago
Peter Holmberg	97978a7c02	Alerting: Add value to notifier template (#41951 ) * add value to email template * add value to default template * update test string * test: fix ngalert test suite * test: run CI Co-authored-by: gillesdemey <gilles.de.mey@gmail.com>	4 years ago
George Robinson	967721068e	Alerting: Support custom annotations and labels when testing contact points Support custom annotations and labels when testing contact points	4 years ago
Jean-Philippe Quéméner	d9c0220824	Alerting: add organziation ID to the ngAlert webhook payload (#40189 ) * Alerting: add organziation ID to the ngAlert webhook payload	4 years ago
Joan López de la Franca Beltran	722c414fef	Encryption: Refactor securejsondata.SecureJsonData to stop relying on global functions (#38865 ) * Encryption: Add support to encrypt/decrypt sjd * Add datasources.Service as a proxy to datasources db operations * Encrypt ds.SecureJsonData before calling SQLStore * Move ds cache code into ds service * Fix tlsmanager tests * Fix pluginproxy tests * Remove some securejsondata.GetEncryptedJsonData usages * Add pluginsettings.Service as a proxy for plugin settings db operations * Add AlertNotificationService as a proxy for alert notification db operations * Remove some securejsondata.GetEncryptedJsonData usages * Remove more securejsondata.GetEncryptedJsonData usages * Fix lint errors * Minor fixes * Remove encryption global functions usages from ngalert * Fix lint errors * Minor fixes * Minor fixes * Remove securejsondata.DecryptedValue usage * Refactor the refactor * Remove securejsondata.DecryptedValue usage * Move securejsondata to migrations package * Move securejsondata to migrations package * Minor fix * Fix integration test * Fix integration tests * Undo undesired changes * Fix tests * Add context.Context into encryption methods * Fix tests * Fix tests * Fix tests * Trigger CI * Fix test * Add names to params of encryption service interface * Remove bus from CacheServiceImpl * Add logging * Add keys to logger Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com> * Add missing key to logger Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com> * Undo changes in markdown files * Fix formatting * Add context to secrets service * Rename decryptSecureJsonData to decryptSecureJsonDataFn * Name args in GetDecryptedValueFn * Add template back to NewAlertmanagerNotifier * Copy GetDecryptedValueFn to ngalert * Add logging to pluginsettings * Fix pluginsettings test Co-authored-by: Tania B <yalyna.ts@gmail.com> Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>	4 years ago
Sofia Papagiannaki	012d4f0905	Alerting: Remove `ngalert` feature toggle and introduce two new settings for enabling Grafana 8 alerts and disabling them for specific organisations (#38746 ) * Remove `ngalert` feature toggle * Update frontend Remove all references of ngalert feature toggle * Update docs * Disable unified alerting for specific orgs * Add backend tests * Apply suggestions from code review Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com> * Disabled unified alerting by default * Ensure backward compatibility with old ngalert feature toggle * Apply suggestions from code review Co-authored-by: gotjosh <josue@grafana.com>	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
George Robinson	3ca00f90b5	Contact point testing (#37308 ) This commit adds contact point testing to ngalerts via a new API endpoint. This endpoint accepts JSON containing a list of receiver configurations which are validated and then tested with a notification for a test alert. The endpoint returns JSON for each receiver with a status and error message. It accepts a configurable timeout via the Request-Timeout header (in seconds) up to a maximum of 30 seconds.	4 years ago
Sofia Papagiannaki	04d5dcb7c8	Alerting: modify DB table, accessors and migration to restrict org access (#37414 ) * Alerting: modify table and accessors to limit org access appropriately * Update migration to create multiple Alertmanager configs * Apply suggestions from code review Co-authored-by: gotjosh <josue@grafana.com> * replace mg.ClearMigrationEntry() mg.ClearMigrationEntry() would create a new session. This commit introduces a new migration for clearing an entry from migration log for replacing mg.ClearMigrationEntry() so that all dashboard alert migration operations will run inside the same transaction. It adds also `SkipMigrationLog()` in Migrator interface for skipping adding an entry in the migration_log. Co-authored-by: gotjosh <josue@grafana.com>	4 years ago

1 2

72 Commits (07b5043222a51275e7b0c429668d37795416d6e9)