Create separate Helm value for span queue size

grafana · Jan 8, 2024 · 5456a48 · 5456a48
1 parent 88ac742
commit 5456a48
Show file tree

Hide file tree

Showing 43 changed files with 150 additions and 142 deletions.
diff --git a/operations/helm/charts/mimir-distributed/templates/querier/querier-dep.yaml b/operations/helm/charts/mimir-distributed/templates/querier/querier-dep.yaml
@@ -109,6 +109,11 @@ spec:
             - name: "GOMAXPROCS"
               value: {{ max $cpu_request_doubled $cpu_request_plus_four | toString | toYaml }}
             {{- end }}
+            {{- $jaeger_queue_size := dig "jaegerReporterMaxQueueSize" nil .Values.querier }}
+            {{- if $jaeger_queue_size }}
+            - name: "JAEGER_REPORTER_MAX_QUEUE_SIZE"
+              value: {{$jaeger_queue_size | toString | toYaml }}
+            {{- end }}
           envFrom:
             {{- with .Values.global.extraEnvFrom }}
               {{- toYaml . | nindent 12 }}

diff --git a/...ions/helm/charts/mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml b/...ions/helm/charts/mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml
@@ -184,6 +184,11 @@ spec:
             - name: "GOMEMLIMIT"
               value: {{include "mimir.siToBytes" (dict "value" $mem_request) | toString | toYaml }}
             {{- end }}
+            {{- $jaeger_queue_size := dig "jaegerReporterMaxQueueSize" nil .Values.store_gateway }}
+            {{- if $jaeger_queue_size }}
+            - name: "JAEGER_REPORTER_MAX_QUEUE_SIZE"
+              value: {{$jaeger_queue_size | toString | toYaml }}
+            {{- end }}
           envFrom:
             {{- with .Values.global.extraEnvFrom }}
               {{- toYaml . | nindent 12 }}

diff --git a/operations/helm/charts/mimir-distributed/values.yaml b/operations/helm/charts/mimir-distributed/values.yaml
@@ -1211,10 +1211,9 @@ querier:
   extraContainers: []
   extraVolumes: []
   extraVolumeMounts: []
-  env:
-    - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
-      value: "5000"
+  env: []
   extraEnvFrom: []
+  jaegerReporterMaxQueueSize: 5000
 
 query_frontend:
   # Setting it to null will produce a deployment without replicas set, allowing you to use autoscaling with the deployment
@@ -1491,10 +1490,9 @@ store_gateway:
   extraContainers: []
   extraVolumes: []
   extraVolumeMounts: []
-  env:
-    - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
-      value: "1000"
+  env: []
   extraEnvFrom: []
+  jaegerReporterMaxQueueSize: 1000
 
   # -- Options to configure zone-aware replication for store-gateway
   # Example configuration with full geographical redundancy:

diff --git a/...ts/enterprise-https-values-generated/mimir-distributed/templates/querier/querier-dep.yaml b/...ts/enterprise-https-values-generated/mimir-distributed/templates/querier/querier-dep.yaml
@@ -98,10 +98,10 @@ spec:
               - ALL
             readOnlyRootFilesystem: true
           env:
-            - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
-              value: "5000"
             - name: "GOMAXPROCS"
               value: "5"
+            - name: "JAEGER_REPORTER_MAX_QUEUE_SIZE"
+              value: "5000"
           envFrom:
       nodeSelector:
         {}

diff --git a/...values-generated/mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml b/...values-generated/mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml
@@ -149,12 +149,12 @@ spec:
               - ALL
             readOnlyRootFilesystem: true
           env:
-            - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
-              value: "1000"
             - name: "GOMAXPROCS"
               value: "5"
             - name: "GOMEMLIMIT"
               value: "536870912"
+            - name: "JAEGER_REPORTER_MAX_QUEUE_SIZE"
+              value: "1000"
           envFrom:
 ---
 # Source: mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml
@@ -307,12 +307,12 @@ spec:
               - ALL
             readOnlyRootFilesystem: true
           env:
-            - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
-              value: "1000"
             - name: "GOMAXPROCS"
               value: "5"
             - name: "GOMEMLIMIT"
               value: "536870912"
+            - name: "JAEGER_REPORTER_MAX_QUEUE_SIZE"
+              value: "1000"
           envFrom:
 ---
 # Source: mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml
@@ -465,10 +465,10 @@ spec:
               - ALL
             readOnlyRootFilesystem: true
           env:
-            - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
-              value: "1000"
             - name: "GOMAXPROCS"
               value: "5"
             - name: "GOMEMLIMIT"
               value: "536870912"
+            - name: "JAEGER_REPORTER_MAX_QUEUE_SIZE"
+              value: "1000"
           envFrom:
diff --git a/.../gateway-enterprise-values-generated/mimir-distributed/templates/querier/querier-dep.yaml b/.../gateway-enterprise-values-generated/mimir-distributed/templates/querier/querier-dep.yaml
@@ -93,10 +93,10 @@ spec:
               - ALL
             readOnlyRootFilesystem: true
           env:
-            - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
-              value: "5000"
             - name: "GOMAXPROCS"
               value: "5"
+            - name: "JAEGER_REPORTER_MAX_QUEUE_SIZE"
+              value: "5000"
           envFrom:
       nodeSelector:
         {}

diff --git a/...values-generated/mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml b/...values-generated/mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml
@@ -140,12 +140,12 @@ spec:
               - ALL
             readOnlyRootFilesystem: true
           env:
-            - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
-              value: "1000"
             - name: "GOMAXPROCS"
               value: "5"
             - name: "GOMEMLIMIT"
               value: "536870912"
+            - name: "JAEGER_REPORTER_MAX_QUEUE_SIZE"
+              value: "1000"
           envFrom:
 ---
 # Source: mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml
@@ -289,12 +289,12 @@ spec:
               - ALL
             readOnlyRootFilesystem: true
           env:
-            - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
-              value: "1000"
             - name: "GOMAXPROCS"
               value: "5"
             - name: "GOMEMLIMIT"
               value: "536870912"
+            - name: "JAEGER_REPORTER_MAX_QUEUE_SIZE"
+              value: "1000"
           envFrom:
 ---
 # Source: mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml
@@ -438,10 +438,10 @@ spec:
               - ALL
             readOnlyRootFilesystem: true
           env:
-            - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
-              value: "1000"
             - name: "GOMAXPROCS"
               value: "5"
             - name: "GOMEMLIMIT"
               value: "536870912"
+            - name: "JAEGER_REPORTER_MAX_QUEUE_SIZE"
+              value: "1000"
           envFrom:
diff --git a/...tests/gateway-nginx-values-generated/mimir-distributed/templates/querier/querier-dep.yaml b/...tests/gateway-nginx-values-generated/mimir-distributed/templates/querier/querier-dep.yaml
@@ -91,10 +91,10 @@ spec:
               - ALL
             readOnlyRootFilesystem: true
           env:
-            - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
-              value: "5000"
             - name: "GOMAXPROCS"
               value: "5"
+            - name: "JAEGER_REPORTER_MAX_QUEUE_SIZE"
+              value: "5000"
           envFrom:
       nodeSelector:
         {}

diff --git a/...values-generated/mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml b/...values-generated/mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml
@@ -135,12 +135,12 @@ spec:
               - ALL
             readOnlyRootFilesystem: true
           env:
-            - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
-              value: "1000"
             - name: "GOMAXPROCS"
               value: "5"
             - name: "GOMEMLIMIT"
               value: "536870912"
+            - name: "JAEGER_REPORTER_MAX_QUEUE_SIZE"
+              value: "1000"
           envFrom:
 ---
 # Source: mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml
@@ -279,12 +279,12 @@ spec:
               - ALL
             readOnlyRootFilesystem: true
           env:
-            - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
-              value: "1000"
             - name: "GOMAXPROCS"
               value: "5"
             - name: "GOMEMLIMIT"
               value: "536870912"
+            - name: "JAEGER_REPORTER_MAX_QUEUE_SIZE"
+              value: "1000"
           envFrom:
 ---
 # Source: mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml
@@ -423,10 +423,10 @@ spec:
               - ALL
             readOnlyRootFilesystem: true
           env:
-            - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
-              value: "1000"
             - name: "GOMAXPROCS"
               value: "5"
             - name: "GOMEMLIMIT"
               value: "536870912"
+            - name: "JAEGER_REPORTER_MAX_QUEUE_SIZE"
+              value: "1000"
           envFrom:
diff --git a/...ts/graphite-enabled-values-generated/mimir-distributed/templates/querier/querier-dep.yaml b/...ts/graphite-enabled-values-generated/mimir-distributed/templates/querier/querier-dep.yaml
@@ -93,10 +93,10 @@ spec:
               - ALL
             readOnlyRootFilesystem: true
           env:
-            - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
-              value: "5000"
             - name: "GOMAXPROCS"
               value: "5"
+            - name: "JAEGER_REPORTER_MAX_QUEUE_SIZE"
+              value: "5000"
           envFrom:
       nodeSelector:
         {}

diff --git a/...values-generated/mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml b/...values-generated/mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml
@@ -131,10 +131,10 @@ spec:
               - ALL
             readOnlyRootFilesystem: true
           env:
-            - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
-              value: "1000"
             - name: "GOMAXPROCS"
               value: "5"
             - name: "GOMEMLIMIT"
               value: "536870912"
+            - name: "JAEGER_REPORTER_MAX_QUEUE_SIZE"
+              value: "1000"
           envFrom:
diff --git a/...ns/helm/tests/large-values-generated/mimir-distributed/templates/querier/querier-dep.yaml b/...ns/helm/tests/large-values-generated/mimir-distributed/templates/querier/querier-dep.yaml
@@ -93,10 +93,10 @@ spec:
               - ALL
             readOnlyRootFilesystem: true
           env:
-            - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
-              value: "5000"
             - name: "GOMAXPROCS"
               value: "6"
+            - name: "JAEGER_REPORTER_MAX_QUEUE_SIZE"
+              value: "5000"
           envFrom:
       nodeSelector:
         {}

diff --git a/...values-generated/mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml b/...values-generated/mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml
@@ -149,12 +149,12 @@ spec:
               - ALL
             readOnlyRootFilesystem: true
           env:
-            - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
-              value: "1000"
             - name: "GOMAXPROCS"
               value: "5"
             - name: "GOMEMLIMIT"
               value: "6442450944"
+            - name: "JAEGER_REPORTER_MAX_QUEUE_SIZE"
+              value: "1000"
           envFrom:
 ---
 # Source: mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml
@@ -307,12 +307,12 @@ spec:
               - ALL
             readOnlyRootFilesystem: true
           env:
-            - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
-              value: "1000"
             - name: "GOMAXPROCS"
               value: "5"
             - name: "GOMEMLIMIT"
               value: "6442450944"
+            - name: "JAEGER_REPORTER_MAX_QUEUE_SIZE"
+              value: "1000"
           envFrom:
 ---
 # Source: mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml
@@ -465,10 +465,10 @@ spec:
               - ALL
             readOnlyRootFilesystem: true
           env:
-            - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
-              value: "1000"
             - name: "GOMAXPROCS"
               value: "5"
             - name: "GOMEMLIMIT"
               value: "6442450944"
+            - name: "JAEGER_REPORTER_MAX_QUEUE_SIZE"
+              value: "1000"
           envFrom:
diff --git a/...ests/metamonitoring-values-generated/mimir-distributed/templates/querier/querier-dep.yaml b/...ests/metamonitoring-values-generated/mimir-distributed/templates/querier/querier-dep.yaml
@@ -91,10 +91,10 @@ spec:
               - ALL
             readOnlyRootFilesystem: true
           env:
-            - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
-              value: "5000"
             - name: "GOMAXPROCS"
               value: "5"
+            - name: "JAEGER_REPORTER_MAX_QUEUE_SIZE"
+              value: "5000"
           envFrom:
       nodeSelector:
         {}

diff --git a/...values-generated/mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml b/...values-generated/mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml
@@ -126,10 +126,10 @@ spec:
               - ALL
             readOnlyRootFilesystem: true
           env:
-            - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
-              value: "1000"
             - name: "GOMAXPROCS"
               value: "5"
             - name: "GOMEMLIMIT"
               value: "536870912"
+            - name: "JAEGER_REPORTER_MAX_QUEUE_SIZE"
+              value: "1000"
           envFrom:
diff --git a/...elm/tests/openshift-values-generated/mimir-distributed/templates/querier/querier-dep.yaml b/...elm/tests/openshift-values-generated/mimir-distributed/templates/querier/querier-dep.yaml
@@ -90,10 +90,10 @@ spec:
               - ALL
             readOnlyRootFilesystem: true
           env:
-            - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
-              value: "5000"
             - name: "GOMAXPROCS"
               value: "5"
+            - name: "JAEGER_REPORTER_MAX_QUEUE_SIZE"
+              value: "5000"
           envFrom:
       nodeSelector:
         {}

diff --git a/...values-generated/mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml b/...values-generated/mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml
@@ -137,12 +137,12 @@ spec:
               - ALL
             readOnlyRootFilesystem: true
           env:
-            - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
-              value: "1000"
             - name: "GOMAXPROCS"
               value: "5"
             - name: "GOMEMLIMIT"
               value: "536870912"
+            - name: "JAEGER_REPORTER_MAX_QUEUE_SIZE"
+              value: "1000"
           envFrom:
 ---
 # Source: mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml
@@ -283,12 +283,12 @@ spec:
               - ALL
             readOnlyRootFilesystem: true
           env:
-            - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
-              value: "1000"
             - name: "GOMAXPROCS"
               value: "5"
             - name: "GOMEMLIMIT"
               value: "536870912"
+            - name: "JAEGER_REPORTER_MAX_QUEUE_SIZE"
+              value: "1000"
           envFrom:
 ---
 # Source: mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml
@@ -429,10 +429,10 @@ spec:
               - ALL
             readOnlyRootFilesystem: true
           env:
-            - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
-              value: "1000"
             - name: "GOMAXPROCS"
               value: "5"
             - name: "GOMEMLIMIT"
               value: "536870912"
+            - name: "JAEGER_REPORTER_MAX_QUEUE_SIZE"
+              value: "1000"
           envFrom:
diff --git a/...ests/scheduler-name-values-generated/mimir-distributed/templates/querier/querier-dep.yaml b/...ests/scheduler-name-values-generated/mimir-distributed/templates/querier/querier-dep.yaml
@@ -91,10 +91,10 @@ spec:
               - ALL
             readOnlyRootFilesystem: true
           env:
-            - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
-              value: "5000"
             - name: "GOMAXPROCS"
               value: "5"
+            - name: "JAEGER_REPORTER_MAX_QUEUE_SIZE"
+              value: "5000"
           envFrom:
       nodeSelector:
         {}