Skip to content

Conversation

@dtaylor113
Copy link
Contributor

@dtaylor113 dtaylor113 commented Jan 22, 2020

  • Implemented 'Save as Default/Global' functionality, which defaults certain form fields to global values, and saves values in global section if 'Save as Default' checked. Includes new call to ${alertManagerBaseURL}/api/v2/status/ to get global values not found in alertmanager-main's alertmanager.yaml's global properties.
  • Added Email and Slack Receiver forms
  • Added new alertmanager integration test suite which tests initializing and saving global fields/values. Removed global testing from monitor integration test suite, does not need to run during CI.

Screenshots

Follow on [WIP] PR adds advanced fields: #4044

@dtaylor113 dtaylor113 requested a review from spadgett January 22, 2020 16:54
@openshift-ci-robot openshift-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Jan 22, 2020
@openshift-ci-robot openshift-ci-robot added component/core Related to console core functionality component/monitoring Related to monitoring labels Jan 22, 2020
Copy link
Member

@spadgett spadgett left a comment

Choose a reason for hiding this comment

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

I'm concerned that we have no type safety with this approach. This is problem particularly because we have no API server validation on this config (it's just a YAML block in a secret). I'm not sure what to suggest, though, because it we would need to change the approach to add types.

It seems like there's too much magic converting to/from Alertmanager config property names and camel case names. I'm not sure why that's necessary.

@dtaylor113 dtaylor113 force-pushed the alertmanager-email-slack-save-as-global branch from 05e2a27 to e07d7ab Compare January 23, 2020 18:06
@openshift openshift deleted a comment from spadgett Jan 23, 2020
@openshift openshift deleted a comment from spadgett Jan 23, 2020
@dtaylor113
Copy link
Contributor Author

dtaylor113 commented Jan 23, 2020

Hi @spadgett, I believe I have addressed the majority of your review comments.
Remaining comments:

Copy link
Member

@spadgett spadgett left a comment

Choose a reason for hiding this comment

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

Thanks, @dtaylor113. We need to make sure this can pass CI since I haven't seen it pass yet.

Copy link
Member

Choose a reason for hiding this comment

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

I don't think this is right... You want aria-describedby. This will break screenreaders using the label. I would leave this off.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed

Copy link
Member

Choose a reason for hiding this comment

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

This shouldn't be necessary if you use the right checkbox styles.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is not for the checkbox, it is for the blue (?) icon

Copy link
Member

Choose a reason for hiding this comment

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

This is not for the checkbox, it is for the blue (?) icon

We should give it a better name in that case.

Copy link
Member

Choose a reason for hiding this comment

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

I feel like we have some existing styles you can reuse for the tooltip icon.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hi @spadgett, seaching through css, nothing jumping out at me, what's a better name? It matches the naming convention of the css definition above it in the .scss file.

Copy link
Member

Choose a reason for hiding this comment

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

By convention, id should be kebab case, not camel case (here and below).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed

@openshift openshift deleted a comment from openshift-ci-robot Jan 24, 2020
@dtaylor113 dtaylor113 force-pushed the alertmanager-email-slack-save-as-global branch from fe1086d to f002a35 Compare January 24, 2020 19:49
@spadgett
Copy link
Member

/hold
for merge queue fix #4065

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 24, 2020
@openshift openshift deleted a comment from spadgett Jan 24, 2020
@openshift openshift deleted a comment from spadgett Jan 24, 2020
@openshift openshift deleted a comment from openshift-ci-robot Jan 24, 2020
@spadgett
Copy link
Member

/approve
/lgtm

We can address any further changes in follow on PRs.

@openshift-ci-robot openshift-ci-robot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jan 24, 2020
@dtaylor113 dtaylor113 force-pushed the alertmanager-email-slack-save-as-global branch from f002a35 to aeb42ad Compare January 25, 2020 21:48
@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Jan 25, 2020
@dtaylor113 dtaylor113 force-pushed the alertmanager-email-slack-save-as-global branch from aeb42ad to be2e96e Compare January 27, 2020 16:18
@spadgett
Copy link
Member

This was approved on Friday. Tagging again for the rebase

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 27, 2020
@openshift openshift deleted a comment from openshift-ci-robot Jan 27, 2020
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dtaylor113, spadgett

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@spadgett
Copy link
Member

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 27, 2020
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

17 similar comments
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@dtaylor113
Copy link
Contributor Author

/retest

1 similar comment
@dtaylor113
Copy link
Contributor Author

/retest

@openshift-merge-robot openshift-merge-robot merged commit 2b79ba3 into openshift:master Jan 29, 2020
@spadgett spadgett added this to the v4.4 milestone Feb 4, 2020
@dtaylor113 dtaylor113 deleted the alertmanager-email-slack-save-as-global branch April 27, 2020 14:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. component/core Related to console core functionality component/monitoring Related to monitoring lgtm Indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants