From cf00665ebeab15254b32f43411c3e2ca34f875f9 Mon Sep 17 00:00:00 2001 From: Tony Murray Date: Fri, 24 Jan 2025 14:37:14 -0600 Subject: [PATCH] Fix cumulus mellanox test data (#17056) it was in the wrong location and had old storage table structure --- .../{tests/data => }/cumulus_mellanox.json | 143 ++++-------------- 1 file changed, 32 insertions(+), 111 deletions(-) rename tests/data/{tests/data => }/cumulus_mellanox.json (99%) diff --git a/tests/data/tests/data/cumulus_mellanox.json b/tests/data/cumulus_mellanox.json similarity index 99% rename from tests/data/tests/data/cumulus_mellanox.json rename to tests/data/cumulus_mellanox.json index 22adfa35bdea..6dc09f621830 100644 --- a/tests/data/tests/data/cumulus_mellanox.json +++ b/tests/data/cumulus_mellanox.json @@ -13970,166 +13970,87 @@ "discovery": { "storage": [ { - "storage_mib": "hrstorage", - "storage_index": "35", - "storage_type": "hrStorageFixedDisk", - "storage_descr": "/run", - "storage_size": 823316480, - "storage_units": 4096, - "storage_used": 87437312, - "storage_free": 0, - "storage_perc": 0, - "storage_perc_warn": 60, - "storage_deleted": 0 - }, - { - "storage_mib": "hrstorage", - "storage_index": "36", - "storage_type": "hrStorageFixedDisk", - "storage_descr": "/", - "storage_size": 15225360384, - "storage_units": 4096, - "storage_used": 7713853440, - "storage_free": 0, - "storage_perc": 0, - "storage_perc_warn": 60, - "storage_deleted": 0 - }, - { - "storage_mib": "hrstorage", - "storage_index": "38", - "storage_type": "hrStorageFixedDisk", - "storage_descr": "/dev/shm", - "storage_size": 4116582400, - "storage_units": 4096, - "storage_used": 32100352, - "storage_free": 0, - "storage_perc": 0, - "storage_perc_warn": 60, - "storage_deleted": 0 - }, - { - "storage_mib": "hrstorage", - "storage_index": "39", - "storage_type": "hrStorageFixedDisk", - "storage_descr": "/run/lock", - "storage_size": 5242880, - "storage_units": 4096, - "storage_used": 0, - "storage_free": 0, - "storage_perc": 0, - "storage_perc_warn": 60, - "storage_deleted": 0 - }, - { - "storage_mib": "hrstorage", - "storage_index": "40", - "storage_type": "hrStorageFixedDisk", - "storage_descr": "/sys/fs/cgroup", - "storage_size": 4116582400, - "storage_units": 4096, - "storage_used": 0, - "storage_free": 0, - "storage_perc": 0, - "storage_perc_warn": 60, - "storage_deleted": 0 - }, - { - "storage_mib": "hrstorage", - "storage_index": "58", - "storage_type": "hrStorageFixedDisk", - "storage_descr": "/tmp", - "storage_size": 4116582400, - "storage_units": 4096, - "storage_used": 5996544, - "storage_free": 0, - "storage_perc": 0, - "storage_perc_warn": 60, - "storage_deleted": 0 - } - ] - }, - "poller": { - "storage": [ - { - "storage_mib": "hrstorage", + "type": "hrstorage", "storage_index": "35", "storage_type": "hrStorageFixedDisk", "storage_descr": "/run", "storage_size": 823316480, + "storage_size_oid": null, "storage_units": 4096, "storage_used": 87437312, + "storage_used_oid": ".1.3.6.1.2.1.25.2.3.1.6.35", "storage_free": 735879168, + "storage_free_oid": null, "storage_perc": 11, - "storage_perc_warn": 60, - "storage_deleted": 0 + "storage_perc_oid": null, + "storage_perc_warn": 60 }, { - "storage_mib": "hrstorage", + "type": "hrstorage", "storage_index": "36", "storage_type": "hrStorageFixedDisk", "storage_descr": "/", "storage_size": 15225360384, + "storage_size_oid": null, "storage_units": 4096, "storage_used": 7713853440, + "storage_used_oid": ".1.3.6.1.2.1.25.2.3.1.6.36", "storage_free": 7511506944, + "storage_free_oid": null, "storage_perc": 51, - "storage_perc_warn": 60, - "storage_deleted": 0 + "storage_perc_oid": null, + "storage_perc_warn": 60 }, { - "storage_mib": "hrstorage", + "type": "hrstorage", "storage_index": "38", "storage_type": "hrStorageFixedDisk", "storage_descr": "/dev/shm", "storage_size": 4116582400, + "storage_size_oid": null, "storage_units": 4096, "storage_used": 32100352, + "storage_used_oid": ".1.3.6.1.2.1.25.2.3.1.6.38", "storage_free": 4084482048, + "storage_free_oid": null, "storage_perc": 1, - "storage_perc_warn": 60, - "storage_deleted": 0 + "storage_perc_oid": null, + "storage_perc_warn": 60 }, { - "storage_mib": "hrstorage", + "type": "hrstorage", "storage_index": "39", "storage_type": "hrStorageFixedDisk", "storage_descr": "/run/lock", "storage_size": 5242880, + "storage_size_oid": null, "storage_units": 4096, "storage_used": 0, + "storage_used_oid": ".1.3.6.1.2.1.25.2.3.1.6.39", "storage_free": 5242880, + "storage_free_oid": null, "storage_perc": 0, - "storage_perc_warn": 60, - "storage_deleted": 0 - }, - { - "storage_mib": "hrstorage", - "storage_index": "40", - "storage_type": "hrStorageFixedDisk", - "storage_descr": "/sys/fs/cgroup", - "storage_size": 4116582400, - "storage_units": 4096, - "storage_used": 0, - "storage_free": 4116582400, - "storage_perc": 0, - "storage_perc_warn": 60, - "storage_deleted": 0 + "storage_perc_oid": null, + "storage_perc_warn": 60 }, { - "storage_mib": "hrstorage", + "type": "hrstorage", "storage_index": "58", "storage_type": "hrStorageFixedDisk", "storage_descr": "/tmp", "storage_size": 4116582400, + "storage_size_oid": null, "storage_units": 4096, "storage_used": 5996544, + "storage_used_oid": ".1.3.6.1.2.1.25.2.3.1.6.58", "storage_free": 4110585856, + "storage_free_oid": null, "storage_perc": 0, - "storage_perc_warn": 60, - "storage_deleted": 0 + "storage_perc_oid": null, + "storage_perc_warn": 60 } ] - } + }, + "poller": "matches discovery" } }