ARTESCA-4300 raise alert when pods get OOMKilled #4042

aprucolimartins · 2023-04-20T12:32:28Z

Component:

Context:

Summary:

Acceptance criteria:

Closes: #ISSUE_NUMBER

bert-e · 2023-04-20T12:32:33Z

Hello aprucolimartins,

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.

Status report is not available.

bert-e · 2023-04-20T12:32:39Z

Branches have diverged

This pull request's source branch improvement/ARTESCA-4300_OOMKill_alert has diverged from
development/125.0 by more than 50 commits.

To avoid any integration risks, please re-synchronize them using one of the
following solutions:

Merge origin/development/125.0 into improvement/ARTESCA-4300_OOMKill_alert
Rebase improvement/ARTESCA-4300_OOMKill_alert onto origin/development/125.0

Note: If you choose to rebase, you may have to ask me to rebuild
integration branches using the reset command.

bert-e · 2023-04-20T13:57:17Z

Integration data created

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

this pull request will merge improvement/ARTESCA-4300_OOMKill_alert into
development/124.1
w/125.0/improvement/ARTESCA-4300_OOMKill_alert will be merged into development/125.0

The following branches will NOT be impacted:

development/123.0
development/124.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

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

bert-e · 2023-04-20T13:57:20Z

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:

bert-e · 2023-04-21T12:58:38Z

History mismatch

Merge commit #4b7546ce8e7f66a08526ee5aad7963e03f441e51 on the integration branch
w/125.0/improvement/ARTESCA-4300_OOMKill_alert is merging a branch which is neither the current
branch improvement/ARTESCA-4300_OOMKill_alert nor the development branch
development/125.0.

It is likely due to a rebase of the branch improvement/ARTESCA-4300_OOMKill_alert 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.

salt/metalk8s/addons/prometheus-operator/deployed/prometheus-rules.sls

TeddyAndrieux

Almost good to me, mostly nitpicking and rewording

You will need to re-extract rules using the rule_extractor (feel free to reach me directly if you need help about it)

salt/metalk8s/addons/prometheus-operator/deployed/container-exporter-alerts-rules.sls

buildchain/buildchain/salt_tree.py

salt/metalk8s/addons/prometheus-operator/deployed/container-exporter-alerts-rules.sls

salt/metalk8s/addons/prometheus-operator/deployed/node-alerts-rules.sls

salt/metalk8s/addons/prometheus-operator/deployed/container-alert-rules.sls

salt/metalk8s/addons/prometheus-operator/deployed/init.sls

aprucolimartins · 2023-05-15T06:43:45Z

/approve

aprucolimartins · 2023-05-15T06:48:36Z

/reset

bert-e · 2023-05-15T08:07:18Z

Reset complete

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

The following options are set: approve

bert-e · 2023-05-15T08:07:25Z

Conflict

A conflict has been raised during the creation of
integration branch w/125.0/improvement/ARTESCA-4300_OOMKill_alert with contents from improvement/ARTESCA-4300_OOMKill_alert
and development/125.0.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/125.0/improvement/ARTESCA-4300_OOMKill_alert origin/development/125.0
 $ git merge origin/improvement/ARTESCA-4300_OOMKill_alert
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/125.0/improvement/ARTESCA-4300_OOMKill_alert

The following options are set: approve

bert-e · 2023-05-15T12:08:06Z

Build failed

The build for commit did not succeed in branch w/125.0/improvement/ARTESCA-4300_OOMKill_alert.

The following options are set: approve

bert-e · 2023-05-15T17:10:43Z

Build failed

The build for commit did not succeed in branch w/125.0/improvement/ARTESCA-4300_OOMKill_alert.

The following options are set: approve

bert-e · 2023-05-16T11:44:14Z

History mismatch

Merge commit #4314db09cf6d2609fa67b8fb54fe13bd0eb2fcfe on the integration branch
w/125.0/improvement/ARTESCA-4300_OOMKill_alert is merging a branch which is neither the current
branch improvement/ARTESCA-4300_OOMKill_alert nor the development branch
development/125.0.

It is likely due to a rebase of the branch improvement/ARTESCA-4300_OOMKill_alert 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: approve

aprucolimartins · 2023-05-16T15:37:04Z

/reset

bert-e · 2023-05-16T15:37:12Z

Reset complete

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

The following options are set: approve

bert-e · 2023-05-16T15:37:20Z

Conflict

A conflict has been raised during the creation of
integration branch w/125.0/improvement/ARTESCA-4300_OOMKill_alert with contents from improvement/ARTESCA-4300_OOMKill_alert
and development/125.0.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/125.0/improvement/ARTESCA-4300_OOMKill_alert origin/development/125.0
 $ git merge origin/improvement/ARTESCA-4300_OOMKill_alert
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/125.0/improvement/ARTESCA-4300_OOMKill_alert

The following options are set: approve

bert-e · 2023-05-16T16:18:01Z

Build failed

The build for commit did not succeed in branch w/125.0/improvement/ARTESCA-4300_OOMKill_alert.

The following options are set: approve

bert-e · 2023-05-17T07:09:12Z

History mismatch

Merge commit #655b01abe4429f715a718c998f78112a075a0e14 on the integration branch
w/125.0/improvement/ARTESCA-4300_OOMKill_alert is merging a branch which is neither the current
branch improvement/ARTESCA-4300_OOMKill_alert nor the development branch
development/125.0.

It is likely due to a rebase of the branch improvement/ARTESCA-4300_OOMKill_alert 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: approve

aprucolimartins · 2023-05-17T09:30:25Z

/reset

bert-e · 2023-05-17T09:30:33Z

Reset complete

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

The following options are set: approve

bert-e · 2023-05-17T09:30:42Z

Conflict

A conflict has been raised during the creation of
integration branch w/125.0/improvement/ARTESCA-4300_OOMKill_alert with contents from improvement/ARTESCA-4300_OOMKill_alert
and development/125.0.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/125.0/improvement/ARTESCA-4300_OOMKill_alert origin/development/125.0
 $ git merge origin/improvement/ARTESCA-4300_OOMKill_alert
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/125.0/improvement/ARTESCA-4300_OOMKill_alert

The following options are set: approve

bert-e · 2023-05-17T12:30:59Z

Conflict

There is a conflict between your branch improvement/ARTESCA-4300_OOMKill_alert and the
destination branch development/124.1.

Please resolve the conflict on the feature branch (improvement/ARTESCA-4300_OOMKill_alert).

git fetch && \
git checkout origin/improvement/ARTESCA-4300_OOMKill_alert && \
git merge origin/development/124.1

Resolve merge conflicts and commit

git push origin HEAD:improvement/ARTESCA-4300_OOMKill_alert

The following options are set: approve

bert-e · 2023-05-17T14:30:45Z

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: approve

aprucolimartins · 2023-05-21T10:25:46Z

/approve

bert-e · 2023-05-22T13:03:40Z

Build failed

The build for commit did not succeed in branch w/125.0/improvement/ARTESCA-4300_OOMKill_alert.

The following options are set: approve

bert-e · 2023-05-22T15:35:33Z

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/124.1
✔️ development/125.0

The following branches will NOT be impacted:

development/123.0
development/124.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

bert-e · 2023-05-23T09:46:09Z

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

✔️ development/124.1
✔️ development/125.0

The following branches have NOT changed:

development/123.0
development/124.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 ARTESCA-4300.

Goodbye aprucolimartins.

aprucolimartins force-pushed the improvement/ARTESCA-4300_OOMKill_alert branch 2 times, most recently from 26975d7 to 4b7546c Compare April 20, 2023 13:55

aprucolimartins changed the base branch from development/125.0 to development/124.1 April 20, 2023 13:57

aprucolimartins force-pushed the improvement/ARTESCA-4300_OOMKill_alert branch from 4b7546c to 3215cba Compare April 21, 2023 12:58

TeddyAndrieux reviewed Apr 21, 2023

View reviewed changes

salt/metalk8s/addons/prometheus-operator/deployed/prometheus-rules.sls Outdated Show resolved Hide resolved

aprucolimartins force-pushed the improvement/ARTESCA-4300_OOMKill_alert branch from 3215cba to 28c99d6 Compare April 24, 2023 15:41

aprucolimartins force-pushed the improvement/ARTESCA-4300_OOMKill_alert branch 3 times, most recently from b238d80 to 3c0bc09 Compare May 9, 2023 14:21

aprucolimartins marked this pull request as ready for review May 9, 2023 14:26

aprucolimartins requested a review from a team as a code owner May 9, 2023 14:26

aprucolimartins force-pushed the improvement/ARTESCA-4300_OOMKill_alert branch 7 times, most recently from 91400c1 to 745944d Compare May 11, 2023 12:18

TeddyAndrieux reviewed May 12, 2023

View reviewed changes

aprucolimartins force-pushed the improvement/ARTESCA-4300_OOMKill_alert branch from e395fcb to 29161ce Compare May 12, 2023 07:25

TeddyAndrieux reviewed May 12, 2023

View reviewed changes

salt/metalk8s/addons/prometheus-operator/deployed/node-alerts-rules.sls Outdated Show resolved Hide resolved

TeddyAndrieux reviewed May 12, 2023

View reviewed changes

salt/metalk8s/addons/prometheus-operator/deployed/container-alert-rules.sls Outdated Show resolved Hide resolved

TeddyAndrieux reviewed May 12, 2023

View reviewed changes

salt/metalk8s/addons/prometheus-operator/deployed/init.sls Outdated Show resolved Hide resolved

aprucolimartins force-pushed the improvement/ARTESCA-4300_OOMKill_alert branch 2 times, most recently from fa2e997 to 29ee842 Compare May 12, 2023 08:11

TeddyAndrieux previously approved these changes May 12, 2023

View reviewed changes

Merge remote-tracking branch 'origin/development/124.1' into HEAD

0bba23d

aprucolimartins dismissed TeddyAndrieux’s stale review via 0bba23d May 17, 2023 14:30

eg-ayoub self-requested a review May 22, 2023 13:03

eg-ayoub approved these changes May 22, 2023

View reviewed changes

aprucolimartins requested review from TeddyAndrieux and removed request for TeddyAndrieux May 22, 2023 13:41

bert-e merged commit 0c71b05 into development/124.1 May 23, 2023

bert-e deleted the improvement/ARTESCA-4300_OOMKill_alert branch May 23, 2023 09:46

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ARTESCA-4300 raise alert when pods get OOMKilled #4042

ARTESCA-4300 raise alert when pods get OOMKilled #4042

aprucolimartins commented Apr 20, 2023

bert-e commented Apr 20, 2023

bert-e commented Apr 20, 2023

bert-e commented Apr 20, 2023

bert-e commented Apr 20, 2023

bert-e commented Apr 21, 2023

TeddyAndrieux left a comment

aprucolimartins commented May 15, 2023

aprucolimartins commented May 15, 2023

bert-e commented May 15, 2023

bert-e commented May 15, 2023

bert-e commented May 15, 2023

bert-e commented May 15, 2023

bert-e commented May 16, 2023

aprucolimartins commented May 16, 2023

bert-e commented May 16, 2023

bert-e commented May 16, 2023

bert-e commented May 16, 2023

bert-e commented May 17, 2023

aprucolimartins commented May 17, 2023

bert-e commented May 17, 2023

bert-e commented May 17, 2023

bert-e commented May 17, 2023

bert-e commented May 17, 2023

aprucolimartins commented May 21, 2023

bert-e commented May 22, 2023

bert-e commented May 22, 2023

bert-e commented May 23, 2023

ARTESCA-4300 raise alert when pods get OOMKilled #4042

ARTESCA-4300 raise alert when pods get OOMKilled #4042

Conversation

aprucolimartins commented Apr 20, 2023

bert-e commented Apr 20, 2023

Hello aprucolimartins,

bert-e commented Apr 20, 2023

Branches have diverged

bert-e commented Apr 20, 2023

Integration data created

bert-e commented Apr 20, 2023

Waiting for approval

bert-e commented Apr 21, 2023

History mismatch

TeddyAndrieux left a comment

Choose a reason for hiding this comment

aprucolimartins commented May 15, 2023

aprucolimartins commented May 15, 2023

bert-e commented May 15, 2023

Reset complete

bert-e commented May 15, 2023

Conflict

bert-e commented May 15, 2023

Build failed

bert-e commented May 15, 2023

Build failed

bert-e commented May 16, 2023

History mismatch

aprucolimartins commented May 16, 2023

bert-e commented May 16, 2023

Reset complete

bert-e commented May 16, 2023

Conflict

bert-e commented May 16, 2023

Build failed

bert-e commented May 17, 2023

History mismatch

aprucolimartins commented May 17, 2023

bert-e commented May 17, 2023

Reset complete

bert-e commented May 17, 2023

Conflict

bert-e commented May 17, 2023

Conflict

bert-e commented May 17, 2023

Waiting for approval

aprucolimartins commented May 21, 2023

bert-e commented May 22, 2023

Build failed

bert-e commented May 22, 2023

In the queue

bert-e commented May 23, 2023