update and debug victoria metrics

maddevsio · Dec 27, 2024 · f640096 · f640096
1 parent 44d5707
commit f640096
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 13 deletions.
diff --git a/terraform/modules/k8s-addons/eks-prometheus-operator-crds.tf b/terraform/modules/k8s-addons/eks-prometheus-operator-crds.tf
@@ -12,12 +12,12 @@ locals {
 }
 
 data "http" "kube_prometheus_stack_operator_crds" {
-  for_each = (local.victoria_metrics_k8s_stack.enabled || local.kube_prometheus_stack.enabled) ? toset(local.kube_prometheus_stack_operator_crds) : []
+  for_each = (local.victoria_metrics_k8s_stack.enabled || local.kube_prometheus_stack.enabled || local.ingress_nginx.enabled) ? toset(local.kube_prometheus_stack_operator_crds) : []
   url      = each.key
 }
 
 resource "kubectl_manifest" "kube_prometheus_stack_operator_crds" {
-  for_each          = (local.victoria_metrics_k8s_stack.enabled || local.kube_prometheus_stack.enabled) ? { for k, v in data.http.kube_prometheus_stack_operator_crds : yamldecode(v.body).metadata.name => v.body } : {}
+  for_each          = (local.victoria_metrics_k8s_stack.enabled || local.kube_prometheus_stack.enabled || local.ingress_nginx.enabled) ? { for k, v in data.http.kube_prometheus_stack_operator_crds : yamldecode(v.body).metadata.name => v.body } : {}
   yaml_body         = each.value
   server_side_apply = true
 }
diff --git a/terraform/modules/k8s-addons/eks-storageclass.tf b/terraform/modules/k8s-addons/eks-storageclass.tf
@@ -7,7 +7,7 @@ resource "kubernetes_storage_class" "advanced" {
   allow_volume_expansion = true
   volume_binding_mode    = "WaitForFirstConsumer"
   parameters = {
-    type      = "gp2"
+    type      = "gp3"
     fsType    = "ext4"
     encrypted = "true" # It is set to true for cases when global EBS encryption is disabled.
   }

diff --git a/terraform/modules/k8s-addons/eks-victoria-metrics-k8s-stack.tf b/terraform/modules/k8s-addons/eks-victoria-metrics-k8s-stack.tf
@@ -88,6 +88,12 @@ vmagent:
               operator: In
               values:
                 - on-demand
+
+vmalert:
+  spec:
+    extraArgs:
+      notifier.blackhole: "true"
+
 kubeScheduler:
   enabled: false
 kubeControllerManager:
@@ -101,6 +107,9 @@ VALUES
 # Grafana settings
 grafana:
   enabled: true
+  sidecar:
+    datasources:
+      enabled: "false"
   adminPassword: "${local.victoria_metrics_k8s_stack_grafana_password}"
   serviceAccount:
     annotations:
@@ -124,13 +133,7 @@ grafana:
       type: cloudwatch
       jsonData:
         authType: credentials
-        defaultRegion: "${local.region}"
-    - name: Loki
-      type: loki
-      url: http://loki-stack.loki:3100
-      jsonData:
-        maxLines: 1000
-  dashboardProviders:
+dashboardProviders:
     dashboardproviders.yaml:
       apiVersion: 1
       providers:

diff --git a/terraform/modules/k8s-addons/helm-releases.yaml b/terraform/modules/k8s-addons/helm-releases.yaml
@@ -72,7 +72,7 @@ releases:
     chart_version: 1.84.0
     namespace: kiali
   - id: kube-prometheus-stack
-    enabled: true
+    enabled: false
     chart: kube-prometheus-stack
     repository: https://prometheus-community.github.io/helm-charts
     chart_version: 67.3.1
@@ -90,8 +90,8 @@ releases:
     chart_version: 1.2.0
     namespace: reloader
   - id: victoria-metrics-k8s-stack
-    enabled: false
+    enabled: true
     chart: victoria-metrics-k8s-stack
     repository: https://victoriametrics.github.io/helm-charts
-    chart_version: 0.24.1
+    chart_version: 0.31.3
     namespace: monitoring