Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PMM-13449 Grafana update to 11.1.8 #778

Open
wants to merge 94 commits into
base: v3
Choose a base branch
from

Conversation

YashSartanpara1
Copy link

@YashSartanpara1 YashSartanpara1 commented Oct 23, 2024

What this PR does / why we need it: Update grafana to latest patch release to fix CVEs

Which issue(s) this PR fixes:

Fixes # PMM-13449

Special notes for your reviewer:

ryantxu and others added 30 commits August 23, 2024 10:35
Docs: Fix typo in installation/debian/index.md (grafana#92040)

Fix typo in installation/debian/index.md

Co-authored-by: Jack Baldry <[email protected]>
(cherry picked from commit b4e7329)

Co-authored-by: SADIK KUZU <[email protected]>
…eus rules (grafana#92398)

Alerting: Fix invalid loading condition for vanilla Prometheus rules (grafana#92390)

Remove invalid loading condition

(cherry picked from commit 30035b2)
… with their data needs (grafana#92440)

Co-authored-by: Isabel Matwawana <[email protected]>
Co-authored-by: Isabel Matwawana <[email protected]>
Co-authored-by: Señor Performo - Leandro Melendez <[email protected]>
…fana#92447)

Co-authored-by: Isabel Matwawana <[email protected]>
Co-authored-by: Isabel Matwawana <[email protected]>
Co-authored-by: Señor Performo - Leandro Melendez <[email protected]>
…a#92452)

Alerting Docs: Monitor your high availability setup (grafana#92063)

* Alerting Docs: Monitor your high availability setup

* Update docs/sources/alerting/set-up/configure-high-availability/_index.md

Co-authored-by: brendamuir <[email protected]>

* Update docs/sources/alerting/set-up/configure-high-availability/_index.md

Co-authored-by: brendamuir <[email protected]>

* Update docs/sources/alerting/set-up/configure-high-availability/_index.md

Co-authored-by: brendamuir <[email protected]>

* Update docs/sources/alerting/set-up/configure-high-availability/_index.md

Co-authored-by: brendamuir <[email protected]>

* Shorten links

* Update/reorder a bit the description about alertmanager gossiping

* Update `alertmanager_peer_position` description

---------

Co-authored-by: brendamuir <[email protected]>
(cherry picked from commit 2ba930a)

Co-authored-by: Pepe Cano <[email protected]>
…rafana#92456)

Alerting docs: adds display names to fixed roles for RBAC (grafana#92357)

* Alerting docs: adds display names to fixed roles for RBAC

* ran prettier

* updates descriptions

* preposition update

* ran prettier

(cherry picked from commit 667cbd6)

Co-authored-by: brendamuir <[email protected]>
Co-authored-by: grafanabot <[email protected]>
Co-authored-by: Jack Baldry <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* Update changelog

* Update version to 11.1.5

* Lint

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Andreas Christou <[email protected]>
…reqs (grafana#92523)

Co-authored-by: Isabel Matwawana <[email protected]>
Co-authored-by: Isabel Matwawana <[email protected]>
Co-authored-by: Señor Performo - Leandro Melendez <[email protected]>
CI: Run prettier in bump-version workflow (grafana#92195)

Run prettier

(cherry picked from commit 931d64b)

Co-authored-by: Andreas Christou <[email protected]>
…ata needs (grafana#92539)

Co-authored-by: Isabel Matwawana <[email protected]>
Co-authored-by: Señor Performo - Leandro Melendez <[email protected]>
… data needs (grafana#92541)

Co-authored-by: Drew Slobodnjak <[email protected]>
Co-authored-by: Isabel Matwawana <[email protected]>
Co-authored-by: Isabel Matwawana <[email protected]>
Co-authored-by: Señor Performo - Leandro Melendez <[email protected]>
Docs: Re-order Explore docs in TOC (grafana#92624)

* re-ordered Explore docs for cohesion

* ran prettier

(cherry picked from commit f9d38c8)

Co-authored-by: Larissa Wandzura <[email protected]>
…ds (grafana#92678)

Co-authored-by: Isabel Matwawana <[email protected]>
Co-authored-by: Isabel Matwawana <[email protected]>
Co-authored-by: Señor Performo - Leandro Melendez <[email protected]>
…data needs (grafana#92683)

Co-authored-by: Isabel Matwawana <[email protected]>
Co-authored-by: Isabel Matwawana <[email protected]>
Co-authored-by: Señor Performo - Leandro Melendez <[email protected]>
…aluation (grafana#92720)

Alerting docs: add info on changing default time out for evaluation (grafana#92391)

* Alerting docs: add info on changing default time out for evaluation

* ran prettier

* Update docs/sources/alerting/fundamentals/alert-rule-evaluation/state-and-health.md

Co-authored-by: antonio <[email protected]>

* Update docs/sources/alerting/fundamentals/alert-rule-evaluation/state-and-health.md

Co-authored-by: antonio <[email protected]>

* ran prettier

* updates with yuris feedback

* ran prettier

---------

Co-authored-by: antonio <[email protected]>
(cherry picked from commit 16c618f)

Co-authored-by: brendamuir <[email protected]>
Docs: keep the HTTP API list updated (grafana#92635)

* Docs: keep the HTTP API list updated

* Update menu title to be consistent with the HTTP API list

* Update docs/sources/developers/http_api/preferences.md

Co-authored-by: Jack Baldry <[email protected]>

* Update docs/sources/developers/http_api/snapshot.md

Co-authored-by: Jack Baldry <[email protected]>

---------

Co-authored-by: Irene Rodriguez <[email protected]>
Co-authored-by: Jack Baldry <[email protected]>
(cherry picked from commit fcb4b3d)

Co-authored-by: Pepe Cano <[email protected]>
…ed headers (grafana#92757)

Co-authored-by: Isabel Matwawana <[email protected]>
Co-authored-by: Señor Performo - Leandro Melendez <[email protected]>
Co-authored-by: Isabel Matwawana <[email protected]>
Co-authored-by: Isabel Matwawana <[email protected]>
Co-authored-by: Señor Performo - Leandro Melendez <[email protected]>
…tions. (grafana#92774)

Co-authored-by: Isabel Matwawana <[email protected]>
Co-authored-by: Señor Performo - Leandro Melendez <[email protected]>
Co-authored-by: Isabel Matwawana <[email protected]>
Co-authored-by: Señor Performo - Leandro Melendez <[email protected]>
…ds (grafana#92782)

Co-authored-by: Isabel Matwawana <[email protected]>
Co-authored-by: Isabel Matwawana <[email protected]>
Co-authored-by: Señor Performo - Leandro Melendez <[email protected]>
…a#92823)

alerting: docs / highlight tutorial in landing page (grafana#92805)

(cherry picked from commit 0df5a6a)

Co-authored-by: antonio <[email protected]>
…cated notifications (grafana#92841)

Alerting docs: HA - configure alertmanager to prevent duplicated notifications (grafana#92611)

* Alerting docs: HA - configure shared alertmanager

* Update docs/sources/alerting/set-up/configure-high-availability/_index.md

Co-authored-by: brendamuir <[email protected]>

* Update docs/sources/alerting/set-up/configure-high-availability/_index.md

Co-authored-by: brendamuir <[email protected]>

* Apply minor content suggestion

---------

Co-authored-by: brendamuir <[email protected]>
(cherry picked from commit 15de549)

Co-authored-by: Pepe Cano <[email protected]>
RBAC: Always store action sets (grafana#92833)

always store action sets, even if FT is disabled

(cherry picked from commit 46e81e9)
…fana#92892)

Templating: Fix searching non-latin template variables (grafana#92789)

(cherry picked from commit 43c960d)

Co-authored-by: Leon Sorokin <[email protected]>
grafana-delivery-bot bot and others added 29 commits September 27, 2024 14:50
…oups endpoint [CVE-2024-8118] (grafana#93948)

Alerting: Fix incorrect permission on POST external rule groups endpoint [CVE-2024-8118] (grafana#93940)

Fix endpoint permission on rule write endpoint

(cherry picked from commit c2799b4)

Co-authored-by: Alexander Weaver <[email protected]>
Update Okta SAML attributes documentation (grafana#93966)

Co-authored-by: Irene Rodriguez <[email protected]>
(cherry picked from commit fb9e12c)

Co-authored-by: Dai Nguyen <[email protected]>
Co-authored-by: Jack Baldry <[email protected]>
Co-authored-by: Ronald McCollam <[email protected]>
* Update changelog

* Update version to 11.1.7

* Add CVE to changelog

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Yuri Tseretyan <[email protected]>
CI: upgrade grabpl v3.0.53 (grafana#94112)

* upgrade grabpl to v3.0.53

* upgrade grabpl to v3.0.53

(cherry picked from commit 26c3ed8)
Co-authored-by: Irene Rodriguez <[email protected]>
Co-authored-by: Isabel Matwawana <[email protected]>
* Annotations: Fix composite store read (grafana#94158)

* Annotations: Fix composite store read

* Add test

* check error

(cherry picked from commit bd17416)

* re-format

* re-format
…tion (grafana#94255)

Anonymous: Fix anonymous cache ignoring device limit evaluation (grafana#94218)

* ensure cache contains the evaluation result for device limit

* add device limit errors and warnings

* fix lint

(cherry picked from commit 544b5f9)

Co-authored-by: Jo <[email protected]>
…rafana#94356)

CI: Remove redundant FE and BE tests from release pipeline (grafana#94173)

baldm0mma/remove_tests/ remove fe and be tests

(cherry picked from commit 0e8fa1f)
… it is deleted (grafana#94371)

ServiceAccounts: Remove permissions to service account when it is deleted (grafana#93877)

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

* Add migration for deleting orphaned service account permissions
ServiceAccounts: Run migration in batches (grafana#94429)

* ServiceAccounts: Run migration in batches

(cherry picked from commit 2d0ea60)

Co-authored-by: Karl Persson <[email protected]>
…e trace queries (grafana#94474)

AzureMonitor: Fix App Insights portal URL for multi-resource trace queries (grafana#94119)

* Retrieve the resource in the query

* Appropriately construct url

* Update tests

(cherry picked from commit 97a9059)

Co-authored-by: Andreas Christou <[email protected]>
…grafana#94398)

Fix: Ensure SA migrations doesn't hit migrated SAs if rerun (grafana#94347)

* ensure mig doesn't hit migrated SAs if rerun

* Fix small issue with the test

---------

Co-authored-by: gamab <[email protected]>
(cherry picked from commit 945dd05)

Co-authored-by: Jo <[email protected]>
…lm installs (grafana#94546)

Docs: Added instructions for configuring a private CA in Helm installs (grafana#93249)

* Docs: Added instructions for configuring a private CA in Helm installs

Signed-off-by: Bradley Pettit <[email protected]>

* Docs: linted new instructions for private CA cert

Signed-off-by: Bradley Pettit <[email protected]>

* Expanded to gem/gel/get

Originally, it just referred to GEM

---------

Signed-off-by: Bradley Pettit <[email protected]>
Co-authored-by: Jennifer Villa <[email protected]>
(cherry picked from commit 747cdf9)

Co-authored-by: Bradley <[email protected]>
…n-existent Organization (grafana#94551)

OrgSync: Do not set default Organization for a user to a non-existent Organization (grafana#94537)

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

Co-authored-by: Karl Persson <[email protected]>
(cherry picked from commit c872cad)
GCM: Time field naming (grafana#94548)

* Name time field correctly

* Update tests

* Lint

(cherry picked from commit 7c79f8f)

Co-authored-by: Andreas Christou <[email protected]>
…fana#94627)

Co-authored-by: Isabel Matwawana <[email protected]>
Co-authored-by: Señor Performo - Leandro Melendez <[email protected]>
Co-authored-by: Isabel Matwawana <[email protected]>
Co-authored-by: Irene Rodriguez <[email protected]>
…a#94694)

Co-authored-by: Jack Baldry <[email protected]>
Fix list indentation to ensure continuous numbering (grafana#94692)
CI: Support more version formats in publishing (grafana#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 7a2edd3)
* Update changelog

* Update version to 11.1.6+security-01

* Revert "Update version to 11.1.6+security-01"

This reverts commit 4309ada.

* update changelog

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Kevin Minehart <[email protected]>
* Update changelog

* Update version to 11.1.7+security-01

* Revert "Update version to 11.1.7+security-01"

This reverts commit 9d350a4.

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Kevin Minehart <[email protected]>
CI: Additional changes for +security versions (grafana#94854)

* Build: Fix docker manifest create not using correct IMAGE_TAG

* Support publishing security versions of NPM packages

---------

Co-authored-by: Andreas Christou <[email protected]>
Co-authored-by: Kevin Minehart <[email protected]>
Co-authored-by: Diego Augusto Molina <[email protected]>
(cherry picked from commit 8f7352e)

Co-authored-by: Josh Hunt <[email protected]>
…CE and LFI vulnerability (grafana#94969)

* remove sql expressions - backport 11.1.x

* Run `make gen-go` and `go mod tidy`

---------

Co-authored-by: Scott Lepper <[email protected]>
@matejkubinec matejkubinec self-requested a review October 23, 2024 09:07
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.