sbcli-pre 1.3.9__zip → 1.4.1__zip

{sbcli_pre-1.3.9 → sbcli_pre-1.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sbcli-pre
-Version: 1.3.9
+Version: 1.4.1
 Summary: CLI for managing SimplyBlock cluster
 Home-page: https://www.simplyblock.io/
 Author: Hamdy

{sbcli_pre-1.3.9 → sbcli_pre-1.4.1}/env_var

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

{sbcli_pre-1.3.9 → sbcli_pre-1.4.1}/sbcli_pre.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sbcli-pre
-Version: 1.3.9
+Version: 1.4.1
 Summary: CLI for managing SimplyBlock cluster
 Home-page: https://www.simplyblock.io/
 Author: Hamdy

{sbcli_pre-1.3.9 → sbcli_pre-1.4.1}/simplyblock_core/scripts/alerting/alert_rules.yaml

@@ -108,7 +108,8 @@ groups:
               model:
                 alias: ""
                 bucketAggs:
-                    - id: "2"
+                    - field: function
+                      id: "2"
                       settings:
                         min_doc_count: "1"
                         order: desc

{sbcli_pre-1.3.9 → sbcli_pre-1.4.1}/simplyblock_web/blueprints/web_api_deployer.py

@@ -141,6 +141,10 @@ def update_cluster(d, kv_store, storage_nodes, availability_zone):
     ECR_IMAGE_TAG = d.ecr_image_tag
     ECR_ACCOUNT_ID = d.ecr_account_id
     tf_logs_bucket_name = d.tf_logs_bucket_name
+    sbcli_cmd = d.sbcli_cmd
+    mgmt_nodes_instance_type = d.mgmt_nodes_instance_type
+    storage_nodes_instance_type = d.storage_nodes_instance_type
+    volumes_per_storage_nodes = d.volumes_per_storage_nodes
 
     d.status = "in_progress"
     d.write_to_db(kv_store)
@@ -159,10 +163,6 @@ def update_cluster(d, kv_store, storage_nodes, availability_zone):
         docker volume create terraform
         """,
         f"""
-        docker run --rm -v terraform:/app -e TF_LOG=DEBUG -w /app {ECR_ACCOUNT_ID}.dkr.ecr.{ECR_REGION}.amazonaws.com/{ECR_REPOSITORY_NAME}:{ECR_IMAGE_TAG} \
-            workspace select -or-create {TF_WORKSPACE}
-        """,
-        f"""
         docker run --rm -v terraform:/app -w /app {ECR_ACCOUNT_ID}.dkr.ecr.{ECR_REGION}.amazonaws.com/{ECR_REPOSITORY_NAME}:{ECR_IMAGE_TAG} \
             init -reconfigure -input=false \
                     -backend-config='bucket={TFSTATE_BUCKET}' \
@@ -170,12 +170,21 @@ def update_cluster(d, kv_store, storage_nodes, availability_zone):
                     -backend-config='region={TFSTATE_REGION}'
         """,
         f"""
+        docker run --rm -v terraform:/app -e TF_LOG=DEBUG -w /app {ECR_ACCOUNT_ID}.dkr.ecr.{ECR_REGION}.amazonaws.com/{ECR_REPOSITORY_NAME}:{ECR_IMAGE_TAG} \
+            workspace select -or-create {TF_WORKSPACE}
+        """,
+        f"""
         docker run --rm -v terraform:/app -w /app {ECR_ACCOUNT_ID}.dkr.ecr.{ECR_REGION}.amazonaws.com/{ECR_REPOSITORY_NAME}:{ECR_IMAGE_TAG} \
-            plan -var mgmt_nodes={mgmt_nodes} -var storage_nodes={storage_nodes} -var az={availability_zone} -var region={aws_region}
+          plan -var mgmt_nodes={mgmt_nodes} -var storage_nodes={storage_nodes} -var az={availability_zone} -var region={aws_region} \
+               -var mgmt_nodes_instance_type={mgmt_nodes_instance_type} -var storage_nodes_instance_type={storage_nodes_instance_type} \
+               -var volumes_per_storage_nodes={volumes_per_storage_nodes} -var sbcli_cmd={sbcli_cmd}
         """,
         f"""
         docker run --rm -v terraform:/app -w /app {ECR_ACCOUNT_ID}.dkr.ecr.{ECR_REGION}.amazonaws.com/{ECR_REPOSITORY_NAME}:{ECR_IMAGE_TAG} \
-         apply -var mgmt_nodes={mgmt_nodes} -var storage_nodes={storage_nodes} -var az={availability_zone} -var region={aws_region} --auto-approve
+         apply -var mgmt_nodes={mgmt_nodes} -var storage_nodes={storage_nodes} -var az={availability_zone} -var region={aws_region} \
+               -var mgmt_nodes_instance_type={mgmt_nodes_instance_type} -var storage_nodes_instance_type={storage_nodes_instance_type} \
+               -var volumes_per_storage_nodes={volumes_per_storage_nodes} -var sbcli_cmd={sbcli_cmd} \
+            --auto-approve
         """
     ]
 
@@ -299,6 +308,8 @@ def validate_tf_vars(dpl_data):
         return "missing required param: mgmt_nodes_instance_type"
     if 'storage_nodes_instance_type' not in dpl_data:
         return "missing required param: storage_nodes_instance_type"
+    if 'volumes_per_storage_nodes' not in dpl_data:
+        return "missing required param: volumes_per_storage_nodes"
 
     return ""
 
@@ -375,6 +386,9 @@ def add_deployer():
     d.write_to_db(db_controller.kv_store)
 
     storage_nodes = int(dpl_data['storage_nodes'])
+    if d.storage_nodes+storage_nodes < 0:
+        return utils.get_response_error("total storage_nodes cannot be less than 0", 400)
+
     availability_zone = dpl_data['availability_zone']
     d.write_to_db(db_controller.kv_store)