sbcli-dev 17.2.7__tar.gz → 17.2.8__tar.gz

{sbcli_dev-17.2.7 → sbcli_dev-17.2.8}/PKG-INFO

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

{sbcli_dev-17.2.7 → sbcli_dev-17.2.8}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-17.2.7 → sbcli_dev-17.2.8}/simplyblock_core/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-dev
-SIMPLY_BLOCK_VERSION=17.2.7
+SIMPLY_BLOCK_VERSION=17.2.8
 
 SIMPLY_BLOCK_DOCKER_IMAGE=public.ecr.aws/simply-block/simplyblock:main
 SIMPLY_BLOCK_SPDK_ULTRA_IMAGE=public.ecr.aws/simply-block/ultra:main-latest

{sbcli_dev-17.2.7 → sbcli_dev-17.2.8}/simplyblock_core/scripts/prometheus.yml

@@ -4,10 +4,12 @@ global:
     monitor: 'codelab-monitor'
 
 scrape_configs:
-  - job_name: 'metricsgateway'
+  - job_name: 'cluster_metrics'
     static_configs:
-      - targets: ['pushgateway:9091']
-      
+      - targets: ['HAProxy:80']
+        labels:
+          metrics_path: '/cluster/metrics'
+
   - job_name: 'node'
     dns_sd_configs:
     - names:

{sbcli_dev-17.2.7 → sbcli_dev-17.2.8}/simplyblock_core/services/capacity_and_stats_collector.py

@@ -92,11 +92,11 @@ def add_device_stats(cl, device, capacity_dict, stats_dict):
     for g in ng:
         v = g.replace("device_", "")
         if v in data:
-            ng[g].labels(cluster=cl.get_id(), node_ip=node.get_id(), device_id=device.get_id()).set(data[v])
+            ng[g].labels(cluster=cl.get_id(), snode=node.get_id(), device_id=device.get_id()).set(data[v])
         elif v == "status_code":
-            ng[g].labels(cluster=cl.get_id(), node_ip=node.get_id(), device_id=device.get_id()).set(device.get_status_code())
+            ng[g].labels(cluster=cl.get_id(), snode=node.get_id(), device_id=device.get_id()).set(device.get_status_code())
         elif v == "health_check":
-            ng[g].labels(cluster=cl.get_id(), node_ip=node.get_id(), device_id=device.get_id()).set(device.health_check)
+            ng[g].labels(cluster=cl.get_id(), snode=node.get_id(), device_id=device.get_id()).set(device.health_check)
 
 
     return stat_obj
@@ -137,11 +137,11 @@ def add_node_stats(node, records):
     for g in ng:
         v = g.replace("snode_", "")
         if v in data:
-            ng[g].labels(cluster=cl.get_id(), node_ip=node.get_id()).set(data[v])
+            ng[g].labels(cluster=cl.get_id(), snode=node.get_id()).set(data[v])
         elif v == "status_code":
-            ng[g].labels(cluster=cl.get_id(), node_ip=node.get_id()).set(node.get_status_code())
+            ng[g].labels(cluster=cl.get_id(), snode=node.get_id()).set(node.get_status_code())
         elif v == "health_check":
-            ng[g].labels(cluster=cl.get_id(), node_ip=node.get_id()).set(node.health_check)
+            ng[g].labels(cluster=cl.get_id(), snode=node.get_id()).set(node.health_check)
 
     return stat_obj
 
@@ -228,7 +228,7 @@ dg = {}
 def get_device_metrics():
     global dg
     if not dg:
-        labels = ['cluster', "node_ip", "device_id"]
+        labels = ['cluster', "snode", "device_id"]
         for k in io_stats_keys + ["status_code", "health_check"]:
             dg["device_" + k] = Gauge("device_" + k, "device_" + k, labelnames=labels, registry=registry)
     return dg
@@ -236,7 +236,7 @@ def get_device_metrics():
 def get_snode_metrics():
     global ng
     if not ng:
-        labels = ['cluster', "node_ip"]
+        labels = ['cluster', "snode"]
         for k in io_stats_keys + ["status_code", "health_check"]:
             ng["snode_" + k] = Gauge("snode_" + k, "snode_" + k, labelnames=labels, registry=registry)
     return ng

{sbcli_dev-17.2.7 → sbcli_dev-17.2.8}/simplyblock_core/services/spdk_http_proxy_server.py

@@ -50,7 +50,7 @@ def rpc_call(req):
     response = None
 
     while not closed:
-        newdata = sock.recv(1024)
+        newdata = sock.recv(1024*1024*1024)
         if newdata == b'':
             closed = True
         buf += newdata.decode('ascii')
@@ -151,7 +151,7 @@ def run_server(host, port, user, password, is_threading_enabled=False):
 
 TIMEOUT = int(get_env_var("TIMEOUT", is_required=False, default=60*5))
 is_threading_enabled = get_env_var("MULTI_THREADING_ENABLED", is_required=False, default=False)
-server_ip = get_env_var("SERVER_IP", is_required=True)
+server_ip = get_env_var("SERVER_IP", is_required=True, default="")
 rpc_port = get_env_var("RPC_PORT", is_required=True)
 rpc_username = get_env_var("RPC_USERNAME", is_required=True)
 rpc_password = get_env_var("RPC_PASSWORD", is_required=True)