self in cluster info

Author: nikhilsinhaparseable

src/handlers/http/cluster/mod.rs

@@ -540,7 +540,20 @@ pub async fn send_retention_cleanup_request(
 }
 
 pub async fn get_cluster_info() -> Result<impl Responder, StreamError> {
-    // Get ingestor and indexer metadata concurrently
+    let self_info = utils::ClusterInfo::new(
+        &PARSEABLE.options.address,
+        true,
+        PARSEABLE
+            .options
+            .staging_dir()
+            .to_string_lossy()
+            .to_string(),
+        PARSEABLE.storage.get_endpoint(),
+        None,
+        Some(String::from("200 OK")),
+        &PARSEABLE.options.mode.to_node_type(),
+    );
+    // Get querier, ingestor and indexer metadata concurrently
     let (querier_result, ingestor_result, indexer_result) = future::join3(
         get_node_info("querier"),
         get_node_info("ingestor"),
@@ -585,6 +598,7 @@ pub async fn get_cluster_info() -> Result<impl Responder, StreamError> {
     infos.extend(querier_infos?);
     infos.extend(ingestor_infos?);
     infos.extend(indexer_infos?);
+    infos.push(self_info);
 
     Ok(actix_web::HttpResponse::Ok().json(infos))
 }

src/handlers/http/modal/mod.rs

@@ -200,14 +200,14 @@ pub async fn load_on_init() -> anyhow::Result<()> {
 }
 
 #[derive(Debug, Serialize, Deserialize, Clone, Eq, PartialEq, Default)]
+#[serde(rename_all = "lowercase")]
 pub enum NodeType {
     #[default]
-    #[serde(rename = "ingestor")]
     Ingestor,
-    #[serde(rename = "indexer")]
     Indexer,
-    #[serde(rename = "querier")]
     Querier,
+    Prism,
+    All,
 }
 
 impl NodeType {
@@ -216,6 +216,8 @@ impl NodeType {
             NodeType::Ingestor => "ingestor",
             NodeType::Indexer => "indexer",
             NodeType::Querier => "querier",
+            NodeType::Prism => "prism",
+            NodeType::All => "all",
         }
     }
 
@@ -224,6 +226,8 @@ impl NodeType {
             NodeType::Ingestor => Mode::Ingest,
             NodeType::Indexer => Mode::Index,
             NodeType::Querier => Mode::Query,
+            NodeType::Prism => Mode::Prism,
+            NodeType::All => Mode::All,
         }
     }
 }
@@ -532,89 +536,6 @@ pub type IngestorMetadata = NodeMetadata;
 pub type IndexerMetadata = NodeMetadata;
 pub type QuerierMetadata = NodeMetadata;
 
-// Helper functions for creating specific node types
-pub fn create_ingestor_metadata(
-    port: String,
-    domain_name: String,
-    bucket_name: String,
-    username: &str,
-    password: &str,
-    ingestor_id: String,
-    flight_port: String,
-) -> NodeMetadata {
-    NodeMetadata::new(
-        port,
-        domain_name,
-        bucket_name,
-        username,
-        password,
-        ingestor_id,
-        flight_port,
-        NodeType::Ingestor,
-    )
-}
-
-pub fn load_ingestor_metadata(
-    options: &Options,
-    storage: &dyn ObjectStorageProvider,
-) -> Arc<NodeMetadata> {
-    NodeMetadata::load(options, storage, NodeType::Ingestor)
-}
-
-pub fn create_indexer_metadata(
-    port: String,
-    domain_name: String,
-    bucket_name: String,
-    username: &str,
-    password: &str,
-    indexer_id: String,
-    flight_port: String,
-) -> NodeMetadata {
-    NodeMetadata::new(
-        port,
-        domain_name,
-        bucket_name,
-        username,
-        password,
-        indexer_id,
-        flight_port,
-        NodeType::Indexer,
-    )
-}
-
-pub fn load_indexer_metadata(
-    options: &Options,
-    storage: &dyn ObjectStorageProvider,
-) -> Arc<NodeMetadata> {
-    NodeMetadata::load(options, storage, NodeType::Indexer)
-}
-
-pub fn create_querier_metadata(
-    port: String,
-    domain_name: String,
-    bucket_name: String,
-    username: &str,
-    password: &str,
-    querier_id: String,
-    flight_port: String,
-) -> NodeMetadata {
-    NodeMetadata::new(
-        port,
-        domain_name,
-        bucket_name,
-        username,
-        password,
-        querier_id,
-        flight_port,
-        NodeType::Querier,
-    )
-}
-pub fn load_querier_metadata(
-    options: &Options,
-    storage: &dyn ObjectStorageProvider,
-) -> Arc<NodeMetadata> {
-    NodeMetadata::load(options, storage, NodeType::Querier)
-}
 #[cfg(test)]
 mod test {
     use actix_web::body::MessageBody;

src/option.rs

@@ -18,6 +18,8 @@
 use parquet::basic::{BrotliLevel, GzipLevel, ZstdLevel};
 use serde::{Deserialize, Serialize};
 
+use crate::handlers::http::modal::NodeType;
+
 #[derive(Debug, Default, Eq, PartialEq, Clone, Copy, Serialize, Deserialize)]
 pub enum Mode {
     Query,
@@ -41,6 +43,16 @@ impl Mode {
 
         Ok(())
     }
+
+    pub fn to_node_type(&self) -> NodeType {
+        match self {
+            Mode::Ingest => NodeType::Ingestor,
+            Mode::Index => NodeType::Indexer,
+            Mode::Query => NodeType::Querier,
+            Mode::Prism => NodeType::Prism,
+            Mode::All => NodeType::All,
+        }
+    }
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Default, Deserialize)]