diff --git a/45drives-system/public/img/F8X1.png b/45drives-system/public/img/F8X1.png new file mode 100755 index 0000000..5b2668a Binary files /dev/null and b/45drives-system/public/img/F8X1.png differ diff --git a/45drives-system/public/img/F8X2.png b/45drives-system/public/img/F8X2.png new file mode 100755 index 0000000..b4df3e0 Binary files /dev/null and b/45drives-system/public/img/F8X2.png differ diff --git a/45drives-system/public/img/F8X3.png b/45drives-system/public/img/F8X3.png new file mode 100755 index 0000000..b9d7a5b Binary files /dev/null and b/45drives-system/public/img/F8X3.png differ diff --git a/45drives-system/src/components/SectionSystem.vue b/45drives-system/src/components/SectionSystem.vue index a015261..483b20b 100644 --- a/45drives-system/src/components/SectionSystem.vue +++ b/45drives-system/src/components/SectionSystem.vue @@ -109,7 +109,7 @@ export default { } const regExpModel = - /(Storinator|Stornado).*(AV15|Q30|S45|XL60|2U|C8|MI4).*/; + /(Storinator|Stornado).*(AV15|Q30|S45|XL60|2U|C8|MI4|F8X1|F8X2|F8X3).*/; const match = model.match(regExpModel); const imgPathLookup = { "Storinator": { @@ -119,6 +119,9 @@ export default { "XL60": "img/storinatorXL60.png", "C8": "img/storinatorC8.png", "MI4": "img/storinatorMI4.png", + "F8X1": "img/F8X1.png", + "F8X2": "img/F8X2.png", + "F8X3": "img/F8X3.png" }, "Stornado": { "2U": "img/stornado2U.png", diff --git a/CHANGELOG.md b/CHANGELOG.md index 30852d7..d235835 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## cockpit-45drives-hardware 2.2.2-1 +## cockpit-45drives-hardware 2.2.2-2 -* updated zfs_info script to fix bug when single disk vdevs are encountered -* single device vdevs are now reported as both a disk and vdev by zfs_info script \ No newline at end of file +* Added support for F8X servers in Disks and System modules +* updated 45Drives-tools dependency \ No newline at end of file diff --git a/manifest.json b/manifest.json index f359805..681e20a 100644 --- a/manifest.json +++ b/manifest.json @@ -4,7 +4,7 @@ "title": "cockpit-45drives-hardware", "prerelease": false, "version": "2.2.2", - "buildVersion": "1", + "buildVersion": "2", "author": "Mark Hooper ", "url": "https://github.com/45Drives/cockpit-hardware", "category": "utils", @@ -30,7 +30,7 @@ "dmidecode", "ipmitool", "lshw", - "45drives-tools (>= 2.1.0)", + "45drives-tools (>= 2.1.2)", "iproute2" ], "el": [ @@ -41,7 +41,7 @@ "dmidecode", "ipmitool", "lshw", - "45drives-tools >= 2.1.0" + "45drives-tools >= 2.1.2" ] }, "releases": [ @@ -59,7 +59,7 @@ "changelog": { "urgency": "medium", "version": "2.2.2", - "buildVersion": "1", + "buildVersion": "2", "ignore": [], "date": null, "packager": "Mark Hooper ", diff --git a/packaging/el8/main.spec b/packaging/el8/main.spec index 08c3feb..7ce84bf 100644 --- a/packaging/el8/main.spec +++ b/packaging/el8/main.spec @@ -42,6 +42,9 @@ make DESTDIR=%{buildroot} install /usr/lib/udev/rules.d/68-cockpit-45drives-disks.rules %changelog +* Thu Feb 02 2023 Mark Hooper 2.2.2-2 +- Added support for F8X servers in Disks and System modules +- updated 45Drives-tools dependency * Tue Nov 29 2022 Mark Hooper 2.2.2-1 - updated zfs_info script to fix bug when single disk vdevs are encountered - single device vdevs are now reported as both a disk and vdev by zfs_info script diff --git a/packaging/focal/changelog b/packaging/focal/changelog index 701719f..46e8abe 100644 --- a/packaging/focal/changelog +++ b/packaging/focal/changelog @@ -1,3 +1,10 @@ +cockpit-45drives-hardware (2.2.2-2focal) focal; urgency=medium + + * Added support for F8X servers in Disks and System modules + * updated 45Drives-tools dependency + + -- Mark Hooper Thu, 02 Feb 2023 05:36:07 -0400 + cockpit-45drives-hardware (2.2.2-1focal) focal; urgency=medium * updated zfs_info script to fix bug when single disk vdevs are encountered