tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2013-04-01 Sancho Lerena <slerena@artica.es> 

* operation/agentes/sla_view.php,
	operation/agentes/ver_agente.php: Removed old "SLA view", now unused.

	* general/error_authconfig.php,
	general/error_dbconfig.php,	
	general/error_emptyconfig.php,
	general/error_install.php,
	general/error_noconfig.php,
	general/error_perms.php,
	general/login_page.php,
	general/logoff.php,
	include/styles/pandora.css,
	include/styles/pandora_black.css,
	include/styles/pandora_minimal.css: replaced PNG images for JPG version, much lighter.

	* images/header_f2.jpg,
	images/header_f2b.jpg,
	images/login_background.jpg: New JPG version of old PNG images.

	* images/header_f2.png,
	images/header_f2b.png,
	images/login_background.png: Removed PNG's.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7900 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
slerena 2013-04-01 01:16:59 +00:00
parent 3f37700928
commit dfb6f20bac
19 changed files with 39 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pandora_console/ChangeLog
View File

@ -1,3 +1,30 @@
2013-04-01 Sancho Lerena <slerena@artica.es>
* operation/agentes/sla_view.php,
operation/agentes/ver_agente.php: Removed old "SLA view", now unused.
* general/error_authconfig.php,
general/error_dbconfig.php,
general/error_emptyconfig.php,
general/error_install.php,
general/error_noconfig.php,
general/error_perms.php,
general/login_page.php,
general/logoff.php,
include/styles/pandora.css,
include/styles/pandora_black.css,
include/styles/pandora_minimal.css: replaced PNG images for JPG version, much lighter.
* images/header_f2.jpg,
images/header_f2b.jpg,
images/login_background.jpg: New JPG version of old PNG images.
* images/header_f2.png,
images/header_f2b.png,
images/login_background.png: Removed PNG's.
(merged from 4.0 branch)
2013-03-31 Junichi Satoh <junichi@rworks.jp>
* include/help/ja/help_network_map_enterprise.php: Updated help.

2
pandora_console/general/error_authconfig.php
View File

@ -34,7 +34,7 @@
<img src="images/login_background.png" id="login_body">
<img src="images/login_background.jpg" id="login_body">
<div class="databox_error" id="login">
<br>
<h1 id="log">Problem with Pandora FMS database</h1>

2
pandora_console/general/error_dbconfig.php
View File

@ -33,7 +33,7 @@
<body>
<img src="images/login_background.png" id="login_body">
<img src="images/login_background.jpg" id="login_body">
<div class="databox_logout" id="login">
<br>
<h1 id="log">Problem with Pandora FMS database</h1>

2
pandora_console/general/error_emptyconfig.php
View File

@ -32,7 +32,7 @@
</head>
<body>
<img src="images/login_background.png" id="login_body">
<img src="images/login_background.jpg" id="login_body">
<div class="databox_error" id="login">
<br>
<h1 id="log">Empty configuration table</h1>

2
pandora_console/general/error_install.php
View File

@ -32,7 +32,7 @@
</head>
<body>
<img src="images/login_background.png" id="login_body">
<img src="images/login_background.jpg" id="login_body">
<div class="databox_logout" id="login">
<br>
<h1 id="log">Installer active</h1>

2
pandora_console/general/error_noconfig.php
View File

@ -33,7 +33,7 @@
<body>
<img src="images/login_background.png" id="login_body">
<img src="images/login_background.jpg" id="login_body">
<div class="databox_logout" id="login">
<br>
<h1 id="log">No configuration file found</h1>

2
pandora_console/general/error_perms.php
View File

@ -32,7 +32,7 @@
</head>
<body>
<img src="images/login_background.png" id="login_body">
<img src="images/login_background.jpg" id="login_body">
<div class="databox_logout" id="login">
<br>
<h1 id="log">&nbsp;&nbsp;Bad permission for include/config.php</h1>

4
pandora_console/general/login_page.php
View File

@ -21,7 +21,7 @@ if (!empty ($page) && !empty ($sec)) {
$url .= '&amp;'.safe_url_extraclean($key).'='.safe_url_extraclean($value);
}
}
echo '<img src="' . ui_get_full_url('images/login_background.png') . '" id="login_body">';
echo '<img src="' . ui_get_full_url('images/login_background.jpg') . '" id="login_body">';
echo '<div class="databox_login" id="login">';
@ -246,4 +246,4 @@ ui_require_jquery_file('jquery-ui-1.10.0.custom');
$('#nick').focus();
/* ]]> */
</script>
</script>

2
pandora_console/general/logoff.php
View File

@ -18,7 +18,7 @@ ui_require_css_file ('jquery-ui-1.10.0.custom');
ui_require_jquery_file('jquery-ui-1.10.0.custom');
?>
<img src="images/login_background.png" id="login_body">
<img src="images/login_background.jpg" id="login_body">
<div class="databox_logout" id="login">
<br>
<h1 id="log"><?php echo __('Logged out'); ?></h1>

BIN
pandora_console/images/header_f2.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 26 KiB

BIN
pandora_console/images/header_f2.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 268 KiB

BIN
pandora_console/images/header_f2b.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 22 KiB

BIN
pandora_console/images/header_f2b.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 243 KiB

BIN
pandora_console/images/login_background.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 22 KiB

BIN
pandora_console/images/login_background.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 369 KiB

4
pandora_console/include/styles/pandora.css
View File

@ -1409,7 +1409,7 @@ div#head {
width: auto;
height: auto;
background-color: #000;
background-image: url(../../images/header_f2.png);
background-image: url(../../images/header_f2.jpg);
}
div#foot {
@ -1751,7 +1751,7 @@ span#plugin_description {
/*SIDEBAR*/
.menu_sidebar {
color:#000;
background:#cccacb url('../../images/login_background.png') right center no-repeat;
background:#cccacb url('../../images/login_background.jpg') right center no-repeat;
margin-left: 10px;
padding-left: 0px;

2
pandora_console/include/styles/pandora_black.css
View File

@ -44,7 +44,7 @@ h1#log {
div#head {
background: #1E1E1E;
background-image: url(../../images/header_f2b.png);
background-image: url(../../images/header_f2b.jpg);
}
div#container, div#page, div#main {

148
pandora_console/operation/agentes/sla_view.php
View File

@ -1,148 +0,0 @@
<?php
// Pandora FMS - http://pandorafms.com
// ==================================================
// Copyright (c) 2005-2010 Artica Soluciones Tecnologicas
// Please see http://pandorafms.org for full contribution list
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation for version 2.
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// Load global vars
global $config;
require_once ("include/functions_reporting.php");
require_once($config['homedir'] . "/include/functions_agents.php");
require_once($config['homedir'] . "/include/functions_modules.php");
check_login();
if (! check_acl ($config['id_user'], 0, "AR") && ! check_acl ($config['id_user'], 0, "AW")) {
db_pandora_audit("ACL Violation",
"Trying to access SLA View");
require ("general/noaccess.php");
exit;
}
$id_agent = get_parameter ("id_agente", 0);
$interval = agents_get_interval ($id_agent);
$modules = agents_get_modules ($id_agent, '*',
array ('disabled' => 0, 'history_data' => 1, 'delete_pending' => 0));
if (empty ($modules)) {
echo "<div class='nf'>".__("There are no modules to evaluate the S.L.A. from")."</div>";
return;
}
$offset = get_parameter ("offset", 0);
// Get all module from agent
ui_pagination (count ($modules), "index.php?sec=estado&sec2=operation/agentes/ver_agente&tab=sla&id_agente=".$id_agent);
$table->width = '95%';
$table->cellpadding = 4;
$table->cellspacing = 4;
$table->class = "databox";
$table->head = array ();
$table->head[0] = __('Type');
$table->head[1] = __('Module name');
$table->head[2] = __('S.L.A.');
$table->head[3] = __('Status');
$table->head[4] = __('Interval');
$table->align = array ();
$table->align[0] = "center";
$table->align[1] = "center";
$table->align[2] = "center";
$table->align[3] = "center";
$table->align[4] = "center";
$table->data = array ();
$loc = 0;
foreach ($modules as $module_id => $module) {
if ($loc < $offset) {
$loc++;
continue; //Skip offset
}
elseif ($loc >= $offset + $config["block_size"]) {
continue;
}
$data = array ();
$data[0] = ui_print_moduletype_icon ($module["id_tipo_modulo"], true);
$data[1] = ui_print_string_substr ($module["nombre"], 25, true);
if ($module["min_critical"] != 0) {
$sla_min = $module["min_critical"];
$data[2] = format_numeric (reporting_get_agentmodule_sla ($module_id, $config["sla_period"], $sla_min));
$data[2] = 100 - $data[2]. "%";
}
else {
$data[2] = format_numeric (reporting_get_agentmodule_sla ($module_id, $config["sla_period"], 1)).'%';
}
//TODO: Make this work for all new status
$status = modules_get_agentmodule_status ($module_id);
if ($status == 1) {
$data[3] = html_print_image ("images/pixel_red.png", true, array ("width" => 40, "height" => 18, "title" => __('Module Down')));
}
else {
$data[3] = html_print_image ("images/pixel_green.png", true, array ("width" => 40, "height" => 18, "title" => __('Module Up')));
}
if ($module["module_interval"] > 0) {
$data[4] = $module["module_interval"];
}
else {
$data[4] = $interval;
}
array_push ($table->data, $data);
$loc++;
}
html_print_table ($table);
unset ($table);
// Get all SLA report components
$sql = "SELECT id_agent_module, sla_max, sla_min, sla_limit
FROM treport_content_sla_combined
WHERE id_agent_module IN (".implode (",",array_keys ($modules)).")";
$result = db_get_all_rows_sql ($sql);
if ($result !== false) {
echo "<h4>".__('User-defined SLA items')." - ".human_time_description_raw ($config["sla_period"])."</h4>";
$table->width = '95%';
$table->cellpadding = 4;
$table->cellspacing = 4;
$table->class = "databox";
$table->head = array ();
$table->head[0] = __('Type');
$table->head[1] = __('Module name');
$table->head[2] = __('S.L.A.');
$table->head[3] = __('Status');
$table->data = array ();
foreach ($result as $sla_data) {
$data = array ();
$data[0] = ui_print_moduletype_icon ($modules[$sla_data["id_agent_module"]]["id_tipo_modulo"], true);
$data[1] = ui_print_string_substr ($modules[$sla_data["id_agent_module"]]["nombre"], 25, true);
$data[1] .= "(".$sla_data["sla_min"]." / ".$sla_data["sla_max"]." / ".$sla_data["sla_limit"].")";
$data[2] = format_numeric (reporting_get_agentmodule_sla ($sla_data["id_agent_module"], $config["sla_period"], 1)).'%';
$status = modules_get_agentmodule_status ($sla_data["id_agent_module"]);
if ($status == 1) {
$data[3] = html_print_image ("images/pixel_red.png", true, array ("width" => 40, "height" => 18, "title" => __('Module Down')));
}
else {
$data[3] = html_print_image ("images/pixel_green.png", true, array ("width" => 40, "height" => 18, "title" => __('Module Up')));
}
array_push ($table->data, $data);
}
html_print_table ($table);
unset ($table);
}
?>

18
pandora_console/operation/agentes/ver_agente.php
View File

@ -726,17 +726,6 @@ else
$alerttab['active'] = false;
/* SLA view */
$slatab['text']= '<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&tab=sla&id_agente='.$id_agente.'">'
. html_print_image("images/images.png", true, array("title" => __('S.L.A.')))
. '</a>';
if ($tab == 'sla') {
$slatab['active'] = true;
}
else {
$slatab['active'] = false;
}
/* Inventory */
$inventorytab = enterprise_hook ('inventory_tab');
@ -832,7 +821,6 @@ $onheader = array('manage' => $managetab,
'main' => $maintab,
'data' => $datatab,
'alert' => $alerttab,
'sla' => $slatab,
'inventory' => $inventorytab,
'collection' => $collectiontab,
'group' => $grouptab,
@ -914,9 +902,6 @@ switch($tab) {
case "alert":
$header_description = ' - ' . __('Alerts');
break;
case "sla":
$header_description = ' - ' . __('S.L.A.');
break;
case "inventory":
$header_description = ' - ' . __('Inventory');
break;
@ -955,9 +940,6 @@ switch ($tab) {
case "gis":
require ("gis_view.php");
break;
case "sla":
require ("sla_view.php");
break;
case "manage":
require ("estado_generalagente.php");
break;