public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,859 Commits 655 Branches 650 Tags
a9012e04444fd7f22b212eaac9683ca04f625d5a
Commit Graph

16008 Commits

Author SHA1 Message Date
Alexander Akhmetov c53915cb87 [release-12.0.2] Alerting: Fix group-level labels and query_offset in the import API (#106392) 
Alerting: Fix group-level labels and query_offset in the import API (#106379)

What is this feature?

Fixes a bug when group-level query_offset and labels parameters are ignored and not saved

Why do we need this feature?

In the import API Prometheus YAML rule definitions are supported:

groups:
  - name: group-1
    interval: 1m
    query_offset: 10m
    labels:
      severity: "warning"
    rules:
      - alert: Alert 0 > 0
        expr: vector(0) > 0

But applying group-level labels and query_offset is broken and they are not saved right now because during the conversion of the API model to PrometheusRuleGroup they aren't saved to the new structure.

(cherry picked from commit f7a52bc04e)
 2025-06-06 12:04:17 +02:00
grafana-delivery-bot[bot] 94ee07eebf [release-12.0.2] SCIM: Change SCIM hook registration (#106255) 
SCIM: Change SCIM hook registration (#106200)

* Add function to skip provisioning hook

* Rework provisioning hook to PostLoginHook

* Revert back to PostAuthHook and remove unused tests

* Fix tests

(cherry picked from commit 374bd5bec7)

Co-authored-by: linoman <2051016+linoman@users.noreply.github.com>
 2025-06-03 12:48:42 +02:00
Alexander Zobnin 6c0b0e8752 [release-12.0.2] RBAC: Dont additionally cache all users permissions (#106147) 
RBAC: Don't additionally cache all users permissions (#105607)

* RBAC: Don't additionally cache all users permissions

* remove unused tests

(cherry picked from commit cfba630f5c)
 2025-05-28 16:44:50 +02:00
Matheus Macabu 2c3f53dd0e [release-12.0.2] Dependencies: Bump github.com/openfga/openfga to v1.8.13 to address CVE-2025-48371 (#106116) 
Dependencies: Bump github.com/openfga/openfga to v1.8.13 to address CVE-2025-48371
 2025-05-28 11:09:15 +02:00
grafana-delivery-bot[bot] 982238b4bd [release-12.0.2] Alerting: Fix $value type when single data source is queried (#106101) 
Alerting: Fix $value type when single data source is queried (#106080)

(cherry picked from commit faeddf334a)

Co-authored-by: Alexander Akhmetov <me@alx.cx>
 2025-05-27 21:32:21 +02:00
grafana-delivery-bot[bot] 577c29d0dc [release-12.0.1] Storage: Take migration_locking setting into account (#105951) 
Storage: Take `migration_locking` setting into account (#105938)

(cherry picked from commit 392c1a71c9)

Co-authored-by: Jean-Philippe Quéméner <JohnnyQQQQ@users.noreply.github.com>
 2025-05-23 15:37:30 +02:00
github-actions[bot] b6dd2b70c6 apply security patch: release-12.0.1/security-patch-202505051005.patch 2025-05-22 14:48:38 +00:00
github-actions[bot] 7b2192ec76 apply security patch: release-12.0.1/404-202504151210.patch 2025-05-22 14:48:38 +00:00
Michael Mandrus 2de93c5022 CloudMigrations: Fix issues with snapshot resource limits (#105425) (#105625) 
* CloudMigrations: Fix issues with snapshot resource limits (#105425)

* fix bulk inserts

* commit progress so cursor doesn't sabotage me

* add more tests

* get everything working

* rename variable

* update comment

* regen mocks, fix k8s list method maybe

* fix bug with duplicate entries

* lint

* Snapshots: Use slices.Chunk for batching inserts

* remove extra linebreak

---------

Co-authored-by: Matheus Macabu <macabu.matheus@gmail.com>

* fix postgres integration tests

---------

Co-authored-by: Matheus Macabu <macabu.matheus@gmail.com>
 2025-05-20 09:02:03 -04:00
Matheus Macabu ce22d40908 [release-12.0.1] Dependencies: Bump packages in modules with incorrect dependencies or outside of workspace (#105457) 
* Dependencies: Bump github.com/getkin/kin-openapi from v0.131.0 to v0.132.0

* Dependencies: Bump github.com/openfga/openfga from v1.8.6 to v1.8.12

* Dependencies: Bump golang.org/x to latest
 2025-05-15 16:49:30 +03:00
Matheus Macabu 908a5c8afb [release-12.0.1] Dependencies: Bump github.com/openfga/openfga from v1.8.6 to v1.8.12 (#105368) 
Dependencies: Bump github.com/openfga/openfga from v1.8.6 to v1.8.12
 2025-05-14 14:16:46 +02:00
linoman bf293c8ab6 Backport 105046 to 12.0.1 (#105337) 2025-05-13 12:29:35 -04:00
linoman 2e6b7bf74a SCIM: Backport 104613 to 12.0.1 (#105332) 
Backport 104613 to 12.0.1
 2025-05-13 17:15:01 +02:00
Matheus Macabu b1a4e09102 [release-12.0.1] Dependencies: Unpin and bump github.com/getkin/kin-openapi from v0.126.0 to v0.132.0 (#105249) 
* Dependencies: Unpin and bump github.com/getkin/kin-openapi from v0.126.0 to v0.132.0

* Chore: Update schemas and remove examples

* Chore: Update schemas and remove examples2
 2025-05-13 12:23:12 +03:00
Matheus Macabu 25f48a36bd [release-12.0.1] Chore: Bump Go version to 1.24.3 (#105101) 
Chore: Bump Go version to 1.24.3
 2025-05-08 15:28:22 +02:00
Artur Wierzbicki f17e42fb40 [release-12.0.1] Live: logging fix (#105076) 
Live: logging fix (#105054)

logg fix

(cherry picked from commit c781b0922e)
 2025-05-07 21:51:20 +03:00
Will Browne 5b795ae2e3 [release-12.0.1] Plugins: Fix issue with propagating ID token downstream for RunStream requests (#105002) 
Plugins: Fix issue with propagating ID token downstream for RunStream requests (#104833)

fix issue

(cherry picked from commit a5649b6e1d)
 2025-05-06 13:33:47 +01:00
Stephanie Hingtgen 3b2165d787 [release-12.0.1] Dashboards: Fix cleanup job (#104824) 2025-05-01 16:51:44 +03:00
Stephanie Hingtgen 6b7bba2b5a [release-12.0.1] Dashboard and Folders: fix version mismatch (#104717) 
Folders: Fix version mismatch errors
 2025-04-30 03:01:45 +03:00
Stephanie Hingtgen 249bf8ac64 [release-12.0.1] Dashboards and Folders: cleanup timestamps and error codes (#104720) 
K8s: Fix timestamps and error codes
 2025-04-29 22:44:44 +03:00
Stephanie Hingtgen 18a9cd3636 [release-12.0.1] Dashboards: Fix moving to general folder (#104719) 
Dashboards: Fix moving to general folder
 2025-04-29 22:14:00 +03:00
Stephanie Hingtgen 7287b4958f [release-12.0.1] Dashboards: add missing folder info to /search (#104718) 
Dashboards: add missing folder info to /search
 2025-04-29 22:08:52 +03:00
Kevin Minehart 8bb4c806fb [release-12.0.1] Backport workflow fixes (#104692) 
* Copy workflows and actions from main

* add zizmor.yml
 2025-04-29 19:12:47 +03:00
Stephanie Hingtgen 4620dc0b4e [release-12.0.1] App Plugins: Fix dashboard updater (#104583) (#104585) 2025-04-26 01:22:28 +02:00
Stephanie Hingtgen 7dfb628cb4 [release-12.0.1] Provisioning: Remove warning logs for valid usage (#104555) (#104558) 
Provisioning: Remove warnings for valid usage (#104555)
 2025-04-25 11:18:17 -05:00
Stephanie Hingtgen 549833e40d [release-12.0.1] K8s: Dashboards: Fix transformation between v1 and v2 (#104502) (#104527) 
K8s: Dashboards: Fix transformation between v1 and v2 (#104502)
 2025-04-25 17:02:35 +01:00
Stephanie Hingtgen 745015e74f [release-12.0.1] K8s: Dashboards: Fix provisioned dashboard cleanup (#104504) (#104525) 
K8s: Dashboards: Fix provisioned dashboard cleanup (#104504)
 2025-04-25 13:41:29 +01:00
Stephanie Hingtgen 123351e3ac [release-12.0.1] Access control: Make sure that user permission cache is cleared after new dashboard and folder creation (#104495) 
Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
 2025-04-24 15:48:04 -05:00
grafana-delivery-bot[bot] 26b81feb85 [release-12.0.1] Apply security patch 357-202503311017.patch (#104493) 
Apply security patch 357-202503311017.patch (#104490)

* Sanitize paths before evaluating access to route

* use util.CleanRelativePath

---------

Co-authored-by: Andres Martinez Gotor <andres.martinez@grafana.com>
(cherry picked from commit 1f707d16ed)

Co-authored-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com>
 2025-04-24 20:40:18 +01:00
Stephanie Hingtgen ed408985fa [release-12.0.1] K8s: Dashboards: Mark as v1beta1 (#104422) 
Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
 2025-04-23 19:21:59 +01:00
Stephanie Hingtgen b0d42f432a [release-12.0.1] K8s: Dashboards: Add fine grained access control checks to /apis (#104419) 
K8s: Dashboards: Add fine grained access control checks to /apis (#104347)


---------

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
Co-authored-by: Gabriel MABILLE <gabriel.mabille@grafana.com>
Co-authored-by: Marco de Abreu <marco.deabreu@grafana.com>
Co-authored-by: Georges Chaudy <chaudyg@gmail.com>
 2025-04-23 18:28:10 +01:00
Stephanie Hingtgen cde4a9dabe [release-12.0.1] TeamMember: Treat null permission as member (#104195) (#104250) 
TeamMember: Treat null permission as member (#104195)

Co-authored-by: Jo <joao.guerreiro@grafana.com>
 2025-04-22 09:46:13 +02:00
Stephanie Hingtgen 2e878c4fdc [release 12.0.1] Dashboards: Preserve schema version in /api (#104213) (#104249) 
Dashboards: Preserve schema version in /api (#104213)


---------

Co-authored-by: Artur Wierzbicki <artur.wierzbicki@grafana.com>
 2025-04-21 18:40:34 -05:00
Stephanie Hingtgen 4d6d46a181 [release 12.0.1] Klog: Prevent response bodies from being logged (#104247) 2025-04-21 23:07:53 +01:00
grafana-delivery-bot[bot] b9ee6bae38 [release-12.0.1] Alerting: Ensure field validators return the proper type (#104243) 
Alerting: Ensure field validators return the proper type (#104050)

* Ensure field validators return the proper type

This ensures correct error propagation through services up to
the API layer.

* Move error wrapping up to call site

(cherry picked from commit 820c338414)

Co-authored-by: William Wernert <william.wernert@grafana.com>
 2025-04-21 21:17:40 +01:00
colin-stuart 7b8b88adad SCIM: Add group sync config option to test infra (#104007) 
SCIM: Add group sync flag to test infra
 2025-04-14 17:22:36 -04:00
Sam Jewell 4aa7d67edd Server-side expressions: Improve error message (#103968) 
This error message is more correct
 2025-04-14 21:14:03 +00:00
Ryan McKinley 0283c98e30 K8s/Folders: Use v1beta1 and app-sdk based spec (#103975) 2025-04-14 23:20:10 +03:00
Alexander Akhmetov acfd998fa6 Alerting: Send resolved notifications immediately for state deleted states (#103996) 
What is this feature?

Send resolved notifications not only when an alert state becomes stale (series is missing) and transitions from Alerting to Normal, but also from Error, NoData and Recovering.

Why do we need this feature?

Previously, when an alert state became stale or was deleted, it would transition to Normal but wouldn't trigger resolved notifications to the Alertmanager. This meant we relied on the Alertmanager to send resolved notifications when the alert expires. However, if the Alertmanager state is lost, these resolved notifications would never be sent, leaving users with firing alerts in their notification channels. This PR ensures that any transition from a firing state (Alerting, Error, NoData, Recovering) to Normal triggers a resolved notification.
 2025-04-14 21:40:44 +02:00
Georges Chaudy e69052a417 unistore: add check when update the folder of a resource (#102699) 
* Add check for move folder

* make the server test generic

* address comment
 2025-04-14 16:57:40 +02:00
Ida Štambuk 27795ff7bf ElasticSearch: Improve index pattern error messaging and docs (#103899) 2025-04-14 15:55:33 +02:00
beejeebus b0ecc90329 InfluxDB: capture more downstream errors (#103978) 
This adds more checks on the type of errors returned from InfluxDB
fsql datasource queries. The Grpc error code `Unavailable` is mapped
to a downstream error source.
 2025-04-14 09:21:09 -04:00
Ryan McKinley 1d4d7cec41 Chore: update feature toggle stats from git (#103960) 2025-04-14 15:57:41 +03:00
Esteban Beltran 20d8223b6e Chore: Clean up code from pluginsAPIMetrics feature toggle (#103965) 2025-04-14 13:15:06 +01:00
Cory Forseth 2b279efe15 Use team uid for team group actions (#103415) 
* use team uid for team group actions

* add constructor for tests; rename vars for clarity

* github told me to do this
 2025-04-14 06:40:55 -05:00
Ryan McKinley f4dbbbac0c Chore: update golang.org/x/sys+net+text+tools+crypto (#103963) 2025-04-14 10:01:19 +01:00
Ivana Huckova 242ac6bfa7 Jaeger: Run dependency graph queries through backend behind the feature toggle (#103768) 
* Start with dependency graph

* Update and add tests

* Fix lint and ordering in test
 2025-04-14 10:54:40 +02:00
Carl Bergquist ed65c99e54 Scopes: Adds feature toggle used by grafana-enterprise (#103870) 
Signed-off-by: bergquist <carl.bergquist@gmail.com>
 2025-04-14 09:42:16 +02:00
Dave Henderson 1125f36f4f fix(test): Attempt to make TestPollingNotifier/notify_returns_channel_and_starts_polling less flaky (#103947) 
Signed-off-by: Dave Henderson <dave.henderson@grafana.com>
 2025-04-14 09:41:09 +02:00
Gábor Farkas 9aca2606c7 upgrade plugin-sdk-go from v0.274.0 to v0.275.0 (#103863) 
* upgrade plugin-sdk-go from v0.274.0 to v0.275.0

* ignore deprecated warning
 2025-04-14 08:29:58 +02:00