4303 Commits
Author SHA1 Message Date
Grot (@grafanabot)andBart Peeters 5d1bed9b64 [v9.2.x] Alerting: Support Prometheus durations in Provisioning API (#59066)
Alerting: Support Prometheus durations in Provisioning API (#58293)

Provisioning API should support Prometheus durations

(cherry picked from commit 57d6adbc7c)

Co-authored-by: Bart Peeters <birtpeeters@hotmail.com>
2022-11-21 19:17:54 +00:00
JoandMihaly Gyongyosi 15179a6abb Fix: Email and username trimming and invitation validation (#58446)
* Trim leading and trailing whitespaces from email and username on signup

* Check whether the provided email address is the same as where the invitation sent

Co-authored-by: Mihaly Gyongyosi <mgyongyosi@users.noreply.github.com>
2022-11-14 13:10:15 +01:00
George Robinson cc2560b96f Alerting: Fix logging pointer address of DashboardUID and PanelID variables (#58539) (#58565)
(cherry picked from commit c5ae1bcfe0)
2022-11-10 13:45:20 +00:00
George Robinson b372406a61 Alerting: Log when alert rule cannot be screenshot to help debugging (#58537) (#58563)
(cherry picked from commit 68600c224b)
2022-11-10 11:06:50 +00:00
George Robinson a2f412e21f Alerting: Small improvements to staleResultsHandler (#58007) (#58513)
(cherry picked from commit 1290951b65)
2022-11-09 17:15:09 +00:00
Grot (@grafanabot)andGeorge Robinson 40ad7fe358 Alerting: Fix images cached on rule instead of dashboard panel signature (#58510) (#58536)
(cherry picked from commit 7e852720e3)

Co-authored-by: George Robinson <george.robinson@grafana.com>
2022-11-09 17:14:16 +00:00
Grot (@grafanabot)andGeorge Robinson 18e8f6dc65 Alerting: Improve debug logs in image service (#58507) (#58533)
(cherry picked from commit b92a0223e3)

Co-authored-by: George Robinson <george.robinson@grafana.com>
2022-11-09 16:48:59 +00:00
George Robinson 749d9c2cba Alerting: Fix screenshots were not cached (#58493) (#58494)
(cherry picked from commit c646ff0ce3)
2022-11-09 10:43:00 +08:00
Grot (@grafanabot)andGeorge Robinson a54d45fa90 Alerting: Use hash of opts in singleflight (#58474) (#58488)
(cherry picked from commit ad9ac85ee0)

Co-authored-by: George Robinson <george.robinson@grafana.com>
2022-11-08 22:52:49 +00:00
Grot (@grafanabot)andGeorge Robinson 91d4141cf9 Use fnv64 for InmemCacheService (#58468) (#58487)
(cherry picked from commit 72275e97d2)

Co-authored-by: George Robinson <george.robinson@grafana.com>
2022-11-08 22:18:39 +00:00
Grot (@grafanabot)andWill Jordan 945c3fafe7 Alerting: Remove duplicate Slack notification title (#58107) (#58256)
Move mentions to a markdown-formatted pretext field
to prevent issues mixing blocks and legacy-attachment content.

(cherry picked from commit d581b368bd)

Co-authored-by: Will Jordan <wjordan@users.noreply.github.com>
2022-11-08 11:41:35 +01:00
George RobinsonandNeel d38ac63f22 Alerting: Append org ID to alert notification URLs (#57123) (#58349)
(cherry picked from commit db1fd10ff1)

Co-authored-by: Neel <47709856+neel1996@users.noreply.github.com>
2022-11-07 17:07:07 +00:00
Grot (@grafanabot)andGeorge Robinson 67f503b820 Alerting: Fix test fails in some environments (#58251) (#58356)
(cherry picked from commit 8353f307aa)

Co-authored-by: George Robinson <george.robinson@grafana.com>
2022-11-07 16:54:39 +00:00
Eric LeijonmarckandRyan McKinley 9b07bc7e98 merge complete (#58274)
Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
2022-11-04 15:03:07 -07:00
Eric Leijonmarck 94594d61e6 followup fix for backport (#58273) 2022-11-04 21:20:20 +00:00
Eric Leijonmarck 0026764f04 merge complete (#58272) 2022-11-04 20:45:38 +00:00
Eric Leijonmarck 797dd2dd58 fix: migration of alert_rules fix (#58123) 2022-11-03 10:37:22 +00:00
George Robinson ab3718afba Alerting: Fix screenshot is not taken for stale series (#57982) (#58102)
(cherry picked from commit 215ffee437)
2022-11-03 10:17:01 +00:00
Grot (@grafanabot)andGeorge Robinson d1df696c31 Alerting: Fix feedback (#57922) (#58104)
(cherry picked from commit f2e4cb7c4e)

Co-authored-by: George Robinson <george.robinson@grafana.com>
2022-11-02 18:49:29 -04:00
Grot (@grafanabot)andGeorge Robinson 5895100beb Alerting: Fix response is not returned for invalid Duration in Provisioning API (#58046) (#58049)
(cherry picked from commit 4c581b5f85)

Co-authored-by: George Robinson <george.robinson@grafana.com>
2022-11-02 13:06:58 +00:00
Grot (@grafanabot)andAlexander Weaver ad2ea44977 Attempt to preserve UID from migrated channel (#57639) (#57919)
(cherry picked from commit 0dfd78c88c)

Co-authored-by: Alexander Weaver <weaver.alex.d@gmail.com>
2022-10-31 12:17:48 -05:00
Grot (@grafanabot)andGeorge Robinson 924180a25b Alerting: Add debug logs in validateAndGetPrefix (#57002) (#57923)
(cherry picked from commit b0a927b138)

Co-authored-by: George Robinson <george.robinson@grafana.com>
2022-10-31 17:12:19 +00:00
Grot (@grafanabot)andIeva 76ed60064d change json command parameter names from userID to userId and teamID to teamId (#57902) (#57913)
(cherry picked from commit 5c1a1c8318)

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
2022-10-31 15:33:39 +00:00
Grot (@grafanabot)andIeva e09307c078 add an endpoint for updating several managed permissions with one call (#57893) (#57898)
(cherry picked from commit 2546437e20)

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
2022-10-31 14:31:34 +00:00
Grot (@grafanabot)andKarl Persson dac165a7fc RBAC: Allow to list users for dashboard / folder admins (#57080) (#57252)
* RBAC: Use query struct in tests

* RBAC: If access control enforcement is disabled don't filter out users
when fetching permissions

(cherry picked from commit 9adaf1565c)

Co-authored-by: Karl Persson <kalle.persson@grafana.com>
2022-10-31 07:31:43 -04:00
Grot (@grafanabot) 2576f05029 Alerting: Fix "Not Implemented" responses (#57710) (#57712) 2022-10-27 14:48:54 -03:00
Grot (@grafanabot)andIeva d6f248c14e move data source permission model to enterprise repo (#57615) (#57659)
(cherry picked from commit 92531c5596)

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
2022-10-26 13:30:20 +01:00
Grot (@grafanabot)andsh0rez 8d7c3f19ee live: explicitely reply with http 200 (#57428) (#57592)
`pkg/web` triggers a panic when a http handler chain does not return any
response to the client.
This has been put in place, because it usually means a middleware along
the way did not call the next one.

In this specific case however, the handlers meant to return 200, but did
not do so explicitely, instead relying on the default behavior of `net/http`

(cherry picked from commit beaaabd770)

Co-authored-by: sh0rez <me@shorez.de>
2022-10-25 06:02:15 -04:00
Grot (@grafanabot)andArtur Wierzbicki 7832a7579f Storage: Fix initialization on windows (#57504) (#57577)
(cherry picked from commit 749b3b6263)

Co-authored-by: Artur Wierzbicki <artur.wierzbicki@grafana.com>
2022-10-24 21:45:55 -04:00
Grot (@grafanabot)andGabriel MABILLE 509cb77bca RBAC: Allow access to /dashboards when user has dashboards create (#56712) (#57153)
* RBAC: Allow access to dashboards when user has dashboards create

* Remove eval any that I didn't add on purpose

(cherry picked from commit 3963ed3754)

Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
2022-10-24 15:57:55 +02:00
Joandlinoman b6a91429c9 Swap order of login fields (#57426)
Co-authored-by: linoman <2051016+linoman@users.noreply.github.com>
2022-10-21 14:15:59 +02:00
Marcus EfraimssonandWill Browne d2fe4b4813 [v9.2.x] Plugin fixes (#57401)
* Plugins: Remove support for V1 manifests

* Plugins: Make proxy endpoints not leak sensitive HTTP headers

* Security: Fix do not forward login cookie in outgoing requests

(cherry picked from commit 4539c33fce)

Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
2022-10-21 13:55:35 +02:00
Grot (@grafanabot)andJosh Hunt a3bccbbdeb User: Fix externalUserId not being populated (#57341) (#57370)
(cherry picked from commit 8cebaf345d)

Co-authored-by: Josh Hunt <joshhunt@users.noreply.github.com>
2022-10-20 14:53:17 -04:00
Grot (@grafanabot)andYuriy Tseretyan 1559344944 Alerting: Change severity level of fetcher log messages (#57299) (#57304)
(cherry picked from commit 3e6bc28de5)

Co-authored-by: Yuriy Tseretyan <yuriy.tseretyan@grafana.com>
2022-10-19 16:19:13 -04:00
Grot (@grafanabot)andaimuz cce767fee4 Alerting: Add support for wecom apiapp (#55991) (#57238)
This change adds new functionality to the wecom alerting contact point. In addition to a webhook address, you can now send alerts to the wecom apiapp endpoint.

Based on https://github.com/grafana/grafana/discussions/55883

Signed-off-by: aimuz <mr.imuz@gmail.com>
(cherry picked from commit c0cc85b5f1)

Co-authored-by: aimuz <mr.imuz@gmail.com>
2022-10-19 13:14:32 +08:00
Grot (@grafanabot)andSantiago 29baf812cf fix swagger spec for receivers API response (#57124) (#57128)
(cherry picked from commit 6ad405e256)

Co-authored-by: Santiago <santiagohernandez.1997@gmail.com>
2022-10-18 12:50:54 -03:00
Grot (@grafanabot)andYuriy Tseretyan 484df7d682 [v9.2.x] Alerting: Use correct response body for silence post API (#57126)
Co-authored-by: Yuriy Tseretyan <yuriy.tseretyan@grafana.com>
2022-10-18 11:35:13 -04:00
juanicabanas b9cce07b10 PublicDashboards: Fix hidden queries execution (#57004) (#57194)
PublicDashboards: Fix hidden queries execution
2022-10-18 10:57:58 -04:00
Grot (@grafanabot)andEric Leijonmarck 38458c40d2 Quota(fix): remove service accounts from quota count (#56700) (#57167)
(cherry picked from commit fa45742abc)

Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com>
2022-10-18 13:00:06 +01:00
Grot (@grafanabot)andMatthew Jacobson 56fa39ede0 Alerting: Improve notification policies created during migration (#52071) (#57139)
* Alerting: Improve notification policies created during migration

Previously, migrated legacy alerts were connected to notification policies through
a `rule_uid` label in a 1:1 fashion. While this correctly mimicked pre-migration routing,
it didn't create a notification policy structure that is easy to view/modify. In addition,
having one policy per migrated alert is, in some ways, counter to the recommended approach of
Unified Alerting.

This change replaces `rule_uid`-based migrated notification policies with a private
label called `__contacts__`. This label stores a list of double quoted strings containing the names of
all contact points an AlertRule should route to (based on legacy notification channels). Finally,
one notification policy is created per contact point with each matching AlertRules via regex on this
`__contacts__` label.

The result is a simpler, clearer, and easier to modify notification policy structure, with the
added benefit that you can see which contact points an AlertRule is being routed to from the
AlertRule creation page.

(cherry picked from commit 0db339d82f)

Co-authored-by: Matthew Jacobson <matthew.jacobson@grafana.com>
2022-10-18 01:05:47 -04:00
Grot (@grafanabot)andSantiago 8ba2187115 Fix duplicated receivers in API response (#56829) (#57027)
(cherry picked from commit 3c56fd8da0)

Co-authored-by: Santiago <santiagohernandez.1997@gmail.com>
2022-10-17 15:19:28 +02:00
Grot (@grafanabot)andKarl Persson 27f57b144d RBAC: Make uid for managed role names deterministic during migrations (#56620) (#57073)
* RBAC: Change the generate uid function to be deterministic so we can avoid collision

* RBAC: Use fmt.Errorf

* RBAC: Add comment

* RBAC: Export GenerateManagedRoleUID

(cherry picked from commit 21792fdf37)

Co-authored-by: Karl Persson <kalle.persson@grafana.com>
2022-10-17 06:27:33 -04:00
Santiago ba9293b09d Alerting: Expose info about notification delivery errors in a new /receivers endpoint (#55429) (#56899)
* (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>
(cherry picked from commit 09f8e026a1)
2022-10-14 12:22:33 -03:00
Grot (@grafanabot)andGeorge Robinson 96ae3b7e45 Alerting: Remove blank comment (#56889) (#56984)
(cherry picked from commit 2f85172718)

Co-authored-by: George Robinson <george.robinson@grafana.com>
2022-10-14 08:41:57 -04:00
Grot (@grafanabot)andJoe Blubaugh 17e197634e Alerting: Fix email image embedding on Windows. (#56766) (#56839)
The email notifier was incorrectly handling Windows filepaths. This is
fixed by using the `path/filepath` package.

(cherry picked from commit c7c640d903)

Co-authored-by: Joe Blubaugh <joe.blubaugh@grafana.com>
2022-10-13 11:21:20 +08:00
Grot (@grafanabot)andGabriel MABILLE e20953e4f8 LDAP: log that organization mapping is skipped (#56796) (#56798)
(cherry picked from commit 5fcec05695)

Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
2022-10-12 15:03:10 +02:00
Grot (@grafanabot)andGabriel MABILLE f01526e35b LDAP: Add skip_org_role_sync configuration option (#56679) (#56792)
* LDAP: Add skip_org_role_sync option

* Document the new config option

* Nit on docs

* Update docs/sources/setup-grafana/configure-security/configure-authentication/ldap.md

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>

* Docs suggestions

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
Co-authored-by: Jguer <joao.guerreiro@grafana.com>

* Add test, Fix disabled user when no role

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
Co-authored-by: Jguer <joao.guerreiro@grafana.com>
(cherry picked from commit 10c080dad1)

Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
2022-10-12 13:57:20 +02:00
Grot (@grafanabot)andMatt ffa67c888b Fixes 48972 - Exposes channels.WebhookMessage (#56140) (#56778)
(cherry picked from commit 26bb139470)

Co-authored-by: Matt <cadnce@users.noreply.github.com>
2022-10-12 05:02:57 -04:00
Grot (@grafanabot)andJorge Luis Betancourt d02b7fc0ba Alerting: Fix duration calculation when testing a rule (#56616) (#56705)
When testing a rule within the legacy alerting the `timeMs` field could
sometimes show negative (and/or wrongly calculated) durations. This happens if the alert evaluation crosses a second boundary. This change uses the full timestamp to compute the eval duration.

(cherry picked from commit 95b9fa3346)

Co-authored-by: Jorge Luis Betancourt <jorge-luis.betancourt@trivago.com>
2022-10-12 11:38:33 +08:00
George Robinson 4585d70f22 Alerting: Add doc comments to state struct and normalize fields (#56647) (#56676)
(cherry picked from commit 52965de369)
2022-10-11 15:20:18 +01:00