Skip to content

Commit 3259ca5

Browse files
chaitanyapremchaitanyaprem
committed
add support for multiple mix publishers
1 parent 154ad2a commit 3259ca5

File tree

3 files changed

+128
-38
lines changed

3 files changed

+128
-38
lines changed

‎docker-compose.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,8 @@ services:
100100
lp-mix:
101101
image: lightpushmix:test
102102
pull_policy: never
103+
#deploy:
104+
#replicas: 2
103105
entrypoint: sh
104106
environment:
105107
- NUM_NWAKU_NODES=${NUM_NWAKU_NODES}
@@ -249,4 +251,4 @@ services:
249251
# - simulation
250252

251253
volumes:
252-
privatekeys-volume:
254+
privatekeys-volume:

‎monitoring/configuration/dashboards/nwaku-monitoring.json‎

Lines changed: 104 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
"x": 0,
7373
"y": 1
7474
},
75-
"id": 89,
75+
"id": 94,
7676
"options": {
7777
"colorMode": "value",
7878
"graphMode": "none",
@@ -98,14 +98,14 @@
9898
"uid": "PBFA97CFB590B2093"
9999
},
100100
"editorMode": "code",
101-
"expr": "mix_messages_recvd_total{type=\"Intermediate\"}",
101+
"expr": "mix_pool_size",
102102
"format": "time_series",
103103
"legendFormat": "{{instance}}",
104104
"range": true,
105105
"refId": "A"
106106
}
107107
],
108-
"title": "Mix msgs Rcvd (Intermediate)",
108+
"title": "Mix Pool Size",
109109
"type": "stat"
110110
},
111111
{
@@ -175,6 +175,74 @@
175175
"title": "Mix msgs Rcvd (Exit)",
176176
"type": "stat"
177177
},
178+
{
179+
"datasource": {
180+
"type": "prometheus",
181+
"uid": "PBFA97CFB590B2093"
182+
},
183+
"fieldConfig": {
184+
"defaults": {
185+
"color": {
186+
"mode": "thresholds"
187+
},
188+
"mappings": [],
189+
"thresholds": {
190+
"mode": "percentage",
191+
"steps": [
192+
{
193+
"color": "green"
194+
},
195+
{
196+
"color": "red",
197+
"value": 80
198+
}
199+
]
200+
}
201+
},
202+
"overrides": []
203+
},
204+
"gridPos": {
205+
"h": 13,
206+
"w": 11,
207+
"x": 0,
208+
"y": 14
209+
},
210+
"id": 89,
211+
"options": {
212+
"colorMode": "value",
213+
"graphMode": "none",
214+
"justifyMode": "auto",
215+
"orientation": "auto",
216+
"percentChangeColorMode": "standard",
217+
"reduceOptions": {
218+
"calcs": [
219+
"lastNotNull"
220+
],
221+
"fields": "",
222+
"values": false
223+
},
224+
"showPercentChange": false,
225+
"textMode": "auto",
226+
"wideLayout": true
227+
},
228+
"pluginVersion": "11.6.0",
229+
"targets": [
230+
{
231+
"datasource": {
232+
"type": "prometheus",
233+
"uid": "PBFA97CFB590B2093"
234+
},
235+
"editorMode": "code",
236+
"expr": "mix_messages_recvd_total{type=\"Intermediate\"}",
237+
"format": "time_series",
238+
"legendFormat": "{{instance}}",
239+
"range": true,
240+
"refId": "A"
241+
}
242+
],
243+
"title": "Mix msgs Rcvd (Intermediate)",
244+
"type": "stat"
245+
},
178246
{
179247
"datasource": {
180248
"type": "prometheus",
@@ -237,10 +305,10 @@
237305
"gridPos": {
238306
"h": 8,
239307
"w": 11,
240-
"x": 0,
308+
"x": 11,
241309
"y": 14
242310
},
243-
"id": 91,
311+
"id": 92,
244312
"options": {
245313
"legend": {
246314
"calcs": [],
@@ -262,13 +330,13 @@
262330
"uid": "PBFA97CFB590B2093"
263331
},
264332
"editorMode": "code",
265-
"expr": "waku_lightpush_v3_messages",
266-
"legendFormat": "{{instance}}",
333+
"expr": "waku_node_messages_total",
334+
"legendFormat": "{{instance}}_{{__name__}}",
267335
"range": true,
268336
"refId": "A"
269337
}
270338
],
271-
"title": "LP msgs Recvd",
339+
"title": "Relay msgs",
272340
"type": "timeseries"
273341
},
274342
{
@@ -334,9 +402,9 @@
334402
"h": 8,
335403
"w": 11,
336404
"x": 11,
337-
"y": 14
405+
"y": 22
338406
},
339-
"id": 92,
407+
"id": 93,
340408
"options": {
341409
"legend": {
342410
"calcs": [],
@@ -358,13 +426,13 @@
358426
"uid": "PBFA97CFB590B2093"
359427
},
360428
"editorMode": "code",
361-
"expr": "waku_node_messages_total",
362-
"legendFormat": "{{instance}}_{{__name__}}",
429+
"expr": "mix_messages_recvd_total{type=\"Exit\"}",
430+
"legendFormat": "{{instance}}",
363431
"range": true,
364432
"refId": "A"
365433
}
366434
],
367-
"title": "Relay msgs",
435+
"title": "Mix Msgs Recvd(Exit)",
368436
"type": "timeseries"
369437
},
370438
{
@@ -430,9 +498,9 @@
430498
"h": 8,
431499
"w": 11,
432500
"x": 0,
433-
"y": 22
501+
"y": 27
434502
},
435-
"id": 83,
503+
"id": 91,
436504
"options": {
437505
"legend": {
438506
"calcs": [],
@@ -454,13 +522,13 @@
454522
"uid": "PBFA97CFB590B2093"
455523
},
456524
"editorMode": "code",
457-
"expr": "mix_messages_recvd{type=\"Intermediate\"}",
525+
"expr": "waku_lightpush_v3_messages",
458526
"legendFormat": "{{instance}}",
459527
"range": true,
460528
"refId": "A"
461529
}
462530
],
463-
"title": "Mix Msgs Recvd(Intermediate)",
531+
"title": "LP msgs Recvd",
464532
"type": "timeseries"
465533
},
466534
{
@@ -526,9 +594,9 @@
526594
"h": 8,
527595
"w": 11,
528596
"x": 11,
529-
"y": 22
597+
"y": 30
530598
},
531-
"id": 93,
599+
"id": 87,
532600
"options": {
533601
"legend": {
534602
"calcs": [],
@@ -550,13 +618,13 @@
550618
"uid": "PBFA97CFB590B2093"
551619
},
552620
"editorMode": "code",
553-
"expr": "mix_messages_recvd{type=\"Exit\"}",
554-
"legendFormat": "{{instance}}",
621+
"expr": "mix_messages_error_total",
622+
"legendFormat": "{{instance}}_{{__name__}}",
555623
"range": true,
556624
"refId": "A"
557625
}
558626
],
559-
"title": "Mix Msgs Recvd(Exit)",
627+
"title": "Mix Msgs Errors",
560628
"type": "timeseries"
561629
},
562630
{
@@ -622,9 +690,9 @@
622690
"h": 8,
623691
"w": 11,
624692
"x": 0,
625-
"y": 30
693+
"y": 35
626694
},
627-
"id": 84,
695+
"id": 83,
628696
"options": {
629697
"legend": {
630698
"calcs": [],
@@ -646,13 +714,13 @@
646714
"uid": "PBFA97CFB590B2093"
647715
},
648716
"editorMode": "code",
649-
"expr": "mix_messages_forwarded",
650-
"legendFormat": "{{instance}}_{{__name__}}",
717+
"expr": "mix_messages_recvd_total{type=\"Intermediate\"}",
718+
"legendFormat": "{{instance}}",
651719
"range": true,
652720
"refId": "A"
653721
}
654722
],
655-
"title": "Mix Msgs Fwd",
723+
"title": "Mix Msgs Recvd(Intermediate)",
656724
"type": "timeseries"
657725
},
658726
{
@@ -718,9 +786,9 @@
718786
"h": 8,
719787
"w": 11,
720788
"x": 11,
721-
"y": 30
789+
"y": 38
722790
},
723-
"id": 87,
791+
"id": 88,
724792
"options": {
725793
"legend": {
726794
"calcs": [],
@@ -742,13 +810,13 @@
742810
"uid": "PBFA97CFB590B2093"
743811
},
744812
"editorMode": "code",
745-
"expr": "mix_messages_error",
813+
"expr": "lp_mix_success_total",
746814
"legendFormat": "{{instance}}_{{__name__}}",
747815
"range": true,
748816
"refId": "A"
749817
}
750818
],
751-
"title": "Mix Msgs Errors",
819+
"title": "LP Mix Sim msgs sent",
752820
"type": "timeseries"
753821
},
754822
{
@@ -814,9 +882,9 @@
814882
"h": 8,
815883
"w": 11,
816884
"x": 0,
817-
"y": 38
885+
"y": 43
818886
},
819-
"id": 88,
887+
"id": 84,
820888
"options": {
821889
"legend": {
822890
"calcs": [],
@@ -838,13 +906,13 @@
838906
"uid": "PBFA97CFB590B2093"
839907
},
840908
"editorMode": "code",
841-
"expr": "lp_mix_success",
909+
"expr": "mix_messages_forwarded_total",
842910
"legendFormat": "{{instance}}_{{__name__}}",
843911
"range": true,
844912
"refId": "A"
845913
}
846914
],
847-
"title": "LP Mix Sim msgs sent",
915+
"title": "Mix Msgs Fwd",
848916
"type": "timeseries"
849917
},
850918
{
@@ -853,7 +921,7 @@
853921
"h": 1,
854922
"w": 24,
855923
"x": 0,
856-
"y": 46
924+
"y": 51
857925
},
858926
"id": 85,
859927
"panels": [

‎monitoring/prometheus-config.yml‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,4 +214,24 @@ scrape_configs:
214214
- waku-simulator-nwaku-198:8008
215215
- waku-simulator-nwaku-199:8008
216216
- waku-simulator-nwaku-200:8008
217-
- lp-mix-1:8008
217+
- waku-simulator-lp-mix-1:8008
218+
- waku-simulator-lp-mix-2:8008
219+
- waku-simulator-lp-mix-3:8008
220+
- waku-simulator-lp-mix-4:8008
221+
- waku-simulator-lp-mix-5:8008
222+
- waku-simulator-lp-mix-6:8008
223+
- waku-simulator-lp-mix-7:8008
224+
- waku-simulator-lp-mix-8:8008
225+
- waku-simulator-lp-mix-9:8008
226+
- waku-simulator-lp-mix-10:8008
227+
- waku-simulator-lp-mix-11:8008
228+
- waku-simulator-lp-mix-12:8008
229+
- waku-simulator-lp-mix-13:8008
230+
- waku-simulator-lp-mix-14:8008
231+
- waku-simulator-lp-mix-15:8008
232+
- waku-simulator-lp-mix-16:8008
233+
- waku-simulator-lp-mix-17:8008
234+
- waku-simulator-lp-mix-18:8008
235+
- waku-simulator-lp-mix-19:8008
236+
- waku-simulator-lp-mix-20:8008
237+
- waku-simulator-lp-mix-21:8008

0 commit comments

Comments
 (0)