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.2.0 #206

Open
wants to merge 1,396 commits into
base: release-2.12
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.2.0 --no-edit; then
  git checkout --theirs .drone.yml CHANGELOG.md docs go.mod go.sum go.work go.work.sum pkg lerna.json package.json packages public/app/ yarn.lock
  git checkout --ours OWNERS
  git add .drone.yml CHANGELOG.md docs go.mod go.sum go.work go.work.sum pkg lerna.json package.json packages public/app/ yarn.lock 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

renovate bot and others added 30 commits August 6, 2024 14:41
* add link to docs page

* add link to docs

* a word
…re data sources (grafana#91545)

* minor performance improvement

* apply a warning to any non-core plugins that successfully migrate

* commit frontend wip while I refactor some stuff

* update api

* repurpose error dialog to be a generic details dialog

* whitespace

* add unit test

* fixes from testing

* fix migration summary

* add comment

* fix localization stuff

* fix backend test

* reduce number of queries to the db

* some PR feedback

* whitespace
Co-authored-by: Jennifer Villa <jvilla2013@gmail.com>
Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
grafana#91340)

* Add migration to enable TraceQL streaming for Tempo datasources

* lint

* Always run migration but exit early if feature flag is disabled

* Require feature toggle OR datasource config to enable streaming
* remove count method

* remove count from remote cache

---------

Co-authored-by: jguer <me@jguer.space>
…s loading (grafana#91468)

* Add useNotificationTemplates hook to abstract away templates loading

* Add useUpdateNotificationTemplate hook to abstract away updating logic

* Add useDeleteNotificationTemplate hook to abstract away deletiong logic

* Fix and update templatestable tests

* Remove old code

* Improve error handling

* Remove obsolete test

* Fix and improve tests

* Adjust code style

* Update test snapshot, remove redirects in hooks

* Remove unused code, add provenance none handling, fix redirect url

* Improve provisioning state handling
fix type + prefix/suffix
* Update Yarn to v4.4.0

* add new yarn version

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
…rafana#91596)

* chore: preallocate slices where we have a good idea of requirements

* pr feedback
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Isabel Matwawana <76437239+imatwawana@users.noreply.github.com>
…rafana#91423)

add IRM plugin to "Alerts & IRM" left-hand navigation group
…91357)

Cloudwatch: clear cached PDC transport when PDC is disabled
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
grafana-delivery-bot bot and others added 18 commits September 24, 2024 09:07
…on labels (grafana#93579)

Docs > alerting: example of conditional notification based on labels (grafana#93541)

* Docs > alerting: example of conditional notification based on labels

* typos

* Update docs/sources/alerting/configure-notifications/template-notifications/create-notification-templates.md

Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>

---------

Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>
(cherry picked from commit c78ea87)

Co-authored-by: antonio <45235678+tonypowa@users.noreply.github.com>
Fix deps on panel options (grafana#93647)

(cherry picked from commit 764ec26)

Co-authored-by: Victor Marin <36818606+mdvictor@users.noreply.github.com>
…eld overrides (grafana#93663)

FieldOverrides: Clear displayName caching after applying field overrides (grafana#93651)

* FieldOverrides: Clear displayName caching after applying field overrides

* Remove old comment

(cherry picked from commit f04e032)

Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
…ng (grafana#93690)

DashboardScene: Fix broken error handling and error rendering (grafana#93680)

(cherry picked from commit 05dbba4)

Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
AzureMonitor: Deduplicate resource picker rows (grafana#93129)

* Use URI for querying resources in RG

- Ensure resource group names are correctly slash separated

* Update test

(cherry picked from commit 76c8975)

Co-authored-by: Andreas Christou <andreas.christou@grafana.com>
)

Alerting docs: update `Configure Alertmanagers` (grafana#93712)

* Alerting docs: update `Configure Alertmanagers`
- clarify alertmanager types
- specify that each alertmanager manages its own alerting resources

* Update docs/sources/alerting/set-up/configure-alertmanager/index.md

Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>

* Update docs/sources/alerting/set-up/configure-alertmanager/index.md

Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>

* Update docs/sources/alerting/set-up/configure-alertmanager/index.md

Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>

* use `Alertmanager` - capitalize the first letter

* Small copy changes

* Minor cosmetic updates to `Add an Alertmanager` section

* Update docs/sources/alerting/set-up/configure-alertmanager/index.md

Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>

---------

Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>
(cherry picked from commit 7590013)

Co-authored-by: Pepe Cano <825430+ppcano@users.noreply.github.com>
…a#93679)

TraceView: Fix for toString() usage in span filters (grafana#93648)

Fix for toString() usage

(cherry picked from commit d30dc3a)
…ss Explore (grafana#93676)

Correlations: Limit access to correlations page to users who can access Explore (grafana#93519)

Correlations: Limit access to correlations page to users who can access Explore
(cherry picked from commit 813e1c1)

Co-authored-by: Piotr Jamróz <pm.jamroz@gmail.com>
…grafana#93796)

Dashboards: Fix issue with percentage difference formatting (grafana#93389)

* Dashboards: Fix issue with percentage difference formatting

---------

Co-authored-by: Ihor Yeromin <yeryomin.igor@gmail.com>
(cherry picked from commit 6c8f24a)

Co-authored-by: kay delaney <45561153+kaydelaney@users.noreply.github.com>
* Update changelog

* Update version to 11.2.1

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
[DOC] Add videos to Explore docs (grafana#93847)

* Add videos to Explore docs

* Apply suggestions from code review

(cherry picked from commit 6951fef)

Co-authored-by: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com>
* CI: Update retry_command function (grafana#93863)

* baldm0mma/update args

* baldm0mma/update_args/ conflict

(cherry picked from commit b17b98a)

* make drone
CI: Bump alpine version (grafana#93865)

* baldm0mma/up_alpine/ update alpine

* baldm0mma/resolve commits

(cherry picked from commit dc1670e)
Co-authored-by: Irene Rodriguez <irene.rodriguez@grafana.com>
…l-rule-write-endpo.patch

commit a2c5ee91899ce8934453e5f8b933a9ad4fa8f7f1
Author: Alex Weaver <weaver.alex.d@gmail.com>
Date:   Thu Aug 22 11:52:43 2024 -0500

    Alerting: Fix permission on external rule write endpoint
* Cloud migrations: disable flaky test

* Update pkg/services/cloudmigration/cloudmigrationimpl/xorm_store_test.go

Co-authored-by: Kevin Minehart <5140827+kminehart@users.noreply.github.com>

---------

Co-authored-by: Kevin Minehart <5140827+kminehart@users.noreply.github.com>
Copy link

sonarcloud bot commented Sep 30, 2024

Quality Gate Failed Quality Gate failed

Failed conditions
19.5% Coverage on New Code (required ≥ 70%)
D Reliability Rating on New Code (required ≥ A)
E Security Rating on New Code (required ≥ A)

See analysis details on SonarCloud

Catch issues before they fail your Quality Gate with our IDE extension SonarLint

Copy link

openshift-ci bot commented Sep 30, 2024

@acm-observability-bot[bot]: The following test 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/sonar-pre-submit 1a3fbc0 link true /test sonar-pre-submit

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.

kminehart and others added 2 commits October 2, 2024 14:56
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)
commit d0cc77124a9470d879543ad080e10cb1f9535823
Author: Scott Lepper <scott.lepper@gmail.com>
Date:   Mon Sep 30 11:18:26 2024 -0400

    remove sql expressions - backport 11.1.x
kminehart and others added 5 commits October 15, 2024 15:00
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)
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>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
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.