update: cluster/info to return bucket name

cluster info now also returns the bucket name
parseablehq · Mar 26, 2024 · f9c2f64 · f9c2f64
1 parent f0dfd87
commit f9c2f64
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/server/src/handlers/http/about.rs b/server/src/handlers/http/about.rs
@@ -28,6 +28,26 @@ use crate::{
 };
 use std::path::PathBuf;
 
+/// {
+///     "version": current_version,
+///     "uiVersion": ui_version,
+///     "commit": commit,
+///     "deploymentId": deployment_id,
+///     "updateAvailable": update_available,
+///     "latestVersion": latest_release,
+///     "llmActive": is_llm_active,
+///     "llmProvider": llm_provider,
+///     "oidcActive": is_oidc_active,
+///     "license": "AGPL-3.0-only",
+///     "mode": mode,
+///     "staging": staging,
+///     "cache": cache_details,
+///     "grpcPort": grpc_port,
+///     "store": {
+///         "type": CONFIG.get_storage_mode_string(),
+///         "path": store_endpoint
+///     }
+/// }
 pub async fn about() -> Json<serde_json::Value> {
     let meta = StorageMetadata::global();
 

diff --git a/server/src/handlers/http/modal/query_server.rs b/server/src/handlers/http/modal/query_server.rs
@@ -248,6 +248,7 @@ impl QueryServer {
                 &ingester.domain_name,
                 reachable,
                 staging_path,
+                CONFIG.storage().get_endpoint(),
                 error,
                 status,
             ));
@@ -692,6 +693,7 @@ struct ClusterInfo {
     domain_name: String,
     reachable: bool,
     staging_path: String,
+    storage_path: String,
     error: Option<String>,  // error message if the ingester is not reachable
     status: Option<String>, // status message if the ingester is reachable
 }
@@ -701,13 +703,15 @@ impl ClusterInfo {
         domain_name: &str,
         reachable: bool,
         staging_path: String,
+        storage_path: String,
         error: Option<String>,
         status: Option<String>,
     ) -> Self {
         Self {
             domain_name: domain_name.to_string(),
             reachable,
             staging_path,
+            storage_path,
             error,
             status,
         }