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

nautilus: mgr/dashboard: Silence Alertmanager alerts #28968

Merged
merged 5 commits into from Aug 12, 2019

Conversation

@Devp00l
Copy link
Contributor

commented Jul 10, 2019

@Devp00l Devp00l self-assigned this Jul 10, 2019

@Devp00l Devp00l added this to the nautilus milestone Jul 10, 2019

@Devp00l Devp00l added the dashboard label Jul 10, 2019

@Devp00l Devp00l requested review from LenzGr, epuertat and votdev Jul 10, 2019

@Devp00l

This comment has been minimized.

Copy link
Contributor Author

commented Jul 10, 2019

Tested it on a fresh build - worked fine :)

@Devp00l Devp00l requested a review from smithfarm Jul 10, 2019

@Devp00l Devp00l added the feature label Jul 10, 2019

@LenzGr
LenzGr approved these changes Jul 11, 2019
Copy link
Contributor

left a comment

LGTM!

@votdev

This comment has been minimized.

Copy link
Contributor

commented Jul 11, 2019

Please summarize all commits in the PR comment.

@smithfarm

This comment has been minimized.

Copy link
Contributor

commented Jul 11, 2019

@votdev This is a backport of #27277, where I see there is a nice PR description.

@Devp00l

This comment has been minimized.

Copy link
Contributor Author

commented Jul 12, 2019

@votdev I documented merge conflicts in the commit see 0a453ab for details.

@Devp00l

This comment has been minimized.

Copy link
Contributor Author

commented Jul 15, 2019

jenkins test dashboard

@Devp00l Devp00l changed the title nautilus: mgr/dashboard: Silence Alertmanager alerts mgr/dashboard: Silence Alertmanager alerts Jul 15, 2019

@Devp00l

This comment has been minimized.

Copy link
Contributor Author

commented Jul 15, 2019

jenkins test dashboard

@Devp00l Devp00l changed the title mgr/dashboard: Silence Alertmanager alerts nautilus: mgr/dashboard: Silence Alertmanager alerts Jul 15, 2019

@tspmelo

This comment has been minimized.

Copy link
Contributor

commented Jul 22, 2019

jenkins test dashboard

@tspmelo tspmelo added the needs-qa label Jul 22, 2019

@votdev votdev added the needs-rebase label Jul 23, 2019

@smithfarm

This comment has been minimized.

Copy link
Contributor

commented Jul 24, 2019

needs-rebase

@Devp00l Devp00l force-pushed the Devp00l:wip-40699-nautilus branch from fc374b7 to 77dcb71 Jul 24, 2019

Devp00l added 5 commits Feb 4, 2019
mgr/dashboard: Allow test selection overwrite
Currently it's not easily possible to mock a selection during table
action tests, that's why I added a method that is used to create the
selection that is used through out the table action scenario tests.
You can simply overwrite it to get a different base object as selection.

Fixes: https://tracker.ceph.com/issues/36722
Signed-off-by: Stephan Müller <smueller@suse.com>
(cherry picked from commit b20e9c8)
mgr/dashboard: Add succeeded action labels
Succeeded action labels can be used in order to show the right tense
for a succeeded action in a success notification.

Fixes: https://tracker.ceph.com/issues/36722
Signed-off-by: Stephan Müller <smueller@suse.com>
(cherry picked from commit c5d30b8)
mgr/dashboard: Silence Alertmanager alerts
Now you can silence alerts through the dashboard. You can now create,
recreate, edit and expire a silence. You can create a silence based on a
selected alert.

The silence form will help you create a silence that silences an alert.
It is provided with functionality to check if the silences, that
you are about to create, will or will not match an active alert or even
a rule.

It also provides help choosing the right values for the right chosen
matcher attribute name, through the use of type ahead values.

The dashboard will now use the Prometheus and the Alertmanager API

Fixes: https://tracker.ceph.com/issues/36722
Signed-off-by: Stephan Müller <smueller@suse.com>
(cherry picked from commit aa571a2)

Resolved the following conflicts:
(modified) src/pybind/mgr/dashboard/frontend/src/app/shared/constants/app.constants.ts
  The change from commit 2ec6945
  created a conflict as it is not backported.
(added) src/pybind/mgr/dashboard/frontend/src/app/shared/enum/icons.enum.ts
  It was introduced with a4d7bb2 which
  is not backported.
(modified) src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/alert-list/alert-list.component.ts
  Got a conflict because of the mentioned commit above (a4d7bb2).
(modiefied) frontend/src/app/app-routing.module.ts
  The commit 6eaac0d was not backported
  which caused "npm start" to fail.
mgr/dashboard: Handle unset settings
It's now easy to deal with unset settings.

Fixes: https://tracker.ceph.com/issues/36722
Signed-off-by: Stephan Müller <smueller@suse.com>
(cherry picked from commit 5243190)
mgr/dashboard: Time diff service
The time diff service can easily calculate the difference between two
dates and print it out in a human readable duration format. It also can
calculate a end or start date based on a date and a duration string.

Fixes: https://tracker.ceph.com/issues/36722
Signed-off-by: Stephan Müller <smueller@suse.com>
(cherry picked from commit 3fb21de)

@Devp00l Devp00l force-pushed the Devp00l:wip-40699-nautilus branch from 77dcb71 to 8767765 Jul 25, 2019

@smithfarm smithfarm removed the needs-rebase label Jul 25, 2019

@smithfarm

This comment has been minimized.

Copy link
Contributor

commented Jul 25, 2019

I guess this needs to pass the 'ceph dashboard tests' Jenkins test, first?

@smithfarm

This comment has been minimized.

Copy link
Contributor

commented Jul 25, 2019

In all likelihood, this will need to be rebased once again after #28938 merges.

@Devp00l

This comment has been minimized.

Copy link
Contributor Author

commented Jul 26, 2019

jenkins test dashboard

@yuriw

This comment has been minimized.

Copy link
Contributor

commented Jul 31, 2019

@yuriw yuriw merged commit 305aa9c into ceph:nautilus Aug 12, 2019

5 checks passed

Docs: build check OK - docs built
Details
Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
ceph dashboard tests ceph dashboard tests succeeded
Details
make check make check succeeded
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.