Skip to content

Commit ff53757

Browse files
kostorrkostorr
committed
[mon] Serial and endpoint as tags
1 parent 2395ce1 commit ff53757

16 files changed

+185
-185
lines changed

‎README.md‎

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -390,18 +390,18 @@ To directly send metrics to the Alice O2 Monitoring library, the argument `--mon
390390
| Value name | Value | type |
391391
| ------------------------- | ----- | ------ |
392392
| `"pciAddress"` | - | string |
393-
| `"serial"` | - | int |
394-
| `"endpoint"` | - | int |
395393
| `"temperature"` | - | double |
396394
| `"droppedPackets"` | - | int |
397395
| `"ctpClock"` | - | double |
398396
| `"localClock"` | - | double |
399397
| `"totalPacketsPerSecond"` | - | int |
400398
401-
| Tag key | Value |
402-
| ------------------ | ---------------- |
403-
| `tags::Key::ID` | ID of the card |
404-
| `tags::Key::Type` | Type of the card |
399+
| Tag key | Value |
400+
| --------------------- | --------------------- |
401+
| `tags::Key::SerialId` | Serial ID of the card |
402+
| `tags::Key::Endpoint` | Endpoint of the card |
403+
| `tags::Key::ID` | ID of the card |
404+
| `tags::Key::Type` | Type of the card |
405405
406406
### roc-pkt-monitor
407407
Monitors packet statistics per link and per CRU wrapper. Output may be in an ASCII table (default) or in JSON (`json-out` option)
@@ -420,15 +420,15 @@ To directly send metrics to the Alice O2 Monitoring library, the argument `--mon
420420
| Value name | Value | Type |
421421
| ----------------------- | ------ | ------ |
422422
| `"pciAddress"` | - | string |
423-
| `"serial"` | - | int |
424423
| `"acquisitionRate"` | - | int |
425424
| `"packetsReceived"` | - | int |
426425
427-
| Tag key | Value |
428-
| ------------------ | -------------------- |
429-
| `tags::Key::CRORC` | ID of the CRORC |
430-
| `tags::Key::ID` | ID of the link |
431-
| `tags::Key::Type` | `tags::Value::CRORC` |
426+
| Tag key | Value |
427+
| --------------------- | --------------------- |
428+
| `tags::Key::SerialId` | Serial ID of the card |
429+
| `tags::Key::CRORC` | ID of the CRORC |
430+
| `tags::Key::ID` | ID of the link |
431+
| `tags::Key::Type` | `tags::Value::CRORC` |
432432
433433
##### CRU
434434
@@ -437,34 +437,34 @@ To directly send metrics to the Alice O2 Monitoring library, the argument `--mon
437437
| Value name | Value | Type |
438438
| ---------------- | ------ | ------ |
439439
| `"pciAddress"` | - | string |
440-
| `"serial"` | - | int |
441-
| `"endpoint"` | - | int |
442440
| `"accepted"` | - | int |
443441
| `"rejected"` | - | int |
444442
| `"forced"` | - | int |
445443
446-
| Tag key | Value |
447-
| ------------------ | -------------------- |
448-
| `tags::Key::CRU` | ID of the CRU |
449-
| `tags::Key::ID` | ID of the link |
450-
| `tags::Key::Type` | `tags::Value::CRU` |
444+
| Tag key | Value |
445+
| --------------------- | --------------------- |
446+
| `tags::Key::SerialId` | Serial ID of the card |
447+
| `tags::Key::Endpoint` | Endpoint of the card |
448+
| `tags::Key::CRU` | ID of the CRU |
449+
| `tags::Key::ID` | ID of the link |
450+
| `tags::Key::Type` | `tags::Value::CRU` |
451451
452452
###### `Metric: `"wrapper"`
453453
454454
| Value name | Value | Type |
455455
| -------------------------- | ------ | ------ |
456456
| `"pciAddress"` | - | string |
457-
| `"serial"` | - | int |
458-
| `"endpoint"` | - | int |
459457
| `"dropped"` | - | int |
460458
| `"totalPacketsPerSec"` | - | int |
461459
| `"forced"` | - | int |
462460
463-
| Tag key | Value |
464-
| ------------------ | -------------------- |
465-
| `tags::Key::CRU` | ID of the CRU |
466-
| `tags::Key::ID` | ID of the wrapper |
467-
| `tags::Key::Type` | `tags::Value::CRU` |
461+
| Tag key | Value |
462+
| --------------------- | --------------------- |
463+
| `tags::Key::SerialId` | Serial ID of the card |
464+
| `tags::Key::Endpoint` | Endpoint of the card |
465+
| `tags::Key::CRU` | ID of the CRU |
466+
| `tags::Key::ID` | ID of the link |
467+
| `tags::Key::Type` | `tags::Value::CRU` |
468468
469469
### roc-reg-[read, read-range, write]
470470
Writes and reads registers to/from a card's BAR.
@@ -502,31 +502,31 @@ metric format for the CRORC and the CRU is different, as different parameters ar
502502
| Value name | Value | Type |
503503
| ---------------------- | ------------------------ | ------ |
504504
| `"pciAddress"` | - | string |
505-
| `"serial"` | - | int |
506505
| `"qsfp"` | 0/1 (Disabled/Enabled) | int |
507506
| `"dynamicOffset"` | 0/1 (Disabled/Enabled) | int |
508507
| `"timeFrameDetection"` | 0/1 (Disabled/Enabled) | int |
509508
| `"timeFrameLength"` | - | int |
510509
511-
| Tag key | Value |
512-
| ----------------- | -------------------- |
513-
| `tags::Key::ID` | ID of the card |
514-
| `tags::Key::Type` | `tags::Value::CRORC` |
510+
| Tag key | Value |
511+
| --------------------- | --------------------- |
512+
| `tags::Key::SerialId` | Serial ID of the card |
513+
| `tags::Key::ID` | ID of the card |
514+
| `tags::Key::Type` | `tags::Value::CRORC` |
515515
516516
###### Metric: `"link"`
517517
518518
| Value name | Value | Type |
519519
| ---------------- | -------------- | ------ |
520520
| `"pciAddress"` | - | string |
521-
| `"serial"` | - | int |
522521
| `"status"` | 0/1 (DOWN/UP) | int |
523522
| `"opticalPower"` | - | double |
524523
525-
| Tag key | Value |
526-
| ------------------ | -------------------- |
527-
| `tags::Key::CRORC` | ID of the CRORC |
528-
| `tags::Key::ID` | ID of the link |
529-
| `tags::Key::Type` | `tags::Value::CRORC` |
524+
| Tag key | Value |
525+
| --------------------- | --------------------- |
526+
| `tags::Key::SerialId` | Serial ID of the card |
527+
| `tags::Key::CRORC` | ID of the CRORC |
528+
| `tags::Key::ID` | ID of the link |
529+
| `tags::Key::Type` | `tags::Value::CRORC` |
530530
531531
##### CRU
532532
@@ -535,19 +535,19 @@ metric format for the CRORC and the CRU is different, as different parameters ar
535535
| Value name | Value | Type |
536536
| --------------------------- | ----------------------- | ------ |
537537
| `"pciAddress"` | - | string |
538-
| `"serial"` | - | int |
539-
| `"endpoint"` | - | int |
540538
| `"CRU ID"` | Assigned CRU ID | int |
541539
| `"clock"` | "TTC" or "Local" | string |
542540
| `"dynamicOffset"` | 0/1 (Disabled/Enabled) | int |
543541
| `"userLogic"` | 0/1 (Disabled/Enabled) | int |
544542
| `"runStats"` | 0/1 (Disabled/Enabled) | int |
545543
| `"commonAndUserLogic"` | 0/1 (Disabled/Enabled) | int |
546544
547-
| Tag key | Value |
548-
| ----------------- | ------------------ |
549-
| `tags::Key::ID` | ID of the card |
550-
| `tags::Key::Type` | `tags::Value::CRU` |
545+
| Tag key | Value |
546+
| --------------------- | --------------------- |
547+
| `tags::Key::SerialId` | Serial ID of the card |
548+
| `tags::Key::Endpoint` | Endpoint of the card |
549+
| `tags::Key::ID` | ID of the card |
550+
| `tags::Key::Type` | `tags::Value::CRU` |
551551
552552
###### Metric: `"onu"`
553553
@@ -570,8 +570,6 @@ metric format for the CRORC and the CRU is different, as different parameters ar
570570
| Value name | Value | Type |
571571
| ---------------- | ----------------------------------------------------------------- | ------ |
572572
| `"pciAddress"` | - | string |
573-
| `"serial"` | - | int |
574-
| `"endpoint"` | - | int |
575573
| `"gbtMode"` | "GBT/GBT" or "GBT/WB" | string |
576574
| `"loopback"` | 0/1 (Enabled/Disabled) | int |
577575
| `"gbtMux"` | "DDG", "SWT", "TTC:CTP", "TTC:PATTERN", "TTC:MIDTRG", or "TTCUP" | string |
@@ -582,11 +580,13 @@ metric format for the CRORC and the CRU is different, as different parameters ar
582580
| `"status"` | 0/1/2 (DOWN/UP/UP was DOWN) | int |
583581
| `"opticalPower"` | - | double |
584582
585-
| Tag key | Value |
586-
| ----------------- | ------------------ |
587-
| `tags::Key::CRU` | ID of the CRU |
588-
| `tags::Key::ID` | ID of the link |
589-
| `tags::Key::Type` | `tags::Value::CRU` |
583+
| Tag key | Value |
584+
| --------------------- | --------------------- |
585+
| `tags::Key::SerialId` | Serial ID of the card |
586+
| `tags::Key::Endpoint` | Endpoint of the card |
587+
| `tags::Key::CRU` | ID of the CRU |
588+
| `tags::Key::ID` | ID of the link |
589+
| `tags::Key::Type` | `tags::Value::CRU` |
590590
591591
Exceptions
592592
-------------------

‎doc/examples/roc-metrics/roc-metrics.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,45 +2,45 @@
22
"0": {
33
"type": "CRU",
44
"pciAddress": "af:00.0",
5-
"serial": "10243",
5+
"serial": "243",
66
"endpoint": "0",
77
"temperature": "38.19",
8-
"droppedPackets": "0",
9-
"ctpClock": "0.79",
8+
"droppedPackets": "-1723989759",
9+
"ctpClock": "1.01",
1010
"localClock": "240.47",
11-
"totalPacketsPerSecond": "0"
11+
"totalPacketsPerSecond": "304347"
1212
},
1313
"1": {
1414
"type": "CRU",
1515
"pciAddress": "3b:00.0",
1616
"serial": "10241",
1717
"endpoint": "0",
18-
"temperature": "38.19",
18+
"temperature": "40.22",
1919
"droppedPackets": "0",
2020
"ctpClock": "0.90",
21-
"localClock": "0.00",
21+
"localClock": "240.47",
2222
"totalPacketsPerSecond": "0"
2323
},
2424
"2": {
2525
"type": "CRU",
2626
"pciAddress": "3c:00.0",
2727
"serial": "10241",
2828
"endpoint": "1",
29-
"temperature": "38.19",
29+
"temperature": "40.22",
3030
"droppedPackets": "0",
3131
"ctpClock": "0.90",
32-
"localClock": "0.00",
32+
"localClock": "240.47",
3333
"totalPacketsPerSecond": "0"
3434
},
3535
"3": {
3636
"type": "CRU",
3737
"pciAddress": "b0:00.0",
38-
"serial": "10243",
38+
"serial": "243",
3939
"endpoint": "1",
4040
"temperature": "38.19",
41-
"droppedPackets": "0",
42-
"ctpClock": "0.79",
41+
"droppedPackets": "772628918",
42+
"ctpClock": "1.01",
4343
"localClock": "240.47",
44-
"totalPacketsPerSecond": "0"
44+
"totalPacketsPerSecond": "304347"
4545
}
4646
}

‎doc/examples/roc-metrics/roc-metrics.mon‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
2020-08-04 13:05:22 InfluxDB backend initialized
2-
card,hostname=flp-kostas.cern.ch,id=1,type=CRU pciAddress="af:00.0",serial=10243i,endpoint=0i,temperature=38.1875,droppedPackets=0i,ctpClock=0.790384,localClock=240.471,totalPacketsPerSecond=0i 1596539122722151804
3-
card,hostname=flp-kostas.cern.ch,id=2,type=CRU pciAddress="3b:00.0",serial=10241i,endpoint=0i,temperature=38.1875,droppedPackets=0i,ctpClock=0.901238,localClock=0,totalPacketsPerSecond=0i 1596539122882675174
4-
card,hostname=flp-kostas.cern.ch,id=3,type=CRU pciAddress="3c:00.0",serial=10241i,endpoint=1i,temperature=38.1875,droppedPackets=0i,ctpClock=0.901238,localClock=0,totalPacketsPerSecond=0i 1596539123042720898
5-
card,hostname=flp-kostas.cern.ch,id=4,type=CRU pciAddress="b0:00.0",serial=10243i,endpoint=1i,temperature=38.8643,droppedPackets=0i,ctpClock=0.790384,localClock=240.471,totalPacketsPerSecond=0i 1596539123203288989
1+
2020-08-25 13:49:11 InfluxDB backend initialized
2+
card,hostname=flp-kostas.cern.ch,serialId=243,endpoint=0,id=1,type=CRU pciAddress="af:00.0",temperature=38.1875,droppedPackets=-1726260925i,ctpClock=1.01428,localClock=240.471,totalPacketsPerSecond=304347i 1598356151308255600
3+
card,hostname=flp-kostas.cern.ch,serialId=10241,endpoint=0,id=2,type=CRU pciAddress="3b:00.0",temperature=40.8945,droppedPackets=0i,ctpClock=0.901238,localClock=240.471,totalPacketsPerSecond=0i 1598356151468913758
4+
card,hostname=flp-kostas.cern.ch,serialId=10241,endpoint=1,id=3,type=CRU pciAddress="3c:00.0",temperature=40.8945,droppedPackets=0i,ctpClock=0.901238,localClock=240.471,totalPacketsPerSecond=0i 1598356151629278762
5+
card,hostname=flp-kostas.cern.ch,serialId=243,endpoint=1,id=4,type=CRU pciAddress="b0:00.0",temperature=37.5107,droppedPackets=772376633i,ctpClock=1.01428,localClock=240.471,totalPacketsPerSecond=304347i 1598356151630611651

‎doc/examples/roc-metrics/roc-metrics.out‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
===============================================================================================================================================
22
# Type PCI Addr Serial Endpoint Temp (C) #Dropped Packets CTP Clock (MHz) Local Clock (MHz) Total Packets per second
33
-----------------------------------------------------------------------------------------------------------------------------------------------
4-
0 CRU af:00.0 10243 0 38.1875 0 0.790384 240.471 0
5-
1 CRU 3b:00.0 10241 0 37.5107 0 0.901238 0 0
6-
2 CRU 3c:00.0 10241 1 38.1875 0 0.901238 0 0
7-
3 CRU b0:00.0 10243 1 38.1875 0 0.790384 240.471 0
4+
0 CRU af:00.0 243 0 38.1875 -1722217653 1.01428 240.471 304348
5+
1 CRU 3b:00.0 10241 0 40.2178 0 0.901238 240.471 0
6+
2 CRU 3c:00.0 10241 1 40.2178 0 0.901238 240.471 0
7+
3 CRU b0:00.0 243 1 38.1875 772825847 1.01428 240.471 304348
88
===============================================================================================================================================

‎doc/examples/roc-pkt-monitor/roc-pkt-monitor-crorc.mon‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
2020-08-14 13:53:42 InfluxDB backend initialized
2-
link,hostname=flp-kostas.cern.ch,CRORC=0,id=0,type=CRORC pciAddress="d8:00.0",serial=42942i,acquisitionRate=0i,packetsReceived=0i 1597406022865010783
3-
link,hostname=flp-kostas.cern.ch,CRORC=0,id=1,type=CRORC pciAddress="d8:00.0",serial=42942i,acquisitionRate=0i,packetsReceived=0i 1597406023367687305
4-
link,hostname=flp-kostas.cern.ch,CRORC=0,id=2,type=CRORC pciAddress="d8:00.0",serial=42942i,acquisitionRate=0i,packetsReceived=0i 1597406023869886425
5-
link,hostname=flp-kostas.cern.ch,CRORC=0,id=3,type=CRORC pciAddress="d8:00.0",serial=42942i,acquisitionRate=0i,packetsReceived=0i 1597406024372455378
6-
link,hostname=flp-kostas.cern.ch,CRORC=0,id=4,type=CRORC pciAddress="d8:00.0",serial=42942i,acquisitionRate=0i,packetsReceived=0i 1597406024875084974
7-
link,hostname=flp-kostas.cern.ch,CRORC=0,id=5,type=CRORC pciAddress="d8:00.0",serial=42942i,acquisitionRate=0i,packetsReceived=0i 1597406025377332221
1+
2020-08-25 13:49:59 InfluxDB backend initialized
2+
link,hostname=flp-kostas.cern.ch,serialId=42942,CRORC=0,id=0,type=CRORC pciAddress="d8:00.0",acquisitionRate=0i,packetsReceived=0i 1598356199986026486
3+
link,hostname=flp-kostas.cern.ch,serialId=42942,CRORC=0,id=1,type=CRORC pciAddress="d8:00.0",acquisitionRate=0i,packetsReceived=0i 1598356200488689170
4+
link,hostname=flp-kostas.cern.ch,serialId=42942,CRORC=0,id=2,type=CRORC pciAddress="d8:00.0",acquisitionRate=0i,packetsReceived=0i 1598356200990959498
5+
link,hostname=flp-kostas.cern.ch,serialId=42942,CRORC=0,id=3,type=CRORC pciAddress="d8:00.0",acquisitionRate=0i,packetsReceived=0i 1598356201493785243
6+
link,hostname=flp-kostas.cern.ch,serialId=42942,CRORC=0,id=4,type=CRORC pciAddress="d8:00.0",acquisitionRate=0i,packetsReceived=0i 1598356201997210429
7+
link,hostname=flp-kostas.cern.ch,serialId=42942,CRORC=0,id=5,type=CRORC pciAddress="d8:00.0",acquisitionRate=0i,packetsReceived=0i 1598356202499596972

‎doc/examples/roc-pkt-monitor/roc-pkt-monitor-crorc.out‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
==================================
2-
Channel ACQ Rate Received
3-
----------------------------------
4-
0 0 0
5-
1 0 0
6-
2 0 0
7-
3 0 0
8-
4 0 0
9-
5 0 0
10-
==================================
1+
==========================================
2+
Channel ACQ Rate Packets Received
3+
------------------------------------------
4+
0 0 0
5+
1 0 0
6+
2 0 0
7+
3 0 0
8+
4 0 0
9+
5 0 0
10+
==========================================

‎doc/examples/roc-pkt-monitor/roc-pkt-monitor-cru.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22
"gbtLinks": {
33
"0": {
44
"linkId": "0",
5-
"accepted": "1230564670",
5+
"accepted": "2323607366",
66
"rejected": "107289",
77
"forced": "0"
88
},
99
"1": {
1010
"linkId": "1",
11-
"accepted": "1230564673",
11+
"accepted": "2323607367",
1212
"rejected": "107289",
1313
"forced": "0"
1414
},
1515
"2": {
1616
"linkId": "2",
17-
"accepted": "1230564673",
17+
"accepted": "2323607367",
1818
"rejected": "107289",
1919
"forced": "0"
2020
},
@@ -87,7 +87,7 @@
8787
},
8888
"wrapper": {
8989
"wrapperId": "0",
90-
"dropped": "3604563062",
91-
"totalPacketsPerSec": "304347"
90+
"dropped": "2588723845",
91+
"totalPacketsPerSec": "304353"
9292
}
9393
}

0 commit comments

Comments
 (0)