From: Patrick Seidensal <pseidensal@suse.com>
Date: Mon, 2 Mar 2020 15:49:43 +0000 (+0100)
Subject: cephadm: fix `alertmanager not implemented yet`
X-Git-Tag: v15.1.1~151^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=41fd2f5ec37b40af10b6ff27ac82990e6ad52773;p=ceph.git

cephadm: fix `alertmanager not implemented yet`

```
Traceback (most recent call last):
  File "/home/user/src/ceph/src/pybind/mgr/cephadm/module.py", line 391, in do_work
    res = self._on_complete_(*args, **kwargs)
  File "/home/user/src/ceph/src/pybind/mgr/cephadm/module.py", line 455, in call_self
    return f(self, *inner_args)
  File "/home/user/src/ceph/src/pybind/mgr/cephadm/module.py", line 2576, in _create_alertmanager
    custom_config=self._generate_alertmanager_config)
  File "/home/user/src/ceph/src/pybind/mgr/cephadm/module.py", line 2051, in _create_daemon
    stdin=json.dumps(cephadm_config))
  File "/home/user/src/ceph/src/pybind/mgr/cephadm/module.py", line 1459, in _run_cephadm
    code, '\n'.join(err)))
RuntimeError: cephadm exited with an error code: 1, stderr:ERROR: alertmanager not implemented yet
```

Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 5b8dda922d9dd..ceff83570f39e 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -2045,6 +2045,8 @@ def extract_uid_gid_monitoring(daemon_type):
         uid, gid = 65534, 65534
     elif daemon_type == 'grafana':
         uid, gid = extract_uid_gid(file_path='/var/lib/grafana')
+    elif daemon_type == 'alertmanager':
+        uid, gid = extract_uid_gid(file_path='/etc/alertmanager')
     else:
         raise Error("{} not implemented yet".format(daemon_type))
     return uid, gid