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.

Sign up for GitHub

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

Jump to bottom

tools: Add some missing alerts in the alerts hierarchy #3714

Merged
merged 1 commit into from
Mar 1, 2022
Merged

tools: Add some missing alerts in the alerts hierarchy #3714

merged 1 commit into from
Mar 1, 2022

Conversation

TeddyAndrieux
Copy link
Collaborator

No description provided.

@alexandre-allard @TeddyAndrieux
tools: Add some missing alerts in the alerts hierarchy
9309687 
Extract again all Prometheus rules using:
```
./tools/rule_extractor/rule_extractor.py \
  -i <control-plane-ip> -p 8443 -t rules
```
@TeddyAndrieux TeddyAndrieux requested a review from a team as a code owner February 25, 2022 12:24
@bert-e
Copy link
Contributor

bert-e commented Feb 25, 2022

Hello teddyandrieux,

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
Copy link
Contributor

bert-e commented Feb 25, 2022

Conflict

A conflict has been raised during the creation of
integration branch w/123.0/bugfix/ARTESCA-3543-missing-alerts with contents from bugfix/ARTESCA-3543-missing-alerts
and development/123.0.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/123.0/bugfix/ARTESCA-3543-missing-alerts origin/development/123.0
 $ git merge origin/bugfix/ARTESCA-3543-missing-alerts
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/123.0/bugfix/ARTESCA-3543-missing-alerts

@bert-e
Copy link
Contributor

bert-e commented Feb 25, 2022

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:

@TeddyAndrieux TeddyAndrieux marked this pull request as draft February 25, 2022 12:36
@TeddyAndrieux TeddyAndrieux marked this pull request as ready for review February 25, 2022 15:21
@TeddyAndrieux
Copy link
Collaborator Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Feb 28, 2022

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/2.11

  • ✔️ development/123.0

The following branches will NOT be impacted:

  • development/2.0
  • development/2.1
  • development/2.10
  • 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
Copy link
Contributor

bert-e commented Mar 1, 2022

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

  • ✔️ development/2.11

  • ✔️ development/123.0

The following branches have NOT changed:

  • development/2.0
  • development/2.1
  • development/2.10
  • 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-3543.

Goodbye teddyandrieux.

@bert-e bert-e merged commit 9309687 into development/2.11 Mar 1, 2022
@bert-e bert-e deleted the bugfix/ARTESCA-3543-missing-alerts branch March 1, 2022 11:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gdemonet gdemonet gdemonet approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@TeddyAndrieux @bert-e @gdemonet @alexandre-allard