public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
59,705 Commits 655 Branches 650 Tags
9a8555dead9c61d0dc4e79aa8cef96fa540ab99d
Commit Graph
16306 Commits
Author SHA1 Message Date
beejeebus 6a0cf22b53 Revert "Postgres: Switch the datasource plugin from lib/pq to pgx (#103961)" (#106270) 
This reverts commit 1e383b0c1e.
 2025-06-03 08:45:07 -04:00
xavi 86f2bf2940 IAM: Skip token rotation if it has been rotated recently (#106075) 2025-06-03 08:59:40 +02:00
Alexander Zobnin cb05eb3cd6 RBAC: Return bad request when header is malformed (#105448) 2025-06-02 16:31:15 +02:00
Alexander Akhmetov 6ff67722b8 Alerting: Include rules imported in the UI into prometheus_imported_rules metric (#106229) 2025-06-02 12:47:09 +02:00
xavi 31a9ddc47a IAM: Run user creation inside transaction (#106113) 2025-06-02 11:29:57 +02:00
linoman 374bd5bec7 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
 2025-06-02 11:04:14 +02:00
Alexander Akhmetov e256f2d5e2 Alerting: Enable recording rules by default (#105603) 2025-06-02 10:56:05 +02:00
Alexander Akhmetov 4cde79e802 Alerting: Clean up join errors code (#106243) 2025-06-02 10:30:04 +02:00
Mihai Doarna 6ab9c8bf57 Auth: Remove code for authenticating API keys (#105998) 
* remove auth for plain API keys

* move condition to validateApiKey()

* fix typo

* remove GetApiKeyById() method
 2025-06-02 09:54:10 +03:00
maicon 6fb0ed9886 Bump tempo to 20250529124718-87c2dc380cec (#106220) 
* Bump tempo to 20250529124718-87c2dc380cec

Signed-off-by: Maicon Costa <maiconscosta@gmail.com>

* Add owners to pkg/build

Signed-off-by: Maicon Costa <maiconscosta@gmail.com>

* update workspace

Signed-off-by: Maicon Costa <maiconscosta@gmail.com>

* update pkg/build/go.sum

Signed-off-by: Maicon Costa <maiconscosta@gmail.com>

* update pkg/build/go.sum

Signed-off-by: Maicon Costa <maiconscosta@gmail.com>

---------

Signed-off-by: Maicon Costa <maiconscosta@gmail.com>
 2025-05-29 23:43:13 -05:00
Adam SimpsonandSarah Zinger 729f0a6ba5 ds-querier: handle downstream 500s (#105890) 
* ds-querier: add new metric for the total request

Co-authored-by: Sarah Zinger <sarah.zinger@grafana.com>

* fix logger and trace

Co-authored-by: Sarah Zinger <sarah.zinger@grafana.com>

* ds-querier: rewrite downstream 500s to 400

---------

Co-authored-by: Sarah Zinger <sarah.zinger@grafana.com>
 2025-05-29 17:30:45 -04:00
Alexander Akhmetov eae77aa695 Alerting: Resend alerts for states that are missing in the eval results (#105965) 
What is this feature?

This PR fixes the MissingSeriesEvalsToResolve behavior when it's set to more than 4 evaluation intervals.

Why do we need this feature?

The MissingSeriesEvalsToResolve setting was not working correctly due to alerts being auto-resolved by Alertmanager after 4 evaluation intervals (via the endsAt field).

Before we had deleteStaleStatesFromCache method that was returning only stale states that had to be resolved. Non-stale states for which the current evaluation does not have a series never had endsAt updated and were never resend to the Alertmanager, so they were automatically resolved after 4 evaluations regardless of the setting.

The new processMissingSeriesStates returns state for each missing series on every evaluation, and resolves the stale ones. This guarantees that alerts without series still alert for the configured number of evaluations.
 2025-05-29 23:22:35 +02:00
Ashley Harrison 4ac248a512 Internationalisation: Mark up panel plugins for translations (#106068) 
* config for panel plugin translations

* markup

* tweaks

* prettier

* use data-testid

* rename disable rule now it's been moved

* final markup
 2025-05-29 18:13:25 +01:00
David Kim (DK) 939f2c9828 Navigation: Add the new badge to the SLO reports nav item (#105707) 
* attempt to add slo reports badge

* fix build

* add new badge for reports for subitem in grafana-slo-app
 2025-05-29 16:37:14 +01:00
Sarah Zinger 020780f5ac DS-querier: define func to fetch instance config settings (#106172) 
DS-querier: define func to fetch instance config settings to be passed into executing query
 2025-05-29 11:07:40 -04:00
Eric Leijonmarck 69653ea3dc Zanzana: Adds running migrations from openfga w. RunMigrations() (#105691) 2025-05-29 15:54:12 +01:00
Collin Fingar c23ee1e116 QueryLibrary: Adding Tags as new set field to queries (#105702) 2025-05-29 08:47:30 -04:00
Mykhailo ZahladaandMisi fc988c8771 Auth: Add Azure/Entra workload identity support (#104807) 
* fixes/adds azure workload identity authentication. Issue #78249

* Updates default values. Adds `workload_identity_token_file` defaults

* Updates example config. Adds `workload_identity_token_file`

* Updates docummentation: adds Federated credentials for Workload Identity

* Update docs/sources/setup-grafana/configure-security/configure-authentication/azuread/index.md

Co-authored-by: Misi <mgyongyosi@users.noreply.github.com>

* Update docs/sources/setup-grafana/configure-security/configure-authentication/azuread/index.md

Co-authored-by: Misi <mgyongyosi@users.noreply.github.com>

* Docs: add link to official documentation. Clarifies example.

* 1. Add workload_identity_enabled and workload_identity_token_file settings to [auth.azuread] for workload identity support.

2. Extend OAuthInfo struct to include workload identity fields.
3. Update OAuth authentication logic to handle Azure AD workload identity using federated token as client assertion.
4. Update sample configuration and documentation for new settings.

* ensure environment variable overrides are respected for OAuth SSO settings

- Ensure that settings loaded in pkg/services/ssosettings/strategies/oauth_strategy.go correctly reflect environment variable overrides, matching Grafana's config behavior.
- Align config loading logic with main config loader to prevent issues where INI values would override environment variables.

* updates documentation

* test: add workload identity configuration tests for Azure AD OAuth strategy. Add test coverage for workload_identity_enabled and workload_identity_token_file settings

* feat: add workload identity support to Azure AD SSO configuration UI

* updates documentation

* Simplify OAuth flow by removing unnecessary switch-case structure

* Small changes

* Lint + i18n gen

* refactor: remove redundant workload_identity_enabled setting as auth method gets defined by client_authentication

* update documentation

* refactor: remove redundant workload_identity_enabled setting as auth method gets defined by client_authentication

* updates documentation - configuration options table: adds `client_authentication`, `workload_identity_token_file`, and `federated_credential_audience`

* Small changes, lint, i18n

---------

Co-authored-by: Misi <mgyongyosi@users.noreply.github.com>
 2025-05-29 14:09:18 +02:00
Kyle Brandt 601676b98e TestData: Adds Frame Type to "Predictable" Scenarios to enable SQL expressions (#106177) 2025-05-29 07:22:51 -04:00
Andres Martinez Gotor e2e8de29ba Advisor: Check plugin signature (#106044) 2025-05-29 11:33:19 +02:00
Stephanie Hingtgen 5303a1cc7e Org: Fix org deletion (#106193) 2025-05-29 09:40:06 +03:00
Stephanie Hingtgen ab99211b40 Dashboard Provisioning: Reduce db load (#106114) 2025-05-29 09:39:07 +03:00
Ezequiel Victorero 3de80ec3d7 Feature Toggles: remove useRawTimeRange FF (#106154) 2025-05-28 15:44:48 -07:00
Jean-Philippe Quéméner 4519ef8d21 chore(unified-storage): increase background request timeout (#106186) 2025-05-28 22:59:28 +02:00
Kyle Brandt 7f1a286ffb SQL Expressions: Always convert on type first (#106083) 
fixes #103124
 2025-05-28 12:00:37 -04:00
Mariell Hoversholm 312fcb4a54 Build: Use absolute paths when passed relatives (#106122) 2025-05-28 15:35:24 +02:00
Kevin Minehart 8a11a9bd6d CI: mirror some CI dependencies (#106148) 
* mirror some CI dependencies
* remove -v from go build
 2025-05-28 15:34:59 +02:00
Dana AxinteMatheus MacabuPoorlyDefinedBehaviour
 		b4cd51810b SecretsManager: Various utils for usage insights, outbox and secretkeeper (#106010) 
* SecretsManager: utils for usage insights on ST mode

Co-authored-by: Matheus Macabu <macabu@users.noreply.github.com>

* SecretsManager: add assert

Co-authored-by: PoorlyDefinedBehaviour <brunotj2015@hotmail.com>

* SecretsManager: Remove encryption scope option

Co-authored-by: Matheus Macabu <macabu@users.noreply.github.com>

* SecretsManager: add fake keeper

Co-authored-by: Dana Axinte <53751979+dana-axinte@users.noreply.github.com>
Co-authored-by: PoorlyDefinedBehaviour <brunotj2015@hotmail.com>
Co-authored-by: Matheus Macabu <macabu@users.noreply.github.com>

---------

Co-authored-by: Matheus Macabu <macabu@users.noreply.github.com>
Co-authored-by: PoorlyDefinedBehaviour <brunotj2015@hotmail.com>
 2025-05-28 12:46:54 +01:00
Will Browne edb0865caa Chore: Ensure we save correct default admin user in integration test DB setup (#105752) 
* fix helper + amend tests

* fix import + remove unused var

* remove more users

* remove unused code

* update test comment
 2025-05-28 11:25:01 +01:00
Ryan McKinley 10f2b76156 Chore: Update apps codegen to v0.38.2 (#106111) 2025-05-28 12:35:44 +03:00
Aleksandar PetrovandPiotr Jamróz 0b8252fd7c Pyroscope: Annotation support for series queries (#104130) 
* Pyroscope: Add annotations frame to series response

* Adapt to API change, add tests

* Run make lint-go

* Fix conflicts after rebase

* Add annotation via a separate data frame

* Process annotations fully at the datasource

* Add mod owner for go-humanize

* Pyroscope: Annotations in Query Response can be optional

---------

Co-authored-by: Piotr Jamróz <pm.jamroz@gmail.com>
 2025-05-28 10:42:19 +02:00
Alexander Akhmetov b51d70aad9 Alerting: Fix swagger generation (#106106) 2025-05-28 10:15:11 +02:00
Mariell Hoversholm 6f3b0e95b4 Build: Include .git (#106124) 2025-05-28 10:03:19 +02:00
Ryan McKinley d4c446f42c Chore: Update k8s.io to v0.33.1 (#105307) 2025-05-28 00:13:18 +03:00
Nathan Marrs 0178de3109 Feature Toggles: Remove two AB test feature toggles (#106100) 2025-05-27 21:18:23 +02:00
Mustafa Sencer Özcan 4ba378603d feat(unified-storage): round robin queue and scheduler package (#105544) 2025-05-27 21:15:03 +02:00
Alexander Akhmetov faeddf334a Alerting: Fix $value type when single data source is queried (#106080) 2025-05-27 21:04:07 +02:00
Matheus Macabu c4c4faff1e Dependencies: Bump github.com/openfga/openfga to v1.8.13 to address CVE-2025-48371 (#106064) 2025-05-27 16:30:23 +02:00
Jean-Philippe Quéméner 9a565ff46e chore(authz): contextualize the authz logger (#106078) 2025-05-27 16:28:58 +02:00
Domas d5bb055593 NavTree: Group APM and Infra plugins under "Observability" section (#104192) 
* put o11y department apps under Observability menu section

* fix tests

* change url for observability grouping

* add routing for /observability
 2025-05-27 17:05:28 +03:00
Kyle Brandt 005f390df4 SSE: Update execution order to move DS queries first (#105686) 
This is part of getting SSE more consistent when run from the query service vs part of grafana-server. 
fixes #105680
 2025-05-27 09:34:40 -04:00
Syerikjan Kh b6c9ecf7fe fix: preinstall sync plugins have priority over preinstall_async plugin (#106016) 2025-05-27 08:32:02 -04:00
Alexander Zobnin ef14992f00 Zanzana: Fix reconciling role with empty UID (#106045) 2025-05-27 14:23:29 +02:00
Jev Forsberg 5963be6f31 Security: Add fix for CVE-2025-3580 (#105976) 
baldm0mma/ add main/404-202504151210.patch to main
 2025-05-27 11:21:55 +01:00
Fayzal Ghantiwala 589046bcdc Alerting: Persist alert instance FiredAt field (#105927) 
* Persist alert instance fired at

* Update protos and tests
 2025-05-27 10:04:26 +01:00
Jean-Philippe Quéméner 9ba031364b fix(unified-storage): use batching for index creation (#106034) 2025-05-27 09:48:39 +02:00
Ryan McKinley 326081cdb7 Chore: Remove unified storage go modules (#106035) 2025-05-27 09:49:21 +03:00
Jean-Philippe Quéméner 814707152d chore(unified-storage): contextualize the index build logger (#106025) 2025-05-26 21:33:51 +02:00
Dana AxinteandMatheus Macabu 5401175562 SecretsManager: Conditionally lock DB before migrations using config setting (#106003) 
Secrets: Conditionally lock DB before migrations using config setting (#105949)

Co-authored-by: Matheus Macabu <macabu@users.noreply.github.com>
 2025-05-26 18:28:53 +01:00
Oscar Kilhed 4f18ad30c9 SchemaV2: Remove legacy rows from schema v2. (#105238) 
* save transparent setting

* make sure we test both transparent and non transparent

* no more legacy rows

* schema changes

* Add testing, fix first row offset

* Remove legacy row from transform test

* Remove panel that's not present in layout

* Remove expects after removing the row, fix lint issues

* Remove unused commit

* update codegen

* update openapi snapshot

* Fix snapshot

* add missing default prop

* Fix repeating, fix first row, fix not flushing last row

* Use correct repeater

* fix lint, remove unused empty check

* update codegen

* update openapi test snapshot
 2025-05-26 14:33:30 +02:00