Fix interval as param

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pony"
-version = "0.0.22"
+version = "0.0.23"
 edition = "2021"
 
 [dependencies]

config-example.toml

@@ -3,6 +3,7 @@
 
 [clickhouse]
 #address = "http://localhost:8123"
+fetch_interval_minute = 10
 
 [app]
 #env = "dev"

src/clickhouse.rs

@@ -15,6 +15,7 @@ pub async fn fetch_metrics_value(
     env: &str,
     cluster: &str,
     metric_postfix: &str,
+    fetch_interval: u8,
 ) -> Result<Vec<MetricValue>, Box<dyn Error>> {
     let metric_value_req = format!(
         "SELECT
@@ -23,7 +24,7 @@ pub async fn fetch_metrics_value(
                           toFloat64(anyLast(Value)) AS value
                         FROM default.graphite_data
                         WHERE metric LIKE '{env}.{cluster}%.{metric_postfix}'
-                        AND Timestamp >= now() - INTERVAL 1 MINUTE
+                        AND Timestamp >= now() - INTERVAL {fetch_interval} MINUTE
                         GROUP BY metric"
     );
 

src/config2.rs

@@ -21,6 +21,10 @@ fn default_wg_port() -> u16 {
     51820
 }
 
+fn default_fetch_interval() -> u8 {
+    10
+}
+
 fn default_api_bind_addr() -> String {
     "0.0.0.0".to_string()
 }
@@ -77,6 +81,8 @@ pub struct CarbonConfig {
 pub struct ChConfig {
     #[serde(default = "default_ch_server")]
     pub address: String,
+    #[serde(default = "default_fetch_interval")]
+    pub fetch_interval_minute: u8,
 }
 
 #[derive(Clone, Debug, Deserialize, Default)]
@@ -159,7 +165,6 @@ impl Settings {
         if self.wg.enabled && self.wg.port == 0 {
             return Err("Xray wg порт port coulnd't be 0".into());
         }
-        // Другие проверки
         Ok(())
     }
 }

src/main.rs

@@ -34,7 +34,7 @@ use crate::web::not_found;
 
 #[derive(Parser)]
 #[command(
-    version = "0.0.22",
+    version = "0.0.23",
     about = "Pony - montiroing tool for Xray/Wireguard"
 )]
 struct Cli {
@@ -77,7 +77,7 @@ async fn main() -> std::io::Result<()> {
         std::process::exit(1);
     } else {
         info!(">>> Settings: {:?}", settings);
-        info!(">>> Version: 0.0.22");
+        info!(">>> Version: 0.0.23");
     }
 
     let carbon_server = settings.carbon.address.clone();

src/web.rs

@@ -9,6 +9,7 @@ use std::collections::HashMap;
 use std::sync::Arc;
 
 use crate::clickhouse::fetch_metrics_value;
+use crate::config2::Settings;
 
 #[derive(Deserialize)]
 struct Params {
@@ -149,7 +150,11 @@ pub async fn hello() -> impl Responder {
 }
 
 #[get("/status/{env}/{cluster}")]
-pub async fn status(req: Path<Params>, ch_client: Data<Arc<Client>>) -> impl Responder {
+pub async fn status(
+    req: Path<Params>,
+    ch_client: Data<Arc<Client>>,
+    settings: Data<Arc<Settings>>,
+) -> impl Responder {
     let mut connections_by_type = ConnectionsByType {
         vless: Vec::new(),
         vmess: Vec::new(),
@@ -161,8 +166,14 @@ pub async fn status(req: Path<Params>, ch_client: Data<Arc<Client>>) -> impl Res
 
     for connection_type in connection_types {
         let request_postfix = format!("connections.{connection_type}");
-        let metrics_connections =
-            fetch_metrics_value(&ch_client, &req.env, &req.cluster, &request_postfix).await;
+        let metrics_connections = fetch_metrics_value(
+            &ch_client,
+            &req.env,
+            &req.cluster,
+            &request_postfix,
+            settings.clickhouse.fetch_interval_minute,
+        )
+        .await;
 
         let metrics_value_connections = match metrics_connections {
             Ok(metrics) => metrics
@@ -201,7 +212,14 @@ pub async fn status(req: Path<Params>, ch_client: Data<Arc<Client>>) -> impl Res
         }
     }
 
-    let metrics_bps = fetch_metrics_value(&ch_client, &req.env, &req.cluster, "%bps").await;
+    let metrics_bps = fetch_metrics_value(
+        &ch_client,
+        &req.env,
+        &req.cluster,
+        "%bps",
+        settings.clickhouse.fetch_interval_minute,
+    )
+    .await;
     let metrics_value_bps = match metrics_bps {
         Ok(metrics) => metrics
             .into_iter()