From: Sage Weil <sage@redhat.com>
Date: Sat, 7 Mar 2020 14:09:30 +0000 (-0600)
Subject: mgr/cephadm: fix prom config generation when hosts have no labels or addrs
X-Git-Tag: v15.1.1~69^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5bd44d4338fe81d90744cdb39a5db110bbfcc6c2;p=ceph.git

mgr/cephadm: fix prom config generation when hosts have no labels or addrs

The inventory for a host might be {}, which evaluates as false.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index 3ccf0caec833..6d5ed60bb978 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -2467,24 +2467,22 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
                 continue
             if dd.daemon_id == self.get_mgr_id():
                 continue
-            hi = self.inventory.get(dd.hostname, None)
-            if hi:
-                addr = hi.get('addr', dd.hostname)
+            hi = self.inventory.get(dd.hostname, {})
+            addr = hi.get('addr', dd.hostname)
             mgr_scrape_list.append(addr.split(':')[0] + ':' + port)
 
         # scrape node exporters
         node_configs = ''
         for dd in self.cache.get_daemons_by_service('node-exporter'):
-            hi = self.inventory.get(dd.hostname, None)
-            if hi:
-                deps.append(dd.name())
-                addr = hi.get('addr', dd.hostname)
-                if not node_configs:
-                    node_configs = """
+            deps.append(dd.name())
+            hi = self.inventory.get(dd.hostname, {})
+            addr = hi.get('addr', dd.hostname)
+            if not node_configs:
+                node_configs = """
   - job_name: 'node'
     static_configs:
 """
-                node_configs += """    - targets: {}
+            node_configs += """    - targets: {}
       labels:
         instance: '{}'
 """.format([addr.split(':')[0] + ':9100'],
@@ -2494,10 +2492,8 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
         alertmgr_configs = ""
         alertmgr_targets = []
         for dd in self.cache.get_daemons_by_service('alertmanager'):
-            hi = self.inventory.get(dd.hostname, None)
-            if hi is None:
-                continue
             deps.append(dd.name())
+            hi = self.inventory.get(dd.hostname, {})
             addr = hi.get('addr', dd.hostname)
             alertmgr_targets.append("'{}:9093'".format(addr.split(':')[0]))
         if alertmgr_targets:
@@ -2649,8 +2645,8 @@ receivers:
         port = '9094'
         for dd in self.cache.get_daemons_by_service('alertmanager'):
             deps.append(dd.name())
-            hi = self.inventory.get(dd.hostname, None)
-            addr = hi.get('addr', dd.hostname) if hi else ""
+            hi = self.inventory.get(dd.hostname, {})
+            addr = hi.get('addr', dd.hostname)
             peers.append(addr.split(':')[0] + ':' + port)
         return {
             "files": {