prom quring

server/Cargo.lock

@@ -1139,9 +1139,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
 
 [[package]]
 name = "subbeat"
-version = "0.0.4"
+version = "0.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13098527ed12a53c850659a33f6f83acd7a4142eadfaa80b09fc1447868d9c54"
+checksum = "b8575d807b45953cb0d42ec24574039393a5c41fc97c2750384d3370344632c3"
 dependencies = [
  "anyhow",
  "async-trait",

server/Cargo.toml

@@ -11,5 +11,6 @@ warp = "0.3"
 parking_lot = "0.11.2"
 serde = { version = "1.0", features = ["derive"] }
 fastrand = "1.5.0"
-subbeat = "0.0.4"
+# subbeat = { path = "../../../subbeat/subbeat/" }
+subbeat = "0.0.5"
 config = "0.11.0"

server/src/api.rs

@@ -1,6 +1,5 @@
 use hastic::config::Config;
 use hastic::services::{metric_service, user_service};
-use warp::filters::method::post;
 use warp::http::HeaderValue;
 use warp::hyper::{Body, StatusCode};
 use warp::{body, options, Rejection, Reply};

server/src/api/metric.rs

@@ -15,7 +15,6 @@ use crate::api::{self, API};
 
 use parking_lot::RwLock;
 use std::collections::HashMap;
-use std::convert::Infallible;
 use std::fmt::Debug;
 use std::sync::Arc;
 
@@ -43,12 +42,8 @@ async fn query(
     let prom = ms.read().get_prom();
     drop(ms);
     let res = prom.query(from, to, step).await;
-    // let pm = subbeat::datasources::prometheus::Prometheus::new(&"http://".to_owned(), &"asd".to_owned());
-    // let r = pm.query(from, to, step).await;
 
-    Ok(API::json(&QueryResponse {
-        message: "hello".to_string(),
-    }))
+    Ok(API::json(&res.unwrap()))
 }
 
 pub fn get_route(

server/src/config.rs

@@ -3,6 +3,7 @@ pub struct Config {
     pub query: String,
 }
 
+// TODO: use actual config and env variables
 impl Config {
     pub fn new() -> Config {
         Config {

server/src/services/metric_service.rs

@@ -9,7 +9,7 @@ impl MetricService {
     pub fn new(url: &str, query: &str) -> MetricService {
         MetricService {
             url: url.to_string(),
-            query: url.to_string(),
+            query: query.to_string(),
         }
     }