From 455b8a3b57e0e0a19a1a1653a3a7129b0ef67a86 Mon Sep 17 00:00:00 2001 From: Ales Verbic Date: Sun, 3 May 2026 17:48:08 -0400 Subject: [PATCH 1/4] chore: update Blinklabs/Kupo endpoints Signed-off-by: Ales Verbic --- cloudflare.tf | 305 +++++++------------------------------------------- config.yaml | 12 +- 2 files changed, 49 insertions(+), 268 deletions(-) diff --git a/cloudflare.tf b/cloudflare.tf index 5285f99..a4dfc32 100644 --- a/cloudflare.tf +++ b/cloudflare.tf @@ -20,23 +20,16 @@ locals { demeter_providers = [ { name = "blinklabs-us" - blockfrost = { + blockfrost_m1 = { enabled = true + address = "demeter.blinklabs.cloud" port = 3001 health_check_port = 3001 - networks = { - cardano_mainnet = "preview.dolos.blinklabs.cloud" - cardano_preprod = "preview.dolos.blinklabs.cloud" - cardano_preview = "preview.dolos.blinklabs.cloud" - } } - kupo = { + kupo_m1 = { enabled = true - networks = { - cardano_mainnet = "kupo.blinklabs.cloud" - cardano_preprod = "preprod.kupo.blinklabs.cloud" - cardano_preview = "preview.kupo.blinklabs.cloud" - } + address = "demeter.blinklabs.cloud" + port = 4442 } ogmios = { enabled = true @@ -63,23 +56,16 @@ locals { }, { name = "txpipe-m2" - blockfrost = { + blockfrost_m1 = { enabled = false + address = "" port = 0 health_check_port = 0 - networks = { - cardano_mainnet = "" - cardano_preprod = "" - cardano_preview = "" - } } - kupo = { - enabled = true - networks = { - cardano_mainnet = "mainnet-v2.kupo-m1.demeter.run" - cardano_preprod = "preprod-v2.kupo-m1.demeter.run" - cardano_preview = "preview-v2.kupo-m1.demeter.run" - } + kupo_m1 = { + enabled = false + address = "" + port = 0 } ogmios = { enabled = true @@ -125,6 +111,15 @@ resource "cloudflare_certificate_pack" "this" { hosts = [ "*.dmtr.host", + // CNode + "*.cnode-m1.dmtr.host", + "*.cardano-mainnet.cnode-m1.dmtr.host", + "*.cardano-preprod.cnode-m1.dmtr.host", + "*.cardano-preview.cnode-m1.dmtr.host", + "*.vector-mainnet.cnode-m1.dmtr.host", + "*.vector-testnet.cnode-m1.dmtr.host", + "*.prime-testnet.cnode-m1.dmtr.host", + // Ogmios "*.ogmios-m1.dmtr.host", "*.cardano-mainnet-v6.ogmios-m1.dmtr.host", @@ -169,42 +164,10 @@ resource "cloudflare_certificate_pack" "this" { } # Kupo -resource "cloudflare_load_balancer_pool" "kupo_preview" { - name = "KupoPreview" - - account_id = var.cloudflare_account_id - monitor = cloudflare_load_balancer_monitor.kupo_preview_monitor.id - - origins = [ - for p in local.demeter_providers : { - name = p.name - address = p.kupo.networks.cardano_preview != "" ? p.kupo.networks.cardano_preview : "${p.name}.${var.cloudflare_zone_name}" - } if p.kupo.enabled - ] -} - -resource "cloudflare_load_balancer" "kupo_preview" { - zone_id = var.cloudflare_zone_id - name = "cardano-preview-v2.kupo-m1.${var.cloudflare_zone_name}" - default_pools = [cloudflare_load_balancer_pool.kupo_preview.id] - fallback_pool = cloudflare_load_balancer_pool.kupo_preview.id - proxied = true - steering_policy = "off" -} - -resource "cloudflare_load_balancer" "kupo_preview_splat" { - zone_id = var.cloudflare_zone_id - name = "*.cardano-preview-v2.kupo-m1.${var.cloudflare_zone_name}" - default_pools = [cloudflare_load_balancer_pool.kupo_preview.id] - fallback_pool = cloudflare_load_balancer_pool.kupo_preview.id - proxied = true - steering_policy = "off" -} - -resource "cloudflare_load_balancer_monitor" "kupo_preview_monitor" { +resource "cloudflare_load_balancer_monitor" "kupo_m1_monitor" { account_id = var.cloudflare_account_id type = "https" - description = "Health check for KupoPreview" + description = "Health check for KupoM1" path = "/dmtr_health" interval = 60 timeout = 5 @@ -214,96 +177,29 @@ resource "cloudflare_load_balancer_monitor" "kupo_preview_monitor" { allow_insecure = true } -resource "cloudflare_load_balancer_pool" "kupo_preprod" { - name = "KupoPreprod" - +resource "cloudflare_load_balancer_pool" "kupo_m1" { + name = "KupoM1" account_id = var.cloudflare_account_id - monitor = cloudflare_load_balancer_monitor.kupo_preprod_monitor.id + monitor = cloudflare_load_balancer_monitor.kupo_m1_monitor.id origins = [ for p in local.demeter_providers : { name = p.name - address = p.kupo.networks.cardano_preprod != "" ? p.kupo.networks.cardano_preprod : "${p.name}.${var.cloudflare_zone_name}" - } if p.kupo.enabled + address = p.kupo_m1.address != "" ? p.kupo_m1.address : "${p.name}.${var.cloudflare_zone_name}" + port = p.kupo_m1.port != 0 ? p.kupo_m1.port : null + } if p.kupo_m1.enabled ] } -resource "cloudflare_load_balancer" "kupo_preprod" { +resource "cloudflare_load_balancer" "kupo_m1_splat" { zone_id = var.cloudflare_zone_id - name = "cardano-preprod-v2.kupo-m1.${var.cloudflare_zone_name}" - default_pools = [cloudflare_load_balancer_pool.kupo_preprod.id] - fallback_pool = cloudflare_load_balancer_pool.kupo_preprod.id + name = "*.kupo-m1.${var.cloudflare_zone_name}" + default_pools = [cloudflare_load_balancer_pool.kupo_m1.id] + fallback_pool = cloudflare_load_balancer_pool.kupo_m1.id proxied = true steering_policy = "off" } -resource "cloudflare_load_balancer" "kupo_preprod_splat" { - zone_id = var.cloudflare_zone_id - name = "*.cardano-preprod-v2.kupo-m1.${var.cloudflare_zone_name}" - default_pools = [cloudflare_load_balancer_pool.kupo_preprod.id] - fallback_pool = cloudflare_load_balancer_pool.kupo_preprod.id - proxied = true - steering_policy = "off" -} - -resource "cloudflare_load_balancer_monitor" "kupo_preprod_monitor" { - account_id = var.cloudflare_account_id - type = "https" - description = "Health check for KupoPreprod" - path = "/dmtr_health" - interval = 60 - timeout = 5 - retries = 2 - method = "GET" - expected_codes = "200" - allow_insecure = true -} - -resource "cloudflare_load_balancer_pool" "kupo_mainnet" { - name = "KupoMainnet" - - account_id = var.cloudflare_account_id - monitor = cloudflare_load_balancer_monitor.kupo_mainnet_monitor.id - - origins = [ - for p in local.demeter_providers : { - name = p.name - address = p.kupo.networks.cardano_mainnet != "" ? p.kupo.networks.cardano_mainnet : "${p.name}.${var.cloudflare_zone_name}" - } if p.kupo.enabled - ] -} - -resource "cloudflare_load_balancer" "kupo_mainnet" { - zone_id = var.cloudflare_zone_id - name = "cardano-mainnet-v2.kupo-m1.${var.cloudflare_zone_name}" - default_pools = [cloudflare_load_balancer_pool.kupo_mainnet.id] - fallback_pool = cloudflare_load_balancer_pool.kupo_mainnet.id - proxied = true - steering_policy = "off" -} - -resource "cloudflare_load_balancer" "kupo_mainnet_splat" { - zone_id = var.cloudflare_zone_id - name = "*.cardano-mainnet-v2.kupo-m1.${var.cloudflare_zone_name}" - default_pools = [cloudflare_load_balancer_pool.kupo_mainnet.id] - fallback_pool = cloudflare_load_balancer_pool.kupo_mainnet.id - proxied = true - steering_policy = "off" -} - -resource "cloudflare_load_balancer_monitor" "kupo_mainnet_monitor" { - account_id = var.cloudflare_account_id - type = "https" - description = "Health check for KupoMainnet" - path = "/dmtr_health" - interval = 60 - timeout = 5 - retries = 2 - method = "GET" - expected_codes = "200" - allow_insecure = true -} - # Ogmios resource "cloudflare_load_balancer_pool" "ogmios_preview" { name = "OgmiosPreview" @@ -477,92 +373,12 @@ resource "cloudflare_load_balancer" "tx_submit_api_m1" { } # Blockfrost -resource "cloudflare_load_balancer_pool" "blockfrost_preview" { - name = "BlockfrostPreview" - - account_id = var.cloudflare_account_id - monitor = cloudflare_load_balancer_monitor.blockfrost_preview_monitor.id - - origins = [ - for p in local.demeter_providers : { - name = p.name - address = p.blockfrost.networks.cardano_preview != "" ? p.blockfrost.networks.cardano_preview : "${p.name}.${var.cloudflare_zone_name}" - port = p.blockfrost.port != 0 ? p.blockfrost.port : null - } if p.blockfrost.enabled - ] -} - -resource "cloudflare_load_balancer" "blockfrost_preview" { - zone_id = var.cloudflare_zone_id - name = "cardano-preview.blockfrost-m1.${var.cloudflare_zone_name}" - default_pools = [cloudflare_load_balancer_pool.blockfrost_preview.id] - fallback_pool = cloudflare_load_balancer_pool.blockfrost_preview.id - proxied = true - steering_policy = "off" -} - -resource "cloudflare_load_balancer" "blockfrost_preview_splat" { - zone_id = var.cloudflare_zone_id - name = "*.cardano-preview.blockfrost-m1.${var.cloudflare_zone_name}" - default_pools = [cloudflare_load_balancer_pool.blockfrost_preview.id] - fallback_pool = cloudflare_load_balancer_pool.blockfrost_preview.id - proxied = true - steering_policy = "off" -} - -resource "cloudflare_load_balancer_monitor" "blockfrost_preview_monitor" { - account_id = var.cloudflare_account_id - type = "https" - description = "Health check for BlockfrostPreview" - path = "/dmtr_health" - port = try(([for p in local.demeter_providers : p.blockfrost.health_check_port if p.blockfrost.enabled && p.blockfrost.health_check_port != 0])[0], null) - interval = 60 - timeout = 5 - retries = 2 - method = "GET" - expected_codes = "200" - allow_insecure = true -} - -resource "cloudflare_load_balancer_pool" "blockfrost_preprod" { - name = "BlockfrostPreprod" - - account_id = var.cloudflare_account_id - monitor = cloudflare_load_balancer_monitor.blockfrost_preprod_monitor.id - - origins = [ - for p in local.demeter_providers : { - name = p.name - address = p.blockfrost.networks.cardano_preprod != "" ? p.blockfrost.networks.cardano_preprod : "${p.name}.${var.cloudflare_zone_name}" - port = p.blockfrost.port != 0 ? p.blockfrost.port : null - } if p.blockfrost.enabled - ] -} - -resource "cloudflare_load_balancer" "blockfrost_preprod" { - zone_id = var.cloudflare_zone_id - name = "cardano-preprod.blockfrost-m1.${var.cloudflare_zone_name}" - default_pools = [cloudflare_load_balancer_pool.blockfrost_preprod.id] - fallback_pool = cloudflare_load_balancer_pool.blockfrost_preprod.id - proxied = true - steering_policy = "off" -} - -resource "cloudflare_load_balancer" "blockfrost_preprod_splat" { - zone_id = var.cloudflare_zone_id - name = "*.cardano-preprod.blockfrost-m1.${var.cloudflare_zone_name}" - default_pools = [cloudflare_load_balancer_pool.blockfrost_preprod.id] - fallback_pool = cloudflare_load_balancer_pool.blockfrost_preprod.id - proxied = true - steering_policy = "off" -} - -resource "cloudflare_load_balancer_monitor" "blockfrost_preprod_monitor" { +resource "cloudflare_load_balancer_monitor" "blockfrost_m1_monitor" { account_id = var.cloudflare_account_id type = "https" - description = "Health check for BlockfrostPreprod" + description = "Health check for BlockfrostM1" path = "/dmtr_health" - port = try(([for p in local.demeter_providers : p.blockfrost.health_check_port if p.blockfrost.enabled && p.blockfrost.health_check_port != 0])[0], null) + port = try(([for p in local.demeter_providers : p.blockfrost_m1.health_check_port if p.blockfrost_m1.enabled && p.blockfrost_m1.health_check_port != 0])[0], null) interval = 60 timeout = 5 retries = 2 @@ -571,62 +387,27 @@ resource "cloudflare_load_balancer_monitor" "blockfrost_preprod_monitor" { allow_insecure = true } -resource "cloudflare_load_balancer_pool" "blockfrost_mainnet" { - name = "BlockfrostMainnet" - +resource "cloudflare_load_balancer_pool" "blockfrost_m1" { + name = "BlockfrostM1" account_id = var.cloudflare_account_id - monitor = cloudflare_load_balancer_monitor.blockfrost_mainnet_monitor.id + monitor = cloudflare_load_balancer_monitor.blockfrost_m1_monitor.id origins = [ for p in local.demeter_providers : { name = p.name - address = p.blockfrost.networks.cardano_mainnet != "" ? p.blockfrost.networks.cardano_mainnet : "${p.name}.${var.cloudflare_zone_name}" - port = p.blockfrost.port != 0 ? p.blockfrost.port : null - } if p.blockfrost.enabled + address = p.blockfrost_m1.address != "" ? p.blockfrost_m1.address : "${p.name}.${var.cloudflare_zone_name}" + port = p.blockfrost_m1.port != 0 ? p.blockfrost_m1.port : null + } if p.blockfrost_m1.enabled ] } -resource "cloudflare_load_balancer" "blockfrost_mainnet" { - zone_id = var.cloudflare_zone_id - name = "cardano-mainnet.blockfrost-m1.${var.cloudflare_zone_name}" - default_pools = [cloudflare_load_balancer_pool.blockfrost_mainnet.id] - fallback_pool = cloudflare_load_balancer_pool.blockfrost_mainnet.id - proxied = true - steering_policy = "off" -} - -resource "cloudflare_load_balancer" "blockfrost_mainnet_splat" { - zone_id = var.cloudflare_zone_id - name = "*.cardano-mainnet.blockfrost-m1.${var.cloudflare_zone_name}" - default_pools = [cloudflare_load_balancer_pool.blockfrost_mainnet.id] - fallback_pool = cloudflare_load_balancer_pool.blockfrost_mainnet.id - proxied = true - steering_policy = "off" -} - resource "cloudflare_load_balancer" "blockfrost_m1_splat" { zone_id = var.cloudflare_zone_id name = "*.blockfrost-m1.${var.cloudflare_zone_name}" - default_pools = [cloudflare_load_balancer_pool.blockfrost_preview.id] - fallback_pool = cloudflare_load_balancer_pool.blockfrost_preview.id + default_pools = [cloudflare_load_balancer_pool.blockfrost_m1.id] + fallback_pool = cloudflare_load_balancer_pool.blockfrost_m1.id proxied = true steering_policy = "off" - - rules = [] -} - -resource "cloudflare_load_balancer_monitor" "blockfrost_mainnet_monitor" { - account_id = var.cloudflare_account_id - type = "https" - description = "Health check for BlockfrostMainnet" - path = "/dmtr_health" - port = try(([for p in local.demeter_providers : p.blockfrost.health_check_port if p.blockfrost.enabled && p.blockfrost.health_check_port != 0])[0], null) - interval = 60 - timeout = 5 - retries = 2 - method = "GET" - expected_codes = "200" - allow_insecure = true } # UTxORPC diff --git a/config.yaml b/config.yaml index fb529b4..a193f2f 100644 --- a/config.yaml +++ b/config.yaml @@ -59,21 +59,21 @@ grafana: target: blinklabs-kupo-cardano-mainnet frequency: 600000 timeout: 15000 - url: https://kupo.blinklabs.cloud + url: https://demeter.blinklabs.cloud:4442 api_key: ENC[AES256_GCM,data:65Hi+NoSaeqVjS+0bQfSaOMWDzCTyrnw,iv:mQWmKVAOdWjMEluyznVxvqkn7/sejMkD/CtcxBd981E=,tag:xCaD033fsdbo23JCt8sLJw==,type:str] script_path: grafana/synthetics/shared/dmtrHealth.js - job_name: dmtr_healthcheck target: blinklabs-kupo-cardano-preprod frequency: 600000 timeout: 15000 - url: https://preprod.kupo.blinklabs.cloud + url: https://demeter.blinklabs.cloud:4442 api_key: ENC[AES256_GCM,data:cex7Kd8zxpq0FSD1E9a5+QsSH193Ab2q,iv:5+gqtPW5jqMhZg1r+Jrmg7/E842K8pd0Km3sBiwwtoQ=,tag:1feG8scabz8xOHjHX7Nalw==,type:str] script_path: grafana/synthetics/shared/dmtrHealth.js - job_name: dmtr_healthcheck target: blinklabs-kupo-cardano-preview frequency: 600000 timeout: 15000 - url: https://preview.kupo.blinklabs.cloud + url: https://demeter.blinklabs.cloud:4442 api_key: ENC[AES256_GCM,data:IrbpzR/IzvSYYxlFRl8T6WhJsYtlSniP,iv:aRIO376AWii3pjiwF0weWINEbf0ZgcGPRg+8+E+xC8g=,tag:JDguEGp9sfq5dHgpC9E8dQ==,type:str] script_path: grafana/synthetics/shared/dmtrHealth.js sops: @@ -87,7 +87,7 @@ sops: UXRHaS9aaDZmT0dCbXE4OGJVWmZrdTQKRF+KB857hWanvdDelvTu4S8iw9/FEVvs rwaTGEB/XG5wmIsf69m+HrEs0SiN7k1DxaGb2sKq4YWbIBwv7Ig8hA== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-11-11T00:23:14Z" - mac: ENC[AES256_GCM,data:y+oKL6UqaXnA5W/In6uY32XoLad7BQb3OmDu/v/hQ28Nads0756IW1xqQKphEG+6tJ5RRs8mAG1OjhG7sp22ZVa6AqYEark5fe5/iwIql+hZSKbhuwYoQqq7Kjh2oX6hFGKZ7WULVwt8YP2Q+ttZ1v9jLUZ6Wqf786ZZh1cdOlQ=,iv:9eZQ3ptjMGu+E40lrmiLzAwZDjkQ6DCi6QRxlX8A7Uo=,tag:ovrn9S5NS3Y3oO9RfXvjSQ==,type:str] + lastmodified: "2026-05-09T23:27:34Z" + mac: ENC[AES256_GCM,data:omAq530GVHO8v3i2VBNsmNQ3/XVJ96RlcW49Z4cl6sFyx6/At6omWlq2KyngEP4IdUwFPpZEa1PV4S5qzQ34CyddCqfTrkHOHyw6kBTEhk77Liusa68gz3wjwvNnPwMqkYeWptLhAWDmYy1Skj67gDCUL7y347Thir8z2P/SUwQ=,iv:pbMFBjzltoh+I37jzGLQA0+X2gc/leP2QSf3ExUiunQ=,tag:SsHG5XvwvpvD2pHl9Rb1gw==,type:str] encrypted_regex: ^(auth|sm_access_token|api_key)$ - version: 3.10.2 + version: 3.11.0 From 23b9888007c54c8de1da566b31d274389efc18d3 Mon Sep 17 00:00:00 2001 From: Felipe Gonzalez Date: Mon, 11 May 2026 12:28:01 -0300 Subject: [PATCH 2/4] chore: Add demeter URLs (#41) --- cloudflare.tf | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/cloudflare.tf b/cloudflare.tf index a4dfc32..e5d7ef5 100644 --- a/cloudflare.tf +++ b/cloudflare.tf @@ -57,15 +57,15 @@ locals { { name = "txpipe-m2" blockfrost_m1 = { - enabled = false - address = "" - port = 0 - health_check_port = 0 + enabled = true + address = "all.blockfrost-m1.demeter.run" + port = 443 + health_check_port = 443 } kupo_m1 = { - enabled = false - address = "" - port = 0 + enabled = true + address = "all.kupo-m1.demeter.run" + port = 443 } ogmios = { enabled = true From 58d94fb8272bc495795ee27964af635d31cd3285 Mon Sep 17 00:00:00 2001 From: Ales Verbic Date: Sat, 16 May 2026 17:02:09 -0400 Subject: [PATCH 3/4] feat: update code and terraform state to match current Cloudflare/Grafan state Signed-off-by: Ales Verbic --- cloudflare.tf | 39 +- grafana/dashboards/shared/blockfrost.json | 468 +++++++-- grafana/dashboards/shared/kupo.json | 1120 +++++++++++---------- grafana/dashboards/shared/node.json | 237 +++-- grafana/dashboards/shared/ogmios.json | 31 +- 5 files changed, 1116 insertions(+), 779 deletions(-) diff --git a/cloudflare.tf b/cloudflare.tf index e5d7ef5..7a0807e 100644 --- a/cloudflare.tf +++ b/cloudflare.tf @@ -21,10 +21,9 @@ locals { { name = "blinklabs-us" blockfrost_m1 = { - enabled = true - address = "demeter.blinklabs.cloud" - port = 3001 - health_check_port = 3001 + enabled = true + address = "demeter.blinklabs.cloud" + port = 3001 } kupo_m1 = { enabled = true @@ -57,10 +56,9 @@ locals { { name = "txpipe-m2" blockfrost_m1 = { - enabled = true - address = "all.blockfrost-m1.demeter.run" - port = 443 - health_check_port = 443 + enabled = true + address = "all.blockfrost-m1.demeter.run" + port = 443 } kupo_m1 = { enabled = true @@ -165,20 +163,20 @@ resource "cloudflare_certificate_pack" "this" { # Kupo resource "cloudflare_load_balancer_monitor" "kupo_m1_monitor" { - account_id = var.cloudflare_account_id - type = "https" - description = "Health check for KupoM1" - path = "/dmtr_health" + account_id = var.cloudflare_account_id + type = "https" + description = "Health Check for Kupo" + path = "/dmtr_health" + # port omitted so each origin is health-checked on its own port (blinklabs-us: 4442, txpipe-m2: 443) interval = 60 timeout = 5 retries = 2 method = "GET" expected_codes = "200" - allow_insecure = true } resource "cloudflare_load_balancer_pool" "kupo_m1" { - name = "KupoM1" + name = "Kupo" account_id = var.cloudflare_account_id monitor = cloudflare_load_balancer_monitor.kupo_m1_monitor.id @@ -374,21 +372,20 @@ resource "cloudflare_load_balancer" "tx_submit_api_m1" { # Blockfrost resource "cloudflare_load_balancer_monitor" "blockfrost_m1_monitor" { - account_id = var.cloudflare_account_id - type = "https" - description = "Health check for BlockfrostM1" - path = "/dmtr_health" - port = try(([for p in local.demeter_providers : p.blockfrost_m1.health_check_port if p.blockfrost_m1.enabled && p.blockfrost_m1.health_check_port != 0])[0], null) + account_id = var.cloudflare_account_id + type = "https" + description = "Health check for BlockfrostM1" + path = "/dmtr_health" + # port omitted so each origin is health-checked on its own port (blinklabs-us: 3001, txpipe-m2: 443) interval = 60 timeout = 5 retries = 2 method = "GET" expected_codes = "200" - allow_insecure = true } resource "cloudflare_load_balancer_pool" "blockfrost_m1" { - name = "BlockfrostM1" + name = "Blockfrost" account_id = var.cloudflare_account_id monitor = cloudflare_load_balancer_monitor.blockfrost_m1_monitor.id diff --git a/grafana/dashboards/shared/blockfrost.json b/grafana/dashboards/shared/blockfrost.json index 4339a7e..8ad7f07 100644 --- a/grafana/dashboards/shared/blockfrost.json +++ b/grafana/dashboards/shared/blockfrost.json @@ -24,8 +24,6 @@ "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 0, - "id": 64, - "links": [], "liveNow": false, "panels": [ { @@ -38,7 +36,6 @@ "color": { "mode": "thresholds" }, - "mappings": [], "max": 1, "min": 0, "thresholds": { @@ -46,7 +43,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -55,8 +52,7 @@ ] }, "unit": "percentunit" - }, - "overrides": [] + } }, "gridPos": { "h": 8, @@ -64,8 +60,17 @@ "x": 0, "y": 0 }, - "id": 7, "options": { + "barShape": "flat", + "barWidthFactor": 0.5, + "effects": { + "barGlow": false, + "centerGlow": false, + "gradient": false + }, + "endpointMarker": "point", + "minVizHeight": 75, + "minVizWidth": 75, "orientation": "auto", "reduceOptions": { "calcs": [ @@ -74,10 +79,16 @@ "fields": "", "values": false }, + "segmentCount": 1, + "segmentSpacing": 0.3, + "shape": "gauge", "showThresholdLabels": false, - "showThresholdMarkers": true + "showThresholdMarkers": true, + "sizing": "auto", + "sparkline": false, + "textMode": "auto" }, - "pluginVersion": "9.2.6", + "pluginVersion": "13.1.0-24779284961", "targets": [ { "datasource": { @@ -104,13 +115,12 @@ "color": { "mode": "thresholds" }, - "mappings": [], "thresholds": { "mode": "absolute", "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -118,8 +128,7 @@ } ] } - }, - "overrides": [] + } }, "gridPos": { "h": 8, @@ -127,12 +136,12 @@ "x": 12, "y": 0 }, - "id": 9, "options": { "colorMode": "value", "graphMode": "area", "justifyMode": "auto", "orientation": "auto", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "lastNotNull" @@ -140,9 +149,11 @@ "fields": "", "values": false }, - "textMode": "auto" + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "9.2.6", + "pluginVersion": "13.1.0-24779284961", "targets": [ { "datasource": { @@ -171,6 +182,13 @@ "regex": ".*\\.(ext-utxorpc-m1).*", "renamePattern": "dolos" } + }, + { + "id": "renameByRegex", + "options": { + "regex": ".*\\.(ftr-dolos-m1).*", + "renamePattern": "dolos(new)" + } } ], "type": "stat" @@ -186,6 +204,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -193,6 +212,7 @@ "axisSoftMax": 10, "axisSoftMin": 0, "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -201,6 +221,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -208,6 +229,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -217,13 +239,12 @@ "mode": "off" } }, - "mappings": [], "thresholds": { "mode": "absolute", "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -233,16 +254,44 @@ }, "unit": "s" }, - "overrides": [] + "overrides": [ + { + "__systemRef": "hideSeriesFrom", + "matcher": { + "id": "byNames", + "options": { + "mode": "exclude", + "names": [ + "99" + ], + "prefix": "All except:", + "readOnly": true + } + }, + "properties": [ + { + "id": "custom.hideFrom", + "value": { + "legend": false, + "tooltip": true, + "viz": true + } + } + ] + } + ] }, "gridPos": { - "h": 9, - "w": 24, + "h": 8, + "w": 12, "x": 0, "y": 8 }, - "id": 23, "options": { + "annotations": { + "clustering": -1, + "multiLane": false + }, "legend": { "calcs": [], "displayMode": "list", @@ -250,10 +299,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "13.1.0-24779284961", "targets": [ { "datasource": { @@ -273,7 +324,6 @@ }, "editorMode": "code", "expr": "histogram_quantile(0.90, sum by (le) (rate(blockfrost_proxy_http_request_duration_seconds_bucket{network=\"$network\", proxied=\"true\", resolved_by=\"blockfrost\"}[10m])))", - "hide": false, "legendFormat": "90", "range": true, "refId": "B" @@ -285,7 +335,6 @@ }, "editorMode": "code", "expr": "histogram_quantile(0.50, sum by (le) (rate(blockfrost_proxy_http_request_duration_seconds_bucket{network=\"$network\", proxied=\"true\", resolved_by=\"blockfrost\"}[10m])))", - "hide": false, "legendFormat": "50", "range": true, "refId": "C" @@ -297,7 +346,6 @@ }, "editorMode": "code", "expr": "histogram_quantile(1, sum by (le) (rate(blockfrost_proxy_http_request_duration_seconds_bucket{network=\"$network\", proxied=\"true\", resolved_by=\"blockfrost\"}[10m])))", - "hide": false, "legendFormat": "p100", "range": true, "refId": "D" @@ -317,6 +365,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -324,6 +373,7 @@ "axisSoftMax": 1, "axisSoftMin": 0, "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -332,6 +382,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -339,6 +390,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -348,13 +400,12 @@ "mode": "off" } }, - "mappings": [], "thresholds": { "mode": "absolute", "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -364,16 +415,44 @@ }, "unit": "s" }, - "overrides": [] + "overrides": [ + { + "__systemRef": "hideSeriesFrom", + "matcher": { + "id": "byNames", + "options": { + "mode": "exclude", + "names": [ + "99" + ], + "prefix": "All except:", + "readOnly": true + } + }, + "properties": [ + { + "id": "custom.hideFrom", + "value": { + "legend": false, + "tooltip": true, + "viz": true + } + } + ] + } + ] }, "gridPos": { - "h": 9, - "w": 24, - "x": 0, - "y": 17 + "h": 8, + "w": 12, + "x": 12, + "y": 8 }, - "id": 22, "options": { + "annotations": { + "clustering": -1, + "multiLane": false + }, "legend": { "calcs": [], "displayMode": "list", @@ -381,10 +460,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "13.1.0-24779284961", "targets": [ { "datasource": { @@ -404,7 +485,6 @@ }, "editorMode": "code", "expr": "histogram_quantile(0.90, sum by (le) (rate(blockfrost_proxy_http_request_duration_seconds_bucket{network=\"$network\",resolved_by=\"dolos\"}[10m])))", - "hide": false, "legendFormat": "90", "range": true, "refId": "B" @@ -416,7 +496,6 @@ }, "editorMode": "code", "expr": "histogram_quantile(0.50, sum by (le) (rate(blockfrost_proxy_http_request_duration_seconds_bucket{network=\"$network\", resolved_by=\"dolos\"}[10m])))", - "hide": false, "legendFormat": "50", "range": true, "refId": "C" @@ -430,18 +509,19 @@ "type": "prometheus", "uid": "$datasource" }, - "description": "", "fieldConfig": { "defaults": { "color": { "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -450,6 +530,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -457,6 +538,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -466,12 +548,12 @@ "mode": "off" } }, - "mappings": [], "thresholds": { "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": 0 }, { "color": "red", @@ -479,17 +561,19 @@ } ] } - }, - "overrides": [] + } }, "gridPos": { "h": 8, "w": 12, "x": 0, - "y": 26 + "y": 16 }, - "id": 2, "options": { + "annotations": { + "clustering": -1, + "multiLane": false + }, "legend": { "calcs": [], "displayMode": "list", @@ -497,10 +581,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "13.1.0-24779284961", "targets": [ { "datasource": { @@ -522,18 +608,19 @@ "type": "prometheus", "uid": "$datasource" }, - "description": "", "fieldConfig": { "defaults": { "color": { "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -542,6 +629,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -549,6 +637,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -558,12 +647,12 @@ "mode": "off" } }, - "mappings": [], "thresholds": { "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": 0 }, { "color": "red", @@ -571,17 +660,19 @@ } ] } - }, - "overrides": [] + } }, "gridPos": { "h": 8, "w": 12, "x": 12, - "y": 26 + "y": 16 }, - "id": 3, "options": { + "annotations": { + "clustering": -1, + "multiLane": false + }, "legend": { "calcs": [], "displayMode": "list", @@ -589,10 +680,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "13.1.0-24779284961", "targets": [ { "datasource": { @@ -614,18 +707,19 @@ "type": "prometheus", "uid": "$datasource" }, - "description": "", "fieldConfig": { "defaults": { "color": { "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -634,6 +728,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -641,6 +736,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -650,12 +746,12 @@ "mode": "off" } }, - "mappings": [], "thresholds": { "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": 0 }, { "color": "red", @@ -663,17 +759,19 @@ } ] } - }, - "overrides": [] + } }, "gridPos": { "h": 8, "w": 12, "x": 0, - "y": 34 + "y": 24 }, - "id": 5, "options": { + "annotations": { + "clustering": -1, + "multiLane": false + }, "legend": { "calcs": [], "displayMode": "list", @@ -681,10 +779,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "13.1.0-24779284961", "targets": [ { "datasource": { @@ -706,18 +806,19 @@ "type": "prometheus", "uid": "$datasource" }, - "description": "", "fieldConfig": { "defaults": { "color": { "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -726,6 +827,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -733,6 +835,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -742,12 +845,12 @@ "mode": "dashed" } }, - "mappings": [], "thresholds": { "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": 0 }, { "color": "#6ED0E0", @@ -763,17 +866,19 @@ } ] } - }, - "overrides": [] + } }, "gridPos": { "h": 8, "w": 12, "x": 12, - "y": 34 + "y": 24 }, - "id": 4, "options": { + "annotations": { + "clustering": -1, + "multiLane": false + }, "legend": { "calcs": [], "displayMode": "list", @@ -781,10 +886,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "13.1.0-24779284961", "targets": [ { "datasource": { @@ -801,16 +908,115 @@ "title": "Requests per consumer", "type": "timeseries" }, + { + "datasource": { + "type": "prometheus", + "uid": "af0jrqwy4uhhce" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "barWidthFactor": 0.6, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "showValues": false, + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": 0 + }, + { + "color": "red", + "value": 80 + } + ] + } + } + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 32 + }, + "options": { + "annotations": { + "clustering": -1, + "multiLane": false + }, + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "hideZeros": false, + "mode": "single", + "sort": "none" + } + }, + "pluginVersion": "13.1.0-24779284961", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "af0jrqwy4uhhce" + }, + "editorMode": "code", + "exemplar": false, + "expr": "sum(container_memory_working_set_bytes{namespace=\"ftr-dolos-m1\", container!=\"\", pod=~\"cardano-mainnet-.*\"}) by (pod)", + "interval": "", + "legendFormat": "__auto", + "range": true, + "refId": "A" + } + ], + "title": "New Panel", + "type": "timeseries" + }, { "collapsed": false, "gridPos": { "h": 1, "w": 24, "x": 0, - "y": 42 + "y": 40 }, - "id": 20, - "panels": [], "title": "Proxy", "type": "row" }, @@ -825,12 +1031,14 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "axisSoftMax": 1, "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -839,6 +1047,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -846,6 +1055,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -855,13 +1065,13 @@ "mode": "dashed" } }, - "mappings": [], "min": 0, "thresholds": { "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": 0 }, { "color": "#EAB839", @@ -874,17 +1084,19 @@ ] }, "unit": "none" - }, - "overrides": [] + } }, "gridPos": { "h": 8, "w": 12, "x": 0, - "y": 43 + "y": 41 }, - "id": 15, "options": { + "annotations": { + "clustering": -1, + "multiLane": false + }, "legend": { "calcs": [], "displayMode": "list", @@ -892,10 +1104,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "13.1.0-24779284961", "targets": [ { "datasource": { @@ -923,11 +1137,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 6, "gradientMode": "none", @@ -936,6 +1152,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -943,6 +1160,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -952,14 +1170,14 @@ "mode": "dashed" } }, - "mappings": [], "max": 1.2, "min": 0, "thresholds": { "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": 0 }, { "color": "#EAB839", @@ -972,17 +1190,19 @@ ] }, "unit": "percentunit" - }, - "overrides": [] + } }, "gridPos": { "h": 8, "w": 12, "x": 12, - "y": 43 + "y": 41 }, - "id": 16, "options": { + "annotations": { + "clustering": -1, + "multiLane": false + }, "legend": { "calcs": [], "displayMode": "list", @@ -990,11 +1210,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, - "pluginVersion": "9.2.6", + "pluginVersion": "13.1.0-24779284961", "targets": [ { "datasource": { @@ -1017,10 +1238,8 @@ "h": 1, "w": 24, "x": 0, - "y": 51 + "y": 49 }, - "id": 18, - "panels": [], "title": "Instance", "type": "row" }, @@ -1035,12 +1254,14 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "axisSoftMax": 1, "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -1049,6 +1270,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1056,6 +1278,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -1065,13 +1288,13 @@ "mode": "dashed" } }, - "mappings": [], "min": 0, "thresholds": { "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": 0 }, { "color": "#EAB839", @@ -1084,17 +1307,19 @@ ] }, "unit": "percentunit" - }, - "overrides": [] + } }, "gridPos": { "h": 8, "w": 12, "x": 0, - "y": 52 + "y": 50 }, - "id": 11, "options": { + "annotations": { + "clustering": -1, + "multiLane": false + }, "legend": { "calcs": [], "displayMode": "list", @@ -1102,10 +1327,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "13.1.0-24779284961", "targets": [ { "datasource": { @@ -1133,11 +1360,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 6, "gradientMode": "none", @@ -1146,6 +1375,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1153,6 +1383,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -1162,14 +1393,14 @@ "mode": "dashed" } }, - "mappings": [], "max": 1.2, "min": 0, "thresholds": { "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": 0 }, { "color": "#EAB839", @@ -1182,17 +1413,19 @@ ] }, "unit": "percentunit" - }, - "overrides": [] + } }, "gridPos": { "h": 8, "w": 12, "x": 12, - "y": 52 + "y": 50 }, - "id": 14, "options": { + "annotations": { + "clustering": -1, + "multiLane": false + }, "legend": { "calcs": [], "displayMode": "list", @@ -1200,11 +1433,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, - "pluginVersion": "9.2.6", + "pluginVersion": "13.1.0-24779284961", "targets": [ { "datasource": { @@ -1222,23 +1456,31 @@ "type": "timeseries" } ], + "preload": false, "refresh": "30s", - "schemaVersion": 37, - "style": "dark", - "tags": [], + "schemaVersion": 42, "templating": { "list": [ { + "allowCustomValue": true, + "current": { + "text": "", + "value": "" + }, + "hide": 0, "includeAll": false, + "multi": false, "name": "datasource", "options": [], "query": "prometheus", "refresh": 1, + "regex": "", + "skipUrlSync": false, "type": "datasource" }, { + "allowCustomValue": true, "current": { - "selected": true, "text": "ext-blockfrost-m1", "value": "ext-blockfrost-m1" }, @@ -1254,13 +1496,13 @@ } ], "query": "ext-blockfrost-m1", - "queryValue": "", "skipUrlSync": false, - "type": "custom" + "type": "custom", + "valuesFormat": "csv" }, { + "allowCustomValue": true, "current": { - "selected": true, "text": [ "mainnet" ], @@ -1284,6 +1526,7 @@ }, "refresh": 1, "regex": ".*network=\"([A-Za-z0-9\\-]+)\",.+", + "regexApplyTo": "value", "skipUrlSync": false, "sort": 0, "type": "query" @@ -1294,9 +1537,20 @@ "from": "now-6h", "to": "now" }, - "timepicker": {}, - "timezone": "", - "title": "Blockfrost", - "version": 1, - "weekStart": "" + "timepicker": { + "refresh_intervals": [ + "5s", + "10s", + "30s", + "1m", + "5m", + "15m", + "30m", + "1h", + "2h", + "1d" + ] + }, + "timezone": "browser", + "title": "Blockfrost" } diff --git a/grafana/dashboards/shared/kupo.json b/grafana/dashboards/shared/kupo.json index e224cb8..a53bda2 100644 --- a/grafana/dashboards/shared/kupo.json +++ b/grafana/dashboards/shared/kupo.json @@ -24,8 +24,7 @@ "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 0, - "id": 2601293922639872, - "links": [], + "liveNow": false, "panels": [ { "collapsed": false, @@ -35,8 +34,6 @@ "x": 0, "y": 0 }, - "id": 24, - "panels": [], "title": "Proxies", "type": "row" }, @@ -84,7 +81,6 @@ "mode": "off" } }, - "mappings": [], "thresholds": { "mode": "absolute", "steps": [ @@ -98,8 +94,7 @@ } ] } - }, - "overrides": [] + } }, "gridPos": { "h": 8, @@ -107,8 +102,11 @@ "x": 0, "y": 1 }, - "id": 29, "options": { + "annotations": { + "clustering": -1, + "multiLane": false + }, "legend": { "calcs": [], "displayMode": "list", @@ -121,7 +119,7 @@ "sort": "none" } }, - "pluginVersion": "12.4.0-20781422371.patch1", + "pluginVersion": "13.1.0-25668120414", "targets": [ { "datasource": { @@ -129,8 +127,9 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "histogram_quantile(0.99, sum by (le) (rate(kupo_proxy_http_request_duration_seconds_bucket{network=~\".*$network\"}[10m])))", - "legendFormat": "99", + "expr": "histogram_quantile(0.99, sum by (le, job) (rate(kupo_proxy_http_request_duration_seconds_bucket{network=~\".*$network\"}[10m])))", + "interval": "", + "legendFormat": "99% {{job}}", "range": true, "refId": "A" }, @@ -140,10 +139,10 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "histogram_quantile(0.90, sum by (le) (rate(kupo_proxy_http_request_duration_seconds_bucket{network=~\".*$network\"}[10m])))", + "expr": "histogram_quantile(0.90, sum by (le, job) (rate(kupo_proxy_http_request_duration_seconds_bucket{network=~\".*$network\"}[10m])))", "instant": false, "interval": "", - "legendFormat": "90", + "legendFormat": "90% {{job}}", "range": true, "refId": "B" }, @@ -153,10 +152,10 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "histogram_quantile(0.50, sum by (le) (rate(kupo_proxy_http_request_duration_seconds_bucket{network=~\".*$network\"}[10m])))", + "expr": "histogram_quantile(0.50, sum by (le, job) (rate(kupo_proxy_http_request_duration_seconds_bucket{network=~\".*$network\"}[10m])))", "instant": false, "interval": "", - "legendFormat": "50", + "legendFormat": "50% {{job}}", "range": true, "refId": "C" } @@ -208,7 +207,6 @@ "mode": "off" } }, - "mappings": [], "thresholds": { "mode": "absolute", "steps": [ @@ -222,8 +220,7 @@ } ] } - }, - "overrides": [] + } }, "gridPos": { "h": 8, @@ -231,8 +228,11 @@ "x": 0, "y": 9 }, - "id": 25, "options": { + "annotations": { + "clustering": -1, + "multiLane": false + }, "legend": { "calcs": [], "displayMode": "list", @@ -245,7 +245,7 @@ "sort": "none" } }, - "pluginVersion": "12.4.0-20781422371.patch1", + "pluginVersion": "13.1.0-25668120414", "targets": [ { "datasource": { @@ -253,7 +253,7 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "sum by (consumer)(rate(kupo_proxy_http_total_request{namespace=~\"ftr-kupo-.*\", exported_instance=~\".*$network.*\", job=~\"ftr-kupo-v1/(kupo-)?proxy-green(-cardano)?-${network}(-podmonitor)?\"}[1m]) > 0)", + "expr": "sum by (consumer)(rate(kupo_proxy_http_total_request{namespace=~\"ftr-kupo-.*\", exported_instance=~\".*$network.*\", job=~\"ftr-kupo-v1/proxy-green\"}[1m]) > 0)", "legendFormat": "__auto", "range": true, "refId": "A" @@ -306,7 +306,6 @@ "mode": "off" } }, - "mappings": [], "thresholds": { "mode": "absolute", "steps": [ @@ -320,8 +319,7 @@ } ] } - }, - "overrides": [] + } }, "gridPos": { "h": 8, @@ -329,8 +327,11 @@ "x": 12, "y": 9 }, - "id": 26, "options": { + "annotations": { + "clustering": -1, + "multiLane": false + }, "legend": { "calcs": [], "displayMode": "list", @@ -343,7 +344,7 @@ "sort": "none" } }, - "pluginVersion": "12.4.0-20781422371.patch1", + "pluginVersion": "13.1.0-25668120414", "targets": [ { "datasource": { @@ -351,7 +352,7 @@ "uid": "af0jrqwy4uhhce" }, "editorMode": "code", - "expr": "sum(rate(kupo_proxy_http_total_request{namespace=~\"ftr-kupo-.*\", exported_instance=~\".*$network.*\", job=~\"ftr-kupo-v1/.*green.*$network\" }[1m]) > 0) by (status_code)", + "expr": "sum(rate(kupo_proxy_http_total_request{namespace=~\"ftr-kupo-.*\", exported_instance=~\".*$network.*\", job=~\"ftr-kupo-v1/.*green\" }[1m]) > 0) by (status_code)", "legendFormat": "__auto", "range": true, "refId": "A" @@ -404,7 +405,6 @@ "mode": "off" } }, - "mappings": [], "thresholds": { "mode": "absolute", "steps": [ @@ -418,8 +418,7 @@ } ] } - }, - "overrides": [] + } }, "gridPos": { "h": 8, @@ -427,8 +426,11 @@ "x": 0, "y": 17 }, - "id": 27, "options": { + "annotations": { + "clustering": -1, + "multiLane": false + }, "legend": { "calcs": [], "displayMode": "list", @@ -441,7 +443,7 @@ "sort": "none" } }, - "pluginVersion": "12.4.0-20781422371.patch1", + "pluginVersion": "13.1.0-25668120414", "targets": [ { "datasource": { @@ -449,7 +451,7 @@ "uid": "af0jrqwy4uhhce" }, "editorMode": "code", - "expr": "sum by (consumer)(rate(kupo_proxy_http_total_request{namespace=~\"ftr-kupo-.*\", exported_instance=~\".*$network.*\", job=~\"ftr-kupo-v1/.*blue.*$network\"}[1m]) > 0)", + "expr": "sum by (consumer)(rate(kupo_proxy_http_total_request{namespace=~\"ftr-kupo-.*\", exported_instance=~\".*$network.*\", job=~\"ftr-kupo-v1/.*blue\"}[1m]) > 0)", "legendFormat": "__auto", "range": true, "refId": "A" @@ -502,7 +504,6 @@ "mode": "off" } }, - "mappings": [], "thresholds": { "mode": "absolute", "steps": [ @@ -516,8 +517,7 @@ } ] } - }, - "overrides": [] + } }, "gridPos": { "h": 8, @@ -525,8 +525,11 @@ "x": 12, "y": 17 }, - "id": 28, "options": { + "annotations": { + "clustering": -1, + "multiLane": false + }, "legend": { "calcs": [], "displayMode": "list", @@ -539,7 +542,7 @@ "sort": "none" } }, - "pluginVersion": "12.4.0-20781422371.patch1", + "pluginVersion": "13.1.0-25668120414", "targets": [ { "datasource": { @@ -547,7 +550,7 @@ "uid": "af0jrqwy4uhhce" }, "editorMode": "code", - "expr": "sum(rate(kupo_proxy_http_total_request{namespace=~\"ftr-kupo-.*\", exported_instance=~\".*$network.*\", job=~\"ftr-kupo-v1/.*blue.*$network\" }[1m]) > 0) by (status_code)", + "expr": "sum(rate(kupo_proxy_http_total_request{namespace=~\"ftr-kupo-.*\", exported_instance=~\".*$network.*\", job=~\"ftr-kupo-v1/.*blue\" }[1m]) > 0) by (status_code)", "legendFormat": "__auto", "range": true, "refId": "A" @@ -557,608 +560,621 @@ "type": "timeseries" }, { - "collapsed": false, + "collapsed": true, "gridPos": { "h": 1, "w": 24, "x": 0, "y": 25 }, - "id": 14, - "panels": [], - "title": "Instances", - "type": "row" - }, - { - "datasource": { - "type": "prometheus", - "uid": "$datasource" - }, - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" + "panels": [ + { + "datasource": { + "type": "prometheus", + "uid": "$datasource" }, - "custom": { - "axisBorderShow": false, - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "barWidthFactor": 0.6, - "drawStyle": "line", - "fillOpacity": 0, - "gradientMode": "none", - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false - }, - "insertNulls": false, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, - "scaleDistribution": { - "type": "linear" + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "barWidthFactor": 0.6, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "showValues": false, + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": 0 + }, + { + "color": "red", + "value": 80 + } + ] + } + } + }, + "gridPos": { + "h": 8, + "w": 16, + "x": 0, + "y": 26 + }, + "id": 10, + "options": { + "annotations": { + "clustering": -1, + "multiLane": false }, - "showPoints": "auto", - "showValues": false, - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true }, - "thresholdsStyle": { - "mode": "off" + "tooltip": { + "hideZeros": false, + "mode": "single", + "sort": "none" } }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": 0 + "pluginVersion": "13.1.0-25668120414", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "$datasource" }, - { - "color": "red", - "value": 80 - } - ] - } - }, - "overrides": [] - }, - "gridPos": { - "h": 8, - "w": 16, - "x": 0, - "y": 26 - }, - "id": 10, - "options": { - "legend": { - "calcs": [], - "displayMode": "list", - "placement": "bottom", - "showLegend": true + "editorMode": "code", + "expr": "kupo_most_recent_checkpoint{pod=~\".*$pod.*\"}", + "legendFormat": "{{pod}}.checkpoint", + "range": true, + "refId": "A" + }, + { + "datasource": { + "type": "prometheus", + "uid": "$datasource" + }, + "editorMode": "code", + "expr": "kupo_most_recent_node_tip{pod=~\".*$pod.*\"}", + "legendFormat": "{{pod}}.tip", + "range": true, + "refId": "B" + } + ], + "title": "Slot", + "type": "timeseries" }, - "tooltip": { - "hideZeros": false, - "mode": "single", - "sort": "none" - } - }, - "pluginVersion": "12.4.0-20781422371.patch1", - "targets": [ { "datasource": { "type": "prometheus", "uid": "$datasource" }, - "editorMode": "code", - "expr": "kupo_most_recent_checkpoint{pod=~\".*$pod.*\"}", - "legendFormat": "{{pod}}.checkpoint", - "range": true, - "refId": "A" - }, - { - "datasource": { - "type": "prometheus", - "uid": "$datasource" + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "min": 0, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "blue", + "value": 0 + } + ] + }, + "unit": "none" + } }, - "editorMode": "code", - "expr": "kupo_most_recent_node_tip{pod=~\".*$pod.*\"}", - "legendFormat": "{{pod}}.tip", - "range": true, - "refId": "B" - } - ], - "title": "Slot", - "type": "timeseries" - }, - { - "datasource": { - "type": "prometheus", - "uid": "$datasource" - }, - "fieldConfig": { - "defaults": { - "color": { - "mode": "thresholds" + "gridPos": { + "h": 8, + "w": 8, + "x": 16, + "y": 26 }, - "mappings": [], - "min": 0, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "blue", - "value": 0 - } - ] + "id": 15, + "options": { + "colorMode": "value", + "graphMode": "area", + "justifyMode": "auto", + "orientation": "auto", + "percentChangeColorMode": "standard", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true }, - "unit": "none" - }, - "overrides": [] - }, - "gridPos": { - "h": 8, - "w": 8, - "x": 16, - "y": 26 - }, - "id": 15, - "options": { - "colorMode": "value", - "graphMode": "area", - "justifyMode": "auto", - "orientation": "auto", - "percentChangeColorMode": "standard", - "reduceOptions": { - "calcs": [ - "lastNotNull" + "pluginVersion": "13.1.0-25668120414", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "$datasource" + }, + "editorMode": "code", + "expr": "kupo_most_recent_node_tip{pod=~\".*$pod.*\"} - kupo_most_recent_checkpoint{pod=~\".*$pod.*\"}", + "legendFormat": "{{pod}}", + "range": true, + "refId": "A" + } ], - "fields": "", - "values": false + "title": "Sync Delta", + "type": "stat" }, - "showPercentChange": false, - "textMode": "auto", - "wideLayout": true - }, - "pluginVersion": "12.4.0-20781422371.patch1", - "targets": [ { "datasource": { "type": "prometheus", "uid": "$datasource" }, - "editorMode": "code", - "expr": "kupo_most_recent_node_tip{pod=~\".*$pod.*\"} - kupo_most_recent_checkpoint{pod=~\".*$pod.*\"}", - "legendFormat": "{{pod}}", - "range": true, - "refId": "A" - } - ], - "title": "Sync Delta", - "type": "stat" - }, - { - "datasource": { - "type": "prometheus", - "uid": "$datasource" - }, - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "barWidthFactor": 0.6, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "showValues": false, + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "dashed" + } + }, + "max": 4, + "min": 0, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": 0 + }, + { + "color": "yellow", + "value": 2 + }, + { + "color": "red", + "value": 4 + } + ] + }, + "unit": "none" + } }, - "custom": { - "axisBorderShow": false, - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "barWidthFactor": 0.6, - "drawStyle": "line", - "fillOpacity": 0, - "gradientMode": "none", - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false - }, - "insertNulls": false, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, - "scaleDistribution": { - "type": "linear" + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 34 + }, + "id": 17, + "options": { + "annotations": { + "clustering": -1, + "multiLane": false }, - "showPoints": "auto", - "showValues": false, - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true }, - "thresholdsStyle": { - "mode": "dashed" + "tooltip": { + "hideZeros": false, + "mode": "single", + "sort": "none" } }, - "mappings": [], - "max": 4, - "min": 0, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": 0 - }, - { - "color": "yellow", - "value": 2 + "pluginVersion": "13.1.0-25668120414", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "$datasource" }, - { - "color": "red", - "value": 4 - } - ] - }, - "unit": "none" - }, - "overrides": [] - }, - "gridPos": { - "h": 8, - "w": 12, - "x": 0, - "y": 34 - }, - "id": 17, - "options": { - "legend": { - "calcs": [], - "displayMode": "list", - "placement": "bottom", - "showLegend": true + "editorMode": "code", + "expr": "sum(rate(container_cpu_usage_seconds_total{namespace=~\"ftr-kupo-.*\", container=\"main\", pod=~\"$pod\"}[5m])) by (pod)", + "legendFormat": "__auto", + "range": true, + "refId": "A" + } + ], + "title": "CPU Usage", + "type": "timeseries" }, - "tooltip": { - "hideZeros": false, - "mode": "single", - "sort": "none" - } - }, - "pluginVersion": "12.4.0-20781422371.patch1", - "targets": [ { "datasource": { "type": "prometheus", "uid": "$datasource" }, - "editorMode": "code", - "expr": "sum(rate(container_cpu_usage_seconds_total{namespace=~\"ftr-kupo-.*\", container=\"main\", pod=~\"$pod\"}[5m])) by (pod)", - "legendFormat": "__auto", - "range": true, - "refId": "A" - } - ], - "title": "CPU Usage", - "type": "timeseries" - }, - { - "datasource": { - "type": "prometheus", - "uid": "$datasource" - }, - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "barWidthFactor": 0.6, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "showValues": false, + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "dashed" + } + }, + "max": 1.2, + "min": 0, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": 0 + }, + { + "color": "yellow", + "value": 0.5 + }, + { + "color": "red", + "value": 1 + } + ] + }, + "unit": "percentunit" + } }, - "custom": { - "axisBorderShow": false, - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "barWidthFactor": 0.6, - "drawStyle": "line", - "fillOpacity": 0, - "gradientMode": "none", - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false + "gridPos": { + "h": 8, + "w": 12, + "x": 12, + "y": 34 + }, + "id": 19, + "options": { + "annotations": { + "clustering": -1, + "multiLane": false }, - "insertNulls": false, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, - "scaleDistribution": { - "type": "linear" + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true }, - "showPoints": "auto", - "showValues": false, - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "dashed" + "tooltip": { + "hideZeros": false, + "mode": "single", + "sort": "none" } }, - "mappings": [], - "max": 1.2, - "min": 0, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": 0 + "pluginVersion": "13.1.0-25668120414", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "$datasource" }, - { - "color": "yellow", - "value": 0.5 - }, - { - "color": "red", - "value": 1 - } - ] - }, - "unit": "percentunit" - }, - "overrides": [] - }, - "gridPos": { - "h": 8, - "w": 12, - "x": 12, - "y": 34 - }, - "id": 19, - "options": { - "legend": { - "calcs": [], - "displayMode": "list", - "placement": "bottom", - "showLegend": true + "editorMode": "code", + "expr": "sum(container_memory_working_set_bytes{namespace=~\"ftr-kupo-.*\", container=\"main\", pod=~\"$pod\"}) by (pod) / sum(kube_pod_container_resource_limits{namespace=~\"ftr-kupo-.*\", resource=\"memory\", container=\"main\", pod=~\"$pod\"}) by (pod)", + "legendFormat": "__auto", + "range": true, + "refId": "A" + } + ], + "title": "Memory Usage", + "type": "timeseries" }, - "tooltip": { - "hideZeros": false, - "mode": "single", - "sort": "none" - } - }, - "pluginVersion": "12.4.0-20781422371.patch1", - "targets": [ { "datasource": { "type": "prometheus", "uid": "$datasource" }, - "editorMode": "code", - "expr": "sum(container_memory_working_set_bytes{namespace=~\"ftr-kupo-.*\", container=\"main\", pod=~\"$pod\"}) by (pod) / sum(kube_pod_container_resource_limits{namespace=~\"ftr-kupo-.*\", resource=\"memory\", container=\"main\", pod=~\"$pod\"}) by (pod)", - "legendFormat": "__auto", - "range": true, - "refId": "A" - } - ], - "title": "Memory Usage", - "type": "timeseries" - }, - { - "datasource": { - "type": "prometheus", - "uid": "$datasource" - }, - "fieldConfig": { - "defaults": { - "color": { - "mode": "thresholds" - }, - "mappings": [], - "max": 1, - "min": 0, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "red", - "value": 0 + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" }, - { - "color": "yellow", - "value": 0.1 + "max": 1, + "min": 0, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "red", + "value": 0 + }, + { + "color": "yellow", + "value": 0.1 + }, + { + "color": "green", + "value": 0.25 + } + ] }, - { - "color": "green", - "value": 0.25 - } - ] + "unit": "percentunit" + } }, - "unit": "percentunit" - }, - "overrides": [] - }, - "gridPos": { - "h": 8, - "w": 10, - "x": 0, - "y": 42 - }, - "id": 23, - "options": { - "displayMode": "lcd", - "legend": { - "calcs": [], - "displayMode": "list", - "placement": "bottom", - "showLegend": false - }, - "maxVizHeight": 300, - "minVizHeight": 10, - "minVizWidth": 0, - "namePlacement": "auto", - "orientation": "vertical", - "reduceOptions": { - "calcs": [ - "lastNotNull" + "gridPos": { + "h": 8, + "w": 10, + "x": 0, + "y": 42 + }, + "id": 23, + "options": { + "displayMode": "lcd", + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": false + }, + "maxVizHeight": 300, + "minVizHeight": 10, + "minVizWidth": 0, + "namePlacement": "auto", + "orientation": "vertical", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "showUnfilled": true, + "sizing": "auto", + "valueMode": "color" + }, + "pluginVersion": "13.1.0-25668120414", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "$datasource" + }, + "editorMode": "code", + "exemplar": false, + "expr": "kubelet_volume_stats_available_bytes{exported_namespace=\"ftr-kupo-v1\"} / on(persistentvolumeclaim) kubelet_volume_stats_capacity_bytes{exported_namespace=\"ftr-kupo-v1\"}", + "format": "time_series", + "instant": false, + "interval": "", + "key": "Q-afae6dc0-819b-4ec4-b2e1-a3e6105c38fd-0", + "legendFormat": "{{persistentvolumeclaim}}", + "range": true, + "refId": "A" + } ], - "fields": "", - "values": false + "title": "Disk Space Available", + "type": "bargauge" }, - "showUnfilled": true, - "sizing": "auto", - "valueMode": "color" - }, - "pluginVersion": "12.4.0-20781422371.patch1", - "targets": [ { "datasource": { "type": "prometheus", "uid": "$datasource" }, - "editorMode": "code", - "exemplar": false, - "expr": "kubelet_volume_stats_available_bytes{exported_namespace=\"ftr-kupo-v1\"} / on(persistentvolumeclaim) kubelet_volume_stats_capacity_bytes{exported_namespace=\"ftr-kupo-v1\"}", - "format": "time_series", - "instant": false, - "interval": "", - "key": "Q-afae6dc0-819b-4ec4-b2e1-a3e6105c38fd-0", - "legendFormat": "{{persistentvolumeclaim}}", - "range": true, - "refId": "A" - } - ], - "title": "Disk Space Available", - "type": "bargauge" - }, - { - "datasource": { - "type": "prometheus", - "uid": "$datasource" - }, - "fieldConfig": { - "defaults": { - "color": { - "mode": "thresholds" - }, - "custom": { - "axisPlacement": "auto", - "fillOpacity": 70, - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false - }, - "insertNulls": false, - "lineWidth": 0, - "spanNulls": false - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": 0 + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" }, - { - "color": "yellow", - "value": 1 + "custom": { + "axisPlacement": "auto", + "fillOpacity": 70, + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineWidth": 0, + "spanNulls": false }, - { - "color": "red", - "value": 3 + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": 0 + }, + { + "color": "yellow", + "value": 1 + }, + { + "color": "red", + "value": 3 + } + ] } - ] - } - }, - "overrides": [] - }, - "gridPos": { - "h": 8, - "w": 14, - "x": 10, - "y": 42 - }, - "id": 21, - "options": { - "alignValue": "left", - "legend": { - "displayMode": "list", - "placement": "bottom", - "showLegend": true - }, - "mergeValues": true, - "rowHeight": 0.9, - "showValue": "auto", - "tooltip": { - "hideZeros": false, - "mode": "single", - "sort": "none" - } - }, - "pluginVersion": "12.4.0-20781422371.patch1", - "targets": [ - { - "datasource": { - "type": "prometheus", - "uid": "$datasource" + } }, - "editorMode": "code", - "exemplar": false, - "expr": "kube_pod_container_status_restarts_total{namespace=~\"ftr-kupo-.*\",container=\"main\", pod=~\"$pod\"}", - "format": "time_series", - "instant": false, - "legendFormat": "{{pod}}", - "range": true, - "refId": "A" + "gridPos": { + "h": 8, + "w": 14, + "x": 10, + "y": 42 + }, + "id": 21, + "options": { + "alignValue": "left", + "annotations": { + "clustering": -1, + "multiLane": false + }, + "legend": { + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "mergeValues": true, + "rowHeight": 0.9, + "showValue": "auto", + "tooltip": { + "hideZeros": false, + "mode": "single", + "sort": "none" + } + }, + "pluginVersion": "13.1.0-25668120414", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "$datasource" + }, + "editorMode": "code", + "exemplar": false, + "expr": "kube_pod_container_status_restarts_total{namespace=~\"ftr-kupo-.*\",container=\"main\", pod=~\"$pod\"}", + "format": "time_series", + "instant": false, + "legendFormat": "{{pod}}", + "range": true, + "refId": "A" + } + ], + "title": "Container Restarts", + "type": "state-timeline" } ], - "title": "Container Restarts", - "type": "state-timeline" + "title": "Instances", + "type": "row" } ], "preload": false, "refresh": "5s", "schemaVersion": 42, - "tags": [], "templating": { "list": [ { + "allowCustomValue": true, "current": { "text": "aws_txpipe-demeter_us-west-2_m2-prometheus", "value": "af0jrqwy4uhhce" }, + "hide": 0, "includeAll": false, + "multi": false, "name": "datasource", "options": [], "query": "prometheus", "refresh": 1, + "regex": "", + "skipUrlSync": false, "type": "datasource" }, { + "allowCustomValue": true, "current": { "text": "mainnet", "value": "mainnet" }, + "hide": 0, "includeAll": false, + "multi": false, "name": "network", "options": [], "query": "mainnet,preprod,preview", + "skipUrlSync": false, "type": "custom", "valuesFormat": "csv" }, { + "allowCustomValue": true, "current": { "text": "All", "value": "$__all" @@ -1168,6 +1184,7 @@ "uid": "$datasource" }, "definition": "query_result(kupo_connection_status{pod=~\".*$network.*\"})", + "hide": 0, "includeAll": true, "multi": true, "name": "pod", @@ -1179,6 +1196,8 @@ "refresh": 1, "regex": "/.*pod=\"([^\"]+)/", "regexApplyTo": "value", + "skipUrlSync": false, + "sort": 0, "type": "query" } ] @@ -1187,10 +1206,21 @@ "from": "now-6h", "to": "now" }, - "timepicker": {}, + "timepicker": { + "refresh_intervals": [ + "5s", + "10s", + "30s", + "1m", + "5m", + "15m", + "30m", + "1h", + "2h", + "1d" + ] + }, "timezone": "browser", "title": "Cardano Kupo", - "uid": "b0d911a7-d917-41ad-a7f7-bfe4ede0e042", - "version": 4, - "weekStart": "" + "uid": "b0d911a7-d917-41ad-a7f7-bfe4ede0e042" } diff --git a/grafana/dashboards/shared/node.json b/grafana/dashboards/shared/node.json index 1ac6eab..c7d1dd9 100644 --- a/grafana/dashboards/shared/node.json +++ b/grafana/dashboards/shared/node.json @@ -24,9 +24,7 @@ "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 0, - "id": 7, "links": [], - "liveNow": false, "panels": [ { "datasource": { @@ -39,11 +37,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -52,6 +52,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -59,6 +60,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -74,7 +76,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -91,7 +93,6 @@ "x": 0, "y": 0 }, - "id": 4, "options": { "legend": { "calcs": [], @@ -100,10 +101,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "12.4.0-19576184216.patch1", "targets": [ { "datasource": { @@ -138,7 +141,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "#EAB839", @@ -159,12 +162,12 @@ "x": 4, "y": 0 }, - "id": 12, "options": { "colorMode": "value", "graphMode": "area", "justifyMode": "auto", "orientation": "auto", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "last" @@ -172,9 +175,11 @@ "fields": "", "values": false }, - "textMode": "auto" + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "9.2.6", + "pluginVersion": "12.4.0-19576184216.patch1", "targets": [ { "datasource": { @@ -189,7 +194,6 @@ } ], "title": "Block Diff Between Replicas", - "transformations": [], "type": "stat" }, { @@ -208,7 +212,7 @@ "steps": [ { "color": "blue", - "value": null + "value": 0 } ] } @@ -216,17 +220,17 @@ "overrides": [] }, "gridPos": { - "h": 5, + "h": 7, "w": 8, "x": 8, "y": 0 }, - "id": 2, "options": { "colorMode": "value", "graphMode": "area", "justifyMode": "auto", "orientation": "auto", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "lastNotNull" @@ -234,9 +238,11 @@ "fields": "", "values": false }, - "textMode": "auto" + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "9.2.6", + "pluginVersion": "12.4.0-19576184216.patch1", "targets": [ { "datasource": { @@ -244,7 +250,7 @@ "uid": "$datasource" }, "editorMode": "code", - "expr": "cardano_node_metrics_blockNum_int{namespace=\"$namespace\", pod=~\"(cardano-)?node-$network-.*\"}", + "expr": "max by (pod) (cardano_node_metrics_blockNum_int{namespace=\"$namespace\", pod=~\"(cardano-)?node-$network-.*\"})", "legendFormat": "{{pod}}", "range": true, "refId": "A" @@ -269,7 +275,7 @@ "steps": [ { "color": "blue", - "value": null + "value": 0 } ] } @@ -277,17 +283,17 @@ "overrides": [] }, "gridPos": { - "h": 5, + "h": 7, "w": 8, "x": 16, "y": 0 }, - "id": 23, "options": { "colorMode": "value", "graphMode": "area", "justifyMode": "auto", "orientation": "auto", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "lastNotNull" @@ -295,9 +301,11 @@ "fields": "", "values": false }, - "textMode": "auto" + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "9.2.6", + "pluginVersion": "12.4.0-19576184216.patch1", "targets": [ { "datasource": { @@ -325,11 +333,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -338,6 +348,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -345,6 +356,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -360,7 +372,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -378,7 +390,6 @@ "x": 0, "y": 5 }, - "id": 6, "options": { "legend": { "calcs": [], @@ -387,10 +398,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "12.4.0-19576184216.patch1", "targets": [ { "datasource": { @@ -424,7 +437,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "#EAB839", @@ -443,14 +456,14 @@ "h": 6, "w": 8, "x": 8, - "y": 5 + "y": 7 }, - "id": 8, "options": { "colorMode": "value", "graphMode": "area", "justifyMode": "auto", "orientation": "auto", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "lastNotNull" @@ -458,9 +471,11 @@ "fields": "", "values": false }, - "textMode": "auto" + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "9.2.6", + "pluginVersion": "12.4.0-19576184216.patch1", "targets": [ { "datasource": { @@ -488,11 +503,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -501,6 +518,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -508,6 +526,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -523,7 +542,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -539,9 +558,8 @@ "h": 6, "w": 8, "x": 16, - "y": 5 + "y": 7 }, - "id": 10, "options": { "legend": { "calcs": [], @@ -550,10 +568,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "12.4.0-19576184216.patch1", "targets": [ { "datasource": { @@ -588,7 +608,7 @@ "steps": [ { "color": "red", - "value": null + "value": 0 }, { "color": "yellow", @@ -610,11 +630,18 @@ "x": 0, "y": 11 }, - "id": 22, "options": { "displayMode": "lcd", + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": false + }, + "maxVizHeight": 300, "minVizHeight": 10, "minVizWidth": 0, + "namePlacement": "auto", "orientation": "horizontal", "reduceOptions": { "calcs": [ @@ -624,11 +651,13 @@ "values": false }, "showUnfilled": true, + "sizing": "auto", "text": { "titleSize": 18 - } + }, + "valueMode": "color" }, - "pluginVersion": "9.2.6", + "pluginVersion": "12.4.0-19576184216.patch1", "targets": [ { "datasource": { @@ -661,7 +690,14 @@ "mode": "thresholds" }, "custom": { + "axisPlacement": "auto", "fillOpacity": 70, + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, "lineWidth": 0, "spanNulls": false }, @@ -671,7 +707,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "yellow", @@ -692,7 +728,6 @@ "x": 3, "y": 11 }, - "id": 14, "options": { "alignValue": "left", "legend": { @@ -704,10 +739,12 @@ "rowHeight": 0.9, "showValue": "auto", "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "12.4.0-19576184216.patch1", "targets": [ { "datasource": { @@ -735,11 +772,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "points", "fillOpacity": 0, "gradientMode": "none", @@ -748,6 +787,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 3, @@ -755,6 +795,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -770,7 +811,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "#EAB839", @@ -790,9 +831,8 @@ "h": 6, "w": 8, "x": 8, - "y": 11 + "y": 13 }, - "id": 20, "options": { "legend": { "calcs": [ @@ -803,10 +843,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "12.4.0-19576184216.patch1", "targets": [ { "datasource": { @@ -834,11 +876,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "points", "fillOpacity": 0, "gradientMode": "none", @@ -847,6 +891,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 3, @@ -854,6 +899,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -869,7 +915,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -884,9 +930,8 @@ "h": 6, "w": 8, "x": 16, - "y": 11 + "y": 13 }, - "id": 19, "options": { "legend": { "calcs": [ @@ -897,10 +942,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "12.4.0-19576184216.patch1", "targets": [ { "datasource": { @@ -928,12 +975,14 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "axisSoftMax": 1, "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -942,6 +991,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -949,6 +999,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -965,7 +1016,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "#EAB839", @@ -985,9 +1036,8 @@ "h": 5, "w": 8, "x": 8, - "y": 17 + "y": 19 }, - "id": 16, "options": { "legend": { "calcs": [], @@ -996,10 +1046,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "12.4.0-19576184216.patch1", "targets": [ { "datasource": { @@ -1027,11 +1079,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 6, "gradientMode": "none", @@ -1040,6 +1094,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1047,6 +1102,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -1064,7 +1120,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "#EAB839", @@ -1084,9 +1140,8 @@ "h": 5, "w": 8, "x": 16, - "y": 17 + "y": 19 }, - "id": 18, "options": { "legend": { "calcs": [], @@ -1095,11 +1150,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, - "pluginVersion": "9.2.6", + "pluginVersion": "12.4.0-19576184216.patch1", "targets": [ { "datasource": { @@ -1127,11 +1183,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -1140,6 +1198,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1147,6 +1206,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -1163,7 +1223,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "#EAB839", @@ -1183,9 +1243,8 @@ "h": 7, "w": 16, "x": 0, - "y": 22 + "y": 24 }, - "id": 29, "options": { "legend": { "calcs": [ @@ -1196,10 +1255,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "12.4.0-19576184216.patch1", "targets": [ { "datasource": { @@ -1275,11 +1336,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -1288,6 +1351,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1295,6 +1359,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -1312,7 +1377,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 } ] }, @@ -1324,9 +1389,8 @@ "h": 7, "w": 8, "x": 16, - "y": 22 + "y": 24 }, - "id": 28, "options": { "legend": { "calcs": [], @@ -1335,10 +1399,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "12.4.0-19576184216.patch1", "targets": [ { "datasource": { @@ -1366,11 +1432,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -1379,6 +1447,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1386,6 +1455,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -1401,7 +1471,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -1416,9 +1486,8 @@ "h": 10, "w": 24, "x": 0, - "y": 29 + "y": 31 }, - "id": 25, "options": { "legend": { "calcs": [], @@ -1427,10 +1496,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "12.4.0-19576184216.patch1", "targets": [ { "datasource": { @@ -1458,11 +1529,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -1471,6 +1544,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1478,6 +1552,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -1493,7 +1568,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -1508,9 +1583,8 @@ "h": 10, "w": 24, "x": 0, - "y": 39 + "y": 41 }, - "id": 30, "options": { "legend": { "calcs": [], @@ -1519,10 +1593,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "12.4.0-19576184216.patch1", "targets": [ { "datasource": { @@ -1550,11 +1626,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -1563,6 +1641,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1570,6 +1649,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -1586,7 +1666,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -1601,9 +1681,8 @@ "h": 12, "w": 24, "x": 0, - "y": 49 + "y": 51 }, - "id": 26, "options": { "legend": { "calcs": [], @@ -1612,10 +1691,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "12.4.0-19576184216.patch1", "targets": [ { "datasource": { @@ -1643,11 +1724,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -1656,6 +1739,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1663,6 +1747,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -1679,7 +1764,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -1707,7 +1792,7 @@ "id": "custom.hideFrom", "value": { "legend": false, - "tooltip": false, + "tooltip": true, "viz": true } } @@ -1719,9 +1804,8 @@ "h": 12, "w": 24, "x": 0, - "y": 61 + "y": 63 }, - "id": 27, "options": { "legend": { "calcs": [], @@ -1730,10 +1814,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "12.4.0-19576184216.patch1", "targets": [ { "datasource": { @@ -1751,9 +1837,9 @@ "type": "timeseries" } ], + "preload": false, "refresh": "30s", - "schemaVersion": 37, - "style": "dark", + "schemaVersion": 42, "tags": [], "templating": { "list": [ @@ -1767,13 +1853,10 @@ }, { "current": { - "selected": true, "text": "ext-nodes-m1", "value": "ext-nodes-m1" }, - "hide": 0, "includeAll": false, - "multi": false, "name": "namespace", "options": [ { @@ -1783,19 +1866,14 @@ } ], "query": "ext-nodes-m1", - "queryValue": "", - "skipUrlSync": false, "type": "custom" }, { "current": { - "selected": true, "text": "mainnet", "value": "mainnet" }, - "hide": 0, "includeAll": false, - "multi": false, "name": "network", "options": [ { @@ -1830,8 +1908,6 @@ } ], "query": "mainnet,preview,preprod,sanchonet,vector-testnet,prime-testnet", - "queryValue": "", - "skipUrlSync": false, "type": "custom" } ] @@ -1843,6 +1919,5 @@ "timepicker": {}, "timezone": "", "title": "Cardano Node", - "version": 34, "weekStart": "" } diff --git a/grafana/dashboards/shared/ogmios.json b/grafana/dashboards/shared/ogmios.json index 4accb53..cfdafc1 100644 --- a/grafana/dashboards/shared/ogmios.json +++ b/grafana/dashboards/shared/ogmios.json @@ -24,7 +24,6 @@ "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 0, - "id": 60, "links": [], "liveNow": false, "panels": [ @@ -36,7 +35,6 @@ "x": 0, "y": 0 }, - "id": 27, "panels": [], "title": "Instance", "type": "row" @@ -70,7 +68,6 @@ "x": 0, "y": 1 }, - "id": 6, "options": { "colorMode": "value", "graphMode": "area", @@ -172,7 +169,6 @@ "x": 9, "y": 1 }, - "id": 4, "options": { "legend": { "calcs": [], @@ -236,7 +232,6 @@ "x": 0, "y": 7 }, - "id": 2, "options": { "colorMode": "value", "graphMode": "area", @@ -304,7 +299,6 @@ "x": 7, "y": 7 }, - "id": 34, "options": { "colorMode": "none", "graphMode": "area", @@ -409,7 +403,6 @@ "x": 9, "y": 7 }, - "id": 10, "options": { "legend": { "calcs": [], @@ -514,7 +507,6 @@ "x": 0, "y": 14 }, - "id": 12, "options": { "legend": { "calcs": [], @@ -620,7 +612,6 @@ "x": 9, "y": 14 }, - "id": 14, "options": { "legend": { "calcs": [], @@ -696,7 +687,6 @@ "x": 0, "y": 20 }, - "id": 8, "options": { "alignValue": "left", "legend": { @@ -798,7 +788,6 @@ "x": 0, "y": 27 }, - "id": 16, "options": { "legend": { "calcs": [], @@ -903,7 +892,6 @@ "x": 0, "y": 35 }, - "id": 20, "options": { "legend": { "calcs": [], @@ -1009,7 +997,6 @@ "x": 9, "y": 35 }, - "id": 21, "options": { "legend": { "calcs": [], @@ -1048,7 +1035,6 @@ "x": 0, "y": 41 }, - "id": 29, "panels": [ { "datasource": { @@ -1139,7 +1125,7 @@ "uid": "$datasource" }, "editorMode": "code", - "expr": "sum by (consumer) (rate(ogmios_proxy_ws_total_frame{exported_instance=~\"ogmios-(cardano-)?$network-.*\", job=~\"ext-ogmios-m1/.*proxy.*$network.*blue.*\"}[5m])) > 0", + "expr": "sum by (consumer) (rate(ogmios_proxy_ws_total_frame{exported_instance=~\"ogmios-(cardano-)?$network-.*\", job=~\"ext-ogmios-m1/.*proxy.*(blue.*$network|$network.*blue).*\"}[5m])) > 0", "legendFormat": "__auto", "range": true, "refId": "A" @@ -1237,7 +1223,7 @@ "uid": "$datasource" }, "editorMode": "code", - "expr": "sum by (consumer) (ogmios_proxy_total_connections{exported_instance=~\"ogmios-(cardano-)?$network-.*\", job=~\"ext-ogmios-m1/.*$network.*\"}) > 0", + "expr": "sum by (consumer) (ogmios_proxy_total_connections{exported_instance=~\"ogmios-(cardano-)?$network-.*\", job=~\"ext-ogmios-m1/.*proxy.*(blue.*$network|$network.*blue).*\"}) > 0", "legendFormat": "__auto", "range": true, "refId": "A" @@ -1335,7 +1321,7 @@ "uid": "$datasource" }, "editorMode": "code", - "expr": "sum by (status_code, consumer) (rate(ogmios_proxy_http_total_request{namespace=~\"ext-ogmios-m1\", exported_instance=~\".*(cardano-)?$network-.*\", job=~\"ext-ogmios-m1/.*proxy.*$network.*\"}[5m])) > 0", + "expr": "sum by (status_code, consumer) (rate(ogmios_proxy_http_total_request{namespace=~\"ext-ogmios-m1\", exported_instance=~\"ogmios-(cardano-)?$network-.*\", job=~\"ext-ogmios-m1/.*proxy.*(blue.*$network|$network.*blue).*\"}[5m])) > 0", "legendFormat": "{{status_code}}.{{consumer}}", "range": true, "refId": "A" @@ -1356,7 +1342,6 @@ "x": 0, "y": 42 }, - "id": 31, "panels": [], "title": "Proxy Green", "type": "row" @@ -1428,7 +1413,6 @@ "x": 0, "y": 43 }, - "id": 32, "options": { "legend": { "calcs": [], @@ -1450,7 +1434,7 @@ "uid": "$datasource" }, "editorMode": "code", - "expr": "sum by (consumer) (rate(ogmios_proxy_ws_total_frame{exported_instance=~\"ogmios-(cardano-)?$network-.*\", job=~\"ext-ogmios-m1/.*proxy.*$network.*green.*\"}[5m])) > 0", + "expr": "sum by (consumer) (rate(ogmios_proxy_ws_total_frame{exported_instance=~\"ogmios-(cardano-)?$network-.*\", job=~\"ext-ogmios-m1/.*proxy.*(green.*$network|$network.*green).*\"}[5m])) > 0", "legendFormat": "__auto", "range": true, "refId": "A" @@ -1526,7 +1510,6 @@ "x": 0, "y": 53 }, - "id": 19, "options": { "legend": { "calcs": [], @@ -1548,7 +1531,7 @@ "uid": "$datasource" }, "editorMode": "code", - "expr": "sum by (consumer) (ogmios_proxy_total_connections{exported_instance=~\"ogmios-(cardano-)?$network-.*\", job=~\"ext-ogmios-m1/.*proxy.*$network.*green.*\"}) > 0", + "expr": "sum by (consumer) (ogmios_proxy_total_connections{exported_instance=~\"ogmios-(cardano-)?$network-.*\", job=~\"ext-ogmios-m1/.*proxy.*(green.*$network|$network.*green).*\"}) > 0", "legendFormat": "__auto", "range": true, "refId": "A" @@ -1624,7 +1607,6 @@ "x": 0, "y": 61 }, - "id": 25, "options": { "legend": { "calcs": [], @@ -1646,7 +1628,7 @@ "uid": "$datasource" }, "editorMode": "code", - "expr": "sum by (status_code, consumer) (rate(ogmios_proxy_http_total_request{namespace=~\"ext-ogmios-m1\", exported_instance=~\".*(cardano-)?$network-.*\", job=~\"ext-ogmios-m1/.*proxy.*$network.*green.*\"}[5m])) > 0", + "expr": "sum by (status_code, consumer) (rate(ogmios_proxy_http_total_request{namespace=~\"ext-ogmios-m1\", exported_instance=~\"ogmios-(cardano-)?$network-.*\", job=~\"ext-ogmios-m1/.*proxy.*(green.*$network|$network.*green).*\"}[5m])) > 0", "legendFormat": "{{status_code}}.{{consumer}}", "range": true, "refId": "A" @@ -1741,6 +1723,5 @@ "timepicker": {}, "timezone": "", "title": "Cardano Ogmios", - "version": 31, "weekStart": "" } From 8afafc7e60c3eb76ceda51f706e1606fc52612ec Mon Sep 17 00:00:00 2001 From: Ales Verbic Date: Sat, 16 May 2026 17:09:34 -0400 Subject: [PATCH 4/4] feat: remove CNODE hosts entries from certificate Signed-off-by: Ales Verbic --- cloudflare.tf | 9 --------- 1 file changed, 9 deletions(-) diff --git a/cloudflare.tf b/cloudflare.tf index 7a0807e..688d68f 100644 --- a/cloudflare.tf +++ b/cloudflare.tf @@ -109,15 +109,6 @@ resource "cloudflare_certificate_pack" "this" { hosts = [ "*.dmtr.host", - // CNode - "*.cnode-m1.dmtr.host", - "*.cardano-mainnet.cnode-m1.dmtr.host", - "*.cardano-preprod.cnode-m1.dmtr.host", - "*.cardano-preview.cnode-m1.dmtr.host", - "*.vector-mainnet.cnode-m1.dmtr.host", - "*.vector-testnet.cnode-m1.dmtr.host", - "*.prime-testnet.cnode-m1.dmtr.host", - // Ogmios "*.ogmios-m1.dmtr.host", "*.cardano-mainnet-v6.ogmios-m1.dmtr.host",