public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,481 Commits 655 Branches 650 Tags
v8.2.6
Commit Graph
94 Commits
Author SHA1 Message Date
Grot (@grafanabot)Yuriy TseretyanArmand GrilletJean-Philippe QuéménerGeorge Robinsongotjosh
 		3b8be57b4f Alerting: fix bug where user is able to access rules from namespaces user is not part of (#41403) (#41406) 
* Add fix
* Add tests
(cherry picked from commit 6220872633)

Co-authored-by: Yuriy Tseretyan <yuriy.tseretyan@grafana.com>
Co-authored-by: Armand Grillet <2117580+armandgrillet@users.noreply.github.com>
Co-authored-by: Jean-Philippe Quéméner <JohnnyQQQQ@users.noreply.github.com>
Co-authored-by: George Robinson <george.robinson@grafana.com>
Co-authored-by: gotjosh <josue@grafana.com>
 2021-11-08 18:57:51 +01:00
George Robinson 29638a485b Panel ID annotation cannot be set without Dashboard UID (#40019) (#40063) 
(cherry picked from commit 935bd34a30)
 2021-10-06 12:17:29 +01:00
George Robinson 265714866b You can now get alert rules for a dashboard or a panel using /api/v1/rules endpoints. (#39476) (#40008) 
Get alert rules for a dashboard and panel in /api/v1/rules

(cherry picked from commit 2a4c1b1aa6)
 2021-10-06 11:38:26 +01:00
Sofia Papagiannaki 368742ab04 Alerting: Remove ngalert feature toggle and introduce two new settings for enabling Grafana 8 alerts and disabling them for specific organisations (#38746) (#39793) 
* 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>
(cherry picked from commit 012d4f0905)
 2021-09-29 11:21:25 -04:00
Sofia Papagiannaki c89e1236fe Alerting: tune rule evaluation via configuration (#35623) (#39712) 
* Alerting: Configure max evaluation retries

* Alerting: Enforce minimum rule evaluation interval

* Alerting: Disable rule evaluation from configuration

* Update docs

* Alerting: Configure rule evaluation timeout

* Move options on unified_alerting config section

* Apply suggestions from code review

Co-authored-by: gotjosh <josue@grafana.com>
(cherry picked from commit f6f3a54742)
 2021-09-28 14:58:31 +03:00
Grot (@grafanabot)andgotjosh 8a369feb63 Alerting: Support Unified Alerting with Grafana HA (#37920) (#39342) 
* Alerting: Support Unified Alerting in Grafana's HA mode.

(cherry picked from commit 7db97097c9)

Co-authored-by: gotjosh <josue@grafana.com>
 2021-09-17 13:23:51 +01:00
Andrej Ocenas 91a67ab0fb CloudWatch/Logs: Don't group dataframes for non time series queries for non live path (#38915) 
* Use the same grouping function in legacy code

* Add error propagation

* Fix tests

* Fix tests
 2021-09-08 16:30:55 +02:00
Sofia Papagiannaki c19d65b1ad Alerting: some fixes for updating rules via the API (#38764) 
* Alerting: Allow updating rules if quota are exceeded

* Check for rule UID uniqueness in POST request
 2021-09-02 19:38:42 +03:00
+1
Arve KnudsendsotirakisMarcus EfraimssonIda FurjesovaJack WestbrookWill BrowneLeon SorokinAndrej OcenasspinillosKarl PerssonLeonard Gram
 		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>
 2021-08-25 15:11:22 +02:00
David Parrott 7fbeefc090 Alerting: create wrapper for Alertmanager to enable org level isolation (#37320) 
Introduces org-level isolation for the Alertmanager and its components.

Silences, Alerts and Contact points are not separated by org and are not shared between them.

Co-authored with @davidmparrott and @papagian
 2021-08-24 11:28:09 +01:00
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.
 2021-08-17 13:49:05 +01:00
gotjosh f3f3fcc727 Alerting: Introduces /api/v1/ngalert/alertmanagers to expose discovered and dropped Alertmanager(s) (#37632) 
* Alerting: Expose discovered and dropped Alertmanagers

Exposes the API for discovered and dropped Alertmanagers.

* make admin config poll interval configurable

* update after rebase

* wordsmith

* More wordsmithing

* change name of the config

* settings package too
 2021-08-13 13:14:36 +01:00
Sofia Papagiannakiandgotjosh 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>
 2021-08-12 16:04:09 +03:00
SLAMA 5986d99f51 Alerting frontend : fix line notifier (#37744) 
- Fixes #37425
- change `line` type string to uppercase
 2021-08-10 18:59:53 +01:00
Sofia PapagiannakigotjoshNathan Rodmanachatterjee-grafana
 		b96dd1877c Folder API: optionally force deleting Grafana 8 alerts when deleting a folder (or error) (#36427) 
* Folder API: Add an optional query parameter for allowing deleting a  folder containing rules

* Update frontend

- Set forceDeleteRules=true when frontend deletes a folder
- Improve modal text

* Update docs

* Apply suggestions from code review

Co-authored-by: gotjosh <josue@grafana.com>
Co-authored-by: Nathan Rodman <nathanrodman@gmail.com>
Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>
 2021-07-22 12:27:13 +03:00
Djairho GeuensDiana PaytonArve KnudsenGanesh Vernekarachatterjee-grafanaDjairho 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
Will Browne e06335ffe9 Plugins: Improve grafana-cli UX + API response messaging for plugin install incompatibility scenario (#36556) 
* improve UX for plugin install incompatability

* refactor test
 2021-07-13 09:58:46 +02:00
Sofia Papagiannaki fc90d47863 Alerting API: Restrict access to Alertmanager configuration (#36507) 
* Alerting API: Restrict access to Alertmanager configuration to viewers
 2021-07-07 16:29:18 +03:00
Kevin Minehart 92cb503486 use absolute path when getting grafana path; add test for directory (#36001) 2021-07-06 11:28:02 -05:00
Sofia Papagiannaki 8a3edf280e Alerting: Fix prometheus API to check folder permissions (#36301) 2021-07-05 10:49:14 +03:00
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
 2021-06-25 10:32:01 +02:00
Ganesh Vernekar f2bb3faea8 Alerting: Add integration test case for email channel (#36029) 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2021-06-24 20:31:29 +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 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
Ganesh Vernekar dcd4bf1615 Alerting: Fill the empty GeneratorURL (#35740) 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2021-06-16 15:34:12 +05:30
Sofia Papagiannaki e5a5b8e3fe Alerting: Fix updating alert rule properties with missing/zero values (#35512) 
* Fix deleting labels and annotations

* Add test

* Keep no data and error start if not provided

* Allow setting interval and for to zero during rule updates
 2021-06-15 20:55:25 +03:00
gotjoshandSofia Papagiannaki 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
Sofia Papagiannaki 8cda1f5153 Alerting: Allow rules with same title across folders (#35270) 
* Alerting: Allow rules with same title across folders

* Add test
 2021-06-04 20:45:26 +03:00
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 ‮andachatterjee-grafana 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 9aca032d10 Alerting/consistent api errors (#34858) 
* consolidates alertmanager api errors

* util & testing consistent errors

* consistent errors for rest of ngalert apis

* updates expected errors in testware

* bump ci

* linting

* unrelated: dashboard.go lint
 2021-05-28 11:55:03 -04:00
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.
 2021-05-28 11:04:20 -04:00
kay delaney 8143991b94 Security: Update default CSP template and fix firefox CSP issues (#34836) 
* Security: Update default content_security_policy_template
- Add 'strict-dynamic' back to script-src
- Add ws(s)://$ROOT_PATH to connect-src
- Change onEvent to on-event in angular templates to fix CSP issues in firefox.
- Add blob: to style-src
 2021-05-28 17:01:10 +02:00
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>
 2021-05-28 15:24:18 +05:30
Danilo BargenandArve Knudsen 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 89262ac64d Fix flaky TestNotificationChannels (#34831) 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2021-05-28 11:03:49 +05:30
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
Marcus Anderssonandkyle e19b3df1a9 Alerting: added possibility to preview grafana managed alert rules. (#34600) 
* starting to add eval logic.

* wip

* first version of test rule.

* reverted file.

* add info colum to result to show error or (with CC evalmatches)

* fix labels in evalmatch

* fix be test

* refactored using observables.

* moved widht/height div to outside panel rendere.

* adding docs api level.

* adding container styles to error div.

* increasing size of preview.

Co-authored-by: kyle <kyle@grafana.com>
 2021-05-26 10:06:28 +02:00
Sofia Papagiannaki b48832c0f7 [Alerting]: alertmanager notifier fixes (#34575) 2021-05-24 16:09:29 +03:00
Sofia Papagiannakiandgotjosh 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
Ryan McKinleyDominik ProkopTorkel Ödegaard
 		a91edd7267 Plugin Admin App: make the catalog look like internal component (#34341) 
* Allow Route component usage in app plugins

* i tried

* fix catalog app

* fix catalog app

* fix catalog app

* cleanup imports

* plugin catalog enabled to plugin admin

* rename plugin catalog to plugin admin

* expose catalog url

* update text

* import from react-router-dom

* fix imports -- add logging

* merge changes

* avoid onNavUpdate

* Fixed onNavChange issues

* fix library imports

* more links

Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>
Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
 2021-05-20 10:42:26 +02:00
gotjoshandGanesh Vernekar 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
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