sbcli-pre 1.4.4__zip → 1.4.5__zip

{sbcli_pre-1.4.4 → sbcli_pre-1.4.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sbcli-pre
-Version: 1.4.4
+Version: 1.4.5
 Summary: CLI for managing SimplyBlock cluster
 Home-page: https://www.simplyblock.io/
 Author: Hamdy
@@ -8,12 +8,22 @@ Author-email: hamdy@simplyblock.io
 Description-Content-Type: text/markdown
 Requires-Dist: foundationdb
 Requires-Dist: requests
+Requires-Dist: numpy
 Requires-Dist: typing
 Requires-Dist: prettytable
 Requires-Dist: docker
 Requires-Dist: psutil
 Requires-Dist: py-cpuinfo
+Requires-Dist: pytest
+Requires-Dist: mock
+Requires-Dist: setuptools
+Requires-Dist: flask
+Requires-Dist: kubernetes
+Requires-Dist: PyYAML
+Requires-Dist: urllib3
 Requires-Dist: graypy
+Requires-Dist: boto3
+Requires-Dist: jinja2
 
 
 # Simply Block

{sbcli_pre-1.4.4 → sbcli_pre-1.4.5}/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-pre
-SIMPLY_BLOCK_VERSION=1.4.4
+SIMPLY_BLOCK_VERSION=1.4.5
 
 
 SIMPLY_BLOCK_DOCKER_IMAGE=simplyblock/simplyblock:pre-release

{sbcli_pre-1.4.4 → sbcli_pre-1.4.5}/sbcli_pre.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sbcli-pre
-Version: 1.4.4
+Version: 1.4.5
 Summary: CLI for managing SimplyBlock cluster
 Home-page: https://www.simplyblock.io/
 Author: Hamdy
@@ -8,12 +8,22 @@ Author-email: hamdy@simplyblock.io
 Description-Content-Type: text/markdown
 Requires-Dist: foundationdb
 Requires-Dist: requests
+Requires-Dist: numpy
 Requires-Dist: typing
 Requires-Dist: prettytable
 Requires-Dist: docker
 Requires-Dist: psutil
 Requires-Dist: py-cpuinfo
+Requires-Dist: pytest
+Requires-Dist: mock
+Requires-Dist: setuptools
+Requires-Dist: flask
+Requires-Dist: kubernetes
+Requires-Dist: PyYAML
+Requires-Dist: urllib3
 Requires-Dist: graypy
+Requires-Dist: boto3
+Requires-Dist: jinja2
 
 
 # Simply Block

sbcli_pre-1.4.5/sbcli_pre.egg-info/requires.txt

@@ -0,0 +1,18 @@
+foundationdb
+requests
+numpy
+typing
+prettytable
+docker
+psutil
+py-cpuinfo
+pytest
+mock
+setuptools
+flask
+kubernetes
+PyYAML
+urllib3
+graypy
+boto3
+jinja2

{sbcli_pre-1.4.4 → sbcli_pre-1.4.5}/setup.py

@@ -68,12 +68,22 @@ setup(
     install_requires=[
         "foundationdb",
         "requests",
+        "numpy",
         "typing",
         "prettytable",
         "docker",
         "psutil",
         "py-cpuinfo",
+        "pytest",
+        "mock",
+        "setuptools",
+        "flask",
+        "kubernetes",
+        "PyYAML",
+        "urllib3",
         "graypy",
+        "boto3",
+        "jinja2",
     ],
     entry_points={
         'console_scripts': [

{sbcli_pre-1.4.4 → sbcli_pre-1.4.5}/simplyblock_core/cnode_client.py

@@ -111,3 +111,14 @@ class CNodeClient:
 
     def disconnect_all(self):
         return self._request("POST", "cnode/disconnect_all")
+
+    def make_gpt_partitions(self, nbd_device, jm_percent):
+        params = {
+            "nbd_device": nbd_device,
+            "jm_percent": jm_percent,
+        }
+        return self._request("POST", "cnode/make_gpt_partitions", params)
+
+    def delete_dev_gpt_partitions(self, device_pci):
+        params = {"device_pci": device_pci}
+        return self._request("POST", "cnode/delete_dev_gpt_partitions", params)

{sbcli_pre-1.4.4 → sbcli_pre-1.4.5}/simplyblock_core/constants.py

@@ -44,7 +44,7 @@ weights = {
 }
 
 
-HEALTH_CHECK_INTERVAL_SEC = 60
+HEALTH_CHECK_INTERVAL_SEC = 10
 
 GRAYLOG_CHECK_INTERVAL_SEC = 60
 

{sbcli_pre-1.4.4 → sbcli_pre-1.4.5}/simplyblock_core/controllers/caching_node_controller.py

@@ -84,9 +84,9 @@ def add_node(cluster_id, node_ip, iface_name, data_nics_list, spdk_cpu_mask, spd
         return False
 
     logger.info(f"Add Caching node: {node_ip}")
-    snode_api = CNodeClient(node_ip)
+    cnode_api = CNodeClient(node_ip)
 
-    node_info, _ = snode_api.info()
+    node_info, _ = cnode_api.info()
     system_id = node_info['system_id']
     hostname = node_info['hostname']
     logger.info(f"Node found: {node_info['hostname']}")
@@ -95,8 +95,8 @@ def add_node(cluster_id, node_ip, iface_name, data_nics_list, spdk_cpu_mask, spd
         logger.error("Node already exists, try remove it first.")
         return False
 
-    node_info, _ = snode_api.info()
-    results, err = snode_api.join_db(db_connection=cluster.db_connection)
+    node_info, _ = cnode_api.info()
+    results, err = cnode_api.join_db(db_connection=cluster.db_connection)
 
     data_nics = []
     names = data_nics_list or [iface_name]
@@ -156,7 +156,7 @@ def add_node(cluster_id, node_ip, iface_name, data_nics_list, spdk_cpu_mask, spd
                 return False
 
     logger.info(f"Deploying SPDK with HP: {utils.humanbytes(spdk_mem)}")
-    results, err = snode_api.spdk_process_start(
+    results, err = cnode_api.spdk_process_start(
         spdk_cpu_mask, spdk_mem, spdk_image, snode.mgmt_ip,
         snode.rpc_port, snode.rpc_username, snode.rpc_password, namespace)
     if not results:
@@ -165,7 +165,7 @@ def add_node(cluster_id, node_ip, iface_name, data_nics_list, spdk_cpu_mask, spd
 
     retries = 20
     while retries > 0:
-        resp, _ = snode_api.spdk_process_is_up()
+        resp, _ = cnode_api.spdk_process_is_up()
         if resp:
             logger.info(f"Pod is up")
             break
@@ -178,7 +178,7 @@ def add_node(cluster_id, node_ip, iface_name, data_nics_list, spdk_cpu_mask, spd
         logger.error("Pod is not running, exiting")
         return False
 
-    time.sleep(10)
+    time.sleep(20)
 
     # creating RPCClient instance
     rpc_client = RPCClient(
@@ -187,7 +187,7 @@ def add_node(cluster_id, node_ip, iface_name, data_nics_list, spdk_cpu_mask, spd
         timeout=60*5, retry=5)
 
     # # get new node info after starting spdk
-    # node_info, _ = snode_api.info()
+    node_info, _ = cnode_api.info()
     # mem = node_info['memory_details']['huge_free']
     # logger.info(f"Free Hugepages detected: {utils.humanbytes(mem)}")
 
@@ -211,21 +211,40 @@ def add_node(cluster_id, node_ip, iface_name, data_nics_list, spdk_cpu_mask, spd
 
     ssd_size = ssd_dev.size
     supported_ssd_size = mem * 100 / 2.25
-    split_factor = math.ceil(ssd_size/supported_ssd_size)
 
     logger.info(f"Supported SSD size: {utils.humanbytes(supported_ssd_size)}")
     logger.info(f"SSD size: {utils.humanbytes(ssd_size)}")
 
-    cache_size = 0
-    cache_bdev = None
     if supported_ssd_size < ssd_size:
-        logger.info(f"SSD size is bigger than the supported size, will use split bdev: {split_factor}")
-        ret = rpc_client.bdev_split(ssd_dev.nvme_bdev, split_factor)
-        cache_bdev = ret[0]
-        cache_size = int(ssd_dev.size/split_factor)
-        snode.cache_split_factor = split_factor
+        logger.info(f"SSD size is bigger than the supported size, creating partition")
+
+        nbd_device = rpc_client.nbd_start_disk(ssd_dev.nvme_bdev)
+        time.sleep(3)
+        if not nbd_device:
+            logger.error(f"Failed to start nbd dev")
+            return False
+
+        jm_percent = int((supported_ssd_size/ssd_size) * 100)
+        result, error = cnode_api.make_gpt_partitions(nbd_device, jm_percent)
+        if error:
+            logger.error(f"Failed to make partitions")
+            logger.error(error)
+            return False
+        time.sleep(3)
+        rpc_client.nbd_stop_disk(nbd_device)
+        time.sleep(1)
+        rpc_client.bdev_nvme_detach_controller(ssd_dev.nvme_controller)
+        time.sleep(1)
+        rpc_client.bdev_nvme_controller_attach(ssd_dev.nvme_controller, ssd_dev.pcie_address)
+        time.sleep(1)
+        rpc_client.bdev_examine(ssd_dev.nvme_bdev)
+        time.sleep(1)
+
+        cache_bdev = f"{ssd_dev.nvme_bdev}p1"
+        cache_size = int(supported_ssd_size)
+
     else:
-        snode.cache_split_factor = 0
+
         cache_bdev = ssd_dev.nvme_bdev
         cache_size = ssd_dev.size
 
@@ -282,13 +301,13 @@ def recreate(node_id):
         logger.error("No NVMe devices was found!")
         return False
 
-    snode.nvme_devices = nvme_devs
+    # snode.nvme_devices = nvme_devs
     # snode.write_to_db(db_controller.kv_store)
 
-    ssd_dev = nvme_devs[0]
+    # ssd_dev = nvme_devs[0]
 
-    if snode.cache_split_factor > 1:
-        ret = rpc_client.bdev_split(ssd_dev.nvme_bdev, snode.cache_split_factor)
+    # if snode.cache_split_factor > 1:
+    #     ret = rpc_client.bdev_split(ssd_dev.nvme_bdev, snode.cache_split_factor)
 
     logger.info(f"Cache size: {utils.humanbytes(snode.cache_size)}")
 
@@ -688,13 +707,13 @@ def remove_node(node_id, force=False):
 
     logger.info("Removing node")
 
-
     try:
         snode_api = CNodeClient(snode.api_endpoint)
         results, err = snode_api.spdk_process_kill()
+        ret = snode_api.delete_dev_gpt_partitions(snode.nvme_devices[0].pcie_address)
+
     except:
         pass
-    snode.remove(db_controller.kv_store)
 
-    # storage_events.snode_remove(snode)
+    snode.remove(db_controller.kv_store)
     logger.info("done")

{sbcli_pre-1.4.4 → sbcli_pre-1.4.5}/simplyblock_core/models/storage_node.py

@@ -85,10 +85,9 @@ class StorageNode(BaseModel):
         "spdk_image": {"type": str, "default": ""},
         "spdk_debug": {"type": bool, "default": False},
 
-
-        "ec2_metadata": {"type": dict, "default": {}},
-        "ec2_instance_id": {"type": str, "default": ""},
-        "ec2_public_ip": {"type": str, "default": ""},
+        "cloud_instance_id": {"type": str, "default": ""},
+        "cloud_instance_type": {"type": str, "default": ""},
+        "cloud_instance_public_ip": {"type": str, "default": ""},
 
         # IO buffer options
         "iobuf_small_pool_count": {"type": int, "default": 0},

{sbcli_pre-1.4.4 → sbcli_pre-1.4.5}/simplyblock_core/scripts/deploy_stack.sh

@@ -19,6 +19,15 @@ then
    export FDB_CLUSTER_FILE_CONTENTS=$FDB_CLUSTER_FILE_CONTENTS
 fi
 
+if [[ "$LOG_DELETION_INTERVAL" == *d ]]; then
+   export MAX_NUMBER_OF_INDICES=${LOG_DELETION_INTERVAL%d}
+elif [[ "$LOG_DELETION_INTERVAL" == *h || "$LOG_DELETION_INTERVAL" == *m ]]; then
+   export MAX_NUMBER_OF_INDICES=1
+else
+    echo "Invalid LOG_DELETION_INTERVAL format. Please use a value ending in 'd', 'h', or 'm'."
+    exit 1
+fi
+
 docker network create monitoring-net -d overlay --attachable
 
 docker stack deploy --compose-file="$DIR"/docker-compose-swarm-monitoring.yml monitoring

{sbcli_pre-1.4.4 → sbcli_pre-1.4.5}/simplyblock_core/scripts/docker-compose-swarm-monitoring.yml

@@ -42,6 +42,10 @@ services:
       GRAYLOG_ELASTICSEARCH_HOSTS: "http://opensearch:9200"
       GRAYLOG_MONGODB_URI: "mongodb://mongodb:27017/graylog"
       GRAYLOG_SKIP_PREFLIGHT_CHECKS: "true"
+      GRAYLOG_ROTATION_STRATEGY: "time"
+      GRAYLOG_RETENTION_STRATEGY: "delete"
+      GRAYLOG_ELASTICSEARCH_MAX_NUMBER_OF_INDICES: "${MAX_NUMBER_OF_INDICES}"
+      GRAYLOG_ELASTICSEARCH_MAX_TIME_PER_INDEX: "1d"
     ports:
     - "5044:5044/tcp"   # Beats
     - "5140:5140/udp"   # Syslog
@@ -190,8 +194,6 @@ services:
     restart: "always"
     deploy:
       mode: global
-      placement:
-        constraints: [node.role == worker]
     networks:
       - monitoring-net
 
@@ -216,24 +218,13 @@ services:
     networks:
       - monitoring-net
 
-  CleanupGraylog:
-    image: $SIMPLYBLOCK_DOCKER_IMAGE
-    environment:
-      LOG_DELETION_INTERVAL: "${LOG_DELETION_INTERVAL}"
-    command: "python simplyblock_core/workers/cleanup_graylog.py"
-    deploy:
-      placement:
-        constraints: [node.role == manager]
-    networks:
-      - monitoring-net
-
 volumes:
   mongodb_data:
   os_data:
   graylog_data:
   graylog_journal:
   grafana_data:
-  graylog_config:  
+  graylog_config:
   prometheus_data:
   thanos_compactor_data:
 

{sbcli_pre-1.4.4 → sbcli_pre-1.4.5}/simplyblock_core/services/caching_node_monitor.py

@@ -1,28 +1,16 @@
 # coding=utf-8
-import logging
 import os
 
 import time
-import sys
 from datetime import datetime
 
 
-from simplyblock_core import constants, kv_store
+from simplyblock_core import constants, kv_store, utils
 from simplyblock_core.rpc_client import RPCClient
 from simplyblock_core.models.caching_node import CachingNode
 
-# Import the GELF logger
-from graypy import GELFUDPHandler
-
-# configure logging
-logger_handler = logging.StreamHandler(stream=sys.stdout)
-logger_handler.setFormatter(logging.Formatter('%(asctime)s: %(levelname)s: %(message)s'))
-gelf_handler = GELFUDPHandler('0.0.0.0', constants.GELF_PORT)
-logger = logging.getLogger()
-logger.addHandler(gelf_handler)
-logger.addHandler(logger_handler)
-logger.setLevel(logging.DEBUG)
 
+logger = utils.get_logger(__name__)
 
 # get DB controller
 db_store = kv_store.KVStore()

{sbcli_pre-1.4.4 → sbcli_pre-1.4.5}/simplyblock_core/services/cap_monitor.py

@@ -1,28 +1,15 @@
 # coding=utf-8
-import logging
 
 import time
-import sys
 
 
-
-from simplyblock_core import kv_store, constants, cluster_ops
+from simplyblock_core import kv_store, constants, cluster_ops, utils
 from simplyblock_core.controllers import cluster_events
 from simplyblock_core.models.cluster import Cluster
 
-# Import the GELF logger
-from graypy import GELFUDPHandler
 
-# configure logging
-logger_handler = logging.StreamHandler(stream=sys.stdout)
-logger_handler.setFormatter(logging.Formatter('%(asctime)s: %(levelname)s: %(message)s'))
-gelf_handler = GELFUDPHandler('0.0.0.0', constants.GELF_PORT)
-logger = logging.getLogger()
-logger.addHandler(gelf_handler)
-logger.addHandler(logger_handler)
-logger.setLevel(logging.DEBUG)
+logger = utils.get_logger(__name__)
 
-### script to test connection once connection is ascertain
 # get DB controller
 db_controller = kv_store.DBController()
 

{sbcli_pre-1.4.4 → sbcli_pre-1.4.5}/simplyblock_core/services/capacity_and_stats_collector.py

@@ -1,16 +1,14 @@
 # coding=utf-8
-import logging
-
 import time
-import sys
 
 from simplyblock_core import constants, kv_store, utils
 from simplyblock_core.models.nvme_device import NVMeDevice
 from simplyblock_core.rpc_client import RPCClient
 from simplyblock_core.models.stats import DeviceStatObject, NodeStatObject, ClusterStatObject
 
-# Import the GELF logger
-from graypy import GELFUDPHandler
+
+logger = utils.get_logger(__name__)
+
 
 last_object_record = {}
 
@@ -150,14 +148,6 @@ def add_cluster_stats(cl, records):
     return stat_obj
 
 
-# configure logging
-logger_handler = logging.StreamHandler(stream=sys.stdout)
-logger_handler.setFormatter(logging.Formatter('%(asctime)s: %(levelname)s: %(message)s'))
-gelf_handler = GELFUDPHandler('0.0.0.0', constants.GELF_PORT)
-logger = logging.getLogger()
-logger.addHandler(gelf_handler)
-logger.addHandler(logger_handler)
-logger.setLevel(logging.DEBUG)
 
 # get DB controller
 db_controller = kv_store.DBController()

{sbcli_pre-1.4.4 → sbcli_pre-1.4.5}/simplyblock_core/services/device_monitor.py

@@ -1,26 +1,14 @@
 # coding=utf-8
-import logging
 import time
-import sys
-import uuid
 
-from simplyblock_core import constants, kv_store
+from simplyblock_core import constants, kv_store, utils
 from simplyblock_core.controllers import tasks_controller
 from simplyblock_core.models.nvme_device import NVMeDevice
 from simplyblock_core.models.storage_node import StorageNode
 
-# Import the GELF logger
-from graypy import GELFUDPHandler
 
+logger = utils.get_logger(__name__)
 
-# configure logging
-logger_handler = logging.StreamHandler(stream=sys.stdout)
-logger_handler.setFormatter(logging.Formatter('%(asctime)s: %(levelname)s: %(message)s'))
-gelf_handler = GELFUDPHandler('0.0.0.0', constants.GELF_PORT)
-logger = logging.getLogger()
-logger.addHandler(gelf_handler)
-logger.addHandler(logger_handler)
-logger.setLevel(logging.DEBUG)
 
 # get DB controller
 db_store = kv_store.KVStore()

{sbcli_pre-1.4.4 → sbcli_pre-1.4.5}/simplyblock_core/services/distr_event_collector.py

@@ -1,29 +1,18 @@
 # coding=utf-8
-import logging
-import os
-
 import time
-import sys
 
 
 from simplyblock_core import constants, kv_store, utils, rpc_client
 from simplyblock_core.controllers import events_controller, device_controller, lvol_events
 from simplyblock_core.models.lvol_model import LVol
 
-# Import the GELF logger
-from graypy import GELFUDPHandler
 
 from simplyblock_core.models.nvme_device import NVMeDevice
 from simplyblock_core.rpc_client import RPCClient
 
-# configure logging
-logger_handler = logging.StreamHandler(stream=sys.stdout)
-logger_handler.setFormatter(logging.Formatter('%(asctime)s: %(levelname)s: %(message)s'))
-gelf_handler = GELFUDPHandler('0.0.0.0', constants.GELF_PORT)
-logger = logging.getLogger()
-logger.addHandler(gelf_handler)
-logger.addHandler(logger_handler)
-logger.setLevel(logging.DEBUG)
+
+logger = utils.get_logger(__name__)
+
 
 # get DB controller
 db_controller = kv_store.DBController()

{sbcli_pre-1.4.4 → sbcli_pre-1.4.5}/simplyblock_core/services/health_check_service.py

@@ -1,18 +1,16 @@
 # coding=utf-8
-import logging
-
 import time
-import sys
 from datetime import datetime
 
 
 from simplyblock_core.controllers import health_controller, storage_events, device_events
 from simplyblock_core.models.storage_node import StorageNode
 from simplyblock_core.rpc_client import RPCClient
-from simplyblock_core import constants, kv_store
+from simplyblock_core import constants, kv_store, utils
+
+
+logger = utils.get_logger(__name__)
 
-# Import the GELF logger
-from graypy import GELFUDPHandler
 
 def set_node_health_check(snode, health_check_status):
     snode = db_controller.get_storage_node_by_id(snode.get_id())
@@ -40,15 +38,6 @@ def set_device_health_check(cluster_id, device, health_check_status):
                         dev, dev.health_check, old_status, caused_by="monitor")
 
 
-# configure logging
-logger_handler = logging.StreamHandler(stream=sys.stdout)
-logger_handler.setFormatter(logging.Formatter('%(asctime)s: %(levelname)s: %(message)s'))
-gelf_handler = GELFUDPHandler('0.0.0.0', constants.GELF_PORT)
-logger = logging.getLogger()
-logger.addHandler(gelf_handler)
-logger.addHandler(logger_handler)
-logger.setLevel(logging.DEBUG)
-
 # get DB controller
 db_store = kv_store.KVStore()
 db_controller = kv_store.DBController()

{sbcli_pre-1.4.4 → sbcli_pre-1.4.5}/simplyblock_core/services/lvol_monitor.py

@@ -1,17 +1,15 @@
 # coding=utf-8
-import logging
-import os
-
 import time
-import sys
 from datetime import datetime
 
-from simplyblock_core import constants, kv_store
+
+from simplyblock_core import constants, kv_store, utils
 from simplyblock_core.models.lvol_model import LVol
 from simplyblock_core.controllers import health_controller, lvol_events
 
-# Import the GELF logger
-from graypy import GELFUDPHandler
+
+logger = utils.get_logger(__name__)
+
 
 def set_lvol_status(lvol, status):
     if lvol.status != status:
@@ -33,20 +31,10 @@ def set_lvol_health_check(lvol, health_check_status):
     lvol_events.lvol_health_check_change(lvol, lvol.health_check, old_status, caused_by="monitor")
 
 
-# configure logging
-logger_handler = logging.StreamHandler(stream=sys.stdout)
-logger_handler.setFormatter(logging.Formatter('%(asctime)s: %(levelname)s: %(message)s'))
-gelf_handler = GELFUDPHandler('0.0.0.0', constants.GELF_PORT)
-logger = logging.getLogger()
-logger.addHandler(gelf_handler)
-logger.addHandler(logger_handler)
-logger.setLevel(logging.DEBUG)
-
 # get DB controller
 db_store = kv_store.KVStore()
 db_controller = kv_store.DBController()
 
-
 logger.info("Starting LVol monitor...")
 while True:
     lvols = db_controller.get_lvols()  # pass

{sbcli_pre-1.4.4 → sbcli_pre-1.4.5}/simplyblock_core/services/lvol_stat_collector.py

@@ -1,8 +1,5 @@
 # coding=utf-8
-import logging
-
 import time
-import sys
 
 
 from simplyblock_core import constants, kv_store, utils
@@ -10,8 +7,9 @@ from simplyblock_core.controllers import lvol_events
 from simplyblock_core.models.stats import LVolStatObject, PoolStatObject
 from simplyblock_core.rpc_client import RPCClient
 
-# Import the GELF logger
-from graypy import GELFUDPHandler
+
+logger = utils.get_logger(__name__)
+
 
 last_object_record = {}
 
@@ -97,20 +95,10 @@ def add_pool_stats(pool, records):
     return stat_obj
 
 
-# configure logging
-logger_handler = logging.StreamHandler(stream=sys.stdout)
-logger_handler.setFormatter(logging.Formatter('%(asctime)s: %(levelname)s: %(message)s'))
-gelf_handler = GELFUDPHandler('0.0.0.0', constants.GELF_PORT)
-logger = logging.getLogger()
-logger.addHandler(gelf_handler)
-logger.addHandler(logger_handler)
-logger.setLevel(logging.DEBUG)
-
 # get DB controller
 db_store = kv_store.KVStore()
 db_controller = kv_store.DBController()
 
-
 logger.info("Starting stats collector...")
 while True:
 

{sbcli_pre-1.4.4 → sbcli_pre-1.4.5}/simplyblock_core/services/mgmt_node_monitor.py

@@ -1,9 +1,7 @@
 # coding=utf-8
-import logging
 import os
 
 import time
-import sys
 from datetime import datetime
 
 
@@ -11,23 +9,15 @@ from simplyblock_core import constants, kv_store, utils
 from simplyblock_core.controllers import mgmt_events
 from simplyblock_core.models.mgmt_node import MgmtNode
 
-# Import the GELF logger
-from graypy import GELFUDPHandler
 
-# configure logging
-logger_handler = logging.StreamHandler(stream=sys.stdout)
-logger_handler.setFormatter(logging.Formatter('%(asctime)s: %(levelname)s: %(message)s'))
-gelf_handler = GELFUDPHandler('0.0.0.0', constants.GELF_PORT)
-logger = logging.getLogger()
-logger.addHandler(gelf_handler)
-logger.addHandler(logger_handler)
-logger.setLevel(logging.DEBUG)
+logger = utils.get_logger(__name__)
 
 
 # get DB controller
 db_store = kv_store.KVStore()
 db_controller = kv_store.DBController(kv_store=db_store)
 
+
 def set_node_online(node):
     if node.status == MgmtNode.STATUS_UNREACHABLE:
         snode = db_controller.get_mgmt_node_by_id(node.get_id())