WIP: adds metrics and native-metrics service, adds metrics port to container, adds prometheus annotations

Author: xeniape

rust/operator-binary/src/container.rs

@@ -68,7 +68,7 @@ use crate::{
             NAMENODE_ROOT_DATA_DIR, READINESS_PROBE_FAILURE_THRESHOLD,
             READINESS_PROBE_INITIAL_DELAY_SECONDS, READINESS_PROBE_PERIOD_SECONDS,
             SERVICE_PORT_NAME_HTTP, SERVICE_PORT_NAME_HTTPS, SERVICE_PORT_NAME_IPC,
-            SERVICE_PORT_NAME_RPC, STACKABLE_ROOT_DATA_DIR,
+            SERVICE_PORT_NAME_METRICS, SERVICE_PORT_NAME_RPC, STACKABLE_ROOT_DATA_DIR,
         },
         storage::DataNodeStorageConfig,
         v1alpha1,
@@ -488,7 +488,9 @@ impl ContainerConfig {
             )?)
             .add_volume_mounts(self.volume_mounts(hdfs, merged_config, labels)?)
             .context(AddVolumeMountSnafu)?
-            .add_container_ports(self.container_ports(hdfs));
+            .add_container_ports(self.container_ports(hdfs))
+            // TODO: This currently adds the metrics port also to the zkfc containers, not needed there?
+            .add_container_port(SERVICE_PORT_NAME_METRICS, hdfs.metrics_port(role).into());
 
         if let Some(resources) = resources {
             cb.resources(resources);

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

@@ -24,17 +24,23 @@ pub const SERVICE_PORT_NAME_METRICS: &str = "metrics";
 pub const DEFAULT_LISTENER_CLASS: &str = "cluster-internal";
 
 pub const DEFAULT_NAME_NODE_METRICS_PORT: u16 = 8183;
+pub const DEFAULT_NAME_NODE_NATIVE_METRICS_HTTP_PORT: u16 = 9870;
+pub const DEFAULT_NAME_NODE_NATIVE_METRICS_HTTPS_PORT: u16 = 9871;
 pub const DEFAULT_NAME_NODE_HTTP_PORT: u16 = 9870;
 pub const DEFAULT_NAME_NODE_HTTPS_PORT: u16 = 9871;
 pub const DEFAULT_NAME_NODE_RPC_PORT: u16 = 8020;
 
 pub const DEFAULT_DATA_NODE_METRICS_PORT: u16 = 8082;
+pub const DEFAULT_DATA_NODE_NATIVE_METRICS_HTTP_PORT: u16 = 9864;
+pub const DEFAULT_DATA_NODE_NATIVE_METRICS_HTTPS_PORT: u16 = 9865;
 pub const DEFAULT_DATA_NODE_HTTP_PORT: u16 = 9864;
 pub const DEFAULT_DATA_NODE_HTTPS_PORT: u16 = 9865;
 pub const DEFAULT_DATA_NODE_DATA_PORT: u16 = 9866;
 pub const DEFAULT_DATA_NODE_IPC_PORT: u16 = 9867;
 
 pub const DEFAULT_JOURNAL_NODE_METRICS_PORT: u16 = 8081;
+pub const DEFAULT_JOURNAL_NODE_NATIVE_METRICS_HTTP_PORT: u16 = 8480;
+pub const DEFAULT_JOURNAL_NODE_NATIVE_METRICS_HTTPS_PORT: u16 = 8481;
 pub const DEFAULT_JOURNAL_NODE_HTTP_PORT: u16 = 8480;
 pub const DEFAULT_JOURNAL_NODE_HTTPS_PORT: u16 = 8481;
 pub const DEFAULT_JOURNAL_NODE_RPC_PORT: u16 = 8485;

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

@@ -54,15 +54,18 @@ use crate::crd::{
         APP_NAME, CORE_SITE_XML, DEFAULT_DATA_NODE_DATA_PORT,
         DEFAULT_DATA_NODE_GRACEFUL_SHUTDOWN_TIMEOUT, DEFAULT_DATA_NODE_HTTP_PORT,
         DEFAULT_DATA_NODE_HTTPS_PORT, DEFAULT_DATA_NODE_IPC_PORT, DEFAULT_DATA_NODE_METRICS_PORT,
+        DEFAULT_DATA_NODE_NATIVE_METRICS_HTTP_PORT, DEFAULT_DATA_NODE_NATIVE_METRICS_HTTPS_PORT,
         DEFAULT_DFS_REPLICATION_FACTOR, DEFAULT_JOURNAL_NODE_GRACEFUL_SHUTDOWN_TIMEOUT,
         DEFAULT_JOURNAL_NODE_HTTP_PORT, DEFAULT_JOURNAL_NODE_HTTPS_PORT,
-        DEFAULT_JOURNAL_NODE_METRICS_PORT, DEFAULT_JOURNAL_NODE_RPC_PORT, DEFAULT_LISTENER_CLASS,
-        DEFAULT_NAME_NODE_GRACEFUL_SHUTDOWN_TIMEOUT, DEFAULT_NAME_NODE_HTTP_PORT,
-        DEFAULT_NAME_NODE_HTTPS_PORT, DEFAULT_NAME_NODE_METRICS_PORT, DEFAULT_NAME_NODE_RPC_PORT,
-        DFS_REPLICATION, HADOOP_POLICY_XML, HDFS_SITE_XML, JVM_SECURITY_PROPERTIES_FILE,
-        LISTENER_VOLUME_NAME, SERVICE_PORT_NAME_DATA, SERVICE_PORT_NAME_HTTP,
-        SERVICE_PORT_NAME_HTTPS, SERVICE_PORT_NAME_IPC, SERVICE_PORT_NAME_METRICS,
-        SERVICE_PORT_NAME_RPC, SSL_CLIENT_XML, SSL_SERVER_XML,
+        DEFAULT_JOURNAL_NODE_METRICS_PORT, DEFAULT_JOURNAL_NODE_NATIVE_METRICS_HTTP_PORT,
+        DEFAULT_JOURNAL_NODE_NATIVE_METRICS_HTTPS_PORT, DEFAULT_JOURNAL_NODE_RPC_PORT,
+        DEFAULT_LISTENER_CLASS, DEFAULT_NAME_NODE_GRACEFUL_SHUTDOWN_TIMEOUT,
+        DEFAULT_NAME_NODE_HTTP_PORT, DEFAULT_NAME_NODE_HTTPS_PORT, DEFAULT_NAME_NODE_METRICS_PORT,
+        DEFAULT_NAME_NODE_NATIVE_METRICS_HTTP_PORT, DEFAULT_NAME_NODE_NATIVE_METRICS_HTTPS_PORT,
+        DEFAULT_NAME_NODE_RPC_PORT, DFS_REPLICATION, HADOOP_POLICY_XML, HDFS_SITE_XML,
+        JVM_SECURITY_PROPERTIES_FILE, LISTENER_VOLUME_NAME, SERVICE_PORT_NAME_DATA,
+        SERVICE_PORT_NAME_HTTP, SERVICE_PORT_NAME_HTTPS, SERVICE_PORT_NAME_IPC,
+        SERVICE_PORT_NAME_METRICS, SERVICE_PORT_NAME_RPC, SSL_CLIENT_XML, SSL_SERVER_XML,
     },
     security::{AuthenticationConfig, KerberosConfig},
     storage::{
@@ -671,10 +674,6 @@ impl v1alpha1::HdfsCluster {
     pub fn ports(&self, role: &HdfsNodeRole) -> Vec<(String, u16)> {
         match role {
             HdfsNodeRole::Name => vec![
-                (
-                    String::from(SERVICE_PORT_NAME_METRICS),
-                    DEFAULT_NAME_NODE_METRICS_PORT,
-                ),
                 (
                     String::from(SERVICE_PORT_NAME_RPC),
                     DEFAULT_NAME_NODE_RPC_PORT,
@@ -692,10 +691,6 @@ impl v1alpha1::HdfsCluster {
                 },
             ],
             HdfsNodeRole::Data => vec![
-                (
-                    String::from(SERVICE_PORT_NAME_METRICS),
-                    DEFAULT_DATA_NODE_METRICS_PORT,
-                ),
                 (
                     String::from(SERVICE_PORT_NAME_DATA),
                     DEFAULT_DATA_NODE_DATA_PORT,
@@ -717,10 +712,6 @@ impl v1alpha1::HdfsCluster {
                 },
             ],
             HdfsNodeRole::Journal => vec![
-                (
-                    String::from(SERVICE_PORT_NAME_METRICS),
-                    DEFAULT_JOURNAL_NODE_METRICS_PORT,
-                ),
                 (
                     String::from(SERVICE_PORT_NAME_RPC),
                     DEFAULT_JOURNAL_NODE_RPC_PORT,
@@ -739,6 +730,97 @@ impl v1alpha1::HdfsCluster {
             ],
         }
     }
+
+    /// Returns required metrics port name and metrics port number tuples depending on the role.
+    pub fn metrics_ports(&self, role: &HdfsNodeRole) -> Vec<(String, u16)> {
+        match role {
+            HdfsNodeRole::Name => vec![(
+                String::from(SERVICE_PORT_NAME_METRICS),
+                DEFAULT_NAME_NODE_METRICS_PORT,
+            )],
+            HdfsNodeRole::Data => vec![(
+                String::from(SERVICE_PORT_NAME_METRICS),
+                DEFAULT_DATA_NODE_METRICS_PORT,
+            )],
+            HdfsNodeRole::Journal => vec![(
+                String::from(SERVICE_PORT_NAME_METRICS),
+                DEFAULT_JOURNAL_NODE_METRICS_PORT,
+            )],
+        }
+    }
+
+    /// Returns required metrics port name and native metrics port number tuples depending on the role.
+    pub fn native_metrics_ports(&self, role: &HdfsNodeRole) -> Vec<(String, u16)> {
+        match role {
+            HdfsNodeRole::Name => vec![if self.has_https_enabled() {
+                (
+                    String::from(SERVICE_PORT_NAME_METRICS),
+                    DEFAULT_NAME_NODE_NATIVE_METRICS_HTTPS_PORT,
+                )
+            } else {
+                (
+                    String::from(SERVICE_PORT_NAME_METRICS),
+                    DEFAULT_NAME_NODE_NATIVE_METRICS_HTTP_PORT,
+                )
+            }],
+            HdfsNodeRole::Data => vec![if self.has_https_enabled() {
+                (
+                    String::from(SERVICE_PORT_NAME_METRICS),
+                    DEFAULT_DATA_NODE_NATIVE_METRICS_HTTPS_PORT,
+                )
+            } else {
+                (
+                    String::from(SERVICE_PORT_NAME_METRICS),
+                    DEFAULT_DATA_NODE_NATIVE_METRICS_HTTP_PORT,
+                )
+            }],
+            HdfsNodeRole::Journal => vec![if self.has_https_enabled() {
+                (
+                    String::from(SERVICE_PORT_NAME_METRICS),
+                    DEFAULT_JOURNAL_NODE_NATIVE_METRICS_HTTPS_PORT,
+                )
+            } else {
+                (
+                    String::from(SERVICE_PORT_NAME_METRICS),
+                    DEFAULT_JOURNAL_NODE_NATIVE_METRICS_HTTP_PORT,
+                )
+            }],
+        }
+    }
+
+    pub fn metrics_port(&self, role: &HdfsNodeRole) -> u16 {
+        match role {
+            HdfsNodeRole::Name => DEFAULT_NAME_NODE_METRICS_PORT,
+            HdfsNodeRole::Data => DEFAULT_DATA_NODE_METRICS_PORT,
+            HdfsNodeRole::Journal => DEFAULT_JOURNAL_NODE_METRICS_PORT,
+        }
+    }
+
+    pub fn native_metrics_port(&self, role: &HdfsNodeRole) -> u16 {
+        match role {
+            HdfsNodeRole::Name => {
+                if self.has_https_enabled() {
+                    DEFAULT_NAME_NODE_NATIVE_METRICS_HTTPS_PORT
+                } else {
+                    DEFAULT_NAME_NODE_NATIVE_METRICS_HTTP_PORT
+                }
+            }
+            HdfsNodeRole::Data => {
+                if self.has_https_enabled() {
+                    DEFAULT_DATA_NODE_NATIVE_METRICS_HTTPS_PORT
+                } else {
+                    DEFAULT_DATA_NODE_NATIVE_METRICS_HTTP_PORT
+                }
+            }
+            HdfsNodeRole::Journal => {
+                if self.has_https_enabled() {
+                    DEFAULT_JOURNAL_NODE_NATIVE_METRICS_HTTPS_PORT
+                } else {
+                    DEFAULT_JOURNAL_NODE_NATIVE_METRICS_HTTP_PORT
+                }
+            }
+        }
+    }
 }
 
 #[derive(Clone, Debug, Deserialize, Eq, Hash, JsonSchema, PartialEq, Serialize)]