Skip to content

Commit adc5d59

Browse files
murrantlaf
murrant
and
laf
authored
Fix Panos HA states (librenms#18496)
* Fix Panos HA states Define consistent and new state_name * Updated test data --------- Co-authored-by: Neil Lathwood <[email protected]>
1 parent bc0c8d2 commit adc5d59

File tree

7 files changed

+180
-468
lines changed

7 files changed

+180
-468
lines changed

‎resources/definitions/os_discovery/panos.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ modules:
2727
num_oid: '.1.3.6.1.4.1.25461.2.1.2.1.11.{{ $index }}'
2828
index: 'panSysHAState.{{ $index }}'
2929
descr: High Availability Local Status
30+
state_name: panSysHaStateEnum
3031
states:
3132
- { value: 0, generic: 2, graph: 1, descr: unknown }
3233
- { value: 1, generic: 2, graph: 1, descr: suspended }
@@ -42,6 +43,7 @@ modules:
4243
num_oid: '.1.3.6.1.4.1.25461.2.1.2.1.12.{{ $index }}'
4344
index: 'panSysHAPeerState.{{ $index }}'
4445
descr: High Availability Peer Status
46+
state_name: panSysHaStateEnum
4547
states:
4648
- { value: 0, generic: 2, graph: 1, descr: unknown }
4749
- { value: 1, generic: 2, graph: 1, descr: suspended }
@@ -62,7 +64,7 @@ modules:
6264
num_oid: '.1.3.6.1.4.1.25461.2.1.2.1.12.{{ $index }}'
6365
index: 'panSysHAPeerState.{{ $index }}'
6466
descr: High Availability Peer Status
65-
state_name: panSysHAPeerState_local
67+
state_name: panSysHaStateEnum
6668
states:
6769
- { value: 0, generic: 0, graph: 1, descr: unknown }
6870
- { value: 1, generic: 0, graph: 1, descr: suspended }

‎tests/data/panos.json‎

Lines changed: 48 additions & 152 deletions
Original file line numberDiff line numberDiff line change
@@ -5380,7 +5380,7 @@
53805380
"poller_type": "snmp",
53815381
"sensor_oid": ".1.3.6.1.4.1.25461.2.1.2.1.12.0",
53825382
"sensor_index": "panSysHAPeerState.0",
5383-
"sensor_type": "panSysHAPeerState",
5383+
"sensor_type": "panSysHaStateEnum",
53845384
"sensor_descr": "High Availability Peer Status",
53855385
"group": null,
53865386
"sensor_divisor": 1,
@@ -5397,15 +5397,15 @@
53975397
"sensor_prev": null,
53985398
"user_func": null,
53995399
"rrd_type": "GAUGE",
5400-
"state_name": "panSysHAPeerState"
5400+
"state_name": "panSysHaStateEnum"
54015401
},
54025402
{
54035403
"sensor_deleted": 0,
54045404
"sensor_class": "state",
54055405
"poller_type": "snmp",
54065406
"sensor_oid": ".1.3.6.1.4.1.25461.2.1.2.1.11.0",
54075407
"sensor_index": "panSysHAState.0",
5408-
"sensor_type": "panSysHAState",
5408+
"sensor_type": "panSysHaStateEnum",
54095409
"sensor_descr": "High Availability Local Status",
54105410
"group": null,
54115411
"sensor_divisor": 1,
@@ -5422,7 +5422,7 @@
54225422
"sensor_prev": null,
54235423
"user_func": null,
54245424
"rrd_type": "GAUGE",
5425-
"state_name": "panSysHAState"
5425+
"state_name": "panSysHaStateEnum"
54265426
}
54275427
],
54285428
"state_indexes": [
@@ -5441,126 +5441,63 @@
54415441
"state_generic_value": 0
54425442
},
54435443
{
5444-
"state_name": "panSysHAPeerState",
5444+
"state_name": "panSysHaStateEnum",
54455445
"state_descr": "unknown",
54465446
"state_draw_graph": 1,
54475447
"state_value": 0,
54485448
"state_generic_value": 2
54495449
},
54505450
{
5451-
"state_name": "panSysHAPeerState",
5451+
"state_name": "panSysHaStateEnum",
54525452
"state_descr": "suspended",
54535453
"state_draw_graph": 1,
54545454
"state_value": 1,
54555455
"state_generic_value": 2
54565456
},
54575457
{
5458-
"state_name": "panSysHAPeerState",
5458+
"state_name": "panSysHaStateEnum",
54595459
"state_descr": "non-functional",
54605460
"state_draw_graph": 1,
54615461
"state_value": 2,
54625462
"state_generic_value": 2
54635463
},
54645464
{
5465-
"state_name": "panSysHAPeerState",
5465+
"state_name": "panSysHaStateEnum",
54665466
"state_descr": "initial",
54675467
"state_draw_graph": 1,
54685468
"state_value": 3,
54695469
"state_generic_value": 1
54705470
},
54715471
{
5472-
"state_name": "panSysHAPeerState",
5472+
"state_name": "panSysHaStateEnum",
54735473
"state_descr": "passive",
54745474
"state_draw_graph": 1,
54755475
"state_value": 4,
54765476
"state_generic_value": 3
54775477
},
54785478
{
5479-
"state_name": "panSysHAPeerState",
5479+
"state_name": "panSysHaStateEnum",
54805480
"state_descr": "active",
54815481
"state_draw_graph": 1,
54825482
"state_value": 5,
54835483
"state_generic_value": 0
54845484
},
54855485
{
5486-
"state_name": "panSysHAPeerState",
5486+
"state_name": "panSysHaStateEnum",
54875487
"state_descr": "tentative",
54885488
"state_draw_graph": 1,
54895489
"state_value": 10,
54905490
"state_generic_value": 1
54915491
},
54925492
{
5493-
"state_name": "panSysHAPeerState",
5493+
"state_name": "panSysHaStateEnum",
54945494
"state_descr": "active-secondary",
54955495
"state_draw_graph": 1,
54965496
"state_value": 11,
54975497
"state_generic_value": 3
54985498
},
54995499
{
5500-
"state_name": "panSysHAPeerState",
5501-
"state_descr": "active-primary",
5502-
"state_draw_graph": 1,
5503-
"state_value": 12,
5504-
"state_generic_value": 0
5505-
},
5506-
{
5507-
"state_name": "panSysHAState",
5508-
"state_descr": "unknown",
5509-
"state_draw_graph": 1,
5510-
"state_value": 0,
5511-
"state_generic_value": 2
5512-
},
5513-
{
5514-
"state_name": "panSysHAState",
5515-
"state_descr": "suspended",
5516-
"state_draw_graph": 1,
5517-
"state_value": 1,
5518-
"state_generic_value": 2
5519-
},
5520-
{
5521-
"state_name": "panSysHAState",
5522-
"state_descr": "non-functional",
5523-
"state_draw_graph": 1,
5524-
"state_value": 2,
5525-
"state_generic_value": 2
5526-
},
5527-
{
5528-
"state_name": "panSysHAState",
5529-
"state_descr": "initial",
5530-
"state_draw_graph": 1,
5531-
"state_value": 3,
5532-
"state_generic_value": 1
5533-
},
5534-
{
5535-
"state_name": "panSysHAState",
5536-
"state_descr": "passive",
5537-
"state_draw_graph": 1,
5538-
"state_value": 4,
5539-
"state_generic_value": 3
5540-
},
5541-
{
5542-
"state_name": "panSysHAState",
5543-
"state_descr": "active",
5544-
"state_draw_graph": 1,
5545-
"state_value": 5,
5546-
"state_generic_value": 0
5547-
},
5548-
{
5549-
"state_name": "panSysHAState",
5550-
"state_descr": "tentative",
5551-
"state_draw_graph": 1,
5552-
"state_value": 10,
5553-
"state_generic_value": 2
5554-
},
5555-
{
5556-
"state_name": "panSysHAState",
5557-
"state_descr": "active-secondary",
5558-
"state_draw_graph": 1,
5559-
"state_value": 11,
5560-
"state_generic_value": 3
5561-
},
5562-
{
5563-
"state_name": "panSysHAState",
5500+
"state_name": "panSysHaStateEnum",
55645501
"state_descr": "active-primary",
55655502
"state_draw_graph": 1,
55665503
"state_value": 12,
@@ -5801,7 +5738,7 @@
58015738
"poller_type": "snmp",
58025739
"sensor_oid": ".1.3.6.1.4.1.25461.2.1.2.1.12.0",
58035740
"sensor_index": "panSysHAPeerState.0",
5804-
"sensor_type": "panSysHAPeerState",
5741+
"sensor_type": "panSysHaStateEnum",
58055742
"sensor_descr": "High Availability Peer Status",
58065743
"group": null,
58075744
"sensor_divisor": 1,
@@ -5818,15 +5755,15 @@
58185755
"sensor_prev": null,
58195756
"user_func": null,
58205757
"rrd_type": "GAUGE",
5821-
"state_name": "panSysHAPeerState"
5758+
"state_name": "panSysHaStateEnum"
58225759
},
58235760
{
58245761
"sensor_deleted": 0,
58255762
"sensor_class": "state",
58265763
"poller_type": "snmp",
58275764
"sensor_oid": ".1.3.6.1.4.1.25461.2.1.2.1.11.0",
58285765
"sensor_index": "panSysHAState.0",
5829-
"sensor_type": "panSysHAState",
5766+
"sensor_type": "panSysHaStateEnum",
58305767
"sensor_descr": "High Availability Local Status",
58315768
"group": null,
58325769
"sensor_divisor": 1,
@@ -5843,7 +5780,7 @@
58435780
"sensor_prev": null,
58445781
"user_func": null,
58455782
"rrd_type": "GAUGE",
5846-
"state_name": "panSysHAState"
5783+
"state_name": "panSysHaStateEnum"
58475784
}
58485785
],
58495786
"state_indexes": [
@@ -5862,126 +5799,63 @@
58625799
"state_generic_value": 0
58635800
},
58645801
{
5865-
"state_name": "panSysHAPeerState",
5802+
"state_name": "panSysHaStateEnum",
58665803
"state_descr": "unknown",
58675804
"state_draw_graph": 1,
58685805
"state_value": 0,
58695806
"state_generic_value": 2
58705807
},
58715808
{
5872-
"state_name": "panSysHAPeerState",
5809+
"state_name": "panSysHaStateEnum",
58735810
"state_descr": "suspended",
58745811
"state_draw_graph": 1,
58755812
"state_value": 1,
58765813
"state_generic_value": 2
58775814
},
58785815
{
5879-
"state_name": "panSysHAPeerState",
5816+
"state_name": "panSysHaStateEnum",
58805817
"state_descr": "non-functional",
58815818
"state_draw_graph": 1,
58825819
"state_value": 2,
58835820
"state_generic_value": 2
58845821
},
58855822
{
5886-
"state_name": "panSysHAPeerState",
5823+
"state_name": "panSysHaStateEnum",
58875824
"state_descr": "initial",
58885825
"state_draw_graph": 1,
58895826
"state_value": 3,
58905827
"state_generic_value": 1
58915828
},
58925829
{
5893-
"state_name": "panSysHAPeerState",
5830+
"state_name": "panSysHaStateEnum",
58945831
"state_descr": "passive",
58955832
"state_draw_graph": 1,
58965833
"state_value": 4,
58975834
"state_generic_value": 3
58985835
},
58995836
{
5900-
"state_name": "panSysHAPeerState",
5837+
"state_name": "panSysHaStateEnum",
59015838
"state_descr": "active",
59025839
"state_draw_graph": 1,
59035840
"state_value": 5,
59045841
"state_generic_value": 0
59055842
},
59065843
{
5907-
"state_name": "panSysHAPeerState",
5844+
"state_name": "panSysHaStateEnum",
59085845
"state_descr": "tentative",
59095846
"state_draw_graph": 1,
59105847
"state_value": 10,
59115848
"state_generic_value": 1
59125849
},
59135850
{
5914-
"state_name": "panSysHAPeerState",
5915-
"state_descr": "active-secondary",
5916-
"state_draw_graph": 1,
5917-
"state_value": 11,
5918-
"state_generic_value": 3
5919-
},
5920-
{
5921-
"state_name": "panSysHAPeerState",
5922-
"state_descr": "active-primary",
5923-
"state_draw_graph": 1,
5924-
"state_value": 12,
5925-
"state_generic_value": 0
5926-
},
5927-
{
5928-
"state_name": "panSysHAState",
5929-
"state_descr": "unknown",
5930-
"state_draw_graph": 1,
5931-
"state_value": 0,
5932-
"state_generic_value": 2
5933-
},
5934-
{
5935-
"state_name": "panSysHAState",
5936-
"state_descr": "suspended",
5937-
"state_draw_graph": 1,
5938-
"state_value": 1,
5939-
"state_generic_value": 2
5940-
},
5941-
{
5942-
"state_name": "panSysHAState",
5943-
"state_descr": "non-functional",
5944-
"state_draw_graph": 1,
5945-
"state_value": 2,
5946-
"state_generic_value": 2
5947-
},
5948-
{
5949-
"state_name": "panSysHAState",
5950-
"state_descr": "initial",
5951-
"state_draw_graph": 1,
5952-
"state_value": 3,
5953-
"state_generic_value": 1
5954-
},
5955-
{
5956-
"state_name": "panSysHAState",
5957-
"state_descr": "passive",
5958-
"state_draw_graph": 1,
5959-
"state_value": 4,
5960-
"state_generic_value": 3
5961-
},
5962-
{
5963-
"state_name": "panSysHAState",
5964-
"state_descr": "active",
5965-
"state_draw_graph": 1,
5966-
"state_value": 5,
5967-
"state_generic_value": 0
5968-
},
5969-
{
5970-
"state_name": "panSysHAState",
5971-
"state_descr": "tentative",
5972-
"state_draw_graph": 1,
5973-
"state_value": 10,
5974-
"state_generic_value": 2
5975-
},
5976-
{
5977-
"state_name": "panSysHAState",
5851+
"state_name": "panSysHaStateEnum",
59785852
"state_descr": "active-secondary",
59795853
"state_draw_graph": 1,
59805854
"state_value": 11,
59815855
"state_generic_value": 3
59825856
},
59835857
{
5984-
"state_name": "panSysHAState",
5858+
"state_name": "panSysHaStateEnum",
59855859
"state_descr": "active-primary",
59865860
"state_draw_graph": 1,
59875861
"state_value": 12,
@@ -6126,5 +6000,27 @@
61266000
}
61276001
]
61286002
}
6003+
},
6004+
"hr-device": {
6005+
"discovery": {
6006+
"hrDevice": [
6007+
{
6008+
"hrDeviceIndex": 1,
6009+
"hrDeviceDescr": "Slot-1 Management Processor",
6010+
"hrDeviceType": "hrDeviceProcessor",
6011+
"hrDeviceErrors": 0,
6012+
"hrDeviceStatus": "running",
6013+
"hrProcessorLoad": 2
6014+
},
6015+
{
6016+
"hrDeviceIndex": 2,
6017+
"hrDeviceDescr": "Slot-1 Data Processor",
6018+
"hrDeviceType": "hrDeviceProcessor",
6019+
"hrDeviceErrors": 0,
6020+
"hrDeviceStatus": "running",
6021+
"hrProcessorLoad": 0
6022+
}
6023+
]
6024+
}
61296025
}
61306026
}

0 commit comments

Comments
 (0)