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

Release of v9.5.12 #75

Merged
merged 3,320 commits into from
Oct 9, 2023
Merged

Release of v9.5.12 #75

merged 3,320 commits into from
Oct 9, 2023

Conversation

Frzk
Copy link
Contributor

@Frzk Frzk commented Oct 9, 2023

Fixed package.json, go.mod and the git merge mess.
Fixes #68

dsotirakis and others added 30 commits May 12, 2023 13:25
…nd` pipeline (#68348) (#68368)

CI: Add `.drone.yml` in pathschanged trigger for `lint_backend` pipeline (#68348)

Add .drone.yml in pathschanged for lint_backend

(cherry picked from commit b7b1306)

# Conflicts:
#	.drone.yml
…Env variables (#68375)

Settings: Add ability to override `skip_org_role_sync` with Env variables (#68364)

Switch to using the SectionsWithOverride for settings for skip org role sync

(cherry picked from commit 1a79c8a)

Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com>
CloudMonitor: Show template variables by default (#68331)

CloudMonitor: show template variables by default
(cherry picked from commit 9503f22)

Co-authored-by: Adam Simpson <adam@adamsimpson.net>
…e annotations (#68122) (#68189)

* Alerting: Omit "description" and "summary" from default email template annotations (#68122)

(cherry picked from commit 720b5b3)

Co-authored-by: Matthew Jacobson <matthew.jacobson@grafana.com>
Wording changes to improve clarity. (#66045)

* Wording changes to improve clarity.

* Update docs/sources/setup-grafana/set-up-for-high-availability.md

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>

* Update docs/sources/setup-grafana/set-up-for-high-availability.md

* Update docs/sources/setup-grafana/set-up-for-high-availability.md

* Update docs/sources/setup-grafana/set-up-for-high-availability.md

* Update docs/sources/setup-grafana/set-up-for-high-availability.md

* Update docs/sources/setup-grafana/set-up-for-high-availability.md

* ran doc validator, make corrections

---------

Co-authored-by: Eve Meelan <81647476+Eve832@users.noreply.github.com>
Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
Co-authored-by: Chris Moyer <chris.moyer@grafana.com>
(cherry picked from commit fd83b17)

Co-authored-by: colinedwardwood <colin.wood@grafana.com>
Plugins doc review chunk 2 (#67691)

* Doc style edit for 7 topics

Signed-off-by: Joe Perez <joseph.perez@grafana.com>

* Proofread topics

Signed-off-by: Joe Perez <joseph.perez@grafana.com>

* Prettier

Signed-off-by: Joe Perez <joseph.perez@grafana.com>

* Doc fix

Signed-off-by: Joe Perez <joseph.perez@grafana.com>

* Update docs/sources/developers/plugins/add-query-editor-help.md

Co-authored-by: Jack Westbrook <jack.westbrook@gmail.com>

* Doc fixes

Signed-off-by: Joe Perez <joseph.perez@grafana.com>

* Changes from doc review

Signed-off-by: Joe Perez <joseph.perez@grafana.com>

* Incorporate review feedback

Signed-off-by: Joe Perez <joseph.perez@grafana.com>

* More fixes

Signed-off-by: Joe Perez <joseph.perez@grafana.com>

* More doc fixes

Signed-off-by: Joe Perez <joseph.perez@grafana.com>

---------

Signed-off-by: Joe Perez <joseph.perez@grafana.com>
Co-authored-by: Jack Westbrook <jack.westbrook@gmail.com>
(cherry picked from commit 49a18bc)

Co-authored-by: Joseph Perez <45749060+josmperez@users.noreply.github.com>
Heatmap: Fix log scale editor (#68132)

(cherry picked from commit 4ee894b)

Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
…etwork requests for query var with ${__searchFilter} (#68081)

Template Variables: Input field in dashboard does not send network requests for query var with ${__searchFilter} (#67839)

Co-authored-by: Ivan Ortega Alba <ivanortegaalba@gmail.com>
(cherry picked from commit 6137e45)

Co-authored-by: Polina Boneva <13227501+polibb@users.noreply.github.com>
* CI: Port of init-enterprise fix from 9.4.10

* CI: Update grabpl to 3.0.34

(cherry picked from commit 35ccfa6)

Backport of grafana/grafana#68456
… (#68472)

CI: Add delivery bot secrets to publish images step (#68467)

Add delivery bot secrets

(cherry picked from commit 5562261)

# Conflicts:
#	.drone.yml
#	scripts/drone/vault.star
Canvas: Fix field not found (#68415)

(cherry picked from commit 92d865c)

Co-authored-by: Adela Almasan <88068998+adela-almasan@users.noreply.github.com>
Tempo: Fix get label values based on CoreApp type (#68463)

Fix and update test

(cherry picked from commit a1f76af)
…updated (#68536)

Dashboard: Fix library panels in collapsed rows not getting updated (#66643)

(cherry picked from commit f478504)

Co-authored-by: Victor Colomb <51762123+VictorColomb@users.noreply.github.com>
docs: add list of angular plugins, update guidance (#68096)

* docs: add list of angular plugins, update guidance

* fix lint error

(cherry picked from commit b8a9f5c)

Co-authored-by: David Harris <david.harris@grafana.com>
Chore: remove pre tags from DOMPurify config (#68512)

(cherry picked from commit 4ccaf80)

Co-authored-by: Kristian Bremberg <114284895+KristianGrafana@users.noreply.github.com>
Docs: Update run behind proxy docs (#68608)

(cherry picked from commit 5457a9e)

Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
Explore: Remove data source onboarding page (#68131)

* Remove EmptyStateWrapper

(cherry picked from commit cee838c)

Co-authored-by: Haris Rozajac <58232930+harisrozajac@users.noreply.github.com>
Dashboard: Re-align Save form (#68565)

flex direction column does not add anything to the layout in the save form, but has an alignment issue in safari

(cherry picked from commit 71e7ec1)

Co-authored-by: Polina Boneva <13227501+polibb@users.noreply.github.com>
Dashboards: Remove no-datasource screen (#68574)

* Dashboards: Remove non-ds configured landing page

* Remove `datasourceOnboarding` feature toggle

(cherry picked from commit 1505a18)
Revert: Allow editors to access GET /datasources (#68632)

Revert "Allow editors to access GET /datasources"

This reverts commit 5a830c43c0f4793726b9826aee063da114e88738.

(cherry picked from commit 6a2bcba)

Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com>
Barchart: Apply field visibility to traceID (#68524)

(cherry picked from commit 160e207)

Co-authored-by: Drew Slobodnjak <60050885+drew08t@users.noreply.github.com>
…egated (#68691)

Service graph: Fix error when service graph metrics are aggregated (#68613)

make service graph work with aggregated metrics

(cherry picked from commit e1c2eb8)

Co-authored-by: Domas <domasx2@gmail.com>
…oud (#68720)

Clarify Graphite version and type to set if using Grafana Cloud (#68239)

* Clarify Graphite version and type to set if using Grafana Cloud

* Update _index.md

(cherry picked from commit 9f7f82c)

Co-authored-by: Fiona Liao <fiona.y.liao@gmail.com>
…(#68685)

* G10: Post `docker pull` commands for local testing (#67489)

* Add grabpl publish images

Update grabpl - add github pr token

* Replace github_pr_token with gh app

# Conflicts:
#	.drone.yml
#	scripts/drone/vault.star

# Conflicts:
#	.drone.yml

# Conflicts:
#	.drone.yml

* Lint starlark

Add forgotten secrets

Lint starlark

Change secrets

* Update grabpl to v3.0.35

* Lint starlark

* Remove unnecessary secrets

(cherry picked from commit 26bacf6)

# Conflicts:
#	.drone.yml

* Update grabpl to v3.0.36
fixed broken table format in docs (#68711)

* fixed broken table format in docs

* added prettier version of doc

(cherry picked from commit dc656ec)

Co-authored-by: Krishna Dutt Panchagnula <krishnadutt123@gmail.com>
…d route (#68776)

RBAC: Remove legacy AC editor and admin role on new dashboard route (#68762)

remove legacy AC editor and admin role on new dashboard route

(cherry picked from commit 94283f5)

Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com>
… (#68783)

Docker images: Don't fail if a PR comes from a fork (#68765)

* Update grabpl

* Allow publish images to fail for PRs

(cherry picked from commit 04e2d90)

# Conflicts:
#	.drone.yml
…ariables are correctly migrated (#68790)

AzureMonitor: Ensure legacy properties containing template variables are correctly migrated (#68697)

* Update migration ordering

- Update migration in applyTemplateVariables to account for interpolation from expression datasource
- Update mock to ensure overrides are passed through correctly
- Update tests
- Update migrateQuery function name for clarity

* Fix tests

* Remove comment

(cherry picked from commit 0be29b4)

Co-authored-by: Andreas Christou <andreas.christou@grafana.com>
grafana-delivery-bot bot and others added 25 commits August 29, 2023 17:15
Update _index.md - fix a typo (#63847)

Update _index.md

Fix a typo

(cherry picked from commit 0ca5ecb)

Co-authored-by: yeya <yeya@users.noreply.github.com>
Docs: Include Cloud support with RBAC API (#73522)

Update access_control.md

Update to show that RBAC HTTP API can be used with a Cloud account also.

(cherry picked from commit d8fd4c2)

Co-authored-by: sarah-spang <86264026+sarah-spang@users.noreply.github.com>
CI: Mount /root/.docker/ dir in authenticate-gcr step  (#73977)

Mount /root/.docker/ dir

(cherry picked from commit eea4ade)

# Conflicts:
#	.drone.yml
Pa11y: Temporarily increase threshold (#73817)

Update pa11y threshold to unblock prs

(cherry picked from commit 61835f0)

Co-authored-by: Tobias Skarhed <1438972+tskarhed@users.noreply.github.com>
Add LICENSE file to generated Docker images (#74082)

(cherry picked from commit 6277c04)

Co-authored-by: Horst Gutmann <horst.gutmann@grafana.com>
* [LDAP] Disable removed users on login (#74016)

* [LDAP] Disable removed users on login

* Fix tests

* Add test for user disabling

* Add tests for disabling user behind auth proxy

* Linting.

* Rename setup func

* Account for reviews comments

Co-authored-by: Kalle Persson <kalle.persson@grafana.com>

---------

Co-authored-by: Kalle Persson <kalle.persson@grafana.com>
(cherry picked from commit f900098)

* manual backport of #74016

* LDAP: Fix active sync with large quantities of users (#73834)

* Fix middleware test

---------

Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
Co-authored-by: Gabriel MABILLE <gabriel.mabille@grafana.com>
Docker: Add musl as a ubuntu dependency (#74127)

Add musl as a ubuntu dependency

(cherry picked from commit 364ca3d)

Co-authored-by: Kevin Minehart <kmineh0151@gmail.com>
Update `make docs` procedure (#74152)

Co-authored-by: grafanabot <bot@grafana.com>
(cherry picked from commit 485f07c)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
… interface (#73766)

* Update all use of docs/shared in Grafana to use keyword arguments

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>

* Add version inference to remaining Grafana docs/shared usage

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>

---------

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
* Replaced partial URL with relref

* Changed link path

Co-authored-by: Jack Baldry <jack.baldry@grafana.com>

---------

Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
CI: Use new release eng managed grafanacom api key (#74017)

Use new release eng managed grafanacom api key

(cherry picked from commit ab7e655)
Docs: reorder visualizations pages (#74047)

* Changed order of visualization docs

* Fixed weight of missed page

(cherry picked from commit 27c4362)
…357)

PromLink: Fixes promlink test failing in CI and locally (#74299)

(cherry picked from commit 39b3b08)

Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
Chore: Upgrade Go to 1.20.8 (#74978)

chore: Update to Go 1.20.8
(cherry picked from commit 39dbd98)
Chore: Upgrade Alpine base image to 3.18.3 (#74984)

(cherry picked from commit 85abf2b)
Co-authored-by: grafana-delivery-bot[bot] <132647405+grafana-delivery-bot[bot]@users.noreply.github.com>
* Backport workload identity changes

* Tidy go.mod

* Add missing flag

(cherry picked from commit b52b829)
…730)

* Azure: Add support for Workload Identity authentication (#75681)

* Update Azure Monitor

* Update Prometheus

* Update README

* Update docs/sources/datasources/azure-monitor/_index.md

Co-authored-by: Andrew Hackmann <5140848+bossinc@users.noreply.github.com>

* Update docs/sources/datasources/azure-monitor/_index.md

Co-authored-by: Beverly <131809838+BeverlyJaneJ@users.noreply.github.com>

* Update docs/sources/datasources/azure-monitor/_index.md

Co-authored-by: Beverly <131809838+BeverlyJaneJ@users.noreply.github.com>

* Update docs/sources/datasources/azure-monitor/_index.md

Co-authored-by: Beverly <131809838+BeverlyJaneJ@users.noreply.github.com>

* README updates

* Fix prettier

* memoize options

---------

Co-authored-by: Andrew Hackmann <5140848+bossinc@users.noreply.github.com>
Co-authored-by: Beverly <131809838+BeverlyJaneJ@users.noreply.github.com>
(cherry picked from commit 5796836)

# Conflicts:
#	public/app/plugins/datasource/azuremonitor/components/AzureCredentialsForm.tsx
#	public/app/plugins/datasource/prometheus/configuration/AzureCredentialsForm.tsx

* Fix types

(cherry picked from commit 56f430f)
Co-authored-by: grafana-delivery-bot[bot] <132647405+grafana-delivery-bot[bot]@users.noreply.github.com>
* Exclude 32 bit arm builds

* Bump grabpl - remove arm/v7 from build.star
@Frzk Frzk requested a review from EtienneM October 9, 2023 07:24
Copy link
Member

@EtienneM EtienneM left a comment

Choose a reason for hiding this comment

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

Yes gg!

@Frzk Frzk merged commit 5ec509e into master Oct 9, 2023
@Frzk Frzk deleted the release/v9.5.12 branch October 9, 2023 08:11
@Frzk Frzk mentioned this pull request Oct 9, 2023
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.

Upgrade from 9.3.2 to 9.5.13