test app: same as before, but working

cabal.project

@@ -32,10 +32,6 @@ packages:
   trace-resources
   trace-forward
 
-  -- ||| TMP PACKAGE, DON'T MAKE PR
-  bench/ekg-restart-test
-  -- ||| TMP PACKAGE, DON'T MAKE PR
-
 extra-packages: Cabal
 
 program-options
@@ -52,7 +48,7 @@ package cryptonite
   flags: -support_rdrand
 
 package snap-server
-  flags: +openssl
+  flags: -openssl
 
 package bitvec
   flags: -simd
@@ -66,8 +62,9 @@ constraints:
 
 allow-newer:
   , katip:Win32
+  , ekg-wai:time
+  -- , ekg-wai:Win32-network
 
 -- IMPORTANT
 -- Do NOT add more source-repository-package stanzas here unless they are strictly
 -- temporary! Please read the section in CONTRIBUTING about updating dependencies.
-

cardano-tracer/CHANGELOG.md

@@ -1,5 +1,16 @@
 # ChangeLog
 
+## 0.3 (September 20, 2024)
+
+* Abondon `snap` webserver in favour of `wai`/`warp` for Prometheus and EKG Monitoring.
+* Add dynamic routing to EKG stores of all connected nodes.
+* Derive URL compliant routes from connected node names (instead of plain node names).
+* Remove the requirement of two distinct ports for the EKG backend (changing `hasEKG` config type).
+* For optional RTView component only: Disable SSL/https connections. Force `snap-server`
+  dependency to build with `-flag -openssl`.
+* Add JSON responses when listing connected nodes for both Prometheus and EKG Monitoring.
+* Add consistency check for redundant port values in the config.
+
 ## 0.2.4 (August 13, 2024)
 
 * `systemd` is enabled by default. To disable it use the cabal

cardano-tracer/cardano-tracer.cabal

@@ -1,7 +1,7 @@
 cabal-version: 3.0
 
 name:                   cardano-tracer
-version:                0.2.4
+version:                0.3
 synopsis:               A service for logging and monitoring over Cardano nodes
 description:            A service for logging and monitoring over Cardano nodes.
 category:               Cardano,
@@ -160,6 +160,7 @@ library
   build-depends:        aeson
                       , async
                       , async-extras
+                      , auto-update
                       , bimap
                       , blaze-html
                       , bytestring
@@ -182,9 +183,6 @@ library
                       , signal
                       , slugify
                       , smtp-mail == 0.3.0.0
-                      , snap-blaze
-                      , snap-core
-                      , snap-server
                       , stm
                       , string-qq
                       , text
@@ -194,7 +192,6 @@ library
                       , trace-resources
                       , unordered-containers
                       , wai
-                      , wai-extra
                       , warp
                       , yaml
 

cardano-tracer/configuration/complete-example.json

@@ -6,16 +6,10 @@
   },
   "loRequestNum": 100,
   "ekgRequestFreq": 2,
-  "hasEKG": [
-    {
-      "epHost": "127.0.0.1",
-      "epPort": 3100
-    },
-    {
-      "epHost": "127.0.0.1",
-      "epPort": 3101
-    }
-  ],
+  "hasEKG": {
+    "epHost": "127.0.0.1",
+    "epPort": 3100
+  },
   "hasPrometheus": {
     "epHost": "127.0.0.1",
     "epPort": 3000

cardano-tracer/configuration/complete-example.yaml

@@ -7,10 +7,8 @@ network:
 loRequestNum: 100
 ekgRequestFreq: 2
 hasEKG:
-- epHost: 127.0.0.1
+  epHost: 127.0.0.1
   epPort: 3100
-- epHost: 127.0.0.1
-  epPort: 3101
 hasPrometheus:
   epHost: 127.0.0.1
   epPort: 3000

cardano-tracer/demo/multi/active-tracer-config.json

@@ -8,16 +8,10 @@
       "/run/user/1000/cardano-tracer-demo-3.sock"
     ]
   },
-  "hasEKG": [
-    {
+  "hasEKG": {
       "epHost": "127.0.0.1",
       "epPort": 3100
-    },
-    {
-      "epHost": "127.0.0.1",
-      "epPort": 3101
-    }
-  ],
+  },
   "hasPrometheus": {
     "epHost": "127.0.0.1",
     "epPort": 3000

cardano-tracer/demo/multi/passive-tracer-config.json

@@ -4,16 +4,10 @@
     "tag": "AcceptAt",
     "contents": "/run/user/1000/cardano-tracer-demo-1.sock"
   },
-  "hasEKG": [
-    {
-      "epHost": "127.0.0.1",
-      "epPort": 3100
-    },
-    {
-      "epHost": "127.0.0.1",
-      "epPort": 3101
-    }
-  ],
+  "hasEKG": {
+    "epHost": "127.0.0.1",
+    "epPort": 3100
+  },
   "hasPrometheus": {
     "epHost": "127.0.0.1",
     "epPort": 3000

cardano-tracer/docs/cardano-tracer.md

@@ -337,6 +337,8 @@ The fields `rpMaxAgeMinutes`, `rpMaxAgeHours` specify the lifetime of the log fi
 
 ## Prometheus
 
+At top-level route `/` Promtheus gives a list of connected nodes.
+
 The optional field `hasPrometheus` specifies the host and port of the web page with metrics. For example:
 
 ```
@@ -374,24 +376,16 @@ rts_gc_cumulative_bytes_used 184824
 
 ## EKG Monitoring
 
-The optional field `hasEKG` specifies the hosts and ports of two web pages:
-
-1. the list of identifiers of connected nodes,
-2. EKG monitoring page.
+At top-level route `/` EKG gives a list of connected nodes.
 
-For example, if you use JSON configuration file:
+The optional field `hasPrometheus` specifies the host and port of the
+web page with metrics. For example:
 
 ```
-"hasEKG": [
-  {
-    "epHost": "127.0.0.1",
-    "epPort": 3100
-  },
-  {
-    "epHost": "127.0.0.1",
-    "epPort": 3101
-  }
-]
+"hasEKG": {
+  "epHost": "127.0.0.1",
+  "epPort": 3100
+}
 ```
 
 The page with the list of identifiers of connected nodes will be available at `http://127.0.0.1:3100`, for example: