exporter: fix lint errors + remove exporter entity

Signed-off-by: Avan Thakkar <athakkar@redhat.com>

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 032d17dcc03ebb29dcb5f4ab3c50ce3061528954..78d409abe3322663a6f1d4984afc2d7f613dca3f 100755 (executable)
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -929,7 +929,7 @@ class CephExporter(object):
                  fsid,
                  daemon_id,
                  image=DEFAULT_IMAGE):
-        # type: (CephadmContext, str, Union[int, str], Dict, str) -> None
+        # type: (CephadmContext, str, Union[int, str], str) -> None
         self.ctx = ctx
         self.fsid = fsid
         self.daemon_id = daemon_id
@@ -937,9 +937,8 @@ class CephExporter(object):
 
     @classmethod
     def init(cls, ctx, fsid, daemon_id):
-        # type: (CephadmContext, str, Union[int, str]) -> CephIscsi
-        return cls(ctx, fsid, daemon_id,
-                   get_parm(ctx.config_json), ctx.image)
+        # type: (CephadmContext, str, Union[int, str]) -> CephExporter
+        return cls(ctx, fsid, daemon_id, get_parm(ctx.config_json), ctx.image)
 
     @staticmethod
     def get_container_mounts():
@@ -5849,7 +5848,7 @@ def command_deploy(ctx):
                       config=config, keyring=keyring,
                       reconfig=ctx.reconfig,
                       ports=daemon_ports)
-    
+
     elif daemon_type == CephExporter.daemon_type:
         if not ctx.reconfig and not redeploy and not daemon_ports:
             daemon_ports = list(CephExporter.port_map.values())

diff --git a/src/common/entity_name.cc b/src/common/entity_name.cc
index fad4f0f3b4de93c08c429dad2399126a027cbe0e..5357b34eacb7f3f5f190c7183130c56568f1a54e 100644 (file)
--- a/src/common/entity_name.cc
+++ b/src/common/entity_name.cc
@@ -20,13 +20,12 @@
 using std::string;
 
 
-const std::array<EntityName::str_to_entity_type_t, 7> EntityName::STR_TO_ENTITY_TYPE = {{
+const std::array<EntityName::str_to_entity_type_t, 6> EntityName::STR_TO_ENTITY_TYPE = {{
   { CEPH_ENTITY_TYPE_AUTH, "auth" },
   { CEPH_ENTITY_TYPE_MON, "mon" },
   { CEPH_ENTITY_TYPE_OSD, "osd" },
   { CEPH_ENTITY_TYPE_MDS, "mds" },
   { CEPH_ENTITY_TYPE_MGR, "mgr" },
-  { CEPH_ENTITY_TYPE_EXPORTER, "exporter" },
   { CEPH_ENTITY_TYPE_CLIENT, "client" },
 }};
 

diff --git a/src/common/entity_name.h b/src/common/entity_name.h
index a9cc533886ba8206c6c7f8f9c2be30f87fdfc368..5e5ab111404a68f9a72c91b3794990aeb7f89b54 100644 (file)
--- a/src/common/entity_name.h
+++ b/src/common/entity_name.h
@@ -60,7 +60,6 @@ struct EntityName
   bool is_mds() const { return get_type() == CEPH_ENTITY_TYPE_MDS; }
   bool is_client() const { return get_type() == CEPH_ENTITY_TYPE_CLIENT; }
   bool is_mon() const { return get_type() == CEPH_ENTITY_TYPE_MON; }
-  bool is_exporter() const { return get_type() == CEPH_ENTITY_TYPE_EXPORTER; }
 
   std::string_view get_type_name() const;
   const std::string &get_id() const;
@@ -79,7 +78,7 @@ private:
     uint32_t type;
     const char *str;
   };
-  static const std::array<str_to_entity_type_t, 7> STR_TO_ENTITY_TYPE;
+  static const std::array<str_to_entity_type_t, 6> STR_TO_ENTITY_TYPE;
 
   uint32_t type = 0;
   std::string id;

diff --git a/src/include/msgr.h b/src/include/msgr.h
index 3c5f7aa8f53705f6a2048aff8e1c361f02c3277f..c8ad48ad1afef1306a33662b92daa0e0245b3a0b 100644 (file)
--- a/src/include/msgr.h
+++ b/src/include/msgr.h
@@ -92,7 +92,6 @@ struct ceph_entity_name {
 #define CEPH_ENTITY_TYPE_CLIENT 0x08
 #define CEPH_ENTITY_TYPE_MGR    0x10
 #define CEPH_ENTITY_TYPE_AUTH   0x20
-#define CEPH_ENTITY_TYPE_EXPORTER    0x30
 
 #define CEPH_ENTITY_TYPE_ANY    0xFF
 

diff --git a/src/msg/msg_types.cc b/src/msg/msg_types.cc
index e0e84c586e2fb8d52d5191af3222ca8bd04ebbf2..1a78cb32680986285d882b15d3d92742eab622e7 100644 (file)
--- a/src/msg/msg_types.cc
+++ b/src/msg/msg_types.cc
@@ -28,9 +28,6 @@ bool entity_name_t::parse(std::string_view s)
   } else if (s.find("mgr.") == 0) {
     _type = TYPE_MGR;
     start += 4;
-  } else if (s.find("exporter.") == 0) {
-    _type = TYPE_EXPORTER;
-    start += 8;
   } else {
     return false;
   }

diff --git a/src/msg/msg_types.h b/src/msg/msg_types.h
index d247a2bb06cf27af172177bb7200b08579f8fd93..a33545d916f3d51ed13592082bc72bea8b897d32 100644 (file)
--- a/src/msg/msg_types.h
+++ b/src/msg/msg_types.h
@@ -51,7 +51,6 @@ public:
   static const int TYPE_OSD = CEPH_ENTITY_TYPE_OSD;
   static const int TYPE_CLIENT = CEPH_ENTITY_TYPE_CLIENT;
   static const int TYPE_MGR = CEPH_ENTITY_TYPE_MGR;
-  static const int TYPE_EXPORTER = CEPH_ENTITY_TYPE_EXPORTER;
 
   static const int64_t NEW = -1;
 
@@ -67,7 +66,6 @@ public:
   static entity_name_t OSD(int64_t i=NEW) { return entity_name_t(TYPE_OSD, i); }
   static entity_name_t CLIENT(int64_t i=NEW) { return entity_name_t(TYPE_CLIENT, i); }
   static entity_name_t MGR(int64_t i=NEW) { return entity_name_t(TYPE_MGR, i); }
-  static entity_name_t EXPORTER(int64_t i=NEW) { return entity_name_t(TYPE_EXPORTER, i); }
 
   int64_t num() const { return _num; }
   int type() const { return _type; }
@@ -82,7 +80,6 @@ public:
   bool is_osd() const { return type() == TYPE_OSD; }
   bool is_mon() const { return type() == TYPE_MON; }
   bool is_mgr() const { return type() == TYPE_MGR; }
-  bool is_exporter() const { return type() == TYPE_EXPORTER; }
 
   operator ceph_entity_name() const {
     ceph_entity_name n = { _type, ceph_le64(_num) };

diff --git a/src/pybind/mgr/cephadm/services/monitoring.py b/src/pybind/mgr/cephadm/services/monitoring.py
index d68d25e5e0cca9dc8212b98a57222e6b8c5da404..e68a9c966021297d682b41dc07abc2732c28e9f8 100644 (file)
--- a/src/pybind/mgr/cephadm/services/monitoring.py
+++ b/src/pybind/mgr/cephadm/services/monitoring.py
@@ -315,7 +315,7 @@ class PrometheusService(CephadmService):
                 'hostname': dd.hostname,
                 'url': build_url(host=addr, port=port).lstrip('/')
             })
-        
+
         # scrape ceph exporters
         for dd in self.mgr.cache.get_daemons_by_service('exporter'):
             assert dd.hostname is not None