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
9005 Commits
Author SHA1 Message Date
Isabella Siu 796e2e020c Cloudwatch: Fix deeplink with default region (#60260) (#60273) 
Cloudwatch: fix deeplink with default region
(cherry picked from commit d6bb2a7493)
 2022-12-13 16:54:08 -05:00
Alexa Vandkay delaney d7dcea71ea [v9.2.x] Snapshots: Build snapshot originalUrl on the backend (#60232) (#60256) 
Co-authored-by: kay delaney <kay@grafana.com>
 2022-12-13 17:43:53 +01:00
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
Grot (@grafanabot)andCarl Bergquist 6c73fd2635 [v9.2.x] Plugins: Add username to datasource plugin logging (#59947) 
Plugins: Add username to datasource plugin logging (#59893)

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
Signed-off-by: bergquist <carl.bergquist@gmail.com>
(cherry picked from commit a5ace56be8)

Co-authored-by: Carl Bergquist <carl.bergquist@gmail.com>
 2022-12-07 13:43:35 +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
Serge Zaitsev b221e8cac9 [v9.2.x] Chore: Remote cache key prefix (#59838) (#59877) 
Chore: Remote cache key prefix (#59838)

* attempt to implement a remote cache key prefix

* add a test for the prefix store

* oh, linter

(cherry picked from commit 3978502d83)
 2022-12-06 15:16:36 +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
Grot (@grafanabot)andAndres Martinez Gotor c0e7cb2bc1 [v9.2.x] AzureMonitor: Fix panic from empty response in ARG (#59706) 
AzureMonitor: Fix panic from empty response in ARG (#59691)

AzureMonitor: Avoid panic from empty response in ARG
(cherry picked from commit 231b5b587c)

Co-authored-by: Andres Martinez Gotor <andres.martinez@grafana.com>
 2022-12-02 13:55:51 +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
Grot (@grafanabot)andGabriel MABILLE ac9819bfa5 [v9.2.x] Fix: Allow creating snapshot with no dashboard id (#59465) 
Fix: Allow creating snapshot with no dashboard id (#58669)

(cherry picked from commit d279b6d7b0)

Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
 2022-11-29 10:09:08 +01: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)andAndres Martinez Gotor 9fef15403c [v9.2.x] Azure Monitor: Fix empty/errored responses for Logs variables (#59277) 
Azure Monitor: Fix empty/errored responses for Logs variables (#59240)

(cherry picked from commit 276b54fe9d)

Co-authored-by: Andres Martinez Gotor <andres.martinez@grafana.com>
 2022-11-24 05:42:12 -05:00
Sven GrossmannandYann Vigara e6a7b53703 [9.2.x] Fix #58598 X-ID-Token header missing on Loki Datasource (#58784) (#59196) 
* Fix #58598 X-ID-Token header missing on Loki Datasource (#58784)

* Fix #58598 X-ID-Token header missing on Loki Datasource

* Remove unecessary continue statements

* Add getAuthHeadersForCallResource unit tests

* Fix test and switch statement issues introduced during merge

(cherry picked from commit f1ef63791a)

* update test

* missed linting

Co-authored-by: Yann Vigara <yvigara@users.noreply.github.com>
 2022-11-23 12:52:35 +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
Grot (@grafanabot)andJo 17efc62c04 [v9.2.x] Chore: Extract server lock error so it can be used with errors.As (#58905) 
Chore: Extract server lock error so it can be used with errors.As (#58899)

chore: extract server lock Error so it can be used with error.As
(cherry picked from commit 7e9d94cfda)

Co-authored-by: Jo <joao.guerreiro@grafana.com>
 2022-11-17 15:30:05 +01:00
Grot (@grafanabot)andKyle Brandt ae1fccc1df [v9.2.x] SSE: Keep value name from numeric table (#58850) 
SSE: Keep value name from numeric table (#58831)

fixes #48868

(cherry picked from commit 1953d473c0)

Co-authored-by: Kyle Brandt <kyle@grafana.com>
 2022-11-16 10:52:49 -05:00
Grot (@grafanabot)andkay delaney a8ceec0ed9 [v9.2.x] Snapshots: Allow user with viewer permissions to delete own snapshots (#58715) 
Snapshots: Allow user with viewer permissions to delete own snapshots (#58572)

(cherry picked from commit 59d2cf2ff7)

Co-authored-by: kay delaney <45561153+kaydelaney@users.noreply.github.com>
 2022-11-14 14:25:41 -05: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
Karl Persson 0f0211f400 [v9.2.x] Omit error from http response (#58445) 2022-11-14 09:42:45 +01:00
ismail simsek 1e97806819 Prometheus: Handle errors and warnings in buffered client (#58657) 
Prometheus: Handle errors in buffered client (#58504)

* Handle prometheus errors in buffered client

* Handle prometheus warnings

* Fix tests

* Add unit test for warnings

(cherry picked from commit 8edeb1aa22)
 2022-11-11 16:30:55 +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
Grot (@grafanabot)andGiuseppe Guerra 4e687bf869 Plugins: CallResource: Use canonical MIME headers when writing response (#58506) (#58567) 
* Plugins: CallResource: use canonical MIME headers when writing response

* Plugins: add tests for canonical mime headers and Set-Cookie filter

* Removed extra new line

(cherry picked from commit 33f02839f0)

Co-authored-by: Giuseppe Guerra <giuseppe.guerra@grafana.com>
 2022-11-10 13:38:46 +01: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
Grot (@grafanabot)andGareth Dawson 725618e1d1 Elasticsearch: fix typo (#58519) (#58523) 
(cherry picked from commit fa5a304de8)

Co-authored-by: Gareth Dawson <gareth.dawson@grafana.com>
 2022-11-09 15:39:31 +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)andEmil Tullstedt 4d00a510d1 pkg/web: avoid shared middleware slice (#58458) (#58463) 
(cherry picked from commit 75701695d8)

Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>
 2022-11-08 11:13:05 -05:00
Grot (@grafanabot)andDan Cech 68882a861a properly format new .drone.yml in verify-drone (#58436) (#58452) 
(cherry picked from commit d593aede3d)

Co-authored-by: Dan Cech <dcech@grafana.com>
 2022-11-08 10:41:52 -05:00
Grot (@grafanabot)andJulien Duchesne 1049636ef6 Grafana Enterprise Packaging: Set to conflict with grafana, not replace (#58189) (#58418) 
* Grafana Enterprise Packaging: Set to conflict with `grafana`, not replace
When `grafana` and `grafana-enterprise` are in the same RPM repository, grafana-enterprise takes precedence over Grafana
This is not what we want. Users should be able to install either OSS or Enterprise

* Set it only one way. It's how it's currently tested

(cherry picked from commit 786c7faff2)

Co-authored-by: Julien Duchesne <julien.duchesne@grafana.com>
 2022-11-08 08:11:54 -05:00
Grot (@grafanabot)andBen Sully b82d26e130 CallResource: don't set Content-Type header if status is 204 (#50780) (#58362) 
Grafana's HTTPServer ensures that the Content-Type header is always set
in the response to a CallResource call, but when the status code is
204 No Content this shouldn't be done; the body should be empty and no
Content-Type header should be set.

We ran into this in the Grafana ML plugin where we were sending an empty
response with status 204, but the frontend client saw that the content
type was JSON and tried to parse it, resulting in an error that made it
to the JS console.

(cherry picked from commit 480277f612)

Co-authored-by: Ben Sully <ben.sully@grafana.com>
 2022-11-08 12:31:45 +01: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
Grot (@grafanabot)andSi Mon 4fee0645a1 Datasource Loki: preserve header X-ID-Token (#57878) (#58346) 
(cherry picked from commit bc280d0749)

Co-authored-by: Si Mon <85333972+siiimooon@users.noreply.github.com>
 2022-11-07 11:11:10 -05: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