Skip to content

Commit ebfb039

Browse files
FrapschenFrapschen
committed
update opentelemetry-demo-lite _help.tpl
1 parent 590ef43 commit ebfb039

File tree

4 files changed

+33
-26
lines changed

4 files changed

+33
-26
lines changed

‎charts/opentelemetry-demo-lite/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v2
22
name: opentelemetry-demo-lite
33
type: application
4-
version: 1.0.0
4+
version: 1.0.1
55
icon: https://opentelemetry.io/img/logos/opentelemetry-logo-nav.png
66
description: A helm chart for openTelemetry community demo application integration with other component(lite version).
77
sources:

‎charts/opentelemetry-demo-lite/templates/_help.tpl‎

Lines changed: 27 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -44,29 +44,29 @@ common java nacos opt
4444
*/}}
4545
{{- define "java.nacos.opt" -}}
4646
{{- if .Values.global.microservices.nacos.enabled }}
47-
{{- $opt := cat "-Dspring.cloud.nacos.config.enabled=true" " " -}}
48-
{{- $opt = cat $opt "-Dspring.cloud.nacos.discovery.enabled=true" " " -}}
49-
{{- $opt = cat $opt ( printf "-Dspring.cloud.nacos.config.server-addr=%s -Dspring.cloud.nacos.discovery.server-addr=%s" .Values.global.microservices.nacos.registryAddr .Values.global.microservices.nacos.registryAddr ) " " -}}
50-
{{- $opt = cat $opt ( printf "-Dspring.cloud.nacos.discovery.namespace=%s" .Values.global.microservices.nacos.registryNamespace ) " " -}}
51-
{{- $opt = cat $opt ( printf "-Dspring.cloud.nacos.discovery.group=%s" .Values.global.microservices.nacos.registryServiceGroup ) " " -}}
52-
{{- $opt = cat $opt ( printf "-Dspring.cloud.nacos.discovery.cluster-name=%s" .Values.global.microservices.nacos.registryInstanceGroup ) " " -}}
47+
{{- $opt := "-Dspring.cloud.nacos.config.enabled=true" -}}
48+
{{- $opt = cat $opt "-Dspring.cloud.nacos.discovery.enabled=true" -}}
49+
{{- $opt = cat $opt ( printf "-Dspring.cloud.nacos.config.server-addr=%s -Dspring.cloud.nacos.discovery.server-addr=%s" .Values.global.microservices.nacos.registryAddr .Values.global.microservices.nacos.registryAddr ) -}}
50+
{{- $opt = cat $opt ( printf "-Dspring.cloud.nacos.discovery.namespace=%s" .Values.global.microservices.nacos.registryNamespace ) -}}
51+
{{- $opt = cat $opt ( printf "-Dspring.cloud.nacos.discovery.group=%s" .Values.global.microservices.nacos.registryServiceGroup ) -}}
52+
{{- $opt = cat $opt ( printf "-Dspring.cloud.nacos.discovery.cluster-name=%s" .Values.global.microservices.nacos.registryInstanceGroup ) -}}
5353

5454
{{/* check username and password */}}
5555
{{- if ne .Values.global.microservices.nacos.username "" }}
56-
{{- $opt = cat $opt ( printf "-Dspring.cloud.nacos.config.username=%s -Dspring.cloud.nacos.discovery.username=%s" .Values.global.microservices.nacos.username .Values.global.microservices.nacos.username ) " " -}}
56+
{{- $opt = cat $opt ( printf "-Dspring.cloud.nacos.config.username=%s -Dspring.cloud.nacos.discovery.username=%s" .Values.global.microservices.nacos.username .Values.global.microservices.nacos.username ) -}}
5757
{{- end }}
5858
{{- if ne .Values.global.microservices.nacos.password "" }}
59-
{{- $opt = cat $opt ( printf "-Dspring.cloud.nacos.config.password=%s -Dspring.cloud.nacos.discovery.password=%s" .Values.global.microservices.nacos.password .Values.global.microservices.nacos.password ) " " -}}
59+
{{- $opt = cat $opt ( printf "-Dspring.cloud.nacos.config.password=%s -Dspring.cloud.nacos.discovery.password=%s" .Values.global.microservices.nacos.password .Values.global.microservices.nacos.password ) -}}
6060
{{- end }}
6161

6262
{{/* metadata k8s */}}
63-
{{- $opt = cat $opt "-Dspring.cloud.nacos.discovery.metadata.k8s_cluster_id=xxx -Dspring.cloud.nacos.discovery.metadata.k8s_cluster_name=xxx" " " -}}
63+
{{- $opt = cat $opt "-Dspring.cloud.nacos.discovery.metadata.k8s_cluster_id=xxx -Dspring.cloud.nacos.discovery.metadata.k8s_cluster_name=xxx" -}}
6464

65-
{{- $opt = cat $opt "-Dspring.cloud.nacos.discovery.metadata.k8s_namespace_name=$(K8S_NAMESPACE)" " " -}}
66-
{{- $opt = cat $opt "-Dspring.cloud.nacos.discovery.metadata.k8s_workload_type=deployment" " " -}}
67-
{{- $opt = cat $opt "-Dspring.cloud.nacos.discovery.metadata.k8s_workload_nam=$(OTEL_SERVICE_NAME)" " " -}}
68-
{{- $opt = cat $opt "-Dspring.cloud.nacos.discovery.metadata.k8s_service_name=$(OTEL_SERVICE_NAME)" " " -}}
69-
{{- $opt = cat $opt "-Dspring.cloud.nacos.discovery.metadata.k8s_pod_name=$(OTEL_RESOURCE_ATTRIBUTES_POD_NAME)" " " -}}
65+
{{- $opt = cat $opt "-Dspring.cloud.nacos.discovery.metadata.k8s_namespace_name=$(K8S_NAMESPACE)" -}}
66+
{{- $opt = cat $opt "-Dspring.cloud.nacos.discovery.metadata.k8s_workload_type=deployment" -}}
67+
{{- $opt = cat $opt "-Dspring.cloud.nacos.discovery.metadata.k8s_workload_nam=$(OTEL_SERVICE_NAME)" -}}
68+
{{- $opt = cat $opt "-Dspring.cloud.nacos.discovery.metadata.k8s_service_name=$(OTEL_SERVICE_NAME)" -}}
69+
{{- $opt = cat $opt "-Dspring.cloud.nacos.discovery.metadata.k8s_pod_name=$(OTEL_RESOURCE_ATTRIBUTES_POD_NAME)" -}}
7070
{{- $opt -}}
7171
{{- else }}
7272
-Dspring.cloud.nacos.config.enabled=false -Dspring.cloud.nacos.discovery.enabled=false
@@ -95,14 +95,19 @@ java dataservice opt
9595
common java adService opt bug
9696
*/}}
9797
{{- define "java.adservice.opt" -}}
98-
{{- $opt := "-javaagent:./jmx_prometheus_javaagent-0.17.0.jar=12345:./prometheus-jmx-config.yaml " -}}
99-
{{- $opt = cat $opt "-Dotel.metrics.exporter=prometheus" " " -}}
100-
{{- $opt = cat $opt "-Dmeter.port=8888" " " -}}
101-
{{- $opt = cat $opt "-Dotel.exporter.prometheus.port=9464" " " -}}
102-
{{- $opt = cat $opt "-Dspring.dataService.enabled=true" " " -}}
103-
{{- $opt = cat $opt "-Dspring.extraAdLabel=Daocloud" " " -}}
104-
{{- $opt = cat $opt "-Dspring.randomError=false" " " -}}
105-
{{- $opt = cat $opt "-Dspring.matrixRow=200" " " -}}
98+
{{- $opt := "-Dmeter.port=8888" -}}
99+
100+
{{/* check jvm */}}
101+
{{- if .Values.global.observability.adServiceJVMEnable }}
102+
{{- $opt = cat $opt "-javaagent:./jmx_prometheus_javaagent-0.17.0.jar=12345:./prometheus-jmx-config.yaml" -}}
103+
{{- $opt = cat $opt "-Dotel.metrics.exporter=prometheus" -}}
104+
{{- $opt = cat $opt "-Dotel.exporter.prometheus.port=9464" -}}
105+
{{- end }}
106+
107+
{{- $opt = cat $opt "-Dspring.dataService.enabled=true" -}}
108+
{{- $opt = cat $opt "-Dspring.extraAdLabel=Daocloud" -}}
109+
{{- $opt = cat $opt "-Dspring.randomError=false" -}}
110+
{{- $opt = cat $opt "-Dspring.matrixRow=200" -}}
106111
{{- $opt = cat $opt ( include "java.common.opt" . ) ( include "java.nacos.opt" . ) ( include "java.sentinel.opt" . ) -}}
107112
{{- $opt -}}
108113
{{- end }}

‎charts/opentelemetry-demo-lite/templates/serviceMonitor/adservice-service-monitor.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ metadata:
88
spec:
99
endpoints:
1010
- honorLabels: true
11-
port: http-metrics
11+
port: jmx-metrics
12+
- honorLabels: true
13+
port: custom-metrics
1214
- honorLabels: true
1315
port: jvm-metrics
1416
namespaceSelector:

‎charts/opentelemetry-demo-lite/values.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,10 +139,10 @@ extensions:
139139
- name: health-http
140140
containerPort: 8999
141141
protocol: TCP
142-
- name: metrics
142+
- name: jmx-metrics
143143
containerPort: 12345
144144
protocol: TCP
145-
- name: http-metrics
145+
- name: custom-metrics
146146
containerPort: 8888
147147
protocol: TCP
148148
- name: jvm-metrics

0 commit comments

Comments
 (0)