examples/example_dashboards.yaml

@@ -4,17 +4,14 @@
     - title: Node cpu
       source: http://heimdall:9001
       query: 'sum by (instance)(irate(node_cpu_seconds_total{mode="system",job="nodestats"}[5m])) * 100'
-      query_type: Range
       name_label: instance
 - title: Test Dasbboard 2
   graphs:
     - title: Node cpu
       source: http://heimdall:9001
       query: 'sum by (instance)(irate(node_cpu_seconds_total{mode="system",job="nodestats"}[5m])) * 100'
-      query_type: Range
       name_label: instance
     - title: Node memory
       source: http://heimdall:9001
-      query: 'node_memory_MemFree_bytes{job="nodestats"}'
+      query: 'node_memory_MemFree_bytes{,job="nodestats"}'
-      query_type: Scalar
       name_label: instance

src/dashboard.rs

@@ -15,9 +15,9 @@ use std::path::Path;
 
 use serde::Deserialize;
 use serde_yaml;
-use tracing::debug;
+use tracing::{debug, info};
 
-use crate::query::{QueryConn, QueryType};
+use crate::query::QueryConn;
 
 #[derive(Deserialize)]
 pub struct Dashboard {
@@ -31,13 +31,12 @@ pub struct Graph {
     pub source: String,
     pub query: String,
     pub name_label: String,
-    pub query_type: QueryType,
 }
 
 impl Graph {
     pub fn get_query_connection<'conn, 'graph: 'conn>(&'graph self) -> QueryConn<'conn> {
         debug!(query=self.query, source=self.source, "Getting query connection for graph");
-        QueryConn::new(&self.source, &self.query, self.query_type.clone())
+        QueryConn::new(&self.source, &self.query)
     }
 }
 

src/query.rs

@@ -18,24 +18,16 @@ use serde::{Serialize, Deserialize};
 use tracing::debug;
 use chrono::prelude::*;
 
-#[derive(Deserialize, Clone)]
-pub enum QueryType {
-    Range,
-    Scalar,
-}
-
 pub struct QueryConn<'conn> {
     source: &'conn str,
     query: &'conn str,
-    query_type: QueryType,    
 }
 
 impl<'conn> QueryConn<'conn> {
-    pub fn new<'a: 'conn>(source: &'a str, query: &'a str, query_type: QueryType) -> Self {
+    pub fn new<'a: 'conn>(source: &'a str, query: &'a str) -> Self {
         Self {
             source,
             query,
-            query_type,
         }
     }
 
@@ -45,10 +37,7 @@ impl<'conn> QueryConn<'conn> {
         let end = Utc::now().timestamp();
         let start = end - (60 * 10);
         let step_resolution = 10 as f64;
-        match self.query_type {
+        Ok(client.query_range(self.query, start, end, step_resolution).get().await?)
-            QueryType::Range => Ok(client.query_range(self.query, start, end, step_resolution).get().await?),
-            QueryType::Scalar => Ok(client.query(self.query).get().await?),
-        }
     }
 }
 
@@ -62,7 +51,7 @@ pub struct DataPoint {
 #[derive(Serialize, Deserialize)]
 pub enum QueryResult {
     Series(Vec<(HashMap<String, String>, Vec<DataPoint>)>),
-    Scalar(Vec<(HashMap<String, String>, DataPoint)>),
+    Scalar(DataPoint),
 }
 
 pub fn to_samples(data: Data) -> QueryResult {
@@ -76,13 +65,13 @@ pub fn to_samples(data: Data) -> QueryResult {
             }).collect())
         }
         Data::Vector(mut vector) => {
-            QueryResult::Scalar(vector.drain(0..).map(|iv| {
+            QueryResult::Series(vector.drain(0..).map(|iv| {
                 let (metric, sample) = iv.into_inner();
-                (metric, DataPoint { timestamp: sample.timestamp(), value: sample.value() })
+                (metric, vec![DataPoint { timestamp: sample.timestamp(), value: sample.value() }])
             }).collect())
         }
         Data::Scalar(sample) => {
-            QueryResult::Scalar(vec![(HashMap::new(), DataPoint { timestamp: sample.timestamp(), value: sample.value() })])
+            QueryResult::Scalar(DataPoint { timestamp: sample.timestamp(), value: sample.value() })
         }
     }
 }

src/routes.rs

@@ -19,9 +19,8 @@ use axum::{
     routing::get,
     Json, Router,
 };
-
+use axum_macros::debug_handler;
-// https://maud.lambda.xyz/getting-started.html
+use maud::{html, Markup, PreEscaped};
-use maud::{html, Markup};
 use tracing::debug;
 
 use crate::dashboard::{Dashboard, Graph};
@@ -29,6 +28,7 @@ use crate::query::{to_samples, QueryResult};
 
 type Config = State<Arc<Vec<Dashboard>>>;
 
+//#[axum_macros::debug_handler]
 pub async fn graph_query(
     State(config): Config,
     Path((dash_idx, graph_idx)): Path<(usize, usize)>,

static/lib.js

@@ -1,16 +1,3 @@
-// Copyright 2021 Jeremy Wall
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 class TimeseriesGraph extends HTMLElement {
     #uri;
     #width;
@@ -102,7 +89,6 @@ class TimeseriesGraph extends HTMLElement {
     async updateGraph() {
         const data = await this.fetchData();
         if (data.Series) {
-            // https://plotly.com/javascript/reference/scatter/
             var traces = [];
             for (const pair of data.Series) {
                 const series = pair[1];
@@ -124,7 +110,6 @@ class TimeseriesGraph extends HTMLElement {
                 traces.push(trace);
             }
             console.log("Traces: ", traces);
-            // https://plotly.com/javascript/plotlyjs-function-reference/#plotlyreact
             Plotly.react(this.getTargetNode(), traces,
                 {
                     legend: {
@@ -136,35 +121,7 @@ class TimeseriesGraph extends HTMLElement {
                     responsive: true
                 });
         } else if (data.Scalar) {
-            // https://plotly.com/javascript/reference/bar/
+            // The graph should be a single value
-            console.log("scalar data: ", data.Scalar);
-            var traces = [];
-            for (const pair of data.Scalar) {
-                const series = pair[1];
-                const labels = pair[0];
-                var trace = {
-                    type: "bar",
-                    x: [],
-                    y: []
-                };
-                console.log("labels: ", labels, this.#label);
-                if (labels[this.#label]) {
-                    trace.x.push(labels[this.#label]);
-                };
-                trace.y.push(series.value);
-                traces.push(trace);
-            }
-            console.log("Traces: ", traces);
-            Plotly.react(this.getTargetNode(), traces,
-                {
-                    legend: {
-                        orientation: 'h'
-                    }
-                },
-                {
-                    displayModeBar: false,
-                    responsive: true
-                });
         }
     }
 }