From df309275b469a847a550afe7073ac6a02b9274c5 Mon Sep 17 00:00:00 2001 From: szalai1 Date: Fri, 26 Aug 2022 15:05:43 +0200 Subject: [PATCH 1/3] fix(gms): remove unused JMX sidecar in favour of the already included JVM agent --- .../datahub/subcharts/datahub-gms/README.md | 1 - .../templates/config-jmx-exporter.yaml | 25 ---------- .../datahub-gms/templates/deployment.yaml | 7 --- .../datahub/subcharts/datahub-gms/values.yaml | 46 ------------------- 4 files changed, 79 deletions(-) delete mode 100644 charts/datahub/subcharts/datahub-gms/templates/config-jmx-exporter.yaml diff --git a/charts/datahub/subcharts/datahub-gms/README.md b/charts/datahub/subcharts/datahub-gms/README.md index fd9a41798..e4788d66d 100644 --- a/charts/datahub/subcharts/datahub-gms/README.md +++ b/charts/datahub/subcharts/datahub-gms/README.md @@ -9,7 +9,6 @@ Current chart version is `0.2.0` | Key | Type | Default | Description | |-----|------|---------|-------------| | affinity | object | `{}` | | -| exporters.jmx.enabled | boolean | false | | | extraEnvs | Extra [environment variables][] which will be appended to the `env:` definition for the container | `[]` | | extraVolumes | Templatable string of additional `volumes` to be passed to the `tpl` function | "" | | extraVolumeMounts | Templatable string of additional `volumeMounts` to be passed to the `tpl` function | "" | diff --git a/charts/datahub/subcharts/datahub-gms/templates/config-jmx-exporter.yaml b/charts/datahub/subcharts/datahub-gms/templates/config-jmx-exporter.yaml deleted file mode 100644 index 9071aa1e0..000000000 --- a/charts/datahub/subcharts/datahub-gms/templates/config-jmx-exporter.yaml +++ /dev/null @@ -1,25 +0,0 @@ -{{- if .Values.exporters.jmx.enabled }} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "datahub-gms.fullname" . }}-config-jmx-exporter - labels: - {{- include "datahub-gms.labels" . | nindent 4 }} -data: - config.yml: |- - hostPort: localhost:{{ .Values.env.JMXPORT }} - lowercaseOutputName: {{ .Values.exporters.jmx.config.lowercaseOutputName }} - lowercaseOutputLabelNames: {{ .Values.exporters.jmx.config.lowercaseOutputLabelNames }} - {{- with .Values.exporters.jmx.config.whitelistObjectNames }} - whitelistObjectNames: - {{- toYaml . | nindent 6 }} - {{- end }} - {{- with .Values.exporters.jmx.config.blacklistObjectNames }} - blacklistObjectNames: - {{- toYaml . | nindent 6 }} - {{- end }} - rules: -{{ .Values.exporters.jmx.config.rules | toYaml | indent 6 }} - ssl: false - startDelaySeconds: {{ .Values.exporters.jmx.config.startDelaySeconds }} -{{- end }} diff --git a/charts/datahub/subcharts/datahub-gms/templates/deployment.yaml b/charts/datahub/subcharts/datahub-gms/templates/deployment.yaml index a4328b4b1..525c91e6b 100644 --- a/charts/datahub/subcharts/datahub-gms/templates/deployment.yaml +++ b/charts/datahub/subcharts/datahub-gms/templates/deployment.yaml @@ -39,11 +39,6 @@ spec: defaultMode: 0444 secretName: {{ .name }} {{- end }} - {{- if .Values.exporters.jmx.enabled }} - - name: config-jmx-exporter - configMap: - name: {{ include "datahub-gms.fullname" . }}-config-jmx-exporter - {{- end }} {{- with .Values.extraVolumes }} {{- toYaml . | nindent 8 }} {{- end }} @@ -236,8 +231,6 @@ spec: resources: {{- toYaml .Values.resources | nindent 12 }} - {{- include "datahub-jmxexporter.container" . }} - {{- with .Values.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} diff --git a/charts/datahub/subcharts/datahub-gms/values.yaml b/charts/datahub/subcharts/datahub-gms/values.yaml index 3f3685f9c..46fc6ab23 100644 --- a/charts/datahub/subcharts/datahub-gms/values.yaml +++ b/charts/datahub/subcharts/datahub-gms/values.yaml @@ -98,52 +98,6 @@ tolerations: [] affinity: {} -env: - JMXPORT: 1099 - -exporters: - jmx: - enabled: false -# image: -# repository: bitnami/jmx-exporter -# tag: 0.15.0 -# pullPolicy: IfNotPresent -# config: -# lowercaseOutputName: true -# lowercaseOutputLabelNames: true -# rules: -# - pattern: ".*" -# startDelaySeconds: 30 -# env: {} -# resources: {} -# path: /metrics -# ports: -# jmxxp: -# containerPort: 5556 -# protocol: TCP -# livenessProbe: -# httpGet: -# path: /metrics -# port: jmxxp -# initialDelaySeconds: 30 -# periodSeconds: 15 -# timeoutSeconds: 60 -# failureThreshold: 8 -# successThreshold: 1 -# readinessProbe: -# httpGet: -# path: /metrics -# port: jmxxp -# initialDelaySeconds: 30 -# periodSeconds: 15 -# timeoutSeconds: 60 -# failureThreshold: 8 -# successThreshold: 1 -# serviceMonitor: -# interval: 30s -# scrapeTimeout: 30s -# scheme: http - livenessProbe: initialDelaySeconds: 60 periodSeconds: 30 From 78a93a9ce63dd953a5501447ca3c851f6b128139 Mon Sep 17 00:00:00 2001 From: Peter Szalai Date: Mon, 29 Aug 2022 09:10:52 +0200 Subject: [PATCH 2/3] Update Chart.yaml --- charts/datahub/subcharts/datahub-gms/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/datahub/subcharts/datahub-gms/Chart.yaml b/charts/datahub/subcharts/datahub-gms/Chart.yaml index 2fa34d73a..b65baaf7b 100644 --- a/charts/datahub/subcharts/datahub-gms/Chart.yaml +++ b/charts/datahub/subcharts/datahub-gms/Chart.yaml @@ -14,7 +14,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 0.2.5 +version: 0.2.6 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. From e759e162c54605f739578651d509b34d18056c13 Mon Sep 17 00:00:00 2001 From: Peter Szalai Date: Mon, 29 Aug 2022 09:13:40 +0200 Subject: [PATCH 3/3] Update Chart.yaml --- charts/datahub/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/datahub/Chart.yaml b/charts/datahub/Chart.yaml index 3bb50482b..a9299b402 100644 --- a/charts/datahub/Chart.yaml +++ b/charts/datahub/Chart.yaml @@ -4,7 +4,7 @@ description: A Helm chart for LinkedIn DataHub type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 0.2.91 +version: 0.2.92 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. appVersion: 0.8.44