Skip to content

Commit 8f36625

Browse files
Stevenpc3Steven Erbyurishkuro
authored
Fix user-config.yaml (#721)
#### What this PR does Fixes broken user-config.yaml template #### Which issue this PR fixes #720 #### Checklist - [x] [DCO](https://github.com/jaegertracing/helm-charts/blob/main/CONTRIBUTING.md#sign-off-your-work) signed - [ ] Commits are [GPG signed](https://docs.github.com/en/github/authenticating-to-github/about-commit-signature-verification) - [x] Chart Version bumped - [ ] Title of the PR starts with chart name (`[jaeger]` or `[jaeger-operator]`) - [ ] README.md has been updated to match version/contain new values --------- Signed-off-by: Steven Erb <stevenpc3@live.com> Signed-off-by: Steven <Stevenpc3@users.noreply.github.com> Signed-off-by: Yuri Shkuro <yurishkuro@users.noreply.github.com> Co-authored-by: Steven Erb <steven.erb@lmco.com> Co-authored-by: Yuri Shkuro <yurishkuro@users.noreply.github.com>
1 parent a69eb2c commit 8f36625

4 files changed

Lines changed: 146 additions & 24 deletions

File tree

‎charts/jaeger/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ appVersion: 2.14.1
33
description: A Jaeger Helm chart for Kubernetes
44
name: jaeger
55
type: application
6-
version: 4.3.2
6+
version: 4.3.3
77
# CronJobs require v1.21
88
kubeVersion: ">= 1.21-0"
99
keywords:

‎charts/jaeger/templates/ui-config.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{{- if .Values.uiconfig -}}
2+
# Generates a config map from a file provided by user via `--set-file uiconfig=`
3+
apiVersion: v1
4+
kind: ConfigMap
5+
metadata:
6+
name: ui-config
7+
namespace: {{ include "jaeger.namespace" . }}
8+
labels:
9+
{{- include "jaeger.labels" . | nindent 4 }}
10+
data:
11+
ui-config.json: {{ toJson .Values.uiconfig | quote }}
12+
{{- end -}}

‎charts/jaeger/templates/user-config.yaml‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,5 @@ metadata:
99
{{- include "jaeger.labels" . | nindent 4 }}
1010
data:
1111
user-config.yaml: |
12-
{{- .Values.userconfig | nindent 4 }}
13-
{{- end -}}
14-
{{- if .Values.uiconfig -}}
15-
{{- if .Values.userconfig }}
16-
---
17-
{{- end }}
18-
# Generates a config map from a file provided by user via `--set-file uiconfig=`
19-
apiVersion: v1
20-
kind: ConfigMap
21-
metadata:
22-
name: ui-config
23-
namespace: {{ include "jaeger.namespace" . }}
24-
labels:
25-
{{- include "jaeger.labels" . | nindent 4 }}
26-
data:
27-
ui-config.json: |
28-
{{- .Values.uiconfig | nindent 4 }}
12+
{{ toYaml .Values.userconfig | indent 4 }}
2913
{{- end -}}

‎charts/jaeger/values.yaml‎

Lines changed: 132 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,132 @@
22
# This is a YAML-formatted file.
33
# Jaeger values are grouped by component. Cassandra values override subchart values
44

5-
# Will use for user provided config
5+
# User provided ui config: see https://www.jaegertracing.io/docs/latest/deployment/frontend-ui/#configuration for more examples and settings
6+
uiconfig:
7+
# {
8+
# "dependencies": {
9+
# "dagMaxNumServices": 200,
10+
# "menuEnabled": true
11+
# },
12+
# "monitor": {
13+
# "menuEnabled": true
14+
# },
15+
# "themes": {
16+
# "enabled": true
17+
# },
18+
# "archiveEnabled": true,
19+
# "tracking": {
20+
# "gaID": "UA-000000-2",
21+
# "trackErrors": true
22+
# },
23+
# "menu": [
24+
# {
25+
# "label": "About Jaeger",
26+
# "items": [
27+
# {
28+
# "label": "GitHub",
29+
# "url": "https://github.com/jaegertracing/jaeger"
30+
# },
31+
# {
32+
# "label": "Docs",
33+
# "url": "https://www.jaegertracing.io/docs/latest/"
34+
# }
35+
# ]
36+
# }
37+
# ],
38+
# "search": {
39+
# "maxLookback": {
40+
# "label": "2 Days",
41+
# "value": "2d"
42+
# },
43+
# "maxLimit": 1500
44+
# },
45+
# "linkPatterns": [{
46+
# "type": "process",
47+
# "key": "jaeger.version",
48+
# "url": "https://github.com/jaegertracing/jaeger-client-java/releases/tag/#{jaeger.version}",
49+
# "text": "Information about Jaeger release #{jaeger.version}"
50+
# },
51+
# {
52+
# "type": "tags",
53+
# "key": "uniqueId",
54+
# "url": "https://mykibana.com/uniqueId=#{uniqueId}&traceId=#{trace.traceID}",
55+
# "text": "Redirect to kibana to view log"
56+
# },
57+
# {
58+
# "type": "traces",
59+
# "url": "https://my-logs.server?from=#{startTime | add -60000000 | epoch_micros_to_date_iso}&to=#{endTime | add 60000000 | epoch_micros_to_date_iso}'",
60+
# "text": "Redirect to kibana to view log with formatted dates"
61+
# }],
62+
# "traceIdDisplayLength": 20,
63+
# "criticalPathEnabled": true,
64+
# "topTagPrefixes": ["http.", "db."]
65+
# }
66+
67+
# User provided config to override the config completely
668
userconfig:
69+
# service:
70+
# extensions: [jaeger_storage, jaeger_query, healthcheckv2]
71+
# pipelines:
72+
# traces:
73+
# receivers: [otlp]
74+
# #processors: [batch]
75+
# exporters: [jaeger_storage_exporter]
76+
# telemetry:
77+
# resource:
78+
# service.name: jaeger
79+
# metrics:
80+
# level: detailed
81+
# readers:
82+
# - pull:
83+
# exporter:
84+
# prometheus:
85+
# host: 0.0.0.0
86+
# port: 8888
87+
# extensions:
88+
# healthcheckv2:
89+
# use_v2: true
90+
# http:
91+
# endpoint: 0.0.0.0:13133
92+
93+
# jaeger_query:
94+
# base_path: /jaeger
95+
# storage:
96+
# traces: primary_store
97+
# traces_archive: archive_store
98+
99+
# jaeger_storage:
100+
# backends:
101+
# primary_store:
102+
# elasticsearch:
103+
# server_urls: ["http://jaeger-elasticsearch-es-jaeger:9200"]
104+
# auth:
105+
# basic:
106+
# # these values are currently from elasticsearch-auth-user-admin
107+
# username: admin
108+
# password: password
109+
# archive_store:
110+
# elasticsearch:
111+
# server_urls: ["http://jaeger-elasticsearch-es-jaeger:9200"]
112+
# auth:
113+
# basic:
114+
# # these values are currently from elasticsearch-auth-user-admin
115+
# username: admin
116+
# password: password
117+
118+
# receivers:
119+
# otlp:
120+
# protocols:
121+
# grpc:
122+
# endpoint: 0.0.0.0:4317
123+
# http:
124+
# endpoint: 0.0.0.0:4318
125+
126+
# exporters:
127+
# jaeger_storage_exporter:
128+
# trace_storage: primary_store
7129

130+
# Default configuration is to use in memory storage. To override completely please see the userconfig above that uses elasticsearch external
8131
config:
9132
service:
10133
extensions: [jaeger_storage, jaeger_query, healthcheckv2]
@@ -46,16 +169,20 @@ config:
46169
elasticsearch:
47170
# index_prefix: jaeger
48171
server_urls: ["http://elasticsearch-master:9200"]
49-
# username: elastic
50-
# password: changeme
172+
# auth:
173+
# basic:
174+
# username: admin
175+
# password: password
51176
memory:
52177
max_traces: 100000
53178
archive_store:
54179
elasticsearch:
55180
# index_prefix: jaeger-archive
56181
server_urls: ["http://elasticsearch-master:9200"]
57-
# username: elastic
58-
# password: changeme
182+
# auth:
183+
# basic:
184+
# username: admin
185+
# password: password
59186
memory:
60187
max_traces: 100000
61188

@@ -77,7 +204,6 @@ config:
77204
exporters:
78205
jaeger_storage_exporter:
79206
trace_storage: primary_store
80-
# The following settings apply to Jaeger v1 and partially to Jaeger v2
81207

82208
global:
83209
imageRegistry:

0 commit comments

Comments
 (0)