public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,255 Commits 655 Branches 650 Tags
v9.2.8
Commit Graph
4316 Commits
Author SHA1 Message Date
Ieva 1b29543b64 Auth: Logger for user remote cache (#59961) 
add logger
 2022-12-07 09:58:57 -05:00
Carl Bergquist 95d2adf251 [9.2.x] Backport Contexthandler: Add uname as response header #59930 (#59950) 
* Contexthandler: Add uname as response header (#59930)

Signed-off-by: bergquist <carl.bergquist@gmail.com>
(cherry picked from commit 1b676d0d49)

* fixes tests broken due to moved featuremgt package

Signed-off-by: bergquist <carl.bergquist@gmail.com>

Signed-off-by: bergquist <carl.bergquist@gmail.com>
 2022-12-07 15:27:34 +01:00
JoievaVasiljevaKalle PerssonGabriel MABILLEgamab
 		2919588a82 Auth: Session cache [v9.2.x] (#59907) 
* add cache wrapper

only cache token if not to rotate

Co-authored-by: Kalle Persson <kalle.persson@grafana.com>

anticipate next rotation

Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com>
Co-authored-by: Kalle Persson <kalle.persson@grafana.com>
Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
(cherry picked from commit 07a4b2343d59cb593ad128355e1d9217ba493700)

* FeatureToggle: for storing sessions in a Remote Cache

Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com>
(cherry picked from commit b8a8c15148)

* use feature flag for session cache

* ensure ttl is minimum 1 second

Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com>
Co-authored-by: Kalle Persson <kalle.persson@grafana.com>
Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>

* ensure 2 ttl window to prevent caching of tokens near rotation

Co-authored-by: Kalle Persson <kalle.persson@grafana.com>

* fix description of toggle

Co-authored-by: gamab <gabi.mabs@gmail.com>
Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com>
Co-authored-by: Kalle Persson <kalle.persson@grafana.com>
Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
 2022-12-07 10:04:05 +01:00
Gabriel MABILLEandievaVasiljeva 91b15eed1a FeatureToggle: for storing signed in user object in a Remote Cache (#59883) 
* FeatureToggle: for storing sessions in a Remote Cache

Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com>

* Fix conflicting modifications :D

Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com>

* rename the flag to userRemoteCache

* undo unintended change

* Users: Add option to use remote cache for SignedInUsers (#59892)

* Add remote cache to GetSignedInUserWithCacheCtx

Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com>

* Populate SignedInUser remote cache

Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com>

* Line

* minor fixes to make this work

Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com>

* Fix tests

* change flag to updated name

Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com>

Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com>
 2022-12-07 08:58:15 +01:00
Serge Zaitsev 3c86bf550e [v9.2.x] Chore: Add encryption codec to the remote cache (#59871) (#59896) 
* add encryption codec to the remote cache

* change config files too

* fix test constructor

* pass codec into the test cache

(cherry picked from commit f1fb202284)
 2022-12-06 17:09:24 +01:00
Carl Bergquist 8c15be99f5 [9.2.x] Instrumentation: Log plugin and datasource info for each plugin request. (#59882) 
Signed-off-by: bergquist <carl.bergquist@gmail.com>
 2022-12-06 16:11:09 +01:00
Gabriel MABILLE efc69a08fa FIX: Remove service accounts from quota count (#59878) 2022-12-06 14:09:25 +01:00
Karl Persson 3148a918ce [v9.2.x] DataSourcePermissions: Handle licensing properly for ds permissions (#59711) 
DataSourcePermissions: Handle licensing properly for ds permissions (#59694)

* RBAC: add viewer grand if dspermissions enforcement is not enabled

* RBAC: Change permissions based on role prefix

* RBAC: Add option to for permission service to add a license middleware

* RBAC: Remove actions from query struct

(cherry picked from commit 6d1bcd9f40)
 2022-12-02 14:07:20 +01:00
Jo 516407dad2 [v9.2.x] Sessions: Remove invalid session cookie if it's invalid/expired/missing (#59588) 
only remove invalid session cookie if it's invalid/expired/missing

(cherry picked from commit 270a893e12)
 2022-11-30 16:50:49 +01:00
Grot (@grafanabot)andWill Browne 903ff4ef5e [v9.2.x] Datasources: Use context logger in cache service (#59557) 
Datasources: Use context logger in cache service (#59547)

(cherry picked from commit 0fca3cf9dd)

Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
 2022-11-30 08:42:21 -05:00
Marcus EfraimssonandKyle Brandt 9b7ad3d663 [v9.2.x] SSE: Make sure to forward headers, user and cookies/OAuth token (#58897) (#59430) 
SSE: Make sure to forward headers, user and cookies/OAuth token (#58897)

Fixes #58793 and Fixes https://github.com/grafana/azure-data-explorer-datasource/issues/513

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
(cherry picked from commit 5623b5afaf)

Co-authored-by: Kyle Brandt <kyle@grafana.com>
 2022-11-28 19:06:59 +01:00
Grot (@grafanabot)andLeo 052fd5713d [v9.2.x] Navigation: Fix crash when Help is disabled (#59375) 
Navigation: Set navtree to  an empty array instead of null (#58919)

set navtree to  an empty array instead of null

(cherry picked from commit 4aa5dea96b)

Co-authored-by: Leo <108552997+lpskdl@users.noreply.github.com>
 2022-11-28 06:54:07 -05:00
Ieva 6b64e4d192 Access Control: Clear user's permission cache after resource creation (#59318) 
resolve merge conflicts
 2022-11-24 18:10:56 +01:00
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