mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Firebrick mempool polling (#15022)

Browse Source 
* Add support for Firebrick memory monitoring.

* Add mempool testing for Firebrick.

* We have to specify the OID by numeric, because otherwise it assumes it's some kind of indexed table.

* Specify by OID.

* Fix test result data for the FB mempools.x

* Firebrick reports in KB.

* Fix precision in the tests.
This commit is contained in:
cjsoftuk
2023-05-02 20:02:50 +01:00
committed by GitHub
parent bc310cffec
commit 927446db7b
3 changed files with 15 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
includes/definitions/discovery/firebrick.yaml
View File

@@ -3,9 +3,9 @@ modules:
mempools:
data:
-
free: FIREBRICK-GLOBAL::fbFreeMem
total: FIREBRICK-GLOBAL::fbTotalMem
index: 0
free: .1.3.6.1.4.1.24693.100.4.1.2
total: .1.3.6.1.4.1.24693.100.4.1.1
precision: 1024
os:
sysDescr_regex: '/^(?<hardware>FB[0-9]{4}).*\((?<version>[^ ]+)/m'
sensors:

35
tests/data/firebrick_2900.json
View File

@@ -2195,15 +2195,15 @@
"entPhysicalIndex": null,
"mempool_type": "firebrick",
"mempool_class": "system",
"mempool_precision": 1,
"mempool_precision": 1024,
"mempool_descr": "Memory",
"mempool_perc": 18,
"mempool_perc_oid": null,
"mempool_used": 95232,
"mempool_used": 97517568,
"mempool_used_oid": null,
"mempool_free": 429056,
"mempool_free_oid": ".1.3.6.1.4.1.24693.100.4.1.2.",
"mempool_total": 524288,
"mempool_free": 439353344,
"mempool_free_oid": ".1.3.6.1.4.1.24693.100.4.1.2",
"mempool_total": 536870912,
"mempool_total_oid": null,
"mempool_largestfree": null,
"mempool_lowestfree": null,
@@ -2212,29 +2212,6 @@
}
]
},
"poller": {
"mempools": [
{
"mempool_index": "0",
"entPhysicalIndex": null,
"mempool_type": "firebrick",
"mempool_class": "system",
"mempool_precision": 1,
"mempool_descr": "Memory",
"mempool_perc": 0,
"mempool_perc_oid": null,
"mempool_used": 0,
"mempool_used_oid": null,
"mempool_free": 524288,
"mempool_free_oid": ".1.3.6.1.4.1.24693.100.4.1.2.",
"mempool_total": 524288,
"mempool_total_oid": null,
"mempool_largestfree": null,
"mempool_lowestfree": null,
"mempool_deleted": 0,
"mempool_perc_warn": 90
}
]
}
"poller": "matches discovery"
}
}

35
tests/data/firebrick_6000.json
View File

@@ -1977,15 +1977,15 @@
"entPhysicalIndex": null,
"mempool_type": "firebrick",
"mempool_class": "system",
"mempool_precision": 1,
"mempool_precision": 1024,
"mempool_descr": "Memory",
"mempool_perc": 15,
"mempool_perc_oid": null,
"mempool_used": 316416,
"mempool_used": 324009984,
"mempool_used_oid": null,
"mempool_free": 1780736,
"mempool_free_oid": ".1.3.6.1.4.1.24693.100.4.1.2.",
"mempool_total": 2097152,
"mempool_free": 1823473664,
"mempool_free_oid": ".1.3.6.1.4.1.24693.100.4.1.2",
"mempool_total": 2147483648,
"mempool_total_oid": null,
"mempool_largestfree": null,
"mempool_lowestfree": null,
@@ -1994,29 +1994,6 @@
}
]
},
"poller": {
"mempools": [
{
"mempool_index": "0",
"entPhysicalIndex": null,
"mempool_type": "firebrick",
"mempool_class": "system",
"mempool_precision": 1,
"mempool_descr": "Memory",
"mempool_perc": 0,
"mempool_perc_oid": null,
"mempool_used": 0,
"mempool_used_oid": null,
"mempool_free": 2097152,
"mempool_free_oid": ".1.3.6.1.4.1.24693.100.4.1.2.",
"mempool_total": 2097152,
"mempool_total_oid": null,
"mempool_largestfree": null,
"mempool_lowestfree": null,
"mempool_deleted": 0,
"mempool_perc_warn": 90
}
]
}
"poller": "matches discovery"
}
}