Skip to content

PMM-14213 Upgrade Grafana to v12.3.1#869

Open
fabio-silva wants to merge 5935 commits intomainfrom
PMM-14213-grafana-12.3.1
Open

PMM-14213 Upgrade Grafana to v12.3.1#869
fabio-silva wants to merge 5935 commits intomainfrom
PMM-14213-grafana-12.3.1

Conversation

@fabio-silva
Copy link

bfmatei and others added 30 commits October 27, 2025 15:23
| datasource | package | from  | to    |
| ---------- | ------- | ----- | ----- |
| npm        | nanoid  | 5.1.5 | 5.1.6 |

Signed-off-by: renovate-sh-app[bot] <219655108+renovate-sh-app[bot]@users.noreply.github.com>
Co-authored-by: renovate-sh-app[bot] <219655108+renovate-sh-app[bot]@users.noreply.github.com>
…11464)

* Fix incorrect label: 'New Grafana recording rule' → 'New Data source recording rule'

* lowercase
* [API Server] Add Example App for reference use.

* Remove Printlns.

* Upgrade app-sdk to v0.46.0, update apps to handle breaking changes.

* Only start the reconciler for the example app if the v1alpha1 API version is enabled.

* Some comment doc updates.

* Run make update-workspace

* Set codeowner for /apps/example

* Run make gofmt and make update-workspace

* Run prettier on apps/example/README.md

* Add COPY apps/example to Dockerfile

* Add an authorizer to the example app.

* Fix import ordering.

* Update apps/example/kinds/manifest.cue

Co-authored-by: Owen Diehl <ow.diehl@gmail.com>

* Run make update-workspace

* Re-run make gen-go for enterprise import updates

* Run make update-workspace

---------

Co-authored-by: Owen Diehl <ow.diehl@gmail.com>
* Canvas: Allow non-icon bg image fields

* add tests
…2839)

* Add delete and update hooks for roles/core roles

no need to capture non reference types

small cleanup on vars

* fix ticket priming in hooks

* fix ticket priming in hooks

* Revert "fix ticket priming in hooks"

This reverts commit f8e953c.

* use old testing blocks

* protect runtime obj in go func

* update test for correctness

* separate files for test correctness. fix leaking goroutines in go tests

* go workspace fixes

* attribute owner

* clean up go mod
)

* txt: download selected fields

* csv: download selected fields

* json: download selected fields

* Address lint issues

* Update tests

* Update tests

* Update suppressions
When creating silences in remote Alertmanager instances, all 4xx errors were treated as 500s.

This change ensures that 4xx errors are properly surfaced as bad payload errors, allowing callers to handle them appropriately.
…2915)

* don't show nav children while plugin config is loading

* add tests
* Edits, weights

* WIP

* Weights

* prettier
…ons (grafana#113042)

* expose inputId to underlying input, add field to story

* just use id instead of inputId
New Crowdin translations by GitHub Action

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* deprecate the cdk backend in favor of the kv storage backend

* lint

* fix watchtests

* cover limit=0 for ListHistory

* fix rv too large
…3054)

| datasource | package            | from  | to    |
| ---------- | ------------------ | ----- | ----- |
| npm        | @grafana/azure-sdk | 0.0.7 | 0.0.8 |

Signed-off-by: renovate-sh-app[bot] <219655108+renovate-sh-app[bot]@users.noreply.github.com>
Co-authored-by: renovate-sh-app[bot] <219655108+renovate-sh-app[bot]@users.noreply.github.com>
* refactor zanzana client instantiation

* refactor client imports

* POC write API (Mutate)

* fix linter

* delete exisitng folder parents

* refactor common functions

* minor refactor

* groupd operations by type

* atomic folder operations

* use deleteExisting for deletes

* Add tests for folders

* more tests

* resource permissions tests

* add more tests

* fix mock zanzana client

* fix linter

* fix linter

* re-use types from apps

* add some comments to the protobuf
…egraph (grafana#113071)

* feat: Improve prompt for open assistant

Existing prompt is not specific enough and uses a new visual tool, which will result in taking a screenshot to analyze the flame graph.

* Apply suggestion from @cyriltovena

less instructions for now.

---------

Co-authored-by: Cyril Tovena <cyril.tovena@gmail.com>
…rafana#113033)

* wrap data source info onto 2 lines at small viewports

* undo other changes

* need flex-start
* Add a tooltip mode for common labels and use it in Triage workbench

* Change Tooltip to ToggleTip for displaying common labels
* refactor ungroup

* deleting last row/tab no longer ungroups

* Change test for deleting last row to not test for ungroup

* fix comment with correct pull request

* use isLayoutGroup instead

* fix implementations

* missing import
…-configured existing branch (grafana#112947)

* SaveProvisionedDashboardForm: Show preview banner when pushing to non-configured existing branch

* useProvisionedRequestHandler: use ref to prevent handler triggered twice
* docs: add docs for the switch variable type

* chore: prettier fix

* docs: fix review notes

* Apply suggestions from code review

Co-authored-by: Isabel Matwawana <76437239+imatwawana@users.noreply.github.com>

* docs: move the switch variable section after ad-hoc variables

* fix: vale fixes

* Update docs/sources/visualizations/dashboards/variables/add-template-variables/index.md

Co-authored-by: Isabel Matwawana <76437239+imatwawana@users.noreply.github.com>

---------

Co-authored-by: Isabel Matwawana <76437239+imatwawana@users.noreply.github.com>
)

* Integrate mt querier with query caching

* typo

* let the caller set cache status response header

* fix TestQueryAPI

* make gen-go

* handle CachingServiceClient being nil and make gen-go

* include namespace in cache key

* set signed in user namespace in query_test.go

* fix test

* remove commented out code

* undo services/query/query.go changes

* make gen-go

* remove namespace requirement

* fix tests

* fix test

* remove namespace from SignedInUser in tests

* make gen-go
grafana-delivery-bot bot and others added 16 commits December 15, 2025 12:12
…fana#115136)

* Chore: Run annotation data migration in batches (grafana#113589)

* run annotation data migration in batches

* how could i miss it

* run in the background, starting from newest annotations

* update tests

* optionally pass batch size via env

(cherry picked from commit 95e65e2)

* update mysql query

---------

Co-authored-by: Serge Zaitsev <serge.zaitsev@grafana.com>
…fana#115314)

Co-authored-by: Robert Horvath <robert.horvath@grafana.com>
fix grafana 12 release and support dates (grafana#115235)
…abs (grafana#115346)

Co-authored-by: grafakus <marc.mignonsin@grafana.com>
Co-authored-by: Isabel Matwawana <76437239+imatwawana@users.noreply.github.com>
Docs: Plugin install deprecation note (grafana#115160)

* Placeholder

* Updated note

* Update docs/sources/administration/plugin-management/plugin-install.md



* Feedback

* Update docs/sources/administration/plugin-management/plugin-install.md



---------


(cherry picked from commit fdc8447)

Co-authored-by: Anna Urbiztondo <anna.urbiztondo@grafana.com>
Co-authored-by: David Harris <david.harris@grafana.com>
Docs: Git Sync scenarios (grafana#115199)

* WIP

* Review

* Move scenarions

* Structure fix

* Edits, fix

* Vale, x-refs

* Feedback, tweaks

* Consolidate HA, titles

* Prettier

* Prettier

* Adding missing content

* Minor edits

* Links

* Prettier

(cherry picked from commit f3421b9)

Co-authored-by: Anna Urbiztondo <anna.urbiztondo@grafana.com>
docs: update visualizations for logs (grafana#115183)

* docs: update visualizations for logs

* ran prettier

* vale errors

(cherry picked from commit ca2babf)

Co-authored-by: J Stickler <julie.stickler@grafana.com>
…15399)

Tracing: Fix excluding paths from tracing  (grafana#115394)

fix: not tracing paths correctly
(cherry picked from commit 7913b20)

Co-authored-by: Levente Balogh <balogh.levente.hu@gmail.com>
…rafana#115376)

alerting docs: restore config feature toggle info (grafana#114056)

* alerting docs: restore config feature toggle info

* Update docs/sources/alerting/set-up/configure-alert-state-history/index.md



---------


(cherry picked from commit eec4722)

Co-authored-by: Johnny Kartheiser <140559259+JohnnyK-Grafana@users.noreply.github.com>
Co-authored-by: Alexander Akhmetov <me@alx.cx>
Alerting: Protect sensitive fields of contact points from unauthorized modification
- Introduce a new permission alert.notifications.receivers.protected:write. The permission is granted to contact point administrators.
- Introduce field Protected to NotifierOption
- Introduce DiffReport for models.Integrations with focus on Settings. The diff report is extended with methods that return all keys that are different between two settings.
- Add new annotation 'grafana.com/access/CanModifyProtected' to Receiver model
- Update receiver service to enforce the permission and return status 403 if unauthorized user modifies protected field
- Update receiver testing API to enforce permission and return status 403 if unauthorized user modifies protected field.
- Update UI to disable protected fields if user cannot modify them

Co-authored-by: Sonia Aguilar <soniaaguilarpeiron@gmail.com>
* Update changelog

* Update version to 12.3.1

* restart ci

---------

Co-authored-by: grafana-delivery-bot[bot] <grafana-delivery-bot[bot]@users.noreply.github.com>
Co-authored-by: jev forsberg <jev.forsberg@grafana.com>
…hat the ones in Dockerfile (grafana#115560)

CI: Remove the default alpine & ubuntu versions so that the ones in Dockerfile (grafana#115544)

* Remove the default alpine & ubuntu versions so that the ones in Dockerfile are used

* set default to just 'alpine' or 'ubuntu'

* use defaults instead

(cherry picked from commit 39fa655)
@fabio-silva fabio-silva requested review from a team, YashSartanpara1, Copilot and matejkubinec and removed request for a team January 20, 2026 12:11
Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR upgrades Grafana to version 12.3.1, which involves significant updates to the Advisor application's check system architecture and introduces new checks for instance, configuration, and SSO settings.

Changes:

  • Refactored plugin check implementation to use new plugin checker and error resolver services
  • Added new check types for instance attributes (version support/pinned status), configuration settings, SSO settings, and data source validation
  • Updated various generated code files, dependencies, and documentation to support Grafana 12.3.1

Reviewed changes

Copilot reviewed 201 out of 13286 changed files in this pull request and generated 3 comments.

Show a summary per file
File Description
apps/advisor/pkg/app/checks/plugincheck/check.go Refactored to use new plugin checker service and error resolver instead of direct plugin installer
apps/advisor/pkg/app/checks/instancechecks/*.go Added new checks for Grafana instance version support and cloud pinned versions
apps/advisor/pkg/app/checks/datasourcecheck/*.go Extended data source checks with missing plugin and deprecated auth detection
apps/advisor/pkg/app/checks/configchecks/*.go Added security configuration validation for secret keys
apps/advisor/pkg/app/checks/authchecks/*.go Added SSO settings list format validation
apps/advisor/pkg/app/checks/ifaces.go Updated Check and Step interfaces to include new methods and logging
apps/advisor/pkg/app/checkregistry/checkregistry.go Updated service to wire new checks and dependencies
apps/advisor/pkg/apis/advisor/v0alpha1/*.go Updated generated API code for new failure report fields (itemID, moreInfo)
apps/advisor/kinds/*.cue Updated CUE schema definitions for Check and CheckType kinds
apps/advisor/go.mod Updated Go version to 1.25.5 and numerous dependencies
Makefile Updated Go version, build flags, Docker configuration, and testing commands
SECURITY.md, CONTRIBUTING.md, README.md Updated documentation and security reporting guidance

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@matejkubinec
Copy link
Collaborator

Some feedback (personally for me for reviewing the upgrade the best approach is to compare with upstream). I'm using Meld, but needed to check on a linux machine, MacOS version is broken on Tahoe.

Left Right
PMM Grafana (upstream)
  1. Could you replace the current docs folder with upstream one? (just a few changes there)
docs folder
  1. Check if the expander ts ignores etc. can be replaced with the ones from upstream
Screenshot From 2026-02-05 15-12-30
  1. Check if the additional changes are needed here (doesn't seem something that we've implemented)
Screenshot From 2026-02-05 15-15-04
  1. Same as 3., check if it's needed.
Screenshot From 2026-02-05 15-15-27
  1. Look like the custom code is not needed anymore (there isn't a "New" badge anymore)
Screenshot From 2026-02-05 15-15-41
  1. Add @PERCONA tag
Screenshot From 2026-02-05 15-17-00
  1. Remove added line (if it's not a problem)
Screenshot From 2026-02-05 15-17-23
  1. Remove comment
Screenshot From 2026-02-05 15-19-10
  1. Remove if unused
Screenshot From 2026-02-05 15-24-02
  1. Remove if unused
Screenshot From 2026-02-05 15-24-58
  1. Remove if unused
Screenshot From 2026-02-05 15-25-22
  1. Remove if unused
Screenshot From 2026-02-05 15-25-34

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.