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

Feature/artesca 8593 alert configuration #4078

Merged
merged 4 commits into from
Jun 29, 2023

Conversation

MonPote
Copy link
Contributor

@MonPote MonPote commented Jun 20, 2023

Component:

Context:

Summary:

Acceptance criteria:


Closes: #ISSUE_NUMBER

@bert-e
Copy link
Contributor

bert-e commented Jun 20, 2023

Hello monpote,

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 Jun 20, 2023

Integration data created

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

The following branches will NOT be impacted:

  • development/123.0
  • development/124.0
  • development/124.1
  • 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
Copy link
Contributor

bert-e commented Jun 20, 2023

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:

@MonPote MonPote force-pushed the feature/ARTESCA-8593-alert-configuration branch from 8156910 to 2680168 Compare June 20, 2023 15:02
@bert-e
Copy link
Contributor

bert-e commented Jun 20, 2023

History mismatch

Merge commit #815691054dee09f9dc502045d66f8e0ca90c9c2d on the integration branch
w/126.0/feature/ARTESCA-8593-alert-configuration is merging a branch which is neither the current
branch feature/ARTESCA-8593-alert-configuration nor the development branch
development/126.0.

It is likely due to a rebase of the branch feature/ARTESCA-8593-alert-configuration 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.

const emailRegex =
/^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/i;
const rfc5322EmailAddressRegex =
/^((([^ ]+ )+<[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*>|[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*|<[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*>)(, ?)?)+$/i;

Check failure

Code scanning / CodeQL

Inefficient regular expression

This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '!@-! <!@->'.
const emailRegex =
/^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/i;
const rfc5322EmailAddressRegex =
/^((([^ ]+ )+<[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*>|[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*|<[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*>)(, ?)?)+$/i;

Check failure

Code scanning / CodeQL

Inefficient regular expression

This part of the regular expression may cause exponential backtracking on strings starting with '!' and containing many repetitions of ' <!@->!'.
const emailRegex =
/^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/i;
const rfc5322EmailAddressRegex =
/^((([^ ]+ )+<[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*>|[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*|<[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*>)(, ?)?)+$/i;

Check failure

Code scanning / CodeQL

Inefficient regular expression

This part of the regular expression may cause exponential backtracking on strings starting with '!@' and containing many repetitions of '--!@'.
const emailRegex =
/^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/i;
const rfc5322EmailAddressRegex =
/^((([^ ]+ )+<[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*>|[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*|<[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*>)(, ?)?)+$/i;

Check failure

Code scanning / CodeQL

Inefficient regular expression

This part of the regular expression may cause exponential backtracking on strings starting with '!@-.' and containing many repetitions of '--!@-.'.
@MonPote MonPote marked this pull request as ready for review June 28, 2023 15:02
@MonPote MonPote requested a review from a team as a code owner June 28, 2023 15:02
Copy link
Contributor

@JBWatenbergScality JBWatenbergScality left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Amazing !! The test are very pleasant to read ! The only drawback is that we couple them with the CSC approach as we mocked directly salt as part of them I think we should have decoupled them by testing against a mocked provider and testing the provider in isolation, but we can go for this first iteration I think

ui/README.md Show resolved Hide resolved
ui/src/alert-configuration/ConfigureAlerting.test.tsx Outdated Show resolved Hide resolved
ui/src/alert-configuration/ConfigureAlerting.test.tsx Outdated Show resolved Hide resolved
ui/src/alert-configuration/ConfigureAlerting.test.tsx Outdated Show resolved Hide resolved
ui/src/alert-configuration/ConfigureAlerting.test.tsx Outdated Show resolved Hide resolved
ui/src/services/loki/api.ts Outdated Show resolved Hide resolved
ui/src/services/platformlibrary/metrics.ts Outdated Show resolved Hide resolved
@MonPote MonPote force-pushed the feature/ARTESCA-8593-alert-configuration branch from 6f762a5 to 7ebfc0f Compare June 29, 2023 13:25
@bert-e
Copy link
Contributor

bert-e commented Jun 29, 2023

History mismatch

Merge commit #1045dd48146110058ffb1dd9e8f476935a3b5610 on the integration branch
w/126.0/feature/ARTESCA-8593-alert-configuration is merging a branch which is neither the current
branch feature/ARTESCA-8593-alert-configuration nor the development branch
development/126.0.

It is likely due to a rebase of the branch feature/ARTESCA-8593-alert-configuration 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.

@MonPote MonPote force-pushed the feature/ARTESCA-8593-alert-configuration branch from 7ebfc0f to 4d1521d Compare June 29, 2023 13:26
@MonPote
Copy link
Contributor Author

MonPote commented Jun 29, 2023

Amazing !! The test are very pleasant to read ! The only drawback is that we couple them with the CSC approach as we mocked directly salt as part of them I think we should have decoupled them by testing against a mocked provider and testing the provider in isolation, but we can go for this first iteration I think

Indeed, we should do that I just created a ticket for that.

@MonPote
Copy link
Contributor Author

MonPote commented Jun 29, 2023

/reset

@bert-e
Copy link
Contributor

bert-e commented Jun 29, 2023

Reset complete

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

@bert-e
Copy link
Contributor

bert-e commented Jun 29, 2023

Integration data created

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

The following branches will NOT be impacted:

  • development/123.0
  • development/124.0
  • development/124.1
  • 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
Copy link
Contributor

bert-e commented Jun 29, 2023

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:

Copy link
Contributor

@JBWatenbergScality JBWatenbergScality left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome !! Let's deliver some alerts via emails !!!
bee-do-bee-do

@MonPote
Copy link
Contributor Author

MonPote commented Jun 29, 2023

/approve

@bert-e
Copy link
Contributor

bert-e commented Jun 29, 2023

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

  • ✔️ development/126.0

The following branches will NOT be impacted:

  • development/123.0
  • development/124.0
  • development/124.1
  • 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
Copy link
Contributor

bert-e commented Jun 29, 2023

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

  • ✔️ development/125.0

  • ✔️ development/126.0

The following branches have NOT changed:

  • development/123.0
  • development/124.0
  • development/124.1
  • 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-8593.

Goodbye monpote.

@MonPote MonPote merged commit 4d1521d into development/125.0 Jun 29, 2023
@MonPote MonPote deleted the feature/ARTESCA-8593-alert-configuration branch June 29, 2023 23:31
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.

3 participants