add jmx exporter back in

Author: xeniape

rust/operator-binary/src/config/jvm.rs

@@ -6,7 +6,7 @@ use stackable_operator::{
 
 use crate::crd::{
     JVM_SECURITY_PROPERTIES_FILE, LOG4J_CONFIG_FILE, LOGBACK_CONFIG_FILE, LoggingFramework,
-    STACKABLE_CONFIG_DIR, STACKABLE_LOG_CONFIG_DIR,
+    METRICS_PORT, STACKABLE_CONFIG_DIR, STACKABLE_LOG_CONFIG_DIR,
     v1alpha1::{ZookeeperCluster, ZookeeperConfig, ZookeeperConfigFragment},
 };
 
@@ -36,6 +36,9 @@ fn construct_jvm_args(
 
     let jvm_args = vec![
         format!("-Djava.security.properties={STACKABLE_CONFIG_DIR}/{JVM_SECURITY_PROPERTIES_FILE}"),
+        format!(
+            "-javaagent:/stackable/jmx/jmx_prometheus_javaagent.jar={METRICS_PORT}:/stackable/jmx/server.yaml"
+        ),
         match logging_framework {
             LoggingFramework::LOG4J => {
                 format!("-Dlog4j.configuration=file:{STACKABLE_LOG_CONFIG_DIR}/{LOG4J_CONFIG_FILE}")
@@ -120,6 +123,7 @@ mod tests {
         assert_eq!(
             non_heap_jvm_args,
             "-Djava.security.properties=/stackable/config/security.properties \
+            -javaagent:/stackable/jmx/jmx_prometheus_javaagent.jar=9505:/stackable/jmx/server.yaml \
             -Dlogback.configurationFile=/stackable/log_config/logback.xml"
         );
         assert_eq!(zk_server_heap_env, "409");
@@ -164,6 +168,7 @@ mod tests {
         assert_eq!(
             non_heap_jvm_args,
             "-Djava.security.properties=/stackable/config/security.properties \
+            -javaagent:/stackable/jmx/jmx_prometheus_javaagent.jar=9505:/stackable/jmx/server.yaml \
             -Dlogback.configurationFile=/stackable/log_config/logback.xml \
             -Dhttps.proxyHost=proxy.my.corp \
             -Djava.net.preferIPv4Stack=true \

rust/operator-binary/src/crd/mod.rs

@@ -47,8 +47,9 @@ pub const OPERATOR_NAME: &str = "zookeeper.stackable.tech";
 pub const ZOOKEEPER_PROPERTIES_FILE: &str = "zoo.cfg";
 pub const JVM_SECURITY_PROPERTIES_FILE: &str = "security.properties";
 
+pub const METRICS_PORT: u16 = 9505;
 pub const METRICS_PROVIDER_HTTP_PORT_KEY: &str = "metricsProvider.httpPort";
-pub const METRICS_PROVIDER_HTTP_PORT: u16 = 9505;
+pub const METRICS_PROVIDER_HTTP_PORT: u16 = 7000;
 
 pub const STACKABLE_DATA_DIR: &str = "/stackable/data";
 pub const STACKABLE_CONFIG_DIR: &str = "/stackable/config";

rust/operator-binary/src/zk_controller.rs

@@ -715,6 +715,12 @@ fn build_server_rolegroup_service(
             },
             ServicePort {
                 name: Some("metrics".to_string()),
+                port: 9505,
+                protocol: Some("TCP".to_string()),
+                ..ServicePort::default()
+            },
+            ServicePort {
+                name: Some("native-metrics".to_string()),
                 port: metrics_port_from_rolegroup_config(rolegroup_config).into(),
                 protocol: Some("TCP".to_string()),
                 ..ServicePort::default()
@@ -900,8 +906,9 @@ fn build_server_rolegroup_statefulset(
         .add_container_port("zk", zookeeper_security.client_port().into())
         .add_container_port("zk-leader", 2888)
         .add_container_port("zk-election", 3888)
+        .add_container_port("metrics", 9505)
         .add_container_port(
-            "metrics",
+            "native-metrics",
             metrics_port_from_rolegroup_config(server_config).into(),
         )
         .add_volume_mount("data", STACKABLE_DATA_DIR)

tests/templates/kuttl/smoke/test_zookeeper.py

@@ -60,7 +60,18 @@ def check_ruok(hosts):
 
 def check_monitoring(hosts):
     for host in hosts:
-        url = host + ":9505/metrics"
+        # test for the jmx exporter metrics
+        url = host + ":9505"
+        response = try_get(url)
+
+        if response.ok:
+            continue
+        else:
+            print("Error for [" + url + "]: could not access monitoring")
+            exit(-1)
+
+        # test for the native metrics
+        url = host + ":7000/metrics"
         response = try_get(url)
 
         if response.ok: