Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[helm] Fix tracing configuration #11186

Merged
merged 8 commits into from
Nov 21, 2023
Merged

[helm] Fix tracing configuration #11186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
de01d4d
[helm] Fix tracing configuration
QuentinBisson Nov 9, 2023
f5c03d7
Fix markdown files
QuentinBisson Nov 10, 2023
c557d38
Merge branch 'main' into enable-tracing-in-helm-chart
QuentinBisson Nov 10, 2023
e5f2e3f
Merge branch 'main' into enable-tracing-in-helm-chart
QuentinBisson Nov 13, 2023
02b7696
Merge branch 'main' into enable-tracing-in-helm-chart
QuentinBisson Nov 14, 2023
2bdcba2
Merge branch 'main' into enable-tracing-in-helm-chart
QuentinBisson Nov 15, 2023
7c838fd
Merge branch 'main' into enable-tracing-in-helm-chart
QuentinBisson Nov 15, 2023
749a9d5
Merge branch 'main' into enable-tracing-in-helm-chart
QuentinBisson Nov 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion docs/sources/operations/troubleshooting.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,11 @@ Jaeger is running.
If you deploy with Helm, use the following command:

```bash
$ helm upgrade --install loki loki/loki --set "loki.tracing.jaegerAgentHost=YOUR_JAEGER_AGENT_HOST"
$ helm upgrade --install loki loki/loki --set "loki.tracing.enabled=true"
--set "read.extraEnv[0].name=JAEGER_AGENT_HOST" --set "read.extraEnv[0].value=<JAEGER_AGENT_HOST>"
--set "write.extraEnv[0].name=JAEGER_AGENT_HOST" --set "write.extraEnv[0].value=<JAEGER_AGENT_HOST>"
--set "backend.extraEnv[0].name=JAEGER_AGENT_HOST" --set "backend.extraEnv[0].value=<JAEGER_AGENT_HOST>"
--set "gateway.extraEnv[0].name=JAEGER_AGENT_HOST" --set "gateway.extraEnv[0].value=<JAEGER_AGENT_HOST>"
```

## Running Loki with Istio Sidecars
Expand Down
20 changes: 11 additions & 9 deletions docs/sources/setup/install/helm/reference.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2297,6 +2297,17 @@ null
<td><pre lang="json">
[]
</pre>
</td>
</tr>
<tr>
<td>loki.tracing</td>
<td>object</td>
<td>Enable tracing</td>
<td><pre lang="json">
{
"enabled": false
}
</pre>
</td>
</tr>
<tr>
Expand Down Expand Up @@ -4393,15 +4404,6 @@ null
<td><pre lang="json">
"1m"
</pre>
</td>
</tr>
<tr>
<td>tracing.jaegerAgentHost</td>
<td>string</td>
<td></td>
<td><pre lang="json">
""
</pre>
</td>
</tr>
<tr>
Expand Down
4 changes: 4 additions & 0 deletions production/helm/loki/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ Entries should include a reference to the pull request that introduced the chang

[//]: # (<AUTOMATED_UPDATES_LOCATOR> : do not remove this line. This locator is used by the CI pipeline to automatically create a changelog entry for each new Loki release. Add other chart versions and respective changelog entries bellow this line.)

## 5.37.0

- [FEATURE] Add support for enabling tracing.

## 5.36.2

- [BUGFIX] Add support to run dnsmasq
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: loki
description: Helm chart for Grafana Loki in simple, scalable mode
type: application
appVersion: 2.9.2
version: 5.36.3
version: 5.37.0
home: https://grafana.github.io/helm-charts
sources:
- https://github.com/grafana/loki
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# loki

![Version: 5.36.3](https://img.shields.io/badge/Version-5.36.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.2](https://img.shields.io/badge/AppVersion-2.9.2-informational?style=flat-square)
![Version: 5.37.0](https://img.shields.io/badge/Version-5.37.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.2](https://img.shields.io/badge/AppVersion-2.9.2-informational?style=flat-square)

Helm chart for Grafana Loki in simple, scalable mode

Expand Down
8 changes: 6 additions & 2 deletions production/helm/loki/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,9 @@ loki:
distributor:
{{- tpl (. | toYaml) $ | nindent 4 }}
{{- end }}

tracing:
enabled: {{ .Values.loki.tracing.enabled }}
# Should authentication be enabled
auth_enabled: true
# -- memberlist configuration (overrides embedded default)
Expand Down Expand Up @@ -344,6 +347,9 @@ loki:
scheduler_address: '{{ include "loki.querySchedulerAddress" . }}'
# -- Optional distributor configuration
distributor: {}
# -- Enable tracing
tracing:
enabled: false
enterprise:
# Enable enterprise features, license must be provided
enabled: false
Expand Down Expand Up @@ -1474,8 +1480,6 @@ networkPolicy:
podSelector: {}
# -- Specifies the namespace the discovery Pods are running in
namespaceSelector: {}
tracing:
jaegerAgentHost: ""
# -------------------------------------
# Configuration for `minio` child chart
# -------------------------------------
Expand Down