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

[Backport 2024.1] feature(monitoring): take screenshots with grafana image renderer #7522

Merged
merged 1 commit into from
Jun 2, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented May 31, 2024

  • switch to grafana image renderer
  • drop all of webdriver related implementation
  • remove grafana snapshots - it's not in use for quite some time

TODO:

  • - remove selenium from hydra image

Testing

PR pre-checks (self review)

  • I added the relevant backport labels
  • I didn't leave commented-out/debugging code

Reminders

  • Add New configuration option and document them (in sdcm/sct_config.py)
  • Add unit tests to cover my changes (under unit-test/ folder)
  • Update the Readme/doc folder relevant to this change (if needed)

(cherry picked from commit 955d14a)

(cherry picked from commit da5f0d4)

Parent PR: #7503

@mergify mergify bot added the conflicts label May 31, 2024
@mergify mergify bot assigned fruch May 31, 2024
Copy link
Author

mergify bot commented May 31, 2024

Cherry-pick of 955d14a has failed:

On branch mergify/bp/branch-2024.1/pr-7503
Your branch is up to date with 'origin/branch-2024.1'.

You are currently cherry-picking commit 955d14af.
  (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:   sdcm/cluster.py
	modified:   sdcm/logcollector.py
	modified:   sdcm/monitorstack/ui.py

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by them: sdcm/utils/remotewebbrowser.py

Cherry-pick of da5f0d4 has failed:

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

You are currently cherry-picking commit da5f0d43.
  (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:   requirements.in
	modified:   sdcm/utils/log.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docker/env/version
	both modified:   requirements.txt

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 marked this pull request as draft May 31, 2024 11:59
@fruch fruch force-pushed the mergify/bp/branch-2024.1/pr-7503 branch from f479035 to f92c127 Compare June 2, 2024 08:27
@fruch fruch removed the conflicts label Jun 2, 2024
@fruch fruch marked this pull request as ready for review June 2, 2024 08:27
@fruch
Copy link
Contributor

fruch commented Jun 2, 2024

@mergify rebase

- switch to grafana image renderer
- drop all of webdriver related implemetion
- remove grafana snapshots - it's not in use for quite some time

(cherry picked from commit 955d14a)

# Conflicts:
#	sdcm/utils/remotewebbrowser.py
Copy link
Author

mergify bot commented Jun 2, 2024

rebase

✅ Branch has been successfully rebased

@fruch fruch force-pushed the mergify/bp/branch-2024.1/pr-7503 branch from f92c127 to 0b0bc50 Compare June 2, 2024 09:59
@fruch fruch merged commit cc87a76 into branch-2024.1 Jun 2, 2024
6 checks passed
@mergify mergify bot deleted the mergify/bp/branch-2024.1/pr-7503 branch June 2, 2024 13:38
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.

1 participant