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

[ACM Obs bot] Bump stolostron/grafana to v11.5.2 #252

Open
wants to merge 4,581 commits into
base: release-2.14
Choose a base branch
from

Conversation

acm-observability-bot[bot]
Copy link

Description

This is an automated version bump from CI.
The logs for this run can be found in the syncbot repo actions.
If you wish to perform this manually, execute the following commands from stolostron/grafana repo:

git fetch https://github.com/grafana/grafana --tags
if ! git merge refs/tags/v11.5.2 --no-edit; then
  git checkout --theirs .betterer.results .drone.yml CHANGELOG.md docs go.mod go.sum go.work go.work.sum pkg scripts lerna.json package.json packages public/app/ yarn.lock SECURITY.md
  git checkout --ours OWNERS
  git add .betterer.results .drone.yml CHANGELOG.md docs go.mod go.sum go.work go.work.sum pkg scripts lerna.json package.json packages public/app/ yarn.lock SECURITY.md OWNERS
  git merge --continue
fi
go mod tidy
go mod vendor
# get rid of old assets as new filenames are generated
rm -rf ./public/build/

# generate nodejs files, using docker since it appears to be problematic doing
# it directly in the github action runner.
docker build --target js-builder -t grafana-js-build .
docker create --name grafana-jsbuild grafana-js-build:latest
docker cp grafana-jsbuild:/tmp/grafana/public/build ./public/
docker rm grafana-jsbuild

# Generate go files with wire
go mod download
go run ./pkg/build/wire/cmd/wire/main.go gen -tags oss ./pkg/server

# Commit assets
git add pkg/server/wire_gen.go ./public/build ./public/app/plugins/datasource/*/dist/*
git diff --cached --exit-code || git commit -s -m "[bot] assets: generate"

if [ -f scripts/rh-manifest.sh ]; then
  bash scripts/rh-manifest.sh
  git add rh-manifest.txt
  git diff --cached --exit-code || git commit -s -m "[bot] update rh-manifest.txt"
fi

s4kh and others added 30 commits January 7, 2025 10:27
* Chore: remove betterer:json script

* codeowners
* Updates for profile doc restructure

* Updates from prettier
Co-authored-by: Isabel Matwawana <[email protected]>
Co-authored-by: Isabel Matwawana <[email protected]>
k8s dashboard - fix user parsing/fetching
* update for get-started-part-3

* update

* pretty

* typo

* clarification

* clarification2

* pretty2
…afana#98592)

* Include folder UID when loading dashboards
* Remove folder UID lookup
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…ana#98607)

add single flight groups for user and anonymous permission checking
…grafana#97802)

* added selector for older versions of selector menu.

* added test-id to the portal container.

* fixed import order.
… form (grafana#98052)

* Add tests for combination of switch

* refactor test

* use alerting option for default datasource in RuleEditor Grafana rules test

* add test for grafana recording rules

* use enum for grafana steps in tests

* dont make each test dependent on previous localstorage

* add test for local storage
…afana#98577)

* Change usePluginInfo to keep installed and latest version

* fix tests, delete console.log

* fix isManaged plugin which s not installed

* refactor add versions into info
joshhunt and others added 19 commits February 12, 2025 16:03
Chore: pin tonistiigi/binfmt version (grafana#100510)

* Chore: pin tonistiigi/binfmt version

* change version to qemu-v7.0.0-28

* uninstall first, log version

* uninstall first, log version

* uninstall first, log version

(cherry picked from commit a9b4b1e)
…a#100527)

CI: Add release branches to patch automation (grafana#100442)

* CI: Add release branches to patch automation

* Update .github/workflows/create-security-patch-from-security-mirror.yml

Co-authored-by: Agnès Toulet <[email protected]>

---------

Co-authored-by: Agnès Toulet <[email protected]>
(cherry picked from commit a8b98de)

Co-authored-by: Kevin Minehart <[email protected]>
…100355)

Auth: Fix redirect with JWT auth URL login (grafana#100295)

fix

(cherry picked from commit acc1521)

Co-authored-by: Misi <[email protected]>
… for JWT auth (grafana#100574)

Auth: Add early return if `auth_token` is in the URL for JWT auth (grafana#100539)

* Add early return

* Update public/app/app.ts

Co-authored-by: Victor Cinaglia <[email protected]>

---------

Co-authored-by: Victor Cinaglia <[email protected]>
(cherry picked from commit 5a6d2f2)

Co-authored-by: Misi <[email protected]>
…na#100582)

AuthN: Refetch user on "ErrUserAlreadyExists" (grafana#100346)

* AuthN: Refetch user on "ErrUserAlreadyExists"

(cherry picked from commit 0b4c622)

Co-authored-by: Karl Persson <[email protected]>
…grafana#100620)

Co-authored-by: Victor Cinaglia <[email protected]>
Fix URLs to auth providers from Team Sync page (grafana#100563)
…100633)

Dashboards: Bring back scripted dashboards (grafana#100575)

* Dashboards: Bring back scripted dashboards

* Fix scripted dashboard examples

* Fix dashboard-solo page not respecnig scripted dashboards

(cherry picked from commit 7edcde6)
…hen using searchLayout (grafana#100632)

Dashboards: Fix repeats not being added on refresh when using searchLayout (grafana#100621)

Fix repeats not being added

(cherry picked from commit 1018aec)

Co-authored-by: Oscar Kilhed <[email protected]>
…in SSO configs (grafana#100649)

IAM: Log error when malformed json arrays are found in SSO configs (grafana#99896)

(cherry picked from commit eeadb7e)
…afana#100628)

Metrics: Use correct gatherer in graphite bridge (grafana#100624)

(cherry picked from commit 5a74a1a)

Co-authored-by: Todd Treece <[email protected]>
…t in Tempo data source (grafana#100668)

Co-authored-by: Jack Baldry <[email protected]>
Co-authored-by: Kim Nylander <[email protected]>
…ns` (grafana#100708)

Alerting docs: update `Configure Webhook notifications` (grafana#100650)

* Alerting docs: update `Configure Webhook notifications`

* fix typo

* fix typo

* Update docs/sources/alerting/configure-notifications/manage-contact-points/integrations/webhook-notifier.md

Co-authored-by: Matthew Jacobson <[email protected]>

* Update docs/sources/alerting/configure-notifications/manage-contact-points/integrations/webhook-notifier.md

Co-authored-by: Matthew Jacobson <[email protected]>

* fix typo

* Add `Note` to  configure either HTTP Basic Authentication or the Authorization request header

* Use `inline` format for JSON keys

---------

Co-authored-by: Matthew Jacobson <[email protected]>
(cherry picked from commit f1b4678)

Co-authored-by: Pepe Cano <[email protected]>
CI: Backport to release branches (grafana#100067)

* update backport and release comms

* Backport to release branches and change docs source branch for publishing

* Add new workflows to CODEOWNERS

* Re-add removed line oops

* backport-testing -> grafana

* checkout grafana repo in backport action, reference repo / branch in reusable action

* generate -> create

(cherry picked from commit 6787cdc)
…00739)

Docker: Missing libresolv.so.2 from glibc (grafana#100729)

* Docker: Missing libresolv.so.2 from glibc

* Misplaced &&

(cherry picked from commit 3a8a24e)

Co-authored-by: Kevin Minehart <[email protected]>
Update whatsnewURL in package.json (grafana#100753)

(cherry picked from commit cd30f38)

Co-authored-by: Kevin Minehart <[email protected]>
commit 9ab71586785f743cfcc8312171bcecbe3967e1f6
Author: AgnesToulet <[email protected]>
Date:   Tue Feb 11 10:57:05 2025 +0100

    Dashboards: Prevent title longer than 5 000 characters

    (cherry picked from commit f9e0789210004b0bd7902255644ef348ae7b3aa8)
Copy link

openshift-ci bot commented Mar 7, 2025

Hi @acm-observability-bot[bot]. Thanks for your PR.

I'm waiting for a stolostron member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Copy link

openshift-ci bot commented Mar 7, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: acm-observability-bot[bot]
Once this PR has been reviewed and has the lgtm label, please assign subbarao-meduri for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@jacobbaungard
Copy link

/ok-to-test

Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@acm-observability-commit-bot acm-observability-commit-bot bot force-pushed the automated-updates-acm-release-2.14 branch from 08ecda3 to 4890d33 Compare March 10, 2025 00:56
Copy link

openshift-ci bot commented Mar 10, 2025

@acm-observability-bot[bot]: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/images 4890d33 link true /test images
ci/prow/pr-image-mirror 4890d33 link true /test pr-image-mirror

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

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

Successfully merging this pull request may close these issues.