chore: remove all jmx + monitoring in the helm chart

close #71

Author: edevosc2c

README.md

@@ -83,30 +83,6 @@ helm upgrade -f your-values.yaml georchestra oci://ghcr.io/georchestra/helm-geor
 The helm chart provides the possibility to clone the datadir from a remote repository using git. A
 secret SSH key can be provided to do so.
 
-# JMX monitoring
-
-A flag can be set in the `values.yaml` so that a collectd-based container is running next to the
-main Java one, on the following deployments:
-
-* `geoserver`
-* `geonetwork`
-* `security-proxy`
-
-If the flag is set to `true` (e.g. `georchestra.webapps.proxy.jetty_monitoring: true`),
-then a `collectd` process along with a minimal configuration to scrape common Java and Jetty specific
-exposed JMX metrics will be configured. The following annotations will be set on the deployed pod as well:
-
-```
-    prometheus.io/path: /metrics
-    prometheus.io/port: "9103"
-    prometheus.io/scrape: "true"
-```
-
-Some `podMonitor` objects will be created as well for each concerned pods (sp, gn, gs).
-
-As a result, if the `prometheus` operator is deployed into the cluster, it will configure itself and be able to scrape the
-exposed metrics.
-
 # Mapstore2 / geOrchestra datadir
 
 On the mapstore2 webapp, we are using the following strategy:

templates/geonetwork/geonetwork-deployment.yaml

@@ -22,12 +22,6 @@ spec:
         {{- include "georchestra.selectorLabels" . | nindent 8 }}
         org.georchestra.service/name: {{ include "georchestra.fullname" . }}-geonetwork
         app.kubernetes.io/component: {{ include "georchestra.fullname" . }}-geonetwork
-      {{- if $webapp.jetty_monitoring }}
-      annotations:
-        prometheus.io/path: /metrics
-        prometheus.io/port: "9103"
-        prometheus.io/scrape: "true"
-      {{- end }}
     spec:
       nodeSelector:
         "kubernetes.io/os": linux
@@ -78,22 +72,6 @@ spec:
           periodSeconds: 50
         resources:
           {{- toYaml $webapp.resources | nindent 10 }}
-      {{- if $webapp.jetty_monitoring }}
-      - name: jmx-collectd
-        image: camptocamp/jmx-collectd:bookworm
-        volumeMounts:
-        - mountPath: /collectd-template
-          name: georchestra-monitoring-cm
-        ports:
-        - containerPort: 9103
-          name: prometheus
-        command:
-        - /bin/sh
-        - -c
-        - mkdir /etc/collectd/collectd.conf.d/ ;
-          cat /collectd-template/collectd-jmx-jetty.conf | sed "s/localhost/$(hostname)/g" > /etc/collectd/collectd.conf.d/jmx.conf ;
-          collectd -f
-      {{- end }}
       volumes:
       - name: georchestra-datadir
         emptyDir: {}
@@ -109,11 +87,6 @@ spec:
       {{- if $webapp.extra_volumes }}
           {{ $webapp.extra_volumes | toYaml | nindent 6 }}
       {{- end }}
-      {{- if $webapp.jetty_monitoring }}
-      - name: georchestra-monitoring-cm
-        configMap:
-          name: {{ include "georchestra.fullname" . }}-monitoring-cm
-      {{- end }}
       {{- if $webapp.registry_secret }}
       imagePullSecrets:
       - name: {{ $webapp.registry_secret }}

templates/geoserver/geoserver-deployment.yaml

@@ -24,13 +24,6 @@ spec:
         {{- include "georchestra.selectorLabels" . | nindent 8 }}
         org.georchestra.service/name: {{ include "georchestra.fullname" . }}-geoserver
         app.kubernetes.io/component: {{ include "georchestra.fullname" . }}-geoserver
-
-      {{- if $webapp.jetty_monitoring }}
-      annotations:
-        prometheus.io/path: /metrics
-        prometheus.io/port: "9103"
-        prometheus.io/scrape: "true"
-      {{- end }}
     spec:
       nodeSelector:
         "kubernetes.io/os": linux
@@ -215,22 +208,6 @@ spec:
           periodSeconds: 40
         resources:
           {{- toYaml $webapp.resources | nindent 10 }}
-      {{- if $webapp.jetty_monitoring }}
-      - name: jmx-collectd
-        image: camptocamp/jmx-collectd:bookworm
-        volumeMounts:
-        - mountPath: /collectd-template
-          name: georchestra-monitoring-cm
-        ports:
-        - containerPort: 9103
-          name: prometheus
-        command:
-        - /bin/sh
-        - -c
-        - mkdir /etc/collectd/collectd.conf.d/ ;
-          cat /collectd-template/collectd-jmx-jetty.conf | sed "s/localhost/$(hostname)/g" > /etc/collectd/collectd.conf.d/jmx.conf ;
-          collectd -f
-      {{- end }}
       volumes:
       - name: georchestra-datadir
         emptyDir: {}
@@ -252,11 +229,6 @@ spec:
       {{- if $webapp.extra_volumes }}
         {{ $webapp.extra_volumes | toYaml | nindent 6 }}
       {{- end }}
-      {{- if $webapp.jetty_monitoring }}
-      - name: georchestra-monitoring-cm
-        configMap:
-          name: {{ include "georchestra.fullname" . }}-monitoring-cm
-      {{- end }}
       {{- if $webapp.registry_secret }}
       imagePullSecrets:
       - name: {{ $webapp.registry_secret }}

templates/monitoring/geonetwork-pm.yaml

@@ -19,13 +19,6 @@ spec:
         {{- include "georchestra.selectorLabels" . | nindent 8 }}
         org.georchestra.service/name: {{ include "georchestra.fullname" . }}-sp
         app.kubernetes.io/component: {{ include "georchestra.fullname" . }}-sp
-
-      {{- if $webapp.jetty_monitoring }}
-      annotations:
-        prometheus.io/path: /metrics
-        prometheus.io/port: "9103"
-        prometheus.io/scrape: "true"
-      {{- end }}
     spec:
       nodeSelector:
         "kubernetes.io/os": linux
@@ -82,22 +75,6 @@ spec:
           periodSeconds: 15
         resources:
           {{- toYaml $webapp.resources | nindent 10 }}
-      {{- if $webapp.jetty_monitoring }}
-      - name: jmx-collectd
-        image: camptocamp/jmx-collectd:bookworm
-        volumeMounts:
-        - mountPath: /collectd-template
-          name: georchestra-monitoring-cm
-        ports:
-        - containerPort: 9103
-          name: prometheus
-        command:
-        - /bin/sh
-        - -c
-        - mkdir /etc/collectd/collectd.conf.d/ ;
-          cat /collectd-template/collectd-jmx-jetty.conf | sed "s/localhost/$(hostname)/g" > /etc/collectd/collectd.conf.d/jmx.conf ;
-          collectd -f
-      {{- end }}
       volumes:
       - name: georchestra-datadir
         emptyDir: {}
@@ -107,11 +84,6 @@ spec:
           secretName: {{ .Values.georchestra.datadir.git.ssh_secret }}
           defaultMode: 0400
       {{- end }}
-      {{- if $webapp.jetty_monitoring }}
-      - name: georchestra-monitoring-cm
-        configMap:
-          name: {{ include "georchestra.fullname" . }}-monitoring-cm
-      {{- end }}
       {{- if $webapp.registry_secret }}
       imagePullSecrets:
       - name: {{ $webapp.registry_secret }}