Skip to content

Commit f70ba81

Browse files
iyacontroliyacontrolprabhatsharma
authored
Add the setting to enable or disable ReportServer (#110)
* Add the setting to enable or disable ReportServer * reportserver will be deployed as part of openobserve default * default reportserver will not be deployed * set reportserver default to true --------- Co-authored-by: iyacontrol <[email protected]> Co-authored-by: Prabhat Sharma <[email protected]>
1 parent 65e9c2a commit f70ba81

9 files changed

+16
-3
lines changed

charts/openobserve/Chart.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ dependencies:
99
repository: https://charts.min.io
1010
version: 5.3.0
1111
digest: sha256:63714207ce2a35dd0dac5d8f70e4c23cb058f1a6f710689dcdbd6fe018221cb0
12-
generated: "2024-12-11T22:49:33.758043+08:00"
12+
generated: "2024-12-12T06:41:57.896330158Z"

charts/openobserve/templates/alertmanager-deployment.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,10 @@ spec:
6666
containerPort: {{ .Values.config.ZO_HTTP_PORT }}
6767
- name: grpc
6868
containerPort: {{ .Values.config.ZO_GRPC_PORT }}
69+
{{- if .Values.reportserver.enabled }}
6970
- name: reportserver
7071
containerPort: {{ .Values.config.ZO_REPORT_SERVER_HTTP_PORT }}
72+
{{- end }}
7173
{{- if .Values.probes.alertmanager.enabled }}
7274
livenessProbe:
7375
httpGet:

charts/openobserve/templates/alertmanager-service.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,12 @@ spec:
1717
targetPort: grpc
1818
protocol: TCP
1919
name: grpc
20+
{{- if .Values.reportserver.enabled }}
2021
- port: {{ .Values.config.ZO_REPORT_SERVER_HTTP_PORT }}
2122
targetPort: reportserver
2223
protocol: TCP
2324
name: reportserver
25+
{{- end }}
2426
selector:
2527
{{- include "openobserve.selectorLabels" . | nindent 4 }}
2628
role: alertmanager

charts/openobserve/templates/configmap.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,10 @@ data:
2929
ZO_ETCD_KEY_FILE: "{{ .Values.config.ZO_ETCD_KEY_FILE }}"
3030
ZO_ETCD_DOMAIN_NAME: "{{ .Values.config.ZO_ETCD_DOMAIN_NAME }}"
3131
ZO_ETCD_LOAD_PAGE_SIZE: "{{ .Values.config.ZO_ETCD_LOAD_PAGE_SIZE }}"
32-
ZO_REPORT_SERVER_SKIP_TLS_VERIFY: "{{ .Values.config.ZO_REPORT_SERVER_SKIP_TLS_VERIFY }}"
32+
{{- if .Values.reportserver.enabled }}
3333
ZO_REPORT_SERVER_URL: "http://{{ include "openobserve.fullname" . }}-reportserver.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:{{ .Values.config.ZO_HTTP_PORT }}"
34+
{{- end }}
35+
ZO_REPORT_SERVER_SKIP_TLS_VERIFY: "{{ .Values.config.ZO_REPORT_SERVER_SKIP_TLS_VERIFY }}"
3436
ZO_CHROME_SLEEP_SECS: "{{ .Values.config.ZO_CHROME_SLEEP_SECS }}"
3537
ZO_CHROME_NO_SANDBOX: "{{ .Values.config.ZO_CHROME_NO_SANDBOX }}"
3638
{{- if not .Values.nats.enabled }}

charts/openobserve/templates/reportserver-configmap.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{{- if .Values.reportserver.enabled -}}
12
apiVersion: v1
23
kind: ConfigMap
34
metadata:
@@ -8,4 +9,5 @@ metadata:
89
data:
910
# Report server will call this router URL to visit the dashboards and generate PDFs from them
1011
ZO_WEB_URL: "http://{{ include "openobserve.fullname" . }}-router.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:{{ .Values.config.ZO_HTTP_PORT }}"
12+
{{- end }}
1113

charts/openobserve/templates/reportserver-delpoyment.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{{- if .Values.reportserver.enabled -}}
12
apiVersion: apps/v1
23
kind: Deployment
34
metadata:
@@ -99,3 +100,4 @@ spec:
99100
tolerations:
100101
{{- toYaml . | nindent 8 }}
101102
{{- end }}
103+
{{- end }}

charts/openobserve/templates/reportserver-hpa.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- if .Values.autoscaling.enabled }}
1+
{{- if and .Values.reportserver.enabled .Values.autoscaling.enabled }}
22
apiVersion: autoscaling/v2
33
kind: HorizontalPodAutoscaler
44
metadata:

charts/openobserve/templates/reportserver-service.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{{- if .Values.reportserver.enabled -}}
12
apiVersion: v1
23
kind: Service
34
metadata:
@@ -15,3 +16,4 @@ spec:
1516
selector:
1617
{{- include "openobserve.selectorLabels" . | nindent 4 }}
1718
role: reportserver
19+
{{- end }}

charts/openobserve/values.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ querier:
114114
- ReadWriteOnce
115115

116116
reportserver:
117+
enabled: true # if true then reportserver will be deployed as part of openobserve
117118
# Additional volumes on the output Deployment definition.
118119
volumes: []
119120
# - name: foo

0 commit comments

Comments
 (0)