From b2f8979a9d8b0748044ca0637f416c59586c53e7 Mon Sep 17 00:00:00 2001 From: Xavier Basty Date: Mon, 5 Feb 2024 15:31:20 +0100 Subject: [PATCH] fix Grafana panels --- Cargo.lock | 60 +++---------------- Cargo.toml | 7 ++- src/http_server/mod.rs | 1 + .../panels/http/request_response.libsonnet | 15 +---- .../panels/registry/cache_read.libsonnet | 2 +- 5 files changed, 19 insertions(+), 66 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9b70711..3d26190 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -17,17 +17,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" -[[package]] -name = "ahash" -version = "0.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - [[package]] name = "ahash" version = "0.8.6" @@ -579,7 +568,7 @@ dependencies = [ "http", "http-body", "matchit", - "metrics 0.21.1", + "metrics", "metrics-exporter-prometheus", "once_cell", "pin-project", @@ -677,7 +666,7 @@ dependencies = [ "hyper", "jsonwebtoken", "log", - "metrics 0.20.1", + "metrics", "parquet", "parquet_derive", "reqwest", @@ -1333,7 +1322,7 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ff8ae62cd3a9102e5637afc8452c55acf3844001bd5374e0b0bd7b6616c038" dependencies = [ - "ahash 0.8.6", + "ahash", ] [[package]] @@ -1702,26 +1691,15 @@ dependencies = [ "autocfg", ] -[[package]] -name = "metrics" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b9b8653cec6897f73b519a43fba5ee3d50f62fe9af80b428accdcc093b4a849" -dependencies = [ - "ahash 0.7.7", - "metrics-macros 0.6.0", - "portable-atomic 0.3.20", -] - [[package]] name = "metrics" version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fde3af1a009ed76a778cb84fdef9e7dbbdf5775ae3e4cc1f434a6a307f6f76c5" dependencies = [ - "ahash 0.8.6", - "metrics-macros 0.7.0", - "portable-atomic 1.6.0", + "ahash", + "metrics-macros", + "portable-atomic", ] [[package]] @@ -1734,7 +1712,7 @@ dependencies = [ "hyper", "indexmap 1.9.3", "ipnet", - "metrics 0.21.1", + "metrics", "metrics-util", "quanta", "thiserror", @@ -1742,17 +1720,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "metrics-macros" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "731f8ecebd9f3a4aa847dfe75455e4757a45da40a7793d2f0b1f9b6ed18b23f3" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "metrics-macros" version = "0.7.0" @@ -1773,7 +1740,7 @@ dependencies = [ "crossbeam-epoch", "crossbeam-utils", "hashbrown 0.13.1", - "metrics 0.21.1", + "metrics", "num_cpus", "quanta", "sketches-ddsketch", @@ -2031,7 +1998,7 @@ name = "parquet" version = "42.0.0" source = "git+https://github.com/WalletConnect/arrow-rs.git?rev=99a1cc3#99a1cc36bce8d55e411dd441f2219d0689a82bee" dependencies = [ - "ahash 0.8.6", + "ahash", "bytes", "chrono", "flate2", @@ -2114,15 +2081,6 @@ version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" -[[package]] -name = "portable-atomic" -version = "0.3.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e30165d31df606f5726b090ec7592c308a0eaf61721ff64c9a3018e344a8753e" -dependencies = [ - "portable-atomic 1.6.0", -] - [[package]] name = "portable-atomic" version = "1.6.0" diff --git a/Cargo.toml b/Cargo.toml index 14cfcf1..9a78698 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,7 +30,7 @@ cerberus = { git = "https://github.com/WalletConnect/cerberus.git", tag = "v0.9. # O11y tracing = "0.1" tracing-subscriber = { version = "0.3", features = ["json"] } -metrics = "0.20" +metrics = "0.21" axum-prometheus = "0.3" # Serialisation @@ -53,3 +53,8 @@ tap = "1.0" [build-dependencies] build-info-build = ">=0.0.30" + +[package.metadata.cargo-udeps.ignore] +normal = ["unicode-normalization"] +#development = [] +#build = [] diff --git a/src/http_server/mod.rs b/src/http_server/mod.rs index fd11a29..f06d568 100644 --- a/src/http_server/mod.rs +++ b/src/http_server/mod.rs @@ -308,6 +308,7 @@ fn build_content_security_header(domains: Vec) -> String { // `*.domain` doesn't match `domain` by the Content-Security-Policy spec, so // we are specifying both. + // // See the test for this function if you have any doubts. [" ", proto, "*.", domain, " ", proto, domain] }); diff --git a/terraform/monitoring/panels/http/request_response.libsonnet b/terraform/monitoring/panels/http/request_response.libsonnet index e480bb1..280adc6 100644 --- a/terraform/monitoring/panels/http/request_response.libsonnet +++ b/terraform/monitoring/panels/http/request_response.libsonnet @@ -4,22 +4,11 @@ local defaults = import '../../grafonnet-lib/defaults.libsonnet'; local panels = grafana.panels; local targets = grafana.targets; -local thresholds = { - warning: 80, -}; - local _configuration = defaults.configuration.timeseries - .withUnit(grafana.fieldConfig.units.Milliseconds) .withThresholdStyle(grafana.fieldConfig.thresholdStyle.Area) .withThresholds( - baseColor = defaults.values.colors.ok, - steps = [ - { value: thresholds.warning, color: defaults.values.colors.critical }, - ] - ) - .withSoftLimit( - axisSoftMin = 0, - axisSoftMax = thresholds.warning, + baseColor = 'transparent', + steps = [] ) .addOverrides([ grafana.override.newColorOverride( diff --git a/terraform/monitoring/panels/registry/cache_read.libsonnet b/terraform/monitoring/panels/registry/cache_read.libsonnet index 2be600c..ce29a40 100644 --- a/terraform/monitoring/panels/registry/cache_read.libsonnet +++ b/terraform/monitoring/panels/registry/cache_read.libsonnet @@ -34,7 +34,7 @@ local _configuration = defaults.configuration.timeseries { new(ds, vars):: panels.timeseries( - title = 'Cache Weads / s', + title = 'Cache Reads / s', datasource = ds.prometheus, ) .configure(_configuration)