WordPress.org
Get WordPress

Plugin Directory

Changeset 1825603


Ignore:
Timestamp:
02/20/2018 08:56:59 PM (8 years ago)
Author:
fs1995
Message:

cleanup

Location:
lw-mwp-tools/trunk
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed

  • lw-mwp-tools/trunk/lw-mwp-tools.php

    r1820882 r1825603  
    55Description: Easy access to system logs and resource usage on the Liquid Web Managed WordPress Hosting Platform.
    66Author: Francis Smith
    7 Version: 0.3.1
     7Version: 0.3.2
    88Author URI: https://github.com/fs1995
    99License: GPL2
    … …  
    2626  add_menu_page('LW MWP Tools', 'LW MWP Tools', 'manage_options', 'lw-mwp-tools',  'lw_mwp_tools_monitor');
    2727  add_submenu_page ('lw-mwp-tools', 'Server Resource Monitor', 'Resource Monitor', 'manage_options', 'lw-mwp-tools', 'lw_mwp_tools_monitor');
     28  add_submenu_page ('lw-mwp-tools', 'System Information', 'System Info', 'manage_options', 'lw-mwp-tools-info', 'lw_mwp_tools_info');
    2829  add_submenu_page ('lw-mwp-tools', 'PHP error log', 'PHP error log', 'manage_options', 'lw-mwp-tools-php', 'lw_mwp_tools_php');
    2930  add_submenu_page ('lw-mwp-tools', 'NGINX access log', 'NGINX access log', 'manage_options', 'lw-mwp-tools-nginx-access', 'lw_mwp_tools_nginx_access');
    … …  
    3334function lw_mwp_tools_monitor(){ //generate the resource monitor page
    3435  require 'monitor.php'; //in a separate file cause theres a bit to this page.
     36}
     37
     38function lw_mwp_tools_info(){ //generate the resource monitor page
     39  echo "<h2>System Information</h2>Hostname: " . gethostname() . "<br>PHP version: " . phpversion() . "<br>Platform: " . PHP_OS;
    3540}
    3641

  • lw-mwp-tools/trunk/monitor.php

    r1820900 r1825603  
    11<?php defined('ABSPATH') or die('No!');
    2 $jsonpath = plugins_url( 'monitor_json.php', __FILE__ ) . "?lw-mwp-tools=" . gethostname() . get_current_user();?>
     2$jsonpath = plugins_url( 'api.php', __FILE__ ) . "?lw-mwp-tools=" . gethostname() . get_current_user() . "&page=monitor";?>
    33
    44<h2>Server Resource Monitor</h2>
    … …  
    2121    <td>Total: <span id="ram_total"></span> MB<br>
    2222      Used: <span id="ram_used"></span> MB<br>
    23       Available: <span id="ram_avail"></span> MB<br><br>
     23      Available: <span id="ram_avail"></span> MB<!--<br><br>
    2424      Free: <span id="ram_free"></span> MB<br>
    2525      Buffers: <span id="ram_buffers"></span> MB<br>
    26       Cached: <span id="ram_cached"></span> MB</td>
     26      Cached: <span id="ram_cached"></span> MB--></td>
    2727    <td>Total: <span id="swap_total"></span> MB<br>
    2828      Used: <span id="swap_used"></span> MB<br>
    … …  
    3333  </tr>
    3434</table><br>
    35 
    36 Hostname: <span id="hostname"></span><br>
    37 PHP: <span id="phpversion"></span><br><br>
    3835
    3936<h2>Bug report or suggestion?</h2>
    … …  
    6663        document.getElementById("ram_used").innerHTML = myjson['ram_used'];
    6764        document.getElementById("ram_avail").innerHTML = myjson['ram_avail'];
    68         document.getElementById("ram_free").innerHTML = myjson['ram_free'];
    69         document.getElementById("ram_buffers").innerHTML = myjson['ram_buffers'];
    70         document.getElementById("ram_cached").innerHTML = myjson['ram_cached'];
    71         document.getElementById("ram_pct").innerHTML = myjson['ram_pct'];
     65        //document.getElementById("ram_free").innerHTML = myjson['ram_free'];
     66        //document.getElementById("ram_buffers").innerHTML = myjson['ram_buffers'];
     67        //document.getElementById("ram_cached").innerHTML = myjson['ram_cached'];
     68        document.getElementById("ram_pct").innerHTML = ((myjson['ram_used'] / myjson['ram_total']) * 100).toFixed(1);
    7269
    7370        document.getElementById("swap_total").innerHTML = myjson['swap_total'];
    7471        document.getElementById("swap_used").innerHTML = myjson['swap_used'];
    7572        document.getElementById("swap_free").innerHTML = myjson['swap_free'];
    76         document.getElementById("swap_pct").innerHTML = myjson['swap_pct'];
     73        document.getElementById("swap_pct").innerHTML = ((myjson['swap_used'] / myjson['swap_total']) * 100).toFixed(1);
    7774
    7875        document.getElementById("disk_total").innerHTML = myjson['disk_total'];
    7976        document.getElementById("disk_used").innerHTML = myjson['disk_used'];
    8077        document.getElementById("disk_free").innerHTML = myjson['disk_free'];
    81         document.getElementById("disk_pct").innerHTML = myjson['disk_pct'];
     78        document.getElementById("disk_pct").innerHTML = ((myjson['disk_used'] / myjson['disk_total']) *100).toFixed(1);
    8279
    8380        document.getElementById("load_1").innerHTML = myjson['load_1'];
    … …  
    8582        document.getElementById("load_15").innerHTML = myjson['load_15'];
    8683        document.getElementById("cores").innerHTML = myjson['cores'];
    87         document.getElementById("hostname").innerHTML = myjson['hostname'];
    88         document.getElementById("phpversion").innerHTML = myjson['phpversion'];
    8984
    9085        chart_ram.update({ series: [myjson['ram_used'], myjson['ram_avail']], labels: [" ", " "] }); //and updating the charts

  • lw-mwp-tools/trunk/readme.txt

    r1820882 r1825603  
    4141== Changelog ==
    4242
     43= 0.3.2 =
     44* Separation of main page into 2 pages: Resource Monitor and System Info. More will be coming to both these pages soon!
     45
    4346= 0.3.1 =
    4447* Bug fix on Resource Monitor page.
    … …  
    5457= 0.1 =
    5558* First release!
    56 
    57 == Upgrade Notice ==
    58 
    59 = 0.3.1 =
    60 * Bug causing a password popup on Resource Monitor page is fixed.
Note: See TracChangeset for help on using the changeset viewer.