4618 Commits (a9873db0f94dea418511ecc953bc3d304ab95e3f)

Author	SHA1	Message	Date
Horst Gutmann	77bb24bc9e	AuthJWT: Fix JWT query param leak (CVE-2023-1387) [9.3.x] (#843) ... * fix JWT query param leak Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com> Co-authored-by: Kalle Persson <kalle.persson@grafana.com> * skip broken test --------- Co-authored-by: jguer <me@jguer.space> Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com> Co-authored-by: Kalle Persson <kalle.persson@grafana.com>	3 years ago
Grot (@grafanabot)	5a35850514	[v9.3.x] Alerting: Update migration to put alerts to the default folder if dashboard folder is missing (#66592) ... * Alerting: Update migration to put alerts to the default folder if dashboard folder is missing (#65577) * extract function * use context logger * put alert to general folder if folder is missing * move folderHelper init * add test * Update pkg/services/sqlstore/migrations/ualert/ualert.go Co-authored-by: Matthew Jacobson <matthew.jacobson@grafana.com> --------- Co-authored-by: Matthew Jacobson <matthew.jacobson@grafana.com> (cherry picked from commit 7b2f44762e) * rename ID to Id and dashboards.Dashboard to models.Dashboard --------- Co-authored-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com>	3 years ago
Dimitris Sotirakis	a807c04177	[v9.3.x] Chore: Upgrade Go to 1.20.1 and Alpine to 3.17 (#63891) (#66455) ... * CI: Split subcommand (#66005) * Update e2e package - Ensure health request is monitored for addDatasource flow - Add custom timeout to configurePanel flow (cherry picked from commit 155fcae4aa) * Make health check optional (cherry picked from commit 91f66d61e1) --------- Co-authored-by: Andreas Christou <andreas.christou@grafana.com>	3 years ago
Horst Gutmann	64f074ca8d	[v9.3.x] CI: Update golangci-lint to 1.51.2 for Go 1.20 compatibility (#65506) ... [v9.3.x] Update golangci-lint to 1.51.2 for Go 1.20 compatibility	3 years ago
Yuri Tseretyan	3a22eba17f	Chore: Update Grafana to use Alertmanager v0.25.1-0.20230308154952-78fedf89728b (#64784)	3 years ago
Yuri Tseretyan	2b00a15709	Alerting: Update scheduler to receive rule updates only from database (#64662) ... Alerting: Update scheduler to get updates only from database (#64635) * stop using the scheduler's Update and Delete methods all communication must be via the database * update scheduler's registry to calculate diff before re-setting the cache * update fetcher to return the diff generated by registry * update processTick to update rule eval routine if the rule was updated and it is not going to be evaluated at this tick. * remove references to the scheduler from api package * remove unused methods in the scheduler (cherry picked from commit 85a954cd81) # Conflicts: # pkg/services/ngalert/api/api_ruler.go # pkg/services/ngalert/ngalert.go # pkg/services/ngalert/ngalert_test.go # pkg/services/ngalert/schedule/schedule.go # pkg/services/ngalert/schedule/schedule_mock.go # pkg/services/ngalert/schedule/schedule_unit_test.go	3 years ago
Armand Grillet	4deceb0aa7	Revert "[v9.3.x] Alerting: Update Prometheus Alertmanager (#64447)" (#64505) ... This reverts commit 42665ac87f.	3 years ago
Armand Grillet	42665ac87f	[v9.3.x] Alerting: Update Prometheus Alertmanager (#64447) ... * Alerting: Update Prometheus Alertmanager * Move to TruncateInRunes * Use updated FromGlobs signature * Avoid indirection around InhibitRule based on 61810 * Work around new API for nflog * One more template FromGlobs api change * One more FromGlobs change in test files. Searched for them all... * Missing line from cherrypicked change * Run maintenance on correct state object --------- Co-authored-by: Alex Weaver <weaver.alex.d@gmail.com>	3 years ago
Grot (@grafanabot)	ac56c21aad	[v9.3.x] Plugins: Fix bug with copying grafanaData (#64453) ... Plugins: Fix bug with copying grafanaData (#64446) (cherry picked from commit 39a4634ae9) Co-authored-by: Stephanie Hingtgen <stephanie.hingtgen@grafana.com>	3 years ago
Grot (@grafanabot)	30a521aade	[v9.3.x] Alerting: Fix incorrect comment in eval.go (#63512) ... Alerting: Fix incorrect comment in eval.go (#63510) This commit fixes an incorrect comment in the Result struct in eval.go that I had written some time ago. The comment now documents the actual behaviour and content of this field. (cherry picked from commit f93a9c794d) Co-authored-by: George Robinson <george.robinson@grafana.com>	3 years ago
George Robinson	e663f6c35e	[v9.3.x] Alerting: Fix a bug taking screenshots with Dashboard UID (#63226) ... Alerting: Fix a bug taking screenshots with Dashboard UID (#63220) This commit fixes a bug where Grafana would fail to take a screenshot if the same Dashboard UID was present across two or more different orgs. (cherry picked from commit 1f984409a2)	3 years ago
Grot (@grafanabot)	b43e6e64e1	[v9.3.x] Annotations: Fix EpochEnd being zero for Alert-generated annotations (#60988) ... Annotations: Fix EpochEnd being zero for Alert-generated annotations (#60931) * Revert linter suggestion * Re-add nolint * Work in terms of pointer rather than copy * Add tests covering validation * Add comment (cherry picked from commit 1381fb6dfc) Co-authored-by: Alexander Weaver <weaver.alex.d@gmail.com>	3 years ago
Grot (@grafanabot)	10f04e19f0	[v9.3.x] Alerting: Fix template validation in provisioning api (#62824) ... * Alerting: Fix template validation in provisioning api (#62530) * Alerting: Fix template validation in provisioning api Fix issue where provisioning API accepts a malformed template having extra text outside of definition block and template name matching definition name. (cherry picked from commit f9ec16e74f) --------- Co-authored-by: Matthew Jacobson <matthew.jacobson@grafana.com>	3 years ago
Gilles De Mey	a31430a3dd	Alerting: hide "silence" button for external AM setups (#62133) (#62693)	3 years ago
ismail simsek	ead3a002df	[v9.3.x] Expressions: Fixes the issue showing expressions editor (#62627) ... Expressions: Fixes the issue showing expressions editor (#62510) * Use suggested value for uid * update the snapshot * use __expr__ * replace all -100 with __expr__ * update snapshot * more changes * revert redundant change * Use expr.DatasourceUID where it's possible * generate files (cherry picked from commit 91221bc436)	3 years ago
George Robinson	1c6fcb8ed4	Alerting: Validate that tags are 100 characters or less (#62335) (#62594) ... Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com> (cherry picked from commit 0dacb11a12)	3 years ago
Grot (@grafanabot)	aaa2a821ae	[v9.3.x] Plugins: Fix circular reference in customOptions leading to MarshalJSON errors (#62564) ... Plugins: Fix circular reference in customOptions leading to MarshalJSON errors (#62328) * Plugins: test ds.JsonData.MarshalJSON() * CustomOptions: copy to avoid cyclic marshal (cherry picked from commit c41f97029e) Co-authored-by: Yasir Ekinci <ekinci.yasir@gmail.com>	3 years ago
Emil Tullstedt	267d53a56a	[v9.3.x] Login: Fix panic when UpsertUser is called without ReqContext (#62571) ... * Login: Fix panic when UpsertUser is called without ReqContext (#62539) (cherry picked from commit b1151dd118) * login->models	3 years ago
Grot (@grafanabot)	7ee08a5c50	[v9.3.x] Auth: Fix catch both both ErrInvalidAPIKey for context with APIKey (#62206) ... Auth: Fix catch both both ErrInvalidAPIKey for context with APIKey (#62193) * fix: capture both ErrInvalidAPIKey * rename of variable (cherry picked from commit c5cb5be3cc) Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com>	3 years ago
Grot (@grafanabot)	6991330eda	[v9.3.x] Encryption: Cache new DEKs (only) after a caution period (#62177) ... Encryption: Cache new DEKs (only) after a caution period (#60664) * Encryption: Cache new DEKs (only) after commit * Fix typo * Update secrets manager tests with new failing case * Update secrets manager tests with new clarifications (comments) * Correct broken method calls * Unify methods * Cache data keys only after a caution period * Caution period for data keys caching only for encrypt ops (cherry picked from commit c4e067d49d) Co-authored-by: Joan López de la Franca Beltran <5459617+joanlopez@users.noreply.github.com>	3 years ago
Grot (@grafanabot)	47f924d915	[v9.3.x] Datasources: Fix Proxy by UID Failing for UIDs with a Hyphen (#62011) ... Datasources: Fix Proxy by UID Failing for UIDs with a Hyphen (#61723) Fix Proxy by UID Failing for UIDs with a Hyphen Hyphens are allowed in short IDs but not picked up by the proxyPathRegexp. This caused the end of the uid to be proxied as part of the path to the backing datasource which would usually cause a 404. (cherry picked from commit f85d072c17) Co-authored-by: Chris Marchbanks <csmarchbanks@gmail.com>	3 years ago
Grot (@grafanabot)	f485d0a1df	[v9.3.x] Plugins: enable the plugin sdk to get the json data for all datasources (#61792) ... Plugins: enable the plugin sdk to get the json data for all datasources (#61729) (cherry picked from commit 3b718a3e8f) Co-authored-by: Stephanie Hingtgen <stephanie.hingtgen@grafana.com>	3 years ago
Grot (@grafanabot)	bed1e36dcc	[v9.3.x] Auth: Fix disable/remove duplicate user entries metrics for performance reasons (#61692) ... Auth: Fix disable/remove duplicate user entries metrics for performance reasons (#61675) * fix: remove metrics from duplicate user entries * fix: disable metrics collection for authinfo * fix: initifine goroutine loop that happened * removed: metrics (cherry picked from commit bedd2304d1) Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com>	3 years ago
Yuri Tseretyan	ad705086cf	Alerting: Fix webhook to use correct key for decrypting token (#61717)	3 years ago
Selene	fe6088e60e	[v9.3.x] Dashboards: Add org_id in dashboards query (#61599) ... Manual backport	3 years ago
Grot (@grafanabot)	b7e4a27e96	[v9.3.x] Auth: Fix correct error for updateapikey in context handler (#61565) ... Auth: Fix correct error for updateapikey in context handler (#61544) * fix: correct error for updateapikey * refactor: send the correct err forward * update: based on review (cherry picked from commit 07bbc0716c) Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com>	3 years ago
Alexander Weaver	46f377635e	Alerting: Set error annotation on EvaluationError regardless of underlying error type (#61508) ... * Alerting: Set error annotation on EvaluationError regardless of underlying error type (#61506) Set error annotation regardless of underlying error type (cherry picked from commit b289b8ac6e) * Also cherrypick the nilcheck that got added prior to 9.4	3 years ago
Grot (@grafanabot)	225534841f	[v9.3.x] Alerting: Fix evaluation timeout (#61307) ... Alerting: Fix evaluation timeout (#61303) (cherry picked from commit b4e1e1871f) Co-authored-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com>	3 years ago
Grot (@grafanabot)	007110c599	[v9.3.x] Traces: Fix timestamp for database query traces (#61162) ... Traces: Fix timestamp for database query traces (#61109) (cherry picked from commit e7b17cde47) Co-authored-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com>	3 years ago
Grot (@grafanabot)	e12c571abf	[v9.3.x] Alerting: Fix conversion of alert state from db state during manager warmup (#60976) ... Alerting: Fix conversion of alert state from db state during manager warmup (#60933) (cherry picked from commit 4d989860fb) Co-authored-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com>	3 years ago
Stephanie Hingtgen	a4b7019ff0	[v9.3.x] Plugins: add option to proxy ds connections through a secure socks proxy (#59254) (#60643) ... Plugins: add option to proxy ds connections through a secure socks proxy (#59254) * Plugins: add feature to proxy data source connections (cherry picked from commit 6805c951e9)	3 years ago
Grot (@grafanabot)	8aa9921c9f	[v9.3.x] Alerting: Fix missing dashboard/panelID links in annotations (#60927) ... Alerting: Fix missing dashboard/panelID links in annotations (#60926) Assign thru ref (cherry picked from commit b88b8bc291) Co-authored-by: Alexander Weaver <weaver.alex.d@gmail.com>	3 years ago
Grot (@grafanabot)	9f639403e6	[v9.3.x] Alerting: Prevent uid collision in migration when db is case-insensitive (#60835) ... Alerting: Prevent uid collision in migration when db is case-insensitive (#60494) * Alerting: Prevent short uid collision in legacy migration when db is case-insensitive Two factors come into play that cause sporadic uid conflicts during legacy alert migration: - MySQL and MySQL-compatible backends use case-insensitive collation. - Our short uid generator is not a uniform RNG and generates uids in such a way that generations in quick succession have a higher probability of creating similar uids. Normally we would be guaranteed unique short uid generation, however if the source alphabet contains duplicate characters (for example, if we use case-insensitive comparison) this guarantee is void. Generating even ~1000 uids in quick succession is nearly guaranteed to create a case-insensitive duplicate. (cherry picked from commit 570b62091c) Co-authored-by: Matthew Jacobson <matthew.jacobson@grafana.com>	3 years ago
Grot (@grafanabot)	2e4c921868	[v9.3.x] RBAC: Fix DeleteUserPermissions not being called on Upsert org sync (#60534) ... RBAC: Fix DeleteUserPermissions not being called on Upsert org sync (#60531) * fix DeleteUserPermissions not being called on RemoveOrgUser * do not error out of auth flow * fix test missing service (cherry picked from commit 77786f236a) Co-authored-by: Jo <joao.guerreiro@grafana.com>	3 years ago
Grot (@grafanabot)	2d876e90b9	[v9.3.x] Alerting: Set Dashboard and Panel IDs on rule group replacement (#60444) ... Alerting: Set Dashboard and Panel IDs on rule group replacement (#60374) * Set Dashboard and Panel IDs on rule group replacement * fix comments and abbreviate test variable name * Update pkg/services/ngalert/provisioning/alert_rules.go Co-authored-by: Jean-Philippe Quéméner <JohnnyQQQQ@users.noreply.github.com> Co-authored-by: Jean-Philippe Quéméner <JohnnyQQQQ@users.noreply.github.com> (cherry picked from commit 174c61b949) Co-authored-by: Alex Moreno <alexander.moreno@grafana.com>	3 years ago
Grot (@grafanabot)	7ba0b172ce	[v9.3.x] Navigation: Fix some missing pages in admin section (#60174) ... Navigation: Fix some missing pages in admin section (#60143) * add stats and licensing under admin -> general when topnav is enabled * add ldap to users and access * use ID instead of Id * add enterprise licensing node (cherry picked from commit 39a4ba4396) Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>	3 years ago
Grot (@grafanabot)	d74552e02f	[v9.3.x] Navigation: Prevent app crash when importing a dashboard with a uid of `home` (#60092) ... Navigation: Prevent app crash when importing a dashboard with a uid of `home` (#59874) * change home id to be more unique, refactor so that home circular reference is never created * prefix starred dashboards * update reducer (cherry picked from commit a589929c92) Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>	3 years ago
Grot (@grafanabot)	8410c327a4	[v9.3.x] Login: Fix failure to login a new user via an external provider if quota are enabled (#60086) ... Login: Fix failure to login a new user via an external provider if quota are enabled (#60015) * Login: Fix failure to login a new user via an external provider if quota are enabled (cherry picked from commit 341d7b01ee) Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>	3 years ago
Grot (@grafanabot)	74a22daa49	[v9.3.x] Alerting: Use the QuotaTargetSrv instead of the QuotaTarget in quota check (#60034) ... Alerting: Use the QuotaTargetSrv instead of the QuotaTarget in quota check (#60026) Before this change, the alerting provisioning system incorrectly used the QuotaTarget to check if alerting's request quota had been reached. The quota service requires the QuotaTargetSrv, which is what's registered with the service at startup time. This is leading to errors in the provisioning system. (cherry picked from commit e6743a7e9a) Co-authored-by: Joe Blubaugh <joe.blubaugh@grafana.com>	3 years ago
Grot (@grafanabot)	0f6c4d1756	[v9.3.x] ServiceAccounts: Do not display warnings about secret scanner when scanner is disabled (#59955) ... ServiceAccounts: Do not display warnings about secret scanner when scanner is disabled (#59952) ServiceAccounts: Fix warnings about secret scanner when scanner is disabled (cherry picked from commit d833031726) Co-authored-by: Jo <joao.guerreiro@grafana.com>	3 years ago
Carl Bergquist	4f68c4ee8b	[9.3.x] Backport Contexthandler: Add uname as response header #59930 (#59951) ... Contexthandler: Add uname as response header (#59930) Signed-off-by: bergquist <carl.bergquist@gmail.com> (cherry picked from commit 1b676d0d49)	3 years ago
Gabriel MABILLE	3adad3c21a	Users: Use Remote Cache for storing signed in users [v9.3.x] (#59883) (#59934) ... * FeatureToggle: for storing signed in user object in a Remote Cache (#59883) Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com>	3 years ago
Jo	a32d25bbe3	Auth: Session cache [v9.3.x] (#59937) ... 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> * add cache wrapper only cache token if not to rotate anticipate next rotation (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> (cherry picked from commit 2919588a82)	3 years ago
Grot (@grafanabot)	7a7bee20af	[v9.3.x] API: Fix delete user failure due to quota not enabled (#59879) ... API: Fix delete user failure due to quota not enabled (#59875) (cherry picked from commit 4259b6bf58) Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>	3 years ago
Grot (@grafanabot)	04fb50f8cc	[v9.3.x] DataSourcePermissions: Handle licensing properly for ds permissions (#59709) ... 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) Co-authored-by: Karl Persson <kalle.persson@grafana.com>	3 years ago
Jo	43ea988ec2	[v9.3.x] Sessions: Remove invalid session cookie if it's invalid/expired/missing (#59586) ... only remove invalid session cookie if it's invalid/expired/missing	3 years ago
Grot (@grafanabot)	25382580fe	[v9.3.x] RBAC: Handle edge case where there is duplicated acl entries for a role on a single dashboard (#59573) ... RBAC: Handle edge case where there is duplicated acl entries for a role on a single dashboard (#58079) * RBAC: Handle edge case where there is duplicated acl entries for a role on a single dashboard (cherry picked from commit 6aaf36776b) Co-authored-by: Karl Persson <kalle.persson@grafana.com>	3 years ago
Grot (@grafanabot)	7feaf4b32c	[v9.3.x] Datasources: Use context logger in cache service (#59558) ... Datasources: Use context logger in cache service (#59547) (cherry picked from commit 0fca3cf9dd) Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>	3 years ago
Grot (@grafanabot)	c45b49cb92	[v9.3.x] Alerting: Fix swallowing of errors when attaching images to notifications (#59513) ... Alerting: Fix swallowing of errors when attaching images to notifications (#59432) * Break out image logic and add logging * Attach alert log context to image attachment * Fix capitalization (cherry picked from commit 1481ace528) Co-authored-by: Alexander Weaver <weaver.alex.d@gmail.com>	3 years ago
Grot (@grafanabot)	3dac951598	[v9.3.x] Chore: Delete accidentally committed test database (#59463) ... Chore: Delete accidentally committed test database (#59238) (cherry picked from commit 933879a347) Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>	3 years ago