From: Paul Cuzner <pcuzner@redhat.com>
Date: Wed, 23 Aug 2017 02:51:52 +0000 (+1200)
Subject: cephmetrics: simplified the probe logic
X-Git-Tag: v1.0~28^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4e63958f8d108e4526c61020b59531fd7312bc3a;p=cephmetrics.git

cephmetrics: simplified the probe logic

probe logic changed in the base class, so the code here can
change to take advantage
---

diff --git a/cephmetrics.py b/cephmetrics.py
index 33fb479..e265664 100644
--- a/cephmetrics.py
+++ b/cephmetrics.py
@@ -35,22 +35,16 @@ class Ceph(object):
 
     def probe(self):
         """
-        set up which collector(s) to use, based on what types of sockets we
-        find in /var/run/ceph
+        set up which collector(s) to use
         """
 
-        mon_socket = Mon.probe(self.cluster_name, 'mon')
-        if mon_socket:
-            self.mon = Mon(self, self.cluster_name,
-                           admin_socket=mon_socket[0])
+        if Mon.probe():
+            self.mon = Mon(self, self.cluster_name)
 
-        rgw_socket = RGW.probe(self.cluster_name, 'rgw')
-        if rgw_socket:
-            self.rgw = RGW(self, self.cluster_name,
-                           admin_socket=rgw_socket[0])
+        if RGW.probe():
+            self.rgw = RGW(self, self.cluster_name)
 
-        osd_socket = OSDs.probe(self.cluster_name, 'osd')
-        if osd_socket:
+        if OSDs.probe():
             self.osd = OSDs(self, self.cluster_name)
 
         if ISCSIGateway.probe():