Update ports used for Prometheus

wso2 · Mar 6, 2024 · 826c877 · 826c877
1 parent c4be1ed
commit 826c877
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 15 deletions.
diff --git a/common-controller/internal/config/default_config.go b/common-controller/internal/config/default_config.go
@@ -46,7 +46,7 @@ var defaultConfig = &Config{
 		Metrics: metrics{
 			Enabled: false,
 			Type:    "prometheus",
-			Port:    18010,
+			Port:    18006,
 		},
 	},
 }
diff --git a/helm-charts/templates/data-plane/config-deployer/config-ds-configmap.yaml b/helm-charts/templates/data-plane/config-deployer/config-ds-configmap.yaml
@@ -31,7 +31,7 @@ data:
     metricsEnabled=true
     metricsReporter="prometheus"
     [ballerinax.prometheus]
-    port=18008
+    port=18006
   {{if .Values.wso2.apk.metrics.configDSBalHost}}
     host="{{ .Values.wso2.apk.metrics.configDSBalHost}}"
   {{else}} 

diff --git a/helm-charts/templates/data-plane/config-deployer/config-ds-deployment.yaml b/helm-charts/templates/data-plane/config-deployer/config-ds-deployment.yaml
@@ -43,9 +43,9 @@ spec:
             - containerPort: 9443
               protocol: "TCP"
             {{ if and .Values.wso2.apk.metrics .Values.wso2.apk.metrics.enabled }}
-            - containerPort: 18008
+            - containerPort: 18006
               protocol: "TCP"
-            - containerPort: 18009
+            - containerPort: 18007
               protocol: "TCP"
             {{ end }}
           readinessProbe:

diff --git a/...mplates/data-plane/gateway-components/common-controller/common-controller-deployment.yaml b/...mplates/data-plane/gateway-components/common-controller/common-controller-deployment.yaml
@@ -49,7 +49,7 @@ spec:
             - containerPort: 18003
               protocol: TCP
             {{ if and .Values.wso2.apk.metrics .Values.wso2.apk.metrics.enabled }}
-            - containerPort: 18010
+            - containerPort: 18006
               protocol: "TCP"
             {{ end }}
 {{ include "apk-helm.deployment.resources" .Values.wso2.apk.dp.commonController.deployment.resources | indent 10 }}

diff --git a/helm-charts/templates/data-plane/gateway-components/common-log-conf.yaml b/helm-charts/templates/data-plane/gateway-components/common-log-conf.yaml
@@ -14,7 +14,7 @@ data:
     [commoncontroller.metrics]
       enabled = {{.Values.wso2.apk.metrics.enabled}}
       type = "{{.Values.wso2.apk.metrics.type| default "prometheus" }}"
-      port = 18010
+      port = 18006
     {{ end}}  
     [commoncontroller.server]
       label = "ratelimiter"

diff --git a/...s/templates/data-plane/gateway-components/gateway-runtime/gateway-runtime-deployment.yaml b/...s/templates/data-plane/gateway-components/gateway-runtime/gateway-runtime-deployment.yaml
@@ -53,7 +53,7 @@ spec:
             - containerPort: 18002
               protocol: "TCP"
             {{- if and .Values.wso2.apk.metrics .Values.wso2.apk.metrics.enabled}}
-            - containerPort: 18007
+            - containerPort: 18006
               protocol: "TCP"
             {{- end }}
 {{ include "apk-helm.deployment.resources" .Values.wso2.apk.dp.gatewayRuntime.deployment.enforcer.resources | indent 10 }}
@@ -92,7 +92,7 @@ spec:
               value: admin
             - name: JAVA_OPTS
             {{- if and .Values.wso2.apk.metrics .Values.wso2.apk.metrics.enabled }}
-              value: -Dhttpclient.hostnameVerifier=AllowAll -Xms512m -Xmx512m -XX:MaxRAMFraction=2 -Dapk.jmx.metrics.enabled=true -javaagent:/home/wso2/lib/jmx_prometheus_javaagent-0.20.0.jar=18007:/tmp/metrics/prometheus-jmx-config-enforcer.yml
+              value: -Dhttpclient.hostnameVerifier=AllowAll -Xms512m -Xmx512m -XX:MaxRAMFraction=2 -Dapk.jmx.metrics.enabled=true -javaagent:/home/wso2/lib/jmx_prometheus_javaagent-0.20.0.jar=18006:/tmp/metrics/prometheus-jmx-config-enforcer.yml
             {{- else }}
               value: -Dhttpclient.hostnameVerifier=AllowAll -Xms512m -Xmx512m -XX:MaxRAMFraction=2
             {{- end }}

diff --git a/helm-charts/templates/idp/idp-ds/idp-ds-configmap.yaml b/helm-charts/templates/idp/idp-ds/idp-ds-configmap.yaml
@@ -31,7 +31,7 @@ data:
     metricsEnabled=true
     metricsReporter="prometheus"
     [ballerinax.prometheus]
-    port=18011
+    port=18006
     {{if .Values.wso2.apk.metrics.idpDSBalHost}}
     host="{{ .Values.wso2.apk.metrics.idpDSBalHost}}"
     {{else}} 

diff --git a/helm-charts/templates/idp/idp-ds/idp-ds-deployment.yaml b/helm-charts/templates/idp/idp-ds/idp-ds-deployment.yaml
@@ -52,9 +52,9 @@ spec:
             - containerPort: 9443
               protocol: "TCP"
             {{ if and .Values.wso2.apk.metrics .Values.wso2.apk.metrics.enabled }}
-            - containerPort: 18011
+            - containerPort: 18006
               protocol: "TCP"
-            - containerPort: 18012
+            - containerPort: 18007
               protocol: "TCP"
             {{ end }}
           readinessProbe:

diff --git a/idp/idp-domain-service/build.gradle b/idp/idp-domain-service/build.gradle
@@ -36,7 +36,7 @@ release {
 unSnapshotVersion.finalizedBy ":ballerina:commit_toml_files"
 afterReleaseBuild.dependsOn ":docker:docker_push"
 task build{
- dependsOn("docker:build")
+ dependsOn("docker:buildDockerImage")
 }
 build.configure {
     dependsOn(":docker:build")

diff --git a/idp/idp-domain-service/docker/build.gradle b/idp/idp-domain-service/docker/build.gradle
@@ -59,4 +59,4 @@ task buildDockerImage{
 buildDockerImage.configure{
     mustRunAfter(":ballerina:build")
     dependsOn(":ballerina:build")
-    }
+}
diff --git a/idp/idp-domain-service/docker/idp/idp.sh b/idp/idp-domain-service/docker/idp/idp.sh
@@ -102,6 +102,6 @@ $JAVACMD \
   $JAVA_OPTS \
   -classpath "$CLASSPATH" \
   -Djava.io.tmpdir="$IDP_HOME/tmp" \
-  -javaagent:/home/wso2apk/jmx_prometheus_javaagent-0.20.0.jar=18012:/tmp/metrics/prometheus-jmx-config-idpds.yml \
+  -javaagent:/home/wso2apk/lib/jmx_prometheus_javaagent-0.20.0.jar=18007:/tmp/metrics/prometheus-jmx-config-idpds.yml \
   -jar idp_domain_service.jar $*
 status=$?
diff --git a/runtime/config-deployer-service/docker/config-deployer/config.sh b/runtime/config-deployer-service/docker/config-deployer/config.sh
@@ -103,6 +103,6 @@ $JAVACMD \
   $JAVA_OPTS \
   -classpath "$CLASSPATH" \
   -Djava.io.tmpdir="$RUNTIME_HOME/tmp" \
-  -javaagent:/home/wso2apk/lib/jmx_prometheus_javaagent-0.20.0.jar=18009:/tmp/metrics/prometheus-jmx-config-configds.yml \
+  -javaagent:/home/wso2apk/lib/jmx_prometheus_javaagent-0.20.0.jar=18007:/tmp/metrics/prometheus-jmx-config-configds.yml \
   -jar config_deployer_service.jar $*
 status=$?