IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity
30,502 Commits 5,416 Branches 554 Tags
a65975cca056d35e37bb3facc7ec6077a6831e7b
Commit Graph

75 Commits

Author SHA1 Message Date
Ganesh Vernekar
a65975cca0 Alerting: Remove the fixed wait for notification delivery (#37203) 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2021-07-26 15:15:09 +02:00
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>
 2021-07-19 13:31:51 +03:00
Sofia Papagiannaki
f308ba91e3 Alerting: Improve receiver initialisation errors (#36814) 
* Alerting: Improve receiver initialisation errors
 2021-07-19 11:58:35 +03:00
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
 2021-07-16 20:07:31 +03:00
Ganesh Vernekar
8efe1856e2 Alerting: A better and cleaner way to know if Alertmanager is initialised (#36659) 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2021-07-12 18:53:01 +05:30
Ganesh Vernekar
e19c690426 Alerting: Fix potential panic in Alertmanager when starting up (#36562) 
* Alerting: Fix potential panic in Alertmanager when starting up

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>

* Fix reviews

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2021-07-12 11:15:16 +05:30
Ganesh Vernekar
94d2520a84 Alerting: Allow space in label and annotation names (#36549) 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2021-07-08 18:26:09 +05:30
Ganesh Vernekar
8fe58fc2e3 Alerting: Add additional newlines to Microsoft Teams notification message where necessary (#36126) 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2021-06-24 20:52:00 +05:30
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
 2021-06-24 12:45:49 +05:30
Ganesh Vernekar
9a5c1f06df Alerting: Template all possible variables in notification channels (#35749) 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2021-06-22 15:12:54 +05:30
Ganesh Vernekar
33d6e11175 Alerting: Decouple default template from channel tests (#35239) 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2021-06-21 07:59:09 +05:30
gotjosh
f7ed35336d Alerting: Implement /status for the notification system (#33227) 
* Alerting: Implement /status for the notification system

Implements the necessary plumbing to have a /status endpoint on the
notification system.

* Add API examples

* Update API specs

* Update prometheus/common dependency

Co-authored-by: Sofia Papagiannaki <sofia@grafana.com>
 2021-06-15 19:14:02 +03:00
Ganesh Vernekar
a30e60a0b8 Alerting: Do not hard fail on templating errors in channels (#35165) 
* Alerting: Do not hard fail on templating errors in channels

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>

* Fix review

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2021-06-03 19:39:32 +05:30
Ganesh Vernekar
a23674ef99 Alerting: Migrate tags as labels and not annotations (#34990) 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2021-05-31 19:47:17 +05:30
Chip Wolf ‮
badec6c6ad Alerting: Add support for configuring avatar URL for the Discord notifier (#33355) 
Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>
 2021-05-28 23:00:21 +02:00
Owen Diehl
cc38613ba4 alerting: fixes per-receiver metric cardinality (#34915) 2021-05-28 12:31:23 -04:00
Danilo Bargen
83a83de10a Clarify that Threema Gateway Alerts support only Basic IDs (#34828) 
Threema Gateway supports two types of IDs: Basic IDs (where the
encryption is managed by the API server) and End-to-End IDs (where the
keys are managed by the user).

This plugin currently does not support End-to-End IDs (since it's much
more complex to implement, because the encryption needs to happen
locally). Add a few clarifications to the UI.

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
 2021-05-28 08:54:55 +02:00
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>
 2021-05-26 16:49:39 +02:00
Ganesh Vernekar
b168223029 NGAlert: Add integration tests for remaining notification channels (#34662) 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2021-05-26 16:33:55 +05:30
Sofia Papagiannaki
b48832c0f7 [Alerting]: alertmanager notifier fixes (#34575) 2021-05-24 16:09:29 +03:00
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>
 2021-05-20 15:49:33 +03:00
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>
 2021-05-20 10:12:08 +02:00
Ganesh Vernekar
533be16787 NGAlert: Add Threema notification channel (#34159) 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2021-05-19 20:20:52 +02:00
Ganesh Vernekar
b2e84277a3 NGAlert: Add Kafka notification channel (#34156) 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2021-05-19 20:02:09 +02:00
Ganesh Vernekar
ad1d0ae0bf NGAlert: Add VictorOps notification channel (#34161) 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2021-05-19 19:52:14 +02:00
Ganesh Vernekar
fb9223ab42 NGAlert: Add Line notification channel (#34157) 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2021-05-19 19:04:48 +02:00
Domas
54c33c6cdd Alerting: update email template (#34205) 2021-05-19 18:58:31 +02:00
Ganesh Vernekar
01e0faf800 NGAlert: Add GoogleChat notification channel (#34153) 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2021-05-19 18:24:04 +02:00
David Parrott
b9f4ec2030 Add discord notifier channel and test (#34150) 
* Add discord notifier channel and test

* Correct payload

* remove print statement

* PR feedback and update due to changes in main

* Add discord notifier channel and test

* Correct payload

* remove print statement

* PR feedback and update due to changes in main

* update constructor and tests

* group imports sensibly

* Fix lint

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>

Co-authored-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2021-05-19 17:31:55 +02:00
Sofia Papagiannaki
a79a4838b8 [Alerting]: Add Pushover integration with the alert manager (#34371) 
* [Alerting]: Add Pushover integration with the alert manager

* lint

* Set boundary only for tests

* Remove title field

* fix imports
 2021-05-19 16:48:46 +02:00
Arve Knudsen
9dfaa037d1 Alerting: Migrate Alertmanager notifier (#34304) 
* Alerting: Port Alertmanager notifier to v8

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2021-05-19 15:27:41 +02:00
Sofia Papagiannaki
ff112f07e3 [Alerting]: Add Sensu Go integration with the alert manager (#34045) 
* [Alerting]: Add sensugo notification channel

* Apply suggestions from code review

Co-authored-by: Ganesh Vernekar <15064823+codesome@users.noreply.github.com>

* Do not include labels with concatenated rule UID and names

* Modifications after syncing with main

Co-authored-by: Ganesh Vernekar <15064823+codesome@users.noreply.github.com>
 2021-05-18 17:31:51 +03:00
Ganesh Vernekar
89c2b5e863 NGAlert: Remove unwanted fields from notification channel config (#34036) 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2021-05-18 10:04:47 +02:00
gotjosh
6384f86fb9 Alerting: Allow the notifier to log (#34232) 
* Alerting: Allow the notifier to log

The notifier upstream code uses go-kit as its logging library. The
grafana specific logger is not compatible with this API. In this PR, I
have created a wrapper that implements io.Writer to make them
compatible.
 2021-05-17 18:06:47 +01:00
Ganesh Vernekar
d5ae55c5dd NGAlert: Add message field to email notification channel (#34044) 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2021-05-17 16:05:09 +05:30
Owen Diehl
1367f7171e Alerting/ruler metrics (#34144) 
* adds active configurations metric

* rule evaluation metrics

* ruler metrics

* pr feedback
 2021-05-14 16:13:44 -04:00
gotjosh
eb74994b8b Alerting: Modify configuration apply and save semantics - v2 (#34143) 
* Save default configuration to the database and copy over secure settings
 2021-05-14 19:49:54 +01:00
Owen Diehl
baca873a84 extracts alertmanager from DI, including migrations (#34071) 
* extracts alertmanager from DI, including migrations

* includes alertmanager Run method in ngalert

* removes 3s test shutdown timeout

* lint
 2021-05-13 14:01:38 -04:00
Ganesh Vernekar
ec3214bac2 NGAlert: Add integration tests for notification channels (#33431) 
* NGAlert: Add integration tests for notification channels

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>

* Fix the failing tests

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>

* Fix review comments

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>

* Override creation of rule UID, remove only namespace UID

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2021-05-13 22:58:19 +05:30
Ganesh Vernekar
5f44ccff0c NGAlert: Fix unit test to write files in temporary directory (#34032) 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2021-05-13 16:08:12 +05:30
Ganesh Vernekar
8d442c9b44 NGAlert: Fix templating and remove unwanted default templates (#33918) 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2021-05-12 15:13:43 +05:30
Sofia Papagiannaki
1c58fd380f [Alerting]: store encrypted receiver secure settings (#33832) 
* [Alerting]: Store secure settings encrypted

* Move encryption to the API handler
 2021-05-10 15:30:42 +03:00
Ganesh Vernekar
1b8c0ce88b NGAlert: Fix some TODOs in notification channels (#33739) 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2021-05-05 17:48:40 +05:30
Ganesh Vernekar
918552d34b NGAlert: Send list of available ngalert notification channels via API (#33489) 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2021-05-04 13:58:39 +02:00
Owen Diehl
5e48b54549 Alerting/metrics (#33547) 
* moves alerting metrics to their own pkg

* adds grafana_alerting_alerts (by state) metric

* alerts_received_{total,invalid}

* embed alertmanager alerting struct in ng metrics & remove duplicated notification metrics (already embed alertmanager notifier metrics)

* use silence metrics from alertmanager lib

* fix - manager has metrics

* updates ngalert tests

* comment lint
Signed-off-by: Owen Diehl <ow.diehl@gmail.com>

* cleaner prom registry code

* removes ngalert global metrics

* new registry use in all tests

* ngalert metrics impl service, hack testinfra code to prevent duplicate metric registrations

* nilmetrics unexported
 2021-04-30 12:28:06 -04:00
Ganesh Vernekar
be1affe0a4 NGAlert: Fix flaky test (#33415) 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2021-04-27 17:03:22 +05:30
Ganesh Vernekar
659ea20c3c NGAlert: Run the maintenance cycle for the silences (#33301) 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2021-04-23 16:19:03 +02:00
Ganesh Vernekar
d66a5e65a4 AlertingNG: Add webhook notification channel (#33229) 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2021-04-23 18:59:28 +05:30
Ganesh Vernekar
a0e567f80f AlertingNG: Add Dingding notification channel (#32995) 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2021-04-22 19:30:49 +02:00
Ganesh Vernekar
4ec1edfca3 AlertingNG: Add Teams notification channel (#32979) 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2021-04-22 18:16:26 +02:00