diff --git a/INFO b/INFO index c2614c6..52a1cd7 100644 --- a/INFO +++ b/INFO @@ -1,9 +1,9 @@ [info] name = hmib -version = 3.0 +version = 3.1 longname = Host MIB Tool author = The Cacti Group email = homepage = http://www.cacti.net -compat = 1.1.1 +compat = 1.1.4 capabilities = online_view:1, online_mgmt:1, offline_view:0, offline_mgmt:0, remote_collect:0 diff --git a/README.md b/README.md index e2d17ac..9a8f42e 100644 --- a/README.md +++ b/README.md @@ -31,6 +31,10 @@ Bug and feature enhancements for the hmib plugin are handled in GitHub. If you ## ChangeLog +--- 3.1 --- +* feature: More of the user interface using ajax callbacks +* issue#8: Correct sql errors in hmib.php page + --- 3.0 --- * Cacti 1.0 Compatibility diff --git a/hmib.php b/hmib.php index 7892b95..a211c14 100644 --- a/hmib.php +++ b/hmib.php @@ -185,7 +185,7 @@ function clearFilter() {
-
+ @@ -197,10 +197,11 @@ function clearFilter() { INNER JOIN plugin_hmib_hrSystem AS hrs ON hrst.id=hrs.host_type WHERE name!='' ORDER BY name"); + if (sizeof($types)) { - foreach($types AS $t) { - echo "'; - } + foreach($types AS $t) { + echo "'; + } } ?> @@ -220,9 +221,9 @@ function clearFilter() { ' ORDER BY description'); if (sizeof($hosts)) { - foreach($hosts AS $h) { - echo "'; - } + foreach($hosts AS $h) { + echo "'; + } } ?> @@ -243,9 +244,9 @@ function clearFilter() { ORDER BY name'); if (sizeof($templates)) { - foreach($templates AS $t) { - echo "'; - } + foreach($templates AS $t) { + echo "'; + } } ?> @@ -260,7 +261,7 @@ function clearFilter() {
- '; - echo "'; - echo "'; - echo "'; + echo "'; + echo "'; + echo "'; + echo "'; } echo ''; }else{ - print ''; + print ''; } html_end_box(false); @@ -514,7 +516,7 @@ function clearFilter() {
+ @@ -277,10 +278,11 @@ function clearFilter() { FROM plugin_hmib_hrSWRun_last_seen AS hrswr WHERE name!='System Idle Time' AND name NOT LIKE '128%' AND (name IS NOT NULL AND name!='') ORDER BY name"); + if (sizeof($procs)) { - foreach($procs AS $p) { - echo "'; - } + foreach($procs AS $p) { + echo "'; + } } ?> @@ -293,9 +295,9 @@ function clearFilter() { $name) { - echo "'; - } + foreach($item_rows AS $key => $name) { + echo "'; + } } ?> @@ -390,14 +392,14 @@ function clearFilter() { $host_url = $row['hostname']; } - echo "" . (strlen(get_request_var('filter')) ? preg_replace('/(' . preg_quote(get_request_var('filter')) . ')/i', "\\1", $row['description'] . ' [' . $host_url . ']'):$row['description'] . ' [' . $host_url . ']') . '" . (strlen(get_request_var('filter')) ? preg_replace('/(' . preg_quote(get_request_var('filter')) . ')/i', "\\1", $row['name']):$row['name']) . '" . (strlen(get_request_var('filter')) ? preg_replace('/(' . preg_quote(get_request_var('filter')) . ')/i', "\\1", $row['last_seen']):$row['last_seen']) . '" . hmib_get_runtime($row['total_time']) . '" . filter_value($row['description'], get_request_var('filter')) . ' [ ' . $host_url . ' ]" . filter_value($row['name'], get_request_var('filter')) . '" . filter_value($row['last_seen'], get_request_var('filter')) . '" . hmib_get_runtime($row['total_time']) . '
' . __('No Process History Found') . '
' . __('No Process History Found') . '
-
+ @@ -526,10 +528,11 @@ function clearFilter() { INNER JOIN plugin_hmib_hrSystem AS hrs ON hrst.id=hrs.host_type WHERE name!='' ORDER BY name"); + if (sizeof($types)) { - foreach($types AS $t) { - echo "'; - } + foreach($types AS $t) { + echo "'; + } } ?> @@ -549,9 +552,9 @@ function clearFilter() { ' ORDER BY description'); if (sizeof($hosts)) { - foreach($hosts AS $h) { - echo "'; - } + foreach($hosts AS $h) { + echo "'; + } } ?> @@ -572,9 +575,9 @@ function clearFilter() { ORDER BY name'); if (sizeof($templates)) { - foreach($templates AS $t) { - echo "'; - } + foreach($templates AS $t) { + echo "'; + } } ?> @@ -589,7 +592,7 @@ function clearFilter() {
- '; - echo "'; - echo "'; - echo "'; - echo "'; - echo "'; - echo "'; - echo "'; + echo "'; + echo "'; + echo "'; + echo "'; + echo "'; + echo "'; + echo "'; + echo "'; } echo ''; }else{ - print ''; + print ''; } html_end_box(false); @@ -862,7 +866,7 @@ function clearFilter() {
+ @@ -606,10 +609,11 @@ function clearFilter() { FROM plugin_hmib_hrSWRun_last_seen AS hrswr WHERE name!='System Idle Time' AND name NOT LIKE '128%' AND (name IS NOT NULL AND name!='') ORDER BY name"); + if (sizeof($procs)) { - foreach($procs AS $p) { - echo "'; - } + foreach($procs AS $p) { + echo "'; + } } ?> @@ -622,9 +626,9 @@ function clearFilter() { $name) { - echo "'; - } + foreach($item_rows AS $key => $name) { + echo "'; + } } ?> @@ -656,7 +660,7 @@ function clearFilter() { $sql_where .= (strlen($sql_where) ? ' AND':'WHERE') . ' host.id=' . get_request_var('device'); } - if (get_request_var('type') != '-1') { + if (get_request_var('type') != '-1' && !isempty_request_var('type')) { $sql_where .= (strlen($sql_where) ? ' AND':'WHERE') . ' hrs.host_type=' . get_request_var('type'); } @@ -697,12 +701,12 @@ function clearFilter() { $totals = db_fetch_row("SELECT ROUND(SUM(perfCPU),2) as cpu, - ROUND(SUM(perfMemory),2) as memory - FROM plugin_hmib_hrSWRun AS hrswr - INNER JOIN host ON host.id=hrswr.host_id - INNER JOIN plugin_hmib_hrSystem AS hrs - ON hrs.host_id=host.id - INNER JOIN plugin_hmib_hrSystemTypes AS hrst + ROUND(SUM(perfMemory),2) as memory + FROM plugin_hmib_hrSWRun AS hrswr + INNER JOIN host ON host.id=hrswr.host_id + INNER JOIN plugin_hmib_hrSystem AS hrs + ON hrs.host_id=host.id + INNER JOIN plugin_hmib_hrSystemTypes AS hrst ON hrst.id=hrs.host_type $sql_where"); @@ -719,7 +723,7 @@ function clearFilter() { 'parameters' => array('display' => __('Parameters'), 'sort' => 'ASC', 'align' => 'left'), 'perfCpu' => array('display' => __('CPU (Hrs)'), 'sort' => 'DESC', 'align' => 'right'), 'perfMemory' => array('display' => __('Memory (MB)'), 'sort' => 'DESC', 'align' => 'right'), - 'type' => array('display' => __('Type'), 'sort' => 'ASC', 'align' => 'left'), + 'type' => array('display' => __('Type'), 'sort' => 'ASC', 'align' => 'right'), 'status' => array('display' => __('Status'), 'sort' => 'DESC', 'align' => 'right') ); @@ -729,23 +733,23 @@ function clearFilter() { foreach ($rows as $row) { form_alternate_row(); if (api_plugin_user_realm_auth('host.php')) { - $host_url = "" . $row['hostname'] . ''; + $host_url = "" . $row['hostname'] . ''; }else{ - $host_url = $row['hostname']; + $host_url = $row['hostname']; } - echo "" . (strlen(get_request_var('filter')) ? preg_replace('/(' . preg_quote(get_request_var('filter')) . ')/i', "\\1", $row['description'] . ' [' . $host_url . ']'):$row['description'] . ' [' . $host_url . ']') . '" . (strlen(get_request_var('filter')) ? preg_replace('/(' . preg_quote(get_request_var('filter')) . ')/i', "\\1", $row['name']):$row['name']) . '" . (strlen(get_request_var('filter')) ? preg_replace('/(' . preg_quote(get_request_var('filter')) . ')/i', "\\1", title_trim($row['path'],40)):title_trim($row['path'],40)) . '" . (strlen(get_request_var('filter')) ? preg_replace('/(' . preg_quote(get_request_var('filter')) . ')/i', "\\1", title_trim($row['parameters'], 40)):title_trim($row['parameters'],40)) . '" . number_format_i18n($row['perfCPU']/3600,0) . '" . number_format_i18n($row['perfMemory']/1024,2) . '" . (isset($hmib_hrSWTypes[$row['type']]) ? $hmib_hrSWTypes[$row['type']]:'Unknown') . '" . $hmib_hrSWRunStatus[$row['status']] . '" . filter_value($row['description'], get_request_var('filter')) . ' [ ' . $host_url . ' ]" . filter_value($row['name'], get_request_var('filter')) . '" . filter_value($row['path'], get_request_var('filter')) . '" . filter_value($row['parameters'], get_request_var('filter')) . '" . number_format_i18n($row['perfCPU']/3600,0) . '" . number_format_i18n($row['perfMemory']/1024,2) . '" . (isset($hmib_hrSWTypes[$row['type']]) ? $hmib_hrSWTypes[$row['type']]:__('Unknown')) . '" . $hmib_hrSWRunStatus[$row['status']] . '
' . __('No Running Software Found') . '
' . __('No Running Software Found') . '
-
+ @@ -937,7 +941,7 @@ function clearFilter() {
- '; - echo "'; - echo "'; - echo "'; - echo "'; + echo "'; + echo "'; + echo "'; + echo "'; + echo "'; } echo ''; }else{ @@ -1167,7 +1171,7 @@ function clearFilter() {
+ @@ -1052,16 +1056,16 @@ function clearFilter() { foreach ($rows as $row) { form_alternate_row(); if (api_plugin_user_realm_auth('host.php')) { - $host_url = "" . $row['hostname'] . ''; + $host_url = "" . $row['hostname'] . ''; }else{ - $host_url = $row['hostname']; + $host_url = $row['hostname']; } - echo "" . (strlen(get_request_var('filter')) ? preg_replace('/(' . preg_quote(get_request_var('filter')) . ')/i', "\\1", $row['hd'] . ' [' . $host_url . ']'):$row['hd'] . ' [' . $host_url . ']') . '" . (strlen(get_request_var('filter')) ? preg_replace('/(' . preg_quote(get_request_var('filter')) . ')/i', "\\1", $row['description']):$row['description']) . '" . (isset($hmib_types[$row['type']]) ? $hmib_types[$row['type']]:'Unknown') . '" . $hmib_hrDeviceStatus[$row['status']] . '" . $row['errors'] . '" . filter_value($row['hd'], get_request_var('filter')) . ' [ ' . $host_url . ' ]" . filter_value($row['description'], get_request_var('filter')) . '" . (isset($hmib_types[$row['type']]) ? $hmib_types[$row['type']]:__('Unknown')) . '" . $hmib_hrDeviceStatus[$row['status']] . '" . $row['errors'] . '
-
+ @@ -1242,7 +1246,7 @@ function clearFilter() {
- '; - echo "'; - echo "'; - echo "'; - echo "'; - echo "'; - echo "'; - echo "'; + echo "'; + echo "'; + echo "'; + echo "'; + echo "'; + echo "'; + echo "'; + echo "'; } echo ''; }else{ - print ''; + print ''; } html_end_box(false); @@ -1406,7 +1410,8 @@ function hmib_devices() { 'default' => '-1', ), 'process' => array( - 'filter' => FILTER_VALIDATE_INT, + 'filter' => FILTER_CALLBACK, + 'options' => array('options' => 'sanitize_search_string'), 'pageset' => true, 'default' => '-1', ), @@ -1472,7 +1477,7 @@ function clearFilter() {
+ @@ -1360,23 +1364,23 @@ function clearFilter() { foreach ($rows as $row) { form_alternate_row(); if (api_plugin_user_realm_auth('host.php')) { - $host_url = "" . $row['hostname'] . ''; + $host_url = "" . $row['hostname'] . ''; }else{ - $host_url = $row['hostname']; + $host_url = $row['hostname']; } - echo "" . (strlen(get_request_var('filter')) ? preg_replace('/(' . preg_quote(get_request_var('filter')) . ')/i', "\\1", $row['hd'] . ' [' . $host_url . ']'):$row['hd'] . ' [' . $host_url . ']') . '" . (strlen(get_request_var('filter')) ? preg_replace('/(' . preg_quote(get_request_var('filter')) . ')/i', "\\1", $row['description']):$row['description']) . '" . (isset($hmib_types[$row['type']]) ? $hmib_types[$row['type']]:'Unknown') . '" . $row['failures'] . '" . round($row['percent']*100,2) . ' %" . number_format_i18n($row['used']/1024,0) . '" . number_format_i18n($row['size']/1024,0) . '" . number_format_i18n($row['allocationUnits']) . '" . filter_value($row['hd'], get_request_var('filter')) . ' [ ' . $host_url . ' ]" . filter_value($row['description'], get_request_var('filter')) . '" . (isset($hmib_types[$row['type']]) ? $hmib_types[$row['type']]:__('Unknown')) . '" . $row['failures'] . '" . round($row['percent']*100,2) . ' %" . number_format_i18n($row['used']/1024,0) . '" . number_format_i18n($row['size']/1024,0) . '" . number_format_i18n($row['allocationUnits']) . '
' . __('No Storage Devices Found') . '
' . __('No Storage Devices Found') . '
-
+ @@ -1541,7 +1546,7 @@ function clearFilter() {
- '; - echo "'; + echo "'; echo "'; echo "'; echo "'; @@ -1756,7 +1761,7 @@ function clearFilter() { } echo ''; }else{ - print ''; + print ''; } html_end_box(false); @@ -1897,7 +1902,7 @@ function clearFilter() {
+ @@ -1619,11 +1624,11 @@ function clearFilter() { $limit = ' LIMIT ' . ($num_rows*(get_request_var('page')-1)) . ',' . $num_rows; $sql_where = ''; - if (get_request_var('template') != '-1' && !isempty_request_var('template')) { + if (get_request_var('template') != '-1') { $sql_where .= (strlen($sql_where) ? ' AND':'WHERE') . ' host.host_template_id=' . get_request_var('template'); } - if (get_request_var('status') != '-1' && !isempty_request_var('status')) { + if (get_request_var('status') != '-1') { $sql_where .= (strlen($sql_where) ? ' AND':'WHERE') . ' hrs.host_status=' . get_request_var('status'); } @@ -1692,20 +1697,20 @@ function clearFilter() { $graphs = $config['url_path'] . 'plugins/hmib/images/view_graphs.gif'; $nographs = $config['url_path'] . 'plugins/hmib/images/view_graphs_disabled.gif'; - $htdq = db_fetch_cell("SELECT id - FROM snmp_query + $htdq = db_fetch_cell("SELECT id + FROM snmp_query WHERE hash='137aeab842986a76cf5bdef41b96c9a3'"); - $hcpudq = db_fetch_cell("SELECT id - FROM snmp_query + $hcpudq = db_fetch_cell("SELECT id + FROM snmp_query WHERE hash='0d1ab53fe37487a5d0b9e1d3ee8c1d0d'"); - $hugt = db_fetch_cell("SELECT id - FROM graph_templates + $hugt = db_fetch_cell("SELECT id + FROM graph_templates WHERE hash='e8462bbe094e4e9e814d4e681671ea82'"); - $hpgt = db_fetch_cell("SELECT id - FROM graph_templates + $hpgt = db_fetch_cell("SELECT id + FROM graph_templates WHERE hash='62205afbd4066e5c4700338841e3901e'"); if (sizeof($rows)) { @@ -1721,12 +1726,12 @@ function clearFilter() { form_alternate_row(); echo ""; //echo ""; - echo ""; - echo ""; - echo ""; - echo ""; + echo ""; + echo ""; + echo ""; + echo ""; if ($found) { - echo ""; + echo ""; }else{ echo ""; } @@ -1736,13 +1741,13 @@ function clearFilter() { $graph_users = hmib_get_graph_template_url($hugt, 0, $row['host_id'], ($row['host_status'] < 2 ? 'N/A':$row['users']), false); $graph_aproc = hmib_get_graph_template_url($hpgt, 0, $row['host_id'], ($row['host_status'] < 2 ? 'N/A':$row['processes']), false); if (api_plugin_user_realm_auth('host.php')) { - $host_url = "" . $row['hostname'] . ''; + $host_url = "" . $row['hostname'] . ''; }else{ - $host_url = $row['hostname']; + $host_url = $row['hostname']; } echo '" . $row['description'] . ' [' . $host_url . ']' . '" . $row['description'] . ' [ ' . $host_url . ' ]" . get_colored_device_status(($row['disabled'] == 'on' ? true : false), $row['host_status']) . '" . hmib_format_uptime($days, $hours, $minutes) . '" . $graph_users . '
' . __('No Devices Found') . '
' . __('No Devices Found') . '
-
+ @@ -1909,10 +1914,11 @@ function clearFilter() { INNER JOIN plugin_hmib_hrSystem AS hrs ON hrst.id=hrs.host_type WHERE name!='' ORDER BY name"); + if (sizeof($ostypes)) { - foreach($ostypes AS $t) { - echo "'; - } + foreach($ostypes AS $t) { + echo "'; + } } ?> @@ -1932,9 +1938,9 @@ function clearFilter() { ' ORDER BY description'); if (sizeof($hosts)) { - foreach($hosts AS $h) { - echo "'; - } + foreach($hosts AS $h) { + echo "'; + } } ?> @@ -1955,9 +1961,9 @@ function clearFilter() { ORDER BY name'); if (sizeof($templates)) { - foreach($templates AS $t) { - echo "'; - } + foreach($templates AS $t) { + echo "'; + } } ?> @@ -1972,7 +1978,7 @@ function clearFilter() {
- '; - echo "'; - echo "'; - echo "'; + echo ''; + echo ''; + echo ''; + echo "'; } echo ''; }else{ - print ''; + print ''; } html_end_box(false); @@ -2131,7 +2138,7 @@ function hmib_tabs() { if (sizeof($tabs)) { foreach (array_keys($tabs) as $tab_short_name) { - print "
  • " . $tabs[$tab_short_name] . "
    • \n"; @@ -2238,20 +2245,20 @@ function hmib_summary() { $inven = $config['url_path'] . 'plugins/hmib/images/view_inventory.gif'; $storage = $config['url_path'] . 'plugins/hmib/images/drive.png'; - $htdq = db_fetch_cell("SELECT id + $htdq = db_fetch_cell("SELECT id FROM snmp_query WHERE hash='137aeab842986a76cf5bdef41b96c9a3'"); - $hcpudq = db_fetch_cell("SELECT id + $hcpudq = db_fetch_cell("SELECT id FROM snmp_query WHERE hash='0d1ab53fe37487a5d0b9e1d3ee8c1d0d'"); - $hugt = db_fetch_cell("SELECT id - FROM graph_templates + $hugt = db_fetch_cell("SELECT id + FROM graph_templates WHERE hash='e8462bbe094e4e9e814d4e681671ea82'"); - $hpgt = db_fetch_cell("SELECT id - FROM graph_templates + $hpgt = db_fetch_cell("SELECT id + FROM graph_templates WHERE hash='62205afbd4066e5c4700338841e3901e'"); $htsd = db_fetch_cell("SELECT id @@ -2303,10 +2310,10 @@ function clearFilter() { '>
    + @@ -1988,10 +1994,11 @@ function clearFilter() { $types = db_fetch_assoc('SELECT DISTINCT type FROM plugin_hmib_hrSWInstalled ORDER BY type'); + if (sizeof($types)) { - foreach($types AS $t) { - echo "'; - } + foreach($types AS $t) { + echo "'; + } } ?> @@ -2004,9 +2011,9 @@ function clearFilter() { $name) { - echo "'; - } + foreach($item_rows AS $key => $name) { + echo "'; + } } ?> @@ -2086,19 +2093,19 @@ function clearFilter() { foreach ($rows as $row) { form_alternate_row(); if (api_plugin_user_realm_auth('host.php')) { - $host_url = "" . $row['hostname'] . ''; + $host_url = "" . $row['hostname'] . ''; }else{ - $host_url = $row['hostname']; + $host_url = $row['hostname']; } - echo "" . (strlen(get_request_var('filter')) ? preg_replace('/(' . preg_quote(get_request_var('filter')) . ')/i', "\\1", $row['description'] . ' [' . $host_url):$row['description'] . ' [' . $host_url) . ']" . (strlen(get_request_var('filter')) ? preg_replace('/(' . preg_quote(get_request_var('filter')) . ')/i', "\\1", $row['name']):$row['name']) . '" . (isset($hmib_hrSWTypes[$row['type']]) ? $hmib_hrSWTypes[$row['type']]:'Unknown') . '" . (strlen(get_request_var('filter')) ? preg_replace('/(' . preg_quote(get_request_var('filter')) . ')/i', "\\1", $row['date']):$row['date']) . '' . filter_value($row['description'], get_request_var('filter')) . ' [ ' . $host_url . ' ]' . filter_value($row['name'], get_request_var('filter')) . '' . (isset($hmib_hrSWTypes[$row['type']]) ? $hmib_hrSWTypes[$row['type']]:__('Unknown')) . '" . filter_value($row['date'], get_request_var('filter')) . '
    ' . __('No Software Packages Found') . '
    ' . __('No Software Packages Found') . '
    - ' name='clear'> + '> -   ' . __('WARNING: You need to import your Host MIB Host Template to view Graphs. See the README for more information.') . '':'';?> + ' . __('WARNING: You need to import your Host MIB Host Template to view Graphs. See the README for more information.') . '':'';?>
    @@ -2399,11 +2406,11 @@ function clearFilter() { form_alternate_row(); echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; echo $graph_url; echo ''; @@ -2412,7 +2419,7 @@ function clearFilter() { $downHosts = hmib_get_device_status_url($row['downHosts'], $row['host_type'], 1); $disaHosts = hmib_get_device_status_url($row['disabledHosts'], $row['host_type'], 0); - echo "" . ($row['name'] != '' ? $row['name']:'Unknown') . ''; + echo "" . ($row['name'] != '' ? $row['name']:__('Unknown')) . ''; echo "" . $row['version'] . ''; echo "" . $upHosts . ''; echo "" . $recHosts . ''; @@ -2429,6 +2436,7 @@ function clearFilter() { echo "" . $graph_aproc . ''; echo "" . $graph_mproc . ''; } + echo ''; }else{ print '' . __('No Device Types') . ''; @@ -2468,7 +2476,7 @@ function clearProc() { - '; echo "'; @@ -2584,9 +2592,10 @@ function clearProc() { echo "'; echo "'; } + echo ''; }else{ - print ''; + print ''; } html_end_box(); @@ -2596,7 +2605,7 @@ function hmib_get_device_status_url($count, $host_type, $status) { global $config; if ($count > 0) { - return "$count"; + return "$count"; }else{ return $count; } @@ -2632,16 +2641,16 @@ function hmib_get_graph_template_url($graph_template, $host_type = 0, $host_id = $graph_add = ''; if (sizeof($graphs)) { - foreach($graphs as $graph) { - $graph_add .= (strlen($graph_add) ? ',':'') . $graph['id']; - } + foreach($graphs as $graph) { + $graph_add .= (strlen($graph_add) ? ',':'') . $graph['id']; + } } if (sizeof($graphs)) { if ($image) { - return ""; + return ""; }else{ - return "$title"; + return "$title"; } } } @@ -2684,16 +2693,16 @@ function hmib_get_graph_url($data_query, $host_type, $host_id, $index, $title = $graph_add = ''; if (sizeof($graphs)) { - foreach($graphs as $g) { - $graph_add .= (strlen($graph_add) ? ',':'') . $g['id']; - } + foreach($graphs as $g) { + $graph_add .= (strlen($graph_add) ? ',':'') . $g['id']; + } } if (sizeof($graphs)) { if ($image) { - return ""; + return ""; }else{ - return "$title"; + return "$title"; } } } @@ -2714,24 +2723,24 @@ function hmib_view_graphs() { html_graph_validate_preview_request_vars(); if (!isset($_SESSION['sess_hmib_gt'])) { - $_SESSION['sess_hmib_gt'] = implode(',', array_rekey(db_fetch_assoc('SELECT DISTINCT gl.graph_template_id - FROM graph_local AS gl + $_SESSION['sess_hmib_gt'] = implode(',', array_rekey(db_fetch_assoc('SELECT DISTINCT gl.graph_template_id + FROM graph_local AS gl WHERE gl.host_id IN( - SELECT host_id + SELECT host_id FROM plugin_hmib_hrSystem )'), 'graph_template_id', 'graph_template_id')); } $gt = $_SESSION['sess_hmib_gt']; if (!isset($_SESSION['sess_hmib_hosts'])) { - $_SESSION['sess_hmib_hosts'] = implode(',', array_rekey(db_fetch_assoc('SELECT h.id - FROM host AS h + $_SESSION['sess_hmib_hosts'] = implode(',', array_rekey(db_fetch_assoc('SELECT h.id + FROM host AS h WHERE h.id IN ( - SELECT host_id + SELECT host_id FROM plugin_hmib_hrSystem - ) - UNION - SELECT h.id + ) + UNION + SELECT h.id FROM host AS h INNER JOIN host_template AS ht ON h.host_template_id=ht.id @@ -2759,11 +2768,13 @@ function hmib_view_graphs() { }else{ $graph_list = array(); } + if (!isempty_request_var('graph_add')) { foreach (explode(',',get_request_var('graph_add')) as $item) { $graph_list[$item] = 1; } } + /* remove items */ if (!isempty_request_var('graph_remove')) { foreach (explode(',',get_request_var('graph_remove')) as $item) { @@ -2798,7 +2809,7 @@ function hmib_view_graphs() { $limit = (get_request_var('graphs')*(get_request_var('page')-1)) . ',' . get_request_var('graphs'); $order = 'gtg.title_cache'; - $graphs = get_allowed_graphs($sql_where, $order, $limit, $total_graphs); + $graphs = get_allowed_graphs($sql_where, $order, $limit, $total_graphs); /* do some fancy navigation url construction so we don't have to try and rebuild the url string */ if (preg_match('/page=[0-9]+/',basename($_SERVER['QUERY_STRING']))) { diff --git a/locales/po/cacti.pot b/locales/po/cacti.pot index 1505c9b..c1f98b6 100644 --- a/locales/po/cacti.pot +++ b/locales/po/cacti.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-08 08:20-0500\n" +"POT-Creation-Date: 2017-06-29 23:10-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -24,134 +24,136 @@ msgstr "" msgid "Duplicate" msgstr "" -#: ../hmib_types.php:224 +#: ../hmib_types.php:226 msgid "Click 'Continue' to Delete the following Host Type(s)" msgstr "" -#: ../hmib_types.php:229 ../hmib_types.php:239 ../hmib_types.php:244 +#: ../hmib_types.php:231 ../hmib_types.php:241 ../hmib_types.php:246 msgid "Cancel" msgstr "" -#: ../hmib_types.php:229 ../hmib_types.php:239 +#: ../hmib_types.php:231 ../hmib_types.php:241 msgid "Continue" msgstr "" -#: ../hmib_types.php:229 +#: ../hmib_types.php:231 msgid "Delete Host Type(s)" msgstr "" -#: ../hmib_types.php:233 +#: ../hmib_types.php:235 msgid "" "Click 'Continue' to Duplicate the following Host Type(s). You may optionally " "change the description for the new Host Type(s). Otherwise, do not change " "value below and the original name will be replicated with a new suffix." msgstr "" -#: ../hmib_types.php:235 +#: ../hmib_types.php:237 msgid "Host Type Prefix:" msgstr "" -#: ../hmib_types.php:239 +#: ../hmib_types.php:241 msgid "Duplicate Host Type(s)" msgstr "" -#: ../hmib_types.php:243 +#: ../hmib_types.php:245 msgid "You must select at least one Host Type." msgstr "" -#: ../hmib_types.php:350 +#: ../hmib_types.php:352 msgid "New Type" msgstr "" -#: ../hmib_types.php:351 ../hmib.php:37 ../hmib.php:52 ../hmib.php:1567 +#: ../hmib_types.php:353 ../hmib.php:37 ../hmib.php:52 ../hmib.php:747 +#: ../hmib.php:1066 ../hmib.php:1374 ../hmib.php:1572 ../hmib.php:2103 +#: ../hmib.php:2422 msgid "Unknown" msgstr "" -#: ../hmib_types.php:395 +#: ../hmib_types.php:397 #, php-format msgid "There were %d Device Types Added!" msgstr "" -#: ../hmib_types.php:398 +#: ../hmib_types.php:400 msgid "No New Host Types Found!" msgstr "" -#: ../hmib_types.php:409 +#: ../hmib_types.php:411 msgid "Import Results" msgstr "" -#: ../hmib_types.php:411 +#: ../hmib_types.php:413 msgid "Cacti has imported the following items:" msgstr "" -#: ../hmib_types.php:423 +#: ../hmib_types.php:425 msgid "Import Host MIB OS Types" msgstr "" -#: ../hmib_types.php:426 +#: ../hmib_types.php:428 msgid "Import Device Types from Local File" msgstr "" -#: ../hmib_types.php:427 +#: ../hmib_types.php:429 msgid "" "Please specify the location of the CSV file containing your device type " "information." msgstr "" -#: ../hmib_types.php:434 +#: ../hmib_types.php:436 msgid "Overwrite Existing Data?" msgstr "" -#: ../hmib_types.php:435 +#: ../hmib_types.php:437 msgid "" "Should the import process be allowed to overwrite existing data? Please " "note, this does not mean delete old row, only replace duplicate rows." msgstr "" -#: ../hmib_types.php:438 +#: ../hmib_types.php:440 msgid "Allow Existing Rows to be Updated?" msgstr "" -#: ../hmib_types.php:443 +#: ../hmib_types.php:445 msgid "Required File Format Notes" msgstr "" -#: ../hmib_types.php:446 +#: ../hmib_types.php:448 msgid "The file must contain a header row with the following column headings." msgstr "" -#: ../hmib_types.php:448 +#: ../hmib_types.php:450 msgid "A common name for the Host Type. For example, Windows 7" msgstr "" -#: ../hmib_types.php:449 +#: ../hmib_types.php:451 msgid "The OS version for the Host Type" msgstr "" -#: ../hmib_types.php:450 +#: ../hmib_types.php:452 msgid "" "A unique set of characters from the snmp sysDescr that uniquely identify " "this device" msgstr "" -#: ../hmib_types.php:451 +#: ../hmib_types.php:453 msgid "" "The vendor specific snmp sysObjectID that distinguishes this device from the " "next" msgstr "" -#: ../hmib_types.php:453 +#: ../hmib_types.php:455 msgid "" "The primary key for this table is a combination of the following two fields:" msgstr "" -#: ../hmib_types.php:457 +#: ../hmib_types.php:459 msgid "" "Therefore, if you attempt to import duplicate device types, the existing " "data will be updated with the new information." msgstr "" -#: ../hmib_types.php:459 +#: ../hmib_types.php:461 msgid "" "The Host Type is determined by scanning its snmp agent for the sysObjectID " "and sysDescription and comparing it against values in the Host Types " @@ -160,11 +162,11 @@ msgid "" "sysObjectID, sysDescrMatch for your Hosts." msgstr "" -#: ../hmib_types.php:724 +#: ../hmib_types.php:726 msgid "Are You Sure?" msgstr "" -#: ../hmib_types.php:724 +#: ../hmib_types.php:726 #, php-format msgid "Are you sure you want to delete the Host Type'%s'" msgstr "" @@ -181,7 +183,7 @@ msgstr "" msgid "Give this Host Type a meaningful name." msgstr "" -#: ../hmib_types.php:758 ../hmib.php:2360 +#: ../hmib_types.php:758 ../hmib.php:2367 msgid "Version" msgstr "" @@ -214,90 +216,90 @@ msgstr "" msgid "Host MIB OS Types [new]" msgstr "" -#: ../hmib_types.php:857 +#: ../hmib_types.php:861 msgid "Host MIB OS Type Filters" msgstr "" -#: ../hmib_types.php:869 ../setup.php:589 +#: ../hmib_types.php:873 ../setup.php:589 msgid "OS Types" msgstr "" -#: ../hmib_types.php:878 +#: ../hmib_types.php:882 msgid "Host Type Name" msgstr "" -#: ../hmib_types.php:879 +#: ../hmib_types.php:883 msgid "OS Version" msgstr "" -#: ../hmib_types.php:880 ../hmib.php:2548 +#: ../hmib_types.php:884 ../hmib.php:2556 msgid "Hosts" msgstr "" -#: ../hmib_types.php:881 +#: ../hmib_types.php:885 msgid "SNMP ObjectID" msgstr "" -#: ../hmib_types.php:882 +#: ../hmib_types.php:886 msgid "SNMP Sys Description Match" msgstr "" -#: ../hmib_types.php:898 +#: ../hmib_types.php:902 msgid "No Host Types Found" msgstr "" -#: ../hmib_types.php:926 +#: ../hmib_types.php:930 msgid "Choose an action:" msgstr "" -#: ../hmib_types.php:930 ../hmib_types.php:998 ../hmib.php:254 ../hmib.php:583 -#: ../hmib.php:931 ../hmib.php:1236 ../hmib.php:1535 ../hmib.php:1966 -#: ../hmib.php:2303 ../hmib.php:2490 +#: ../hmib_types.php:934 ../hmib_types.php:1002 ../hmib.php:255 +#: ../hmib.php:586 ../hmib.php:935 ../hmib.php:1240 ../hmib.php:1540 +#: ../hmib.php:1972 ../hmib.php:2310 ../hmib.php:2498 msgid "Go" msgstr "" -#: ../hmib_types.php:977 ../hmib.php:264 ../hmib.php:593 ../hmib.php:941 -#: ../hmib.php:1246 ../hmib.php:1545 ../hmib.php:1976 ../hmib.php:2472 +#: ../hmib_types.php:981 ../hmib.php:265 ../hmib.php:596 ../hmib.php:945 +#: ../hmib.php:1250 ../hmib.php:1550 ../hmib.php:1982 ../hmib.php:2480 msgid "Search" msgstr "" -#: ../hmib_types.php:983 ../hmib.php:189 ../hmib.php:518 ../hmib.php:866 -#: ../hmib.php:1171 ../hmib.php:1476 ../hmib.php:1901 +#: ../hmib_types.php:987 ../hmib.php:189 ../hmib.php:520 ../hmib.php:870 +#: ../hmib.php:1175 ../hmib.php:1481 ../hmib.php:1906 msgid "OS Type" msgstr "" -#: ../hmib_types.php:987 ../hmib.php:293 ../hmib.php:622 ../hmib.php:970 -#: ../hmib.php:1275 ../hmib.php:1593 ../hmib.php:2004 +#: ../hmib_types.php:991 ../hmib.php:295 ../hmib.php:626 ../hmib.php:974 +#: ../hmib.php:1279 ../hmib.php:1598 ../hmib.php:2011 msgid "Default" msgstr "" -#: ../hmib_types.php:1001 ../hmib.php:257 ../hmib.php:586 ../hmib.php:934 -#: ../hmib.php:1239 ../hmib.php:1538 ../hmib.php:1969 ../hmib.php:2306 -#: ../hmib.php:2493 +#: ../hmib_types.php:1005 ../hmib.php:258 ../hmib.php:589 ../hmib.php:938 +#: ../hmib.php:1243 ../hmib.php:1543 ../hmib.php:1975 ../hmib.php:2313 +#: ../hmib.php:2501 msgid "Clear" msgstr "" -#: ../hmib_types.php:1004 +#: ../hmib_types.php:1008 msgid "Scan for New or Unknown Device Types" msgstr "" -#: ../hmib_types.php:1004 +#: ../hmib_types.php:1008 msgid "Rescan" msgstr "" -#: ../hmib_types.php:1007 +#: ../hmib_types.php:1011 msgid "Import Host Types from a CSV File" msgstr "" -#: ../hmib_types.php:1007 ../setup.php:606 +#: ../hmib_types.php:1011 ../setup.php:606 msgid "Import" msgstr "" -#: ../hmib_types.php:1010 +#: ../hmib_types.php:1014 msgid "Export Host Types to Share with Others" msgstr "" -#: ../hmib_types.php:1010 +#: ../hmib_types.php:1014 msgid "Export" msgstr "" @@ -491,7 +493,7 @@ msgstr "" msgid "How often do you want to scan for Processor performance data?" msgstr "" -#: ../setup.php:506 ../hmib.php:1579 ../hmib.php:2364 +#: ../setup.php:506 ../hmib.php:1584 ../hmib.php:2371 msgid "Disabled" msgstr "" @@ -545,7 +547,7 @@ msgstr "" msgid "Host MIB OS Types" msgstr "" -#: ../setup.php:604 ../hmib.php:1667 ../hmib.php:2358 ../hmib.php:2545 +#: ../setup.php:604 ../hmib.php:1672 ../hmib.php:2365 ../hmib.php:2553 msgid "Actions" msgstr "" @@ -597,7 +599,7 @@ msgstr "" msgid "Testing" msgstr "" -#: ../hmib.php:56 ../hmib.php:1570 ../hmib.php:2363 +#: ../hmib.php:56 ../hmib.php:1575 ../hmib.php:2370 msgid "Down" msgstr "" @@ -605,407 +607,411 @@ msgstr "" msgid "Running Process History" msgstr "" -#: ../hmib.php:193 ../hmib.php:213 ../hmib.php:235 ../hmib.php:274 -#: ../hmib.php:522 ../hmib.php:542 ../hmib.php:564 ../hmib.php:603 -#: ../hmib.php:870 ../hmib.php:890 ../hmib.php:912 ../hmib.php:951 -#: ../hmib.php:1175 ../hmib.php:1195 ../hmib.php:1217 ../hmib.php:1256 -#: ../hmib.php:1480 ../hmib.php:1500 ../hmib.php:1523 ../hmib.php:1555 -#: ../hmib.php:1905 ../hmib.php:1925 ../hmib.php:1947 ../hmib.php:1986 +#: ../hmib.php:193 ../hmib.php:214 ../hmib.php:236 ../hmib.php:275 +#: ../hmib.php:524 ../hmib.php:545 ../hmib.php:567 ../hmib.php:606 +#: ../hmib.php:874 ../hmib.php:894 ../hmib.php:916 ../hmib.php:955 +#: ../hmib.php:1179 ../hmib.php:1199 ../hmib.php:1221 ../hmib.php:1260 +#: ../hmib.php:1485 ../hmib.php:1505 ../hmib.php:1528 ../hmib.php:1560 +#: ../hmib.php:1910 ../hmib.php:1931 ../hmib.php:1953 ../hmib.php:1992 msgid "All" msgstr "" -#: ../hmib.php:209 ../hmib.php:538 ../hmib.php:886 ../hmib.php:1191 -#: ../hmib.php:1921 +#: ../hmib.php:210 ../hmib.php:541 ../hmib.php:890 ../hmib.php:1195 +#: ../hmib.php:1927 msgid "Device" msgstr "" -#: ../hmib.php:231 ../hmib.php:560 ../hmib.php:908 ../hmib.php:1213 -#: ../hmib.php:1496 ../hmib.php:1943 +#: ../hmib.php:232 ../hmib.php:563 ../hmib.php:912 ../hmib.php:1217 +#: ../hmib.php:1501 ../hmib.php:1949 msgid "Template" msgstr "" -#: ../hmib.php:270 ../hmib.php:377 ../hmib.php:599 ../hmib.php:717 -#: ../hmib.php:1519 +#: ../hmib.php:271 ../hmib.php:379 ../hmib.php:602 ../hmib.php:721 +#: ../hmib.php:1524 msgid "Process" msgstr "" -#: ../hmib.php:289 ../hmib.php:618 ../hmib.php:966 +#: ../hmib.php:291 ../hmib.php:622 ../hmib.php:970 msgid "Entries" msgstr "" -#: ../hmib.php:369 +#: ../hmib.php:371 msgid "History" msgstr "" -#: ../hmib.php:376 ../hmib.php:716 ../hmib.php:1042 ../hmib.php:1347 -#: ../hmib.php:1668 ../hmib.php:2077 +#: ../hmib.php:378 ../hmib.php:720 ../hmib.php:1046 ../hmib.php:1351 +#: ../hmib.php:1673 ../hmib.php:2084 msgid "Hostname" msgstr "" -#: ../hmib.php:378 +#: ../hmib.php:380 msgid "Last Seen" msgstr "" -#: ../hmib.php:379 +#: ../hmib.php:381 msgid "Use Time (d:h:m)" msgstr "" -#: ../hmib.php:388 ../hmib.php:732 ../hmib.php:1055 ../hmib.php:1363 -#: ../hmib.php:1739 ../hmib.php:2089 +#: ../hmib.php:390 ../hmib.php:736 ../hmib.php:1059 ../hmib.php:1367 +#: ../hmib.php:1744 ../hmib.php:2096 msgid "Edit Device" msgstr "" -#: ../hmib.php:400 +#: ../hmib.php:397 +msgid "Time when last seen running" +msgstr "" + +#: ../hmib.php:402 msgid "No Process History Found" msgstr "" -#: ../hmib.php:509 +#: ../hmib.php:511 msgid "Running Processes" msgstr "" -#: ../hmib.php:709 ../hmib.php:1674 ../hmib.php:2120 ../hmib.php:2549 +#: ../hmib.php:713 ../hmib.php:1679 ../hmib.php:2127 ../hmib.php:2557 msgid "Processes" msgstr "" -#: ../hmib.php:718 +#: ../hmib.php:722 msgid "Path" msgstr "" -#: ../hmib.php:719 +#: ../hmib.php:723 msgid "Parameters" msgstr "" -#: ../hmib.php:720 +#: ../hmib.php:724 msgid "CPU (Hrs)" msgstr "" -#: ../hmib.php:721 +#: ../hmib.php:725 msgid "Memory (MB)" msgstr "" -#: ../hmib.php:722 ../hmib.php:947 ../hmib.php:1252 ../hmib.php:1982 -#: ../hmib.php:2079 ../hmib.php:2359 +#: ../hmib.php:726 ../hmib.php:951 ../hmib.php:1256 ../hmib.php:1988 +#: ../hmib.php:2086 ../hmib.php:2366 msgid "Type" msgstr "" -#: ../hmib.php:723 ../hmib.php:1045 ../hmib.php:1551 ../hmib.php:1669 +#: ../hmib.php:727 ../hmib.php:1049 ../hmib.php:1556 ../hmib.php:1674 msgid "Status" msgstr "" -#: ../hmib.php:748 +#: ../hmib.php:752 msgid "No Running Software Found" msgstr "" -#: ../hmib.php:763 +#: ../hmib.php:767 msgid "Total CPU [h]:" msgstr "" -#: ../hmib.php:764 +#: ../hmib.php:768 msgid "Total Size [MB]:" msgstr "" -#: ../hmib.php:767 +#: ../hmib.php:771 msgid "Avg. CPU [h]:" msgstr "" -#: ../hmib.php:768 +#: ../hmib.php:772 msgid "Avg. Size [MB]:" msgstr "" -#: ../hmib.php:857 +#: ../hmib.php:861 msgid "Hardware Inventory" msgstr "" -#: ../hmib.php:1035 ../hmib.php:1589 ../hmib.php:1660 ../hmib.php:2117 +#: ../hmib.php:1039 ../hmib.php:1594 ../hmib.php:1665 ../hmib.php:2124 msgid "Devices" msgstr "" -#: ../hmib.php:1043 +#: ../hmib.php:1047 msgid "Hardware Description" msgstr "" -#: ../hmib.php:1044 +#: ../hmib.php:1048 msgid "Hardware Type" msgstr "" -#: ../hmib.php:1046 ../hmib.php:1350 +#: ../hmib.php:1050 ../hmib.php:1354 msgid "Errors" msgstr "" -#: ../hmib.php:1068 +#: ../hmib.php:1072 msgid "No Hardware Found" msgstr "" -#: ../hmib.php:1162 +#: ../hmib.php:1166 msgid "Storage Inventory" msgstr "" -#: ../hmib.php:1271 ../hmib.php:1340 +#: ../hmib.php:1275 ../hmib.php:1344 msgid "Volumes" msgstr "" -#: ../hmib.php:1348 +#: ../hmib.php:1352 msgid "Storage Description" msgstr "" -#: ../hmib.php:1349 +#: ../hmib.php:1353 msgid "Storage Type" msgstr "" -#: ../hmib.php:1351 +#: ../hmib.php:1355 msgid "Percent Used" msgstr "" -#: ../hmib.php:1352 +#: ../hmib.php:1356 msgid "Used (MB)" msgstr "" -#: ../hmib.php:1353 +#: ../hmib.php:1357 msgid "Total (MB)" msgstr "" -#: ../hmib.php:1354 +#: ../hmib.php:1358 msgid "Alloc (KB)" msgstr "" -#: ../hmib.php:1379 +#: ../hmib.php:1383 msgid "No Storage Devices Found" msgstr "" -#: ../hmib.php:1467 +#: ../hmib.php:1472 msgid "Device Filter" msgstr "" -#: ../hmib.php:1573 ../hmib.php:2362 +#: ../hmib.php:1578 ../hmib.php:2369 msgid "Recovering" msgstr "" -#: ../hmib.php:1576 ../hmib.php:2361 +#: ../hmib.php:1581 ../hmib.php:2368 msgid "Up" msgstr "" -#: ../hmib.php:1670 +#: ../hmib.php:1675 msgid "Uptime(d:h:m)" msgstr "" -#: ../hmib.php:1671 +#: ../hmib.php:1676 msgid "Users" msgstr "" -#: ../hmib.php:1672 +#: ../hmib.php:1677 msgid "CPU %" msgstr "" -#: ../hmib.php:1673 +#: ../hmib.php:1678 msgid "CPUs" msgstr "" -#: ../hmib.php:1675 +#: ../hmib.php:1680 msgid "Total Mem" msgstr "" -#: ../hmib.php:1676 +#: ../hmib.php:1681 msgid "Used Mem" msgstr "" -#: ../hmib.php:1677 +#: ../hmib.php:1682 msgid "Total Swap" msgstr "" -#: ../hmib.php:1678 +#: ../hmib.php:1683 msgid "Used Swap" msgstr "" -#: ../hmib.php:1724 ../hmib.php:2403 +#: ../hmib.php:1729 ../hmib.php:2410 msgid "View Storage" msgstr "" -#: ../hmib.php:1725 ../hmib.php:2404 +#: ../hmib.php:1730 ../hmib.php:2411 msgid "View Hardware" msgstr "" -#: ../hmib.php:1726 ../hmib.php:2405 ../hmib.php:2575 +#: ../hmib.php:1731 ../hmib.php:2412 ../hmib.php:2583 msgid "View Processes" msgstr "" -#: ../hmib.php:1727 ../hmib.php:2406 +#: ../hmib.php:1732 ../hmib.php:2413 msgid "View Software Inventory" msgstr "" -#: ../hmib.php:1729 ../hmib.php:2642 ../hmib.php:2644 ../hmib.php:2694 -#: ../hmib.php:2696 +#: ../hmib.php:1734 ../hmib.php:2651 ../hmib.php:2653 ../hmib.php:2703 +#: ../hmib.php:2705 msgid "View Graphs" msgstr "" -#: ../hmib.php:1731 +#: ../hmib.php:1736 msgid "No Graphs Defined" msgstr "" -#: ../hmib.php:1759 +#: ../hmib.php:1764 msgid "No Devices Found" msgstr "" -#: ../hmib.php:1892 +#: ../hmib.php:1897 msgid "Software Inventory" msgstr "" -#: ../hmib.php:2000 ../hmib.php:2070 +#: ../hmib.php:2007 ../hmib.php:2077 msgid "Applications" msgstr "" -#: ../hmib.php:2078 +#: ../hmib.php:2085 msgid "Package" msgstr "" -#: ../hmib.php:2080 +#: ../hmib.php:2087 msgid "Installed" msgstr "" -#: ../hmib.php:2101 +#: ../hmib.php:2108 msgid "No Software Packages Found" msgstr "" -#: ../hmib.php:2116 +#: ../hmib.php:2123 msgid "Summary" msgstr "" -#: ../hmib.php:2118 +#: ../hmib.php:2125 msgid "Storage" msgstr "" -#: ../hmib.php:2119 +#: ../hmib.php:2126 msgid "Hardware" msgstr "" -#: ../hmib.php:2121 +#: ../hmib.php:2128 msgid "Use History" msgstr "" -#: ../hmib.php:2122 +#: ../hmib.php:2129 msgid "Inventory" msgstr "" -#: ../hmib.php:2123 +#: ../hmib.php:2130 msgid "Graphs" msgstr "" -#: ../hmib.php:2282 +#: ../hmib.php:2289 msgid "Summary Filter" msgstr "" -#: ../hmib.php:2291 ../hmib.php:2478 +#: ../hmib.php:2298 ../hmib.php:2486 msgid "Top" msgstr "" -#: ../hmib.php:2295 ../hmib.php:2482 +#: ../hmib.php:2302 ../hmib.php:2490 msgid "All Records" msgstr "" -#: ../hmib.php:2296 ../hmib.php:2483 ../hmib.php:2484 ../hmib.php:2485 -#: ../hmib.php:2486 +#: ../hmib.php:2303 ../hmib.php:2491 ../hmib.php:2492 ../hmib.php:2493 +#: ../hmib.php:2494 #, php-format msgid "%d Records" msgstr "" -#: ../hmib.php:2297 ../hmib.php:2298 ../hmib.php:2299 +#: ../hmib.php:2304 ../hmib.php:2305 ../hmib.php:2306 #, php-format msgid "%d Record" msgstr "" -#: ../hmib.php:2309 ../hmib.php:2496 +#: ../hmib.php:2316 ../hmib.php:2504 msgid "" "WARNING: You need to import your Host MIB Host Template to view Graphs. See " "the README for more information." msgstr "" -#: ../hmib.php:2320 +#: ../hmib.php:2327 msgid "Device Type Summary Statistics" msgstr "" -#: ../hmib.php:2365 +#: ../hmib.php:2372 msgid "Logins" msgstr "" -#: ../hmib.php:2366 +#: ../hmib.php:2373 msgid "CPUS" msgstr "" -#: ../hmib.php:2367 ../hmib.php:2550 +#: ../hmib.php:2374 ../hmib.php:2558 msgid "Avg CPU" msgstr "" -#: ../hmib.php:2368 ../hmib.php:2551 +#: ../hmib.php:2375 ../hmib.php:2559 msgid "Max CPU" msgstr "" -#: ../hmib.php:2369 +#: ../hmib.php:2376 msgid "Avg Mem" msgstr "" -#: ../hmib.php:2370 +#: ../hmib.php:2377 msgid "Max Mem" msgstr "" -#: ../hmib.php:2371 +#: ../hmib.php:2378 msgid "Avg Swap" msgstr "" -#: ../hmib.php:2372 +#: ../hmib.php:2379 msgid "Max Swap" msgstr "" -#: ../hmib.php:2373 +#: ../hmib.php:2380 msgid "Avg Proc" msgstr "" -#: ../hmib.php:2374 +#: ../hmib.php:2381 msgid "Max Proc" msgstr "" -#: ../hmib.php:2402 ../hmib.php:2574 ../hmib.php:2599 +#: ../hmib.php:2409 ../hmib.php:2582 ../hmib.php:2608 msgid "View Devices" msgstr "" -#: ../hmib.php:2434 +#: ../hmib.php:2442 msgid "No Device Types" msgstr "" -#: ../hmib.php:2439 +#: ../hmib.php:2447 msgid "Process Summary Filter" msgstr "" -#: ../hmib.php:2507 +#: ../hmib.php:2515 msgid "Process Summary Statistics" msgstr "" -#: ../hmib.php:2546 +#: ../hmib.php:2554 msgid "Process Name" msgstr "" -#: ../hmib.php:2547 +#: ../hmib.php:2555 msgid "Num Paths" msgstr "" -#: ../hmib.php:2552 +#: ../hmib.php:2560 msgid "Avg Memory" msgstr "" -#: ../hmib.php:2553 +#: ../hmib.php:2561 msgid "Max Memory" msgstr "" -#: ../hmib.php:2589 +#: ../hmib.php:2598 msgid "No Processes" msgstr "" -#: ../hmib.php:2650 ../hmib.php:2702 +#: ../hmib.php:2659 ../hmib.php:2711 msgid "Please Select Data Query First from Console->Settings->Host Mib First" msgstr "" -#: ../hmib.php:2743 +#: ../hmib.php:2752 msgid "Graph Preview Filters" msgstr "" -#: ../hmib.php:2743 +#: ../hmib.php:2752 msgid "Custom Graph List Applied - Filtering from List" msgstr ""
    + @@ -2542,15 +2550,15 @@ function clearProc() { //echo $sql; $display_text = array( - 'nosort' => array('display' => __('Actions'), 'sort' => 'ASC', 'align' => 'left'), - 'name' => array('display' => __('Process Name'), 'sort' => 'ASC', 'align' => 'left'), - 'paths' => array('display' => __('Num Paths'), 'sort' => 'DESC', 'align' => 'right'), - 'numHosts' => array('display' => __('Hosts'), 'sort' => 'DESC', 'align' => 'right'), - 'numProcesses' => array('display' => __('Processes'), 'sort' => 'DESC', 'align' => 'right'), - 'avgCpu' => array('display' => __('Avg CPU'), 'sort' => 'DESC', 'align' => 'right'), - 'maxCpu' => array('display' => __('Max CPU'), 'sort' => 'DESC', 'align' => 'right'), - 'avgMemory' => array('display' => __('Avg Memory'), 'sort' => 'DESC', 'align' => 'right'), - 'maxMemory' => array('display' => __('Max Memory'), 'sort' => 'DESC', 'align' => 'right') + 'nosort' => array('display' => __('Actions'), 'sort' => 'ASC', 'align' => 'left'), + 'name' => array('display' => __('Process Name'), 'sort' => 'ASC', 'align' => 'left'), + 'paths' => array('display' => __('Num Paths'), 'sort' => 'DESC', 'align' => 'right'), + 'numHosts' => array('display' => __('Hosts'), 'sort' => 'DESC', 'align' => 'right'), + 'numProcesses' => array('display' => __('Processes'), 'sort' => 'DESC', 'align' => 'right'), + 'avgCpu' => array('display' => __('Avg CPU'), 'sort' => 'DESC', 'align' => 'right'), + 'maxCpu' => array('display' => __('Max CPU'), 'sort' => 'DESC', 'align' => 'right'), + 'avgMemory' => array('display' => __('Avg Memory'), 'sort' => 'DESC', 'align' => 'right'), + 'maxMemory' => array('display' => __('Max Memory'), 'sort' => 'DESC', 'align' => 'right') ); html_header_sort($display_text, $_SESSION['sess_hmib_proc_sort_column'], $_SESSION['sess_hmib_proc_sort_direction'], false, 'hmib.php?action=summary&area=processes'); @@ -2571,8 +2579,8 @@ function clearProc() { form_alternate_row(); echo ""; - echo ""; - echo ""; + echo ""; + echo ""; echo $graph_url; echo '" . $row['name'] . '" . number_format_i18n($row['avgMemory']/1024,2) . ' MB" . number_format_i18n($row['maxMemory']/1024,2) . ' MB
    ' . __('No Processes') . '
    ' . __('No Processes') . '