diff --git a/modules/kubernetes/main.tf b/modules/kubernetes/main.tf
index 18b1ac25..afe1a4dd 100644
--- a/modules/kubernetes/main.tf
+++ b/modules/kubernetes/main.tf
@@ -277,3 +277,9 @@ module "excalidraw" {
   source          = "./excalidraw"
   tls_secret_name = var.tls_secret_name
 }
+
+
+# module "metrics_api" {
+#   source          = "./metrics_api"
+#   tls_secret_name = var.tls_secret_name
+# }
diff --git a/modules/kubernetes/metrics_api/main.tf b/modules/kubernetes/metrics_api/main.tf
new file mode 100644
index 00000000..d8f1c845
--- /dev/null
+++ b/modules/kubernetes/metrics_api/main.tf
@@ -0,0 +1,24 @@
+variable "tls_secret_name" {}
+
+# resource "kubernetes_namespace" "metrics" {
+#   metadata {
+#     name = "metrics"
+#   }
+# }
+
+module "tls_secret" {
+  source          = "../setup_tls_secret"
+  namespace       = "metrics"
+  tls_secret_name = var.tls_secret_name
+}
+
+resource "helm_release" "metrics_api" {
+  namespace        = "metrics"
+  create_namespace = true
+  name             = "metrics-server"
+
+  repository = "https://kubernetes-sigs.github.io/metrics-server/"
+  chart      = "metrics-server"
+
+  #   values = [templatefile("${path.module}/prometheus_chart_values.tpl", { alertmanager_mail_pass = var.alertmanager_account_password, alertmanager_slack_api_url = var.alertmanager_slack_api_url })]
+}
diff --git a/modules/kubernetes/monitoring/prometheus_chart_values.tpl b/modules/kubernetes/monitoring/prometheus_chart_values.tpl
index c38e0f6e..05ff192b 100644
--- a/modules/kubernetes/monitoring/prometheus_chart_values.tpl
+++ b/modules/kubernetes/monitoring/prometheus_chart_values.tpl
@@ -56,6 +56,7 @@ server:
   extraFlags:
   #  - "web.enable-admin-api"
     - "storage.tsdb.allow-overlapping-blocks"
+    - "storage.tsdb.retention.size=1GB"
   persistentVolume:
     # enabled: false
     existingClaim: prometheus-iscsi-pvc
@@ -88,6 +89,32 @@ server:
 
 serverFiles:
   # prometheus.yml: 
+    # storage:
+    # tsdb:
+    #   # no_lockfile: true
+    #   # max_blocks_in_cache: 100000
+    #   # max_lookback_duration: 0s
+    #   # min_block_duration: 2h
+    #   # retention: 15d
+    #   # chunk_encoding: 1
+    #   # chunk_range: 1h
+    #   # max_chunks_to_persist: 4800
+    #   # chunks_to_persist: 4800
+    #   cache:
+    #     entries: 5000
+    #   head:
+    #     chunk_bytes: 1048576
+    #   # wal:
+    #     # compressions: 1
+    #     # flush_after_seconds: 30
+    #     # segment_size: 1073741824
+    #   series_file:
+    #     # no_sync: true
+    #     # max_concurrent_writes: 256
+    #     # block_size: 262144
+    #     cache:
+    #       max_size: 1073741824
+
   #   alertingaaa:
   #     alertmanagers:
   #       - static_configs:
diff --git a/terraform.tfstate b/terraform.tfstate
index 4a378796..37c212a7 100644
Binary files a/terraform.tfstate and b/terraform.tfstate differ