From: Paul Cuzner <pcuzner@redhat.com>
Date: Fri, 28 Jul 2017 02:23:24 +0000 (+1200)
Subject: common: Add osd type and encrypted state to disk objects
X-Git-Tag: v1.0~38^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f0a4eabaad323216c906a11cecba4bd031d52761;p=cephmetrics.git

common: Add osd type and encrypted state to disk objects

osd_type is defined as; 0 - filestore, 1 - bluestore
encrypted is defined as; 0 - off, 1 - on
---

diff --git a/collectors/common.py b/collectors/common.py
index 08bb2ab..1f4f178 100644
--- a/collectors/common.py
+++ b/collectors/common.py
@@ -178,6 +178,7 @@ class IOstat(object):
 
 
 class Disk(object):
+
     metrics = {
         "rotational": ("rotational", "gauge"),
         "disk_size": ("disk_size", "gauge"),
@@ -187,7 +188,11 @@ class Disk(object):
         "osd_id": ("osd_id", "gauge")
     }
 
-    def __init__(self, device_name, path_name=None, osd_id=None):
+    osd_types = {"filestore": 0,
+                "bluestore": 1}
+
+    def __init__(self, device_name, path_name=None, osd_id=None,
+                 in_osd_type="filestore", encrypted=0):
 
         self._name = device_name
         self._path_name = path_name
@@ -200,6 +205,8 @@ class Disk(object):
         self.fs_size = 0
         self.fs_percent_used = 0
         self.fs_used = 0
+        self.encrypted = encrypted
+        self.osd_type = Disk.osd_types[in_osd_type]
 
         self.refresh()