* update decrypt secrets function signature and add secrets error handling
* remove a couple instances of unnecessary logging since errors are properly handled now
* add unit test
* fix linting issues
(cherry picked from commit 9aa6ce2a50)
Co-authored-by: Michael Mandrus <41969079+mmandrus@users.noreply.github.com>
* allow setting team managed permissions for service accounts
* Revert "allow setting team managed permissions for service accounts"
This reverts commit 7598626397.
* fix org user removal for OSS
* remove comment
(cherry picked from commit ba76be174f)
Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
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.
(cherry picked from commit 094dfd0d4d)
Co-authored-by: George Robinson <george.robinson@grafana.com>
* Add line break, regenerate, and fix
* Left-align custom text in addition to preserving newlines
(cherry picked from commit 39d7fdbbbc)
Co-authored-by: Alexander Weaver <weaver.alex.d@gmail.com>
This will be used to reduce write load when the alerting system writes a
large number of events.
(cherry picked from commit a0f96ed4e1)
Co-authored-by: Joe Blubaugh <joe.blubaugh@grafana.com>
* Documentation: Updated links to landing pages for the respective notifiers in alerting
Updated links for listed notifiers to correctly redirect to their landing pages
* Ran prettier
(cherry picked from commit 9a72ebcd99)
Co-authored-by: sunb3am <57086182+sunb3am@users.noreply.github.com>
* fixed hightlighting searchwords
* do not add empty searchWords
(cherry picked from commit a2512dd1c7)
Co-authored-by: Sven Grossmann <Svennergr@gmail.com>
* Loki: Fix incorrect TopK value type in query builder
* Simplify code
* Remove bracket
* Brackets are back
(cherry picked from commit 8fc51932f5)
Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
- Includes fix for appropriate selection of system assigned identity when using managed identity credential for Azure Monitor auth
(cherry picked from commit 1c48f443f0)
Co-authored-by: Andreas Christou <andreas.christou@grafana.com>
* WIP: Fix XSS in runbook URL (#378)
(cherry picked from commit f4a8d96a4e1259ea25d9cc702a652f1b819db236)
(cherry picked from commit 337c08507b2b1c78ea470192d34cf611fae4b5da)
(cherry picked from commit 54b36a07406ed4e26ff8e161e50eda5401f504da)
* Update grabpl version
(cherry picked from commit b253e87d730f7b8aabdd0b328c5e7a82547c43b3)
(cherry picked from commit 080d3e46f3fcd61555795b9fe8fd6ee2492b422a)
* Fix: Choose Lookup params per auth module
Co-authored-by: Karl Persson <kalle.persson@grafana.com>
Fix: Prefer pointer to struct in lookup
Co-authored-by: Karl Persson <kalle.persson@grafana.com>
Fix: user email for ldap
Co-authored-by: Karl Persson <kalle.persson@grafana.com>
Fix: Use only login for lookup in LDAP
Co-authored-by: Karl Persson <kalle.persson@grafana.com>
Fix: use user email for ldap
Co-authored-by: Karl Persson <kalle.persson@grafana.com>
fix remaining test
fix nit picks
(cherry picked from commit 1eca4aeed878853743cebcf9790b05dd350c4f83)
(cherry picked from commit 0777d100e9263d08f51dbac71aee0766c8a85a92)
* remove better (broke the pipeline)
Co-authored-by: George Robinson <george.robinson@grafana.com>
Co-authored-by: dsotirakis <sotirakis.dim@gmail.com>
Co-authored-by: jguer <joao.guerreiro@grafana.com>
without setting function map from alertmanager we receive error:
method=PUT path=/api/v1/provisioning/templates/slack.message status=400
level=error msg="invalid object specification: invalid template: template: :1: function \"toUpper\" not defined"
So for validation we should use the same settings as alertmanager do
for templates internally.
(cherry picked from commit b54da68765)
Co-authored-by: Michał Zielonka <michal.zielonka.8001@gmail.com>
This commit fixes a bug where the state did not change from Alerting to Error if the evaluation result returned an error, or from Error to Alerting if evaluations stopped returning errors.
(cherry picked from commit 34d45977ca)
Co-authored-by: George Robinson <george.robinson@grafana.com>
Put the ClickOutsideWrapper further out in the PanelHeader, so it doesn't catch itself when clicking on the panel header above the menu;
co-authored with @glintik
(cherry picked from commit 556f312b00)
