fix: fix schedule and cost cal

Signed-off-by: Kami Wan <kamiwan@iMac-Pro.local>
AutoMQ · Jun 6, 2024 · e25f89b · e25f89b
1 parent 50443f3
commit e25f89b
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 19 deletions.
diff --git a/.github/workflows/prepare-vs-benchmark.yml b/.github/workflows/prepare-vs-benchmark.yml
@@ -1,12 +1,12 @@
-name: Prepare Streaming Cluster [Benchmark]
+name: Prepare-Streaming-Cluster-Benchmark
 
 on:
   workflow_run:
-    workflows: ["Prepare Streaming Cluster [Install]"]
+    workflows: [ Prepare-Streaming-Cluster-Install ]
     types:
       - completed
   schedule:
-    - cron: '0 14 * * *'
+    - cron: '37 4 * * *'
   workflow_dispatch:
     inputs:
       cloud_provider:
@@ -125,7 +125,7 @@ jobs:
         run: |
           echo "[INFO] Provider is AutoMQ"
           cd  driver-shared/deploy/${{ env.CLOUD_PROVIDER }}
-          infracost breakdown --path . --usage-file infracost/${{ env.CLOUD_PROVIDER }}-medium-500m-21600g.yml >> /tmp/aws-cost.txt
+          infracost breakdown --path . --usage-file infracost/${{ env.CLOUD_PROVIDER }}-medium-500m-21600g.yml --terraform-var-file  driver-automq/deploy/aws-cn/var.tfvars >> /tmp/aws-cost.txt
           
           COST_DETAIL_FILE=/tmp/aws-cost.txt
           cat $COST_DETAIL_FILE
@@ -246,7 +246,7 @@ jobs:
         run: |
           echo "[INFO] Provider is AutoMQ"
           cd  driver-shared/deploy/${{ env.CLOUD_PROVIDER }}
-          infracost breakdown --path . --usage-file infracost/${{ env.CLOUD_PROVIDER }}-medium-500m-21600g.yml >> /tmp/aws-cost.txt
+          infracost breakdown --path . --usage-file infracost/${{ env.CLOUD_PROVIDER }}-medium-500m-21600g.yml  --terraform-var-file  driver-kafka/deploy/aws-cn/var.tfvars >> /tmp/aws-cost.txt
           
           COST_DETAIL_FILE=/tmp/aws-cost.txt
           cat $COST_DETAIL_FILE

diff --git a/.github/workflows/prepare-vs-install.yml b/.github/workflows/prepare-vs-install.yml
@@ -1,8 +1,8 @@
-name: Prepare Streaming Cluster [Install]
+name: Prepare-Streaming-Cluster-Install
 
 on:
   schedule:
-    - cron: '41 13 * * *'
+    - cron: '37 4 * * *'
   workflow_dispatch:
     inputs:
       cloud_provider:
@@ -121,7 +121,7 @@ jobs:
         run: |
           echo "[INFO] Provider is AutoMQ"
           cd  driver-shared/deploy/${{ env.CLOUD_PROVIDER }}
-          infracost breakdown --path . --usage-file infracost/${{ env.CLOUD_PROVIDER }}-medium-500m-21600g.yml >> /tmp/aws-cost.txt
+          infracost breakdown --path . --usage-file infracost/${{ env.CLOUD_PROVIDER }}-medium-500m-21600g.yml  --terraform-var-file  driver-automq/deploy/aws-cn/var.tfvars >> /tmp/aws-cost.txt
           
           COST_DETAIL_FILE=/tmp/aws-cost.txt
           cat $COST_DETAIL_FILE
@@ -241,7 +241,7 @@ jobs:
         run: |
           echo "[INFO] Provider is AutoMQ"
           cd  driver-shared/deploy/${{ env.CLOUD_PROVIDER }}
-          infracost breakdown --path . --usage-file infracost/${{ env.CLOUD_PROVIDER }}-medium-500m-21600g.yml >> /tmp/aws-cost.txt
+          infracost breakdown --path . --usage-file infracost/${{ env.CLOUD_PROVIDER }}-medium-500m-21600g.yml --terraform-var-file  driver-kafka/deploy/aws-cn/var.tfvars >> /tmp/aws-cost.txt
           
           COST_DETAIL_FILE=/tmp/aws-cost.txt
           cat $COST_DETAIL_FILE

diff --git a/.github/workflows/prepare-vs-uninstall.yml b/.github/workflows/prepare-vs-uninstall.yml
@@ -1,12 +1,12 @@
-name: Prepare Streaming Cluster [Uninstall]
+name: Prepare-Streaming-Cluster-Uninstall
 
 on:
   workflow_run:
-    workflows: ["Prepare Streaming Cluster [Benchmark]"]
+    workflows: [ Prepare-Streaming-Cluster-Benchmark ]
     types:
       - completed
   schedule:
-    - cron: '5 14 * * *'
+    - cron: '37 4 * * *'
   workflow_dispatch:
     inputs:
       cloud_provider:
@@ -125,7 +125,7 @@ jobs:
         run: |
           echo "[INFO] Provider is AutoMQ"
           cd  driver-shared/deploy/${{ env.CLOUD_PROVIDER }}
-          infracost breakdown --path . --usage-file infracost/${{ env.CLOUD_PROVIDER }}-medium-500m-21600g.yml >> /tmp/aws-cost.txt
+          infracost breakdown --path . --usage-file infracost/${{ env.CLOUD_PROVIDER }}-medium-500m-21600g.yml  --terraform-var-file  driver-automq/deploy/aws-cn/var.tfvars >> /tmp/aws-cost.txt
           
           COST_DETAIL_FILE=/tmp/aws-cost.txt
           cat $COST_DETAIL_FILE
@@ -246,7 +246,7 @@ jobs:
         run: |
           echo "[INFO] Provider is AutoMQ"
           cd  driver-shared/deploy/${{ env.CLOUD_PROVIDER }}
-          infracost breakdown --path . --usage-file infracost/${{ env.CLOUD_PROVIDER }}-medium-500m-21600g.yml >> /tmp/aws-cost.txt
+          infracost breakdown --path . --usage-file infracost/${{ env.CLOUD_PROVIDER }}-medium-500m-21600g.yml --terraform-var-file  driver-kafka/deploy/aws-cn/var.tfvars >> /tmp/aws-cost.txt
           
           COST_DETAIL_FILE=/tmp/aws-cost.txt
           cat $COST_DETAIL_FILE

diff --git a/driver-automq/deploy/aws-cn/var.tfvars b/driver-automq/deploy/aws-cn/var.tfvars
@@ -5,7 +5,7 @@ user            = "ubuntu"
 instance_type = {
   "server"              = "r6i.large"
   "broker"              = "r6i.large"
-  "client"              = "r6i.xlarge"
+  "client"              = "r6i.large"
 }
 
 instance_cnt = {

diff --git a/driver-kafka/deploy/aws-cn/var.tfvars b/driver-kafka/deploy/aws-cn/var.tfvars
@@ -5,7 +5,7 @@ user            = "ubuntu"
 instance_type = {
   "server"              = "r6i.large"
   "broker"              = "r6i.large"
-  "client"              = "m6i.xlarge"
+  "client"              = "r6i.large"
 }
 
 instance_cnt = {

diff --git a/workflow_scripts/python/extract_cost_info.py b/workflow_scripts/python/extract_cost_info.py
@@ -32,10 +32,10 @@
     usage_cost_str = re.sub(r'[^\d.]', '', match.group(2))
     total_cost_str = re.sub(r'[^\d.]', '', match.group(3))
 
-#     decrease client cost
-    baseline_cost = float(baseline_cost_str) - 286.54
+#     decrease client cost 5*92.93 USD = 464.65 (decrease 5 client's cost)
+    baseline_cost = float(baseline_cost_str) - 464.65
     usage_cost = float(usage_cost_str)
-    total_cost = float(total_cost_str) - 286.54
+    total_cost = float(total_cost_str) - 464.65
 
     print(f"Baseline cost: ${baseline_cost}")
     print(f"Usage cost: ${usage_cost}")