diff --git a/operations/pyroscope/helm/pyroscope/Chart.yaml b/operations/pyroscope/helm/pyroscope/Chart.yaml index a036b59793..5969985db3 100644 --- a/operations/pyroscope/helm/pyroscope/Chart.yaml +++ b/operations/pyroscope/helm/pyroscope/Chart.yaml @@ -3,7 +3,7 @@ name: pyroscope description: 🔥 horizontally-scalable, highly-available, multi-tenant continuous profiling aggregation system home: https://grafana.com/oss/pyroscope/ type: application -version: 1.14.1 +version: 1.14.1-1 appVersion: 1.14.0 dependencies: - name: grafana-agent diff --git a/operations/pyroscope/helm/pyroscope/README.md b/operations/pyroscope/helm/pyroscope/README.md index 715db6e765..d54cc23fe8 100644 --- a/operations/pyroscope/helm/pyroscope/README.md +++ b/operations/pyroscope/helm/pyroscope/README.md @@ -34,9 +34,11 @@ | pyroscope.components | object | `{}` | | | pyroscope.config | string | The config depends on other values been set, details can be found in [`values.yaml`](./values.yaml) | Contains Pyroscope's configuration as a string. | | pyroscope.dnsPolicy | string | `"ClusterFirst"` | | +| pyroscope.disableSelfProfile | bool | `true` | | | pyroscope.extraArgs."log.level" | string | `"debug"` | | | pyroscope.extraEnvFrom | list | `[]` | Environment variables from secrets or configmaps to add to the pods | | pyroscope.extraEnvVars | object | `{}` | | +| pyroscope.extraCustomEnvVars | object | `{}` | Additional custom environment variables to add to the Pyroscope pods | | pyroscope.extraLabels | object | `{}` | | | pyroscope.extraVolumeMounts | list | `[]` | | | pyroscope.extraVolumes | list | `[]` | | diff --git a/operations/pyroscope/helm/pyroscope/templates/deployments-statefulsets.yaml b/operations/pyroscope/helm/pyroscope/templates/deployments-statefulsets.yaml index 210e636677..cc8d3e898c 100644 --- a/operations/pyroscope/helm/pyroscope/templates/deployments-statefulsets.yaml +++ b/operations/pyroscope/helm/pyroscope/templates/deployments-statefulsets.yaml @@ -69,7 +69,7 @@ spec: imagePullPolicy: {{ $values.image.pullPolicy }} args: - "-target={{ $component }}" - - "-self-profiling.disable-push=true" + - "-self-profiling.disable-push={{ .Values.pyroscope.disableSelfProfile }}" - "-server.http-listen-port={{ $values.service.port }}" - "-memberlist.cluster-label={{ .Release.Namespace }}-{{ include "pyroscope.fullname" .}}" - "-memberlist.join=dns+{{ include "pyroscope.fullname" .}}-memberlist.{{ .Release.Namespace }}.svc{{ .Values.pyroscope.cluster_domain }}:{{ .Values.pyroscope.memberlist.port }}" @@ -95,6 +95,9 @@ spec: {{- end }} {{- end }} {{- end }} + {{- with $values.extraCustomEnvVars }} + {{- toYaml . | nindent 12 }} + {{- end }} {{- with $values.extraEnvFrom }} envFrom: {{- toYaml . | nindent 12 }} diff --git a/operations/pyroscope/helm/pyroscope/values.yaml b/operations/pyroscope/helm/pyroscope/values.yaml index 081505bd9a..6a49845725 100644 --- a/operations/pyroscope/helm/pyroscope/values.yaml +++ b/operations/pyroscope/helm/pyroscope/values.yaml @@ -6,6 +6,9 @@ pyroscope: replicaCount: 1 + # -- Enable or disable Self profile push, useful to test + disableSelfProfile: true + # -- Kubernetes cluster domain suffix for DNS discovery cluster_domain: .cluster.local. @@ -25,6 +28,13 @@ pyroscope: # The following environment variables are set by the Helm chart. # JAEGER_AGENT_HOST: jaeger-agent.jaeger.svc.cluster.local. + extraCustomEnvVars: {} + # The following environment variables raw form. + # - name: MY_NODE_NAME + # valueFrom: + # fieldRef: + # fieldPath: spec.nodeName + # -- Environment variables from secrets or configmaps to add to the pods extraEnvFrom: []