upd

1 files changed, 64 insertions, 27 deletions

diff --git a/tools/monitoring/values.yaml b/tools/monitoring/values.yaml
index 4e330c7..7e66bfc 100644
--- a/tools/monitoring/values.yaml
+++ b/tools/monitoring/values.yaml
@@ -18,6 +18,14 @@ grafana:
           - grafana.topkek.cloud
         secretName: grafana-tls
 
+  resources:
+    requests:
+      cpu: "100m"
+      memory: "128Mi"
+    limits:
+      cpu: "200m"
+      memory: "256Mi"
+
   datasources:
     datasources.yaml:
       apiVersion: 1
@@ -34,14 +42,35 @@ grafana:
           jsonData:
             esVersion: 7
             timeField: "@timestamp"
-            
+
 prometheus:
   alertmanager:
     enabled: true
+    resources:
+      requests:
+        cpu: "100m"
+        memory: "128Mi"
+      limits:
+        cpu: "200m"
+        memory: "256Mi"
   pushgateway:
     enabled: true
+    resources:
+      requests:
+        cpu: "50m"
+        memory: "64Mi"
+      limits:
+        cpu: "100m"
+        memory: "128Mi"
   server:
     enabled: true
+    resources:
+      requests:
+        cpu: "200m"
+        memory: "256Mi"
+      limits:
+        cpu: "400m"
+        memory: "512Mi"
     extraScrapeConfigs:
       - job_name: 'kubernetes-pods'
         kubernetes_sd_configs:
@@ -98,7 +127,7 @@ prometheus:
           - action: labelmap
             regex: __meta_kubernetes_node_label_(.+)
           - target_label: __address__
-            replacement: kubernetes.default.svc:443
+            replacement: kubernetes.default.svc.cluster.local:443
           - source_labels: [__meta_kubernetes_node_name]
             regex: (.+)
             target_label: node
@@ -142,53 +171,60 @@ elasticsearch:
     accessModes: [ "ReadWriteOnce" ]
     resources:
       requests:
-        storage: 30Gi
+        storage: 5Gi # Reduced storage for resource-limited environments
   master:
     resources:
       requests:
-        cpu: "500m"
-        memory: "2Gi"
+        cpu: "250m"
+        memory: "512Mi"
       limits:
-        cpu: "1"
-        memory: "4Gi"
-    replicas: 3
+        cpu: "500m"
+        memory: "1Gi"
+    replicas: 1
     persistence:
       enabled: true
-      size: 30Gi
+      size: 5Gi
     extraEnvs:
       - name: discovery.seed_hosts
-        value: "elasticsearch-master-0,elasticsearch-master-1,elasticsearch-master-2"
+        value: "elasticsearch-master-0.elasticsearch-master.monitoring.svc.cluster.local"
       - name: cluster.initial_master_nodes
-        value: "elasticsearch-master-0,elasticsearch-master-1,elasticsearch-master-2"
+        value: "elasticsearch-master-0"
 
   data:
     resources:
       requests:
-        cpu: "500m"
-        memory: "2Gi"
+        cpu: "250m"
+        memory: "512Mi"
       limits:
-        cpu: "1"
-        memory: "4Gi"
-    replicas: 3
+        cpu: "500m"
+        memory: "1Gi"
+    replicas: 1
     persistence:
       enabled: true
-      size: 30Gi
+      size: 5Gi
 
   ingest:
     resources:
       requests:
-        cpu: "500m"
-        memory: "2Gi"
+        cpu: "250m"
+        memory: "512Mi"
       limits:
-        cpu: "1"
-        memory: "4Gi"
-    replicas: 2
+        cpu: "500m"
+        memory: "1Gi"
+    replicas: 1
 
 opentelemetry-collector:
   mode: deployment
   image:
     repository: otel/opentelemetry-collector
     tag: "latest"
+  resources:
+    requests:
+      cpu: "100m"
+      memory: "128Mi"
+    limits:
+      cpu: "200m"
+      memory: "256Mi"
   config:
     receivers:
       otlp:
@@ -219,11 +255,11 @@ logstash:
   enabled: true
   resources:
     requests:
-      cpu: "500m"
-      memory: "2Gi"
+      cpu: "100m"
+      memory: "128Mi"
     limits:
-      cpu: "1"
-      memory: "4Gi"
+      cpu: "200m"
+      memory: "256Mi"
   config:
     logstash.yml: |
       http.host: "0.0.0.0"
@@ -237,7 +273,8 @@ logstash:
       }
       output {
         elasticsearch {
-          hosts => ["http://elasticsearch-master:9200"]
+          hosts => ["http://elasticsearch-master.monitoring.svc.cluster.local:9200"]
           index => "%{[@metadata][beat]}-%{+YYYY.MM.dd}"
         }
       }
+