Merge pull request #9 from Commit-Boost/feat/grafana

Grafana persistant dashboards
Commit-Boost · Aug 2, 2024 · 44d05ea · 44d05ea
2 parents a5f4dca + 560f236
commit 44d05ea
Show file tree

Hide file tree

Showing 5 changed files with 828 additions and 2 deletions.
diff --git a/crates/cli/src/docker_init.rs b/crates/cli/src/docker_init.rs
@@ -288,6 +288,7 @@ pub fn handle_docker_init(config_path: String, output_dir: String) -> Result<()>
             networks: Networks::Simple(vec![METRICS_NETWORK.to_owned()]),
             depends_on: DependsOnOptions::Simple(vec!["cb_prometheus".to_owned()]),
             environment: Environment::List(vec!["GF_SECURITY_ADMIN_PASSWORD=admin".to_owned()]),
+            volumes: vec![Volumes::Simple("./grafana/dashboards:/etc/grafana/provisioning/dashboards".to_owned()), Volumes::Simple("./grafana/datasources:/etc/grafana/provisioning/datasources".to_owned())],
             // TODO: re-enable logging here once we move away from docker logs
             logging: Some(LoggingParameters { driver: Some("none".to_owned()), options: None }),
             ..Service::default()

diff --git a/crates/pbs/src/metrics.rs b/crates/pbs/src/metrics.rs
@@ -16,7 +16,7 @@ lazy_static! {
     // FROM RELAYS
     /// Status code received by relay by endpoint
     pub static ref RELAY_STATUS_CODE: IntCounterVec = register_int_counter_vec_with_registry!(
-        "relay_status_code",
+        "relay_status_code_total",
         "HTTP status code received by relay",
         &["http_status_code", "endpoint", "relay_id"],
         PBS_METRICS_REGISTRY
@@ -35,7 +35,7 @@ lazy_static! {
     // TO BEACON NODE
     /// Status code returned to beacon node by endpoint
     pub static ref BEACON_NODE_STATUS: IntCounterVec = register_int_counter_vec_with_registry!(
-        "beacon_node_status_code",
+        "beacon_node_status_code_total",
         "HTTP status code returned to beacon node",
         &["http_status_code", "endpoint"],
         PBS_METRICS_REGISTRY