diff --git a/Dockerfile b/Dockerfile index 33dee7ce..e6901354 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ ARG MAVEN_PROXY_PASSWORD ARG POSTGRESQL_VERSION ARG MYSQL_VERSION -ARG JMX_PROMETHEUS_VERSION=0.12.0 +ARG JMX_PROMETHEUS_VERSION=1.0.1 RUN apk add --no-cache \ bash \ diff --git a/test/docker-compose.yml b/test/docker-compose.yml index 25dd79f5..b1f75db1 100644 --- a/test/docker-compose.yml +++ b/test/docker-compose.yml @@ -56,6 +56,8 @@ services: ports: - "8080:8080" - "9404:9404" + volumes: + - $PWD/prometheus-jmx.yml:/camunda/javaagent/prometheus-jmx.yml restart: unless-stopped camunda-password-file: diff --git a/test/prometheus-jmx.yml b/test/prometheus-jmx.yml new file mode 100644 index 00000000..54ee51a8 --- /dev/null +++ b/test/prometheus-jmx.yml @@ -0,0 +1,5 @@ +startDelaySeconds: 0 +ssl: false + +rules: + - pattern: "java.lang:type=ClassLoading" diff --git a/test/test-prometheus-jmx-tomcat.sh b/test/test-prometheus-jmx-tomcat.sh index e8642b21..88439f40 100755 --- a/test/test-prometheus-jmx-tomcat.sh +++ b/test/test-prometheus-jmx-tomcat.sh @@ -12,6 +12,6 @@ _log "Server started" grep_log "Enabling Prometheus JMX Exporter on port" || _exit 2 "Prometheus JMX Exporter not enabled" -curl -s http://localhost:9404/metrics | grep -q "jvm_info" || _exit 3 "Prometheus metrics not available" +curl -s http://localhost:9404/metrics | grep -q "jvm_classes_currently_loaded" || _exit 3 "Prometheus metrics not available" _exit 0 "Test successfull" diff --git a/test/test-prometheus-jmx-wildfly.sh b/test/test-prometheus-jmx-wildfly.sh index ad356c22..ec0ab215 100755 --- a/test/test-prometheus-jmx-wildfly.sh +++ b/test/test-prometheus-jmx-wildfly.sh @@ -12,6 +12,6 @@ _log "Server started" grep_log "Enabling Prometheus JMX Exporter on port" || _exit 2 "Prometheus JMX Exporter not enabled" -curl -s http://localhost:9404/metrics | grep -q "jvm_info" || _exit 3 "Prometheus metrics not available" +curl -s http://localhost:9404/metrics | grep -q "jvm_classes_currently_loaded" || _exit 3 "Prometheus metrics not available" _exit 0 "Test successfull"