adding grafana_endpoint to DB

Author: ananttr

env_var

@@ -1,5 +1,5 @@
-SIMPLY_BLOCK_COMMAND_NAME=sbcli-dev
-SIMPLY_BLOCK_VERSION=3.8.3
+SIMPLY_BLOCK_COMMAND_NAME=sbcli-mig
+SIMPLY_BLOCK_VERSION=1.0.276
 
 
 

simplyblock_cli/cli.py

@@ -263,7 +263,6 @@ def __init__(self):
 
         # add cluster
         sub_command = self.add_sub_command(subparser, 'add', 'Add new cluster')
-        sub_command.add_argument("--grafana-url",help='grafana endpoint',required=True,dest="grafana_url")
         sub_command.add_argument("--blk_size", help='The block size in bytes', type=int, choices=[512, 4096], default=512)
         sub_command.add_argument("--page_size", help='The size of a data page in bytes', type=int, default=2097152)
         sub_command.add_argument("--cap-warn", help='Capacity warning level in percent, default=80',
@@ -337,7 +336,6 @@ def __init__(self):
         sub_command = self.add_sub_command(subparser, 'upd-secret', 'Updates the cluster secret')
         sub_command.add_argument("cluster_id", help='cluster uuid')
         sub_command.add_argument("secret", help='new 20 characters password')
-        sub_command.add_argument("--grafana-url",help='grafana endpoint',required=True,dest="grafana_url")
 
         # check cluster
         sub_command = self.add_sub_command(subparser, "check", 'Health check cluster')
@@ -914,8 +912,7 @@ def run(self):
             elif sub_command == "upd-secret":
                 cluster_id = args.cluster_id
                 secret = args.secret
-                grafana_url = args.grafana_url
-                ret = cluster_ops.set_secret(cluster_id, secret,grafana_url)
+                ret = cluster_ops.set_secret(cluster_id, secret)
             elif sub_command == "get-logs":
                 cluster_id = args.cluster_id
                 ret = cluster_ops.get_logs(cluster_id)
@@ -1208,11 +1205,10 @@ def cluster_add(self, args):
         distr_bs = args.distr_bs
         distr_chunk_bs = args.distr_chunk_bs
         ha_type = args.ha_type
-        grafana_url = args.grafana_url
-
+        
         return cluster_ops.add_cluster(
             blk_size, page_size_in_blocks, cap_warn, cap_crit, prov_cap_warn, prov_cap_crit,
-            distr_ndcs, distr_npcs, distr_bs, distr_chunk_bs, ha_type, grafana_url)
+            distr_ndcs, distr_npcs, distr_bs, distr_chunk_bs, ha_type)
 
     def cluster_create(self, args):
         page_size_in_blocks = args.page_size

simplyblock_core/cluster_ops.py

@@ -26,7 +26,7 @@
 
 
 
-def _create_user(cluster_id, grafana_url,grafana_secret,user_secret,update_secret):
+def _create_update_user(cluster_id, grafana_url,grafana_secret,user_secret,update_secret):
     if not grafana_url.startswith("https://"):
         if grafana_url.startswith("http://"):
             grafana_url = grafana_url.replace("http://", "https://", 1)
@@ -176,7 +176,8 @@ def create_cluster(blk_size, page_size_in_blocks, cli_pass,
     c.distr_bs = distr_bs
     c.distr_chunk_bs = distr_chunk_bs
     c.ha_type = ha_type
-
+    c.grafana_endpoint = grafana_endpoint
+    
     alerts_template_folder = os.path.join(TOP_DIR, "simplyblock_core/scripts/alerting/")
     alert_resources_file = "alert_resources.yaml"
 
@@ -293,7 +294,7 @@ def deploy_spdk(node_docker, spdk_cpu_mask, spdk_mem):
 
 
 def add_cluster(blk_size, page_size_in_blocks, cap_warn, cap_crit, prov_cap_warn, prov_cap_crit,
-                distr_ndcs, distr_npcs, distr_bs, distr_chunk_bs, ha_type, grafana_url):
+                distr_ndcs, distr_npcs, distr_bs, distr_chunk_bs, ha_type):
     db_controller = DBController()
     clusters = db_controller.get_clusters()
     if not clusters:
@@ -311,8 +312,9 @@ def add_cluster(blk_size, page_size_in_blocks, cap_warn, cap_crit, prov_cap_warn
     cluster.cli_pass = default_cluster.cli_pass
     cluster.secret = utils.generate_string(20)
     cluster.db_connection = default_cluster.db_connection
+    cluster.grafana_endpoint = default_cluster.grafana_endpoint
 
-    _create_user(cluster.uuid,grafana_url,default_cluster.secret,cluster.secret,False)
+    _create_update_user(cluster.uuid,cluster.grafana_endpoint,default_cluster.secret,cluster.secret,False)
 
 
     if distr_ndcs == 0 and distr_npcs == 0:
@@ -608,7 +610,7 @@ def get_secret(cluster_id):
     return cluster.secret
 
 
-def set_secret(cluster_id, secret,grafana_url):
+def set_secret(cluster_id, secret):
 
     db_controller = DBController()
     clusters = db_controller.get_clusters()
@@ -622,7 +624,8 @@ def set_secret(cluster_id, secret,grafana_url):
     secret = secret.strip()
     if len(secret) < 20:
         return "Secret must be at least 20 char"
-    _create_user(cluster_id,grafana_url,clusters[0].secret,secret,True)
+    
+    _create_update_user(cluster_id,clusters[0].grafana_endpoint,clusters[0].secret,secret,True)
 
     cluster.secret = secret
     cluster.write_to_db(db_controller.kv_store)

simplyblock_core/models/cluster.py

@@ -52,6 +52,7 @@ class Cluster(BaseModel):
         "secret": {"type": str, "default": ""},
         "status": {"type": str, "default": ""},
         "updated_at": {"type": str, "default": ""},
+        "grafana_endpoint": {"type": str, "default": ""}
     }
 
     def __init__(self, data=None):