sbcli-dev 12.0.1__tar.gz → 12.0.3__tar.gz

{sbcli_dev-12.0.1 → sbcli_dev-12.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sbcli-dev
-Version: 12.0.1
+Version: 12.0.3
 Summary: CLI for managing SimplyBlock cluster
 Home-page: https://www.simplyblock.io/
 Author: Hamdy

{sbcli_dev-12.0.1 → sbcli_dev-12.0.3}/sbcli_dev.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sbcli-dev
-Version: 12.0.1
+Version: 12.0.3
 Summary: CLI for managing SimplyBlock cluster
 Home-page: https://www.simplyblock.io/
 Author: Hamdy

{sbcli_dev-12.0.1 → sbcli_dev-12.0.3}/simplyblock_core/cluster_ops.py

@@ -836,6 +836,18 @@ def get_iostats_history(cluster_id, history_string, records_count=20, parse_size
                 "size_free",
                 "size_util",
                 "size_prov_util",
+                "read_latency_ticks",
+                "record_duration",
+                "record_end_time",
+                "record_start_time",
+                "unmap_bytes",
+                "unmap_bytes_ps",
+                "unmap_io",
+                "unmap_io_ps",
+                "unmap_latency_ps",
+                "unmap_latency_ticks",
+                "write_bytes_ps",
+                "write_latency_ticks",
             ]
         )
     # combine records

{sbcli_dev-12.0.1 → sbcli_dev-12.0.3}/simplyblock_core/controllers/device_events.py

@@ -10,14 +10,15 @@ db_controller = DBController()
 
 def _device_event(device, message, caused_by, event):
     snode = db_controller.get_storage_node_by_id(device.node_id)
-    ec.log_event_cluster(
-        cluster_id=snode.cluster_id,
-        domain=ec.DOMAIN_CLUSTER,
-        event=event,
-        db_object=device,
-        caused_by=caused_by,
-        message=message,
-        node_id=device.get_id())
+    if snode:
+        ec.log_event_cluster(
+            cluster_id=snode.cluster_id,
+            domain=ec.DOMAIN_CLUSTER,
+            event=event,
+            db_object=device,
+            caused_by=caused_by,
+            message=message,
+            node_id=device.get_id())
 
 
 def device_create(device, caused_by=ec.CAUSED_BY_CLI):

{sbcli_dev-12.0.1 → sbcli_dev-12.0.3}/simplyblock_core/controllers/lvol_controller.py

@@ -1260,7 +1260,7 @@ def get_capacity(lvol_uuid, history, records_count=20, parse_sizes=True):
     return out
 
 
-def get_io_stats(lvol_uuid, history, records_count=20, parse_sizes=True):
+def get_io_stats(lvol_uuid, history, records_count=20, parse_sizes=True, with_sizes=False):
     lvol = db_controller.get_lvol_by_id(lvol_uuid)
     if not lvol:
         logger.error(f"LVol not found: {lvol_uuid}")
@@ -1289,6 +1289,29 @@ def get_io_stats(lvol_uuid, history, records_count=20, parse_sizes=True):
         "write_latency_ps",
         "connected_clients",
     ]
+    if with_sizes:
+        io_stats_keys.extend(
+            [
+                "size_total",
+                "size_prov",
+                "size_used",
+                "size_free",
+                "size_util",
+                "size_prov_util",
+                "read_latency_ticks",
+                "record_duration",
+                "record_end_time",
+                "record_start_time",
+                "unmap_bytes",
+                "unmap_bytes_ps",
+                "unmap_io",
+                "unmap_io_ps",
+                "unmap_latency_ps",
+                "unmap_latency_ticks",
+                "write_bytes_ps",
+                "write_latency_ticks",
+            ]
+        )
     # combine records
     new_records = utils.process_records(records_list, records_count, keys=io_stats_keys)
 

{sbcli_dev-12.0.1 → sbcli_dev-12.0.3}/simplyblock_core/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-dev
-SIMPLY_BLOCK_VERSION=12.0.1
+SIMPLY_BLOCK_VERSION=12.0.3
 
 SIMPLY_BLOCK_DOCKER_IMAGE=simplyblock/simplyblock:main
 DOCKER_USER=hamdysimplyblock

{sbcli_dev-12.0.1 → sbcli_dev-12.0.3}/simplyblock_core/storage_node_ops.py

@@ -2406,7 +2406,7 @@ def get_node_capacity(node_id, history, records_count=20, parse_sizes=True):
     return out
 
 
-def get_node_iostats_history(node_id, history, records_count=20, parse_sizes=True):
+def get_node_iostats_history(node_id, history, records_count=20, parse_sizes=True, with_sizes=False):
     db_controller = DBController()
     node = db_controller.get_storage_node_by_id(node_id)
     if not node:
@@ -2436,6 +2436,30 @@ def get_node_iostats_history(node_id, history, records_count=20, parse_sizes=Tru
         "write_io_ps",
         "write_latency_ps",
     ]
+
+    if with_sizes:
+        io_stats_keys.extend(
+            [
+                "size_total",
+                "size_prov",
+                "size_used",
+                "size_free",
+                "size_util",
+                "size_prov_util",
+                "read_latency_ticks",
+                "record_duration",
+                "record_end_time",
+                "record_start_time",
+                "unmap_bytes",
+                "unmap_bytes_ps",
+                "unmap_io",
+                "unmap_io_ps",
+                "unmap_latency_ps",
+                "unmap_latency_ticks",
+                "write_bytes_ps",
+                "write_latency_ticks",
+            ]
+        )
     # combine records
     new_records = utils.process_records(records, records_count, keys=io_stats_keys)
 

{sbcli_dev-12.0.1 → sbcli_dev-12.0.3}/simplyblock_web/blueprints/web_api_lvol.py

@@ -62,7 +62,7 @@ def lvol_iostats(uuid, history):
         if req_secret != pool.secret:
             return utils.get_response_error(f"Pool secret doesn't mach the value in the request header", 400)
 
-    data = lvol_controller.get_io_stats(uuid, history, parse_sizes=False)
+    data = lvol_controller.get_io_stats(uuid, history, parse_sizes=False, with_sizes=True)
     ret = {
         "object_data": lvol.get_clean_dict(),
         "stats": data or []

{sbcli_dev-12.0.1 → sbcli_dev-12.0.3}/simplyblock_web/blueprints/web_api_storage_node.py

@@ -62,7 +62,7 @@ def storagenode_iostats(uuid, history):
     if not node:
         return utils.get_response_error(f"node not found: {uuid}", 404)
 
-    data = storage_node_ops.get_node_iostats_history(uuid, history, parse_sizes=False)
+    data = storage_node_ops.get_node_iostats_history(uuid, history, parse_sizes=False, with_sizes=True)
     ret = {
         "object_data": node.get_clean_dict(),
         "stats": data or []