metrics port on pods/service configurable

Author: xeniape

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

@@ -47,8 +47,7 @@ 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_PROVIDER_CLASS_NAME: &str =
-    "org.apache.zookeeper.metrics.prometheus.PrometheusMetricsProvider";
+pub const METRICS_PROVIDER_HTTP_PORT_KEY: &str = "metricsProvider.httpPort";
 pub const METRICS_PROVIDER_HTTP_PORT: u16 = 9505;
 
 pub const STACKABLE_DATA_DIR: &str = "/stackable/data";
@@ -373,8 +372,6 @@ impl v1alpha1::ZookeeperConfig {
     pub const DATA_DIR: &'static str = "dataDir";
     const DEFAULT_SECRET_LIFETIME: Duration = Duration::from_days_unchecked(1);
     pub const INIT_LIMIT: &'static str = "initLimit";
-    const METRICS_PROVIDER_CLASS_NAME: &'static str = "metricsProvider.className";
-    const METRICS_PROVIDER_HTTP_PORT: &'static str = "metricsProvider.httpPort";
     pub const MYID_OFFSET: &'static str = "MYID_OFFSET";
     pub const SYNC_LIMIT: &'static str = "syncLimit";
     pub const TICK_TIME: &'static str = "tickTime";
@@ -473,11 +470,13 @@ impl Configuration for v1alpha1::ZookeeperConfigFragment {
                 Some(STACKABLE_DATA_DIR.to_string()),
             );
             result.insert(
-                v1alpha1::ZookeeperConfig::METRICS_PROVIDER_CLASS_NAME.to_string(),
-                Some(METRICS_PROVIDER_CLASS_NAME.to_string()),
+                "metricsProvider.className".to_string(),
+                Some(
+                    "org.apache.zookeeper.metrics.prometheus.PrometheusMetricsProvider".to_string(),
+                ),
             );
             result.insert(
-                v1alpha1::ZookeeperConfig::METRICS_PROVIDER_HTTP_PORT.to_string(),
+                METRICS_PROVIDER_HTTP_PORT_KEY.to_string(),
                 Some(METRICS_PROVIDER_HTTP_PORT.to_string()),
             );
         }

rust/operator-binary/src/zk_controller.rs

@@ -72,8 +72,9 @@ use crate::{
     config::jvm::{construct_non_heap_jvm_args, construct_zk_server_heap_env},
     crd::{
         DOCKER_IMAGE_BASE_NAME, JVM_SECURITY_PROPERTIES_FILE, MAX_PREPARE_LOG_FILE_SIZE,
-        MAX_ZK_LOG_FILES_SIZE, STACKABLE_CONFIG_DIR, STACKABLE_DATA_DIR, STACKABLE_LOG_CONFIG_DIR,
-        STACKABLE_LOG_DIR, STACKABLE_RW_CONFIG_DIR, ZOOKEEPER_PROPERTIES_FILE, ZookeeperRole,
+        MAX_ZK_LOG_FILES_SIZE, METRICS_PROVIDER_HTTP_PORT, METRICS_PROVIDER_HTTP_PORT_KEY,
+        STACKABLE_CONFIG_DIR, STACKABLE_DATA_DIR, STACKABLE_LOG_CONFIG_DIR, STACKABLE_LOG_DIR,
+        STACKABLE_RW_CONFIG_DIR, ZOOKEEPER_PROPERTIES_FILE, ZookeeperRole,
         security::{self, ZookeeperSecurity},
         v1alpha1,
     },
@@ -415,6 +416,7 @@ pub async fn reconcile_zk(
             &rolegroup,
             &resolved_product_image,
             &zookeeper_security,
+            rolegroup_config,
         )?;
         let rg_configmap = build_server_rolegroup_config_map(
             zk,
@@ -675,6 +677,7 @@ fn build_server_rolegroup_service(
     rolegroup: &RoleGroupRef<v1alpha1::ZookeeperCluster>,
     resolved_product_image: &ResolvedProductImage,
     zookeeper_security: &ZookeeperSecurity,
+    rolegroup_config: &HashMap<PropertyNameKind, BTreeMap<String, String>>,
 ) -> Result<Service> {
     let prometheus_label =
         Label::try_from(("prometheus.io/scrape", "true")).context(BuildLabelSnafu)?;
@@ -712,7 +715,7 @@ fn build_server_rolegroup_service(
             },
             ServicePort {
                 name: Some("metrics".to_string()),
-                port: 9505,
+                port: metrics_port_from_rolegroup_config(rolegroup_config).into(),
                 protocol: Some("TCP".to_string()),
                 ..ServicePort::default()
             },
@@ -897,7 +900,10 @@ 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",
+            metrics_port_from_rolegroup_config(server_config).into(),
+        )
         .add_volume_mount("data", STACKABLE_DATA_DIR)
         .context(AddVolumeMountSnafu)?
         .add_volume_mount("config", STACKABLE_CONFIG_DIR)
@@ -1063,6 +1069,27 @@ fn build_server_rolegroup_statefulset(
     })
 }
 
+fn metrics_port_from_rolegroup_config(
+    rolegroup_config: &HashMap<PropertyNameKind, BTreeMap<String, String>>,
+) -> u16 {
+    let metrics_port = rolegroup_config
+        .get(&PropertyNameKind::File(
+            ZOOKEEPER_PROPERTIES_FILE.to_string(),
+        ))
+        .expect("{ZOOKEEPER_PROPERTIES_FILE} is present")
+        .get(METRICS_PROVIDER_HTTP_PORT_KEY)
+        .expect("{METRICS_PROVIDER_HTTP_PORT_KEY} is set");
+
+    match u16::from_str(metrics_port) {
+        Ok(port) => port,
+        Err(err) => {
+            tracing::error!("{err}");
+            tracing::info!("Defaulting to using {METRICS_PROVIDER_HTTP_PORT} as metrics port.");
+            METRICS_PROVIDER_HTTP_PORT
+        }
+    }
+}
+
 pub fn error_policy(
     _obj: Arc<DeserializeGuard<v1alpha1::ZookeeperCluster>>,
     error: &Error,