build: bump kube-prometheus-stack to 61.3.0 #4365

eg-ayoub · 2024-07-10T14:56:44Z

No description provided.

bert-e · 2024-07-10T14:56:48Z

Hello eg-ayoub,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Available options

name	description	privileged	authored
`/after_pull_request`	Wait for the given pull request id to be merged before continuing with the current one.
`/bypass_author_approval`	Bypass the pull request author's approval	⭐
`/bypass_build_status`	Bypass the build and test status	⭐
`/bypass_commit_size`	Bypass the check on the size of the changeset `TBA`	⭐
`/bypass_incompatible_branch`	Bypass the check on the source branch prefix	⭐
`/bypass_jira_check`	Bypass the Jira issue check	⭐
`/bypass_peer_approval`	Bypass the pull request peers' approval	⭐
`/bypass_leader_approval`	Bypass the pull request leaders' approval	⭐
`/approve`	Instruct Bert-E that the author has approved the pull request.		✍️
`/create_pull_requests`	Allow the creation of integration pull requests.
`/create_integration_branches`	Allow the creation of integration branches.
`/no_octopus`	Prevent Wall-E from doing any octopus merge and use multiple consecutive merge instead
`/unanimity`	Change review acceptance criteria from `one reviewer at least` to `all reviewers`
`/wait`	Instruct Bert-E not to run until further notice.

Available commands

name	description	privileged
`/help`	Print Bert-E's manual in the pull request.
`/status`	Print Bert-E's current status in the pull request `TBA`
`/clear`	Remove all comments from Bert-E from the history `TBA`
`/retry`	Re-start a fresh build `TBA`
`/build`	Re-start a fresh build `TBA`
`/force_reset`	Delete integration branches & pull requests, and restart merge process from the beginning.
`/reset`	Try to remove integration branches unless there are commits on them which do not appear on the source branch.

Status report is not available.

bert-e · 2024-07-10T14:56:52Z

Request integration branches

Waiting for integration branch creation to be requested by the user.

To request integration branches, please comment on this pull request with the following command:

/create_integration_branches

Alternatively, the /approve and /create_pull_requests commands will automatically
create the integration branches.

eg-ayoub · 2024-07-16T08:01:47Z

update thanos image in thanos.yaml

bert-e · 2024-07-17T17:27:45Z

Conflict

A conflict has been raised during the creation of
integration branch w/128.0/improvement/bump-grafana-11.1.0 with contents from improvement/bump-grafana-11.1.0
and development/128.0.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/128.0/improvement/bump-grafana-11.1.0 origin/development/128.0
 $ git merge origin/improvement/bump-grafana-11.1.0
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/128.0/improvement/bump-grafana-11.1.0

The following options are set: approve

eg-ayoub · 2024-07-17T17:30:39Z

/create_integration_branches

bert-e · 2024-07-17T17:30:55Z

Conflict

A conflict has been raised during the creation of
integration branch w/128.0/improvement/bump-grafana-11.1.0 with contents from improvement/bump-grafana-11.1.0
and development/128.0.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/128.0/improvement/bump-grafana-11.1.0 origin/development/128.0
 $ git merge origin/improvement/bump-grafana-11.1.0
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/128.0/improvement/bump-grafana-11.1.0

The following options are set: create_integration_branches

eg-ayoub · 2024-07-17T17:38:46Z

/create_pull_requests

bert-e · 2024-07-17T17:38:57Z

Integration data created

I have created the integration data for the additional destination branches.

this pull request will merge improvement/bump-grafana-11.1.0 into
development/127.0
w/128.0/improvement/bump-grafana-11.1.0 will be merged into development/128.0 (pull request INTEGRATION [PR#4365 > development/128.0] build: bump kube-prometheus-stack to 61.3.0 #4372)

The following branches will NOT be impacted:

development/123.0
development/124.0
development/124.1
development/125.0
development/126.0
development/2.0
development/2.1
development/2.10
development/2.11
development/2.2
development/2.3
development/2.4
development/2.5
development/2.6
development/2.7
development/2.8
development/2.9

Follow integration pull requests if you would like to be notified of
build statuses by email.

The following options are set: create_pull_requests, create_integration_branches

bert-e · 2024-07-17T17:38:59Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
one peer

Peer approvals must include at least 1 approval from the following list:

The following options are set: create_pull_requests, create_integration_branches

update alerting rules

bert-e · 2024-07-18T10:29:41Z

History mismatch

Merge commit #375749d46416261e6269bbb6ecbaa5f6b4c78f01 on the integration branch
w/128.0/improvement/bump-grafana-11.1.0 is merging a branch which is neither the current
branch improvement/bump-grafana-11.1.0 nor the development branch
development/128.0.

It is likely due to a rebase of the branch improvement/bump-grafana-11.1.0 and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

The following options are set: create_pull_requests, create_integration_branches

eg-ayoub · 2024-07-18T10:31:14Z

/reset

bert-e · 2024-07-18T10:31:21Z

Lossy reset warning

There seems to be manual commits on integration branches (e.g. conflict
resolutions) that will be lost if you chose to reset.

You can use the force_reset command if you still want me
to delete those branches.

The following options are set: create_pull_requests, create_integration_branches

bert-e · 2024-07-18T10:31:29Z

History mismatch

Merge commit #375749d46416261e6269bbb6ecbaa5f6b4c78f01 on the integration branch
w/128.0/improvement/bump-grafana-11.1.0 is merging a branch which is neither the current
branch improvement/bump-grafana-11.1.0 nor the development branch
development/128.0.

It is likely due to a rebase of the branch improvement/bump-grafana-11.1.0 and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

The following options are set: create_pull_requests, create_integration_branches

eg-ayoub · 2024-07-18T10:46:37Z

/force_reset

bert-e · 2024-07-18T10:46:46Z

Reset complete

I have successfully deleted this pull request's integration branches.

The following options are set: create_pull_requests, create_integration_branches

bert-e · 2024-07-18T10:46:56Z

Conflict

A conflict has been raised during the creation of
integration branch w/128.0/improvement/bump-grafana-11.1.0 with contents from improvement/bump-grafana-11.1.0
and development/128.0.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/128.0/improvement/bump-grafana-11.1.0 origin/development/128.0
 $ git merge origin/improvement/bump-grafana-11.1.0
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/128.0/improvement/bump-grafana-11.1.0

The following options are set: create_pull_requests, create_integration_branches

eg-ayoub · 2024-07-18T10:58:08Z

ping

bert-e · 2024-07-18T10:58:19Z

Integration data created

I have created the integration data for the additional destination branches.

this pull request will merge improvement/bump-grafana-11.1.0 into
development/127.0
w/128.0/improvement/bump-grafana-11.1.0 will be merged into development/128.0 (pull request INTEGRATION [PR#4365 > development/128.0] build: bump kube-prometheus-stack to 61.3.0 #4373)

The following branches will NOT be impacted:

development/123.0
development/124.0
development/124.1
development/125.0
development/126.0
development/2.0
development/2.1
development/2.10
development/2.11
development/2.2
development/2.3
development/2.4
development/2.5
development/2.6
development/2.7
development/2.8
development/2.9

Follow integration pull requests if you would like to be notified of
build statuses by email.

The following options are set: create_pull_requests, create_integration_branches

bert-e · 2024-07-18T10:58:22Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
one peer

Peer approvals must include at least 1 approval from the following list:

The following options are set: create_pull_requests, create_integration_branches

eg-ayoub · 2024-07-19T12:49:50Z

/approve

bert-e · 2024-07-19T12:50:08Z

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

✔️ development/127.0
✔️ development/128.0

The following branches will NOT be impacted:

development/123.0
development/124.0
development/124.1
development/125.0
development/126.0
development/2.0
development/2.1
development/2.10
development/2.11
development/2.2
development/2.3
development/2.4
development/2.5
development/2.6
development/2.7
development/2.8
development/2.9

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

Any commit you add on the source branch will trigger a new cycle after the
current queue is merged.
Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve, create_pull_requests, create_integration_branches

bert-e · 2024-07-19T15:12:29Z

I have successfully merged the changeset of this pull request
into targetted development branches:

✔️ development/127.0
✔️ development/128.0

The following branches have NOT changed:

development/123.0
development/124.0
development/124.1
development/125.0
development/126.0
development/2.0
development/2.1
development/2.10
development/2.11
development/2.2
development/2.3
development/2.4
development/2.5
development/2.6
development/2.7
development/2.8
development/2.9

Please check the status of the associated issue None.

Goodbye eg-ayoub.

eg-ayoub requested a review from a team as a code owner July 10, 2024 14:56

eg-ayoub force-pushed the improvement/bump-grafana-11.1.0 branch 2 times, most recently from 5aa0c42 to b24492d Compare July 15, 2024 08:37

eg-ayoub force-pushed the improvement/bump-grafana-11.1.0 branch 6 times, most recently from 7644b96 to 375749d Compare July 17, 2024 13:58

bert-e mentioned this pull request Jul 17, 2024

INTEGRATION [PR#4365 > development/128.0] build: bump kube-prometheus-stack to 61.3.0 #4372

Closed

build: bump kube-prometheus-stack to 61.3.0

79d4e86

update alerting rules

eg-ayoub force-pushed the improvement/bump-grafana-11.1.0 branch from 375749d to 79d4e86 Compare July 18, 2024 10:29

bert-e mentioned this pull request Jul 18, 2024

INTEGRATION [PR#4365 > development/128.0] build: bump kube-prometheus-stack to 61.3.0 #4373

Merged

ezekiel-alexrod approved these changes Jul 19, 2024

View reviewed changes

eg-ayoub merged commit 79d4e86 into development/127.0 Jul 19, 2024
66 checks passed

eg-ayoub deleted the improvement/bump-grafana-11.1.0 branch July 19, 2024 15:12

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

build: bump kube-prometheus-stack to 61.3.0 #4365

build: bump kube-prometheus-stack to 61.3.0 #4365

eg-ayoub commented Jul 10, 2024

bert-e commented Jul 10, 2024

bert-e commented Jul 10, 2024

eg-ayoub commented Jul 16, 2024

bert-e commented Jul 17, 2024

eg-ayoub commented Jul 17, 2024

bert-e commented Jul 17, 2024

eg-ayoub commented Jul 17, 2024

bert-e commented Jul 17, 2024

bert-e commented Jul 17, 2024

bert-e commented Jul 18, 2024

eg-ayoub commented Jul 18, 2024

bert-e commented Jul 18, 2024

bert-e commented Jul 18, 2024

eg-ayoub commented Jul 18, 2024

bert-e commented Jul 18, 2024

bert-e commented Jul 18, 2024

eg-ayoub commented Jul 18, 2024

bert-e commented Jul 18, 2024

bert-e commented Jul 18, 2024

eg-ayoub commented Jul 19, 2024

bert-e commented Jul 19, 2024

bert-e commented Jul 19, 2024

build: bump kube-prometheus-stack to 61.3.0 #4365

build: bump kube-prometheus-stack to 61.3.0 #4365

Conversation

eg-ayoub commented Jul 10, 2024

bert-e commented Jul 10, 2024

Hello eg-ayoub,

bert-e commented Jul 10, 2024

Request integration branches

eg-ayoub commented Jul 16, 2024

bert-e commented Jul 17, 2024

Conflict

eg-ayoub commented Jul 17, 2024

bert-e commented Jul 17, 2024

Conflict

eg-ayoub commented Jul 17, 2024

bert-e commented Jul 17, 2024

Integration data created

bert-e commented Jul 17, 2024

Waiting for approval

bert-e commented Jul 18, 2024

History mismatch

eg-ayoub commented Jul 18, 2024

bert-e commented Jul 18, 2024

Lossy reset warning

bert-e commented Jul 18, 2024

History mismatch

eg-ayoub commented Jul 18, 2024

bert-e commented Jul 18, 2024

Reset complete

bert-e commented Jul 18, 2024

Conflict

eg-ayoub commented Jul 18, 2024

bert-e commented Jul 18, 2024

Integration data created

bert-e commented Jul 18, 2024

Waiting for approval

eg-ayoub commented Jul 19, 2024

bert-e commented Jul 19, 2024

In the queue

bert-e commented Jul 19, 2024