Skip to content

Commit f3600ab

Browse files
duanhongyiduanhongyi
committed
Merge branch 'main' of github.com:drycc/monitor into main
2 parents d0be0f6 + 5ab64bb commit f3600ab

7 files changed

Lines changed: 3817 additions & 3517 deletions

File tree

‎charts/monitor/templates/_helpers.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ env:
99
key: url
1010
{{- else }}
1111
- name: "INFLUXDB_URL"
12-
value: http://$(DRYCC_INFLUXDB_SERVICE_HOST):$(DRYCC_INFLUXDB_SERVICE_PORT_TRANSPORT)
12+
value: http://$(DRYCC_INFLUXDB_SERVICE_HOST):$(DRYCC_INFLUXDB_SERVICE_PORT)
1313
{{- end }}
1414
- name: "INFLUXDB_BUCKET"
1515
valueFrom:

‎charts/monitor/templates/monitor-telegraf-daemon.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ spec:
4242
key: url
4343
{{- else }}
4444
- name: "INFLUXDB_URLS_V2"
45-
value: "\"http://$(DRYCC_INFLUXDB_SERVICE_HOST):$(DRYCC_INFLUXDB_SERVICE_PORT_TRANSPORT)\""
45+
value: "\"http://$(DRYCC_INFLUXDB_SERVICE_HOST):$(DRYCC_INFLUXDB_SERVICE_PORT)\""
4646
- name: "INFLUXDB_V2_INPUT_URLS"
47-
value: "\"http://$(DRYCC_INFLUXDB_SERVICE_HOST):$(DRYCC_INFLUXDB_SERVICE_PORT_TRANSPORT)/metrics\""
47+
value: "\"http://$(DRYCC_INFLUXDB_SERVICE_HOST):$(DRYCC_INFLUXDB_SERVICE_PORT)/metrics\""
4848
- name: "ENABLE_INFLUXDB_V2_INPUT"
4949
value: "true"
5050
{{- end }}
@@ -75,9 +75,9 @@ spec:
7575
key: url
7676
{{- else }}
7777
- name: "INFLUXDB_URLS_V2"
78-
value: "\"http://$(DRYCC_INFLUXDB_SERVICE_HOST):$(DRYCC_INFLUXDB_SERVICE_PORT_TRANSPORT)\""
78+
value: "\"http://$(DRYCC_INFLUXDB_SERVICE_HOST):$(DRYCC_INFLUXDB_SERVICE_PORT)\""
7979
- name: "INFLUXDB_V2_INPUT_URLS"
80-
value: "\"http://$(DRYCC_INFLUXDB_SERVICE_HOST):$(DRYCC_INFLUXDB_SERVICE_PORT_TRANSPORT)/metrics\""
80+
value: "\"http://$(DRYCC_INFLUXDB_SERVICE_HOST):$(DRYCC_INFLUXDB_SERVICE_PORT)/metrics\""
8181
- name: "ENABLE_INFLUXDB_V2_INPUT"
8282
value: "true"
8383
{{- end }}

‎charts/monitor/templates/monitor-telegraf-deployment.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ spec:
4747
key: url
4848
{{- else }}
4949
- name: "INFLUXDB_URLS_V2"
50-
value: "\"http://$(DRYCC_INFLUXDB_SERVICE_HOST):$(DRYCC_INFLUXDB_SERVICE_PORT_TRANSPORT)\""
50+
value: "\"http://$(DRYCC_INFLUXDB_SERVICE_HOST):$(DRYCC_INFLUXDB_SERVICE_PORT)\""
5151
- name: "INFLUXDB_V2_INPUT_URLS"
52-
value: "\"http://$(DRYCC_INFLUXDB_SERVICE_HOST):$(DRYCC_INFLUXDB_SERVICE_PORT_TRANSPORT)/metrics\""
52+
value: "\"http://$(DRYCC_INFLUXDB_SERVICE_HOST):$(DRYCC_INFLUXDB_SERVICE_PORT)/metrics\""
5353
- name: "ENABLE_INFLUXDB_V2_INPUT"
5454
value: "true"
5555
{{- end }}
@@ -80,9 +80,9 @@ spec:
8080
key: url
8181
{{- else }}
8282
- name: "INFLUXDB_URLS_V2"
83-
value: "\"http://$(DRYCC_INFLUXDB_SERVICE_HOST):$(DRYCC_INFLUXDB_SERVICE_PORT_TRANSPORT)\""
83+
value: "\"http://$(DRYCC_INFLUXDB_SERVICE_HOST):$(DRYCC_INFLUXDB_SERVICE_PORT)\""
8484
- name: "INFLUXDB_V2_INPUT_URLS"
85-
value: "\"http://$(DRYCC_INFLUXDB_SERVICE_HOST):$(DRYCC_INFLUXDB_SERVICE_PORT_TRANSPORT)/metrics\""
85+
value: "\"http://$(DRYCC_INFLUXDB_SERVICE_HOST):$(DRYCC_INFLUXDB_SERVICE_PORT)/metrics\""
8686
- name: "ENABLE_INFLUXDB_V2_INPUT"
8787
value: "true"
8888
{{- end }}

0 commit comments

Comments
 (0)