update

2024-05-12 18:20:13 +03:00
parent eb27140756
commit 502552be32
6 changed files with 13 additions and 6 deletions
--- a/internal/resources/templates/helm-apps/releases/observability/observability.yml.tmpl
+++ b/internal/resources/templates/helm-apps/releases/observability/observability.yml.tmpl
@@ -33,6 +33,7 @@
      scrapeInterval: {{ .Modules.Observability.Monitoring.Prometheus.ScrapeInterval }}
      retention: {{ .Modules.Observability.Monitoring.Prometheus.Persistence.Retention }}
      # serviceNodePort: 30008
+
      additionalConfigs: |
        - job_name: "kubelet"
          scheme: https
@@ -307,7 +308,7 @@
    containerRuntime: {{ .Orchestrator.ContainerEngine.Type }}

    fluentbit:
-      enable: {{ .Modules.Observability.Logging.Enabled }}
+      enable: {{ and .Modules.Observability.Enabled .Modules.Observability.Logging.Enabled }}
      serviceMonitor: true
      image:
        repository: "{{ .Modules.Observability.Logging.FluentBit.Image }}"