From 17a6b53b7ab8c06f6711e5ebb825b4c9b63b5e96 Mon Sep 17 00:00:00 2001 From: Warren Gifford Date: Thu, 19 Mar 2026 15:01:55 -0700 Subject: [PATCH 1/3] jaeger docs update --- docs/self-hosted/deploy/kubernetes/index.mdx | 27 ++++++++++++++++++++ docs/self-hosted/observability/tracing.mdx | 2 ++ 2 files changed, 29 insertions(+) diff --git a/docs/self-hosted/deploy/kubernetes/index.mdx b/docs/self-hosted/deploy/kubernetes/index.mdx index 57ebb7320..6da770fb7 100644 --- a/docs/self-hosted/deploy/kubernetes/index.mdx +++ b/docs/self-hosted/deploy/kubernetes/index.mdx @@ -395,6 +395,33 @@ jaeger: enabled: true ``` +#### Customize Jaeger configuration + +Starting with Sourcegraph 7.1.0, the bundled Jaeger instance uses an [OpenTelemetry Collector-style YAML configuration](https://www.jaegertracing.io/docs/2.16/configuration/) instead of CLI flags. The full configuration is exposed through the `jaeger.config` Helm value and rendered into a ConfigMap. + +You can override individual settings in your Helm values override file. For example, to increase the maximum number of in-memory traces: + +```yaml +jaeger: + enabled: true + config: + extensions: + jaeger_storage: + backends: + main_store: + memory: + max_traces: 50000 +``` + +Or using `--set` on the command line: + +```bash +helm upgrade sourcegraph sourcegraph/sourcegraph \ + --set jaeger.config.extensions.jaeger_storage.backends.main_store.memory.max_traces=50000 +``` + +See the [Jaeger v2 configuration reference](https://www.jaegertracing.io/docs/2.16/configuration/) for all available options. The full default configuration can be found in the [`jaeger.config` value](https://github.com/sourcegraph/deploy-sourcegraph-helm/blob/main/charts/sourcegraph/values.yaml) in the Helm chart. + #### Configure OpenTelemetry Collector to use an external tracing backend To configure the bundled otel-collector to export traces to an external OTEL-compatible backend, you you can customize the otel-collector's config file directly in your Helm values `override.yaml` file. diff --git a/docs/self-hosted/observability/tracing.mdx b/docs/self-hosted/observability/tracing.mdx index ed0cefcb3..9fb8af414 100644 --- a/docs/self-hosted/observability/tracing.mdx +++ b/docs/self-hosted/observability/tracing.mdx @@ -20,6 +20,8 @@ To deploy our bundled Jaeger backend, follow the instructions for your deploymen - [Kubernetes with Kustomize](/self-hosted/deploy/kubernetes/configure#deploy-the-bundled-opentelemetry-collector-and-jaeger) - [Docker Compose](/self-hosted/deploy/docker-compose/configuration#deploy-the-bundled-jaeger) +For Helm deployments, you can also [customize the Jaeger configuration](/self-hosted/deploy/kubernetes#customize-jaeger-configuration) (e.g., `max_traces`, sampling, log level) directly through Helm values. + Then configure your Site Configuration: 1. Ensure your `externalURL` is configured From c8255f1fa0c139deb391f5e2e951739ef628d3f7 Mon Sep 17 00:00:00 2001 From: Warren Gifford Date: Thu, 19 Mar 2026 15:20:07 -0700 Subject: [PATCH 2/3] simplify --- docs/self-hosted/deploy/kubernetes/index.mdx | 23 +++++++++++--------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/docs/self-hosted/deploy/kubernetes/index.mdx b/docs/self-hosted/deploy/kubernetes/index.mdx index 6da770fb7..3c832e469 100644 --- a/docs/self-hosted/deploy/kubernetes/index.mdx +++ b/docs/self-hosted/deploy/kubernetes/index.mdx @@ -397,30 +397,33 @@ jaeger: #### Customize Jaeger configuration -Starting with Sourcegraph 7.1.0, the bundled Jaeger instance uses an [OpenTelemetry Collector-style YAML configuration](https://www.jaegertracing.io/docs/2.16/configuration/) instead of CLI flags. The full configuration is exposed through the `jaeger.config` Helm value and rendered into a ConfigMap. +Starting with Sourcegraph 7.1.0, the bundled Jaeger instance uses an [OpenTelemetry Collector-style YAML configuration](https://www.jaegertracing.io/docs/2.16/configuration/) instead of CLI flags. Common settings are exposed through the `jaeger.config` Helm value. -You can override individual settings in your Helm values override file. For example, to increase the maximum number of in-memory traces: +You can override these settings in your Helm values override file. For example, to increase the maximum number of in-memory traces: ```yaml jaeger: enabled: true config: - extensions: - jaeger_storage: - backends: - main_store: - memory: - max_traces: 50000 + maxTraces: 50000 ``` Or using `--set` on the command line: ```bash helm upgrade sourcegraph sourcegraph/sourcegraph \ - --set jaeger.config.extensions.jaeger_storage.backends.main_store.memory.max_traces=50000 + --set jaeger.config.maxTraces=50000 ``` -See the [Jaeger v2 configuration reference](https://www.jaegertracing.io/docs/2.16/configuration/) for all available options. The full default configuration can be found in the [`jaeger.config` value](https://github.com/sourcegraph/deploy-sourcegraph-helm/blob/main/charts/sourcegraph/values.yaml) in the Helm chart. +The available configuration options are: + +| Value | Default | Description | +| --- | --- | --- | +| `jaeger.config.maxTraces` | `20000` | Maximum number of traces stored in memory | +| `jaeger.config.logLevel` | `info` | Log level (`debug`, `info`, `warn`, `error`) | +| `jaeger.config.samplingDefaultProbability` | `1.0` | Default sampling probability (0.0–1.0) returned to services that query Jaeger for sampling config | + +For advanced customization beyond these options, you can mount a custom configuration file using `jaeger.extraVolumes` and `jaeger.extraVolumeMounts`. See the [Jaeger v2 configuration reference](https://www.jaegertracing.io/docs/2.16/configuration/) for all available options. #### Configure OpenTelemetry Collector to use an external tracing backend From e1ab62f8157c367f4417c7f89fd25f947cd51221 Mon Sep 17 00:00:00 2001 From: Warren Gifford Date: Thu, 19 Mar 2026 15:53:48 -0700 Subject: [PATCH 3/3] update --- docs/self-hosted/deploy/kubernetes/index.mdx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/self-hosted/deploy/kubernetes/index.mdx b/docs/self-hosted/deploy/kubernetes/index.mdx index 3c832e469..da0f0e54b 100644 --- a/docs/self-hosted/deploy/kubernetes/index.mdx +++ b/docs/self-hosted/deploy/kubernetes/index.mdx @@ -422,8 +422,9 @@ The available configuration options are: | `jaeger.config.maxTraces` | `20000` | Maximum number of traces stored in memory | | `jaeger.config.logLevel` | `info` | Log level (`debug`, `info`, `warn`, `error`) | | `jaeger.config.samplingDefaultProbability` | `1.0` | Default sampling probability (0.0–1.0) returned to services that query Jaeger for sampling config | +| `jaeger.config.existingConfigMap` | `""` | Name of a pre-existing ConfigMap containing a `jaeger-config.yaml` key. When set, the chart skips creating its own ConfigMap and uses yours instead | -For advanced customization beyond these options, you can mount a custom configuration file using `jaeger.extraVolumes` and `jaeger.extraVolumeMounts`. See the [Jaeger v2 configuration reference](https://www.jaegertracing.io/docs/2.16/configuration/) for all available options. +For advanced customization beyond these options, set `jaeger.config.existingConfigMap` to the name of your own ConfigMap containing a full `jaeger-config.yaml` key. See the [Jaeger v2 configuration reference](https://www.jaegertracing.io/docs/2.16/configuration/) for all available options. #### Configure OpenTelemetry Collector to use an external tracing backend