Commit Graph

12987 Commits

Author SHA1 Message Date
Todd Treece
4a4a5f037f [release-11.0.11] Metrics: Use correct gatherer in graphite bridge (#100680)
Metrics: Use correct gatherer in graphite bridge (#100624)

(cherry picked from commit 5a74a1a0f6)
2025-02-13 23:42:30 +02:00
Jev Forsberg
d5a97f1fa4 Release: 11.0.10 (#99694)
* apply security patch: v11.0.x/310-202501232104.patch

commit 546935e4dcab6c415d4302f4f8548c3d93b1df22
Author: Matt Jacobson <matthew.jacobson@grafana.com>
Date:   Thu Jan 23 15:56:40 2025 -0500

    CVE-2024-11741 - victorops url

* baldm0mma/ update version and add changelog content

* baldm0mma/update deps

* baldm0mma/update deps

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2025-01-28 11:42:52 -07:00
grafana-delivery-bot[bot]
62743dc0db [v11.0.x] Azure: Correctly set application insights resource values (#99594)
* Azure: Correctly set application insights resource values (#99214)

Correctly set resource values

(cherry picked from commit 30ee8b9813)

* Fix test

---------

Co-authored-by: Andreas Christou <andreas.christou@grafana.com>
2025-01-27 21:12:20 +02:00
grafana-delivery-bot[bot]
f9bb741280 [v11.0.x] MSSQL: Correctly type UDPConnectionLimit (#99579)
MSSQL: Correctly type `UDPConnectionLimit` (#99011)

* Correctly type UDPConnectionLimit

* Update tests

* Handle legacy case

(cherry picked from commit cc09f38421)

Co-authored-by: Andreas Christou <andreas.christou@grafana.com>
2025-01-27 18:12:27 +02:00
grafana-delivery-bot[bot]
4a6c9aed08 [v11.0.x] ContactPoints: Remove blank lines prefixes in contact point types (#98762)
ContactPoints: Remove blank lines prefixes in contact point types (#98590)

Remove blank lines prefixes in contact point types

(cherry picked from commit 7cad430ca7)

Co-authored-by: Selene <selenepinillos@gmail.com>
2025-01-10 11:36:37 +01:00
Mariell Hoversholm
9042def18e Backport 0a390cc069 from #97823 (#97854)
* Backport 0a390cc069 from #97823

* fix: don't upgrade go
2024-12-12 16:31:11 +01:00
grafana-delivery-bot[bot]
eb0cf29686 [v11.0.x] Azure/GCM: Improve error display (#97592)
Azure/GCM: Improve error display (#96921)

Improve handling of errors

(cherry picked from commit 9f75a448d4)

Co-authored-by: Andreas Christou <andreas.christou@grafana.com>
2024-12-07 12:11:16 +02:00
grafana-delivery-bot[bot]
64073dd683 [v11.0.x] Alerting: Fix incorrect 500 code on missing alert rule dashboardUID / panelID (#96776)
Alerting: Fix incorrect 500 code on missing alert rule dashboardUID / panelID (#96491)

(cherry picked from commit 64c93217ff)

Co-authored-by: Matthew Jacobson <matthew.jacobson@grafana.com>
2024-12-02 09:16:02 -05:00
Fayzal Ghantiwala
a41db29261 [v11.0.x] Alerting: Make context deadline on AlertNG service startup configurable (#96131)
* Alerting: Make context deadline on AlertNG service startup configurable (#96053)

* Make alerting context deadline configurable

* Remove debug logs

* Change default timeout

* Update tests

(cherry picked from commit 1fdc48faba)

* Update test

* No cyclo lint
2024-11-08 16:46:36 +00:00
Erik Sundell
1f0aa2a1af NPM releases: Stop publishing the e2e package (#95350)
remove e2e from list of packages
2024-11-06 13:38:50 +01:00
grafana-delivery-bot[bot]
aba1c37d27 [v11.0.x] ServerLock: Fix pg concurrency/locking issue (#95932)
ServerLock: Fix pg concurrency/locking issue (#95916)

Fix pg unique constraint validation in serverlock

(cherry picked from commit ab974ddf14)

Co-authored-by: Misi <mgyongyosi@users.noreply.github.com>
2024-11-06 11:07:55 +02:00
grafana-delivery-bot[bot]
b2ba2ea616 [v11.0.x] User: Check SignedInUser OrgID in RevokeInvite (#95487)
User: Check SignedInUser OrgID in RevokeInvite (#95476)

Check SignedInUser OrgID in RevokeInvite

(cherry picked from commit fedcf47702)

Co-authored-by: Misi <mgyongyosi@users.noreply.github.com>
2024-10-28 14:41:11 +02:00
grafana-delivery-bot[bot]
f4eb00952d [v11.0.x] Prometheus: Fix passing query timeout to upstream queries (#95261)
Prometheus: Fix passing query timeout to upstream queries (#95104)

* remove queryTimeout from constructor

* use queryTimeout for range and instant queries

* remove comment

* remove default query timeout

* fix linting

(cherry picked from commit 78a00d09cd)

Co-authored-by: ismail simsek <ismailsimsek09@gmail.com>
2024-10-23 16:49:23 +02:00
grafana-delivery-bot[bot]
829e425b4d [v11.0.x] Fix: Deduplicate OrgID in SA logins (#94400)
* Fix: Deduplicate OrgID in SA logins (#94378)

* Fix: Deduplicate OrgID in SA logins

(cherry picked from commit b90e09e966)

* Fix: Actually call the DedupOrgInLogin migration (#94520)

* Fix: Account for conflicting logins in dedupOrgInlogin migration (#94669)

---------

Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
2024-10-23 15:47:42 +02:00
grafana-delivery-bot[bot]
10e0b16e42 [v11.0.x] Azure: Fix duplicated traces in multi-resource trace query (#95244)
Azure: Fix duplicated traces in multi-resource trace query (#95156)

Use first resource as base resource for query

(cherry picked from commit 8bb7475e4f)

Co-authored-by: Andreas Christou <andreas.christou@grafana.com>
2024-10-23 14:49:01 +03:00
grafana-delivery-bot[bot]
41152036d5 [v11.0.x] Migration: Remove table aliasing in delete statement to make it work for mariadb (#95229)
Migration: Remove table aliasing in delete statement to make it work for mariadb (#95226)

Migration: remove table aliasing in delete statement to make it work in mariadb
(cherry picked from commit 6f7528f896)

Co-authored-by: Karl Persson <kalle.persson@grafana.com>
2024-10-23 11:21:46 +02:00
lean.dev
7c7a4401b3 [v11.0.x] Anonymous User: Adds validator service for anonymous users (#95151)
* Anonymous User: Adds validator service for anonymous users (#94700)

(cherry picked from commit 3438196010)
2024-10-22 14:29:19 -03:00
Sam Jewell
ceff188b35 [v11.0.x] ServerSideExpressions: Disable SQL Expressions to prevent RCE and LFI vulnerability (#94971)
ServerSideExpressions: Disable SQL Expressions to prevent RCE and LFI vulnerability (#94942)

* disable sql expressions

remove duckdb ref

* Run `make update-workspace`

---------

Co-authored-by: Scott Lepper <scott.lepper@gmail.com>
(cherry picked from commit ea71201ddc)
2024-10-18 09:48:48 -04:00
Diego Augusto Molina
10ea008462 [v11.0.x] CI: Additional changes for +security versions (#94927)
CI: Additional changes for +security versions (#94854)

* Build: Fix docker manifest create not using correct IMAGE_TAG

* Support publishing security versions of NPM packages

---------

Co-authored-by: Andreas Christou <andreas.christou@grafana.com>
Co-authored-by: Kevin Minehart <kmineh0151@gmail.com>
Co-authored-by: Diego Augusto Molina <diegoaugustomolina@gmail.com>
(cherry picked from commit 8f7352e862)

Co-authored-by: Josh Hunt <joshhunt@users.noreply.github.com>
2024-10-17 17:20:20 -03:00
Kevin Minehart
b9574d6698 [v11.0.x] CI: Support more version formats in publishing (#94747)
CI: Support more version formats in publishing (#94575)

* cleanup dead code
* add tests and rewrite publish grafanacom steps to reuse
* add pkg/build tests; don't upload CDN assets on grafana releases

(cherry picked from commit 7a2edd35d5)
2024-10-15 13:24:16 -05:00
Diego Augusto Molina
c03cd22431 [v11.0.x] Dashboard: Make dashboard search faster (#94702)
* Dashboard: Make dashboard search faster (#88019)

(cherry picked from commit 28992f0488)

* fix cherry-pick leftover

---------

Co-authored-by: knuzhdin <32521427+knuzhdin@users.noreply.github.com>
2024-10-15 10:07:56 -03:00
grafana-delivery-bot[bot]
ecda40e78a [v11.0.x] GCM: Time field naming (#94604)
GCM: Time field naming (#94548)

* Name time field correctly

* Update tests

* Lint

(cherry picked from commit 7c79f8f7a5)

Co-authored-by: Andreas Christou <andreas.christou@grafana.com>
2024-10-11 13:51:21 +03:00
Misi
f88f9199a5 [v11.0.x] OrgSync: Do not set default Organization for a user to a non-existent Organization (#94552)
OrgSync: Do not set default Organization for a user to a non-existent Organization (#94537)

Do not set default org for a user to a missing org

Co-authored-by: Karl Persson <kalle.persson@grafana.com>
(cherry picked from commit c872cad879)
2024-10-10 17:30:33 +03:00
grafana-delivery-bot[bot]
0de3ec2903 [v11.0.x] Fix: Ensure SA migrations doesn't hit migrated SAs if rerun (#94397)
Fix: Ensure SA migrations doesn't hit migrated SAs if rerun (#94347)

* ensure mig doesn't hit migrated SAs if rerun

* Fix small issue with the test

---------

Co-authored-by: gamab <gabriel.mabille@grafana.com>
(cherry picked from commit 945dd052b1)

Co-authored-by: Jo <joao.guerreiro@grafana.com>
2024-10-10 11:35:34 +02:00
Andreas Christou
db354f2d71 [v11.0.x] AzureMonitor: Fix App Insights portal URL for multi-resource trace queries (#94489)
AzureMonitor: Fix App Insights portal URL for multi-resource trace queries (#94119)

* Retrieve the resource in the query

* Appropriately construct url

* Update tests

(cherry picked from commit 97a90591ca)

# Conflicts:
#	pkg/tsdb/azuremonitor/loganalytics/traces.go
#	pkg/tsdb/azuremonitor/loganalytics/traces_test.go
2024-10-09 16:40:38 +01:00
grafana-delivery-bot[bot]
225b47165d [v11.0.x] ServiceAccounts: Run migration in batches (#94434)
ServiceAccounts: Run migration in batches (#94429)

* ServiceAccounts: Run migration in batches

(cherry picked from commit 2d0ea60017)

Co-authored-by: Karl Persson <kalle.persson@grafana.com>
2024-10-08 21:04:51 +02:00
Karl Persson
dbc1b646cb [v11.0.x] ServiceAccounts: Remove permissions to service account when it is deleted (#94370)
ServiceAccounts: Remove permissions to service account when it is deleted (#93877)

* Service account: clean up permissions related to service accounts when deleted

* Add migration for deleting orphaned service account permissions
2024-10-08 14:33:46 +02:00
Alexander Zobnin
84f806b573 [v11.0.x] Annotations: Fix composite store read (#94180)
* Annotations: Fix composite store read (#94158)

* Annotations: Fix composite store read

* Add test

* check error

(cherry picked from commit bd1741653d)

* remove unused file

* re-format
2024-10-03 18:33:13 +03:00
grafana-delivery-bot[bot]
be023a10fd [v11.0.x] Alerting: Fix incorrect permission on POST external rule groups endpoint [CVE-2024-8118] (#93949)
Alerting: Fix incorrect permission on POST external rule groups endpoint [CVE-2024-8118] (#93940)

Fix endpoint permission on rule write endpoint

(cherry picked from commit c2799b4901)

Co-authored-by: Alexander Weaver <weaver.alex.d@gmail.com>
2024-09-27 14:53:20 -05:00
Stephanie Hingtgen
12dd28d04d [v11.0.x]: Live: Add ha_prefix (#93759) (#93926)
---------

Co-authored-by: Todd Treece <360020+toddtreece@users.noreply.github.com>
2024-09-27 14:20:43 -05:00
grafana-delivery-bot[bot]
dade7bfaaf Correlations: Limit access to correlations page to users who can access Explore (#93674)
Correlations: Limit access to correlations page to users who can access Explore (#93519)

Correlations: Limit access to correlations page to users who can access Explore
(cherry picked from commit 813e1c1364)

Co-authored-by: Piotr Jamróz <pm.jamroz@gmail.com>
2024-09-26 09:57:35 +02:00
grafana-delivery-bot[bot]
64161f72c6 [v11.0.x] Annotations: Optimize search by tags (#93609)
Annotations: Optimize search by tags (#93547)

* Annotations: Optimize search on large number of dashboards

* refactor

* fix batch size

* Return early if no annotations found

* revert go.mod

* return nil in case of error

* Move default limit to the API package

* fix empty access control filter

* Set default limit to 100

* optimize query when number of annotations is less than limit

* Update pkg/services/annotations/annotationsimpl/annotations.go

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

* remove limit from store since it's set in API

* set default limit in Find method (do not break tests)

* Only add limit to the query if it's set

* use limit trick for all searches without dashboard filter

* set default page if not provided

---------

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
(cherry picked from commit 5e713673e1)

Co-authored-by: Alexander Zobnin <alexanderzobnin@gmail.com>
2024-09-23 17:57:18 +02:00
grafana-delivery-bot[bot]
56853cf796 [v11.0.x] Plugins: Avoid returning 404 for AutoEnabled apps (#93486)
Plugins: Avoid returning 404 for `AutoEnabled` apps (#93436)

avoid errors for autoenabled apps

(cherry picked from commit 362ffff591)

Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
2024-09-19 16:19:26 +03:00
Dave Henderson
10c7ae6056 [v11.0.x] Chore: Bump Go to 1.22.7 (#93358)
Signed-off-by: Dave Henderson <dave.henderson@grafana.com>
2024-09-18 00:24:34 +03:00
grafana-delivery-bot[bot]
e31ff0175b [v11.0.x] Provisioning: Prevent provisioning folder errors from failing startup (#92588)
Provisioning: Prevent provisioning folder errors from failing startup (#92560)

* Prevent provisioning folder errors from failing startup
* Refactor setting of dashboard provisioner

(cherry picked from commit 34149c86d0)

Co-authored-by: Arati R. <33031346+suntala@users.noreply.github.com>
2024-08-28 15:40:23 +02:00
grafana-delivery-bot[bot]
7b35fccf07 [v11.0.x] CI: Run prettier in bump-version workflow (#92529)
CI: Run prettier in bump-version workflow (#92195)

Run prettier

(cherry picked from commit 931d64b8fc)

Co-authored-by: Andreas Christou <andreas.christou@grafana.com>
2024-08-27 22:39:59 +03:00
grafana-delivery-bot[bot]
503bbbedbc [v11.0.x] OpenTSDB: Fix data frame construction (#91756)
OpenTSDB: Fix data frame construction (#90991)

* Update type and frame construction

* Update tests

* Keep dataField name as value

(cherry picked from commit 06509712ec)

Co-authored-by: Andreas Christou <andreas.christou@grafana.com>
2024-08-09 19:56:29 +03:00
Yuri Tseretyan
7cfd0db231 [v11.0.x] Alerting: Fix persisting result fingerprint that is used by recovery threshold (#91328)
Alerting: Fix persisting result fingerprint that is used by recovery threshold (#91224)

(cherry picked from commit 537f1fb857)

# Conflicts:
#	pkg/services/ngalert/state/persister_sync.go
2024-07-31 11:16:42 -04:00
grafana-delivery-bot[bot]
cb75e88483 [v11.0.x] Snapshots: Fix panic when snapshot_remove_expired is true (#91330)
Snapshots: Fix panic when snapshot_remove_expired is true (#91232)

(cherry picked from commit bb5d2c83ef)

Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
2024-07-31 16:41:53 +03:00
grafana-delivery-bot[bot]
9a9ce0667d [v11.0.x] CI: fix release pr target (#91001)
CI: fix release pr target (#90999)

* use inputs.target as checkout ref, and `main` for all reused actions.

(cherry picked from commit 2fe506d502)

Co-authored-by: Kevin Minehart <5140827+kminehart@users.noreply.github.com>
2024-07-26 00:33:19 +03:00
Andreas Christou
ee76613eae [v11.0.x] Prometheus: Reintroduce Azure audience override feature flag (#90558)
Prometheus: Reintroduce Azure audience override feature flag (#90339)

* Re-add feature flag with deprecation note

* Hide the field in frontend if ff disabled

* Block scope overriding if ff is disabled in backend

- Update promlib to forward logger to extendOptions
- Add warning
- Update tests

* Default toggle to true for now

* Update description

* Update prom tests

* Fix lint

(cherry picked from commit 2616366a0a)

# Conflicts:
#	packages/grafana-data/src/types/featureToggles.gen.ts
#	pkg/services/featuremgmt/registry.go
#	pkg/services/featuremgmt/toggles_gen.csv
#	pkg/services/featuremgmt/toggles_gen.go
#	pkg/services/featuremgmt/toggles_gen.json
#	pkg/tsdb/prometheus/prometheus.go
2024-07-23 11:31:22 +01:00
Kevin Minehart
e5219818a9 don't use slim image 2024-06-25 08:10:43 -05:00
Kevin Minehart
302831c125 [11.0.x] backport CI / release changes (#89636)
* go mod tidy; go work sync

* CI: Add release-pr workflow (#89005)

* Add release-pr workflow

* update CODEOWNERS

* CI: Trigger release pr workflow when a release is completed (#89062)

* CI: Add bump-version action to the release PR workflow (#89491)

* Automation: Verify release artifacts on grafana.com (#89197)

* baldm0mma/verify_release/ create verify_release_for_download function

* baldm0mma/verify_release/ add name, image, env

* baldm0mma/verify_release/ add initial commands

* baldm0mma/verify_release/ add deps?

* baldm0mma/verify_release/ update location

* baldm0mma/verify_release/ add anno to lib-star

* bald0mma/verify_release/ update func name to verify_grafanacom_step

* baldm0mma/verify_release/ add verify shell script

* baldm0mma/verify_release/ add script content, first attempt

* baldm0mma/verify_release/ add node image to verify_grafanacom_step

* baldm0mma/verify_release/ add gcom secret note

* baldm0mma/verify_release/ add sudo to apt-get

* baldm0mma/verify_release/ add anno

* baldm0mma/verify_release/ add anno to secrets

* baldm0mma/verify_release/ update commands to reflect node env image

* baldm0mma/verify_release/ update annos

* baldm0mma/verify_release/ update tag variable

* baldm0mma/verify release/ add whitespace

* baldm0mma/verify_releases/ update with no bash loops

* baldm0mma/verify_release/ update exit logic

* baldm0mma/verify_release/ remove annos

* baldm0mma/verify_releasse/ resign and build yml

* baldm0mma/verify_release/ remove annos

* baldm0mma/verify_release/ update signature

* baldm0mma/verify_release/ download curl

* baldm0mma/verify_release/ remove temp key folder removal

* baldm0mma/verify_release/ account for artifact download time

* baldm0mma/verify_release/ add anno

* baldm0mma/verify_release/ update location

* baldm0mma/verify_release/ update script

* baldm0mma/verify_release/ make drone

* baldm0mma/verify_release/ update script for oss or ent

* baldm0mma/verify_release/ add promotion option

* baldm0mma/verify_release/ make drone

* Update scripts/drone/events/release.star

Co-authored-by: Kevin Minehart <5140827+kminehart@users.noreply.github.com>

* Update scripts/drone/steps/lib.star

Co-authored-by: Kevin Minehart <5140827+kminehart@users.noreply.github.com>

* Update scripts/drone/steps/lib.star

Co-authored-by: Kevin Minehart <5140827+kminehart@users.noreply.github.com>

* baldm0mma/verify_release/ update drone

* Update scripts/drone/events/release.star

Co-authored-by: Kevin Minehart <5140827+kminehart@users.noreply.github.com>

* baldm0mma/verify_release/ update drone

* Update scripts/drone/steps/lib.star

Co-authored-by: Kevin Minehart <5140827+kminehart@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Kevin Minehart <5140827+kminehart@users.noreply.github.com>

* baldm0mma/update drone

* baldm0mma/verify_release/ update path

* baldm0mma/verify_release/ make drone

* baldm0mma/update drone

* Apply suggestions from code review

Co-authored-by: Kevin Minehart <5140827+kminehart@users.noreply.github.com>

* baldm0mma/verify_release/ update for loop to account for failure

* baldm0mma/verify_release/ make drone

* baldm0mma/verify_release/ make format-drone

* baldm0mma/verify_release/ rem unused var

---------

Co-authored-by: Kevin Minehart <5140827+kminehart@users.noreply.github.com>

* use go 1.21.10

* use 1.21.10 in pkg/build

* upgrade to go 1.22.4

* upgrade swagger

* swagger-gen

* gen openapi3.json

* allow grpc.dial

* fix .bingo/README.md formatting

---------

Co-authored-by: Jev Forsberg <46619047+baldm0mma@users.noreply.github.com>
2024-06-24 15:06:58 -05:00
grafana-delivery-bot[bot]
4c6d554121 [v11.0.x] Notifications: Do not log email address in error message (#89501)
Notifications: Do not log email address in error message (#89314)

Do not log email address in error message

(cherry picked from commit c2c30c25ed)

Co-authored-by: William Wernert <william.wernert@grafana.com>
2024-06-20 20:13:26 +03:00
Eric Leijonmarck
47f5d84c7f [v11.0.x] Auth: Removal of conflicting users check upon creation (#89092)
Auth: Removal of conflicting users check upon creation (#89045)

fix: removal of check for conflicting users
(cherry picked from commit c85d10d6c3)
2024-06-12 10:44:17 +02:00
Yuri Tseretyan
4fbe9604ef [v11.0.x] Alerting: Fix rule storage to filter by group names using case-sensitive comparison (#89063)
Alerting: Fix rule storage to filter by group names using case-sensitive comparison (#88992)

* add test for the bug
* remove unused struct
* update db store to post process filters by group using go-lang's case-sensitive string comparison

--------

Co-authored-by: Alexander Weaver <weaver.alex.d@gmail.com>
# Conflicts:
#	pkg/services/ngalert/store/alert_rule.go
#	pkg/services/ngalert/store/alert_rule_test.go
2024-06-11 15:59:45 -04:00
grafana-delivery-bot[bot]
100ea77047 [v11.0.x] RBAC: List only the folders that the user has access to (#89015)
RBAC: List only the folders that the user has access to (#88599)

only check folder permissions when listing folders

(cherry picked from commit 095ca66d9f)

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
2024-06-11 11:20:30 +03:00
grafana-delivery-bot[bot]
a3915b148f [v11.0.x] User: add second migration for lowercasing login/email of users (#88917)
User: add second migration for lowercasing login/email of users (#88915)

(cherry picked from commit 39bd13f877)

Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com>
2024-06-10 10:42:47 +02:00
grafana-delivery-bot[bot]
706577c0b0 [v11.0.x] Chore: Fix test to retry fetching provisioned dashboard until is in place (#88937)
Chore: Fix test to retry fetching provisioned dashboard until is in place (#85408)

Retry fetching provisioned dashboard until is in place

(cherry picked from commit 88be09420c)

Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>
2024-06-07 20:10:46 +03:00
Karl Persson
718994af44 [v11.0.x] User: Fix GetByID (#88894)
User: Fix GetByID (#86282)

* Auth: Remove unused lookup param

* Remove case sensitive lookup for GetByID

(cherry picked from commit 8520892923)
2024-06-07 13:55:45 +02:00