Merge pull request #42 from paseaf/zl/change-vm-config

Increase VM disk and RAM size
paseaf · Jul 10, 2022 · aa48738 · aa48738
2 parents c948ef9 + 08a377f
commit aa48738
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 28 deletions.
diff --git a/terraform/grafana/provisioning/dashboards/containerSSH.json b/terraform/grafana/provisioning/dashboards/containerSSH.json
@@ -445,7 +445,7 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "(node_memory_MemTotal_bytes{instance=\"gateway-vm:9100\"} - (node_memory_MemFree_bytes{instance=\"gateway-vm:9100\"} + node_memory_Cached_bytes{instance=\"gateway-vm:9100\"} + node_memory_Buffers_bytes{instance=\"gateway-vm:9100\"})) / node_memory_MemTotal_bytes{instance=\"gateway-vm:9100\"} * 100",
+          "expr": "(node_memory_MemTotal_bytes{instance=\"gateway-vm:9100\"} - node_memory_MemAvailable_bytes{instance=\"gateway-vm:9100\"}) / node_memory_MemTotal_bytes{instance=\"gateway-vm:9100\"} * 100",
           "instant": false,
           "legendFormat": "Gateway-VM",
           "range": true,
@@ -457,7 +457,7 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "expr": "(node_memory_MemTotal_bytes{instance=\"logger-vm:9100\"} - (node_memory_MemFree_bytes{instance=\"logger-vm:9100\"} + node_memory_Cached_bytes{instance=\"logger-vm:9100\"} + node_memory_Buffers_bytes{instance=\"logger-vm:9100\"})) / node_memory_MemTotal_bytes{instance=\"logger-vm:9100\"} * 100",
+          "expr": "(node_memory_MemTotal_bytes{instance=\"logger-vm:9100\"} - node_memory_MemAvailable_bytes{instance=\"logger-vm:9100\"}) / node_memory_MemTotal_bytes{instance=\"logger-vm:9100\"} * 100",
           "hide": false,
           "legendFormat": "Logger-VM",
           "range": true,
@@ -469,7 +469,7 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "expr": "(node_memory_MemTotal_bytes{instance=\"sacrificial-vm:9100\"} - (node_memory_MemFree_bytes{instance=\"sacrificial-vm:9100\"} + node_memory_Cached_bytes{instance=\"sacrificial-vm:9100\"} + node_memory_Buffers_bytes{instance=\"sacrificial-vm:9100\"})) / node_memory_MemTotal_bytes{instance=\"sacrificial-vm:9100\"} * 100",
+          "expr": "(node_memory_MemTotal_bytes{instance=\"sacrificial-vm:9100\"} - node_memory_MemAvailable_bytes{instance=\"sacrificial-vm:9100\"}) / node_memory_MemTotal_bytes{instance=\"sacrificial-vm:9100\"} * 100",
           "hide": false,
           "legendFormat": "Sacrificial-VM",
           "range": true,
@@ -1039,22 +1039,12 @@
             }
           },
           "mappings": [],
-          "max": 21200000000,
-          "min": 0,
           "thresholds": {
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
+                "color": "transparent",
                 "value": null
-              },
-              {
-                "color": "orange",
-                "value": 19000000000
-              },
-              {
-                "color": "red",
-                "value": 20000000000
               }
             ]
           },
@@ -1161,22 +1151,20 @@
             }
           },
           "mappings": [],
-          "max": 2000000000,
-          "min": 0,
           "thresholds": {
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
+                "color": "transparent",
                 "value": null
               },
               {
                 "color": "orange",
-                "value": 1750000010
+                "value": 3500000000
               },
               {
                 "color": "red",
-                "value": 1900000000
+                "value": 3800000000
               }
             ]
           },
@@ -1211,7 +1199,7 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "node_memory_MemTotal_bytes{instance=\"gateway-vm:9100\"} - (node_memory_MemFree_bytes{instance=\"gateway-vm:9100\"} + node_memory_Cached_bytes{instance=\"gateway-vm:9100\"} + node_memory_Buffers_bytes{instance=\"gateway-vm:9100\"})",
+          "expr": "node_memory_MemTotal_bytes{instance=\"gateway-vm:9100\"} - node_memory_MemAvailable_bytes{instance=\"gateway-vm:9100\"}",
           "instant": false,
           "legendFormat": "Gateway-VM",
           "range": true,
@@ -1223,7 +1211,7 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "expr": "node_memory_MemTotal_bytes{instance=\"logger-vm:9100\"} - (node_memory_MemFree_bytes{instance=\"logger-vm:9100\"} + node_memory_Cached_bytes{instance=\"logger-vm:9100\"} + node_memory_Buffers_bytes{instance=\"logger-vm:9100\"})",
+          "expr": "node_memory_MemTotal_bytes{instance=\"logger-vm:9100\"} - node_memory_MemAvailable_bytes{instance=\"logger-vm:9100\"}",
           "hide": false,
           "legendFormat": "Logger-VM",
           "range": true,
@@ -1235,7 +1223,7 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "expr": "node_memory_MemTotal_bytes{instance=\"sacrificial-vm:9100\"} - (node_memory_MemFree_bytes{instance=\"sacrificial-vm:9100\"} + node_memory_Cached_bytes{instance=\"sacrificial-vm:9100\"} + node_memory_Buffers_bytes{instance=\"sacrificial-vm:9100\"})",
+          "expr": "node_memory_MemTotal_bytes{instance=\"sacrificial-vm:9100\"} - node_memory_MemAvailable_bytes{instance=\"sacrificial-vm:9100\"}",
           "hide": false,
           "legendFormat": "Sacrificial-VM",
           "range": true,
@@ -1292,12 +1280,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
+                "color": "transparent",
                 "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
               }
             ]
           },

diff --git a/terraform/main.tf b/terraform/main.tf
@@ -130,6 +130,8 @@ resource "google_compute_instance" "gateway_vm" {
   boot_disk {
     initialize_params {
       image = "ubuntu-with-docker-image"
+      size  = 20
+      type  = "pd-balanced"
     }
   }
 
@@ -167,6 +169,8 @@ resource "google_compute_instance" "sacrificial_vm" {
   boot_disk {
     initialize_params {
       image = "sacrificial-vm-image"
+      size  = 20
+      type  = "pd-balanced"
     }
   }
 
@@ -187,6 +191,8 @@ resource "google_compute_instance" "logger_vm" {
   boot_disk {
     initialize_params {
       image = "ubuntu-with-docker-image"
+      size  = 200
+      type  = "pd-balanced"
     }
   }
 

diff --git a/terraform/variables.tf b/terraform/variables.tf
@@ -10,5 +10,5 @@ variable "credentials" {
 
 variable "machine_type" {
   type    = string
-  default = "e2-small"
+  default = "e2-medium"
 }