Skip to content

mgr/cephadm: Enhance AlertManagerSpec to allow adding additional webhook receiver URLs#36371

Merged
sebastian-philipp merged 1 commit intoceph:masterfrom
votdev:issue_46775_alertmanagerspec
Aug 4, 2020
Merged

mgr/cephadm: Enhance AlertManagerSpec to allow adding additional webhook receiver URLs#36371
sebastian-philipp merged 1 commit intoceph:masterfrom
votdev:issue_46775_alertmanagerspec

Conversation

@votdev
Copy link
Member

@votdev votdev commented Jul 30, 2020

Fixes: https://tracker.ceph.com/issues/46775

Signed-off-by: Volker Theile vtheile@suse.com

Checklist

  • References tracker ticket
  • Updates documentation if necessary
  • Includes tests for new functionality or reproducer for bug
Show available Jenkins commands
  • jenkins retest this please
  • jenkins test classic perf
  • jenkins test crimson perf
  • jenkins test signed
  • jenkins test make check
  • jenkins test make check arm64
  • jenkins test submodules
  • jenkins test dashboard
  • jenkins test dashboard backend
  • jenkins test docs
  • jenkins render docs
  • jenkins test ceph-volume all
  • jenkins test ceph-volume tox

sebastian-philipp
sebastian-philipp approved these changes Jul 30, 2020
View reviewed changes
@votdev votdev force-pushed the issue_46775_alertmanagerspec branch 2 times, most recently from 16d82e6 to bb36f26 Compare July 30, 2020 13:52
@votdev votdev force-pushed the issue_46775_alertmanagerspec branch from bb36f26 to 454c5e7 Compare July 31, 2020 06:13
@sebastian-philipp sebastian-philipp added the wip-swagner-testing My Teuthology tests label Jul 31, 2020
@votdev votdev marked this pull request as ready for review July 31, 2020 13:06
@votdev votdev requested a review from a team as a code owner July 31, 2020 13:06
@sebastian-philipp
Copy link
Contributor

sebastian-philipp commented Aug 1, 2020 

2020-07-31T22:21:29.258 INFO:teuthology.orchestra.run.smithi045.stderr:Error EINVAL: Traceback (most recent call last):
2020-07-31T22:21:29.258 INFO:teuthology.orchestra.run.smithi045.stderr:  File "/usr/share/ceph/mgr/mgr_module.py", line 1171, in _handle_command
2020-07-31T22:21:29.259 INFO:teuthology.orchestra.run.smithi045.stderr:    return self.handle_command(inbuf, cmd)
2020-07-31T22:21:29.259 INFO:teuthology.orchestra.run.smithi045.stderr:  File "/usr/share/ceph/mgr/orchestrator/_interface.py", line 138, in handle_command
2020-07-31T22:21:29.259 INFO:teuthology.orchestra.run.smithi045.stderr:    return dispatch[cmd['prefix']].call(self, cmd, inbuf)
2020-07-31T22:21:29.259 INFO:teuthology.orchestra.run.smithi045.stderr:  File "/usr/share/ceph/mgr/mgr_module.py", line 311, in call
2020-07-31T22:21:29.261 INFO:teuthology.orchestra.run.smithi045.stderr:    return self.func(mgr, **kwargs)
2020-07-31T22:21:29.261 INFO:teuthology.orchestra.run.smithi045.stderr:  File "/usr/share/ceph/mgr/orchestrator/_interface.py", line 100, in <lambda>
2020-07-31T22:21:29.262 INFO:teuthology.orchestra.run.smithi045.stderr:    wrapper_copy = lambda *l_args, **l_kwargs: wrapper(*l_args, **l_kwargs)
2020-07-31T22:21:29.262 INFO:teuthology.orchestra.run.smithi045.stderr:  File "/usr/share/ceph/mgr/orchestrator/_interface.py", line 89, in wrapper
2020-07-31T22:21:29.262 INFO:teuthology.orchestra.run.smithi045.stderr:    return func(*args, **kwargs)
2020-07-31T22:21:29.263 INFO:teuthology.orchestra.run.smithi045.stderr:  File "/usr/share/ceph/mgr/orchestrator/module.py", line 1165, in _apply_misc
2020-07-31T22:21:29.263 INFO:teuthology.orchestra.run.smithi045.stderr:    specs = [ServiceSpec(service_type, placement=placementspec, unmanaged=unmanaged, preview_only=dry_run)]
2020-07-31T22:21:29.263 INFO:teuthology.orchestra.run.smithi045.stderr:TypeError: __init__() got an unexpected keyword argument 'preview_only'
2020-07-31T22:21:29.266 INFO:teuthology.orchestra.run.smithi045.stderr:

https://pulpito.ceph.com/swagner-2020-07-31_22:03:23-rados:cephadm-wip-swagner-testing-2020-07-31-1340-distro-basic-smithi/5273869

jschmid1
jschmid1 reviewed Aug 3, 2020
View reviewed changes
jschmid1
jschmid1 reviewed Aug 3, 2020
View reviewed changes
@votdev
mgr/cephadm: Enhance AlertManagerSpec to allow adding additional webh…
4b87eeb 
…ook receiver URLs

Fixes: https://tracker.ceph.com/issues/46775

Signed-off-by: Volker Theile <vtheile@suse.com>
@votdev votdev force-pushed the issue_46775_alertmanagerspec branch from 454c5e7 to 4b87eeb Compare August 3, 2020 08:42
@votdev
Copy link
Member Author

votdev commented Aug 3, 2020 

2020-07-31T22:21:29.258 INFO:teuthology.orchestra.run.smithi045.stderr:Error EINVAL: Traceback (most recent call last):
2020-07-31T22:21:29.258 INFO:teuthology.orchestra.run.smithi045.stderr:  File "/usr/share/ceph/mgr/mgr_module.py", line 1171, in _handle_command
2020-07-31T22:21:29.259 INFO:teuthology.orchestra.run.smithi045.stderr:    return self.handle_command(inbuf, cmd)
2020-07-31T22:21:29.259 INFO:teuthology.orchestra.run.smithi045.stderr:  File "/usr/share/ceph/mgr/orchestrator/_interface.py", line 138, in handle_command
2020-07-31T22:21:29.259 INFO:teuthology.orchestra.run.smithi045.stderr:    return dispatch[cmd['prefix']].call(self, cmd, inbuf)
2020-07-31T22:21:29.259 INFO:teuthology.orchestra.run.smithi045.stderr:  File "/usr/share/ceph/mgr/mgr_module.py", line 311, in call
2020-07-31T22:21:29.261 INFO:teuthology.orchestra.run.smithi045.stderr:    return self.func(mgr, **kwargs)
2020-07-31T22:21:29.261 INFO:teuthology.orchestra.run.smithi045.stderr:  File "/usr/share/ceph/mgr/orchestrator/_interface.py", line 100, in <lambda>
2020-07-31T22:21:29.262 INFO:teuthology.orchestra.run.smithi045.stderr:    wrapper_copy = lambda *l_args, **l_kwargs: wrapper(*l_args, **l_kwargs)
2020-07-31T22:21:29.262 INFO:teuthology.orchestra.run.smithi045.stderr:  File "/usr/share/ceph/mgr/orchestrator/_interface.py", line 89, in wrapper
2020-07-31T22:21:29.262 INFO:teuthology.orchestra.run.smithi045.stderr:    return func(*args, **kwargs)
2020-07-31T22:21:29.263 INFO:teuthology.orchestra.run.smithi045.stderr:  File "/usr/share/ceph/mgr/orchestrator/module.py", line 1165, in _apply_misc
2020-07-31T22:21:29.263 INFO:teuthology.orchestra.run.smithi045.stderr:    specs = [ServiceSpec(service_type, placement=placementspec, unmanaged=unmanaged, preview_only=dry_run)]
2020-07-31T22:21:29.263 INFO:teuthology.orchestra.run.smithi045.stderr:TypeError: __init__() got an unexpected keyword argument 'preview_only'
2020-07-31T22:21:29.266 INFO:teuthology.orchestra.run.smithi045.stderr:

pulpito.ceph.com/swagner-2020-07-31_22:03:23-rados:cephadm-wip-swagner-testing-2020-07-31-1340-distro-basic-smithi/5273869

The changes seem to be merged into master after the PR as been created. The PR has been adapted now.

@sebastian-philipp
Copy link
Contributor

sebastian-philipp commented Aug 4, 2020

green: https://pulpito.ceph.com/swagner-2020-08-04_10:27:26-rados:cephadm-wip-swagner3-testing-2020-08-04-1030-distro-basic-smithi/

@sebastian-philipp sebastian-philipp requested a review from p-se August 4, 2020 13:48
@sebastian-philipp sebastian-philipp merged commit c38309f into ceph:master Aug 4, 2020
@votdev votdev deleted the issue_46775_alertmanagerspec branch August 10, 2020 08:56
@sebastian-philipp sebastian-philipp mentioned this pull request Aug 21, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@p-se p-se p-se approved these changes

@pcuzner pcuzner Awaiting requested review from pcuzner

+2 more reviewers

@jschmid1 jschmid1 jschmid1 left review comments

@sebastian-philipp sebastian-philipp sebastian-philipp approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

cephadm feature needs-review

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@votdev @sebastian-philipp @jschmid1 @p-se