mgr/influx: Send fsid as a tag to Influx to identify cluster

This allows for multiple Ceph clusters to send their data to the
same Influx database.

Using the fsid values for different clusters can be queried from
Influx

Signed-off-by: Wido den Hollander <wido@42on.com>

diff --git a/src/pybind/mgr/influx/module.py b/src/pybind/mgr/influx/module.py
index 7d08f663c03e07665beac5d52a18399cb327932f..5f71c61714801e0f552f8341b81bd7a03d51e4f3 100644 (file)
--- a/src/pybind/mgr/influx/module.py
+++ b/src/pybind/mgr/influx/module.py
@@ -26,6 +26,9 @@ class Module(MgrModule):
         self.event = Event()
         self.run = True
 
+    def get_fsid(self):
+        return self.get('mon_map')['fsid']
+
     def get_latest(self, daemon_type, daemon_name, stat):
         data = self.get_counter(daemon_type, daemon_name, stat)[stat]
         if data:
@@ -55,7 +58,7 @@ class Module(MgrModule):
                         "pool_name": pool['name'],
                         "pool_id": pool['id'],
                         "type_instance": df_type,
-                        "mgr_id": self.get_mgr_id(),
+                        "fsid": self.get_fsid()
                     },
                     "time": datetime.utcnow().isoformat() + 'Z',
                     "fields": {
@@ -83,7 +86,8 @@ class Module(MgrModule):
                     "tags": {
                         "ceph_daemon": daemon,
                         "type_instance": path,
-                        "host": metadata['hostname']
+                        "host": metadata['hostname'],
+                        "fsid": self.get_fsid()
                     },
                     "time": datetime.utcnow().isoformat() + 'Z',
                     "fields": {