Skip to content

Commit 8c6a9f8

Browse files
authored
Merge pull request #6422 from IntersectMBO/bench/hotfix-genesis-format
bench | hotfixes: genesis format; cardano-tracer RTView build
2 parents 4bb4735 + 3d8ce09 commit 8c6a9f8

9 files changed

Lines changed: 4 additions & 323 deletions

File tree

cardano-tracer/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# ChangeLog
22

3+
## NEXT
4+
* RTView: Remove monitoring based on the `NodePeers` datapoint, which has been removed since Node 10.6.2; fixes the RTView-enabled build.
5+
36
## 0.3.6 (November 2025)
47
* Implement Prometheus HTTP service discovery (SD) under the URL `/targets`
58
* Add optional config field `"prometheusLabels": { "<labelname>": "<labelvalue>", ... }` for custom labels to be attached with Prometheus SD

cardano-tracer/cardano-tracer.cabal

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,11 @@ library
7373
Cardano.Tracer.Handlers.RTView.State.EraSettings
7474
Cardano.Tracer.Handlers.RTView.State.Historical
7575
Cardano.Tracer.Handlers.RTView.State.Last
76-
Cardano.Tracer.Handlers.RTView.State.Peers
7776

7877
Cardano.Tracer.Handlers.RTView.UI.CSS.Bulma
7978
Cardano.Tracer.Handlers.RTView.UI.CSS.Own
8079
Cardano.Tracer.Handlers.RTView.UI.HTML.Node.Column
8180
Cardano.Tracer.Handlers.RTView.UI.HTML.Node.EKG
82-
Cardano.Tracer.Handlers.RTView.UI.HTML.Node.Peers
8381
Cardano.Tracer.Handlers.RTView.UI.HTML.About
8482
Cardano.Tracer.Handlers.RTView.UI.HTML.Body
8583
Cardano.Tracer.Handlers.RTView.UI.HTML.Logs
@@ -107,7 +105,6 @@ library
107105
Cardano.Tracer.Handlers.RTView.Update.NodeInfo
108106
Cardano.Tracer.Handlers.RTView.Update.NodeState
109107
Cardano.Tracer.Handlers.RTView.Update.Nodes
110-
Cardano.Tracer.Handlers.RTView.Update.Peers
111108
Cardano.Tracer.Handlers.RTView.Update.Reload
112109
Cardano.Tracer.Handlers.RTView.Update.Resources
113110
Cardano.Tracer.Handlers.RTView.Update.Transactions

cardano-tracer/src/Cardano/Tracer/Handlers/RTView/State/Peers.hs

Lines changed: 0 additions & 73 deletions
This file was deleted.

cardano-tracer/src/Cardano/Tracer/Handlers/RTView/UI/HTML/Main.hs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import Cardano.Tracer.Configuration
88
import Cardano.Tracer.Environment
99
import Cardano.Tracer.Handlers.RTView.State.Displayed
1010
import Cardano.Tracer.Handlers.RTView.State.EraSettings
11-
import Cardano.Tracer.Handlers.RTView.State.Peers
1211
import Cardano.Tracer.Handlers.RTView.UI.CSS.Bulma
1312
import Cardano.Tracer.Handlers.RTView.UI.CSS.Own
1413
import Cardano.Tracer.Handlers.RTView.UI.Charts
@@ -22,7 +21,6 @@ import Cardano.Tracer.Handlers.RTView.Update.KES
2221
import Cardano.Tracer.Handlers.RTView.Update.Logs
2322
import Cardano.Tracer.Handlers.RTView.Update.NodeState
2423
import Cardano.Tracer.Handlers.RTView.Update.Nodes
25-
import Cardano.Tracer.Handlers.RTView.Update.Peers
2624
import Cardano.Tracer.Handlers.RTView.Update.Reload
2725
import Cardano.Tracer.Handlers.State.TraceObjects
2826
import Cardano.Tracer.Handlers.Utils
@@ -67,7 +65,6 @@ mkMainPage tracerEnv tracerEnvRTView displayedElements nodesEraSettings reloadFl
6765

6866
colors <- initColors
6967
datasetIndices <- initDatasetsIndices
70-
peers <- liftIO initPeers
7168

7269
webPageIsOpened tracerEnvRTView
7370

@@ -139,7 +136,6 @@ mkMainPage tracerEnv tracerEnvRTView displayedElements nodesEraSettings reloadFl
139136
uiPeersTimer <- UI.timer # set UI.interval 4000
140137
on_ UI.tick uiPeersTimer do
141138
askNSetNodeState tracerEnv displayedElements
142-
updateNodesPeers tracerEnv peers
143139
updateKESInfo tracerEnv nodesEraSettings displayedElements
144140

145141
UI.start uiLogsLiveViewTimer

cardano-tracer/src/Cardano/Tracer/Handlers/RTView/UI/HTML/Node/Column.hs

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ module Cardano.Tracer.Handlers.RTView.UI.HTML.Node.Column
88
import Cardano.Tracer.Configuration
99
import Cardano.Tracer.Environment
1010
import Cardano.Tracer.Handlers.RTView.UI.HTML.Node.EKG
11-
import Cardano.Tracer.Handlers.RTView.UI.HTML.Node.Peers
1211
import Cardano.Tracer.Handlers.RTView.UI.Img.Icons
1312
import Cardano.Tracer.Handlers.RTView.UI.JS.Utils
1413
import Cardano.Tracer.Handlers.RTView.UI.Utils
@@ -45,14 +44,6 @@ addNodeColumn tracerEnv loggingConfig nodeId@(NodeId anId) = do
4544
kes <- nodeKES id'
4645
opCert <- nodeOpCert id'
4746

48-
peersTable <- mkPeersTable id'
49-
peersDetailsButton <- UI.button ## (id' <> "__node-peers-details-button")
50-
#. "button is-info"
51-
# set UI.enabled False
52-
# set text "Details"
53-
on_ UI.click peersDetailsButton do
54-
fadeInModal peersTable
55-
5647
ekgMetricsWindow <- mkEKGMetricsWindow id'
5748
ekgMetricsButton <- UI.button ## (id' <> "__node-ekg-metrics-button")
5849
#. "button is-info"
@@ -86,14 +77,6 @@ addNodeColumn tracerEnv loggingConfig nodeId@(NodeId anId) = do
8677
addNodeCell "start-time" st
8778
addNodeCell "uptime" ut
8879
addNodeCell "logs" ls
89-
addNodeCell "peers" [ UI.div #. "buttons has-addons" #+
90-
[ UI.button ## (id' <> "__node-peers-num")
91-
#. "button is-static"
92-
# set text ""
93-
, element peersDetailsButton
94-
]
95-
, element peersTable
96-
]
9780
addNodeCell "leadership" leadership
9881
addNodeCell "kes" kes
9982
addNodeCell "op-cert" opCert

cardano-tracer/src/Cardano/Tracer/Handlers/RTView/UI/HTML/Node/Peers.hs

Lines changed: 0 additions & 63 deletions
This file was deleted.

cardano-tracer/src/Cardano/Tracer/Handlers/RTView/Update/Peers.hs

Lines changed: 0 additions & 140 deletions
This file was deleted.

nix/workbench/genesis/genesis.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# shellcheck shell=bash
22

3-
global_genesis_format_version=October-13-2026
3+
global_genesis_format_version=October-13-2025
44

55
usage_genesis() {
66
usage "genesis" "Genesis" <<EOF

0 commit comments

Comments
 (0)