sbcli-dev 19.0.0__tar.gz → 19.0.2__tar.gz

{sbcli_dev-19.0.0 → sbcli_dev-19.0.2}/PKG-INFO

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

{sbcli_dev-19.0.0 → sbcli_dev-19.0.2}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-19.0.0 → sbcli_dev-19.0.2}/simplyblock_core/cluster_ops.py

@@ -3,8 +3,6 @@ import datetime
 import json
 import os
 import socket
-import re
-import tempfile
 import subprocess
 import time
 import uuid
@@ -13,7 +11,6 @@ import typing as t
 
 import docker
 import requests
-from jinja2 import Environment, FileSystemLoader
 
 from simplyblock_core import utils, scripts, constants, mgmt_node_ops, storage_node_ops
 from simplyblock_core.controllers import cluster_events, device_controller, pool_controller, \
@@ -30,7 +27,6 @@ from simplyblock_core.models.storage_node import StorageNode
 from simplyblock_core.utils import pull_docker_image_with_retry
 
 logger = utils.get_logger(__name__)
-TOP_DIR = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
 
 db_controller = DBController()
 
@@ -216,56 +212,9 @@ def create_cluster(blk_size, page_size_in_blocks, cli_pass,
     c.inflight_io_threshold = inflight_io_threshold
     c.enable_qos = enable_qos
     c.strict_node_anti_affinity = strict_node_anti_affinity
+    c.contact_point = contact_point
 
-    alerts_template_folder = os.path.join(TOP_DIR, "simplyblock_core/scripts/alerting/")
-    alert_resources_file = "alert_resources.yaml"
-
-    env = Environment(loader=FileSystemLoader(alerts_template_folder), trim_blocks=True, lstrip_blocks=True)
-    template = env.get_template(f'{alert_resources_file}.j2')
-
-    slack_pattern = re.compile(r"https://hooks\.slack\.com/services/\S+")
-    email_pattern = re.compile(r"^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$")
-
-    if slack_pattern.match(contact_point):
-        ALERT_TYPE = "slack"
-    elif email_pattern.match(contact_point):
-        ALERT_TYPE = "email"
-    else:
-        ALERT_TYPE = "slack"
-        contact_point = 'https://hooks.slack.com/services/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'
-
-    values = {
-        'CONTACT_POINT': contact_point,
-        'GRAFANA_ENDPOINT': c.grafana_endpoint,
-        'ALERT_TYPE': ALERT_TYPE,
-    }
-
-    with tempfile.TemporaryDirectory() as temp_dir:
-        temp_file_path = os.path.join(temp_dir, alert_resources_file)
-        with open(temp_file_path, 'w') as file:
-            file.write(template.render(values))
-
-        destination_file_path = os.path.join(alerts_template_folder, alert_resources_file)
-        subprocess.check_call(['sudo', '-v'])  # sudo -v checks if the current user has sudo permissions
-        subprocess.check_call(['sudo', 'mv', temp_file_path, destination_file_path])
-        print(f"File moved to {destination_file_path} successfully.")
-
-    scripts_folder = os.path.join(TOP_DIR, "simplyblock_core/scripts/")
-    prometheus_file = "prometheus.yml"
-    env = Environment(loader=FileSystemLoader(scripts_folder), trim_blocks=True, lstrip_blocks=True)
-    template = env.get_template(f'{prometheus_file}.j2')
-    values = {
-        'CLUSTER_ID': c.uuid,
-        'CLUSTER_SECRET': c.secret}
-
-    with tempfile.TemporaryDirectory() as temp_dir:
-        file_path = os.path.join(temp_dir, prometheus_file)
-        with open(file_path, 'w') as file:
-            file.write(template.render(values))
-
-        prometheus_file_path = os.path.join(scripts_folder, prometheus_file)
-        subprocess.check_call(['sudo', 'mv', file_path, prometheus_file_path])
-        print(f"File moved to {prometheus_file_path} successfully.")
+    utils.render_and_deploy_alerting_configs(contact_point, c.grafana_endpoint, c.uuid, c.secret)
 
     logger.info("Deploying swarm stack ...")
     log_level = "DEBUG" if constants.LOG_WEB_DEBUG else "INFO"

{sbcli_dev-19.0.0 → sbcli_dev-19.0.2}/simplyblock_core/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-dev
-SIMPLY_BLOCK_VERSION=19.0.0
+SIMPLY_BLOCK_VERSION=19.0.2
 
 
 SIMPLY_BLOCK_DOCKER_IMAGE=simplyblock/simplyblock:main

{sbcli_dev-19.0.0 → sbcli_dev-19.0.2}/simplyblock_core/mgmt_node_ops.py

@@ -60,6 +60,9 @@ def deploy_mgmt_node(cluster_ip, cluster_id, ifname, cluster_secret):
             logger.error("Node already exists in the cluster")
             return False
 
+    utils.render_and_deploy_alerting_configs(cluster_data['contact_point'], cluster_data['grafana_endpoint'],
+                                                                    cluster_data['uuid'], cluster_data['secret'])
+
     logger.info("Joining docker swarm...")
     try:
         cluster_docker = utils.get_docker_client(cluster_id)

{sbcli_dev-19.0.0 → sbcli_dev-19.0.2}/simplyblock_core/models/cluster.py

@@ -47,6 +47,7 @@ class Cluster(BaseModel):
     enable_qos: bool = False
     grafana_endpoint: str = ""
     grafana_secret: str = ""
+    contact_point: str = ""
     ha_type: str = "single"
     inflight_io_threshold: int = 4
     iscsi: str = ""

{sbcli_dev-19.0.0 → sbcli_dev-19.0.2}/simplyblock_core/models/storage_node.py

@@ -240,7 +240,7 @@ class StorageNode(BaseNodeObject):
             for ip in (iface.ip4_address for iface in primary_node.data_nics):
                 ret = rpc_client.bdev_nvme_attach_controller_tcp(
                         primary_node.hublvol.bdev_name, primary_node.hublvol.nqn,
-                        ip, primary_node.hublvol.nvmf_port)
+                        ip, primary_node.hublvol.nvmf_port, multipath=True)
                 if not ret:
                     logger.warning(f'Failed to connect to hublvol on {ip}')
 

{sbcli_dev-19.0.0 → sbcli_dev-19.0.2}/simplyblock_core/scripts/dashboards/cluster.json

@@ -2070,7 +2070,7 @@
                                 "names": [
                                     "{__name__=\"cluster_unmap_io_ps\", cluster=\"c3663938-6610-44d5-9897-d7bfa60a43e1\", exported_job=\"collector\", instance=\"192.168.178.52:9091\", job=\"metricsgateway\"}"
                                 ],
-                                "prefix": "All except Exception:",
+                                "prefix": "All except:",
                                 "readOnly": true
                             }
                         },

{sbcli_dev-19.0.0 → sbcli_dev-19.0.2}/simplyblock_core/scripts/dashboards/devices.json

@@ -2087,7 +2087,7 @@
                                 "names": [
                                     "{__name__=\"device_unmap_io_ps\", cluster=\"c3663938-6610-44d5-9897-d7bfa60a43e1\", exported_job=\"collector\", instance=\"192.168.178.52:9091\", job=\"metricsgateway\"}"
                                 ],
-                                "prefix": "All except Exception:",
+                                "prefix": "All except:",
                                 "readOnly": true
                             }
                         },

{sbcli_dev-19.0.0 → sbcli_dev-19.0.2}/simplyblock_core/scripts/dashboards/lvols.json

@@ -2086,7 +2086,7 @@
                                 "names": [
                                     "{__name__=\"lvol_unmap_io_ps\", cluster=\"c3663938-6610-44d5-9897-d7bfa60a43e1\", exported_job=\"collector\", instance=\"192.168.178.52:9091\", job=\"metricsgateway\"}"
                                 ],
-                                "prefix": "All except Exception:",
+                                "prefix": "All except:",
                                 "readOnly": true
                             }
                         },

{sbcli_dev-19.0.0 → sbcli_dev-19.0.2}/simplyblock_core/scripts/dashboards/nodes.json

@@ -101,7 +101,7 @@
                                 "names": [
                                     "{__name__=\"snode_size_total\", cluster=\"9baa11f4-0b47-47e1-9dec-20dacdda59d0\", exported_job=\"collector\", instance=\"pushgateway:9091\", job=\"metricsgateway\", snode=\"90499750-6b1e-4452-8ff5-125166f33865\"}"
                                 ],
-                                "prefix": "All except Exception:",
+                                "prefix": "All except:",
                                 "readOnly": true
                             }
                         },
@@ -2111,7 +2111,7 @@
                                 "names": [
                                     "{__name__=\"snode_unmap_io_ps\", cluster=\"c3663938-6610-44d5-9897-d7bfa60a43e1\", exported_job=\"collector\", instance=\"192.168.178.52:9091\", job=\"metricsgateway\"}"
                                 ],
-                                "prefix": "All except Exception:",
+                                "prefix": "All except:",
                                 "readOnly": true
                             }
                         },

{sbcli_dev-19.0.0 → sbcli_dev-19.0.2}/simplyblock_core/scripts/dashboards/pools.json

@@ -2084,7 +2084,7 @@
                                 "names": [
                                     "{__name__=\"pool_unmap_io_ps\", cluster=\"c3663938-6610-44d5-9897-d7bfa60a43e1\", exported_job=\"collector\", instance=\"192.168.178.52:9091\", job=\"metricsgateway\"}"
                                 ],
-                                "prefix": "All except Exception:",
+                                "prefix": "All except:",
                                 "readOnly": true
                             }
                         },

{sbcli_dev-19.0.0 → sbcli_dev-19.0.2}/simplyblock_core/utils.py

@@ -16,6 +16,9 @@ import docker
 from prettytable import PrettyTable
 from docker.errors import APIError, DockerException, ImageNotFound
 
+import tempfile
+from jinja2 import Environment, FileSystemLoader
+
 from simplyblock_core import constants
 from simplyblock_core import shell_utils
 from simplyblock_core.models.job_schedule import JobSchedule
@@ -1760,3 +1763,55 @@ def remove_container(client: docker.DockerClient, name, timeout=3):
     except docker.errors.APIError as e:
         if 'Conflict ("removal of container {container.id} is already in progress")' != e.response.reason:
             raise
+
+def render_and_deploy_alerting_configs(contact_point, grafana_endpoint, cluster_uuid, cluster_secret):
+    TOP_DIR = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
+    alerts_template_folder = os.path.join(TOP_DIR, "simplyblock_core/scripts/alerting/")
+    alert_resources_file = "alert_resources.yaml"
+
+    env = Environment(loader=FileSystemLoader(alerts_template_folder), trim_blocks=True, lstrip_blocks=True)
+    template = env.get_template(f'{alert_resources_file}.j2')
+
+    slack_pattern = re.compile(r"https://hooks\.slack\.com/services/\S+")
+    email_pattern = re.compile(r"^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$")
+
+    if slack_pattern.match(contact_point):
+        ALERT_TYPE = "slack"
+    elif email_pattern.match(contact_point):
+        ALERT_TYPE = "email"
+    else:
+        ALERT_TYPE = "slack"
+        contact_point = 'https://hooks.slack.com/services/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'
+
+    values = {
+        'CONTACT_POINT': contact_point,
+        'GRAFANA_ENDPOINT': grafana_endpoint,
+        'ALERT_TYPE': ALERT_TYPE,
+    }
+
+    with tempfile.TemporaryDirectory() as temp_dir:
+        temp_file_path = os.path.join(temp_dir, alert_resources_file)
+        with open(temp_file_path, 'w') as file:
+            file.write(template.render(values))
+
+        destination_file_path = os.path.join(alerts_template_folder, alert_resources_file)
+        subprocess.check_call(['sudo', '-v'])  # sudo -v checks if the current user has sudo permissions
+        subprocess.check_call(['sudo', 'mv', temp_file_path, destination_file_path])
+        print(f"File moved to {destination_file_path} successfully.")
+
+    scripts_folder = os.path.join(TOP_DIR, "simplyblock_core/scripts/")
+    prometheus_file = "prometheus.yml"
+    env = Environment(loader=FileSystemLoader(scripts_folder), trim_blocks=True, lstrip_blocks=True)
+    template = env.get_template(f'{prometheus_file}.j2')
+    values = {
+        'CLUSTER_ID': cluster_uuid,
+        'CLUSTER_SECRET': cluster_secret}
+
+    with tempfile.TemporaryDirectory() as temp_dir:
+        file_path = os.path.join(temp_dir, prometheus_file)
+        with open(file_path, 'w') as file:
+            file.write(template.render(values))
+
+        prometheus_file_path = os.path.join(scripts_folder, prometheus_file)
+        subprocess.check_call(['sudo', 'mv', file_path, prometheus_file_path])
+        print(f"File moved to {prometheus_file_path} successfully.")