Skip to content

Commit

Permalink
added support for F8X servers and prepared for release
Browse files Browse the repository at this point in the history
  • Loading branch information
markdhooper committed Feb 2, 2023
1 parent 673ebf4 commit 4123d70
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 8 deletions.
Binary file added 45drives-system/public/img/F8X1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added 45drives-system/public/img/F8X2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added 45drives-system/public/img/F8X3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 4 additions & 1 deletion 45drives-system/src/components/SectionSystem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
* Added support for F8X servers in Disks and System modules
* updated 45Drives-tools dependency
8 changes: 4 additions & 4 deletions manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"title": "cockpit-45drives-hardware",
"prerelease": false,
"version": "2.2.2",
"buildVersion": "1",
"buildVersion": "2",
"author": "Mark Hooper <[email protected]>",
"url": "https://github.com/45Drives/cockpit-hardware",
"category": "utils",
Expand All @@ -30,7 +30,7 @@
"dmidecode",
"ipmitool",
"lshw",
"45drives-tools (>= 2.1.0)",
"45drives-tools (>= 2.1.2)",
"iproute2"
],
"el": [
Expand All @@ -41,7 +41,7 @@
"dmidecode",
"ipmitool",
"lshw",
"45drives-tools >= 2.1.0"
"45drives-tools >= 2.1.2"
]
},
"releases": [
Expand All @@ -59,7 +59,7 @@
"changelog": {
"urgency": "medium",
"version": "2.2.2",
"buildVersion": "1",
"buildVersion": "2",
"ignore": [],
"date": null,
"packager": "Mark Hooper <[email protected]>",
Expand Down
3 changes: 3 additions & 0 deletions packaging/el8/main.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]> 2.2.2-2
- Added support for F8X servers in Disks and System modules
- updated 45Drives-tools dependency
* Tue Nov 29 2022 Mark Hooper <[email protected]> 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
Expand Down
7 changes: 7 additions & 0 deletions packaging/focal/changelog
Original file line number Diff line number Diff line change
@@ -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 <[email protected]> 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
Expand Down

0 comments on commit 4123d70

Please sign in to comment.