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

Jump to bottom

Adding support for zipkin UI #127

Merged
merged 1 commit into from
Jul 25, 2023
Merged

Adding support for zipkin UI #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions chart/skywalking/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ The following table lists the configurable parameters of the Skywalking chart an
| `oap.image.pullPolicy` | OAP container image pull policy | `IfNotPresent` |
| `oap.ports.grpc` | OAP grpc port for tracing or metric | `11800` |
| `oap.ports.rest` | OAP http port for Web UI | `12800` |
| `oap.ports.zipkinreceiver` | OAP http port for Zipkin receiver(not exposed by default) | `9411` |
| `oap.ports.zipkinquery` | OAP http port for querying Zipkin traces and UI(not exposed by default) | `9412` |
| `oap.replicas` | OAP k8s deployment replicas | `2` |
| `oap.service.type` | OAP svc type | `ClusterIP` |
| `oap.javaOpts` | Parameters to be added to `JAVA_OPTS`environment variable for OAP | `-Xms2g -Xmx2g` |
Expand Down
12 changes: 12 additions & 0 deletions chart/skywalking/templates/oap-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,18 @@ spec:
{{ toYaml .Values.oap.resources | indent 10 }}
{{- end }}
env:
{{- if .Values.oap.ports.zipkinreceiver }}
- name: SW_RECEIVER_ZIPKIN
value: default
- name: SW_RECEIVER_ZIPKIN_REST_PORT
value: "{{ .Values.oap.ports.zipkinreceiver }}"
{{- end }}
{{- if .Values.oap.ports.zipkinquery }}
- name: SW_QUERY_ZIPKIN
value: default
- name: SW_QUERY_ZIPKIN_REST_PORT
value: "{{ .Values.oap.ports.zipkinquery }}"
{{- end }}
- name: JAVA_OPTS
value: "-Dmode=no-init {{ .Values.oap.javaOpts }}"
- name: SW_CLUSTER
Expand Down
4 changes: 4 additions & 0 deletions chart/skywalking/templates/ui-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,10 @@ spec:
env:
- name: SW_OAP_ADDRESS
value: "http://{{ template "skywalking.oap.fullname" . }}:{{ .Values.oap.ports.rest }}"
{{- if .Values.oap.ports.zipkinquery }}
- name: SW_ZIPKIN_ADDRESS
value: "http://{{ template "skywalking.oap.fullname" . }}:{{ .Values.oap.ports.zipkinquery }}"
{{- end }}
{{- range $key, $value := .Values.ui.env }}
- name: {{ $key }}
value: {{ $value | quote }}
Expand Down
2 changes: 2 additions & 0 deletions chart/skywalking/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ oap:
# zabbix: 10051
grpc: 11800
rest: 12800
# zipkinreceiver: 9411
# zipkinquery: 9412
replicas: 2
service:
type: ClusterIP
Expand Down
Loading