Improve organization & SAS support

This commit is contained in:
2026-10-15 21:07:13 +07:00
parent f9951daf22
commit 14598af614
6 changed files with 249 additions and 189 deletions
+33
View File
@@ -0,0 +1,33 @@
<?php
function nvme_data($data)
{
$health = $data->nvme_smart_health_information_log; ?>
<h2>SMART data</h2>
<table>
<thead>
<tr>
<th>Property</th>
<th>Value</th>
</tr>
</thead>
<tbody>
<tr>
<td>Data Units Read</td>
<td><?= number_format($health->data_units_read) .
" (" .
data_unit($health->data_units_read) .
")" ?></td>
</tr>
<tr>
<td>Data Units Written</td>
<td><?= number_format($health->data_units_written) .
" (" .
data_unit($health->data_units_written) .
")" ?></td>
</tr>
</tbody>
</table>
<?php
} ?>
+27
View File
@@ -0,0 +1,27 @@
<?php
function sat_data($data)
{
$tests = $data->ata_smart_self_test_log->standard->table; ?>
<h2>SMART self-test log</h2>
<table>
<thead>
<tr>
<th>Type</th>
<th>Status</th>
<th>Lifetime (hours)</th>
</tr>
</thead>
<tbody>
<?php foreach ($tests as $test) { ?>
<tr>
<td><?= $test->type->string ?></td>
<td><?= $test->status->string ?></td>
<td><?= $test->lifetime_hours ?></td>
</tr>
<?php } ?>
</tbody>
</table>
<?php
} ?>
+14 -33
View File
@@ -1,4 +1,7 @@
<?php <?php
require "components/nvme.php";
require "components/sat.php";
if ($_GET["name"] == null) { if ($_GET["name"] == null) {
header("Location: /"); header("Location: /");
exit(); exit();
@@ -6,7 +9,14 @@ if ($_GET["name"] == null) {
function get_data() function get_data()
{ {
$cmd = ["sudo", "-n", "/usr/local/sbin/smartctl-proxy.sh", $_GET["name"]]; $cmd = [
"sudo",
"-n",
"smartctl",
"--json=oc",
"-a",
"/dev/" . $_GET["name"],
];
$proc = proc_open($cmd, [1 => ["pipe", "w"]], $pipes); $proc = proc_open($cmd, [1 => ["pipe", "w"]], $pipes);
if (!is_resource($proc)) { if (!is_resource($proc)) {
@@ -17,10 +27,7 @@ function get_data()
fclose($pipes[1]); fclose($pipes[1]);
$retval = proc_close($proc); $retval = proc_close($proc);
if ($retval == 0) {
return json_decode($data); return json_decode($data);
}
return $data . "\nProcess exited with $retval";
} }
const NVME_DATA_UNIT = 1000 * 512; const NVME_DATA_UNIT = 1000 * 512;
@@ -81,37 +88,11 @@ $data = get_data();
</tbody> </tbody>
</table> </table>
<h2>SMART data</h2>
<table>
<thead>
<tr>
<th>Property</th>
<th>Value</th>
</tr>
</thead>
<tbody>
<?php if ($data->device->type == "nvme") { <?php if ($data->device->type == "nvme") {
$health = $data->nvme_smart_health_information_log; ?> nvme_data($data);
<tr> } elseif ($data->device->type == "sat") {
<td>Data Units Read</td> sat_data($data);
<td><?= number_format($health->data_units_read) .
" (" .
data_unit($health->data_units_read) .
")" ?></td>
</tr>
<tr>
<td>Data Units Written</td>
<td><?= number_format($health->data_units_written) .
" (" .
data_unit($health->data_units_written) .
")" ?></td>
</tr>
<?php
} ?> } ?>
<tr></tr>
</tbody>
</table>
<details> <details>
<summary>Original Output</summary> <summary>Original Output</summary>
-8
View File
@@ -1,8 +0,0 @@
#!/bin/bash
set -euo pipefail
dev="${1:-}"
exec /usr/bin/smartctl --json=co -a "/dev/$dev"
+1 -1
View File
@@ -1 +1 @@
linesofcodes ALL=(root) NOPASSWD: /usr/local/sbin/smartctl-proxy.sh sd[a-z], /usr/local/sbin/smartctl-proxy.sh nvme[0-9]n[0-9] linesofcodes ALL=(root) NOPASSWD: /usr/bin/smartctl
+61 -34
View File
@@ -6,13 +6,15 @@
/* Body */ /* Body */
html { html {
font-size: 62.5%; font-size: 62.5%;
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif; font-family:
-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue",
Arial, "Noto Sans", sans-serif;
} }
body { body {
font-size: 1.8rem; font-size: 1.8rem;
line-height: 1.618; line-height: 1.618;
max-width: 38em; max-width: 48em;
margin: auto; margin: auto;
color: #4a4a4a; color: #4a4a4a;
background-color: #f9f9f9; background-color: #f9f9f9;
@@ -29,9 +31,16 @@ body {
font-size: 1.35rem; font-size: 1.35rem;
} }
} }
h1, h2, h3, h4, h5, h6 { h1,
h2,
h3,
h4,
h5,
h6 {
line-height: 1.1; line-height: 1.1;
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif; font-family:
-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue",
Arial, "Noto Sans", sans-serif;
font-weight: 700; font-weight: 700;
margin-top: 3rem; margin-top: 3rem;
margin-bottom: 1.5rem; margin-bottom: 1.5rem;
@@ -70,7 +79,9 @@ p {
margin-bottom: 2.5rem; margin-bottom: 2.5rem;
} }
small, sub, sup { small,
sub,
sup {
font-size: 75%; font-size: 75%;
} }
@@ -116,7 +127,8 @@ blockquote p {
margin-bottom: 0; margin-bottom: 0;
} }
img, video { img,
video {
height: auto; height: auto;
max-width: 100%; max-width: 100%;
margin-top: 0px; margin-top: 0px;
@@ -134,7 +146,9 @@ pre {
font-size: 0.9em; font-size: 0.9em;
} }
code, kbd, samp { code,
kbd,
samp {
font-size: 0.9em; font-size: 0.9em;
padding: 0 0.5em; padding: 0 0.5em;
background-color: #f1f1f1; background-color: #f1f1f1;
@@ -156,16 +170,19 @@ table {
margin-bottom: 2rem; margin-bottom: 2rem;
} }
td, th { td,
th {
padding: 0.5em; padding: 0.5em;
border-bottom: 1px solid #f1f1f1; border-bottom: 1px solid #f1f1f1;
} }
/* Buttons, forms and input */ /* Buttons, forms and input */
input, textarea { input,
textarea {
border: 1px solid #4a4a4a; border: 1px solid #4a4a4a;
} }
input:focus, textarea:focus { input:focus,
textarea:focus {
border: 1px solid #1d7484; border: 1px solid #1d7484;
} }
@@ -173,11 +190,12 @@ textarea {
width: 100%; width: 100%;
} }
.button, button, .button,
input[type=submit], button,
input[type=reset], input[type="submit"],
input[type=button], input[type="reset"],
input[type=file]::file-selector-button { input[type="button"],
input[type="file"]::file-selector-button {
display: inline-block; display: inline-block;
padding: 5px 10px; padding: 5px 10px;
text-align: center; text-align: center;
@@ -190,34 +208,39 @@ input[type=file]::file-selector-button {
cursor: pointer; cursor: pointer;
box-sizing: border-box; box-sizing: border-box;
} }
.button:hover, button:hover, .button:hover,
input[type=submit]:hover, button:hover,
input[type=reset]:hover, input[type="submit"]:hover,
input[type=button]:hover, input[type="reset"]:hover,
input[type=file]::file-selector-button:hover { input[type="button"]:hover,
input[type="file"]::file-selector-button:hover {
background-color: #982c61; background-color: #982c61;
color: #f9f9f9; color: #f9f9f9;
outline: 0; outline: 0;
} }
.button[disabled], button[disabled], .button[disabled],
input[type=submit][disabled], button[disabled],
input[type=reset][disabled], input[type="submit"][disabled],
input[type=button][disabled], input[type="reset"][disabled],
input[type=file][disabled] { input[type="button"][disabled],
input[type="file"][disabled] {
cursor: default; cursor: default;
opacity: 0.5; opacity: 0.5;
} }
.button:focus-visible, button:focus-visible, .button:focus-visible,
input[type=submit]:focus-visible, button:focus-visible,
input[type=reset]:focus-visible, input[type="submit"]:focus-visible,
input[type=button]:focus-visible, input[type="reset"]:focus-visible,
input[type=file]:focus-visible { input[type="button"]:focus-visible,
input[type="file"]:focus-visible {
outline-style: solid; outline-style: solid;
outline-width: 2px; outline-width: 2px;
} }
textarea, select, input { textarea,
select,
input {
color: #4a4a4a; color: #4a4a4a;
padding: 6px 10px; /* The 6px vertically centers text on FF, ignored by Webkit */ padding: 6px 10px; /* The 6px vertically centers text on FF, ignored by Webkit */
margin-bottom: 10px; margin-bottom: 10px;
@@ -227,16 +250,20 @@ textarea, select, input {
box-shadow: none; box-shadow: none;
box-sizing: border-box; box-sizing: border-box;
} }
textarea:focus, select:focus, input:focus { textarea:focus,
select:focus,
input:focus {
border: 1px solid #1d7484; border: 1px solid #1d7484;
outline: 0; outline: 0;
} }
input[type=checkbox]:focus { input[type="checkbox"]:focus {
outline: 1px dotted #1d7484; outline: 1px dotted #1d7484;
} }
label, legend, fieldset { label,
legend,
fieldset {
display: block; display: block;
margin-bottom: 0.5rem; margin-bottom: 0.5rem;
font-weight: 600; font-weight: 600;