Skip to content

Commit 1ad95e2

Browse files
authored
Use tcp prefix for metrics exporter (#2408)
1 parent 088f5d4 commit 1ad95e2

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

operator/src/main/java/oracle/kubernetes/operator/helpers/PodStepContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1337,7 +1337,7 @@ private V1Container createMonitoringExporterContainer() {
13371337
}
13381338

13391339
private String getMetricsPortName() {
1340-
return getDomain().isIstioEnabled() ? "http-metrics" : "metrics";
1340+
return getDomain().isIstioEnabled() ? "tcp-metrics" : "metrics";
13411341
}
13421342

13431343
private String createJavaOptions() {

operator/src/main/java/oracle/kubernetes/operator/helpers/ServiceHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ void addServicePorts(List<V1ServicePort> ports, WlsServerConfig serverConfig) {
426426
}
427427

428428
private String getMetricsPortName() {
429-
return getDomain().isIstioEnabled() ? "http-metrics" : "metrics";
429+
return getDomain().isIstioEnabled() ? "tcp-metrics" : "metrics";
430430
}
431431

432432
List<NetworkAccessPoint> getNetworkAccessPoints(@Nonnull WlsServerConfig config) {

operator/src/main/java/oracle/kubernetes/operator/steps/MonitoringExporterSteps.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ Domain getDomain() {
278278
}
279279

280280
private String getMetricsPortName() {
281-
return getDomain().isIstioEnabled() ? "http-metrics" : "metrics";
281+
return getDomain().isIstioEnabled() ? "tcp-metrics" : "metrics";
282282
}
283283

284284
private HttpRequest createConfigurationQueryRequest() {

operator/src/test/java/oracle/kubernetes/operator/helpers/ManagerServerServiceHelperTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,6 @@ void whenDomainHasMonitoringExporterConfigurationAndIstio_serviceHasExporterPort
8383

8484
V1Service service = createService();
8585

86-
assertThat(service, containsPort("http-metrics", DEFAULT_EXPORTER_SIDECAR_PORT));
86+
assertThat(service, containsPort("tcp-metrics", DEFAULT_EXPORTER_SIDECAR_PORT));
8787
}
8888
}

operator/src/test/java/oracle/kubernetes/operator/helpers/PodHelperTestBase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ void whenExporterContainerCreatedWithPort_hasMetricsPortsItem() {
453453
void whenExporterContainerCreatedAndIstioEnabled_hasMetricsPortsItem() {
454454
defineExporterConfiguration().withIstio();
455455

456-
V1ContainerPort metricsPort = getExporterContainerPort("http-metrics");
456+
V1ContainerPort metricsPort = getExporterContainerPort("tcp-metrics");
457457
assertThat(metricsPort, notNullValue());
458458
assertThat(metricsPort.getProtocol(), equalTo("TCP"));
459459
assertThat(metricsPort.getContainerPort(), equalTo(DEFAULT_EXPORTER_SIDECAR_PORT));

0 commit comments

Comments
 (0)