Improve organization & SAS support
This commit is contained in:
@@ -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
|
||||
} ?>
|
||||
@@ -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
@@ -1,4 +1,7 @@
|
||||
<?php
|
||||
require "components/nvme.php";
|
||||
require "components/sat.php";
|
||||
|
||||
if ($_GET["name"] == null) {
|
||||
header("Location: /");
|
||||
exit();
|
||||
@@ -6,7 +9,14 @@ if ($_GET["name"] == null) {
|
||||
|
||||
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);
|
||||
|
||||
if (!is_resource($proc)) {
|
||||
@@ -17,10 +27,7 @@ function get_data()
|
||||
fclose($pipes[1]);
|
||||
$retval = proc_close($proc);
|
||||
|
||||
if ($retval == 0) {
|
||||
return json_decode($data);
|
||||
}
|
||||
return $data . "\nProcess exited with $retval";
|
||||
}
|
||||
|
||||
const NVME_DATA_UNIT = 1000 * 512;
|
||||
@@ -81,37 +88,11 @@ $data = get_data();
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<h2>SMART data</h2>
|
||||
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Property</th>
|
||||
<th>Value</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php if ($data->device->type == "nvme") {
|
||||
$health = $data->nvme_smart_health_information_log; ?>
|
||||
<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>
|
||||
<?php
|
||||
nvme_data($data);
|
||||
} elseif ($data->device->type == "sat") {
|
||||
sat_data($data);
|
||||
} ?>
|
||||
<tr></tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<details>
|
||||
<summary>Original Output</summary>
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
dev="${1:-}"
|
||||
|
||||
exec /usr/bin/smartctl --json=co -a "/dev/$dev"
|
||||
|
||||
+1
-1
@@ -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
@@ -6,13 +6,15 @@
|
||||
/* Body */
|
||||
html {
|
||||
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 {
|
||||
font-size: 1.8rem;
|
||||
line-height: 1.618;
|
||||
max-width: 38em;
|
||||
max-width: 48em;
|
||||
margin: auto;
|
||||
color: #4a4a4a;
|
||||
background-color: #f9f9f9;
|
||||
@@ -29,9 +31,16 @@ body {
|
||||
font-size: 1.35rem;
|
||||
}
|
||||
}
|
||||
h1, h2, h3, h4, h5, h6 {
|
||||
h1,
|
||||
h2,
|
||||
h3,
|
||||
h4,
|
||||
h5,
|
||||
h6 {
|
||||
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;
|
||||
margin-top: 3rem;
|
||||
margin-bottom: 1.5rem;
|
||||
@@ -70,7 +79,9 @@ p {
|
||||
margin-bottom: 2.5rem;
|
||||
}
|
||||
|
||||
small, sub, sup {
|
||||
small,
|
||||
sub,
|
||||
sup {
|
||||
font-size: 75%;
|
||||
}
|
||||
|
||||
@@ -116,7 +127,8 @@ blockquote p {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
img, video {
|
||||
img,
|
||||
video {
|
||||
height: auto;
|
||||
max-width: 100%;
|
||||
margin-top: 0px;
|
||||
@@ -134,7 +146,9 @@ pre {
|
||||
font-size: 0.9em;
|
||||
}
|
||||
|
||||
code, kbd, samp {
|
||||
code,
|
||||
kbd,
|
||||
samp {
|
||||
font-size: 0.9em;
|
||||
padding: 0 0.5em;
|
||||
background-color: #f1f1f1;
|
||||
@@ -156,16 +170,19 @@ table {
|
||||
margin-bottom: 2rem;
|
||||
}
|
||||
|
||||
td, th {
|
||||
td,
|
||||
th {
|
||||
padding: 0.5em;
|
||||
border-bottom: 1px solid #f1f1f1;
|
||||
}
|
||||
|
||||
/* Buttons, forms and input */
|
||||
input, textarea {
|
||||
input,
|
||||
textarea {
|
||||
border: 1px solid #4a4a4a;
|
||||
}
|
||||
input:focus, textarea:focus {
|
||||
input:focus,
|
||||
textarea:focus {
|
||||
border: 1px solid #1d7484;
|
||||
}
|
||||
|
||||
@@ -173,11 +190,12 @@ textarea {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.button, button,
|
||||
input[type=submit],
|
||||
input[type=reset],
|
||||
input[type=button],
|
||||
input[type=file]::file-selector-button {
|
||||
.button,
|
||||
button,
|
||||
input[type="submit"],
|
||||
input[type="reset"],
|
||||
input[type="button"],
|
||||
input[type="file"]::file-selector-button {
|
||||
display: inline-block;
|
||||
padding: 5px 10px;
|
||||
text-align: center;
|
||||
@@ -190,34 +208,39 @@ input[type=file]::file-selector-button {
|
||||
cursor: pointer;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
.button:hover, button:hover,
|
||||
input[type=submit]:hover,
|
||||
input[type=reset]:hover,
|
||||
input[type=button]:hover,
|
||||
input[type=file]::file-selector-button:hover {
|
||||
.button:hover,
|
||||
button:hover,
|
||||
input[type="submit"]:hover,
|
||||
input[type="reset"]:hover,
|
||||
input[type="button"]:hover,
|
||||
input[type="file"]::file-selector-button:hover {
|
||||
background-color: #982c61;
|
||||
color: #f9f9f9;
|
||||
outline: 0;
|
||||
}
|
||||
|
||||
.button[disabled], button[disabled],
|
||||
input[type=submit][disabled],
|
||||
input[type=reset][disabled],
|
||||
input[type=button][disabled],
|
||||
input[type=file][disabled] {
|
||||
.button[disabled],
|
||||
button[disabled],
|
||||
input[type="submit"][disabled],
|
||||
input[type="reset"][disabled],
|
||||
input[type="button"][disabled],
|
||||
input[type="file"][disabled] {
|
||||
cursor: default;
|
||||
opacity: 0.5;
|
||||
}
|
||||
.button:focus-visible, button:focus-visible,
|
||||
input[type=submit]:focus-visible,
|
||||
input[type=reset]:focus-visible,
|
||||
input[type=button]:focus-visible,
|
||||
input[type=file]:focus-visible {
|
||||
.button:focus-visible,
|
||||
button:focus-visible,
|
||||
input[type="submit"]:focus-visible,
|
||||
input[type="reset"]:focus-visible,
|
||||
input[type="button"]:focus-visible,
|
||||
input[type="file"]:focus-visible {
|
||||
outline-style: solid;
|
||||
outline-width: 2px;
|
||||
}
|
||||
|
||||
textarea, select, input {
|
||||
textarea,
|
||||
select,
|
||||
input {
|
||||
color: #4a4a4a;
|
||||
padding: 6px 10px; /* The 6px vertically centers text on FF, ignored by Webkit */
|
||||
margin-bottom: 10px;
|
||||
@@ -227,16 +250,20 @@ textarea, select, input {
|
||||
box-shadow: none;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
textarea:focus, select:focus, input:focus {
|
||||
textarea:focus,
|
||||
select:focus,
|
||||
input:focus {
|
||||
border: 1px solid #1d7484;
|
||||
outline: 0;
|
||||
}
|
||||
|
||||
input[type=checkbox]:focus {
|
||||
input[type="checkbox"]:focus {
|
||||
outline: 1px dotted #1d7484;
|
||||
}
|
||||
|
||||
label, legend, fieldset {
|
||||
label,
|
||||
legend,
|
||||
fieldset {
|
||||
display: block;
|
||||
margin-bottom: 0.5rem;
|
||||
font-weight: 600;
|
||||
|
||||
Reference in New Issue
Block a user