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

Dashboards/Snapshots Changes (backport #148) #151

Closed
wants to merge 2 commits into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 26, 2024

A bunch of changes that came out of the perf testing.

  • Updated the default dashboard
  • Changed the grafana config to persist the data backing the snapshot
  • Changed the snapshot code to actually find the proper elements
  • Updated the snapshot code to make sure that all of the graphs rendered by increasing viewport size
    This is an automatic backport of pull request Dashboards/Snapshots Changes #148 done by Mergify.

(cherry picked from commit 514acdc)
(cherry picked from commit fb0f65b)

# Conflicts:
#	core/monitoring/grafana_snapshot.go
@mergify mergify bot requested a review from Zygimantass as a code owner November 26, 2024 16:04
@mergify mergify bot added the conflicts label Nov 26, 2024
@mergify mergify bot requested a review from aljo242 as a code owner November 26, 2024 16:04
Copy link
Author

mergify bot commented Nov 26, 2024

Cherry-pick of fb0f65b has failed:

On branch mergify/bp/release/v2.x.x/pr-148
Your branch is ahead of 'origin/release/v2.x.x' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit fb0f65b.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   core/monitoring/files/grafana/config/config.ini
	new file:   core/monitoring/files/grafana/config/dashboard-backup.json
	modified:   core/monitoring/files/grafana/config/dashboard.json
	modified:   core/monitoring/grafana.go
	modified:   core/monitoring/prometheus.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   core/monitoring/grafana_snapshot.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot requested a review from Eric-Warehime as a code owner November 26, 2024 16:04
@Zygimantass Zygimantass closed this Jan 3, 2025
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.

2 participants