diff --git a/modules/mesh-delivery-teller/module.json b/modules/mesh-delivery-teller/module.json index 458c778b..4c00a0d3 100644 --- a/modules/mesh-delivery-teller/module.json +++ b/modules/mesh-delivery-teller/module.json @@ -16,24 +16,27 @@ "mesh-conditions.findings-asked", "mesh-delivery-assigner.views.asks" ], - "streams": [ - { - "name": "mesh-delivery-teller-findings", - "events": ["finding-written.*", "finding-cleared.*", "findings-stated.*"], - "max-age-days": 7, - "max-mib": 16 - } - ], "emits": [ "answered", "ask-ended" ], "state": [ - { "name": "answers", "history": 5 }, - { "name": "asked", "history": 1 }, - { "name": "ends", "history": 1 }, - { "name": "first-views", "history": 1 }, - { "name": "findings", "history": 1 } + { + "name": "answers", + "history": 5 + }, + { + "name": "asked", + "history": 1 + }, + { + "name": "ends", + "history": 1 + }, + { + "name": "first-views", + "history": 1 + } ], "reads": [ "mesh-delivery-gate.asks", @@ -101,5 +104,29 @@ ] } ] - } + }, + "requires": [ + { + "name": "findings", + "storage": "key-value", + "template": "state", + "options": { + "history": 1 + } + }, + { + "name": "finding-events", + "storage": "stream", + "template": "events", + "options": { + "events": [ + "finding-written.*", + "finding-cleared.*", + "findings-stated.*" + ], + "max-age-days": 7, + "max-mib": 16 + } + } + ] } diff --git a/modules/mesh-delivery-view/module.json b/modules/mesh-delivery-view/module.json index 899e9931..feb4694c 100644 --- a/modules/mesh-delivery-view/module.json +++ b/modules/mesh-delivery-view/module.json @@ -37,10 +37,18 @@ "stuck" ], "state": [ - { "name": "answers", "history": 5 }, - { "name": "reach", "history": 1 }, - { "name": "first-views", "history": 1 }, - { "name": "findings", "history": 1 } + { + "name": "answers", + "history": 5 + }, + { + "name": "reach", + "history": 1 + }, + { + "name": "first-views", + "history": 1 + } ], "consumes": [ "mesh-conditions.findings-asked", @@ -51,14 +59,6 @@ "mesh-delivery-indexer.views.candidates", "mesh-delivery-indexer.views.taken" ], - "streams": [ - { - "name": "mesh-delivery-view-findings", - "events": ["finding-written.*", "finding-cleared.*", "findings-stated.*"], - "max-age-days": 7, - "max-mib": 16 - } - ], "invokes": [ "mesh-delivery-assigner.assigner_read_asks", "mesh-delivery-assigner.assigner_read_differences", @@ -198,5 +198,29 @@ "from": "files" } ] - } + }, + "requires": [ + { + "name": "findings", + "storage": "key-value", + "template": "state", + "options": { + "history": 1 + } + }, + { + "name": "finding-events", + "storage": "stream", + "template": "events", + "options": { + "events": [ + "finding-written.*", + "finding-cleared.*", + "findings-stated.*" + ], + "max-age-days": 7, + "max-mib": 16 + } + } + ] } diff --git a/modules/mesh-delivery-watchman/module.json b/modules/mesh-delivery-watchman/module.json index 44b51e29..d51fa8b9 100644 --- a/modules/mesh-delivery-watchman/module.json +++ b/modules/mesh-delivery-watchman/module.json @@ -30,9 +30,6 @@ "mesh-delivery-indexer.indexer_read_modules", "seat:mesh-hand-acts.hand-act" ], - "streams": [ - { "name": "mesh-delivery-watchman-findings", "events": ["finding-written.*", "finding-cleared.*", "findings-stated.*"], "max-age-days": 7, "max-mib": 16 } - ], "consumes": [ "mesh-delivery-assigner.views.wants", "mesh-delivery-indexer.take-in.pending", @@ -73,11 +70,22 @@ "watchman_first_view_again" ], "state": [ - { "name": "presence", "history": 20 }, - { "name": "pulse", "key-ttl": true }, - { "name": "stuck", "history": 20 }, - { "name": "findings", "history": 5 }, - { "name": "first-views", "history": 1 } + { + "name": "presence", + "history": 20 + }, + { + "name": "pulse", + "key-ttl": true + }, + { + "name": "stuck", + "history": 20 + }, + { + "name": "first-views", + "history": 1 + } ], "own-secrets": { "broker": "${dir:state}/broker" @@ -146,5 +154,29 @@ ] } ] - } + }, + "requires": [ + { + "name": "findings", + "storage": "key-value", + "template": "state", + "options": { + "history": 5 + } + }, + { + "name": "finding-events", + "storage": "stream", + "template": "events", + "options": { + "events": [ + "finding-written.*", + "finding-cleared.*", + "findings-stated.*" + ], + "max-age-days": 7, + "max-mib": 16 + } + } + ] } diff --git a/modules/mesh-enrolment/module.json b/modules/mesh-enrolment/module.json index 506c568a..1750442f 100644 --- a/modules/mesh-enrolment/module.json +++ b/modules/mesh-enrolment/module.json @@ -16,9 +16,6 @@ ] } ], - "streams": [ - { "name": "mesh-enrolment-findings", "events": ["finding-written.*", "finding-cleared.*", "findings-stated.*"], "max-age-days": 7, "max-mib": 16 } - ], "consumes": [ "mesh-node-enroller.node-enrolled", "mesh-node-enroller.enrolment-refused", @@ -52,8 +49,7 @@ { "name": "asked", "history": 5 - }, - "findings" + } ], "tools": [ "enrolment_first_views", @@ -94,5 +90,26 @@ ] } ] - } + }, + "requires": [ + { + "name": "findings", + "storage": "key-value", + "template": "state" + }, + { + "name": "finding-events", + "storage": "stream", + "template": "events", + "options": { + "events": [ + "finding-written.*", + "finding-cleared.*", + "findings-stated.*" + ], + "max-age-days": 7, + "max-mib": 16 + } + } + ] }