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

Alerts without message annotation no detail in UI #3038

Merged
merged 3 commits into from
Jan 17, 2021
Merged

Alerts without message annotation no detail in UI #3038

merged 3 commits into from
Jan 17, 2021

Conversation

ChengYanJin
Copy link
Contributor

@ChengYanJin ChengYanJin commented Jan 14, 2021 •
edited
Loading

originally from #3030

Component:

ui, tests

Context:
#2994

Summary:
Changes made to display alert message on UI when prometheus alerts annotation have any of description, summary or message field. Currently blank alert message shown for many of prometheus alerts in metalk8s UI.

Closes: #2994
Closes: #3030

@ChengYanJin ChengYanJin requested a review from a team as a code owner January 14, 2021 13:48
@bert-e

This comment has been minimized.

Sign in to view
@bert-e

This comment has been minimized.

Sign in to view
@bert-e

This comment has been minimized.

Sign in to view
@n1603 @ChengYanJin
ui: Expand support Prometheus alerts message display
6b3cf9a 
Changes made to display alert message on UI when prometheus alerts annotation have any of description, summary or message field

Refs: #2994

Signed-off-by: Ganesh Chaudhari <ganesh0407@gmail.com>
@ChengYanJin ChengYanJin force-pushed the bugfix/alerts-without-message-annotation-no-detail-in-ui branch from adf73bf to 7805c96 Compare January 14, 2021 14:53
@bert-e

This comment has been minimized.

Sign in to view
@ChengYanJin

This comment has been minimized.

Sign in to view
@bert-e

This comment has been minimized.

Sign in to view
@bert-e

This comment has been minimized.

Sign in to view
@bert-e

This comment has been minimized.

Sign in to view
@NicolasT
Copy link
Contributor

May want to have a

Closes: #2994
Closes: #3030

in the description of this PR.

@bert-e

This comment has been minimized.

Sign in to view
n1603 and others added 2 commits January 15, 2021 13:20
@n1603 @gdemonet
tools, tests: Also use 'description' of alerts
b985249 
Ensures alerts as retrieved by the rule_extractor tool (and in the
corresponding test that verifies a live deployment is in sync) can also
use `annotations.description` as a valid candidate for the "message" to
display.

Refs: #2994
See: adf73bf
@gdemonet
ci/ui: Run buildbot-worker using Python 3
2d69b7f 
Forgot about this worker when upmerging.

See: #3021
@gdemonet gdemonet force-pushed the bugfix/alerts-without-message-annotation-no-detail-in-ui branch from 5fee08d to 2d69b7f Compare January 15, 2021 12:23
@bert-e

This comment has been minimized.

Sign in to view
@gdemonet

This comment has been minimized.

Sign in to view
@bert-e

This comment has been minimized.

Sign in to view
@bert-e

This comment has been minimized.

Sign in to view
@bert-e

This comment has been minimized.

Sign in to view
@bert-e
Copy link
Contributor

bert-e commented Jan 15, 2021

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:

@ChengYanJin
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Jan 15, 2021

Build failed

The build for commit did not succeed in branch bugfix/alerts-without-message-annotation-no-detail-in-ui.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Jan 16, 2021

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.7

  • ✔️ development/2.8

The following branches will NOT be impacted:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3
  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6

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 Jan 17, 2021

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

  • ✔️ development/2.7

  • ✔️ development/2.8

The following branches have NOT changed:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3
  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6

Please check the status of the associated issue None.

Goodbye chengyanjin.

@bert-e bert-e merged commit 7754435 into development/2.7 Jan 17, 2021
@bert-e bert-e deleted the bugfix/alerts-without-message-annotation-no-detail-in-ui branch January 17, 2021 17:32
@ChengYanJin ChengYanJin mentioned this pull request Jan 18, 2021
Closed
@NicolasT NicolasT mentioned this pull request Jan 18, 2021
Closed
@gdemonet gdemonet mentioned this pull request Feb 17, 2021
Closed
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

@JBWatenbergScality JBWatenbergScality JBWatenbergScality left review comments

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

Successfully merging this pull request may close these issues.

Alerts without a "message" annotation don't show meaningful details in MetalK8s UI
6 participants
@ChengYanJin @bert-e @NicolasT @gdemonet @JBWatenbergScality @n1603