Skip to content

Commit

Permalink
test app: same as before, but working
Browse files Browse the repository at this point in the history
  • Loading branch information
mgmeier authored and Icelandjack committed Sep 23, 2024
1 parent c8ef498 commit 9740b6f
Show file tree
Hide file tree
Showing 22 changed files with 350 additions and 733 deletions.
5 changes: 0 additions & 5 deletions bench/ekg-restart-test/CHANGELOG.md

This file was deleted.

121 changes: 0 additions & 121 deletions bench/ekg-restart-test/app/Main.hs

This file was deleted.

54 changes: 0 additions & 54 deletions bench/ekg-restart-test/ekg-restart-test.cabal

This file was deleted.

8 changes: 2 additions & 6 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -52,7 +48,7 @@ package cryptonite
flags: -support_rdrand

package snap-server
flags: +openssl
flags: -openssl

package bitvec
flags: -simd
Expand All @@ -66,8 +62,8 @@ constraints:

allow-newer:
, katip:Win32
, ekg-wai:time

-- IMPORTANT
-- Do NOT add more source-repository-package stanzas here unless they are strictly
-- temporary! Please read the section in CONTRIBUTING about updating dependencies.

11 changes: 11 additions & 0 deletions cardano-tracer/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
20 changes: 8 additions & 12 deletions cardano-tracer/cardano-tracer.cabal
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -18,7 +18,7 @@ extra-doc-files: README.md

flag rtview
description: Enable RTView. False by default. Enable with `-f +rtview`.
default: False
default: True
manual: True

flag systemd
Expand Down Expand Up @@ -159,7 +159,7 @@ library

build-depends: aeson
, async
, async-extras
, auto-update
, bimap
, blaze-html
, bytestring
Expand All @@ -181,10 +181,7 @@ library
, ouroboros-network-framework
, signal
, slugify
, smtp-mail == 0.3.0.0
, snap-blaze
, snap-core
, snap-server
, smtp-mail ^>= 0.5
, stm
, string-qq
, text
Expand All @@ -193,9 +190,9 @@ library
, trace-forward
, trace-resources
, unordered-containers
, wai
, wai-extra
, warp
, utf8-string
, wai ^>= 3.2
, warp ^>= 3.4
, yaml

if flag(systemd) && os(linux)
Expand Down Expand Up @@ -286,8 +283,7 @@ library demo-acceptor-lib

exposed-modules: Cardano.Tracer.Test.Acceptor

build-depends: async-extras
, bytestring
build-depends: bytestring
, cardano-tracer
, containers
, extra
Expand Down
14 changes: 4 additions & 10 deletions cardano-tracer/configuration/complete-example.json
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions cardano-tracer/configuration/complete-example.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 2 additions & 8 deletions cardano-tracer/demo/multi/active-tracer-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 4 additions & 10 deletions cardano-tracer/demo/multi/passive-tracer-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading

0 comments on commit 9740b6f

Please sign in to comment.