fix: metrics values in uwsgi (MAPCO-4009) (#57)

* fix: metrics values in uwsgi * fix: metrics helm indentation
MapColonies · Feb 28, 2024 · 7b6ddc0 · 7b6ddc0
1 parent fe84a50
commit 7b6ddc0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/helm/config/mapProxyUwsgi.ini b/helm/config/mapProxyUwsgi.ini
@@ -1,4 +1,5 @@
 [uwsgi]
+{{- $metrics := (include "common.metrics.merged" .) | fromYaml }}
 ; based on https://github.com/kartoza/docker-mapproxy/blob/master/build_data/uwsgi.ini
 chdir = /mapproxy
 pyargv = /mapproxy.yaml
@@ -40,7 +41,7 @@ chmod-socket = 664
 uid = 1000
 gid = 0
 http-socket = :{{ .Values.mapproxy.uwsgi.httpSocket }}
-{{ if .Values.mapproxy.env.metrics.enabled }}
+{{ if $metrics.enabled }}
 stats = :{{ .Values.mapproxy.uwsgi.statsServer.stats }}
 stats-http = true
 stats-min = {{ .Values.mapproxy.uwsgi.statsServer.statsMinify }}

diff --git a/helm/values.yaml b/helm/values.yaml
@@ -81,11 +81,11 @@ tracing:
   url: ""
   # samplingRatioDenominator: 1000
 metrics:
-    enabled: false
-    url: ""
-    prometheus:
-      scrape: false
-      port: 9117
+  enabled: false
+  url: ""
+  prometheus:
+    scrape: false
+    port: 9117
 
 # add pod annotations
 # example:
@@ -172,11 +172,6 @@ mapproxy:
     logPrettyPrintEnabled: false
     responseCompressionEnabled: true
     requestPayloadLimit: 1mb
-    metrics:
-      prometheus:
-        scrape: false
-        port: 9117
-      enabled: false
 
 initContainer:
   image: