Skip to content

Commit 967c15e

Browse files
onobconobc
authored
Update metric prop names env vars (spring-attic#5894)
The previous commits for updating metric names to the Boot 3.x format missed some env vars. This commit updates the env vars as well.
1 parent 8c2b07f commit 967c15e

10 files changed

+48
-48
lines changed

‎src/carvel/config/dataflow.star

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ def dataflow_container_env():
4141
envs.extend([{"name": "SPRING_JPA_DATABASE_PLATFORM", "value": dataflow_db_dialect()}])
4242
end
4343
if grafana_enabled():
44-
envs.extend([{"name": "MANAGEMENT_METRICS_EXPORT_PROMETHEUS_ENABLED", "value": "true"}])
44+
envs.extend([{"name": "MANAGEMENT_PROMETHEUS_METRICS_EXPORT_ENABLED", "value": "true"}])
4545
end
4646
if prometheus_rsocket_proxy_enabled():
47-
envs.extend([{"name": "MANAGEMENT_METRICS_EXPORT_PROMETHEUS_RSOCKET_ENABLED", "value": "true"}])
47+
envs.extend([{"name": "MANAGEMENT_PROMETHEUS_METRICS_EXPORT_RSOCKET_ENABLED", "value": "true"}])
4848
end
4949
if non_empty_string(data.values.scdf.server.database.secretName):
5050
if non_empty_string(data.values.scdf.server.database.secretUsernameKey):
@@ -105,4 +105,4 @@ end
105105

106106
def dataflow_has_password():
107107
return non_empty_string(data.values.scdf.server.database.password)
108-
end
108+
end

‎src/carvel/config/skipper.star

+3-3
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ def skipper_container_env():
5959
end
6060
end
6161
if grafana_enabled():
62-
envs.extend([{"name": "MANAGEMENT_METRICS_EXPORT_PROMETHEUS_ENABLED", "value": "true"}])
62+
envs.extend([{"name": "MANAGEMENT_PROMETHEUS_METRICS_EXPORT_ENABLED", "value": "true"}])
6363
end
6464
if prometheus_rsocket_proxy_enabled():
65-
envs.extend([{"name": "MANAGEMENT_METRICS_EXPORT_PROMETHEUS_RSOCKET_ENABLED", "value": "true"}])
65+
envs.extend([{"name": "MANAGEMENT_PROMETHEUS_METRICS_EXPORT_RSOCKET_ENABLED", "value": "true"}])
6666
end
6767
for e in data.values.scdf.skipper.env:
6868
envs.extend([{"name": e.name, "value": e.value}])
@@ -88,4 +88,4 @@ end
8888

8989
def skipper_has_password():
9090
return non_empty_string(data.values.scdf.skipper.database.password)
91-
end
91+
end

‎src/carvel/test/servers.test.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -300,11 +300,11 @@ describe('servers', () => {
300300
expect(envs).toEqual(
301301
expect.arrayContaining([
302302
expect.objectContaining({
303-
name: 'MANAGEMENT_METRICS_EXPORT_PROMETHEUS_ENABLED',
303+
name: 'MANAGEMENT_PROMETHEUS_METRICS_EXPORT_ENABLED',
304304
value: 'true'
305305
}),
306306
expect.objectContaining({
307-
name: 'MANAGEMENT_METRICS_EXPORT_PROMETHEUS_RSOCKET_ENABLED',
307+
name: 'MANAGEMENT_PROMETHEUS_METRICS_EXPORT_RSOCKET_ENABLED',
308308
value: 'true'
309309
})
310310
])
@@ -454,8 +454,8 @@ describe('servers', () => {
454454
expect(envs).toBeTruthy();
455455
expect(envs).toEqual(
456456
expect.arrayContaining([
457-
expect.objectContaining({ name: 'MANAGEMENT_METRICS_EXPORT_PROMETHEUS_ENABLED', value: 'true' }),
458-
expect.objectContaining({ name: 'MANAGEMENT_METRICS_EXPORT_PROMETHEUS_RSOCKET_ENABLED', value: 'true' })
457+
expect.objectContaining({ name: 'MANAGEMENT_PROMETHEUS_METRICS_EXPORT_ENABLED', value: 'true' }),
458+
expect.objectContaining({ name: 'MANAGEMENT_PROMETHEUS_METRICS_EXPORT_RSOCKET_ENABLED', value: 'true' })
459459
])
460460
);
461461
});

‎src/deploy/k8s/yaml/server-deployment.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,9 @@ spec:
128128
configMapKeyRef:
129129
key: SPRING_JPA_DATABASE_PLATFORM
130130
name: scdf-datasource
131-
- name: 'MANAGEMENT_METRICS_EXPORT_PROMETHEUS_ENABLED'
131+
- name: 'MANAGEMENT_PROMETHEUS_METRICS_EXPORT_ENABLED'
132132
value: 'true'
133-
- name: 'MANAGEMENT_METRICS_EXPORT_PROMETHEUS_RSOCKET_ENABLED'
133+
- name: 'MANAGEMENT_PROMETHEUS_METRICS_EXPORT_RSOCKET_ENABLED'
134134
value: 'true'
135135
- name: 'SPRING_CLOUD_DATAFLOW_METRICS_DASHBOARD_URL'
136136
value: 'http://localhost:3000'

‎src/deploy/k8s/yaml/skipper-deployment-pro.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,9 @@ spec:
115115
configMapKeyRef:
116116
key: SPRING_JPA_DATABASE_PLATFORM
117117
name: scdf-datasource
118-
- name: MANAGEMENT_METRICS_EXPORT_PROMETHEUS_ENABLED
118+
- name: MANAGEMENT_PROMETHEUS_METRICS_EXPORT_ENABLED
119119
value: 'true'
120-
- name: MANAGEMENT_METRICS_EXPORT_PROMETHEUS_RSOCKET_ENABLED
120+
- name: MANAGEMENT_PROMETHEUS_METRICS_EXPORT_RSOCKET_ENABLED
121121
value: 'true'
122122
serviceAccountName: scdf-sa
123123
volumes:

‎src/deploy/k8s/yaml/skipper-deployment.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,9 @@ spec:
115115
configMapKeyRef:
116116
key: SPRING_JPA_DATABASE_PLATFORM
117117
name: scdf-datasource
118-
- name: MANAGEMENT_METRICS_EXPORT_PROMETHEUS_ENABLED
118+
- name: MANAGEMENT_PROMETHEUS_METRICS_EXPORT_ENABLED
119119
value: 'true'
120-
- name: MANAGEMENT_METRICS_EXPORT_PROMETHEUS_RSOCKET_ENABLED
120+
- name: MANAGEMENT_PROMETHEUS_METRICS_EXPORT_RSOCKET_ENABLED
121121
value: 'true'
122122
serviceAccountName: scdf-sa
123123
volumes:

‎src/docker-compose/docker-compose-prometheus.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@ services:
66

77
dataflow-server:
88
environment:
9-
- MANAGEMENT_METRICS_EXPORT_PROMETHEUS_ENABLED=true
10-
- MANAGEMENT_METRICS_EXPORT_PROMETHEUS_RSOCKET_ENABLED=true
11-
- MANAGEMENT_METRICS_EXPORT_PROMETHEUS_RSOCKET_HOST=prometheus-rsocket-proxy
12-
- MANAGEMENT_METRICS_EXPORT_PROMETHEUS_RSOCKET_PORT=7001
9+
- MANAGEMENT_PROMETHEUS_METRICS_EXPORT_ENABLED=true
10+
- MANAGEMENT_PROMETHEUS_METRICS_EXPORT_RSOCKET_ENABLED=true
11+
- MANAGEMENT_PROMETHEUS_METRICS_EXPORT_RSOCKET_HOST=prometheus-rsocket-proxy
12+
- MANAGEMENT_PROMETHEUS_METRICS_EXPORT_RSOCKET_PORT=7001
1313
#- SPRING_APPLICATION_JSON={"spring.jpa.properties.hibernate.generate_statistics":true}
1414
- SPRING_CLOUD_DATAFLOW_METRICS_DASHBOARD_URL=http://localhost:3000
1515

1616
skipper-server:
1717
environment:
18-
- MANAGEMENT_METRICS_EXPORT_PROMETHEUS_ENABLED=true
19-
- MANAGEMENT_METRICS_EXPORT_PROMETHEUS_RSOCKET_ENABLED=true
20-
- MANAGEMENT_METRICS_EXPORT_PROMETHEUS_RSOCKET_HOST=prometheus-rsocket-proxy
21-
- MANAGEMENT_METRICS_EXPORT_PROMETHEUS_RSOCKET_PORT=7001
18+
- MANAGEMENT_PROMETHEUS_METRICS_EXPORT_ENABLED=true
19+
- MANAGEMENT_PROMETHEUS_METRICS_EXPORT_RSOCKET_ENABLED=true
20+
- MANAGEMENT_PROMETHEUS_METRICS_EXPORT_RSOCKET_HOST=prometheus-rsocket-proxy
21+
- MANAGEMENT_PROMETHEUS_METRICS_EXPORT_RSOCKET_PORT=7001
2222
#- SPRING_APPLICATION_JSON={"spring.jpa.properties.hibernate.generate_statistics":true}
2323

2424
prometheus-rsocket-proxy:

‎src/docker-compose/docker-compose-wavefront.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ version: '3'
1010
services:
1111
dataflow-server:
1212
environment:
13-
- MANAGEMENT_METRICS_EXPORT_WAVEFRONT_ENABLED=true
14-
- MANAGEMENT_METRICS_EXPORT_WAVEFRONT_APITOKEN=${WAVEFRONT_KEY:?WAVEFRONT_KEY is not set!}
15-
- MANAGEMENT_METRICS_EXPORT_WAVEFRONT_URI=${WAVEFRONT_URI:-https://vmware.wavefront.com}
16-
- MANAGEMENT_METRICS_EXPORT_WAVEFRONT_SOURCE=${WAVEFRONT_SOURCE:-scdf-docker-compose}
13+
- MANAGEMENT_WAVEFRONT_METRICS_EXPORT_ENABLED=true
14+
- MANAGEMENT_WAVEFRONT_METRICS_EXPORT_APITOKEN=${WAVEFRONT_KEY:?WAVEFRONT_KEY is not set!}
15+
- MANAGEMENT_WAVEFRONT_METRICS_EXPORT_URI=${WAVEFRONT_URI:-https://vmware.wavefront.com}
16+
- MANAGEMENT_WAVEFRONT_METRICS_EXPORT_SOURCE=${WAVEFRONT_SOURCE:-scdf-docker-compose}
1717
- SPRING_APPLICATION_JSON={"spring.jpa.properties.hibernate.generate_statistics":true}
1818

1919
skipper-server:
2020
environment:
21-
- MANAGEMENT_METRICS_EXPORT_WAVEFRONT_ENABLED=true
22-
- MANAGEMENT_METRICS_EXPORT_WAVEFRONT_APITOKEN=${WAVEFRONT_KEY:?WAVEFRONT_KEY is not set!}
23-
- MANAGEMENT_METRICS_EXPORT_WAVEFRONT_URI=${WAVEFRONT_URI:-https://vmware.wavefront.com}
24-
- MANAGEMENT_METRICS_EXPORT_WAVEFRONT_SOURCE=${WAVEFRONT_SOURCE:-scdf-docker-compose}
21+
- MANAGEMENT_WAVEFRONT_METRICS_EXPORT_ENABLED=true
22+
- MANAGEMENT_WAVEFRONT_METRICS_EXPORT_APITOKEN=${WAVEFRONT_KEY:?WAVEFRONT_KEY is not set!}
23+
- MANAGEMENT_WAVEFRONT_METRICS_EXPORT_URI=${WAVEFRONT_URI:-https://vmware.wavefront.com}
24+
- MANAGEMENT_WAVEFRONT_METRICS_EXPORT_SOURCE=${WAVEFRONT_SOURCE:-scdf-docker-compose}
2525
- SPRING_APPLICATION_JSON={"spring.jpa.properties.hibernate.generate_statistics":true}

‎src/templates/docker-compose/docker-compose-prometheus.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@ services:
66

77
dataflow-server:
88
environment:
9-
- MANAGEMENT_METRICS_EXPORT_PROMETHEUS_ENABLED=true
10-
- MANAGEMENT_METRICS_EXPORT_PROMETHEUS_RSOCKET_ENABLED=true
11-
- MANAGEMENT_METRICS_EXPORT_PROMETHEUS_RSOCKET_HOST=prometheus-rsocket-proxy
12-
- MANAGEMENT_METRICS_EXPORT_PROMETHEUS_RSOCKET_PORT=7001
9+
- MANAGEMENT_PROMETHEUS_METRICS_EXPORT_ENABLED=true
10+
- MANAGEMENT_PROMETHEUS_METRICS_EXPORT_RSOCKET_ENABLED=true
11+
- MANAGEMENT_PROMETHEUS_METRICS_EXPORT_RSOCKET_HOST=prometheus-rsocket-proxy
12+
- MANAGEMENT_PROMETHEUS_METRICS_EXPORT_RSOCKET_PORT=7001
1313
#- SPRING_APPLICATION_JSON={"spring.jpa.properties.hibernate.generate_statistics":true}
1414
- SPRING_CLOUD_DATAFLOW_METRICS_DASHBOARD_URL=http://localhost:3000
1515

1616
skipper-server:
1717
environment:
18-
- MANAGEMENT_METRICS_EXPORT_PROMETHEUS_ENABLED=true
19-
- MANAGEMENT_METRICS_EXPORT_PROMETHEUS_RSOCKET_ENABLED=true
20-
- MANAGEMENT_METRICS_EXPORT_PROMETHEUS_RSOCKET_HOST=prometheus-rsocket-proxy
21-
- MANAGEMENT_METRICS_EXPORT_PROMETHEUS_RSOCKET_PORT=7001
18+
- MANAGEMENT_PROMETHEUS_METRICS_EXPORT_ENABLED=true
19+
- MANAGEMENT_PROMETHEUS_METRICS_EXPORT_RSOCKET_ENABLED=true
20+
- MANAGEMENT_PROMETHEUS_METRICS_EXPORT_RSOCKET_HOST=prometheus-rsocket-proxy
21+
- MANAGEMENT_PROMETHEUS_METRICS_EXPORT_RSOCKET_PORT=7001
2222
#- SPRING_APPLICATION_JSON={"spring.jpa.properties.hibernate.generate_statistics":true}
2323

2424
prometheus-rsocket-proxy:

‎src/templates/docker-compose/docker-compose-wavefront.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ version: '3'
1010
services:
1111
dataflow-server:
1212
environment:
13-
- MANAGEMENT_METRICS_EXPORT_WAVEFRONT_ENABLED=true
14-
- MANAGEMENT_METRICS_EXPORT_WAVEFRONT_APITOKEN=${WAVEFRONT_KEY:?WAVEFRONT_KEY is not set!}
15-
- MANAGEMENT_METRICS_EXPORT_WAVEFRONT_URI=${WAVEFRONT_URI:-https://vmware.wavefront.com}
16-
- MANAGEMENT_METRICS_EXPORT_WAVEFRONT_SOURCE=${WAVEFRONT_SOURCE:-scdf-docker-compose}
13+
- MANAGEMENT_WAVEFRONT_METRICS_EXPORT_ENABLED=true
14+
- MANAGEMENT_WAVEFRONT_METRICS_EXPORT_APITOKEN=${WAVEFRONT_KEY:?WAVEFRONT_KEY is not set!}
15+
- MANAGEMENT_WAVEFRONT_METRICS_EXPORT_URI=${WAVEFRONT_URI:-https://vmware.wavefront.com}
16+
- MANAGEMENT_WAVEFRONT_METRICS_EXPORT_SOURCE=${WAVEFRONT_SOURCE:-scdf-docker-compose}
1717
- SPRING_APPLICATION_JSON={"spring.jpa.properties.hibernate.generate_statistics":true}
1818

1919
skipper-server:
2020
environment:
21-
- MANAGEMENT_METRICS_EXPORT_WAVEFRONT_ENABLED=true
22-
- MANAGEMENT_METRICS_EXPORT_WAVEFRONT_APITOKEN=${WAVEFRONT_KEY:?WAVEFRONT_KEY is not set!}
23-
- MANAGEMENT_METRICS_EXPORT_WAVEFRONT_URI=${WAVEFRONT_URI:-https://vmware.wavefront.com}
24-
- MANAGEMENT_METRICS_EXPORT_WAVEFRONT_SOURCE=${WAVEFRONT_SOURCE:-scdf-docker-compose}
21+
- MANAGEMENT_WAVEFRONT_METRICS_EXPORT_ENABLED=true
22+
- MANAGEMENT_WAVEFRONT_METRICS_EXPORT_APITOKEN=${WAVEFRONT_KEY:?WAVEFRONT_KEY is not set!}
23+
- MANAGEMENT_WAVEFRONT_METRICS_EXPORT_URI=${WAVEFRONT_URI:-https://vmware.wavefront.com}
24+
- MANAGEMENT_WAVEFRONT_METRICS_EXPORT_SOURCE=${WAVEFRONT_SOURCE:-scdf-docker-compose}
2525
- SPRING_APPLICATION_JSON={"spring.jpa.properties.hibernate.generate_statistics":true}

0 commit comments

Comments
 (0)