Skip to content

Commit 1276f22

Browse files
authored
Merge pull request #6562 from IntersectMBO/russoul/timeseries-align-http-api-with-prometheus
cardano-tracer | timeseries: Prometheus-aligned HTTP API, node info endpoints, Grafana datasource
2 parents a53156c + 6310ad4 commit 1276f22

69 files changed

Lines changed: 11186 additions & 850 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

bench/cardano-profile/data/all-profiles-coay.json

Lines changed: 1577 additions & 599 deletions
Large diffs are not rendered by default.

bench/cardano-profile/data/test/chainsync-early-alonzo-coay/profile.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,8 @@
308308
"tracer": {
309309
"rtview": false,
310310
"ekg": false,
311-
"withresources": false
311+
"withresources": false,
312+
"timeseries": false
312313
},
313314
"cluster": null,
314315
"extra_desc": "without cardano-tracer",

bench/cardano-profile/data/test/chainsync-early-byron-coay/profile.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,8 @@
308308
"tracer": {
309309
"rtview": false,
310310
"ekg": false,
311-
"withresources": false
311+
"withresources": false,
312+
"timeseries": false
312313
},
313314
"extra_desc": "without cardano-tracer",
314315
"suffix": "notrc",

bench/cardano-profile/data/test/ci-test-bage.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
"filters": [],
1515
"finish_patience": 21,
1616
"last_log_spread_s": 120,
17-
"minimum_chain_density": 2.5e-2,
17+
"minimum_chain_density": 0.025,
1818
"silence_since_last_block_s": 120,
1919
"start_log_spread_s": 120,
20-
"tx_loss_ratio": 2.0e-2,
20+
"tx_loss_ratio": 0.020,
2121
"type": "standard"
2222
},
2323
"cli_args": {
@@ -119,7 +119,7 @@
119119
"tx_fee": 1000000
120120
},
121121
"genesis": {
122-
"active_slots_coeff": 5.0e-2,
122+
"active_slots_coeff": 0.050,
123123
"alonzo": {
124124
"collateralPercentage": 150,
125125
"costModels": {
@@ -329,7 +329,7 @@
329329
"pparamsEpoch": 300,
330330
"pparamsOverlays": [],
331331
"shelley": {
332-
"activeSlotsCoeff": 5.0e-2,
332+
"activeSlotsCoeff": 0.050,
333333
"epochLength": 600,
334334
"protocolParams": {
335335
"a0": 0.3,
@@ -352,7 +352,7 @@
352352
"major": 6,
353353
"minor": 0
354354
},
355-
"rho": 3.0e-3,
355+
"rho": 0.0030,
356356
"tau": 0.2
357357
},
358358
"securityParam": 3,
@@ -383,8 +383,8 @@
383383
"tracer": {
384384
"ekg": false,
385385
"rtview": false,
386-
"withresources": false
386+
"withresources": false,
387+
"timeseries": false
387388
},
388389
"workloads": []
389390
}
390-

bench/cardano-profile/data/test/ci-test-coay/profile.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,8 @@
315315
"tracer": {
316316
"rtview": false,
317317
"ekg": false,
318-
"withresources": false
318+
"withresources": false,
319+
"timeseries": false
319320
},
320321
"cluster": null,
321322
"desc": "Miniature dataset, CI-friendly duration, test scale",

bench/cardano-profile/data/test/ci-test-dense10-coay/profile.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -315,14 +315,15 @@
315315
"tracer": {
316316
"rtview": false,
317317
"ekg": false,
318-
"withresources": false
318+
"withresources": false,
319+
"timeseries": false
319320
},
320321
"cluster": null,
321322
"desc": "Miniature dataset, CI-friendly duration, test scale",
322323
"name": "ci-test-dense10-coay",
323324
"overlay": {},
324325
"derived": {
325-
"supply_delegated": 1e+16,
326+
"supply_delegated": 1E+16,
326327
"supply_total": 10010000000000000,
327328
"utxo_delegated": 0,
328329
"utxo_generated": 18000,

bench/cardano-profile/data/test/default-coay/profile.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,8 @@
317317
"tracer": {
318318
"rtview": false,
319319
"ekg": false,
320-
"withresources": false
320+
"withresources": false,
321+
"timeseries": false
321322
},
322323
"cluster": null,
323324
"name": "default-coay",

bench/cardano-profile/data/test/fast-nomadperf-coay/profile.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,8 @@
510510
"tracer": {
511511
"rtview": false,
512512
"ekg": false,
513-
"withresources": false
513+
"withresources": false,
514+
"timeseries": false
514515
},
515516
"cluster": {
516517
"nomad": {

bench/cardano-profile/src/Cardano/Benchmarking/Profile/Builtin/Miniature.hs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ base =
2828
. P.initCooldown 5
2929
. P.analysisStandard
3030

31+
3132
benchDuration :: Types.Profile -> Types.Profile
3233
benchDuration =
3334
V.timescaleCompressed
@@ -73,6 +74,7 @@ profilesNoEraMiniature =
7374
ciBench02PlutusV3 = ciBench02 & V.genesisVariantVoltaire
7475
ciBench10Value = ciBench10 & V.genesisVariant300
7576
ciBench10Plutus = ciBench10 & V.genesisVariant300
77+
7678
loop = V.plutusSaturation . V.plutusTypeLoop . P.analysisSizeSmall
7779
loop2024 = V.plutusSaturation . V.plutusTypeLoop2024 . P.analysisSizeSmall
7880
ecdsa = V.plutusDoublePlusSaturation . V.plutusTypeECDSA . P.analysisSizeModerate
@@ -85,6 +87,7 @@ profilesNoEraMiniature =
8587
, ciBench02Value & P.name "ci-bench-lmdb" . V.valueLocal . P.dreps 0 . P.traceForwardingOn . P.newTracing . P.lmdb . P.ssdDirectory "/tmp"
8688
, ciBench02Value & P.name "ci-bench-lsmt" . V.valueLocal . P.dreps 0 . P.traceForwardingOn . P.newTracing . P.lsmt . P.ssdDirectory "/tmp"
8789
, ciBench02Value & P.name "ci-bench-rtview" . V.valueLocal . P.dreps 0 . P.traceForwardingOn . P.newTracing . P.tracerRtview
90+
8891
, ciBench02Value & P.name "ci-bench-notracer" . V.valueLocal . P.dreps 0 . P.traceForwardingOff . P.newTracing
8992
, ciBench02Value & P.name "ci-bench-drep" . V.valueLocal . P.dreps 10 . P.traceForwardingOn . P.newTracing
9093
, ciBench02Plutus & P.name "ci-bench-plutus" . loop . P.dreps 0 . P.traceForwardingOn . P.newTracing
@@ -115,7 +118,8 @@ profilesNoEraMiniature =
115118
dense & P.name "6-dense" . V.valueCloud . duration30 . P.traceForwardingOn . P.newTracing
116119
, dense & P.name "6-dense-rtsprof" . V.valueCloud . duration30 . P.traceForwardingOn . P.newTracing . P.rtsHeapProf . P.rtsEventlogged
117120
, dense & P.name "6-dense-1h" . V.valueCloud . duration60 . P.traceForwardingOn . P.newTracing
118-
, dense & P.name "6-dense-1h-rtsprof" . V.valueCloud . duration60 . P.traceForwardingOn . P.newTracing . P.rtsHeapProf . P.rtsEventlogged
121+
, dense & P.name "6-dense-1h-rtsprof" . V.valueCloud . duration60 . P.traceForwardingOn . P.newTracing . P.rtsHeapProf . P.rtsEventlogged
122+
, dense & P.name "6-dense-timeseries-1h" . V.valueCloud . duration60 . P.traceForwardingOn . P.newTracing . P.tracerRtview . P.tracerTimeseries
119123
, dense & P.name "6-dense-4h" . V.valueCloud . duration240 . P.traceForwardingOn . P.newTracing
120124
, dense & P.name "6-dense-4h-rtsprof" . V.valueCloud . duration240 . P.traceForwardingOn . P.newTracing . P.rtsHeapProf . P.rtsEventlogged
121125
]

bench/cardano-profile/src/Cardano/Benchmarking/Profile/Primitives.hs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ module Cardano.Benchmarking.Profile.Primitives (
9393
, workloadAppend
9494

9595
-- Tracer's params.
96-
, tracerRtview, tracerWithresources
96+
, tracerRtview, tracerWithresources, tracerTimeseries
9797

9898
-- Cluster params.
9999
, clusterMinimunStorage, ssdDirectory, clusterKeepRunningOn
@@ -203,6 +203,7 @@ empty = Types.Profile {
203203
Types.rtview = False
204204
, Types.ekg = False
205205
, Types.withresources = False
206+
, Types.timeseries = False
206207
}
207208
, Types.cluster = Nothing
208209
, Types.analysis = Types.Analysis {
@@ -804,6 +805,9 @@ tracerRtview = tracer (\t -> t {Types.rtview = True})
804805
tracerWithresources :: Types.Profile -> Types.Profile
805806
tracerWithresources = tracer (\t -> t {Types.withresources = True})
806807

808+
tracerTimeseries :: Types.Profile -> Types.Profile
809+
tracerTimeseries = tracer (\t -> t {Types.timeseries = True})
810+
807811
-- Cluster.
808812
--------------------------------------------------------------------------------
809813

0 commit comments

Comments
 (0)