grafana

Commit Graph

Author	SHA1	Message	Date
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
SLAMA	5986d99f51	Alerting frontend : fix line notifier (#37744 ) - Fixes #37425 - change `line` type string to uppercase	4 years ago
Djairho Geuens	4cadbba686	Email: Allow configuration of content types for email notifications (#34530 ) * Alerting: Allow configuration of content types for email notifications * Fix lint error * Improves email templates * Improve configuration documentation Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com> * Improve code comments Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com> * Improve configuration documentation Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com> * Improve email template * Remove unnecessary predeclaration Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Adds handling for unrecognized content type Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Move utility function outside of util package * Fixes syntax * Remove unused package * Fix lint error * improve email templates * Fix test * Alerting: Allow configuration of content types for email notifications * Fix lint error * Improves email templates * Improve configuration documentation Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com> * Improve code comments Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com> * Improve configuration documentation Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com> * Improve email template * Remove unnecessary predeclaration Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Adds handling for unrecognized content type Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Move utility function outside of util package * Fixes syntax * Remove unused package * Fix lint error * improve email templates * Fix test * Fix comment style Co-authored-by: Ganesh Vernekar <15064823+codesome@users.noreply.github.com> * Fix template formatting * Add test and improve error handling * Fix test * Fix formatting * Fix formatting * Improve documentation and regenerates txt template * Update docs/sources/administration/configuration.md Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com> Co-authored-by: Djairho Geuens <djairho.geuens@ae.be> Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com> Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> Co-authored-by: Ganesh Vernekar <15064823+codesome@users.noreply.github.com> Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>	4 years ago
Sofia Papagiannaki	afe6e793ff	Alerting: deactivate an Alertmanager configuration (#36794 ) * Alerting: deactivate an Alertmanager configuration Implement DELETE /api/alertmanager/grafana/config/api/v1/alerts by storing the default configuration which stops existing cnfiguration from being in use. * Apply suggestions from code review	4 years ago
Dimitris Sotirakis	4f3bc71caa	Chore: Update tests to prevent `test-backend` step from failing the pipeline (#36155 ) * Chore: Update flight-simple-X.txt * Fix api_notification_channel_test.go failing test	4 years ago
Ganesh Vernekar	f2bb3faea8	Alerting: Add integration test case for email channel (#36029 ) Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>	4 years ago
Kyle Brandt	19f764739b	Alerting: Change `__value__` label to `__value_string__` annotation and add `ValueString` variable in notifications (#36032 ) * Alerting: Allow __value__ label in notifications was being removed by removePrivateItems discoverd in #36020, but issue is not about that specifically * __value__ label to __value_string__ annotation and .ValueString extended property for notifications	4 years ago
Ganesh Vernekar	33d6e11175	Alerting: Decouple default template from channel tests (#35239 ) Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>	4 years ago
Ganesh Vernekar	dcd4bf1615	Alerting: Fill the empty GeneratorURL (#35740 ) Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>	4 years ago
Ganesh Vernekar	a23674ef99	Alerting: Migrate tags as labels and not annotations (#34990 ) Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>	4 years ago
Kyle Brandt	b47e7d12e6	Alerting: Extract values from MD expr alerts (#34757 ) When using mulit-dimensional Grafana managed alerts (e.g. SSE math) extract refIds values and labels so they can be shown in the notification and dashboards.	4 years ago
Ganesh Vernekar	8278c7bf77	Alerting: Fix flaky TestNotificationChannels take 2 (#34880 ) * Alerting: Fix flaky TestNotificationChannels take 2 Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com> * Fix nits Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com> * Fix lint Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>	4 years ago
Ganesh Vernekar	89262ac64d	Fix flaky TestNotificationChannels (#34831 ) Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>	4 years ago
Ganesh Vernekar	d69c21acb6	NGAlert: Update the default template to include more URLs (#34715 ) * NGAlert: Update the default template to include more URLs Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com> * Fix tests Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>	4 years ago
Ganesh Vernekar	b168223029	NGAlert: Add integration tests for remaining notification channels (#34662 ) Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>	4 years ago
Sofia Papagiannaki	23939eab10	[Alerting]: namespace fixes (#34470 ) * [Alerting]: forbid viewers for updating rules if viewers can edit check for CanSave instead of CanEdit * Clear ngalert tables when deleting the folder * Apply suggestions from code review * Log failure to check save permission Co-authored-by: gotjosh <josue@grafana.com>	4 years ago
gotjosh	7b04278834	Alerting: Opsgenie notification channel (#34418 ) * Alerting: Opsgenie notification channel This translate the opsgenie notification channel from the old alerting system to the new alerting system with a few changes: - The tag system has been replaced in favour of annotation. - TBD - TBD Signed-off-by: Josue Abreu <josue@grafana.com> * Fix template URL * Bugfig: dont send resolved when autoClose is false Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com> * Fix integration tests Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com> * Fix URLs in all other channels Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com> Co-authored-by: Ganesh Vernekar <ganeshvern@gmail.com>	4 years ago
Owen Diehl	d6c4c2fcd5	[Alerting] Ensure upstream validations are run (#34333 ) * use embedded validations via noop yaml unmarshaler * lint * fixes integration tests now that groupings are handled	4 years ago

1 2

55 Commits (5388dc6a2f10496131f1159c882b1c32d4997afa)