pr feeback

Author: umswmayj

helm/bundles/cortex-nova/alerts/nova.alerts.yaml

@@ -157,7 +157,7 @@ groups:
         time the service will have a less recent view of the datacenter.
 
   - alert: CortexNovaSyncObjectsDroppedToZero
-    expr: cortex_sync_objects{service="cortex-nova-metrics", datasource!~"openstack_migrations|prometheus_kvm_libvirt_domain_steal_pct"} == 0
+    expr: cortex_sync_objects{service="cortex-nova-metrics", datasource!="openstack_migrations"} == 0
     for: 60m
     labels:
       context: syncobjects
@@ -731,4 +731,4 @@ groups:
         The webhook {{ $labels.webhook }} has experienced errors in the last 5 minutes.
         This may indicate issues with the webhook logic, connectivity problems, or
         external factors causing failures. Check the webhook server logs for error
-        details and investigate the affected resources.
+        details and investigate the affected resources.

helm/library/cortex/templates/_helpers.tpl

@@ -41,6 +41,22 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 {{ $hasMutating }}}}{{- end }}
 
 
+{{/*
+chart.argsContainPrefix checks if any string in args starts with prefix.
+Usage: include "chart.argsContainPrefix" (dict "prefix" "--zap-log-level" "args" .Values.controllerManager.container.args)
+Returns "true" or "false".
+*/}}
+{{- define "chart.argsContainPrefix" -}}
+{{- $prefix := .prefix -}}
+{{- $result := dict "found" "false" -}}
+{{- range .args -}}
+  {{- if hasPrefix $prefix . -}}
+    {{- $_ := set $result "found" "true" -}}
+  {{- end -}}
+{{- end -}}
+{{- get $result "found" -}}
+{{- end -}}
+
 {{- define "chart.hasValidatingWebhooks" -}}
 {{- $hasValidating := false }}
 {{- range . }}

helm/library/cortex/templates/manager/manager.yaml

@@ -35,10 +35,10 @@ spec:
             {{- range .Values.controllerManager.container.args }}
             - {{ . }}
             {{- end }}
-            {{- if .Values.controllerManager.container.logLevel }}
+            {{- if and .Values.controllerManager.container.logLevel (ne (include "chart.argsContainPrefix" (dict "prefix" "--zap-log-level" "args" .Values.controllerManager.container.args)) "true") }}
             - "--zap-log-level={{ .Values.controllerManager.container.logLevel }}"
             {{- end }}
-            {{- if .Values.controllerManager.container.zapDevel }}
+            {{- if and .Values.controllerManager.container.zapDevel (ne (include "chart.argsContainPrefix" (dict "prefix" "--zap-devel" "args" .Values.controllerManager.container.args)) "true") }}
             - "--zap-devel"
             {{- end }}
             {{- if and .Values.webhook.enable .Values.certmanager.enable }}
@@ -63,7 +63,7 @@ spec:
           imagePullPolicy: {{ .Values.controllerManager.container.image.pullPolicy }}
           {{- end }}
           env:
-            {{- if .Values.controllerManager.container.logLevel }}
+            {{- if and .Values.controllerManager.container.logLevel (not (and .Values.controllerManager.container.env (hasKey .Values.controllerManager.container.env "LOG_LEVEL"))) }}
             - name: LOG_LEVEL
               value: {{ .Values.controllerManager.container.logLevel | quote }}
             {{- end }}
@@ -150,4 +150,4 @@ data:
     {{- $mergedSecrets = mergeOverwrite .Values.secrets $mergedSecrets }}
     {{- end }}
     {{ toJson $mergedSecrets | b64enc }}
-{{- end }}
+{{- end }}

helm/library/cortex/values.yaml

@@ -16,9 +16,10 @@ controllerManager:
     # Log level for both zap (controller-runtime) and slog (internal packages).
     # Supported: debug, info (default), warn, error.
     logLevel: "info"
-    # Enable zap development mode (human-readable console logs, debug level).
-    # Set to true for local development (e.g. Tilt), keep false for production
-    # (JSON logs, info level, no stack traces on warnings).
+    # Enable zap development mode (human-readable console logs, development stack traces).
+    # This only changes output format and stack trace behavior, not the log level.
+    # The effective log level is controlled by logLevel above (default: "info").
+    # Set to true for local development (e.g. Tilt), keep false for production.
     zapDevel: false
     resources:
       limits:

pkg/monitoring/log_metrics_test.go

@@ -6,6 +6,7 @@ package monitoring
 import (
 	"bytes"
 	"log/slog"
+	"strings"
 	"testing"
 	"time"
 
@@ -212,9 +213,9 @@ func TestMetricsSlogHandler_DelegatesAllLevels(t *testing.T) {
 	logger.Error("e")
 
 	output := buf.String()
-	for _, msg := range []string{"d", "i", "w", "e"} {
-		if !bytes.Contains([]byte(output), []byte(msg)) {
-			t.Errorf("expected inner handler to receive message %q", msg)
+	for _, msg := range []string{"msg=d", "msg=i", "msg=w", "msg=e"} {
+		if !strings.Contains(output, msg) {
+			t.Errorf("expected inner handler to receive %q", msg)
 		}
 	}
 }
@@ -334,7 +335,7 @@ func TestWrapCoreWithLogMetrics(t *testing.T) {
 			LogMessagesTotal = newTestCounter()
 			defer func() { LogMessagesTotal = orig }()
 
-			sink := &zapcore.BufferedWriteSyncer{WS: zapcore.AddSync(&bytes.Buffer{})}
+			sink := zapcore.AddSync(&bytes.Buffer{})
 			inner := zapcore.NewCore(enc, sink, zapcore.DebugLevel)
 			wrapped := WrapCoreWithLogMetrics(inner)