PMM-12114 Grafana 9.2.18 #668
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ana#58145) (cherry picked from commit 372ba83) Co-authored-by: Marcos Vinicius <[email protected]>
…ir (grafana#57863) (grafana#58147) (cherry picked from commit 4d88e2b) Co-authored-by: Leon Sorokin <[email protected]>
…fana#58151) (cherry picked from commit 4b1ddba) Co-authored-by: Sven Grossmann <[email protected]>
(cherry picked from commit 1722000) Co-authored-by: Christopher Moyer <[email protected]>
…na#58222) Co-authored-by: Gilles De Mey <[email protected]>
…#58243) * add explicit build step for go codeql * support workflow_dispatch for codeql checks * syntax fix * enable on push to codeql-go branch * test * use go version from go.mod * explicitly set go version * tidy up, add workflow_dispatch support to all codeql actions (cherry picked from commit da9c646) Co-authored-by: Dan Cech <[email protected]>
…hboard folder name (grafana#57716) (grafana#57949) * Search: Read from url on mount no on app boot * Fixed tests * Remove unused type (cherry picked from commit 3991be4) Co-authored-by: Torkel Ödegaard <[email protected]>
Co-authored-by: Ryan McKinley <[email protected]>
…na#58030) (grafana#58298) * Fix timeseries fill below to error * wip * modifications * add tests for fillBelowTo option (cherry picked from commit d673c88) Co-authored-by: Victor Marin <[email protected]>
…#58226) (grafana#58308) (cherry picked from commit b1bfae0) Co-authored-by: Oscar Kilhed <[email protected]>
…rafana#58217) (grafana#58225) (cherry picked from commit 9ff2765) Co-authored-by: Josh Hunt <[email protected]>
…#58323) (cherry picked from commit d4e3d47) Co-authored-by: Josh Hunt <[email protected]>
…fana#58314) (cherry picked from commit d001a1b) Co-authored-by: Andres Martinez Gotor <[email protected]>
(cherry picked from commit b799be3) Co-authored-by: dessen-xu <[email protected]>
(cherry picked from commit 6bc8ec0) Co-authored-by: Galen Kistler <[email protected]>
…a#58346) (cherry picked from commit bc280d0) Co-authored-by: Si Mon <[email protected]>
…58248) (grafana#58354) (cherry picked from commit b472306)
…a#58356) (cherry picked from commit 8353f30) Co-authored-by: George Robinson <[email protected]>
…rafana#58349) (cherry picked from commit db1fd10) Co-authored-by: Neel <[email protected]>
…afana#57983) * CI: Use full `dockerhub` repository name (grafana#57979) * Add full dockerhub repo name * Update grabpl version (cherry picked from commit 57ee0e4) * sign drone.yml Co-authored-by: Marcus Efraimsson <[email protected]>
* corrects outer join example * Update docs/sources/panels-visualizations/query-transform-data/transform-data/index.md * adds query tables back in (cherry picked from commit 0315f63) Co-authored-by: Christopher Moyer <[email protected]>
…rafana#58256) Move mentions to a markdown-formatted pretext field to prevent issues mixing blocks and legacy-attachment content. (cherry picked from commit d581b36) Co-authored-by: Will Jordan <[email protected]>
…#50780) (grafana#58362) Grafana's HTTPServer ensures that the Content-Type header is always set in the response to a CallResource call, but when the status code is 204 No Content this shouldn't be done; the body should be empty and no Content-Type header should be set. We ran into this in the Grafana ML plugin where we were sending an empty response with status 204, but the frontend client saw that the content type was JSON and tried to parse it, resulting in an error that made it to the JS console. (cherry picked from commit 480277f) Co-authored-by: Ben Sully <[email protected]>
…lace (grafana#58189) (grafana#58418) * Grafana Enterprise Packaging: Set to conflict with `grafana`, not replace When `grafana` and `grafana-enterprise` are in the same RPM repository, grafana-enterprise takes precedence over Grafana This is not what we want. Users should be able to install either OSS or Enterprise * Set it only one way. It's how it's currently tested (cherry picked from commit 786c7fa) Co-authored-by: Julien Duchesne <[email protected]>
(cherry picked from commit 94573d3)
…6853) [docs] remove auth/saml alias from team sync page (grafana#66796) removed auth/saml alias from team sync page (cherry picked from commit 60e6ff1) Co-authored-by: Isabel <[email protected]>
Docs: adds legacy wording to api docs (grafana#66937) adds legacy wording to api docs (cherry picked from commit 9b529ef) Co-authored-by: brendamuir <[email protected]>
Doc: Fix typo (grafana#66929) Update index.md (cherry picked from commit ff61772) Co-authored-by: oneoneonepig <[email protected]>
"Release: Updated versions in package to 9.2.18"
* fix JWT query param leak Co-authored-by: Gabriel MABILLE <[email protected]> Co-authored-by: Kalle Persson <[email protected]> * skip broken test --------- Co-authored-by: jguer <[email protected]> Co-authored-by: Gabriel MABILLE <[email protected]> Co-authored-by: Kalle Persson <[email protected]>
* AuthJWT: Fix JWT query param leak (CVE-2023-1387) [9.2.x] (grafana#827) * fix JWT query param leak Co-authored-by: Gabriel MABILLE <[email protected]> Co-authored-by: Kalle Persson <[email protected]> * skip broken test --------- Co-authored-by: Gabriel MABILLE <[email protected]> Co-authored-by: Kalle Persson <[email protected]> * Update SAML lib * Replace golang.org/x/net with v0.7.0 * Revert "Replace golang.org/x/net with v0.7.0" This reverts commit 5df9a41749131aff2cedd26885429b99fdc4c3fd. --------- Co-authored-by: Jo <[email protected]> Co-authored-by: Gabriel MABILLE <[email protected]> Co-authored-by: Kalle Persson <[email protected]> Co-authored-by: Mihaly Gyongyosi <[email protected]>
…arget in migration (grafana#67501) Influxdb: Handle legacy Influxdb influxql annotations with target in migration (grafana#63225) * handle legacy influxdb annotations with target in migration * add types * don't check tags that are empty strings and give annotation a type (cherry picked from commit 7a3f7e2) Co-authored-by: Brendan O'Handley <[email protected]>
…afana#67526) Grafana Cloud: Add `VariantLinuxAmd64` in build variants (grafana#66167) Add VariantLinuxAmd64 in build variants (cherry picked from commit 8dd87a7) Co-authored-by: Dimitris Sotirakis <[email protected]>
…na#67531) Grafana Cloud: Put cloud artifacts to `*/release` dir (grafana#66168) Put cloud artifacts to */release dir (cherry picked from commit a263449) Co-authored-by: Dimitris Sotirakis <[email protected]>
docs: move misplaced Configure legend page (grafana#67597) * move configure legend page and add alias * updated page weight and tried fixing alias * fixed alias * add preemptive alias for current page location * apply suggestion from review Co-authored-by: Jack Baldry <[email protected]> * apply suggestions from review Co-authored-by: Jack Baldry <[email protected]> * apply suggestions from review Co-authored-by: Jack Baldry <[email protected]> --------- Co-authored-by: Jack Baldry <[email protected]> (cherry picked from commit 688459f) Co-authored-by: Isabel <[email protected]>
Chore: Upgrade Go to 1.20.4
…grafana#68010) * CI: Add Windows backend tests in more places * CI: Add promotion pipeline for publishing new windows-test-images * CI: Ignore windows backend-test failures for now * CI: Fix linting issue in ci_images.star file (cherry picked from commit b2fc285) Backport of grafana#66438
…grafana#68026) * Prometheus: bug in creating autocomplete queries with labels (grafana#68003) Fix bug formatting multiple prometheus labels when doing metric query (cherry picked from commit a1bc1bd)
fabio-silva
approved these changes
May 17, 2023
This was referenced May 18, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does / why we need it:
Provides fixes for CVE in grafana 9.2.13.
Which issue(s) this PR fixes:
PMM-12114
FB: Percona-Lab/pmm-submodules#3272