Skip to content

Commit 15d3b04

Browse files
ravisingalravisingal
authored
Remove JMX exporter container from span-normalizer and raw-spans-grouper pods (#94)
1 parent e652fc0 commit 15d3b04

File tree

12 files changed

+11
-166
lines changed

12 files changed

+11
-166
lines changed

‎hypertrace-ingester/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ hypertraceDocker {
2525
}
2626

2727
dependencies {
28-
implementation("org.hypertrace.core.kafkastreams.framework:kafka-streams-framework:0.1.15")
28+
implementation("org.hypertrace.core.kafkastreams.framework:kafka-streams-framework:0.1.16")
2929
implementation("org.hypertrace.core.serviceframework:platform-service-framework:0.1.18")
3030
implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.18")
3131
implementation("org.hypertrace.core.datamodel:data-model:0.1.12")

‎hypertrace-trace-enricher/hypertrace-trace-enricher/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ dependencies {
4040
implementation("org.hypertrace.entity.service:entity-service-client:0.1.23")
4141

4242
implementation("com.typesafe:config:1.4.1")
43-
implementation("org.hypertrace.core.kafkastreams.framework:kafka-streams-framework:0.1.15")
43+
implementation("org.hypertrace.core.kafkastreams.framework:kafka-streams-framework:0.1.16")
4444
constraints {
4545
implementation("com.google.guava:guava:30.1-jre") {
4646
because("Information Disclosure [Medium Severity][https://snyk.io/vuln/SNYK-JAVA-COMGOOGLEGUAVA-1015415] in com.google.guava:[email protected]")

‎raw-spans-grouper/helm/templates/headless-service.yaml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ apiVersion: v1
22
kind: Service
33
metadata:
44
name: {{ .Values.name }}
5-
annotations:
6-
prometheus.io/scrape: "true"
7-
prometheus.io/port: {{ .Values.containerAdminPort | quote }}
85
labels:
96
release: {{ .Release.Name }}
107
{{- with .Values.deploymentLabels }}

‎raw-spans-grouper/helm/templates/jmx-configmap.yaml‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎raw-spans-grouper/helm/templates/statefulset.yaml‎

Lines changed: 2 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,8 @@ spec:
3636
{{- end }}
3737
annotations:
3838
checksum/config: {{ include (print $.Template.BasePath "/raw-spans-grouper-config.yaml") . | sha256sum }}
39-
{{- if .Values.prometheus.jmx.enabled }}
4039
prometheus.io/scrape: "true"
41-
prometheus.io/port: {{ .Values.prometheus.jmx.port | quote }}
42-
{{- end }}
40+
prometheus.io/port: {{ .Values.containerAdminPort | quote }}
4341
{{- with .Values.podAnnotations }}
4442
{{- toYaml . | nindent 8 }}
4543
{{- end }}
@@ -68,11 +66,6 @@ spec:
6866
- name: log4j-config
6967
configMap:
7068
name: {{ .Values.logConfig.name }}
71-
{{- if .Values.prometheus.jmx.enabled }}
72-
- name: jmx-config
73-
configMap:
74-
name: {{ .Values.name }}-jmx-config
75-
{{- end }}
7669
affinity:
7770
podAntiAffinity:
7871
requiredDuringSchedulingIgnoredDuringExecution:
@@ -91,11 +84,6 @@ spec:
9184
- name: admin-port
9285
containerPort: {{ .Values.containerAdminPort }}
9386
protocol: TCP
94-
{{- if .Values.jmx.enabled }}
95-
- name: jmx
96-
containerPort: {{ .Values.jmx.port }}
97-
protocol: TCP
98-
{{- end }}
9987
env:
10088
- name: SERVICE_NAME
10189
value: "{{ .Values.name }}"
@@ -111,7 +99,7 @@ spec:
11199
value: "/var/{{ .Values.name }}/log/log4j2.properties"
112100
{{- if .Values.javaOpts }}
113101
- name: JAVA_TOOL_OPTIONS
114-
value: {{ .Values.javaOpts }} {{ if .Values.jmx.enabled }}{{ .Values.jmx.opts }}{{ end }}
102+
value: {{ .Values.javaOpts | quote }}
115103
{{- end }}
116104
volumeMounts:
117105
- name: service-config
@@ -134,26 +122,3 @@ spec:
134122
port: {{ .Values.containerAdminPort }}
135123
resources:
136124
{{- toYaml .Values.resources | nindent 12 }}
137-
{{- if .Values.prometheus.jmx.enabled }}
138-
- name: prometheus-jmx-exporter
139-
image: "{{ .Values.prometheus.jmx.image.repository }}:{{ .Values.prometheus.jmx.image.tag }}"
140-
imagePullPolicy: "{{ .Values.prometheus.jmx.image.pullPolicy }}"
141-
command:
142-
- java
143-
- -XX:+UnlockExperimentalVMOptions
144-
- -XX:+UseCGroupMemoryLimitForHeap
145-
- -XX:MaxRAMFraction=1
146-
- -XshowSettings:vm
147-
- -jar
148-
- jmx_prometheus_httpserver.jar
149-
- {{ .Values.prometheus.jmx.port | quote }}
150-
- /etc/jmx-config/prometheus-raw-spans-grouper.yaml
151-
ports:
152-
- name: prometheus-jmx
153-
containerPort: {{ .Values.prometheus.jmx.port }}
154-
resources:
155-
{{- toYaml .Values.prometheus.jmx.resources | nindent 12 }}
156-
volumeMounts:
157-
- name: jmx-config
158-
mountPath: /etc/jmx-config
159-
{{- end }}

‎raw-spans-grouper/helm/values.yaml‎

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -80,26 +80,6 @@ volumeClaimTemplates:
8080
storageClassName: kafka-streams-rocksdb
8181
storageRequestSize: 50Gi
8282

83-
jmx:
84-
enabled: true
85-
port: 7022
86-
opts: "-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.local.only=false -Dcom.sun.management.jmxremote.port=7022 -Dcom.sun.management.jmxremote.rmi.port=7022 -Djava.rmi.server.hostname=127.0.0.1"
87-
88-
prometheus:
89-
jmx:
90-
enabled: true
91-
port: 7071
92-
image:
93-
repository: solsson/kafka-prometheus-jmx-exporter@sha256
94-
tag: 6f82e2b0464f50da8104acd7363fb9b995001ddff77d248379f8788e78946143
95-
pullPolicy: IfNotPresent
96-
resources:
97-
requests:
98-
cpu: "0.25"
99-
memory: "256Mi"
100-
101-
102-
10383
###########
10484
# Config Maps
10585
###########
@@ -138,6 +118,9 @@ rawSpansGrouperConfig:
138118
ignoreProductionExceptionClasses: "org.apache.kafka.common.errors.RecordTooLargeException"
139119
# Others
140120
metricsRecordingLevel: INFO # default = INFO
121+
# All other streams config goes here.
122+
# Remove the flower braces and add key: value pair here.
123+
extraKafkaStreamsConfig: {}
141124

142125
span:
143126
groupby:

‎raw-spans-grouper/raw-spans-grouper/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ dependencies {
3939
implementation("org.hypertrace.core.serviceframework:platform-service-framework:0.1.18")
4040
implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.18")
4141

42-
implementation("org.hypertrace.core.kafkastreams.framework:kafka-streams-framework:0.1.15")
42+
implementation("org.hypertrace.core.kafkastreams.framework:kafka-streams-framework:0.1.16")
4343
implementation("com.typesafe:config:1.4.1")
4444
implementation("de.javakaffee:kryo-serializers:0.45")
4545
implementation("io.confluent:kafka-avro-serializer:5.5.0")

‎span-normalizer/helm/templates/deployment.yaml‎

Lines changed: 2 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,8 @@ spec:
2525
{{- end }}
2626
annotations:
2727
checksum/config: {{ include (print $.Template.BasePath "/span-normalizer-config.yaml") . | sha256sum }}
28-
{{- if .Values.prometheus.jmx.enabled }}
2928
prometheus.io/scrape: "true"
30-
prometheus.io/port: {{ .Values.prometheus.jmx.port | quote }}
31-
{{- end }}
29+
prometheus.io/port: {{ .Values.containerAdminPort | quote }}
3230
{{- with .Values.podAnnotations }}
3331
{{- toYaml . | nindent 8 }}
3432
{{- end }}
@@ -44,11 +42,6 @@ spec:
4442
- name: log4j-config
4543
configMap:
4644
name: {{ .Values.logConfig.name }}
47-
{{- if .Values.prometheus.jmx.enabled }}
48-
- name: jmx-config
49-
configMap:
50-
name: {{ .Chart.Name }}-jmx-config
51-
{{- end }}
5245
{{- with .Values.nodeLabels }}
5346
nodeSelector:
5447
{{- toYaml . | nindent 8}}
@@ -69,7 +62,7 @@ spec:
6962
- name: LOG4J_CONFIGURATION_FILE
7063
value: "/var/{{ .Chart.Name }}/log/log4j2.properties"
7164
- name: JAVA_TOOL_OPTIONS
72-
value: {{ .Values.javaOpts }} {{ if .Values.jmx.enabled }}{{ .Values.jmx.opts }}{{ end }}
65+
value: {{ .Values.javaOpts | quote }}
7366
volumeMounts:
7467
- name: service-config
7568
mountPath: /app/resources/configs/{{ .Chart.Name }}/application.conf
@@ -89,26 +82,3 @@ spec:
8982
port: {{ .Values.containerAdminPort }}
9083
resources:
9184
{{- toYaml .Values.resources | nindent 12 }}
92-
{{- if .Values.prometheus.jmx.enabled }}
93-
- name: prometheus-jmx-exporter
94-
image: "{{ .Values.prometheus.jmx.image.repository }}:{{ .Values.prometheus.jmx.image.tag }}"
95-
imagePullPolicy: "{{ .Values.prometheus.jmx.image.pullPolicy }}"
96-
command:
97-
- java
98-
- -XX:+UnlockExperimentalVMOptions
99-
- -XX:+UseCGroupMemoryLimitForHeap
100-
- -XX:MaxRAMFraction=1
101-
- -XshowSettings:vm
102-
- -jar
103-
- jmx_prometheus_httpserver.jar
104-
- {{ .Values.prometheus.jmx.port | quote }}
105-
- /etc/jmx-config/prometheus-span-normalizer.yaml
106-
ports:
107-
- name: prometheus-jmx
108-
containerPort: {{ .Values.prometheus.jmx.port }}
109-
resources:
110-
{{- toYaml .Values.prometheus.jmx.resources | nindent 12 }}
111-
volumeMounts:
112-
- name: jmx-config
113-
mountPath: /etc/jmx-config
114-
{{- end }}

‎span-normalizer/helm/templates/jmx-configmap.yaml‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎span-normalizer/helm/templates/service.yaml‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)