diff --git a/k8s/components/gridsuite/patches/services-springboot.yaml b/k8s/components/gridsuite/patches/services-springboot.yaml index 3f3e7025..28f4513d 100644 --- a/k8s/components/gridsuite/patches/services-springboot.yaml +++ b/k8s/components/gridsuite/patches/services-springboot.yaml @@ -2,6 +2,8 @@ apiVersion: v1 kind: Service metadata: name: not-important + labels: + app-prometheus-metrics: enabled spec: type: ClusterIP ports: diff --git a/k8s/resources/common/config/loadflow-server-application.yml b/k8s/resources/common/config/loadflow-server-application.yml index bc6bb014..bbbf16b4 100644 --- a/k8s/resources/common/config/loadflow-server-application.yml +++ b/k8s/resources/common/config/loadflow-server-application.yml @@ -1,8 +1,2 @@ loadflow: default-provider: OpenLoadFlow - -management: - endpoints: - web: - exposure: - include: prometheus, health, info diff --git a/k8s/resources/common/config/network-conversion-server-application.yml b/k8s/resources/common/config/network-conversion-server-application.yml index ba8896db..e69de29b 100644 --- a/k8s/resources/common/config/network-conversion-server-application.yml +++ b/k8s/resources/common/config/network-conversion-server-application.yml @@ -1,5 +0,0 @@ -management: - endpoints: - web: - exposure: - include: prometheus, health, info \ No newline at end of file diff --git a/k8s/resources/common/loadflow-server-service.yaml b/k8s/resources/common/loadflow-server-service.yaml index 8e050e35..65b8f693 100644 --- a/k8s/resources/common/loadflow-server-service.yaml +++ b/k8s/resources/common/loadflow-server-service.yaml @@ -3,7 +3,6 @@ kind: Service metadata: labels: name: loadflow-server - app-prometheus-metrics: enabled app.kubernetes.io/component: gridsuite-springboot name: loadflow-server spec: diff --git a/k8s/resources/common/network-conversion-server-service.yaml b/k8s/resources/common/network-conversion-server-service.yaml index c8a30e4b..37662820 100644 --- a/k8s/resources/common/network-conversion-server-service.yaml +++ b/k8s/resources/common/network-conversion-server-service.yaml @@ -3,7 +3,6 @@ kind: Service metadata: labels: name: network-conversion-server - app-prometheus-metrics: enabled app.kubernetes.io/component: gridsuite-springboot name: network-conversion-server spec: diff --git a/k8s/resources/study/config/dynamic-simulation-server-application.yml b/k8s/resources/study/config/dynamic-simulation-server-application.yml index 5daf104d..e69de29b 100644 --- a/k8s/resources/study/config/dynamic-simulation-server-application.yml +++ b/k8s/resources/study/config/dynamic-simulation-server-application.yml @@ -1,5 +0,0 @@ -management: - endpoints: - web: - exposure: - include: prometheus, health, info diff --git a/k8s/resources/study/config/security-analysis-server-application.yml b/k8s/resources/study/config/security-analysis-server-application.yml index a7e6052b..e1d1bd09 100644 --- a/k8s/resources/study/config/security-analysis-server-application.yml +++ b/k8s/resources/study/config/security-analysis-server-application.yml @@ -2,8 +2,3 @@ security-analysis: default-provider: OpenLoadFlow -management: - endpoints: - web: - exposure: - include: prometheus, health, info diff --git a/k8s/resources/study/config/sensitivity-analysis-server-application.yml b/k8s/resources/study/config/sensitivity-analysis-server-application.yml index 4d7c5a47..eee47250 100644 --- a/k8s/resources/study/config/sensitivity-analysis-server-application.yml +++ b/k8s/resources/study/config/sensitivity-analysis-server-application.yml @@ -4,9 +4,3 @@ sensitivity-analysis: non-evacuated-energy: default-provider: OpenLoadFlow - -management: - endpoints: - web: - exposure: - include: prometheus, health, info diff --git a/k8s/resources/study/config/shortcircuit-server-application.yml b/k8s/resources/study/config/shortcircuit-server-application.yml index 02161b65..e69de29b 100644 --- a/k8s/resources/study/config/shortcircuit-server-application.yml +++ b/k8s/resources/study/config/shortcircuit-server-application.yml @@ -1,6 +0,0 @@ -management: - endpoints: - web: - exposure: - include: prometheus, health, info - diff --git a/k8s/resources/study/config/study-notification-server-application.yml b/k8s/resources/study/config/study-notification-server-application.yml index b457cc1a..ac053b26 100644 --- a/k8s/resources/study/config/study-notification-server-application.yml +++ b/k8s/resources/study/config/study-notification-server-application.yml @@ -1,9 +1,3 @@ logging: level: org.gridsuite.study.notification.server.NotificationWebSocketHandler: DEBUG - -management: - endpoints: - web: - exposure: - include: prometheus, health, info diff --git a/k8s/resources/study/config/voltage-init-server-application.yml b/k8s/resources/study/config/voltage-init-server-application.yml index ba8896db..e69de29b 100644 --- a/k8s/resources/study/config/voltage-init-server-application.yml +++ b/k8s/resources/study/config/voltage-init-server-application.yml @@ -1,5 +0,0 @@ -management: - endpoints: - web: - exposure: - include: prometheus, health, info \ No newline at end of file diff --git a/k8s/resources/study/dynamic-simulation-server-service.yaml b/k8s/resources/study/dynamic-simulation-server-service.yaml index 9ebf5949..638d4a66 100644 --- a/k8s/resources/study/dynamic-simulation-server-service.yaml +++ b/k8s/resources/study/dynamic-simulation-server-service.yaml @@ -3,7 +3,6 @@ kind: Service metadata: labels: name: dynamic-simulation-server - app-prometheus-metrics: enabled app.kubernetes.io/component: gridsuite-springboot name: dynamic-simulation-server spec: diff --git a/k8s/resources/study/security-analysis-server-service.yaml b/k8s/resources/study/security-analysis-server-service.yaml index 3ebd4add..74d8f780 100644 --- a/k8s/resources/study/security-analysis-server-service.yaml +++ b/k8s/resources/study/security-analysis-server-service.yaml @@ -3,7 +3,6 @@ kind: Service metadata: labels: name: security-analysis-server - app-prometheus-metrics: enabled app.kubernetes.io/component: gridsuite-springboot name: security-analysis-server spec: diff --git a/k8s/resources/study/sensitivity-analysis-server-service.yaml b/k8s/resources/study/sensitivity-analysis-server-service.yaml index c88ebdcf..1d571e5e 100644 --- a/k8s/resources/study/sensitivity-analysis-server-service.yaml +++ b/k8s/resources/study/sensitivity-analysis-server-service.yaml @@ -3,7 +3,6 @@ kind: Service metadata: labels: name: sensitivity-analysis-server - app-prometheus-metrics: enabled app.kubernetes.io/component: gridsuite-springboot name: sensitivity-analysis-server spec: diff --git a/k8s/resources/study/shortcircuit-server-service.yaml b/k8s/resources/study/shortcircuit-server-service.yaml index a6feb061..72195937 100644 --- a/k8s/resources/study/shortcircuit-server-service.yaml +++ b/k8s/resources/study/shortcircuit-server-service.yaml @@ -3,7 +3,6 @@ kind: Service metadata: labels: name: shortcircuit-server - app-prometheus-metrics: enabled app.kubernetes.io/component: gridsuite-springboot name: shortcircuit-server spec: diff --git a/k8s/resources/study/study-notification-server-service.yaml b/k8s/resources/study/study-notification-server-service.yaml index 30624eb3..a3ce4dbb 100644 --- a/k8s/resources/study/study-notification-server-service.yaml +++ b/k8s/resources/study/study-notification-server-service.yaml @@ -3,7 +3,6 @@ kind: Service metadata: labels: name: study-notification-server - app-prometheus-metrics: enabled app.kubernetes.io/component: gridsuite-springboot name: study-notification-server spec: diff --git a/k8s/resources/study/voltage-init-server-service.yaml b/k8s/resources/study/voltage-init-server-service.yaml index 6bf8802a..872a706b 100644 --- a/k8s/resources/study/voltage-init-server-service.yaml +++ b/k8s/resources/study/voltage-init-server-service.yaml @@ -3,7 +3,6 @@ kind: Service metadata: labels: name: voltage-init-server - app-prometheus-metrics: enabled app.kubernetes.io/component: gridsuite-springboot name: voltage-init-server spec: