diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php index 887520700e..db62df3385 100644 --- a/html/includes/print-menubar.php +++ b/html/includes/print-menubar.php @@ -206,16 +206,16 @@ if ($deleted_ports) { echo('
  • Processors
  • -
  • Memory
  • +
  • Processor
  • +
  • Memory
  • Storage

  • -
  • Temperatures
  • +
  • Temperature
  • Humidity
  • -
  • Fans
  • +
  • Fanspeed

  • -
  • Voltages
  • -
  • Frequencies
  • +
  • Voltage
  • +
  • Frequency
  • Current
  • diff --git a/html/pages/health.inc.php b/html/pages/health.inc.php index 5a04495708..a7f729e056 100644 --- a/html/pages/health.inc.php +++ b/html/pages/health.inc.php @@ -73,7 +73,7 @@ print_optionbar_end(); switch ($_GET['opta']) { case 'processor': - case 'memory': + case 'mempool': case 'storage': case 'temperature': case 'humidity': diff --git a/html/pages/health/mempool.inc.php b/html/pages/health/mempool.inc.php index cd62dd87ce..a1d4b225eb 100644 --- a/html/pages/health/mempool.inc.php +++ b/html/pages/health/mempool.inc.php @@ -4,6 +4,15 @@ $graph_type = "mempool_usage"; echo("
    "); echo(""); + +echo(" + + + + + + "); + $i = '1'; $mempools = mysql_query("SELECT * FROM `mempools` AS M, `devices` as D WHERE D.device_id = M.device_id ORDER BY D.hostname"); while ($mempool = mysql_fetch_assoc($mempools)) diff --git a/html/pages/health/processor.inc.php b/html/pages/health/processor.inc.php index d2a9319187..fe61bced26 100644 --- a/html/pages/health/processor.inc.php +++ b/html/pages/health/processor.inc.php @@ -4,6 +4,14 @@ $graph_type = "processor_usage"; echo("
    "); echo("
    DeviceMemoryUsageUsed
    "); + +echo(" + + + + + "); + $i = '1'; $procs = mysql_query("SELECT * FROM `processors` AS P, `devices` AS D WHERE D.device_id = P.device_id ORDER BY D.hostname"); while ($proc = mysql_fetch_assoc($procs))
    DeviceProcessorUsage