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 2023.1] feature(monitoring): set the scylla monitoring image to 4.8.0 #8331

Merged
merged 7 commits into from
Aug 12, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Aug 11, 2024

Set the monitoring image to version 4.8.0

Testing

(cherry picked from commit aa8930a )

(cherry picked from commit 47b43b9 )

(cherry picked from commit 0b7842d )

(cherry picked from commit 1215819 )

(cherry picked from commit 9282de2 )

Parent PR: #8005

@mergify mergify bot added the conflicts label Aug 11, 2024
@mergify mergify bot assigned amnonh Aug 11, 2024
Copy link
Author

mergify bot commented Aug 11, 2024

Cherry-pick of aa8930a has failed:

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

You are currently cherry-picking commit aa8930a45.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   defaults/aws_config.yaml

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 47b43b9 has failed:

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

You are currently cherry-picking commit 47b43b911.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   defaults/gce_config.yaml

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 0b7842d has failed:

On branch mergify/bp/branch-2023.1/pr-8005
Your branch is ahead of 'origin/branch-2023.1' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 0b7842da3.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   defaults/test_default.yaml

no changes added to commit (use "git add" and/or "git commit -a")

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 August 11, 2024 17:03
@fruch fruch force-pushed the mergify/bp/branch-2023.1/pr-8005 branch from c411187 to c804a88 Compare August 12, 2024 13:08
@fruch fruch removed the conflicts label Aug 12, 2024
amnonh and others added 5 commits August 12, 2024 16:23
code has binaries for multiple platfroms, but we don't use those
at all, and we don't need to back them up every time.

(cherry picked from commit 1215819)
passing `height=-1` for automatic calculation of height, was broken
for a few releases, in this release it should work when `kisok` parameter
is also being passed

(cherry picked from commit 9282de2)
too many time we have case the headline is more then 72
that seems a bit too small to be descriptive

updating it to be bigger
since dependabot is using this scope, we should fail
CI checks on it (it's easier then teaching it to switch the text)
@fruch fruch force-pushed the mergify/bp/branch-2023.1/pr-8005 branch from c804a88 to eeb2abb Compare August 12, 2024 13:23
@fruch fruch marked this pull request as ready for review August 12, 2024 13:24
@fruch fruch merged commit 592b196 into branch-2023.1 Aug 12, 2024
6 checks passed
@mergify mergify bot deleted the mergify/bp/branch-2023.1/pr-8005 branch August 12, 2024 21:12
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.

2 participants