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

Merge branch 'develop' into new_networkmap_feature

This commit is contained in:
Arturo Gonzalez 2016-10-17 11:36:30 +02:00
parent 3e50676e19 97428f0771
commit 13a19c42c2
149 changed files with 3729 additions and 984 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -4,4 +4,4 @@ services:
- docker
script:
- docker run --rm -t -v "$TRAVIS_BUILD_DIR:/tmp/pandorafms" pandorafms/pandorafms-base /tmp/pandorafms/tests/test.sh
- docker run --rm -h pandorafms -t -v "$TRAVIS_BUILD_DIR:/tmp/pandorafms" pandorafms/pandorafms-base /tmp/pandorafms/tests/test.sh

2
pandora_agents/unix/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-agent-unix
Version: 6.1dev-160921
Version: 6.1dev-161017
Architecture: all
Priority: optional
Section: admin

2
pandora_agents/unix/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
pandora_version="6.1dev-160921"
pandora_version="6.1dev-161017"
echo "Test if you has the tools for to make the packages."
whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null

2
pandora_agents/unix/pandora_agent
View File

@ -41,7 +41,7 @@ my $Sem = undef;
my $ThreadSem = undef;
use constant AGENT_VERSION => '6.1dev';
use constant AGENT_BUILD => '160921';
use constant AGENT_BUILD => '161017';
# Agent log default file size maximum and instances
use constant DEFAULT_MAX_LOG_SIZE => 600000;

2
pandora_agents/unix/pandora_agent.redhat.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_agent_unix
%define version 6.1dev
%define release 160921
%define release 161017
Summary: Pandora FMS Linux agent, PERL version
Name: %{name}

2
pandora_agents/unix/pandora_agent.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_agent_unix
%define version 6.1dev
%define release 160921
%define release 161017
Summary: Pandora FMS Linux agent, PERL version
Name: %{name}

2
pandora_agents/unix/pandora_agent_installer
View File

@ -10,7 +10,7 @@
# **********************************************************************
PI_VERSION="6.1dev"
PI_BUILD="160921"
PI_BUILD="161017"
OS_NAME=`uname -s`
FORCE=0

92
pandora_agents/unix/plugins/grep_log
View File

@ -19,9 +19,9 @@
# GNU General Public License for more details.
#
###############################################################################
use strict;
use File::Basename;
use Scalar::Util qw(looks_like_number);
# Output format (module or log_module).
my $Output = 'module';
@ -30,7 +30,7 @@ my $Output = 'module';
my $Verbose = 0;
# Index file storage directory, with a trailing '/'
my $Idx_dir='/tmp/';
my $Idx_dir=($^O =~ /win/i)?'C:\\':'/tmp/';
# Log file
my $Log_file = '';
@ -59,6 +59,44 @@ my $summary_flag = 0;
# Number of coincidences found
my $coincidences = 0;
########################################################################################
# Erase blank spaces before and after the string
########################################################################################
sub trim($){
my $string = shift;
if (empty ($string)){
return "";
}
$string =~ s/\r//g;
chomp ($string);
$string =~ s/^\s+//g;
$string =~ s/\s+$//g;
return $string;
}
########################################################################################
# Empty
########################################################################################
sub empty($){
my $str = shift;
if (! (defined ($str)) ){
return 1;
}
if(looks_like_number($str)){
return 0;
}
if ($str =~ /^\ *[\n\r]{0,2}\ *$/) {
return 1;
}
return 0;
}
###############################################################################
# SUB error_msg
# Print an error message and exit.
@ -188,7 +226,10 @@ sub parse_log (;$$) {
seek(LOGFILE, $Idx_pos, 0);
# Parse log file
my @data;
my %data;
# Matched line id
my $matched_line = 0;
if ( (defined($up_lines)) || (defined($bot_lines)) ){
# Detailed workmode
@ -210,8 +251,9 @@ sub parse_log (;$$) {
$flag = 1;
# Push upper lines
for (my $i = ($curr_line-$up_lines); $i<=$curr_line; $i++){
if ($i < 0) {next;}
if (defined ($lines[$i])) {
push (@data, $lines[$i]);
push (@{$data{$matched_line}}, $lines[$i]);
}
}
@ -220,16 +262,17 @@ sub parse_log (;$$) {
# Push bottom lines
for (my $i = ($curr_line+$flag); $i<=($curr_line+$bot_lines); $i++){
if (defined ($lines[$i])) {
push (@data, $lines[$i]);
push (@{$data{$matched_line}}, $lines[$i]);
}
}
}
$matched_line++;
}
}
else { # Standar workmode
while ($line = <LOGFILE>) {
if ($line =~ m/$Reg_exp/i) {
push @data, $line;
push (@{$data{$matched_line++}}, $line);
}
}
}
@ -240,7 +283,7 @@ sub parse_log (;$$) {
# Save the index file
save_idx();
return @data;
return \%data;
}
###############################################################################
@ -262,11 +305,12 @@ sub print_summary() {
# SUB parse_log
# Print log data to stdout.
###############################################################################
sub print_log (@) {
my @data = @_;
sub print_log ($) {
my $data = shift;
# No data
if ($#data < 0) {
my @kdata = keys (%{$data});
if ($#kdata < 0) {
print_summary() if ($summary_flag == 1);
return;
}
@ -276,8 +320,8 @@ sub print_log (@) {
my $output = "<log_module>\n";
$output .= "<source><![CDATA[" . $Module_name . "]]></source>\n";
$output .= "<data><![CDATA[";
foreach my $line (@data) {
$output .= $line;
foreach my $line (@kdata) {
$output .= $data->{$line};
}
$output .= "]]></data>";
$output .= "</log_module>\n";
@ -292,8 +336,12 @@ sub print_log (@) {
$output .= "<name><![CDATA[" . $Module_name . "]]></name>\n";
$output .= "<type><![CDATA[async_string]]></type>\n";
$output .= "<datalist>\n";
foreach my $line (@data) {
$output .= "<data><value><![CDATA[$line]]></value></data>\n";
foreach my $line (@kdata) {
$output .= "<data><value><![CDATA[";
foreach my $content (@{$data->{$line}}) {
$output .= $content;
}
$output .= "]]></value></data>\n";
}
$output .= "</datalist>\n";
$output .= "</module>\n";
@ -314,12 +362,12 @@ if ($#ARGV < 2) {
exit 1;
}
$Log_file = $ARGV[0];
$Module_name = $ARGV[1];
$Reg_exp = $ARGV[2];
my $up_lines = $ARGV[3];
my $bot_lines = $ARGV[4];
my $sum_flag = $ARGV[5];
$Log_file = trim($ARGV[0]);
$Module_name = trim($ARGV[1]);
$Reg_exp = trim($ARGV[2]);
my $up_lines = trim($ARGV[3]);
my $bot_lines = trim($ARGV[4]);
my $sum_flag = trim($ARGV[5]);
if ( ( defined($up_lines) && ($up_lines eq "--summary"))
|| ( defined($bot_lines) && ($bot_lines eq "--summary"))
@ -348,9 +396,9 @@ if (! -e $Idx_file) {
load_idx();
# Parse log file
my @data = parse_log($up_lines,$bot_lines);
my $data = parse_log($up_lines,$bot_lines);
# Print output to stdout
print_log (@data);
print_log ($data);
exit 0;

16
pandora_agents/unix/plugins/pandora_mem
View File

@ -7,10 +7,22 @@ use POSIX;
my $TOTAL=`vmstat -s | grep "total memory" | awk '{ print $1 } '`;
my $FREE=`vmstat -s | grep "free memory" | awk '{ print $1 } '`;
my $FREEP=($FREE/$TOTAL)*100;
my $FREEP;
eval {
$FREEP=($FREE/$TOTAL)*100;
};
if ($@) {
$FREEP = 0;
}
my $STOTAL=`vmstat -s | grep "total swap" | awk '{ print $1 } '`;
my $SUSED=`vmstat -s | grep "free swap" | awk '{ print $1 } '`;
my $SFREE=($SUSED/$STOTAL)*100;
my $SFREE;
eval {
$SFREE=($SUSED/$STOTAL)*100;
};
if ($@) {
$SFREE = 0;
}
$SFREE = floor($SFREE);
$FREEP = floor($FREEP);

BIN
pandora_agents/win32/bin/util/grep_log.exe Normal file
View File

Binary file not shown.

2
pandora_agents/win32/installer/pandora.mpi
View File

@ -186,7 +186,7 @@ UpgradeApplicationID
{}
Version
{160921}
{161017}
ViewReadme
{Yes}

2
pandora_agents/win32/pandora.cc
View File

@ -30,7 +30,7 @@ using namespace Pandora;
using namespace Pandora_Strutils;
#define PATH_SIZE _MAX_PATH+1
#define PANDORA_VERSION ("6.1dev(Build 160921)")
#define PANDORA_VERSION ("6.1dev(Build 161017)")
string pandora_path;
string pandora_dir;

2
pandora_agents/win32/versioninfo.rc
View File

@ -11,7 +11,7 @@ BEGIN
VALUE "LegalCopyright", "Artica ST"
VALUE "OriginalFilename", "PandoraAgent.exe"
VALUE "ProductName", "Pandora FMS Windows Agent"
VALUE "ProductVersion", "(6.1dev(Build 160921))"
VALUE "ProductVersion", "(6.1dev(Build 161017))"
VALUE "FileVersion", "1.0.0.0"
END
END

2
pandora_console/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-console
Version: 6.1dev-160921
Version: 6.1dev-161017
Architecture: all
Priority: optional
Section: admin

2
pandora_console/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
pandora_version="6.1dev-160921"
pandora_version="6.1dev-161017"
package_pear=0
package_pandora=1

1
pandora_console/Dockerfile
View File

@ -45,6 +45,7 @@ RUN yum install -y \
php-common \
php-zip \
nmap \
net-snmp-utils \
xprobe2
#Clone the repo

6
pandora_console/extensions/module_groups.php
View File

@ -181,7 +181,7 @@ function mainModuleGroups() {
$table = null;
$table->headstyle[] = "width: 20%";
foreach ($modelGroups as $i => $n) {
$table->headstyle[] = "width: 7%";
$table->headstyle[] = "min-width: 60px;max-width: 5%;text-align:center;";
$modelGroups[$i] = ui_print_truncate_text($n, GENERIC_SIZE_TEXT, true, true, true, '&hellip;', 'color:#FFF');
}
@ -278,9 +278,9 @@ function mainModuleGroups() {
array_push($row,
'<div
style="background: ' . $color . ';
height: 25px;
height: 20px;min-width: 60px;max-width:5%;overflow:hidden;
margin-left: auto; margin-right: auto;
text-align: center; padding-top: 0px; font-size: 18px;">
text-align: center; padding: 5px;padding-bottom:10px;font-size: 18px;">
' . $alinkStart . $count . $alinkEnd . '</div>');
}
array_push($tableData,$row);

4
pandora_console/extensions/plugin_registration.php
View File

@ -325,6 +325,10 @@ function pluginreg_extension_main () {
'unit' => io_safe_input ($unit),
'max_timeout' => isset($ini_array[$label]["max_timeout"]) ? $ini_array[$label]["max_timeout"] : '',
'history_data' => isset($ini_array[$label]["history_data"]) ? $ini_array[$label]["history_data"] : '',
'dynamic_interval' => isset($ini_array[$label]["dynamic_interval"]) ? $ini_array[$label]["dynamic_interval"] : '',
'dynamic_min' => isset($ini_array[$label]["dynamic_min"]) ? $ini_array[$label]["dynamic_min"] : '',
'dynamic_max' => isset($ini_array[$label]["dynamic_max"]) ? $ini_array[$label]["dynamic_max"] : '',
'dynamic_two_tailed' => isset($ini_array[$label]["dynamic_two_tailed"]) ? $ini_array[$label]["dynamic_two_tailed"] : '',
'min_warning' => isset($ini_array[$label]["min_warning"]) ? $ini_array[$label]["min_warning"] : '',
'max_warning' => isset($ini_array[$label]["max_warning"]) ? $ini_array[$label]["max_warning"] : '',
'str_warning' => isset($ini_array[$label]["str_warning"]) ? $ini_array[$label]["str_warning"] : '',

16
pandora_console/extensions/resource_registration.php
View File

@ -608,6 +608,10 @@ function process_upload_xml_component($xml) {
$max_timeout = (int)$componentElement->max_timeout;
$max_retries = (int)$componentElement->max_retries;
$historical_data = (int)$componentElement->historical_data;
$dynamic_interval = (int)$componentElement->dynamic_interval;
$dynamic_min = (int)$componentElement->dynamic_min;
$dynamic_max = (int)$componentElement->dynamic_max;
$dynamic_two_tailed = (int)$componentElement->dynamic_two_tailed;
$min_war = (float)$componentElement->min_war;
$max_war = (float)$componentElement->max_war;
$str_war = (string)$componentElement->str_war;
@ -680,6 +684,10 @@ function process_upload_xml_component($xml) {
'max_timeout' => $max_timeout,
'max_retries' => $max_retries,
'history_data' => $historical_data,
'dynamic_interval' => $dynamic_interval,
'dynamic_min' => $dynamic_min,
'dynamic_max' => $dynamic_max,
'dynamic_two_tailed' => $dynamic_two_tailed,
'min_warning' => $min_war,
'max_warning' => $max_war,
'str_warning' => $str_war,
@ -716,6 +724,10 @@ function process_upload_xml_component($xml) {
'max_timeout' => $max_timeout,
'max_retries' => $max_retries,
'history_data' => $historical_data,
'dynamic_interval' => $dynamic_interval,
'dynamic_min' => $dynamic_min,
'dynamic_max' => $dynamic_max,
'dynamic_two_tailed' => $dynamic_two_tailed,
'min_warning' => $min_war,
'max_warning' => $max_war,
'str_warning' => $str_war,
@ -754,6 +766,10 @@ function process_upload_xml_component($xml) {
'max_timeout' => $max_timeout,
'max_retries' => $max_retries,
'history_data' => $historical_data,
'dynamic_interval' => $dynamic_interval,
'dynamic_min' => $dynamic_min,
'dynamic_max' => $dynamic_max,
'dynamic_two_tailed' => $dynamic_two_tailed,
'min_warning' => $min_war,
'max_warning' => $max_war,
'str_warning' => $str_war,

15
pandora_console/extras/pandoradb_migrate_6.0_to_6.1.mysql.sql
View File

@ -68,3 +68,18 @@ ALTER TABLE tevent_filter ADD COLUMN `date_to` date DEFAULT NULL;
-- ---------------------------------------------------------------------
ALTER TABLE tusuario ADD (`id_filter` int(10) unsigned NULL default NULL);
ALTER TABLE tusuario ADD CONSTRAINT fk_id_filter FOREIGN KEY (id_filter) REFERENCES tevent_filter(id_filter) ON DELETE SET NULL;
-- ---------------------------------------------------------------------
-- Table `tagente_modulo`
-- ---------------------------------------------------------------------
ALTER TABLE tagente_modulo ADD COLUMN `dynamic_next` bigint(20) NOT NULL default '0';
ALTER TABLE tagente_modulo ADD COLUMN `dynamic_two_tailed` tinyint(1) unsigned default '0';
-- ---------------------------------------------------------------------
-- Table `tnetwork_component`
-- ---------------------------------------------------------------------
ALTER TABLE tnetwork_component ADD COLUMN `dynamic_interval` int(4) unsigned default '0';
ALTER TABLE tnetwork_component ADD COLUMN `dynamic_max` int(4) default '0';
ALTER TABLE tnetwork_component ADD COLUMN `dynamic_min` int(4) default '0';
ALTER TABLE tnetwork_component ADD COLUMN `dynamic_next` bigint(20) NOT NULL default '0';
ALTER TABLE tnetwork_component ADD COLUMN `dynamic_two_tailed` tinyint(1) unsigned default '0';

18
pandora_console/extras/pandoradb_migrate_6.0_to_6.1.oracle.sql
View File

@ -67,3 +67,21 @@ ALTER TABLE tevent_filter ADD COLUMN date_to date DEFAULT NULL;
-- ---------------------------------------------------------------------
ALTER TABLE tusuario ADD (id_filter int(10) unsigned NULL default NULL);
ALTER TABLE tusuario ADD CONSTRAINT fk_id_filter FOREIGN KEY (id_filter) REFERENCES tevent_filter(id_filter) ON DELETE SET NULL;
-- ---------------------------------------------------------------------
-- Table `tagente_modulo`
-- ---------------------------------------------------------------------
ALTER TABLE tagente_modulo ADD COLUMN dynamic_interval int(4) unsigned default '0';
ALTER TABLE tagente_modulo ADD COLUMN dynamic_max bigint(20) default '0';
ALTER TABLE tagente_modulo ADD COLUMN dynamic_min bigint(20) default '0';
ALTER TABLE tagente_modulo ADD COLUMN dynamic_next bigint(20) NOT NULL default '0';
ALTER TABLE tagente_modulo ADD COLUMN dynamic_two_tailed tinyint(1) unsigned default '0';
-- ---------------------------------------------------------------------
-- Table `tnetwork_component`
-- ---------------------------------------------------------------------
ALTER TABLE tnetwork_component ADD COLUMN dynamic_interval int(4) unsigned default '0';
ALTER TABLE tnetwork_component ADD COLUMN dynamic_max int(4) default '0';
ALTER TABLE tnetwork_component ADD COLUMN dynamic_min int(4) default '0';
ALTER TABLE tnetwork_component ADD COLUMN dynamic_next bigint(20) NOT NULL default '0';
ALTER TABLE tnetwork_component ADD COLUMN dynamic_two_tailed tinyint(1) unsigned default '0';

18
pandora_console/extras/pandoradb_migrate_6.0_to_6.1.postgreSQL.sql
View File

@ -4,3 +4,21 @@
ALTER TABLE tagente_estado RENAME COLUMN last_known_status TO known_status;
ALTER TABLE tagente_estado ADD COLUMN last_known_status NUMBER(10, 0) DEFAULT 0;
-- ---------------------------------------------------------------------
-- Table `tagente_modulo`
-- ---------------------------------------------------------------------
ALTER TABLE tagente_modulo ADD COLUMN dynamic_interval int(4) unsigned default 0;
ALTER TABLE tagente_modulo ADD COLUMN dynamic_max bigint(20) default 0;
ALTER TABLE tagente_modulo ADD COLUMN dynamic_min bigint(20) default 0;
ALTER TABLE tagente_modulo ADD COLUMN dynamic_next bigint(20) NOT NULL default 0;
ALTER TABLE tagente_modulo ADD COLUMN dynamic_two_tailed tinyint(1) unsigned default 0;
-- ---------------------------------------------------------------------
-- Table `tnetwork_component`
-- ---------------------------------------------------------------------
ALTER TABLE tnetwork_component ADD COLUMN dynamic_interval int(4) unsigned default 0;
ALTER TABLE tnetwork_component ADD COLUMN dynamic_max int(4) default 0;
ALTER TABLE tnetwork_component ADD COLUMN dynamic_min int(4) default 0;
ALTER TABLE tnetwork_component ADD COLUMN dynamic_next bigint(20) NOT NULL default 0;
ALTER TABLE tnetwork_component ADD COLUMN dynamic_two_tailed tinyint(1) unsigned default 0;

169
pandora_console/general/alert_enterprise.php
View File

@ -1,39 +1,178 @@
<?php
/* Hello there! :)
We added some of what seems to be "buggy" messages to the openSource version recently. This is not to force open-source users to move to the enterprise version, this is just to inform people using Pandora FMS open source that it requires skilled people to maintain and keep it running smoothly without professional support. This does not imply open-source version is limited in any way. If you check the recently added code, it contains only warnings and messages, no limitations except one: we removed the option to add custom logo in header. In the Update Manager section, it warns about the 'danger’ of applying automated updates without a proper backup, remembering in the process that the Enterprise version comes with a human-tested package. Maintaining an OpenSource version with more than 500 agents is not so easy, that's why someone using a Pandora with 8000 agents should consider asking for support. It's not a joke, we know of many setups with a huge number of agents, and we hate to hear that “its becoming unstable and slow” :(
You can of course remove the warnings, that's why we include the source and do not use any kind of trick. And that's why we added here this comment, to let you know this does not reflect any change in our opensource mentality of does the last 14 years.
*/
if(!enterprise_installed()){
$open=true;
}
$tipo = $_GET['message'];
echo "<div class='info_box' style='padding-top:20px;padding-bottom:20px;'><span style='padding:20px;'>";
echo "
<div class='modalheader'>
<span class='modalheadertext'>";
if(!enterprise_installed()){
echo "Community version";
}
else{
echo "Enterprise version";
}
echo "</span>
<img class='modalclosex cerrar' src='".$config['homeurl']."images/icono_cerrar.png'>
</div>
<div class='modalcontent'>
<img class='modalcontentimg' src='".$config['homeurl']."images/";
switch ($tipo) {
case "module":
echo __("The community version have not the ability to define your own library of local modules, or distribute it to remote agents. You need to do that changes individually on each agent, but it's possible by using external tools and space time and effort. Nor can distribute local plugins, and nor does it have access to the library of plugins enterprise to monitor applications such as Informix, Oracle, DB2, SQL Server, Exchange, WebSphere, Oracle Exadata, F5, JBoss, HyperV, VMWare, RHEV, to name a few. With the Enterprise version will have all this, and the ability to distribute and manage their own local modules to your systems, individually or through policies.");
case "infomodal":
echo "icono_info.png";
break;
case "massive":
echo __("You want to manage your monitoring homogeneously? Do you have many systems and is difficult to manage in a comprehensive manner? Would you like to deploy monitoring, alerts and even local plugins with a single click? Pandora FMS Enterprise Policies are exactly what you need, you'll save time, effort and dislikes. More information (link to pandorafms.com)");
case "modulemodal":
echo "icono_popup.png";
break;
case "massivemodal":
echo "icono_popup.png";
break;
case "events":
echo __("Pandora FMS Enterprise has event correlation. Through correlation you can generate alerts and / or new events based on logical rules on your realtime events. This allows you to automate the troubleshooting. If you know the value of working with events, the correlation will take you to a new level.");
case "eventsmodal":
echo "icono_popup.png";
break;
case "reporting":
echo __("The reports of the Enterprise version are more powerful: it has wizards, you can schedule sending via email in PDF, and it has a template system to create reports quickly for each of your customers. It will even allow your customers generate their own reports from templates created by you. If reports are key to your business, Pandora FMS Enterprise version can be very useful for you.");
case "reportingmodal":
echo "icono_popup.png";
break;
case "visualmodal":
echo "icono_popup.png";
break;
case "updatemodal":
echo "icono_info.png";
break;
case "agentsmodal":
echo "icono_info.png";
break;
case "monitorcheckmodal":
echo "icono_info.png";
break;
case "remotemodulesmodal":
echo "icono_info.png";
break;
case "monitoreventsmodal":
echo "icono_info.png";
break;
case "alertagentmodal":
echo "icono_info.png";
break;
default:
break;
}
echo "</span></div>";
echo "'>
<div class='modalcontenttext'>";
echo "<button id='cerrar' onclick='ocultar();'>OK</button>";
switch ($tipo) {
case "infomodal":
if($open){
echo
'<p>' .
__('The Update Manager client is included on Pandora FMS. It helps system administrators update their Pandora FMS automatically, since the Update Manager retrieves new modules, new plugins and new features (even full migrations tools for future versions) automatically.') .
'</p>' .
'<p>' .
__('<b>OpenSource version updates are automated packages generated each week. These updates come WITHOUT ANY warranty or support. If your system is corrupted or a feature stops working properly, you will need to recover a backup by yourself.</b>') .
'</p>' .
'<p>' .
__('The Enterprise version comes with a different update system, with fully tested, professionally-supported packages, and our support team is there to help you in case of problems or queries. Update Manager is another feature present in the Enterprise version and not included in the OpenSource version. There are lots of advanced business-oriented features contained in Pandora FMS Enterprise Edition. For more information visit <a href="http://pandorafms.com">pandorafms.com</a>') .
'</p>'
;
}else{
echo
'<p>' .
__('The new <a href="http://updatemanager.sourceforge.net">Update Manager</a> client is shipped with Pandora FMS It helps system administrators to update their Pandora FMS automatically, since the Update Manager does the task of getting new modules, new plugins and new features (even full migrations tools for future versions) automatically.') .
'</p>' .
'<p>' .
__('Update Manager is one of the most advanced features of Pandora FMS Enterprise version, for more information visit <a href="http://pandorafms.com">http://pandorafms.com</a>.') .
'</p>' .
'<p>' .
__('Update Manager sends anonymous information about Pandora FMS usage (number of agents and modules running). To disable it, please remove the remote server address from the Update Manager plugin setup.') .
'</p>'
;
}
break;
case "modulemodal":
echo __("The community version doesn't have the ability to define your own library of local modules, or distribute it to remote agents. You need to make those changes individually on each agent which is possible by using external tools and time and effort. Nor can it distribute local plugins, or have access to the library of enterprise plugins to monitor applications such as VMWare, RHEV or Informix between others. The Enterprise version will have all this, plus the ability to distribute and manage your own local modules on your systems, individually or through policies.
<br><br><img style='width:105px' src='".$config['homeurl']."images/logo_oracle.png'><img style='width:105px' src='".$config['homeurl']."images/logo_citrix.png'><img style='width:105px' src='".$config['homeurl']."images/logo_sap.png'><img style='width:105px' src='".$config['homeurl']."images/logo_exchange.png'><br><br><span style='font-style:italic;'>* Todos los logotipos pertenecen a marcas registradas</span>");
break;
case "massivemodal":
echo __("Do you want to consolidate all your system monitoring? Do you have many systems, making it difficult to manage them in a comprehensive manner? Would you like to deploy monitoring, alerts and even local plugins with a single click? Pandora FMS Enterprise Policies are exactly what you need; you'll save time, effort and annoyances. More information <a href='pandorafms.com'>pandorafms.com</a>");
break;
case "eventsmodal":
echo __("Pandora FMS Enterprise also features event correlation. Through correlation you can generate realtime alerts and / or new events based on logical rules. This allows you to automate troubleshooting. If you know the value of working with events, event correlation will take you to a new level.");
break;
case "reportingmodal":
echo __("Report generating on the Enterprise version is also more powerful: it has wizards, you can schedule emails in PDF to be sent according to the schedule you decide, and it has a template system to create personalized reports quickly for each of your customers. It will even allow your customers to generate their own reports from templates created by you. If reports are key to your business, Pandora FMS Enterprise version is for you.");
break;
case "visualmodal":
echo __("These options are only effective on the Enterprise version.");
break;
case "updatemodal":
echo __("WARNING: You are just one click away from an automated update. This may result in a damaged system, including loss of data and operativity. Check you have a recent backup. OpenSource updates are automatically created packages, and there is no WARRANTY or SUPPORT. If you need professional support and warranty, please upgrade to Enterprise Version.");
break;
case "agentsmodal":
echo __("This system is heavily loaded. OpenSource version could get a lot more agents but fine tuning requires knowledge and time. Checkout the Enterprise Version for a professional supported system.");
break;
case "monitorcheckmodal":
echo __("This system has too many modules per agent. OpenSource version could manage thousands of modules, but is not recommended to have more than 40 modules per agent. This configuration has B/A modules per agent. Checkout the Enterprise Version for a professional supported system.");
break;
case "remotemodulesmodal":
echo __("Too much remote modules has been detected on this system. OpenSource version could manage thousands of modules, but performance is limited on high amount of SNMP or ICMP request. Checkout the Enterprise Version for a professional supported system with improved capacity on network monitoring, including distributed servers.");
break;
case "monitoreventsmodal":
echo __("This system has too much events in the database. Checkout database purge options. Checkout the Enterprise Version for a professional supported system.");
break;
case "alertagentmodal":
echo __("You have defined a high number of alerts, this may cause you performance problems in the future. In the Enterprise version, you can use event correlation alerts to simplify the alerting system and have easier administration and increased performance.");
break;
default:
break;
}
echo "
</div>
<div style='float:right;width:100%;height:30px;'>
</div>
<div class='modalokbutton cerrar'>
<span class='modalokbuttontext'>OK</span>
</div>
<div class='modalgobutton gopandora'>
<span class='modalokbuttontext'>About Enterprise</span>
</div>
";
?>
<script>
function ocultar(){
$("#alert_messages" ).dialog('close');
$(".cerrar").click(function(){
$("#alert_messages").hide();
$( "#opacidad" ).remove();
});
}
$(".gopandora").click(function(){
window.open('https://pandorafms.com/es/software-de-monitorizacion-pandorafms/','_blank');
});
</script>

24
pandora_console/general/header.php
View File

@ -64,7 +64,7 @@ config_check();
$table->style[8] =
$table->style[9] =
$table->style['qr'] =
'width: 22px; text-align:center; height: 22px; padding-right: 9px;';
'width: 22px; text-align:center; height: 22px; padding-right: 9px;padding-left: 9px;';
$table->style[7] = 'width: 20px; padding-right: 9px;';
$table->style['searchbar'] = 'width: 180px; min-width: 180px;';
$table->style[11] = 'padding-left: 10px; padding-right: 5px;width: 16px;';
@ -125,7 +125,7 @@ config_check();
$servers_link_open = '<a class="white" href="index.php?sec=gservers&amp;sec2=godmode/servers/modificar_server&amp;refr=60">';
$servers_link_close = '</a>';
$show_qr_code_header = 'display: none;';
$show_qr_code_header = 'display: inline;';
if (isset($config['show_qr_code_header']))
if ($config['show_qr_code_header'])
$show_qr_code_header = '';
@ -134,7 +134,7 @@ config_check();
'<div style="' . $show_qr_code_header . '" id="qr_code_container" style="">' .
'<a href="javascript: show_dialog_qrcode();">' .
html_print_image(
"images/qrcode_icon.jpg",
"images/qrcode_icon.png",
true,
array("alt" => __('QR Code of the page'),
'title' => __('QR Code of the page'))) .
@ -188,7 +188,7 @@ config_check();
$_GET['refr'] = null;
}
if (array_search($_GET['sec2'], $config['autorefresh_white_list']) !== false) {
if ($config['autorefresh_white_list'] !== null && array_search($_GET['sec2'], $config['autorefresh_white_list']) !== false) {
$autorefresh_img = html_print_image("images/header_refresh.png", true, array("class" => 'bot', "alt" => 'lightning', 'title' => __('Configure autorefresh')));
if ($_GET['refr']) {
@ -369,11 +369,19 @@ config_check();
$("#agent_access").css("display","");
});
function blinkmail(){
$("#yougotmail").delay(100).fadeTo(300,0.2).delay(100).fadeTo(300,1, blinkmail);
}
function blinkalert(){
$("#yougotalert").delay(100).fadeTo(300,0.2).delay(100).fadeTo(300,1, blinkalert);
}
function blinkpubli(){
$(".publienterprise").delay(100).fadeTo(300,0.2).delay(100).fadeTo(300,1, blinkpubli);
}
<?php
if ($msg_cnt > 0) {
?>
$("#yougotmail").pulsate ();
blinkmail();
<?php
}
?>
@ -382,11 +390,11 @@ config_check();
<?php
if ($config["alert_cnt"] > 0) {
?>
$("#yougotalert").pulsate ();
blinkalert();
<?php
}
?>
$("#publienterprise").pulsate ();
blinkpubli();
<?php
if ($_GET["refr"]) {

25
pandora_console/general/login_page.php
View File

@ -89,14 +89,29 @@ echo '<div id="login_in">';
echo '<a href="' . $logo_link . '">';
if (defined ('METACONSOLE')) {
html_print_image ("images/logo_login.png", false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true);
}
if (!isset ($config["custom_logo_login"])){
html_print_image ("images/custom_logo_login/login_logo.png", false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true);
}
else{
html_print_image ("images/custom_logo_login/".$config['custom_logo_login'], false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true);
}
}
else if (defined ('PANDORA_ENTERPRISE')) {
html_print_image ("images/logo_login.png", false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true);
if (!isset ($config["custom_logo_login"])){
html_print_image ("images/custom_logo_login/login_logo.png", false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true);
}
else{
html_print_image ("images/custom_logo_login/".$config['custom_logo_login'], false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true);
}
}
else {
html_print_image ("images/logo_login.png", false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true);
echo "<br><span style='font-size:120%;color:white;top:10px;position:relative;'>Community edition</span>";
if (!isset ($config["custom_logo_login"])){
html_print_image ("images/custom_logo_login/login_logo.png", false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true);
}
else{
html_print_image ("images/custom_logo_login/".$config['custom_logo_login'], false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true);
}
echo "<br><span style='font-size:120%;color:white;top:10px;position:relative;'>Community edition</span>";
}
echo '</a>';

4
pandora_console/godmode/agentes/agent_template.php
View File

@ -85,6 +85,10 @@ if (isset ($_POST["template_id"])) {
'max_retries' => $row2["max_retries"],
'id_plugin' => $row2['id_plugin'],
'post_process' => $row2['post_process'],
'dynamic_interval' => $row2['dynamic_interval'],
'dynamic_max' => $row2['dynamic_max'],
'dynamic_min' => $row2['dynamic_min'],
'dynamic_two_tailed' => $row2['dynamic_two_tailed'],
'min_warning' => $row2['min_warning'],
'max_warning' => $row2['max_warning'],
'str_warning' => $row2['str_warning'],

12
pandora_console/godmode/agentes/configurar_agente.php
View File

@ -975,6 +975,10 @@ if ($update_module || $create_module) {
$ip_target = (string) get_parameter ('ip_target');
$custom_id = (string) get_parameter ('custom_id');
$history_data = (int) get_parameter('history_data');
$dynamic_interval = (int) get_parameter('dynamic_interval');
$dynamic_max = (int) get_parameter('dynamic_max');
$dynamic_min = (int) get_parameter('dynamic_min');
$dynamic_two_tailed = (int) get_parameter('dynamic_two_tailed');
$min_warning = (float) get_parameter ('min_warning');
$max_warning = (float) get_parameter ('max_warning');
$str_warning = (string) get_parameter ('str_warning');
@ -1069,6 +1073,10 @@ if ($update_module) {
'max_retries' => $max_retries,
'custom_id' => $custom_id,
'history_data' => $history_data,
'dynamic_interval' => $dynamic_interval,
'dynamic_max' => $dynamic_max,
'dynamic_min' => $dynamic_min,
'dynamic_two_tailed' => $dynamic_two_tailed,
'min_warning' => $min_warning,
'max_warning' => $max_warning,
'str_warning' => $str_warning,
@ -1212,6 +1220,10 @@ if ($create_module) {
'id_modulo' => $id_module,
'custom_id' => $custom_id,
'history_data' => $history_data,
'dynamic_interval' => $dynamic_interval,
'dynamic_max' => $dynamic_max,
'dynamic_min' => $dynamic_min,
'dynamic_two_tailed' => $dynamic_two_tailed,
'min_warning' => $min_warning,
'max_warning' => $max_warning,
'str_warning' => $str_warning,

8
pandora_console/godmode/agentes/module_manager_editor.php
View File

@ -198,6 +198,10 @@ if ($id_agent_module) {
$max_retries = $module['max_retries'];
$custom_id = $module['custom_id'];
$history_data = $module['history_data'];
$dynamic_interval = $module['dynamic_interval'];
$dynamic_max = $module['dynamic_max'];
$dynamic_min = $module['dynamic_min'];
$dynamic_two_tailed = $module['dynamic_two_tailed'];
$min_warning = $module['min_warning'];
$max_warning = $module['max_warning'];
$str_warning = $module['str_warning'];
@ -280,6 +284,10 @@ else {
$plugin_parameter = '';
$custom_id = '';
$history_data = 1;
$dynamic_interval = 0;
$dynamic_min = 0;
$dynamic_max = 0;
$dynamic_two_tailed = 0;
$min_warning = 0;
$max_warning = 0;
$str_warning = '';

107
pandora_console/godmode/agentes/module_manager_editor_common.php
View File

@ -228,70 +228,78 @@ $table_simple->data[1][3] = html_print_select_from_sql ('SELECT id_mg, name FROM
if($disabledBecauseInPolicy){
$table_simple->data[1][3] .= html_print_input_hidden ('id_module_group', $id_module_group, true);
}
$table_simple->data[2][0] = __('Dynamic Interval') .' ' . ui_print_help_icon ('warning_status', true);
html_debug_print($dynamic_interval);
$table_simple->data[2][1] = html_print_extended_select_for_time ('dynamic_interval', $dynamic_interval, '', 'None', '0', 10, true, 'width:150px',false);
$table_simple->data[2][2] = '<span><em>'.__('Dynamic Min. ').'</em>';
$table_simple->data[2][2] .= html_print_input_text ('dynamic_min', $dynamic_min, '', 10, 255, true);
$table_simple->data[2][2] .= '<br /><em>'.__('Dynamic Max.').'</em>';
$table_simple->data[2][2] .= html_print_input_text ('dynamic_max', $dynamic_max, '', 10, 255, true);
$table_simple->data[2][3] = '<span><em>'.__('Dynamic Two Tailed: ').'</em>';
$table_simple->data[2][3] .= html_print_checkbox ("dynamic_two_tailed", 1, $dynamic_two_tailed, true);
$table_simple->data[3][0] = __('Warning status').' ' . ui_print_help_icon ('warning_status', true);
$table_simple->data[2][0] = __('Warning status').' ' . ui_print_help_icon ('warning_status', true);
$table_simple->data[2][1] = '';
$table_simple->data[3][1] = '';
if (!modules_is_string_type($id_module_type) || $edit) {
$table_simple->data[2][1] .= '<span id="minmax_warning"><em>'.__('Min. ').'</em>';
$table_simple->data[2][1] .= html_print_input_text ('min_warning', $min_warning,
$table_simple->data[3][1] .= '<span id="minmax_warning"><em>'.__('Min. ').'</em>';
$table_simple->data[3][1] .= html_print_input_text ('min_warning', $min_warning,
'', 10, 255, true, $disabledBecauseInPolicy);
$table_simple->data[2][1] .= '<br /><em>'.__('Max.').'</em>';
$table_simple->data[2][1] .= html_print_input_text ('max_warning', $max_warning,
$table_simple->data[3][1] .= '<br /><em>'.__('Max.').'</em>';
$table_simple->data[3][1] .= html_print_input_text ('max_warning', $max_warning,
'', 10, 255, true, $disabledBecauseInPolicy).'</span>';
}
if (modules_is_string_type($id_module_type) || $edit) {
$table_simple->data[2][1] .= '<span id="string_warning"><em>'.__('Str.').'</em>';
$table_simple->data[2][1] .= html_print_input_text ('str_warning', $str_warning,
$table_simple->data[3][1] .= '<span id="string_warning"><em>'.__('Str.').'</em>';
$table_simple->data[3][1] .= html_print_input_text ('str_warning', $str_warning,
'', 10, 255, true, $disabledBecauseInPolicy).'</span>';
}
$table_simple->data[2][1] .= '<br /><em>'.__('Inverse interval').'</em>';
$table_simple->data[2][1] .= html_print_checkbox ("warning_inverse", 1,
$table_simple->data[3][1] .= '<br /><em>'.__('Inverse interval').'</em>';
$table_simple->data[3][1] .= html_print_checkbox ("warning_inverse", 1,
$warning_inverse, true);
$table_simple->data[2][2] = __('Critical status').' ' . ui_print_help_icon ('critical_status', true);
$table_simple->data[2][3] = '';
$table_simple->data[3][2] = __('Critical status').' ' . ui_print_help_icon ('critical_status', true);
$table_simple->data[3][3] = '';
if (!modules_is_string_type($id_module_type) || $edit) {
$table_simple->data[2][3] .= '<span id="minmax_critical"><em>'.__('Min. ').'</em>';
$table_simple->data[2][3] .= html_print_input_text ('min_critical', $min_critical,
$table_simple->data[3][3] .= '<span id="minmax_critical"><em>'.__('Min. ').'</em>';
$table_simple->data[3][3] .= html_print_input_text ('min_critical', $min_critical,
'', 10, 255, true, $disabledBecauseInPolicy);
$table_simple->data[2][3] .= '<br /><em>'.__('Max.').'</em>';
$table_simple->data[2][3] .= html_print_input_text ('max_critical', $max_critical,
$table_simple->data[3][3] .= '<br /><em>'.__('Max.').'</em>';
$table_simple->data[3][3] .= html_print_input_text ('max_critical', $max_critical,
'', 10, 255, true, $disabledBecauseInPolicy).'</span>';
}
if (modules_is_string_type($id_module_type) || $edit) {
$table_simple->data[2][3] .= '<span id="string_critical"><em>'.__('Str.').'</em>';
$table_simple->data[2][3] .= html_print_input_text ('str_critical', $str_critical,
$table_simple->data[3][3] .= '<span id="string_critical"><em>'.__('Str.').'</em>';
$table_simple->data[3][3] .= html_print_input_text ('str_critical', $str_critical,
'', 10, 255, true, $disabledBecauseInPolicy).'</span>';
}
$table_simple->data[2][3] .= '<br /><em>'.__('Inverse interval').'</em>';
$table_simple->data[2][3] .= html_print_checkbox ("critical_inverse", 1, $critical_inverse, true);
$table_simple->data[3][3] .= '<br /><em>'.__('Inverse interval').'</em>';
$table_simple->data[3][3] .= html_print_checkbox ("critical_inverse", 1, $critical_inverse, true);
/* FF stands for Flip-flop */
$table_simple->data[3][0] = __('FF threshold').' ' . ui_print_help_icon ('ff_threshold', true);
$table_simple->colspan[3][1] = 3;
$table_simple->data[4][0] = __('FF threshold').' ' . ui_print_help_icon ('ff_threshold', true);
$table_simple->colspan[4][1] = 3;
$table_simple->data[3][1] = html_print_radio_button ('each_ff', 0, '', $each_ff, true) . ' ' . __('All state changing') . ' : ';
$table_simple->data[3][1] .= html_print_input_text ('ff_event', $ff_event, '', 5
$table_simple->data[4][1] = html_print_radio_button ('each_ff', 0, '', $each_ff, true) . ' ' . __('All state changing') . ' : ';
$table_simple->data[4][1] .= html_print_input_text ('ff_event', $ff_event, '', 5
, 15, true, $disabledBecauseInPolicy) . '<br />';
$table_simple->data[3][1] .= html_print_radio_button ('each_ff', 1, '', $each_ff, true) . ' ' . __('Each state changing') . ' : ';
$table_simple->data[3][1] .= __('To normal');
$table_simple->data[3][1] .= html_print_input_text ('ff_event_normal', $ff_event_normal, '', 5, 15, true, $disabledBecauseInPolicy) . ' ';
$table_simple->data[3][1] .= __('To warning');
$table_simple->data[3][1] .= html_print_input_text ('ff_event_warning', $ff_event_warning, '', 5, 15, true, $disabledBecauseInPolicy) . ' ';
$table_simple->data[3][1] .= __('To critical');
$table_simple->data[3][1] .= html_print_input_text ('ff_event_critical', $ff_event_critical, '', 5, 15, true, $disabledBecauseInPolicy);
$table_simple->data[4][0] = __('Historical data');
$table_simple->data[4][1] .= html_print_radio_button ('each_ff', 1, '', $each_ff, true) . ' ' . __('Each state changing') . ' : ';
$table_simple->data[4][1] .= __('To normal');
$table_simple->data[4][1] .= html_print_input_text ('ff_event_normal', $ff_event_normal, '', 5, 15, true, $disabledBecauseInPolicy) . ' ';
$table_simple->data[4][1] .= __('To warning');
$table_simple->data[4][1] .= html_print_input_text ('ff_event_warning', $ff_event_warning, '', 5, 15, true, $disabledBecauseInPolicy) . ' ';
$table_simple->data[4][1] .= __('To critical');
$table_simple->data[4][1] .= html_print_input_text ('ff_event_critical', $ff_event_critical, '', 5, 15, true, $disabledBecauseInPolicy);
$table_simple->data[5][0] = __('Historical data');
if($disabledBecauseInPolicy) {
// If is disabled, we send a hidden in his place and print a false checkbox because HTML dont send disabled fields and could be disabled by error
$table_simple->data[4][1] = html_print_checkbox ("history_data_fake", 1, $history_data, true, $disabledBecauseInPolicy);
$table_simple->data[4][1] .= '<input type="hidden" name="history_data" value="'.(int)$history_data.'">';
$table_simple->data[5][1] = html_print_checkbox ("history_data_fake", 1, $history_data, true, $disabledBecauseInPolicy);
$table_simple->data[5][1] .= '<input type="hidden" name="history_data" value="'.(int)$history_data.'">';
}
else {
$table_simple->data[4][1] = html_print_checkbox ("history_data", 1, $history_data, true, $disabledBecauseInPolicy);
$table_simple->data[5][1] = html_print_checkbox ("history_data", 1, $history_data, true, $disabledBecauseInPolicy);
}
/* Advanced form part */
@ -799,9 +807,36 @@ $(document).ready (function () {
$("#submit-crtbutton").click (function () {
validate_post_process();
});
//Dynamic_interval;
disabled_status();
$('#dynamic_interval_select').change (function() {
disabled_status();
});
});
function disabled_status () {
if($('#dynamic_interval_select').val() != 0){
$('#text-min_warning').prop('readonly', true);
$('#text-min_warning').addClass('readonly');
$('#text-max_warning').prop('readonly', true);
$('#text-max_warning').addClass('readonly');
$('#text-min_critical').prop('readonly', true);
$('#text-min_critical').addClass('readonly');
$('#text-max_critical').prop('readonly', true);
$('#text-max_critical').addClass('readonly');
} else {
$('#text-min_warning').prop('readonly', false);
$('#text-min_warning').removeClass('readonly');
$('#text-max_warning').prop('readonly', false);
$('#text-max_warning').removeClass('readonly');
$('#text-min_critical').prop('readonly', false);
$('#text-min_critical').removeClass('readonly');
$('#text-max_critical').prop('readonly', false);
$('#text-max_critical').removeClass('readonly');
}
}
// Add a new module macro
function add_macro () {
var macro_count = parseInt($("#hidden-module_macro_count").val());

41
pandora_console/godmode/agentes/planned_downtime.editor.php
View File

@ -47,6 +47,10 @@ ui_print_page_header(
true,
$buttons);
//recursion group filter
$recursion = get_parameter('recursion', $_POST['recursion']);
//Initialize data
$id_group = (int) get_parameter ('id_group');
$name = (string) get_parameter ('name');
@ -628,7 +632,7 @@ echo '</form>';
if ($id_downtime > 0) {
echo "<td valign=top>";
echo "<td valign=top style='width:300px;padding-left:20px;'>";
// Show available agents to include into downtime
echo '<h4>' . __('Available agents') . ':</h4>';
@ -643,8 +647,31 @@ if ($id_downtime > 0) {
}
$filter_cond = '';
if ($filter_group > 0)
$filter_cond = " AND id_grupo = $filter_group ";
if ($filter_group > 0){
if($recursion){
$rg = groups_get_id_recursive($filter_group, true);
$filter_cond .= " AND id_grupo IN (";
$i = 0;
$len = count($rg);
foreach ($rg as $key) {
if ($i == $len - 1) {
$filter_cond .= $key.")";
}else{
$i++;
$filter_cond .= $key.",";
}
}
}
else{
$filter_cond = " AND id_grupo = $filter_group ";
}
}
$sql = sprintf("SELECT tagente.id_agente, tagente.nombre
FROM tagente
WHERE tagente.id_agente NOT IN (
@ -671,17 +698,19 @@ if ($id_downtime > 0) {
$disabled_add_button = true;
}
echo "<form method=post action='index.php?sec=estado&sec2=godmode/agentes/planned_downtime.editor&id_downtime=$id_downtime'>";
html_print_select_groups(false, $access, true, 'filter_group', $filter_group, '', '', '', false, false, true, '', false, 'min-width:180px;width:180px;max-width:180px;margin-right:15px;');
html_print_select_groups(false, $access, true, 'filter_group', $filter_group, '', '', '', false, false, true, '', false, 'width:180px');
html_print_checkbox ("recursion", !$_POST['recursion'], $_POST['recursion'], false, false, '');
echo __('Recursion') . '&nbsp;';
echo "<br /><br />";
html_print_submit_button (__('Filter by group'), '', false, 'class="sub next"',false);
echo "</form>";
echo "<form method=post action='index.php?sec=estado&sec2=godmode/agentes/planned_downtime.editor&insert_downtime_agent=1&id_downtime=$id_downtime'>";
echo html_print_select ($agents, "id_agents[]", '', '', '', 0, false, true, true, '', false, 'width: 180px;');
echo html_print_select ($agents, "id_agents[]", -1, '', _("Any"), -2, false, true, true, '', false, 'width: 180px;');
echo '<h4>' . __('Available modules:') .
ui_print_help_tip (__('Only for type Quiet for downtimes.'), true) . '</h4>';

3
pandora_console/godmode/alerts/alert_list.list.php
View File

@ -390,6 +390,9 @@ if (! $id_agente) {
}*/
}
else {
$table->head[0] = __('Module') . '&nbsp;' .
'<a href="' . $url . '&sort_field=module&sort=up&pure='.$pure.'">' . html_print_image("images/sort_up.png", true, array("style" => $selectModuleUp)) . '</a>' .
'<a href="' . $url . '&sort_field=module&sort=down&pure='.$pure.'">' . html_print_image("images/sort_down.png", true, array("style" => $selectModuleDown)) . '</a>';
/* Different sizes or the layout screws up */
$table->size[0] = '0%';
$table->size[1] = '10%';

64
pandora_console/godmode/alerts/configure_alert_template.php
View File

@ -632,11 +632,13 @@ if ($step == 2) {
$table->colspan['example'][1] = 4;
}
else if ($step == 3) {
$table->style[0] = 'font-weight: bold; vertical-align: top';
$table->style[0] = 'font-weight: bold; vertical-align: middle';
$table->style[1] = 'font-weight: bold; vertical-align: top';
$table->style[2] = 'font-weight: bold; vertical-align: top';
$table->size = array ();
$table->size[0] = '20%';
$table->size[0] = '10%';
$table->size[1] = '45%';
$table->size[2] = '45%';
/* Alert recover */
if (! $recovery_notify) {
@ -673,11 +675,36 @@ else if ($step == 3) {
//$table->rowclass['field'.$i] = 'row_field';
$table->data['field'.$i][0] = sprintf(__('Field %s'), $i) .
ui_print_help_icon ('alert_macros', true);
$table->data['field'.$i][1] = html_print_textarea('field'.$i, 1, 1, isset($fields[$i]) ? $fields[$i] : '', 'style="min-height:40px;" class="fields"', true);
$table->data['field'.$i][0] = sprintf(__('Field %s'), $i) . ui_print_help_icon ('alert_macros', true);
//TinyMCE
//triggering fields
//basic
$table->data['field'.$i][1] = "<div style=\"padding: 4px 0px;\"><b><small>";
$table->data['field'.$i][1] .= __('Basic') . "&nbsp;&nbsp;";
$table->data['field'.$i][1] .= html_print_radio_button_extended ('editor_type_value_'.$i, 0, '', false, false, "removeTinyMCE('textarea_field".$i."')", '', true);
//Advanced
$table->data['field'.$i][1] .= "&nbsp;&nbsp;&nbsp;&nbsp;";
$table->data['field'.$i][1] .= __('Advanced') . "&nbsp;&nbsp;";
$table->data['field'.$i][1] .= html_print_radio_button_extended ('editor_type_value_'.$i, 0, '', true, false, "addTinyMCE('textarea_field".$i."')", '', true);
$table->data['field'.$i][1] .= "</small></b></div>";
//Texarea
$table->data['field'.$i][1] .= html_print_textarea('field'.$i, 1, 1, isset($fields[$i]) ? $fields[$i] : '', 'style="min-height:40px;" class="fields"', true);
// Recovery
$table->data['field'.$i][2] = html_print_textarea ('field'.$i.'_recovery', 1, 1, isset($fields_recovery[$i]) ? $fields_recovery[$i] : '', 'style="min-height:40px" class="fields"', true);
//basic
$table->data['field'.$i][2] = "<div style=\"padding: 4px 0px;\"><b><small>";
$table->data['field'.$i][2] .= __('Basic') . "&nbsp;&nbsp;";
$table->data['field'.$i][2] .= html_print_radio_button_extended ('editor_type_recovery_value_'.$i, 0, '', false, false, "removeTinyMCE('textarea_field".$i."_recovery')", '', true);
//advanced
$table->data['field'.$i][2] .= "&nbsp;&nbsp;&nbsp;&nbsp;";
$table->data['field'.$i][2] .= __('Advanced') . "&nbsp;&nbsp;";
$table->data['field'.$i][2] .= html_print_radio_button_extended ('editor_type_recovery_value_'.$i, 0, '', true, false, "addTinyMCE('textarea_field".$i."_recovery')", '', true);
$table->data['field'.$i][2] .= "</small></b></div>";
//Texarea
$table->data['field'.$i][2] .= html_print_textarea ('field'.$i.'_recovery', 1, 1, isset($fields_recovery[$i]) ? $fields_recovery[$i] : '', 'style="min-height:40px" class="fields"', true);
}
}
else {
@ -804,6 +831,7 @@ enterprise_hook('close_meta_frame');
ui_require_javascript_file ('pandora_alerts');
ui_include_time_picker();
ui_require_jquery_file("ui.datepicker-" . get_user_language(), "include/javascript/i18n/");
ui_require_javascript_file('tiny_mce', 'include/javascript/tiny_mce/');
?>
<script type="text/javascript">
@ -813,13 +841,13 @@ var matches_not = <?php echo "\"" . __("The alert would fire when the value does
var is = <?php echo "'" . __("The alert would fire when the value is <span id=\"value\"></span>") . "'";?>;
var is_not = <?php echo "'" . __("The alert would fire when the value is not <span id=\"value\"></span>") . "'";?>;
var between = <?php echo "'" . __("The alert would fire when the value is between <span id=\"min\"></span> and <span id=\"max\"></span>") . "'";?>;
var between_not = <?php echo "'" . __("The alert would fire when the value is not between <span id=\"min\"></span> and <span id=\"max\"></span>") . "'";?>;
var between_not = <?php echo "\"" . __("The alert would fire when the value is not between <span id=\'min\'></span> and <span id=\'max\'></span>") . "\"";?>;
var under = <?php echo "'" . __("The alert would fire when the value is below <span id=\"min\"></span>") . "'";?>;
var over = <?php echo "'" . __("The alert would fire when the value is above <span id=\"max\"></span>") . "'";?>;
var warning = <?php echo "'" . __("The alert would fire when the module is in warning status") . "'";?>;
var critical = <?php echo "'" . __("The alert would fire when the module is in critical status") . "'";?>;
var onchange_msg = <?php echo "'" . __("The alert would fire when the module value changes") . "'";?>;
var onchange_not = <?php echo "'" . __("The alert would fire when the module value does not change") . "'";?>;
var onchange_msg = <?php echo "\"" . __("The alert would fire when the module value changes") . "\"";?>;
var onchange_not = <?php echo "\"" . __("The alert would fire when the module value does not change") . "\"";?>;
var unknown = <?php echo "'" . __("The alert would fire when the module is in unknown status") . "'";?>;
var error_message_min_max_zero = <?php echo "'" . __("The alert template cannot have the same value for min and max thresholds.") . "'";?>;
@ -1069,6 +1097,24 @@ elseif ($step == 3) {
$("#template-label_fields-2, #template-field1-2, #template-field2-2, #template-field3-2, #template-field4-2, #template-field5-2, #template-field6-2, #template-field7-2, #template-field8-2, #template-field9-2, #template-field10-2").hide ();
}
});
tinyMCE.init({
selector: 'textarea.tiny-mce-editor',
theme : "advanced",
plugins : "preview, print, table, searchreplace, nonbreaking, xhtmlxtras, noneditable",
theme_advanced_buttons1 : "bold,italic,underline,|,justifyleft,justifycenter,justifyright,justifyfull,|,formatselect,fontselect,fontsize,select",
theme_advanced_buttons2 : "search,replace,|,bullist,numlist,|,undo,redo,|,link,unlink,image,|,cleanup,code,preview,|,forecolor,backcolor",
theme_advanced_buttons3 : "",
theme_advanced_toolbar_location : "top",
theme_advanced_toolbar_align : "left",
theme_advanced_resizing : true,
theme_advanced_statusbar_location : "bottom",
force_p_newlines : false,
forced_root_block : '',
inline_styles : true,
valid_children : "+body[style]",
element_format : "html"
});
<?php
}
?>

2
pandora_console/godmode/gis_maps/configure_gis_map.php
View File

@ -18,7 +18,7 @@ global $config;
check_login ();
$gis_w = check_acl ($config['id_user'], 0, 'MW');
$gis_m = check_acl ($config['id_user'], 0, 'MM')
$gis_m = check_acl ($config['id_user'], 0, 'MM');
$access = ($gis_w == true) ? 'MW' : (($gis_m == true) ? 'MM' : 'MW');
if (!$gis_w && !$gis_m ) {

55
pandora_console/godmode/massive/massive_edit_modules.php
View File

@ -176,6 +176,7 @@ $table->size[2] = '15%';
$table->size[3] = '35%';
if (! $module_type) {
$table->rowstyle['edit1'] = 'display: none';
$table->rowstyle['edit0'] = 'display: none';
$table->rowstyle['edit1_1'] = 'display: none';
$table->rowstyle['edit2'] = 'display: none';
$table->rowstyle['edit3'] = 'display: none';
@ -340,7 +341,16 @@ $table->data['form_agents_3'][3] = html_print_select (array(), 'module[]',
$modules_select, false, '', '', true, true, false);
$table->data['edit0'][0] = __('Dynamic Interval');
$table->data['edit0'][1] = html_print_extended_select_for_time ('dynamic_interval', '', '', 'None', '0', 10, true, 'width:150px',false);
$table->data['edit0'][2] = '<table width="100%"><tr><td><em>' . __('Dynamic Min.') . '</em></td>';
$table->data['edit0'][2] .= '<td align="right">' .
html_print_input_text ('dynamic_min', '', '', 10, 255, true) . '</td></tr>';
$table->data['edit0'][2] .= '<tr><td><em>' . __('Dynamic Max.') . '</em></td>';
$table->data['edit0'][2] .= '<td align="right">' .
html_print_input_text ('dynamic_max', '', '', 10, 255, true) . '</td></tr></table>';
$table->data['edit0'][3] = __('Dynamic Two Tailed: ');
$table->data['edit0'][3] .= html_print_checkbox ("dynamic_two_tailed", 1, '', true);
$table->data['edit1'][0] = __('Warning status');
$table->data['edit1'][1] = '<table width="100%">';
@ -656,6 +666,7 @@ $(document).ready (function () {
}
$("tr#delete_table-edit1, " +
"tr#delete_table-edit0, " +
"tr#delete_table-edit1_1, " +
"tr#delete_table-edit2, " +
"tr#delete_table-edit3, " +
@ -685,7 +696,7 @@ $(document).ready (function () {
params['id_tipo_modulo'] = this.value;
$("#module_loading").show ();
$("tr#delete_table-edit1, tr#delete_table-edit2").hide ();
$("tr#delete_table-edit1, tr#delete_table-edit0, tr#delete_table-edit2").hide ();
$("#module_name").attr ("disabled", "disabled")
$("#module_name option[value!=0]").remove ();
jQuery.post ("ajax.php",
@ -708,6 +719,7 @@ $(document).ready (function () {
$("#form_edit input[type=text]").attr ("value", "");
$("#form_edit input[type=checkbox]").not ("#checkbox-recursion").removeAttr ("checked");
$("tr#delete_table-edit1, " +
"tr#delete_table-edit0, " +
"tr#delete_table-edit1_1, " +
"tr#delete_table-edit2, " +
"tr#delete_table-edit3, " +
@ -733,6 +745,7 @@ $(document).ready (function () {
$("#agents").html('<?php echo __('None'); ?>');
$("#module").html('<?php echo __('None'); ?>');
$("tr#delete_table-edit1, " +
"tr#delete_table-edit0, " +
"tr#delete_table-edit1_1, " +
"tr#delete_table-edit2, " +
"tr#delete_table-edit3, " +
@ -766,6 +779,7 @@ $(document).ready (function () {
if (this.checked) {
$(".select_modules_row_2").css('display', 'none');
$("tr#delete_table-edit1, " +
"tr#delete_table-edit0, " +
"tr#delete_table-edit1_1, " +
"tr#delete_table-edit2, " +
"tr#delete_table-edit3, " +
@ -782,6 +796,7 @@ $(document).ready (function () {
$(".select_modules_row_2").css('display', '');
if ($('#module_name option:selected').val() == undefined) {
$("tr#delete_table-edit1, " +
"tr#delete_table-edit0, " +
"tr#delete_table-edit1_1, " +
"tr#delete_table-edit2, " +
"tr#delete_table-edit3, " +
@ -812,6 +827,9 @@ $(document).ready (function () {
else if (this.id == "checkbox-critical_inverse") {
return; //Do none
}
else if (this.id == "checkbox-dynamic_two_tailed") {
return; //Do none
}
else {
if (this.id == "checkbox-force_group") {
$("#checkbox-recursion").attr("checked", false);
@ -820,6 +838,7 @@ $(document).ready (function () {
if (this.checked) {
$(".select_agents_row_2").css('display', 'none');
$("tr#delete_table-edit1, " +
"tr#delete_table-edit0, " +
"tr#delete_table-edit1_1, " +
"tr#delete_table-edit2, " +
"tr#delete_table-edit3, " +
@ -842,6 +861,7 @@ $(document).ready (function () {
$(".select_agents_row_2").css('display', '');
if ($('#id_agents option:selected').val() == undefined) {
$("tr#delete_table-edit1, " +
"tr#delete_table-edit0, " +
"tr#delete_table-edit1_1, " +
"tr#delete_table-edit2, " +
"tr#delete_table-edit3, " +
@ -916,6 +936,7 @@ $(document).ready (function () {
}
$("tr#delete_table-edit1, " +
"tr#delete_table-edit0, " +
"tr#delete_table-edit1_1, " +
"tr#delete_table-edit2, " +
"tr#delete_table-edit3, " +
@ -966,7 +987,35 @@ $(document).ready (function () {
$("#status_agents").change(function() {
$("#groups_select").trigger("change");
});
//Dynamic_interval;
disabled_status();
$('#dynamic_interval_select').change (function() {
disabled_status();
});
});
function disabled_status () {
if($('#dynamic_interval_select').val() != 0){
$('#text-min_warning').prop('readonly', true);
$('#text-min_warning').addClass('readonly');
$('#text-max_warning').prop('readonly', true);
$('#text-max_warning').addClass('readonly');
$('#text-min_critical').prop('readonly', true);
$('#text-min_critical').addClass('readonly');
$('#text-max_critical').prop('readonly', true);
$('#text-max_critical').addClass('readonly');
} else {
$('#text-min_warning').prop('readonly', false);
$('#text-min_warning').removeClass('readonly');
$('#text-max_warning').prop('readonly', false);
$('#text-max_warning').removeClass('readonly');
$('#text-min_critical').prop('readonly', false);
$('#text-min_critical').removeClass('readonly');
$('#text-max_critical').prop('readonly', false);
$('#text-max_critical').removeClass('readonly');
}
}
/* ]]> */
</script>
<?php
@ -982,7 +1031,7 @@ function process_manage_edit ($module_name, $agents_select = null) {
$agents_select = array($agents_select);
/* List of fields which can be updated */
$fields = array ('min_warning', 'max_warning', 'str_warning',
$fields = array ('dynamic_interval', 'dynamic_max', 'dynamic_min', 'dynamic_two_tailed', 'min_warning', 'max_warning', 'str_warning',
'min_critical', 'max_critical', 'str_critical', 'min_ff_event',
'module_interval', 'disabled', 'post_process', 'unit',
'snmp_community', 'tcp_send', 'custom_string_1',

10
pandora_console/godmode/massive/massive_operations.php
View File

@ -203,9 +203,17 @@ $onheader['policies'] = $policiestab;
$onheader['snmp'] = $snmptab;
$onheader['satellite'] = $satellitetab;
/* Hello there! :)
We added some of what seems to be "buggy" messages to the openSource version recently. This is not to force open-source users to move to the enterprise version, this is just to inform people using Pandora FMS open source that it requires skilled people to maintain and keep it running smoothly without professional support. This does not imply open-source version is limited in any way. If you check the recently added code, it contains only warnings and messages, no limitations except one: we removed the option to add custom logo in header. In the Update Manager section, it warns about the 'danger’ of applying automated updates without a proper backup, remembering in the process that the Enterprise version comes with a human-tested package. Maintaining an OpenSource version with more than 500 agents is not so easy, that's why someone using a Pandora with 8000 agents should consider asking for support. It's not a joke, we know of many setups with a huge number of agents, and we hate to hear that “its becoming unstable and slow” :(
You can of course remove the warnings, that's why we include the source and do not use any kind of trick. And that's why we added here this comment, to let you know this does not reflect any change in our opensource mentality of does the last 14 years.
*/
ui_print_page_header(
__('Massive operations') . ' &raquo; '. $options[$option],
"images/gm_massive_operations.png", false, "", true, $onheader,true, "massive");
"images/gm_massive_operations.png", false, "", true, $onheader,true, "massivemodal");
// Checks if the PHP configuration is correctly
if ((get_cfg_var("max_execution_time") != 0)

29
pandora_console/godmode/modules/manage_network_components.php
View File

@ -38,9 +38,18 @@ if (defined('METACONSOLE')) {
$sec = 'advanced';
}
else {
/* Hello there! :)
We added some of what seems to be "buggy" messages to the openSource version recently. This is not to force open-source users to move to the enterprise version, this is just to inform people using Pandora FMS open source that it requires skilled people to maintain and keep it running smoothly without professional support. This does not imply open-source version is limited in any way. If you check the recently added code, it contains only warnings and messages, no limitations except one: we removed the option to add custom logo in header. In the Update Manager section, it warns about the 'danger’ of applying automated updates without a proper backup, remembering in the process that the Enterprise version comes with a human-tested package. Maintaining an OpenSource version with more than 500 agents is not so easy, that's why someone using a Pandora with 8000 agents should consider asking for support. It's not a joke, we know of many setups with a huge number of agents, and we hate to hear that “its becoming unstable and slow” :(
You can of course remove the warnings, that's why we include the source and do not use any kind of trick. And that's why we added here this comment, to let you know this does not reflect any change in our opensource mentality of does the last 14 years.
*/
ui_print_page_header (__('Module management') . ' &raquo; ' .
__('Network component management'), "", false,
"network_component", true,"sell",true,"module");
"network_component", true,"sell",true,"modulemodal");
$sec = 'gmodules';
}
@ -70,13 +79,17 @@ if (!empty($macros)) {
$macros[$k]['value'] = get_parameter($m['macro'], '');
}
$macros = json_encode($macros);
$macros = io_json_mb_encode($macros);
}
$max_timeout = (int) get_parameter ('max_timeout');
$max_retries = (int) get_parameter ('max_retries');
$id_modulo = (int) get_parameter ('id_component_type');
$id_plugin = (int) get_parameter ('id_plugin');
$dynamic_interval = (int) get_parameter('dynamic_interval');
$dynamic_max = (int) get_parameter('dynamic_max');
$dynamic_min = (int) get_parameter('dynamic_min');
$dynamic_two_tailed = (int) get_parameter('dynamic_two_tailed');
$min_warning = (float) get_parameter ('min_warning');
$max_warning = (float) get_parameter ('max_warning');
$str_warning = (string) get_parameter ('str_warning');
@ -203,6 +216,10 @@ if ($create_component) {
'max_timeout' => $max_timeout,
'max_retries' => $max_retries,
'history_data' => $history_data,
'dynamic_interval' => $dynamic_interval,
'dynamic_max' => $dynamic_max,
'dynamic_min' => $dynamic_min,
'dynamic_two_tailed' => $dynamic_two_tailed,
'min_warning' => $min_warning,
'max_warning' => $max_warning,
'str_warning' => $str_warning,
@ -289,6 +306,10 @@ if ($update_component) {
'max_timeout' => $max_timeout,
'max_retries' => $max_retries,
'history_data' => $history_data,
'dynamic_interval' => $dynamic_interval,
'dynamic_max' => $dynamic_max,
'dynamic_min' => $dynamic_min,
'dynamic_two_tailed' => $dynamic_two_tailed,
'min_warning' => $min_warning,
'max_warning' => $max_warning,
'str_warning' => $str_warning,
@ -417,6 +438,10 @@ $url = ui_get_url_refresh (array ('offset' => false,
'id_modulo' => false,
'id_plugin' => false,
'history_data' => false,
'dynamic_interval' => false,
'dynamic_max' => false,
'dynamic_min' => false,
'dynamic_two_tailed' => false,
'min_warning' => false,
'max_warning' => false,
'str_warning' => false,

12
pandora_console/godmode/modules/manage_network_components_form.php
View File

@ -53,6 +53,10 @@ if ($create_network_from_module) {
$macros = $data_module["macros"];
$max_timeout = $data_module["max_timeout"];
$max_retries = $data_module["max_retries"];
$dynamic_interval = $data_module['dynamic_interval'];
$dynamic_max = $data_module['dynamic_max'];
$dynamic_min = $data_module['dynamic_min'];
$dynamic_two_tailed = $data_module['dynamic_two_tailed'];
$min_warning = $data_module["min_warning"];
$max_warning = $data_module["max_warning"];
$str_warning = $data_module["str_warning"];
@ -106,6 +110,10 @@ if (isset ($id)) {
$macros = $component["macros"];
$max_timeout = $component["max_timeout"];
$max_retries = $component["max_retries"];
$dynamic_interval = $component['dynamic_interval'];
$dynamic_max = $component['dynamic_max'];
$dynamic_min = $component['dynamic_min'];
$dynamic_two_tailed = $component['dynamic_two_tailed'];
$min_warning = $component["min_warning"];
$max_warning = $component["max_warning"];
$str_warning = $component["str_warning"];
@ -161,6 +169,10 @@ if (isset ($id)) {
$min_warning = 0;
$max_warning = 0;
$str_warning = '';
$dynamic_interval = 0;
$dynamic_min = 0;
$dynamic_max = 0;
$dynamic_two_tailed = 0;
$max_critical = 0;
$min_critical = 0;
$str_critical = '';

135
pandora_console/godmode/modules/manage_network_components_form_common.php
View File

@ -102,73 +102,82 @@ $table->data[2][1] = html_print_select (network_components_get_groups (),
$table->data[2][2] = __('Interval');
$table->data[2][3] = html_print_extended_select_for_time ('module_interval' , $module_interval, '', '', '0', false, true);
$table->data[3][0] = __('Dynamic Interval') .' ' . ui_print_help_icon ('warning_status', true);
html_debug_print($dynamic_interval);
$table->data[3][1] = html_print_extended_select_for_time ('dynamic_interval', $dynamic_interval, '', 'None', '0', 10, true, 'width:150px',false);
$table->data[3][2] = '<span><em>'.__('Dynamic Min. ').'</em>';
$table->data[3][2] .= html_print_input_text ('dynamic_min', $dynamic_min, '', 10, 255, true);
$table->data[3][2] .= '<br /><em>'.__('Dynamic Max.').'</em>';
$table->data[3][2] .= html_print_input_text ('dynamic_max', $dynamic_max, '', 10, 255, true);
$table->data[3][3] = '<span><em>'.__('Dynamic Two Tailed: ').'</em>';
$table->data[3][3] .= html_print_checkbox ("dynamic_two_tailed", 1, $dynamic_two_tailed, true);
$table->data[3][0] = __('Warning status') . ' ' . ui_print_help_icon ('warning_status', true);
$table->data[3][1] = '<span id="minmax_warning"><em>'.__('Min.').'&nbsp;</em>&nbsp;';
$table->data[3][1] .= html_print_input_text ('min_warning', $min_warning,
$table->data[4][0] = __('Warning status') . ' ' . ui_print_help_icon ('warning_status', true);
$table->data[4][1] = '<span id="minmax_warning"><em>'.__('Min.').'&nbsp;</em>&nbsp;';
$table->data[4][1] .= html_print_input_text ('min_warning', $min_warning,
'', 5, 15, true);
$table->data[3][1] .= '<br /><em>'.__('Max.').'</em>&nbsp;';
$table->data[3][1] .= html_print_input_text ('max_warning', $max_warning,
$table->data[4][1] .= '<br /><em>'.__('Max.').'</em>&nbsp;';
$table->data[4][1] .= html_print_input_text ('max_warning', $max_warning,
'', 5, 15, true) . '</span>';
$table->data[3][1] .= '<span id="string_warning"><em>'.__('Str.').' </em>&nbsp;';
$table->data[3][1] .= html_print_input_text ('str_warning', $str_warning,
$table->data[4][1] .= '<span id="string_warning"><em>'.__('Str.').' </em>&nbsp;';
$table->data[4][1] .= html_print_input_text ('str_warning', $str_warning,
'', 5, 15, true) . '</span>';
$table->data[3][1] .= '<br /><em>'.__('Inverse interval').'</em>';
$table->data[3][1] .= html_print_checkbox ("warning_inverse", 1, $warning_inverse, true);
$table->data[4][1] .= '<br /><em>'.__('Inverse interval').'</em>';
$table->data[4][1] .= html_print_checkbox ("warning_inverse", 1, $warning_inverse, true);
$table->data[3][2] = __('Critical status'). ' ' . ui_print_help_icon ('critical_status', true);
$table->data[3][3] = '<span id="minmax_critical"><em>'.__('Min.').'&nbsp;</em>&nbsp;';
$table->data[3][3] .= html_print_input_text ('min_critical', $min_critical,
$table->data[4][2] = __('Critical status'). ' ' . ui_print_help_icon ('critical_status', true);
$table->data[4][3] = '<span id="minmax_critical"><em>'.__('Min.').'&nbsp;</em>&nbsp;';
$table->data[4][3] .= html_print_input_text ('min_critical', $min_critical,
'', 5, 15, true);
$table->data[3][3] .= '<br /><em>'.__('Max.').'</em>&nbsp;';
$table->data[3][3] .= html_print_input_text ('max_critical', $max_critical,
$table->data[4][3] .= '<br /><em>'.__('Max.').'</em>&nbsp;';
$table->data[4][3] .= html_print_input_text ('max_critical', $max_critical,
'', 5, 15, true) . '</span>';
$table->data[3][3] .= '<span id="string_critical"><em>'.__('Str.').' </em>&nbsp;';
$table->data[3][3] .= html_print_input_text ('str_critical', $str_critical,
$table->data[4][3] .= '<span id="string_critical"><em>'.__('Str.').' </em>&nbsp;';
$table->data[4][3] .= html_print_input_text ('str_critical', $str_critical,
'', 5, 15, true) . '</span>';
$table->data[3][3] .= '<br /><em>'.__('Inverse interval').'</em>';
$table->data[3][3] .= html_print_checkbox ("critical_inverse", 1, $critical_inverse, true);
$table->data[4][3] .= '<br /><em>'.__('Inverse interval').'</em>';
$table->data[4][3] .= html_print_checkbox ("critical_inverse", 1, $critical_inverse, true);
$table->data[4][0] = __('FF threshold') . ' ' . ui_print_help_icon ('ff_threshold', true);
$table->colspan[4][1] = 3;
$table->data[4][1] = html_print_radio_button ('each_ff', 0, '', $each_ff, true) . ' ' . __('All state changing') . ' : ';
$table->data[4][1] .= html_print_input_text ('ff_event', $ff_event,
$table->data[5][0] = __('FF threshold') . ' ' . ui_print_help_icon ('ff_threshold', true);
$table->colspan[5][1] = 3;
$table->data[5][1] = html_print_radio_button ('each_ff', 0, '', $each_ff, true) . ' ' . __('All state changing') . ' : ';
$table->data[5][1] .= html_print_input_text ('ff_event', $ff_event,
'', 5, 15, true) . '<br />';
$table->data[4][1] .= html_print_radio_button ('each_ff', 1, '', $each_ff, true) . ' ' . __('Each state changing') . ' : ';
$table->data[4][1] .= __('To normal');
$table->data[4][1] .= html_print_input_text ('ff_event_normal', $ff_event_normal, '', 5, 15, true) . ' ';
$table->data[4][1] .= __('To warning');
$table->data[4][1] .= html_print_input_text ('ff_event_warning', $ff_event_warning, '', 5, 15, true) . ' ';
$table->data[4][1] .= __('To critical');
$table->data[4][1] .= html_print_input_text ('ff_event_critical', $ff_event_critical, '', 5, 15, true);
$table->data[5][1] .= html_print_radio_button ('each_ff', 1, '', $each_ff, true) . ' ' . __('Each state changing') . ' : ';
$table->data[5][1] .= __('To normal');
$table->data[5][1] .= html_print_input_text ('ff_event_normal', $ff_event_normal, '', 5, 15, true) . ' ';
$table->data[5][1] .= __('To warning');
$table->data[5][1] .= html_print_input_text ('ff_event_warning', $ff_event_warning, '', 5, 15, true) . ' ';
$table->data[5][1] .= __('To critical');
$table->data[5][1] .= html_print_input_text ('ff_event_critical', $ff_event_critical, '', 5, 15, true);
$table->data[5][0] = __('Historical data');
$table->data[5][1] = html_print_checkbox ("history_data", 1, $history_data, true);
$table->data[6][0] = __('Historical data');
$table->data[6][1] = html_print_checkbox ("history_data", 1, $history_data, true);
$table->data[6][0] = __('Min. Value');
$table->data[6][1] = html_print_input_text ('min', $min, '', 5, 15, true). ' ' . ui_print_help_tip (__('Any value below this number is discarted'), true);
$table->data[6][2] = __('Max. Value');
$table->data[6][3] = html_print_input_text ('max', $max, '', 5, 15, true) . ' ' . ui_print_help_tip (__('Any value over this number is discarted'), true);
$table->data[7][0] = __('Unit');
$table->data[7][1] = html_print_input_text ('unit', $unit, '', 12, 25, true);
$table->data[7][0] = __('Min. Value');
$table->data[7][1] = html_print_input_text ('min', $min, '', 5, 15, true). ' ' . ui_print_help_tip (__('Any value below this number is discarted'), true);
$table->data[7][2] = __('Max. Value');
$table->data[7][3] = html_print_input_text ('max', $max, '', 5, 15, true) . ' ' . ui_print_help_tip (__('Any value over this number is discarted'), true);
$table->data[8][0] = __('Unit');
$table->data[8][1] = html_print_input_text ('unit', $unit, '', 12, 25, true);
$table->data[7][2] = __('Throw unknown events');
$table->data[7][3] = html_print_checkbox('throw_unknown_events', 1,
$table->data[8][2] = __('Throw unknown events');
$table->data[8][3] = html_print_checkbox('throw_unknown_events', 1,
!network_components_is_disable_type_event($id, EVENTS_GOING_UNKNOWN), true);
$table->data[8][0] = __('Critical instructions'). ui_print_help_tip(__("Instructions when the status is critical"), true);
$table->data[8][1] = html_print_textarea ('critical_instructions', 2, 65, $critical_instructions, '', true);
$table->colspan[8][1] = 3;
$table->data[9][0] = __('Warning instructions'). ui_print_help_tip(__("Instructions when the status is warning"), true);
$table->data[9][1] = html_print_textarea ('warning_instructions', 2, 65, $warning_instructions, '', true);
$table->data[9][0] = __('Critical instructions'). ui_print_help_tip(__("Instructions when the status is critical"), true);
$table->data[9][1] = html_print_textarea ('critical_instructions', 2, 65, $critical_instructions, '', true);
$table->colspan[9][1] = 3;
$table->data[10][0] = __('Unknown instructions'). ui_print_help_tip(__("Instructions when the status is unknown"), true);
$table->data[10][1] = html_print_textarea ('unknown_instructions', 2, 65, $unknown_instructions, '', true);
$table->data[10][0] = __('Warning instructions'). ui_print_help_tip(__("Instructions when the status is warning"), true);
$table->data[10][1] = html_print_textarea ('warning_instructions', 2, 65, $warning_instructions, '', true);
$table->colspan[10][1] = 3;
$next_row = 11;
$table->data[11][0] = __('Unknown instructions'). ui_print_help_tip(__("Instructions when the status is unknown"), true);
$table->data[11][1] = html_print_textarea ('unknown_instructions', 2, 65, $unknown_instructions, '', true);
$table->colspan[11][1] = 3;
$next_row = 12;
if (check_acl ($config['id_user'], 0, "PM")) {
$table->data[$next_row][0] = __('Category');
@ -178,7 +187,7 @@ if (check_acl ($config['id_user'], 0, "PM")) {
}
else {
// Store in a hidden field if is not visible to avoid delete the value
$table->data[10][1] .= html_print_input_hidden ('id_category', $id_category, true);
$table->data[11][1] .= html_print_input_hidden ('id_category', $id_category, true);
}
$table->data[$next_row][0] = __('Tags');
@ -237,7 +246,33 @@ $next_row++;
$('#minmax_warning').hide();
}
});
//Dynamic_interval;
disabled_status();
$('#dynamic_interval_select').change (function() {
disabled_status();
});
$("#type").trigger('change');
});
function disabled_status () {
if($('#dynamic_interval_select').val() != 0){
$('#text-min_warning').prop('readonly', true);
$('#text-min_warning').addClass('readonly');
$('#text-max_warning').prop('readonly', true);
$('#text-max_warning').addClass('readonly');
$('#text-min_critical').prop('readonly', true);
$('#text-min_critical').addClass('readonly');
$('#text-max_critical').prop('readonly', true);
$('#text-max_critical').addClass('readonly');
} else {
$('#text-min_warning').prop('readonly', false);
$('#text-min_warning').removeClass('readonly');
$('#text-max_warning').prop('readonly', false);
$('#text-max_warning').removeClass('readonly');
$('#text-min_critical').prop('readonly', false);
$('#text-min_critical').removeClass('readonly');
$('#text-max_critical').prop('readonly', false);
$('#text-max_critical').removeClass('readonly');
}
}
</script>

13
pandora_console/godmode/modules/manage_network_templates.php
View File

@ -27,7 +27,16 @@ if (! check_acl ($config['id_user'], 0, "PM")) {
}
// Header
ui_print_page_header (__('Module management')." &raquo; ".__('Module template management'), "images/gm_modules.png", false, "template_tab", true,"",true,"module");
/* Hello there! :)
We added some of what seems to be "buggy" messages to the openSource version recently. This is not to force open-source users to move to the enterprise version, this is just to inform people using Pandora FMS open source that it requires skilled people to maintain and keep it running smoothly without professional support. This does not imply open-source version is limited in any way. If you check the recently added code, it contains only warnings and messages, no limitations except one: we removed the option to add custom logo in header. In the Update Manager section, it warns about the 'danger’ of applying automated updates without a proper backup, remembering in the process that the Enterprise version comes with a human-tested package. Maintaining an OpenSource version with more than 500 agents is not so easy, that's why someone using a Pandora with 8000 agents should consider asking for support. It's not a joke, we know of many setups with a huge number of agents, and we hate to hear that “its becoming unstable and slow” :(
You can of course remove the warnings, that's why we include the source and do not use any kind of trick. And that's why we added here this comment, to let you know this does not reflect any change in our opensource mentality of does the last 14 years.
*/
ui_print_page_header (__('Module management')." &raquo; ".__('Module template management'), "images/gm_modules.png", false, "template_tab", true,"",true,"modulemodal");
require_once ('include/functions_network_profiles.php');
@ -94,7 +103,7 @@ if ($export_profile) {
components.tcp_port, components.tcp_send, components.tcp_rcv, components.snmp_community, components.snmp_oid,
components.id_module_group, components.id_modulo, components.plugin_user, components.plugin_pass, components.plugin_parameter,
components.max_timeout, components.max_retries, components.history_data, components.min_warning, components.max_warning, components.str_warning, components.min_critical,
components.max_critical, components.str_critical, components.min_ff_event, comp_group.name AS group_name, components.critical_instructions, components.warning_instructions, components.unknown_instructions
components.max_critical, components.str_critical, components.min_ff_event, components.dynamic_interval, components.dynamic_max, components.dynamic_min, components.dynamic_two_tailed, comp_group.name AS group_name, components.critical_instructions, components.warning_instructions, components.unknown_instructions
FROM `tnetwork_component` AS components, tnetwork_profile_component AS tpc, tnetwork_component_group AS comp_group
WHERE tpc.id_nc = components.id_nc
AND components.id_group = comp_group.id_sg

49
pandora_console/godmode/reporting/reporting_builder.item_editor.php
View File

@ -91,6 +91,7 @@ $inventory_modules = array();
$date = null;
// Only avg is selected by default for the simple graphs
$only_avg = true;
$percentil_95 = false;
$time_compare_overlapped = false;
//Added for events items
@ -191,6 +192,7 @@ switch ($action) {
case 'simple_graph':
$only_avg = isset($style['only_avg']) ? (bool) $style['only_avg'] : true;
$percentil_95 = isset($style['percentil_95']) ? $style['percentil_95'] : 0;
// The break hasn't be forgotten.
case 'simple_baseline_graph':
case 'projection_graph':
@ -620,7 +622,7 @@ $class = 'databox filters';
<td style="">
<?php
if ($action == 'new') {
html_print_select(reports_get_report_types(false, true), 'type', $type, 'chooseType();', '', '','','','','','','','','',true,'reporting');
html_print_select(reports_get_report_types(false, true), 'type', $type, 'chooseType();', '', '','','','','','','','','',true,'reportingmodal');
}
else {
$report_type = reports_get_report_types();
@ -637,7 +639,7 @@ $class = 'databox filters';
<tr id="row_name" style="" class="datos">
<td style="font-weight:bold;">
<?php echo __('Name'); ?>
<?php echo __('Name') . ui_print_help_icon ('reports_label_field',true); ?>
</td>
<td style="">
<?php
@ -909,7 +911,7 @@ $class = 'databox filters';
$params['javascript_is_function_select'] = true;
$params['selectbox_id'] = 'id_agent_module';
$params['add_none_module'] = false;
$params['add_none_module'] = true;
$params['use_hidden_input_idagent'] = true;
$params['hidden_input_idagent_id'] = 'hidden-id_agent';
if ($meta) {
@ -1201,6 +1203,10 @@ $class = 'databox filters';
<td style="font-weight:bold;"><?php echo __('Only average');?></td>
<td><?php html_print_checkbox('only_avg', 1, $only_avg);?></td>
</tr>
<tr id="row_percentil" style="" class="datos">
<td style="font-weight:bold;"><?php echo __('Percentil 95');?></td>
<td><?php html_print_checkbox('percentil_95', 1, $percentil_95);?></td>
</tr>
<tr id="row_exception_condition_value" style="" class="datos">
<td style="font-weight:bold;"><?php echo __('Value'); ?></td>
<td style="">
@ -1772,6 +1778,7 @@ function print_General_list($width, $action, $idItem = null, $type = 'general')
ui_require_javascript_file ('pandora_inventory', ENTERPRISE_DIR.'/include/javascript/');
?>
<script type="text/javascript">
$(document).ready (function () {
chooseType();
@ -1788,6 +1795,37 @@ $(document).ready (function () {
currentText: '<?php echo __('Now');?>',
closeText: '<?php echo __('Close');?>'
});
$('#id_agent_module').change(function(){
var idModule = $(this).val();
var params = [];
params.push("get_type=1");
params.push("id_module=" + idModule);
params.push("page=include/ajax/module");
jQuery.ajax ({
data: params.join ("&"),
type: 'POST',
url: action= <?php echo '"' . ui_get_full_url(false, false, false, false) . '"'; ?> + "/ajax.php",
async: false,
timeout: 10000,
success: function (data) {
console.log(data);
switch (data) {
case 'boolean':
case 'sparse':
$("#row_percentil").show();
break;
default:
$("#row_percentil").hide();
break;
}
}
});
});
});
function create_custom_graph() {
@ -2283,6 +2321,7 @@ function chooseType() {
$("#row_resolution").hide();
$("#row_last_value").hide();
$("#row_filter_search").hide();
$("#row_percentil").hide();
// SLA list default state
$("#sla_list").hide();
@ -2318,6 +2357,8 @@ function chooseType() {
case 'simple_graph':
$("#row_time_compare_overlapped").show();
$("#row_only_avg").show();
if ($("#checkbox-percentil_95").prop("checked"))
$("#row_percentil").show();
// The break hasn't be forgotten, this element
// only should be shown on the simple graphs.
case 'simple_baseline_graph':
@ -2802,7 +2843,7 @@ function chooseType() {
$("#row_label").show();
break;
default:
break;
}
}

23
pandora_console/godmode/reporting/reporting_builder.php
View File

@ -900,10 +900,19 @@ switch ($action) {
case 'update':
$values = array();
$values['id_report'] = $idReport;
$values['name'] = (string) get_parameter('name');
//$values['name'] = (string) get_parameter('name');
$values['description'] = get_parameter('description');
$values['type'] = get_parameter('type', null);
$label = get_parameter('label', '');
//Add macros name
$items_label = array();
$items_label['type'] = get_parameter('type');
$items_label['id_agent'] = get_parameter('id_agent');
$items_label['id_agent_module'] = get_parameter('id_agent_module');
$name_it = (string) get_parameter('name');
$values['name'] = reporting_label_macro($items_label, $name_it);
// Added support for projection graphs, prediction date and SLA reports
// 'top_n_value','top_n' and 'text' fields will be reused for these types of report
switch ($values['type']) {
@ -1140,6 +1149,7 @@ switch ($action) {
// Warning. We are using this column to hold this value to avoid
// the modification of the database for compatibility reasons.
$style['only_avg'] = (int) get_parameter('only_avg');
$style['percentil_95'] = (int) get_parameter('percentil_95');
if ($label != '')
$style['label'] = $label;
else
@ -1198,10 +1208,18 @@ switch ($action) {
$values = array();
$values['id_report'] = $idReport;
$values['type'] = get_parameter('type', null);
$values['name'] = (string) get_parameter('name');
//$values['name'] = (string) get_parameter('name');
$values['description'] = get_parameter('description');
$label = get_parameter('label', '');
//Add macros name
$items_label = array();
$items_label['type'] = get_parameter('type');
$items_label['id_agent'] = get_parameter('id_agent');
$items_label['id_agent_module'] = get_parameter('id_agent_module');
$name_it = (string) get_parameter('name');
$values['name'] = reporting_label_macro($items_label, $name_it);
// Support for projection graph, prediction date and SLA reports
// 'top_n_value', 'top_n' and 'text' fields will be reused for these types of report
switch ($values['type']) {
@ -1449,6 +1467,7 @@ switch ($action) {
// Warning. We are using this column to hold this value to avoid
// the modification of the database for compatibility reasons.
$style['only_avg'] = (int) get_parameter('only_avg');
$style['percentil_95'] = (int) get_parameter('percentil_95');
if ($label != '')
$style['label'] = $label;
else

6
pandora_console/godmode/reporting/visual_console_builder.editor.js
View File

@ -1239,8 +1239,8 @@ function setModuleGraph(id_data) {
id_agente_modulo = data['id_agente_modulo'];
id_custom_graph = data['id_custom_graph'];
label = data['label'];
height = data['height'];
width = data['width'];
height = (data['height'] + 60);
width = (data['width'] + 60);
period = data['period'];
background_color = data['image'];
@ -1609,7 +1609,7 @@ function createItem(type, values, id_data) {
case 'simple_value':
sizeStyle = '';
imageSize = '';
item = $('<div id="' + id_data + '" class="item simple_value" style="text-align: center; position: absolute; ' + sizeStyle + ' top: ' + values['top'] + 'px; left: ' + values['left'] + 'px;">' +
item = $('<div id="' + id_data + '" class="item simple_value" style="position: absolute; ' + sizeStyle + ' top: ' + values['top'] + 'px; left: ' + values['left'] + 'px;">' +
'<span id="text_' + id_data + '" class="text"> ' + values['label'] + '</span> ' + '</div>'
);
setModuleValue(id_data,values.process_simple_value,values.period);

2
pandora_console/godmode/servers/plugin.php
View File

@ -93,7 +93,7 @@ require_once ($config['homedir'] . "/include/functions_filemanager.php");
check_login ();
if (! check_acl ($config['id_user'], 0, "LM")) {
if (! check_acl ($config['id_user'], 0, "PM")) {
db_pandora_audit("ACL Violation",
"Trying to access Plugin Management");
require ("general/noaccess.php");

2
pandora_console/godmode/setup/license.php
View File

@ -108,7 +108,7 @@ echo '</div>';
echo '' . __('To get your <b>Pandora FMS Enterprise License</b>:') . '<br />';
echo '<ul>';
echo '<li>';
echo '' . sprintf(__('Go to %s'), "<a target=\"_blank\" href=\"http://artica.es/pandoraupdate6/index.php?section=generate_key_client\">http://artica.es/pandoraupdate6/index.php?section=generate_key_client</a>");
echo '' . sprintf(__('Go to %s'), "<a target=\"_blank\" href=\"https://licensing.artica.es/pandoraupdate6/index.php?section=generate_key_client\">https://licensing.artica.es/pandoraupdate6/index.php?section=generate_key_client</a>");
echo '</li>';
echo '<li>';
echo '' .__('Enter the <b>auth key</b> and the following <b>request key</b>:');

3
pandora_console/godmode/setup/performance.php
View File

@ -71,6 +71,9 @@ $table->data[8][1] = html_print_input_text ('days_delete_unknown', $config["days
$table->data[9][0] = __('Max. days before delete autodisabled agents');
$table->data[9][1] = html_print_input_text ('days_autodisable_deletion', $config["days_autodisable_deletion"], '', 5, 5, true);
$table->data[10][0] = __('Retention period of past special days') . ui_print_help_tip(__('This number is days to keep past special days. 0 means never remove.'), true);
$table->data[10][1] = html_print_input_text ('num_past_special_days', $config["num_past_special_days"], '', 5, 5, true);
$table_other = new stdClass();
$table_other->width = '100%';
$table_other->class = 'databox filters';

50
pandora_console/godmode/setup/setup_auth.php
View File

@ -48,6 +48,7 @@ $remote_rows = array();
// Autocreate options row names
// Fill this array for every matched row
$autocreate_rows = array();
$no_autocreate_rows = array();
// LDAP data row names
// Fill this array for every matched row
@ -89,16 +90,12 @@ $row = array();
$row['name'] = __('Autocreate profile');
$row['control'] = html_print_select($profile_list, 'default_remote_profile', $config['default_remote_profile'], '', '', '', true, false, true, '', $config['autocreate_remote_users'] == 0);
$table->data['default_remote_profile'] = $row;
$remote_rows[] = 'default_remote_profile';
$autocreate_rows[] = 'default_remote_profile';
// Autocreate profile group
$row = array();
$row['name'] = __('Autocreate profile group');
$row['control'] = html_print_select_groups($config['id_user'], "AR", true, 'default_remote_group', $config['default_remote_group'], '', '', '', true, false, true, '', $config['autocreate_remote_users'] == 0);
$table->data['default_remote_group'] = $row;
$remote_rows[] = 'default_remote_group';
$autocreate_rows[] = 'default_remote_group';
// Autocreate profile tags
$tags = tags_get_all_tags();
@ -106,8 +103,23 @@ $row = array();
$row['name'] = __('Autocreate profile tags');
$row['control'] = html_print_select($tags, 'default_assign_tags[]', explode(',', $config['default_assign_tags']), '', __('Any'), '', true, true);
$table->data['default_assign_tags'] = $row;
$remote_rows[] = 'default_assign_tags';
$autocreate_rows[] = 'default_assign_tags';
if (((int)$config['autocreate_remote_users'] === 1) && ((int)$config['ad_advanced_config'] === 1)) {
$table->rowstyle['default_remote_profile'] = 'display:none;';
$table->rowstyle['default_remote_group'] = 'display:none;';
$table->rowstyle['default_assign_tags'] = 'display:none;';
$no_autocreate_rows[] = 'default_remote_profile';
$no_autocreate_rows[] = 'default_remote_group';
$no_autocreate_rows[] = 'default_assign_tags';
}
else {
$autocreate_rows[] = 'default_remote_profile';
$autocreate_rows[] = 'default_remote_group';
$autocreate_rows[] = 'default_assign_tags';
$remote_rows[] = 'default_remote_group';
$remote_rows[] = 'default_remote_profile';
$remote_rows[] = 'default_assign_tags';
}
// Autocreate blacklist
$row = array();
@ -121,14 +133,20 @@ $autocreate_rows[] = 'autocreate_blacklist';
foreach ($remote_rows as $name) {
if (!isset($table->rowclass[$name]))
$table->rowclass[$name] = '';
$table->rowclass[$name] .= ' ' . 'remote';
$table->rowclass[$name] .= ' remote';
}
// Add the remote class to the no autocreate rows
foreach ($no_autocreate_rows as $name) {
if (!isset($table->rowclass[$name]))
$table->rowclass[$name] = '';
$table->rowclass[$name] .= ' no_autocreate';
}
// Add the autocreate class to the autocreate rows
foreach ($autocreate_rows as $name) {
if (!isset($table->rowclass[$name]))
$table->rowclass[$name] = '';
$table->rowclass[$name] .= ' ' . 'autocreate';
$table->rowclass[$name] .= ' autocreate';
}
@ -292,5 +310,21 @@ echo '</form>';
$('tr.autocreate').hide();
else
$('tr.autocreate').show();
if (typeof $('input:radio[name=ad_advanced_config]') !== 'undefined') {
advanced_value = $('input:radio[name=ad_advanced_config]:checked').val();
if (disabled) {
$('tr.ad_advanced').hide();
$('tr.no_autocreate').hide();
$('input:radio[name=ad_advanced_config][value=0]').prop('checked', true);
$('input:radio[name=ad_advanced_config][value=1]').prop('checked', false);
$('input:radio[name=ad_advanced_config][value=1]').prop('checked', '');
}
else {
if (advanced_value == 0) {
$('tr.no_autocreate').show();
}
}
}
}
</script>

84
pandora_console/godmode/setup/setup_visuals.php
View File

@ -150,20 +150,58 @@ $backgrounds_list_png = list_files("images/backgrounds", "png", 1, 0);
$backgrounds_list = array_merge($backgrounds_list_jpg, $backgrounds_list_png);
$backgrounds_list = array_merge($backgrounds_list, $backgrounds_list_gif);
asort($backgrounds_list);
if(!enterprise_installed()){
$open=true;
}
$table_styles->data[$row][1] = html_print_select ($backgrounds_list,
'login_background', $config["login_background"], '', __('Default'),
'', true);
'', true,false,true,'',false,'width:240px');
$table_styles->data[$row][1] .= "&nbsp;" .
html_print_button(__("View"), 'login_background_preview', false, '', 'class="sub camera"', true);
$row++;
$table_styles->data[$row][0] = __('Custom logo') . ui_print_help_icon("custom_logo", true);
if(enterprise_installed()){
$table_styles->data[$row][1] = html_print_select(
list_files('enterprise/images/custom_logo', "png", 1, 0), 'custom_logo',
$config["custom_logo"], '', '', '',true,false,true,'',$open,'width:240px');
}
else{
$table_styles->data[$row][1] = html_print_select(
list_files('images/custom_logo', "png", 1, 0), 'custom_logo',
$config["custom_logo"], '', '', '', true);
$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_logo_preview', false, '', 'class="sub camera"', true);
$config["custom_logo"], '', '', '',true,false,true,'',$open,'width:240px');
}
$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_logo_preview', $open, '', 'class="sub camera"', true,false,$open,'visualmodal');
$row++;
$table_styles->data[$row][0] = __('Custom logo in login') . ui_print_help_icon("custom_logo_login", true);
$table_styles->data[$row][1] = html_print_select(
list_files('images/custom_logo_login', "png", 1, 0), 'custom_logo_login',
$config["custom_logo_login"], '', '', '',true,false,true,'',$open,'width:240px');
$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_logo_login_preview', $open, '', 'class="sub camera"', true,false,$open,'visualmodal');
$row++;
$table_styles->data[$row][0] = __('Disable Pandora FMS on graphs');
$table_styles->data[$row][1] = __('Yes') . '&nbsp;' .
html_print_radio_button_extended ('fixed_graph', 1, '', $config["fixed_graph"], $open, '','',true) .
'&nbsp;&nbsp;';
$table_styles->data[$row][1] .= __('No') . '&nbsp;' .
html_print_radio_button_extended ('fixed_graph', 0, '', $config["fixed_graph"], $open, '','',true, $open,'visualmodal');
$row++;
$table_styles->data[$row][0] = __('Fixed header');
$table_styles->data[$row][1] = __('Yes') . '&nbsp;' .
html_print_radio_button ('fixed_header', 1, '', $config["fixed_header"], true) .
@ -836,6 +874,46 @@ $("#button-custom_logo_preview").click (function (e) {
}
});
$("#button-custom_logo_login_preview").click (function (e) {
var icon_name = $("select#custom_logo_login option:selected").val();
var icon_path = "<?php echo $config['homeurl']; ?>/images/custom_logo_login/" + icon_name;
if (icon_name == "")
return;
$dialog = $("<div></div>");
$image = $("<img src=\"" + icon_path + "\">");
$image
.css('max-width', '500px')
.css('max-height', '500px');
try {
$dialog
.hide()
.html($image)
.dialog({
title: "<?php echo __('Logo preview'); ?>",
resizable: true,
draggable: true,
modal: true,
overlay: {
opacity: 0.5,
background: "black"
},
minHeight: 1,
width: $image.width,
close: function () {
$dialog
.empty()
.remove();
}
}).show();
}
catch (err) {
// console.log(err);
}
});
$("#button-login_background_preview").click (function (e) {
var icon_name = $("select#login_background option:selected").val();
var icon_path = "<?php echo $config['homeurl']; ?>/images/backgrounds/" + icon_name;

74
pandora_console/godmode/update_manager/update_manager.online.php
View File

@ -30,8 +30,11 @@ enterprise_include_once("include/functions_update_manager.php");
$current_package = update_manager_get_current_package();
echo "<p><b>" . sprintf(__("The last version of package installed is: %d"),
$current_package) . "</b></p>";
if(!enterprise_installed()){
$open=true;
}
$memory_limit = ini_get("memory_limit");
@ -59,27 +62,24 @@ if ($memory_limit < 100) {
/* Translators: Do not translade Update Manager, it's the name of the program */
ui_print_info_message(
'<p>' .
__('The new <a href="http://updatemanager.sourceforge.net">Update Manager</a> client is shipped with Pandora FMS It helps system administrators to update their Pandora FMS automatically, since the Update Manager does the task of getting new modules, new plugins and new features (even full migrations tools for future versions) automatically.') .
'</p>' .
'<p>' .
__('Update Manager is one of the most advanced features of Pandora FMS Enterprise version, for more information visit <a href="http://pandorafms.com">http://pandorafms.com</a>.') .
'</p>' .
'<p>' .
__('Update Manager sends anonymous information about Pandora FMS usage (number of agents and modules running). To disable it, remove remote server address from Update Manager plugin setup.') .
'</p>');
echo "<div id='box_online' style='text-align: center;'>";
echo "<span class='loading' style=''>";
echo "<img src='images/wait.gif' />";
echo "</span>";
echo "<div id='box_online' style='padding-top:40px;padding-bottom:40px;' class='cargatextodialogo'>";
echo "<span class='loading' style='font-size:18pt;'>";
echo "<img src='images/wait.gif' />";
echo "</span><br><br>";
echo "<div><b>".__('The last version of package installed is:')."</b></div><br>";
echo "<div style='color:#82b92e;font-size:40pt;font-weight:bold;'>".$current_package."</div>";
echo "<div class='checking_package' style='width:100%; text-align: center; display: none;'>";
echo "<div class='checking_package' style='font-size:18pt;width:100%; text-align: center; display: none;'>";
echo __('Checking for the newest package.');
echo "</div>";
echo "<div class='downloading_package' style='width:100%; text-align: center; display: none;'>";
echo "<div class='downloading_package' style='font-size:18pt;width:100%; text-align: center; display: none;'>";
echo __('Downloading for the newest package.');
echo "</div>";
@ -87,11 +87,45 @@ echo "<div id='box_online' style='text-align: center;'>";
echo "<div class='progressbar' style='display: none;'><img class='progressbar_img' src='' /></div>";
echo "</div>";
/* Hello there! :)
We added some of what seems to be "buggy" messages to the openSource version recently. This is not to force open-source users to move to the enterprise version, this is just to inform people using Pandora FMS open source that it requires skilled people to maintain and keep it running smoothly without professional support. This does not imply open-source version is limited in any way. If you check the recently added code, it contains only warnings and messages, no limitations except one: we removed the option to add custom logo in header. In the Update Manager section, it warns about the 'danger’ of applying automated updates without a proper backup, remembering in the process that the Enterprise version comes with a human-tested package. Maintaining an OpenSource version with more than 500 agents is not so easy, that's why someone using a Pandora with 8000 agents should consider asking for support. It's not a joke, we know of many setups with a huge number of agents, and we hate to hear that “its becoming unstable and slow” :(
You can of course remove the warnings, that's why we include the source and do not use any kind of trick. And that's why we added here this comment, to let you know this does not reflect any change in our opensource mentality of does the last 14 years.
*/
if($open){
echo "<br><br><div id='updatemodal' class='publienterprisehide' title='Community version' style=''><img data-title='Enterprise version' class='img_help forced_title' data-use_title_for_force_title='1' src='images/icono_exclamacion_2.png'></div><br>
";
}
$enterprise = enterprise_hook('update_manager_enterprise_main');
if ($enterprise == ENTERPRISE_NOT_HOOK) {
//Open view
update_manager_main();
}
?>
?>
<script>
$(document).ready(function() {
$('body').append( "<div id='opacidad' style='position:fixed;background:black;opacity:0.6;z-index:1'></div>" );
jQuery.get ("ajax.php",
{
"page": "general/alert_enterprise",
"message":"infomodal"},
function (data, status) {
$("#alert_messages").hide ()
.empty ()
.append (data)
.show ();
},
"html"
);
return false;
});
</script>

32
pandora_console/godmode/users/configure_profile.php
View File

@ -250,13 +250,13 @@ if ($id_profile || $new_profile) {
$row['input'] = html_print_checkbox ('agent_view', 1, $agent_view, true);
$table->data['AR'] = $row;
$row = array();
$row['name'] = __('Edit agents');
$row['input'] = html_print_checkbox ('agent_edit', 1, $agent_edit, true, false, 'autoclick_profile_users(\'agent_view\', \'false\')');
$table->data['AW'] = $row;
$row = array();
$row['name'] = __('Disable agents');
$row['input'] = html_print_checkbox ('agent_disable', 1, $agent_disable, true, false, 'autoclick_profile_users(\'agent_view\', \'agent_edit\')');
$row['input'] = html_print_checkbox ('agent_disable', 1, $agent_disable, true);
$table->data['AD'] = $row;
$row = array();
$row['name'] = __('Edit agents');
$row['input'] = html_print_checkbox ('agent_edit', 1, $agent_edit, true, false, 'autoclick_profile_users(\'agent_edit\',\'agent_view\', \'agent_disable\')');
$table->data['AW'] = $row;
$table->data[] = '<hr>';
// Alerts
@ -266,7 +266,7 @@ if ($id_profile || $new_profile) {
$table->data['LW'] = $row;
$row = array();
$row['name'] = __('Manage alerts');
$row['input'] = html_print_checkbox ('alert_management', 1, $alert_management, true, false, 'autoclick_profile_users(\'alert_edit\', \'false\')');
$row['input'] = html_print_checkbox ('alert_management', 1, $alert_management, true, false, 'autoclick_profile_users(\'alert_management\', \'alert_edit\', \'false\')');
$table->data['LM'] = $row;
$table->data[] = '<hr>';
@ -277,11 +277,11 @@ if ($id_profile || $new_profile) {
$table->data['ER'] = $row;
$row = array();
$row['name'] = __('Edit events');
$row['input'] = html_print_checkbox ('event_edit', 1, $event_edit, true, false, 'autoclick_profile_users(\'event_view\', \'false\')');
$row['input'] = html_print_checkbox ('event_edit', 1, $event_edit, true, false, 'autoclick_profile_users(\'event_edit\', \'event_view\', \'false\')');
$table->data['EW'] = $row;
$row = array();
$row['name'] = __('Manage events');
$row['input'] = html_print_checkbox ('event_management', 1, $event_management, true, false, 'autoclick_profile_users(\'event_view\', \'event_edit\')');
$row['input'] = html_print_checkbox ('event_management', 1, $event_management, true, false, 'autoclick_profile_users(\'event_management\', \'event_view\', \'event_edit\')');
$table->data['EM'] = $row;
$table->data[] = '<hr>';
@ -292,11 +292,11 @@ if ($id_profile || $new_profile) {
$table->data['RR'] = $row;
$row = array();
$row['name'] = __('Edit reports');
$row['input'] = html_print_checkbox ('report_edit', 1, $report_edit, true, false, 'autoclick_profile_users(\'report_view\', \'false\')');
$row['input'] = html_print_checkbox ('report_edit', 1, $report_edit, true, false, 'autoclick_profile_users(\'report_edit\', \'report_view\', \'false\')');
$table->data['RW'] = $row;
$row = array();
$row['name'] = __('Manage reports');
$row['input'] = html_print_checkbox ('report_management', 1, $report_management, true, false, 'autoclick_profile_users(\'report_view\', \'report_edit\')');
$row['input'] = html_print_checkbox ('report_management', 1, $report_management, true, false, 'autoclick_profile_users(\'report_management\', \'report_view\', \'report_edit\')');
$table->data['RM'] = $row;
$table->data[] = '<hr>';
@ -307,11 +307,11 @@ if ($id_profile || $new_profile) {
$table->data['MR'] = $row;
$row = array();
$row['name'] = __('Edit network maps');
$row['input'] = html_print_checkbox ('map_edit', 1, $map_edit, true, false, 'autoclick_profile_users(\'map_view\', \'false\')');
$row['input'] = html_print_checkbox ('map_edit', 1, $map_edit, true, false, 'autoclick_profile_users(\'map_edit\', \'map_view\', \'false\')');
$table->data['MW'] = $row;
$row = array();
$row['name'] = __('Manage network maps');
$row['input'] = html_print_checkbox ('map_management', 1, $map_management, true, false, 'autoclick_profile_users(\'map_view\', \'map_edit\')');
$row['input'] = html_print_checkbox ('map_management', 1, $map_management, true, false, 'autoclick_profile_users(\'map_management\', \'map_view\', \'map_edit\')');
$table->data['MM'] = $row;
$table->data[] = '<hr>';
@ -322,11 +322,11 @@ if ($id_profile || $new_profile) {
$table->data['VR'] = $row;
$row = array();
$row['name'] = __('Edit visual console');
$row['input'] = html_print_checkbox ('vconsole_edit', 1, $vconsole_edit, true, false, 'autoclick_profile_users(\'vconsole_view\', \'false\')');
$row['input'] = html_print_checkbox ('vconsole_edit', 1, $vconsole_edit, true, false, 'autoclick_profile_users(\'vconsole_edit\', \'vconsole_view\', \'false\')');
$table->data['VW'] = $row;
$row = array();
$row['name'] = __('Manage visual console');
$row['input'] = html_print_checkbox ('vconsole_management', 1, $vconsole_management, true, false, 'autoclick_profile_users(\'vconsole_view\', \'vconsole_edit\')');
$row['input'] = html_print_checkbox ('vconsole_management', 1, $vconsole_management, true, false, 'autoclick_profile_users(\'vconsole_management\', \'vconsole_view\', \'vconsole_edit\')');
$table->data['VM'] = $row;
$table->data[] = '<hr>';
@ -337,11 +337,11 @@ if ($id_profile || $new_profile) {
$table->data['IR'] = $row;
$row = array();
$row['name'] = __('Edit incidents');
$row['input'] = html_print_checkbox ('incident_edit', 1, $incident_edit, true, false, 'autoclick_profile_users(\'incident_view\', \'false\')');
$row['input'] = html_print_checkbox ('incident_edit', 1, $incident_edit, true, false, 'autoclick_profile_users(\'incident_edit\', \'incident_view\', \'false\')');
$table->data['IW'] = $row;
$row = array();
$row['name'] = __('Manage incidents');
$row['input'] = html_print_checkbox ('incident_management', 1, $incident_management, true, false, 'autoclick_profile_users(\'incident_view\', \'incident_edit\');');
$row['input'] = html_print_checkbox ('incident_management', 1, $incident_management, true, false, 'autoclick_profile_users(\'incident_management\', \'incident_view\', \'incident_edit\');');
$table->data['IM'] = $row;
$table->data[] = '<hr>';

BIN
pandora_console/images/agent_mc.menu.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 323 B

BIN
pandora_console/images/brick.menu.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 392 B

BIN
pandora_console/images/custom_logo/pandora_logo_head.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

BIN
pandora_console/images/custom_logo/pandora_logo_head_2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.7 KiB

BIN
pandora_console/images/custom_logo/pandora_logo_head_3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
pandora_console/images/custom_logo/pandora_logo_head_4.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
pandora_console/images/custom_logo_login/artica_logo.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.9 KiB

BIN
pandora_console/images/custom_logo_login/artica_logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.5 KiB

BIN
pandora_console/images/custom_logo_login/login_logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
pandora_console/images/custom_logo_login/none.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 285 B

BIN
pandora_console/images/custom_logo_login/none.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 123 B

BIN
pandora_console/images/custom_logo_login/pandora_logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
pandora_console/images/group.menu.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 348 B

BIN
pandora_console/images/icono_cerrar.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 284 B

BIN
pandora_console/images/icono_exclamacion_2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
pandora_console/images/icono_info.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
pandora_console/images/icono_popup.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
pandora_console/images/logo_citrix.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
pandora_console/images/logo_exchange.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.3 KiB

BIN
pandora_console/images/logo_oracle.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.5 KiB

BIN
pandora_console/images/logo_sap.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.5 KiB

BIN
pandora_console/images/pandora.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 318 B

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
pandora_console/images/pandora_2.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 318 B

BIN
pandora_console/images/qrcode_icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 391 B

0
pandora_console/images/qrcode_icon.jpg → pandora_console/images/qrcode_icon_2.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 681 B

After

Width:  |  Height:  |  Size: 681 B

17
pandora_console/include/ajax/module.php
View File

@ -30,6 +30,7 @@ $add_module_relation = (bool) get_parameter('add_module_relation');
$remove_module_relation = (bool) get_parameter('remove_module_relation');
$change_module_relation_updates = (bool) get_parameter('change_module_relation_updates');
$get_id_tag = (bool) get_parameter('get_id_tag', 0);
$get_type = (bool) get_parameter('get_type', 0);
$list_modules = (bool) get_parameter('list_modules', 0);
@ -50,7 +51,6 @@ if ($get_plugin_macros) {
return;
}
if ($search_modules) {
if ( https_is_running() ) {
header('Content-type: application/json');
@ -72,7 +72,6 @@ if ($search_modules) {
return;
}
if ($get_module_detail) {
// This script is included manually to be included after jquery and avoid error
ui_include_time_picker();
@ -317,7 +316,6 @@ if ($get_module_detail) {
return;
}
if ($get_module_autocomplete_input) {
$id_agent = (int) get_parameter("id_agent");
@ -330,7 +328,6 @@ if ($get_module_autocomplete_input) {
return;
}
if ($add_module_relation) {
$result = false;
$id_module_a = (int) get_parameter("id_module_a");
@ -364,7 +361,6 @@ if ($add_module_relation) {
return;
}
if ($remove_module_relation) {
$id_relation = (int) get_parameter("id_relation");
if ($id_relation > 0) {
@ -375,7 +371,6 @@ if ($remove_module_relation) {
return;
}
if ($change_module_relation_updates) {
$id_relation = (int) get_parameter("id_relation");
if ($id_relation > 0) {
@ -386,7 +381,6 @@ if ($change_module_relation_updates) {
return;
}
if ($get_id_tag) {
$tag_name = get_parameter('tag_name');
@ -1054,4 +1048,13 @@ if ($list_modules) {
}
if ($get_type) {
$id_module = (int) get_parameter("id_module");
$module = modules_get_agentmodule($id_module);
$graph_type = return_graphtype ($module["id_tipo_modulo"]);
echo $graph_type;
return;
}
?>

5
pandora_console/include/ajax/visual_console_builder.ajax.php
View File

@ -153,7 +153,7 @@ switch ($action) {
if ($id_custom_graph != 0) {
$img = custom_graphs_print(
$id_custom_graph, $height, $width, $period,
true, true, 0, true, $background_color);
null, true, 0, true, $background_color);
}
else {
$img = grafico_modulo_sparse($id_agent_module,
@ -189,7 +189,8 @@ switch ($action) {
case 'get_layout_data':
$layoutData = db_get_row_filter('tlayout_data',
array('id' => $id_element));
$layoutData['height'] = $layoutData['height'] + 60;
$layoutData['width'] = $layoutData['width'] + 60;
echo json_encode($layoutData);
break;

2
pandora_console/include/config_process.php
View File

@ -22,7 +22,7 @@
/**
* Pandora build version and version
*/
$build_version = 'PC160921';
$build_version = 'PC161017';
$pandora_version = 'v6.1dev';
// Do not overwrite default timezone set if defined.

10
pandora_console/include/functions.php
View File

@ -2070,11 +2070,17 @@ function delete_dir($dir) {
return rmdir($dir);
}
/**
* Returns 1 if the data contains a codified image (base64)
*/
function is_image_data ($data) {
return (substr($data,0,10) == "data:image");
}
/**
* Returns 1 if this is Snapshot data, 0 otherwise
* Looks for two or more carriage returns.
*/
function is_snapshot_data ($data) {
// TODO IDEA: In the future, we can set a variable in setup
@ -2084,7 +2090,7 @@ function is_snapshot_data ($data) {
$temp = array();
$count = preg_match_all ("/\n/", $data, $temp);
if ($count > 2)
if ( ($count > 2) || (is_image_data($data)) )
return 1;
else
return 0;

39
pandora_console/include/functions_config.php
View File

@ -53,8 +53,7 @@ function config_update_value ($token, $value) {
}
if ($token == 'ad_adv_perms') {
$value = str_replace(array("\r\n", "\r", "\n"), ";",
io_safe_output($value));
$value = io_safe_output($value);
}
if ($token == 'default_assign_tags') {
@ -410,6 +409,8 @@ function config_update_config () {
$error_update[] = __('Big Operatiopn Step to purge old data');
if (!config_update_value ('small_operation_step_datos_purge', get_parameter ('small_operation_step_datos_purge')))
$error_update[] = __('Small Operation Step to purge old data');
if (!config_update_value ('num_past_special_days', get_parameter ('num_past_special_days')))
$error_update[] = __('Retention period of past special days');
/////////////
break;
@ -462,8 +463,15 @@ function config_update_config () {
$error_update[] = __('Font size');
if (!config_update_value ('flash_charts', (bool) get_parameter ('flash_charts')))
$error_update[] = __('Interactive charts');
if (!config_update_value ('custom_logo', (string) get_parameter ('custom_logo')))
$error_update[] = __('Custom logo');
if (!config_update_value ('custom_logo', (string) get_parameter ('custom_logo')))
$error_update[] = __('Custom logo');
if (!config_update_value ('custom_logo_login', (string) get_parameter ('custom_logo_login')))
$error_update[] = __('Custom logo login');
if (!config_update_value ('login_background', (string) get_parameter ('login_background')))
$error_update[] = __('Login background');
if (!config_update_value ('vc_refr', get_parameter('vc_refr')))
@ -488,6 +496,8 @@ function config_update_config () {
$error_update[] = __('Default icon in GIS');
if (!config_update_value ('autohidden_menu', get_parameter('autohidden_menu')))
$error_update[] = __('Autohidden menu');
if (!config_update_value ('fixed_graph', get_parameter('fixed_graph')))
$error_update[] = __('Fixed graph');
if (!config_update_value ('fixed_header', get_parameter('fixed_header')))
$error_update[] = __('Fixed header');
if (!config_update_value ('fixed_menu', get_parameter('fixed_menu')))
@ -835,6 +845,10 @@ function config_process_config () {
config_update_value ('small_operation_step_datos_purge', 1000);
}
if (!isset ($config["num_past_special_days"])) {
config_update_value ('num_past_special_days', 0);
}
if (!isset ($config["event_purge"])) {
config_update_value ('event_purge', 15);
}
@ -1027,13 +1041,24 @@ function config_process_config () {
config_update_value ('fixed_header', false);
}
if (!isset ($config["fixed_graph"])) {
config_update_value ('fixed_graph', false);
}
if (!isset ($config["fixed_menu"])) {
config_update_value ('fixed_menu', false);
}
if (!isset ($config["custom_logo"])) {
config_update_value ('custom_logo', 'pandora_logo_head.png');
config_update_value ('custom_logo', 'pandora_logo_head_4.png');
}
if (!isset ($config["custom_logo_login"])) {
config_update_value ('custom_logo_login', 'login_logo.png');
}
if (!isset ($config['history_db_enabled'])) {
config_update_value ( 'history_db_enabled', false);
@ -1189,14 +1214,14 @@ function config_process_config () {
config_update_value ( 'ad_domain', '');
}
if (!isset ($config["ad_adv_perms"])) {
if (!isset ($config['ad_adv_perms'])) {
config_update_value ('ad_adv_perms', '');
}
else{
$temp_ad_adv_perms = array();
if (isset($config['ad_adv_perms'])) {
if (!empty($config['ad_adv_perms'])) {
$temp_ad_adv_perms = explode(';', io_safe_output($config['ad_adv_perms']));
$temp_ad_adv_perms = $config['ad_adv_perms'];
}
}
$config['ad_adv_perms'] = $temp_ad_adv_perms;

7
pandora_console/include/functions_custom_graphs.php
View File

@ -164,10 +164,10 @@ function custom_graphs_print($id_graph, $height, $width, $period,
$background_color = 'white', $modules_param = array(), $homeurl = '',
$name_list = array(), $unit_list = array(), $show_last = true,
$show_max = true, $show_min = true, $show_avg = true, $ttl = 1,
$dashboard = false, $vconsole = false) {
$dashboard = false, $vconsole = false, $percentil = null) {
global $config;
if ($id_graph == 0) {
$graph_conf['stacked'] = CUSTOM_GRAPH_LINE;
}
@ -244,7 +244,8 @@ function custom_graphs_print($id_graph, $height, $width, $period,
$show_avg,
$labels,
$dashboard,
$vconsole);
$vconsole,
$percentil);
if ($return)
return $output;

55
pandora_console/include/functions_graph.php
View File

@ -465,7 +465,6 @@ function grafico_modulo_sparse_data_chart (&$chart, &$chart_data_extra, &$long_i
}
}
if (!is_null($percentil)) {
$avg = array_map(function($item) { return $item['sum'];}, $chart);
@ -863,10 +862,11 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
if ($only_image) {
$flash_chart = false;
}
$water_mark = array('file' =>
$config['homedir'] . "/images/logo_vertical_water.png",
'url' => ui_get_full_url("images/logo_vertical_water.png", false, false, false));
if($config["fixed_graph"] == false){
$water_mark = array('file' =>
$config['homedir'] . "/images/.png",
'url' => ui_get_full_url("images/logo_vertical_water.png", false, false, false));
}
if ($config['type_module_charts'] === 'area') {
if ($compare === 'separated') {
@ -874,7 +874,7 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
area_graph($flash_chart, $chart, $width, $height/2, $color,
$legend, $long_index,
ui_get_full_url("images/image_problem.opaque.png", false, false, false),
"", $unit, $homeurl, $water_mark, $config['fontpath'],
$title, $unit, $homeurl, $water_mark, $config['fontpath'],
$config['font_size'], $unit, $ttl, $series_type,
$chart_extra_data, $warning_min, $critical_min,
$adapt_key, false, $series_suffix_str, $menu,
@ -883,7 +883,7 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
area_graph($flash_chart, $chart_prev, $width, $height/2,
$color_prev, $legend_prev, $long_index_prev,
ui_get_full_url("images/image_problem.opaque.png", false, false, false),
"", $unit, $homeurl, $water_mark, $config['fontpath'],
$title, $unit, $homeurl, $water_mark, $config['fontpath'],
$config['font_size'], $unit, $ttl, $series_type_prev,
$chart_extra_data, $warning_min, $critical_min,
$adapt_key, false, $series_suffix_str, $menu,
@ -895,7 +895,7 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
area_graph($flash_chart, $chart, $width, $height, $color,
$legend, $long_index,
ui_get_full_url("images/image_problem.opaque.png", false, false, false),
"", $unit, $homeurl, $water_mark, $config['fontpath'],
$title, $unit, $homeurl, $water_mark, $config['fontpath'],
$config['font_size'], $unit, $ttl, $series_type,
$chart_extra_data, $warning_min, $critical_min,
$adapt_key, false, $series_suffix_str, $menu,
@ -976,7 +976,8 @@ function graphic_combined_module ($module_list, $weight_list, $period,
$only_image = false, $homeurl = '', $ttl = 1, $projection = false,
$prediction_period = false, $background_color = 'white',
$name_list = array(), $unit_list = array(), $show_last = true, $show_max = true,
$show_min = true, $show_avg = true, $labels = array(), $dashboard = false, $vconsole = false) {
$show_min = true, $show_avg = true, $labels = array(), $dashboard = false,
$vconsole = false, $percentil = null) {
global $config;
global $graphic_type;
@ -1704,9 +1705,28 @@ function graphic_combined_module ($module_list, $weight_list, $period,
}
break;
default:
foreach ($graph_values as $graph_group => $point) {
foreach ($point as $timestamp_point => $point_value) {
$temp[$timestamp_point][$graph_group] = $point_value;
if (!is_null($percentil)) {
foreach ($graph_values as $graph_group => $point) {
foreach ($point as $timestamp_point => $point_value) {
$temp[$timestamp_point][$graph_group] = $point_value;
}
$percentile_value = get_percentile($percentil, $point);
$percentil_result[$graph_group] = array_fill ( 0, count($point), $percentile_value);
$series_type[$graph_group] = 'line';
$agent_name = io_safe_output(
modules_get_agentmodule_agent_name ($module_list[$graph_group]));
$module_name = io_safe_output(
modules_get_agentmodule_name ($module_list[$graph_group]));
$module_name_list['percentil'.$graph_group] = __('Percentile %dº', $percentil) . __(' of module ') . $agent_name .' / ' . $module_name . ' (' . $percentile_value . ' ' . $unit . ') ';
}
}
else {
foreach ($graph_values as $graph_group => $point) {
foreach ($point as $timestamp_point => $point_value) {
$temp[$timestamp_point][$graph_group] = $point_value;
}
}
}
break;
@ -1786,7 +1806,7 @@ function graphic_combined_module ($module_list, $weight_list, $period,
return area_graph($flash_charts, $graph_values, $width,
$height, $color, $module_name_list, $long_index,
ui_get_full_url("images/image_problem.opaque.png", false, false, false),
"", "", $homeurl, $water_mark, $config['fontpath'],
$title, "", $homeurl, $water_mark, $config['fontpath'],
$fixed_font_size, $unit, $ttl, array(), array(), 0, 0, '',
false, '', true, $background_color,$dashboard, $vconsole);
break;
@ -1795,22 +1815,23 @@ function graphic_combined_module ($module_list, $weight_list, $period,
return stacked_area_graph($flash_charts, $graph_values,
$width, $height, $color, $module_name_list, $long_index,
ui_get_full_url("images/image_problem.opaque.png", false, false, false),
"", "", $water_mark, $config['fontpath'], $fixed_font_size,
$title, "", $water_mark, $config['fontpath'], $fixed_font_size,
"", $ttl, $homeurl, $background_color,$dashboard, $vconsole);
break;
case CUSTOM_GRAPH_LINE:
return line_graph($flash_charts, $graph_values, $width,
$height, $color, $module_name_list, $long_index,
ui_get_full_url("images/image_problem.opaque.png", false, false, false),
"", "", $water_mark, $config['fontpath'], $fixed_font_size,
$unit, $ttl, $homeurl, $background_color,$dashboard, $vconsole);
$title, "", $water_mark, $config['fontpath'], $fixed_font_size,
$unit, $ttl, $homeurl, $background_color, $dashboard,
$vconsole, $series_type, $percentil_result);
break;
case CUSTOM_GRAPH_STACKED_LINE:
return stacked_line_graph($flash_charts, $graph_values,
$width, $height, $color, $module_name_list, $long_index,
ui_get_full_url("images/image_problem.opaque.png", false, false, false),
"", "", $water_mark, $config['fontpath'], $fixed_font_size,
"", $ttl, $homeurl, $background_color,$dashboard, $vconsole);
"", $ttl, $homeurl, $background_color, $dashboard, $vconsole);
break;
case CUSTOM_GRAPH_BULLET_CHART_THRESHOLD:
case CUSTOM_GRAPH_BULLET_CHART:

54
pandora_console/include/functions_groupview.php
View File

@ -115,6 +115,7 @@ function groupview_get_all_data ($id_user = false, $user_strict = false, $acltag
$list[$group['id_grupo']]['_monitors_ok_'] = 0;
$list[$group['id_grupo']]['_agents_not_init_'] = 0;
$list[$group['id_grupo']]['_agents_unknown_'] = 0;
$list[$group['id_grupo']]['_agents_critical_'] = 0;
$list[$group['id_grupo']]['_total_agents_'] = 0;
$list[$group['id_grupo']]["_monitor_checks_"] = 0;
$list[$group['id_grupo']]["_monitor_not_normal_"] = 0;
@ -167,14 +168,19 @@ function groupview_get_all_data ($id_user = false, $user_strict = false, $acltag
FROM tmetaconsole_agent
WHERE id_grupo = " . $group['id_grupo'] );
foreach ($agents as $agent) {
if (($agent['critical_count'] == 0) && ($agent['warning_count'] == 0) && ($group_agents['disabled'] == 0) && ($agent['normal_count'] == 0)) {
if ($agent['unknown_count'] > 0) {
$list[$group['id_grupo']]['_agents_unknown_'] += 1;
}
if ($agent['critical_count'] > 0) {
$list[$group['id_grupo']]['_agents_critical_'] += 1;
}
if (($agent['critical_count'] == 0) && ($agent['warning_count'] == 0) && ($group_agents['disabled'] == 0) && ($agent['normal_count'] == 0) && ($agent['unknown_count'] == 0)) {
if ($agent['notinit_count'] > 0) {
$list[$group['id_grupo']]['_agents_not_init_'] += 1;
else {
if (($agent['critical_count'] == 0) && ($agent['warning_count'] == 0) && ($group_agents['disabled'] == 0) && ($agent['normal_count'] == 0)) {
if ($agent['unknown_count'] > 0) {
$list[$group['id_grupo']]['_agents_unknown_'] += 1;
}
}
if (($agent['critical_count'] == 0) && ($agent['warning_count'] == 0) && ($group_agents['disabled'] == 0) && ($agent['normal_count'] == 0) && ($agent['unknown_count'] == 0)) {
if ($agent['notinit_count'] > 0) {
$list[$group['id_grupo']]['_agents_not_init_'] += 1;
}
}
}
}
@ -261,6 +267,12 @@ function groupview_get_all_data ($id_user = false, $user_strict = false, $acltag
'status' => AGENT_STATUS_UNKNOWN),
array ('COUNT(*) as total'), $access, false);
$list[$group['id_grupo']]['_agents_unknown_'] = isset ($agent_unknown[0]['total']) ? $agent_unknown[0]['total'] : 0;
$agent_critical = agents_get_agents(array (
'disabled' => 0,
'id_grupo' => $group['id_grupo'],
'status' => AGENT_STATUS_CRITICAL),
array ('COUNT(*) as total'), $access, false);
$list[$group['id_grupo']]['_agents_critical_'] = isset ($agent_critical[0]['total']) ? $agent_critical[0]['total'] : 0;
$agent_total = agents_get_agents(array (
'disabled' => 0,
'id_grupo' => $group['id_grupo']),
@ -335,6 +347,7 @@ function groupview_get_all_data ($id_user = false, $user_strict = false, $acltag
$list[$i]['_total_agents_'] = (int) tags_get_total_agents ($id, $acltags, $agent_filter, $module_filter, $config["realtimestats"]);
$list[$i]['_agents_unknown_'] = (int) tags_get_unknown_agents ($id, $acltags, $agent_filter, $module_filter, $config["realtimestats"]);
$list[$i]['_agents_critical_'] = (int) tags_get_critical_agents ($id, $acltags, $agent_filter, $module_filter, $config["realtimestats"]);
$list[$i]['_agents_not_init_'] = (int) tags_get_not_init_agents ($id, $acltags, $agent_filter, $module_filter, $config["realtimestats"]);
$list[$i]['_monitors_ok_'] = (int) tags_get_normal_monitors ($id, $acltags, $agent_filter, $module_filter);
$list[$i]['_monitors_critical_'] = (int) tags_get_critical_monitors ($id, $acltags, $agent_filter, $module_filter);
@ -728,6 +741,7 @@ function groupview_get_data ($id_user = false, $user_strict = false, $acltags, $
$list[$group['id_grupo']]['_monitors_ok_'] = 0;
$list[$group['id_grupo']]['_agents_not_init_'] = 0;
$list[$group['id_grupo']]['_agents_unknown_'] = 0;
$list[$group['id_grupo']]['_agents_critical_'] = 0;
$list[$group['id_grupo']]['_total_agents_'] = 0;
$list[$group['id_grupo']]["_monitor_checks_"] = 0;
$list[$group['id_grupo']]["_monitor_not_normal_"] = 0;
@ -780,14 +794,19 @@ function groupview_get_data ($id_user = false, $user_strict = false, $acltags, $
FROM tmetaconsole_agent
WHERE id_grupo = " . $group['id_grupo'] );
foreach ($agents as $agent) {
if (($agent['critical_count'] == 0) && ($agent['warning_count'] == 0) && ($group_agents['disabled'] == 0) && ($agent['normal_count'] == 0)) {
if ($agent['unknown_count'] > 0) {
$list[$group['id_grupo']]['_agents_unknown_'] += 1;
}
if ($agent['critical_count'] > 0) {
$list[$group['id_grupo']]['_agents_critical_'] += 1;
}
if (($agent['critical_count'] == 0) && ($agent['warning_count'] == 0) && ($group_agents['disabled'] == 0) && ($agent['normal_count'] == 0) && ($agent['unknown_count'] == 0)) {
if ($agent['notinit_count'] > 0) {
$list[$group['id_grupo']]['_agents_not_init_'] += 1;
else {
if (($agent['critical_count'] == 0) && ($agent['warning_count'] == 0) && ($group_agents['disabled'] == 0) && ($agent['normal_count'] == 0)) {
if ($agent['unknown_count'] > 0) {
$list[$group['id_grupo']]['_agents_unknown_'] += 1;
}
}
if (($agent['critical_count'] == 0) && ($agent['warning_count'] == 0) && ($group_agents['disabled'] == 0) && ($agent['normal_count'] == 0) && ($agent['unknown_count'] == 0)) {
if ($agent['notinit_count'] > 0) {
$list[$group['id_grupo']]['_agents_not_init_'] += 1;
}
}
}
}
@ -874,6 +893,12 @@ function groupview_get_data ($id_user = false, $user_strict = false, $acltags, $
'status' => AGENT_STATUS_UNKNOWN),
array ('COUNT(*) as total'), $access, false);
$list[$group['id_grupo']]['_agents_unknown_'] = isset ($agent_unknown[0]['total']) ? $agent_unknown[0]['total'] : 0;
$agent_critical = agents_get_agents(array (
'disabled' => 0,
'id_grupo' => $group['id_grupo'],
'status' => AGENT_STATUS_CRITICAL),
array ('COUNT(*) as total'), $access, false);
$list[$group['id_grupo']]['_agents_critical_'] = isset ($agent_critical[0]['total']) ? $agent_critical[0]['total'] : 0;
$agent_total = agents_get_agents(array (
'disabled' => 0,
'id_grupo' => $group['id_grupo']),
@ -952,6 +977,7 @@ function groupview_get_data ($id_user = false, $user_strict = false, $acltags, $
$list[$i]['_total_agents_'] = (int) tags_get_total_agents ($id, $acltags, $agent_filter, $module_filter, $config["realtimestats"]);
$list[$i]['_agents_unknown_'] = (int) tags_get_unknown_agents ($id, $acltags, $agent_filter, $module_filter, $config["realtimestats"]);
$list[$i]['_agents_not_init_'] = (int) tags_get_not_init_agents ($id, $acltags, $agent_filter, $module_filter, $config["realtimestats"]);
$list[$i]['_agents_critical_'] = (int) tags_get_critical_agents ($id, $acltags, $agent_filter, $module_filter, $config["realtimestats"]);
$list[$i]['_monitors_ok_'] = (int) tags_get_normal_monitors ($id, $acltags, $agent_filter, $module_filter);
$list[$i]['_monitors_critical_'] = (int) tags_get_critical_monitors ($id, $acltags, $agent_filter, $module_filter);
$list[$i]['_monitors_warning_'] = (int) tags_get_warning_monitors ($id, $acltags, $agent_filter, $module_filter);

31
pandora_console/include/functions_html.php
View File

@ -543,9 +543,9 @@ function html_print_select ($fields, $name, $selected = '', $script = '',
}
$output .= "</select>";
if ($modal){
if ($modal && !enterprise_installed()){
$output .= "
<div id='publienterprise' class='".$message."' title='Community version' style='display:inline;position:relative;top:10px;left:0px;margin-top: -2px !important; margin-left: 2px !important;'><img data-title='Enterprise version' class='img_help forced_title' data-use_title_for_force_title='1' src='images/alert_enterprise.png'></div>
<div id='".$message."' class='publienterprise' title='Community version' style='display:inline;position:relative;top:10px;left:0px;margin-top: -2px !important; margin-left: 2px !important;'><img data-title='Enterprise version' class='img_help forced_title' data-use_title_for_force_title='1' src='images/alert_enterprise.png'></div>
";
}
if ($return)
@ -709,9 +709,14 @@ function html_print_extended_select_for_time ($name, $selected = '',
if ( ! $selected ) {
foreach( $fields as $t_key => $t_value){
if ( $t_key != -1 ) { // -1 means 'custom'
$selected = $t_key;
break;
if ( $t_key != -1 ) {
if($nothing == ''){ // -1 means 'custom'
$selected = $t_key;
break;
} else {
$selected = $nothing;
break;
}
}
}
}
@ -1268,7 +1273,7 @@ function html_print_submit_button ($label = 'OK', $name = '', $disabled = false,
*
* @return string HTML code if return parameter is true.
*/
function html_print_button ($label = 'OK', $name = '', $disabled = false, $script = '', $attributes = '', $return = false, $imageButton = false) {
function html_print_button ($label = 'OK', $name = '', $disabled = false, $script = '', $attributes = '', $return = false, $imageButton = false,$modal=false,$message='') {
$output = '';
$alt = $title = '';
@ -1281,6 +1286,12 @@ function html_print_button ($label = 'OK', $name = '', $disabled = false, $scrip
if ($disabled)
$output .= ' disabled';
$output .= ' />';
if ($modal && !enterprise_installed()){
$output .= "
<div id='".$message."' class='publienterprise' title='Community version' style='display:inline;position:relative;top:10px;left:0px;margin-top: -2px !important; margin-left: 2px !important;'><img data-title='Enterprise version' class='img_help forced_title' data-use_title_for_force_title='1' src='images/alert_enterprise.png'></div>
";
}
if ($return)
return $output;
@ -1650,7 +1661,7 @@ function html_print_table (&$table, $return = false) {
*
* @return string HTML code if return parameter is true.
*/
function html_print_radio_button_extended ($name, $value, $label, $checkedvalue, $disabled, $script, $attributes, $return = false) {
function html_print_radio_button_extended ($name, $value, $label, $checkedvalue, $disabled, $script, $attributes, $return = false,$modal=false,$message='visualmodal') {
static $idcounter = 0;
$output = '';
@ -1675,6 +1686,12 @@ function html_print_radio_button_extended ($name, $value, $label, $checkedvalue,
$output .= '<label for="'.$htmlid.'">'. $label .'</label>' . "\n";
}
if ($modal && !enterprise_installed()){
$output .= "
<div id='".$message."' class='publienterprise' title='Community version' style='display:inline;position:relative;top:10px;left:0px;margin-top: -2px !important; margin-left: 2px !important;'><img data-title='Enterprise version' class='img_help forced_title' data-use_title_for_force_title='1' src='images/alert_enterprise.png'></div>
";
}
if ($return)
return $output;

4
pandora_console/include/functions_network_components.php
View File

@ -451,6 +451,10 @@ function network_components_create_module_from_network_component ($id_network_co
'max_timeout',
'max_retries',
'history_data',
'dynamic_interval',
'dynamic_min',
'dynamic_max',
'dynamic_two_tailed',
'min_warning',
'max_warning',
'str_warning',

315
pandora_console/include/functions_reporting.php
View File

@ -128,9 +128,15 @@ function reporting_make_reporting_data($report = null, $id_report,
$content['period'] = $period;
}
$content['style'] = json_decode(
io_safe_output($content['style']), true);
$content['style'] = json_decode(io_safe_output($content['style']), true);
if(isset($content['style']['name_label'])){
//Add macros name
$items_label = array();
$items_label['type'] = $content['type'];
$items_label['id_agent'] = $content['id_agent'];
$items_label['id_agent_module'] = $content['id_agent_module'];
$content['name'] = reporting_label_macro($items_label, $content['style']['name_label']);
}
switch (reporting_get_type($content)) {
case 'simple_graph':
$report['contents'][] =
@ -151,7 +157,9 @@ function reporting_make_reporting_data($report = null, $id_report,
$report['contents'][] =
reporting_availability(
$report,
$content);
$content,
$date,
$time);
break;
case 'sql':
$report['contents'][] = reporting_sql(
@ -2601,19 +2609,14 @@ function reporting_alert_report_group($report, $content) {
$data_row['template'] = db_get_value_filter('name', 'talert_templates',
array('id' => $alert['id_alert_template']));
$actions = db_get_all_rows_sql('SELECT name
FROM talert_actions
WHERE id IN (SELECT id_alert_action
FROM talert_template_module_actions
WHERE id_alert_template_module = ' . $alert['id_alert_template'] . ')');
$actions = alerts_get_alert_agent_module_actions ($alert['id']);
if (!empty($actions)) {
$row = db_get_row_sql('SELECT id_alert_action
FROM talert_templates
WHERE id IN (SELECT id_alert_template
FROM talert_template_modules
WHERE id = ' . $alert['id_alert_template'] . ')');
WHERE id = ' . $alert['id'] . ')');
$id_action = 0;
if (!empty($row))
@ -2622,16 +2625,13 @@ function reporting_alert_report_group($report, $content) {
// Prevent from void action
if (empty($id_action))
$id_action = 0;
}
else {
$actions = db_get_all_rows_sql('SELECT name
FROM talert_actions
WHERE id = ' . $id_action);
if (empty($actions)) {
$actions = array();
}
}
$data_row['action'] = array();
foreach ($actions as $action) {
$data_row['action'][] = $action['name'];
@ -2639,13 +2639,16 @@ function reporting_alert_report_group($report, $content) {
$data_row['fired'] = array();
$firedTimes = get_module_alert_fired(
$content['id_agent_module'],
$alert['id_alert_template'],
$alert['id_agent_module'],
$alert['id'],
(int) $content['period'],
(int) $report["datetime"]);
if (empty($firedTimes)) {
$firedTimes = array();
$firedTimes[0]['timestamp'] = '----------------------------';
}
foreach ($firedTimes as $fireTime) {
$data_row['fired'][] = $fireTime['timestamp'];
}
@ -2675,8 +2678,6 @@ function reporting_alert_report_agent($report, $content) {
if ($config['metaconsole']) {
$id_meta = metaconsole_get_id_server($content["server_name"]);
$server = metaconsole_get_connection_by_id ($id_meta);
metaconsole_connect($server);
}
@ -2700,87 +2701,69 @@ function reporting_alert_report_agent($report, $content) {
$data = array();
foreach ($alerts as $alert) {
$data_row = array();
$data_row['disabled'] = $alert['disabled'];
$data_row['module'] = db_get_value_filter('nombre', 'tagente_modulo',
array('id_agente_modulo' => $alert['id_agent_module']));
$data_row['template'] = db_get_value_filter('name', 'talert_templates',
array('id' => $alert['id_alert_template']));
switch ($config["dbtype"]) {
case "mysql":
case "postgresql":
$actions = db_get_all_rows_sql('SELECT name
FROM talert_actions
WHERE id IN (SELECT id_alert_action
FROM talert_template_module_actions
WHERE id_alert_template_module = ' . $alert['id_alert_template'] . ');');
break;
case "oracle":
$actions = db_get_all_rows_sql('SELECT name
FROM talert_actions
WHERE id IN (SELECT id_alert_action
FROM talert_template_module_actions
WHERE id_alert_template_module = ' . $alert['id_alert_template'] . ')');
break;
}
if (!empty($actions)) {
$row = db_get_row_sql('SELECT id_alert_action
FROM talert_templates
WHERE id IN (SELECT id_alert_template
FROM talert_template_modules
WHERE id = ' . $alert['id_alert_template'] . ')');
if (is_array($alerts) || is_object($alerts)) {
foreach ($alerts as $alert) {
$data_row = array();
$id_action = 0;
if (!empty($row))
$id_action = $row['id_alert_action'];
$data_row['disabled'] = $alert['disabled'];
// Prevent from void action
if (empty($id_action))
$data_row['module'] = db_get_value_filter('nombre', 'tagente_modulo',
array('id_agente_modulo' => $alert['id_agent_module']));
$data_row['template'] = db_get_value_filter('name', 'talert_templates',
array('id' => $alert['id_alert_template']));
$actions = alerts_get_alert_agent_module_actions ($alert['id']);
if (!empty($actions)) {
$row = db_get_row_sql('SELECT id_alert_action
FROM talert_templates
WHERE id IN (SELECT id_alert_template
FROM talert_template_modules
WHERE id = ' . $alert['id_alert_template'] . ')');
$id_action = 0;
$actions = db_get_all_rows_sql('SELECT name
FROM talert_actions
WHERE id = ' . $id_action);
if (!empty($row))
$id_action = $row['id_alert_action'];
// Prevent from void action
if (empty($id_action))
$id_action = 0;
}
else {
$actions = db_get_all_rows_sql('SELECT name
FROM talert_actions
WHERE id = ' . $id_action);
}
if (empty($actions)) {
$actions = array();
}
$data_row['action'] = array();
foreach ($actions as $action) {
$data_row['action'][] = $action['name'];
}
$data_row['fired'] = array();
$firedTimes = get_module_alert_fired(
$alert['id_agent_module'],
$alert['id'],
(int) $content['period'],
(int) $report["datetime"]);
if (empty($firedTimes)) {
$firedTimes = array();
$firedTimes[0]['timestamp'] = '----------------------------';
}
foreach ($firedTimes as $fireTime) {
$data_row['fired'][] = $fireTime['timestamp'];
}
$data[] = $data_row;
}
$data_row['action'] = array();
foreach ($actions as $action) {
$data_row['action'][] = $action['name'];
}
$data_row['fired'] = array();
$firedTimes = get_module_alert_fired(
$alert['id_agent_module'],
$alert['id_alert_template'],
(int) $content['period'],
(int) $report["datetime"]);
if (empty($firedTimes)) {
$firedTimes = array();
}
foreach ($firedTimes as $fireTime) {
$data_row['fired'][] = $fireTime['timestamp'];
}
$data[] = $data_row;
}
$return['data'] = $data;
if ($config['metaconsole']) {
@ -2845,7 +2828,9 @@ function reporting_alert_report_module($report, $content) {
}
$data = array();
foreach ($alerts as $alert) {
$data_row = array();
$data_row['disabled'] = $alert['disabled'];
@ -2853,25 +2838,7 @@ function reporting_alert_report_module($report, $content) {
$data_row['template'] = db_get_value_filter('name',
'talert_templates', array('id' => $alert['id_alert_template']));
switch ($config["dbtype"]) {
case "mysql":
case "postgresql":
$actions = db_get_all_rows_sql('SELECT name
FROM talert_actions
WHERE id IN (SELECT id_alert_action
FROM talert_template_module_actions
WHERE id_alert_template_module = ' . $alert['id_alert_template_module'] . ');');
break;
case "oracle":
$actions = db_get_all_rows_sql('SELECT name
FROM talert_actions
WHERE id IN (SELECT id_alert_action
FROM talert_template_module_actions
WHERE id_alert_template_module = ' . $alert['id_alert_template_module'] . ')');
break;
}
$actions = alerts_get_alert_agent_module_actions ($alert['id_alert_template_module']);
if (!empty($actions)) {
$row = db_get_row_sql('SELECT id_alert_action
@ -2881,43 +2848,41 @@ function reporting_alert_report_module($report, $content) {
WHERE id = ' . $alert['id_alert_template_module'] . ')');
$id_action = 0;
if (!empty($row))
$id_action = $row['id_alert_action'];
// Prevent from void action
if (empty($id_action))
$id_action = 0;
}
else {
$actions = db_get_all_rows_sql('SELECT name
FROM talert_actions
WHERE id = ' . $id_action);
if (empty($actions)) {
$actions = array();
}
}
$data_row['action'] = array();
foreach ($actions as $action) {
$data_row['action'][] = $action['name'];
}
$data_row['fired'] = array();
$firedTimes = get_module_alert_fired(
$content['id_agent_module'],
$alert['id_alert_template_module'],
(int) $content['period'],
(int) $report["datetime"]);
(int) $report["datetime"]);
if (empty($firedTimes)) {
$firedTimes = array();
$firedTimes[0]['timestamp'] = '----------------------------';
}
foreach ($firedTimes as $fireTime) {
$data_row['fired'][] = $fireTime['timestamp'];
}
$data[] = $data_row;
}
@ -3759,7 +3724,7 @@ function reporting_sql($report, $content) {
return reporting_check_structure_content($return);
}
function reporting_availability($report, $content) {
function reporting_availability($report, $content, $date=false, $time=false) {
global $config;
$return = array();
@ -3771,6 +3736,10 @@ function reporting_availability($report, $content) {
$content['name'] = __('Availability');
}
if($date){
$datetime_to = strtotime ($date . ' ' . $time);
}
$return['title'] = $content['name'];
$return["description"] = $content["description"];
$return["date"] = reporting_get_date_text(
@ -3811,9 +3780,22 @@ function reporting_availability($report, $content) {
$max = null;
$max_text = "";
$count = 0;
$style = io_safe_output($content['style']);
if($style['hide_notinit_agents']){
$aux_id_agents = $agents;
$i=0;
foreach ($items as $item) {
$utimestamp = db_get_value('utimestamp', 'tagente_datos', 'id_agente_modulo', $item['id_agent_module']);
if (($utimestamp === false) || (intval($utimestamp) > intval($datetime_to))){
unset($items[$i]);
}
$i++;
}
}
if (!empty($items)) {
foreach ($items as $item) {
foreach ($items as $item) {
//aaMetaconsole connection
$server_name = $item ['server_name'];
if (($config ['metaconsole'] == 1) && $server_name != '' && defined('METACONSOLE')) {
@ -4553,7 +4535,10 @@ function reporting_simple_graph($report, $content, $type = 'dinamic',
false,
'',
$time_compare_overlapped,
true);
true,
true,
'white',
($content['style']['percentil_95'] == 1) ? 95 : null);
}
break;
case 'data':
@ -5517,13 +5502,17 @@ function reporting_get_stats_alerts($data, $links = false) {
$table_al = html_get_predefined_table();
$tdata = array();
$tdata[0] = html_print_image('images/bell.png', true, array('title' => __('Defined alerts')));
$tdata[0] = html_print_image('images/bell.png', true, array('title' => __('Defined alerts')), false, false, false, true);
$tdata[1] = $data["monitor_alerts"] <= 0 ? '-' : $data["monitor_alerts"];
$tdata[1] = '<a class="big_data" href="' . $urls["monitor_alerts"] . '">' . $tdata[1] . '</a>';
$tdata[2] = html_print_image('images/bell_error.png', true, array('title' => __('Fired alerts')));
$tdata[3] = $data["monitor_alerts_fired"] <= 0 ? '-' : $data["monitor_alerts_fired"];
$tdata[3] = '<a style="color: ' . COL_ALERTFIRED . ';" class="big_data" href="' . $urls["monitor_alerts_fired"] . '">' . $tdata[3] . '</a>';
if($data["monitor_alerts"]>$data["total_agents"] && !enterprise_installed()) {
$tdata[2] = "<div id='alertagentmodal' class='publienterprise' title='Community version' style=''><img data-title='Enterprise version' class='img_help forced_title' data-use_title_for_force_title='1' src='images/alert_enterprise.png'></div>";
}
$tdata[3] = html_print_image('images/bell_error.png', true, array('title' => __('Fired alerts')), false, false, false, true);
$tdata[4] = $data["monitor_alerts_fired"] <= 0 ? '-' : $data["monitor_alerts_fired"];
$tdata[4] = '<a style="color: ' . COL_ALERTFIRED . ';" class="big_data" href="' . $urls["monitor_alerts_fired"] . '">' . $tdata[4] . '</a>';
$table_al->rowclass[] = '';
$table_al->data[] = $tdata;
@ -5585,29 +5574,29 @@ function reporting_get_stats_modules_status($data, $graph_width = 250, $graph_he
$table_mbs = html_get_predefined_table();
$tdata = array();
$tdata[0] = html_print_image('images/module_critical.png', true, array('title' => __('Monitor critical')));
$tdata[0] = html_print_image('images/module_critical.png', true, array('title' => __('Monitor critical')), false, false, false, true);
$tdata[1] = $data["monitor_critical"] <= 0 ? '-' : $data["monitor_critical"];
$tdata[1] = '<a style="color: ' . COL_CRITICAL . ';" class="big_data" href="' . $urls['monitor_critical'] . '">' . $tdata[1] . '</a>';
$tdata[2] = html_print_image('images/module_warning.png', true, array('title' => __('Monitor warning')));
$tdata[2] = html_print_image('images/module_warning.png', true, array('title' => __('Monitor warning')), false, false, false, true);
$tdata[3] = $data["monitor_warning"] <= 0 ? '-' : $data["monitor_warning"];
$tdata[3] = '<a style="color: ' . COL_WARNING_DARK . ';" class="big_data" href="' . $urls['monitor_warning'] . '">' . $tdata[3] . '</a>';
$table_mbs->rowclass[] = '';
$table_mbs->data[] = $tdata;
$tdata = array();
$tdata[0] = html_print_image('images/module_ok.png', true, array('title' => __('Monitor normal')));
$tdata[0] = html_print_image('images/module_ok.png', true, array('title' => __('Monitor normal')), false, false, false, true);
$tdata[1] = $data["monitor_ok"] <= 0 ? '-' : $data["monitor_ok"];
$tdata[1] = '<a style="color: ' . COL_NORMAL . ';" class="big_data" href="' . $urls["monitor_ok"] . '">' . $tdata[1] . '</a>';
$tdata[2] = html_print_image('images/module_unknown.png', true, array('title' => __('Monitor unknown')));
$tdata[2] = html_print_image('images/module_unknown.png', true, array('title' => __('Monitor unknown')), false, false, false, true);
$tdata[3] = $data["monitor_unknown"] <= 0 ? '-' : $data["monitor_unknown"];
$tdata[3] = '<a style="color: ' . COL_UNKNOWN . ';" class="big_data" href="' . $urls["monitor_unknown"] . '">' . $tdata[3] . '</a>';
$table_mbs->rowclass[] = '';
$table_mbs->data[] = $tdata;
$tdata = array();
$tdata[0] = html_print_image('images/module_notinit.png', true, array('title' => __('Monitor not init')));
$tdata[0] = html_print_image('images/module_notinit.png', true, array('title' => __('Monitor not init')), false, false, false, true);
$tdata[1] = $data["monitor_not_init"] <= 0 ? '-' : $data["monitor_not_init"];
$tdata[1] = '<a style="color: ' . COL_NOTINIT . ';" class="big_data" href="' . $urls["monitor_not_init"] . '">' . $tdata[1] . '</a>';
@ -5627,7 +5616,7 @@ function reporting_get_stats_modules_status($data, $graph_width = 250, $graph_he
$table_mbs->data[] = $tdata;
}
if(!defined("METACONSOLE")) {
if(!is_metaconsole()) {
$output = '
<fieldset class="databox tactical_set">
<legend>' .
@ -5676,13 +5665,22 @@ function reporting_get_stats_agents_monitors($data) {
$table_am = html_get_predefined_table();
$tdata = array();
$tdata[0] = html_print_image('images/agent.png', true, array('title' => __('Total agents')));
$tdata[0] = html_print_image('images/agent.png', true, array('title' => __('Total agents')), false, false, false, true);
$tdata[1] = $data["total_agents"] <= 0 ? '-' : $data["total_agents"];
$tdata[1] = '<a class="big_data" href="' . $urls['total_agents'] . '">' . $tdata[1] . '</a>';
$tdata[2] = html_print_image('images/module.png', true, array('title' => __('Monitor checks')));
$tdata[3] = $data["monitor_checks"] <= 0 ? '-' : $data["monitor_checks"];
$tdata[3] = '<a class="big_data" href="' . $urls['monitor_checks'] . '">' . $tdata[3] . '</a>';
if($data["total_agents"]>500 && !enterprise_installed()) {
$tdata[2] = "<div id='agentsmodal' class='publienterprise' title='Community version' style=''><img data-title='Enterprise version' class='img_help forced_title' data-use_title_for_force_title='1' src='images/alert_enterprise.png'></div>";
}
$tdata[3] = html_print_image('images/module.png', true, array('title' => __('Monitor checks')), false, false, false, true);
$tdata[4] = $data["monitor_checks"] <= 0 ? '-' : $data["monitor_checks"];
$tdata[4] = '<a class="big_data" href="' . $urls['monitor_checks'] . '">' . $tdata[4] . '</a>';
if(($data["monitor_checks"]/$data["total_agents"]>100) && !enterprise_installed()) {
$tdata[5] = "<div id='monitorcheckmodal' class='publienterprise' title='Community version' style=''><img data-title='Enterprise version' class='img_help forced_title' data-use_title_for_force_title='1' src='images/alert_enterprise.png'></div>";
}
$table_am->rowclass[] = '';
$table_am->data[] = $tdata;
@ -8330,12 +8328,12 @@ function reporting_get_stats_servers($tiny = true) {
$table_srv->style[0] = $table_srv->style[2] = 'text-align: right; padding: 5px;';
$table_srv->style[1] = $table_srv->style[3] = 'text-align: left; padding: 5px;';
$tdata = array();
$tdata = array();'<span class="big_data">' . format_numeric($server_performance ["total_local_modules"]) . '</span>';
$tdata[0] = html_print_image('images/module.png', true, array('title' => __('Total running modules'), 'width' => '25px'));
$tdata[1] = '<span class="big_data">' . format_numeric($server_performance ["total_modules"]) . '</span>';
$tdata[2] = '<span class="med_data">' . format_numeric($server_performance ["total_modules_rate"], 2) . '</span>';
$tdata[3] = html_print_image('images/module.png', true, array('title' => __('Ratio') . ': ' . __('Modules by second'), 'width' => '16px')) . '/sec </span>';
$tdata[2] = '&nbsp;';
$tdata[3] = '<span class="med_data">' . format_numeric($server_performance ["total_modules_rate"], 2) . '</span>';
$tdata[4] = html_print_image('images/module.png', true, array('title' => __('Ratio') . ': ' . __('Modules by second'), 'width' => '16px')) . '/sec </span>';
$table_srv->rowclass[] = '';
$table_srv->data[] = $tdata;
@ -8350,9 +8348,13 @@ function reporting_get_stats_servers($tiny = true) {
$tdata[0] = html_print_image('images/database.png', true, array('title' => __('Local modules'), 'width' => '25px'));
$tdata[1] = '<span class="big_data">' . format_numeric($server_performance ["total_local_modules"]) . '</span>';
$tdata[2] = '<span class="med_data">' .
$tdata[2] = '&nbsp;';
$tdata[3] = '<span class="med_data">' .
format_numeric($server_performance ["local_modules_rate"], 2) . '</span>';
$tdata[3] = html_print_image('images/module.png', true, array('title' => __('Ratio') . ': ' . __('Modules by second'), 'width' => '16px')) . '/sec </span>';
$tdata[4] = html_print_image('images/module.png', true, array('title' => __('Ratio') . ': ' . __('Modules by second'), 'width' => '16px')) . '/sec </span>';
$table_srv->rowclass[] = '';
$table_srv->data[] = $tdata;
@ -8362,8 +8364,16 @@ function reporting_get_stats_servers($tiny = true) {
$tdata[0] = html_print_image('images/network.png', true, array('title' => __('Remote modules'), 'width' => '25px'));
$tdata[1] = '<span class="big_data">' . format_numeric($server_performance ["total_remote_modules"]) . '</span>';
$tdata[2] = '<span class="med_data">' . format_numeric($server_performance ["remote_modules_rate"], 2) . '</span>';
$tdata[3] = html_print_image('images/module.png', true, array('title' => __('Ratio') . ': ' . __('Modules by second'), 'width' => '16px')) . '/sec </span>';
if($server_performance ["total_remote_modules"]>10000 && !enterprise_installed()){
$tdata[2] = "<div id='agentsmodal' class='publienterprise' title='Community version' style='text-align:left;'><img data-title='Enterprise version' class='img_help forced_title' data-use_title_for_force_title='1' src='images/alert_enterprise.png'></div>";
}
else{
$tdata[2] = '&nbsp;';
}
$tdata[3] = '<span class="med_data">' . format_numeric($server_performance ["remote_modules_rate"], 2) . '</span>';
$tdata[4] = html_print_image('images/module.png', true, array('title' => __('Ratio') . ': ' . __('Modules by second'), 'width' => '16px')) . '/sec </span>';
$table_srv->rowclass[] = '';
$table_srv->data[] = $tdata;
@ -8463,8 +8473,15 @@ function reporting_get_stats_servers($tiny = true) {
array('title' => __('Total events'), 'width' => '25px'));
$tdata[1] = '<span class="big_data">' .
format_numeric($system_events) . '</span>';
$table_srv->colspan[count($table_srv->data)][1] = 3;
if($system_events > 50000 && !enterprise_installed()){
$tdata[2] = "<div id='monitoreventsmodal' class='publienterprise' title='Community version' style='text-align:left'><img data-title='Enterprise version' class='img_help forced_title' data-use_title_for_force_title='1' src='images/alert_enterprise.png'></div>";
}
else{
$tdata[3] = "&nbsp;";
}
$table_srv->colspan[count($table_srv->data)][1] = 2;
$table_srv->rowclass[] = '';
$table_srv->data[] = $tdata;
}

42
pandora_console/include/functions_ui.php
View File

@ -260,7 +260,7 @@ function ui_print_message ($message, $class = '', $attributes = '', $return = fa
//Use the no_meta parameter because this image is only in the base console
$output = '<table cellspacing="0" cellpadding="0" id="' . $id . '" ' . $attributes . '
class="info_box ' . $id . ' ' . $class . '" style="' . $force_style . '">
class="info_box ' . $id . ' ' . $class . ' textodialogo" style="' . $force_style . '">
<tr>
<td class="icon" rowspan="2" style="padding-right: 10px; padding-top: 3px;">' . html_print_image($icon_image, true, false, false, false, true) . '</td>
<td class="title" style="text-transform: uppercase; padding-top: 10px;"><b>' . $text_title . '</b></td>
@ -274,7 +274,7 @@ function ui_print_message ($message, $class = '', $attributes = '', $return = fa
$output .= '</td>
</tr>
<tr>
<td style="color:#222">' . $text_message . '</td>
<td style="color:#333">' . $text_message . '</td>
<td></td>
</tr>
</table>';
@ -554,7 +554,7 @@ function ui_print_group_icon ($id_group, $return = false, $path = "groups_small"
$output .= '<span title="'. groups_get_name($id_group, true).'">&nbsp;&nbsp;</span>';
else {
$output .= html_print_image("images/" . $path . "/" . $icon . ".png",
true, array("style" => $style, "class" => "bot", "alt" => groups_get_name($id_group, true), "title" => groups_get_name ($id_group, true)));
true, array("style" => $style, "class" => "bot", "alt" => groups_get_name($id_group, true), "title" => groups_get_name ($id_group, true)), false, false, false, true);
}
}
@ -629,7 +629,7 @@ function ui_print_os_icon ($id_os, $name = true, $return = false,
if (empty ($icon)) {
if ($only_src) {
$output = html_print_image("images/" . $subfolter . "/unknown.png",
true, $options, true, $relative);
true, $options, true, $relative, false, true);
}
else {
return "-";
@ -637,13 +637,13 @@ function ui_print_os_icon ($id_os, $name = true, $return = false,
}
else if ($apply_skin) {
if ($only_src) {
$output = html_print_image("images/" . $subfolter . "/" . $icon, true, $options, true, $relative);
$output = html_print_image("images/" . $subfolter . "/" . $icon, true, $options, true, $relative, false, true);
}
else {
if (!isset($options['title'])) {
$options['title'] = $os_name;
}
$output = html_print_image("images/" . $subfolter . "/" . $icon, true, $options, false, $relative);
$output = html_print_image("images/" . $subfolter . "/" . $icon, true, $options, false, $relative, false, true);
}
}
else
@ -1299,8 +1299,14 @@ function ui_process_page_head ($string, $bitfield) {
<meta name="author" content="Pandora FMS Developer team" />
<meta name="copyright" content="(c) Artica Soluciones Tecnologicas" />
<meta name="keywords" content="pandora, monitoring, system, GPL, software" />
<meta name="robots" content="index, follow" />
<link rel="icon" href="images/pandora.ico" type="image/ico" />
<meta name="robots" content="index, follow" />';
if(defined ('METACONSOLE')){
$output .='<link rel="icon" href="images/favicon_meta.ico" type="image/ico" />';
}
else{
$output .='<link rel="icon" href="images/pandora.ico" type="image/ico" />';
}
$output .='
<link rel="shortcut icon" href="images/pandora.ico" type="image/x-icon" />
<link rel="alternate" href="operation/events/events_rss.php" title="Pandora RSS Feed" type="application/rss+xml" />';
@ -1829,7 +1835,7 @@ function ui_print_session_action_icon ($action, $return = false) {
$output = '';
foreach($key_icon as $key => $icon) {
if (stristr($action, $key) !== false) {
$output = html_print_image($icon, true, array('title' => $action)) . ' ';
$output = html_print_image($icon, true, array('title' => $action), false, false, false, true) . ' ';
break;
}
}
@ -2070,7 +2076,7 @@ function ui_print_status_image ($type, $title = "", $return = false, $options =
$options['title'] = $title;
return html_print_image ($imagepath, $return, $options);
return html_print_image ($imagepath, $return, $options, false, false, false, true);
}
/**
@ -2403,17 +2409,17 @@ function ui_print_page_header ($title, $icon = "", $return = false, $help = "",
$type2 = "menu_tab_frame_view";
$separator_class = "separator_view";
}
$buffer = '<div id="'.$type2.'" style=""><div id="menu_tab_left">';
$buffer = '<div id="'.$type2.'" style="font-size:9pt;text-transform:uppercase;font-weight:100;letter:spacing:1px;"><div id="menu_tab_left">';
$buffer .= '<ul class="mn"><li class="' . $type . '">&nbsp;' . '&nbsp; ';
$buffer .= '<span style="">' .
$buffer .= '<span style="margin-right:10px;">' .
ui_print_truncate_text($title, 46);
if ($modal){
if ($modal && !enterprise_installed()){
$buffer .= "
<div id='publienterprise' class='".$message."' title='Community version' style='float: right;margin-top: -2px !important; margin-left: 2px !important;'><img data-title='Enterprise version' class='img_help forced_title' data-use_title_for_force_title='1' src='images/alert_enterprise.png'></div>
<div id='".$message."' class='publienterprise' title='Community version' style='float: right;margin-top: -2px !important; margin-left: 2px !important;'><img data-title='Enterprise version' class='img_help forced_title' data-use_title_for_force_title='1' src='images/alert_enterprise.png'></div>
";
}

26
pandora_console/include/functions_update_manager.php
View File

@ -56,6 +56,9 @@ function rrmdir($dir) {
reset($objects);
rmdir($dir);
}
else {
unlink ($dir);
}
}
function update_manager_install_package_step2() {
@ -606,14 +609,19 @@ function update_manager_starting_update() {
"/downloads/last_package.tgz";
$full_path = $config['attachment_store'] . "/downloads/pandora_console";
rrmdir($full_path);
$phar = new PharData($path_package);
ob_start();
$result = system("tar xvzf " . $path_package .
" -C " . $config['attachment_store'] . "/downloads/", $none);
try {
$result = $phar->extractTo($config['attachment_store'] . "/downloads/");
}
catch (Exception $e) {
echo ' There\'s a problem ... -> ' . $e->getMessage();
}
ob_end_clean();
rrmdir($path_package);
if ($result != 0) {
db_process_sql_update('tconfig',
array('value' => json_encode(
@ -640,7 +648,9 @@ function update_manager_starting_update() {
$full_path,
$homedir,
array('install.php'));
rrmdir($full_path);
if (!$result) {
db_process_sql_update('tconfig',
array('value' => json_encode(
@ -796,7 +806,7 @@ function update_manger_get_single_message ($message_id) {
$sql = 'SELECT data, svn_version, db_field_value FROM tupdate ';
$sql .= 'WHERE svn_version=' . $message_id;
html_debug ("S: " . $sql, true);
$message = db_get_row_sql($sql);
return $message;
}

10
pandora_console/include/functions_visual_map.php
View File

@ -94,8 +94,10 @@ function visual_map_print_item($mode = "read", $layoutData,
require_once ($config["homedir"] . '/include/functions_graph.php');
require_once ($config["homedir"] . '/include/functions_custom_graphs.php');
$width = $layoutData['width'];
$height = $max_percentile = $layoutData['height'];
//add 60 px for visual console map
$width = $layoutData['width'] + 60;
$height = $layoutData['height'] + 60;
$max_percentile = $layoutData['height'];
$top = $layoutData['pos_y'];
$left = $layoutData['pos_x'];
$id = $layoutData['id'];
@ -1145,6 +1147,10 @@ function visual_map_get_simple_value($type, $id_module, $period = SECONDS_1DAY)
$value .= " " . $unit_text;
}
}
$value = preg_replace ('/\n/i','<br>',$value);
$value = preg_replace ('/\s/i','&nbsp;',$value);
return $value;
break;
case SIMPLE_VALUE_MAX:

9
pandora_console/include/graphs/fgraph.php
View File

@ -510,7 +510,8 @@ function line_graph($flash_chart, $chart_data, $width, $height, $color,
$legend, $long_index, $no_data_image, $xaxisname = "",
$yaxisname = "", $water_mark = "", $font = '', $font_size = '',
$unit = '', $ttl = 1, $homeurl = '', $backgroundColor = 'white',
$dashboard = false, $vconsole = false) {
$dashboard = false, $vconsole = false, $series_type = array(),
$percentil_values = array()) {
include_once("functions_flot.php");
@ -535,7 +536,7 @@ function line_graph($flash_chart, $chart_data, $width, $height, $color,
$font_size,
$unit,
$water_mark_url,
array(),
$series_type,
array(),
0,
0,
@ -545,7 +546,9 @@ function line_graph($flash_chart, $chart_data, $width, $height, $color,
$menu,
$backgroundColor,
$dashboard,
$vconsole);
$vconsole,
false,
$percentil_values);
}
else {
$graph = array();

4
pandora_console/include/graphs/flot/pandora.flot.js
View File

@ -980,9 +980,9 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
//threshold: [{ below: 80, color: "rgb(200, 20, 30)" } , { below: 65, color: "rgb(30, 200, 30)" }, { below: 50, color: "rgb(30, 200, 30)" }],
lines: {
show: line_show,
fill: 0.2,
fill: 0.4,
fillColor: {
colors: [ { opacity: 0.9 }, { opacity: 0.6 } ]
colors: [ { opacity: 0.3 }, { opacity: 0.7 } ]
},
lineWidth: lineWidth,
steps: steps_chart

20
pandora_console/include/graphs/functions_flot.php
View File

@ -142,11 +142,12 @@ function flot_line_stacked_graph($chart_data, $width, $height, $color,
}
function flot_line_simple_graph($chart_data, $width, $height, $color,
$legend, $long_index, $homeurl = '', $font = '', $font_size = 7,$unit = '', $water_mark = '',
$legend, $long_index, $homeurl = '', $font = '', $font_size = 7, $unit = '', $water_mark = '',
$serie_types = array(), $chart_extra_data = array(),
$yellow_threshold = 0, $red_threshold = 0, $adapt_key= '',
$force_integer = false, $series_suffix_str = '', $menu = true,
$background_color = 'white', $dashboard = false, $vconsole = false, $agent_module_id = 0) {
$background_color = 'white', $dashboard = false, $vconsole = false,
$agent_module_id = 0, $percentil_values = array()) {
global $config;
@ -154,14 +155,17 @@ function flot_line_simple_graph($chart_data, $width, $height, $color,
$legend, $long_index, $homeurl, $unit, 'line_simple',
$water_mark, $serie_types, $chart_extra_data, $yellow_threshold,
$red_threshold, $adapt_key, $force_integer, $series_suffix_str,
$menu, $background_color, $dashboard, $vconsole, $agent_module_id, $font, $font_size);
$menu, $background_color, $dashboard, $vconsole,
$agent_module_id, $font, $font_size, '', $percentil_values);
}
function flot_area_graph($chart_data, $width, $height, $color, $legend,
$long_index, $homeurl, $unit, $type, $water_mark, $serie_types,
$chart_extra_data, $yellow_threshold, $red_threshold, $adapt_key,
$force_integer, $series_suffix_str = '', $menu = true,
$background_color = 'white', $dashboard = false, $vconsole = false, $agent_module_id = 0,$font = '',$font_size = 7, $xaxisname = '') {
$background_color = 'white', $dashboard = false, $vconsole = false,
$agent_module_id = 0,$font = '',$font_size = 7, $xaxisname = '',
$percentil_values = array()) {
global $config;
@ -325,6 +329,14 @@ function flot_area_graph($chart_data, $width, $height, $color, $legend,
}
}
}
if (!empty($percentil_values)) {
foreach($percentil_values as $key => $value) {
$jsvar = "percentil_" . $graph_id . "_" . $key;
$serie_types2[$jsvar] = 'line';
$data[$jsvar] = $value;
}
}
// Store data series in javascript format
$jsvars = '';

15
pandora_console/include/graphs/functions_pchart.php
View File

@ -691,7 +691,7 @@ function pch_bar_graph ($graph_type, $index, $data, $width, $height, $font,
"Mode"=>SCALE_MODE_START0, "LabelRotation" => 60);
$margin_left = 40;
$margin_top = 10;
$margin_bottom = 10 * $max_chars;
$margin_bottom = 3 * $max_chars;
break;
case "hbar":
$scaleSettings = array("GridR"=>200,"GridG"=>200,"GridB"=>200,"DrawSubTicks"=>TRUE,
@ -718,13 +718,13 @@ function pch_bar_graph ($graph_type, $index, $data, $width, $height, $font,
$myPicture->setGraphArea($margin_left,$margin_top,$width - $water_mark_width,$height-$margin_bottom);
$myPicture->drawScale($scaleSettings);
/*
if (isset($legend)) {
/* Write the chart legend */
/* Write the chart legend
$size = $myPicture->getLegendSize(array("Style"=>LEGEND_NOBORDER,"Mode"=>LEGEND_HORIZONTAL));
$myPicture->drawLegend($width-$size['Width'],0,array("Style"=>LEGEND_NOBORDER,"Mode"=>LEGEND_HORIZONTAL, "BoxWidth"=>10, "BoxHeight"=>10));
}
*/
/* Turn on shadow computing */
$myPicture->setShadow(TRUE,array("X"=>0,"Y"=>1,"R"=>0,"G"=>0,"B"=>0,"Alpha"=>10));
@ -1137,8 +1137,9 @@ function pch_bullet_chart($graph_type, $data, $legend,
$MyData->setSerieDescription("Labels", __("Agents/Modules"));
$height_t = ($height * count($data) ) + 40;
$width_t = ($width + ( 200 + $max_chars));
$max_chars = graph_get_max_index($legend_values);
$height_t = $height;
$max_chars = graph_get_max_index($legend);
$width_t = ($width + ( 100 + $max_chars));
/* Create the pChart object */
$myPicture = new pImage($width_t, $height_t,$MyData);
@ -1151,7 +1152,7 @@ function pch_bullet_chart($graph_type, $data, $legend,
$height_t - 10;
/* Draw the scale and chart */
$myPicture->setGraphArea(220,20,($width + 80), $height_t);
$myPicture->setGraphArea(250,20,($width + 100), $height_t);
$myPicture->drawScale(array("Pos"=>SCALE_POS_TOPBOTTOM, "Mode"=>SCALE_MODE_ADDALL_START0,
"LabelingMethod"=>LABELING_DIFFERENT, "GridR"=>255, "GridG"=>255,
"GridB"=>255, "GridAlpha"=>50, "TickR"=>0,"TickG"=>0, "TickB"=>0,

25
pandora_console/include/help/ja/help_reports_label_field.php Executable file
View File

@ -0,0 +1,25 @@
<?php
/**
* @package Include/help/ja
*/
?>
<h1>レポート - ラベルフィールドマクロ</h1>
<p>
次のマクロも使えます: <br />
<ul>
<li><b>_agent_ </b>: レポートアイテムで選択したエージェント名。<li />
<li><b>_agentdescription_ </b>: レポートアイテムで選択したエージェントの説明。<li />
<li><b>_agentgroup_ </b>: エージェントグループ名。<li />
<li><b>_address_</b> : レポートアイテムで選択したエージェントのアドレス。<li />
<ul />
<br />
<ul>
エージェントモジュールのフォームで利用可能なもの<br />
<li><b>_module_ </b>: レポートアイテムで選択したモジュール名。<li />
<li><b>_moduledescription_</b> : レポートアイテムで選択したモジュールの説明。<li />
<ul />
例: エージェント: <b>_agent_</b> / モジュール: <b>_module_</b><br />
</p>

9
pandora_console/include/help/ja/help_snmp_alert_configuration.php Normal file
View File

@ -0,0 +1,9 @@
<?php
/*
* @package Include /help/ja
*/
?>
<h1>アラート設定</h1>
<p>これらは、SNMP アラート設定で必要なフィールドです。フィールドの一部は、"フィールド #x のマッチ" および "カスタム値/OID" フィールドからのマクロを使うことができます。</p>

9
pandora_console/include/help/ja/help_visual_console_editor_list_elements_tab.php Normal file
View File

@ -0,0 +1,9 @@
<?php
/*
* @package Include/help/ja/
*/
?>
<h1>要素一覧</h1>
<p>このタブは、編集中のビジュアルコンソールの要素のファイルまとめて表示します。異なる要素をすばやく編集でき、要素の値を調整する必要がある場合に便利なツールです。</p>

140
pandora_console/include/javascript/jquery.pandora.js
View File

@ -3,27 +3,27 @@
return this.each (function () {
this.checked = true;
});};
$.fn.uncheck = function () {
return this.each (function () {
this.checked = false;
});};
$.fn.enable = function () {
return $(this).removeAttr ("disabled");
};
$.fn.disable = function () {
return $(this).attr ("disabled", "disabled");
};
$.fn.pulsate = function () {
var i = 0;
for (i = 0; i <= 2; i++) {
$(this).fadeOut ("slow").fadeIn ("slow");
}
};
$.fn.showMessage = function (msg) {
return $(this).hide ().empty ()
.text (msg)
@ -54,64 +54,62 @@ $(document).ready (function () {
},
"html"
);
return false;
});
$("a.show_systemalert_dialog").click (function () {
jQuery.get ("ajax.php",
$('body').append( "<div id='opacidad' style='position:fixed;background:black;opacity:0.6;z-index:1'></div>" );
jQuery.get ("ajax.php",
{"page": "operation/system_alert"},
function (data, status) {
$("#alert_messages").hide ()
.empty ()
.append (data)
.dialog ({
title: $("a#show_systemalert_dialog").attr ("title"),
resizable: true,
draggable: true,
modal: true,
overlay: {
opacity: 0.5,
background: "black"
},
width: 700,
height: 300
})
.show ();
},
"html"
);
function (data, status) {
$("#alert_messages").hide ()
.empty ()
.append (data)
.show ();
},
"html"
);
return false;
});
// Creacion de ventana modal y botones
$("#publienterprise").click (function () {
$(".publienterprise").click (function () {
$('body').append( "<div id='opacidad'></div>" );
jQuery.get ("ajax.php",
{
"page": "general/alert_enterprise",
"message":$(this).attr("class")},
"message":$(this).attr("id")},
function (data, status) {
$("#alert_messages").hide ()
.empty ()
.append (data)
.dialog ({
title: $("#publienterprise").attr ("title"),
resizable: true,
draggable: true,
modal: true,
open: function (event, ui) {
$(this).css({'overflow': 'hidden','text-align': 'center','padding-right':'25px','padding-bottom':'25px'}); //this line does the actual hiding
},
overlay: {
opacity: 0.5,
background: "black"
},
width: 600
})
.show ();
},
"html"
);
return false;
});
$(".publienterprisehide").click (function () {
$('body').append( "<div id='opacidad' style='position:fixed;background:black;opacity:0.6;z-index:1'></div>" );
jQuery.get ("ajax.php",
{
"page": "general/alert_enterprise",
"message":$(this).attr("id")},
function (data, status) {
$("#alert_messages").hide ()
.empty ()
.append (data)
.show ();
},
"html"
);
return false;
});
@ -120,12 +118,12 @@ $(document).ready (function () {
if ($('#license_error_msg_dialog').length) {
if (typeof(process_login_ok) == "undefined")
process_login_ok = 0;
if (typeof(show_error_license) == "undefined")
show_error_license = 0;
if (process_login_ok || show_error_license) {
$( "#license_error_msg_dialog" ).dialog({
dialogClass: "no-close",
closeOnEscape: false,
@ -147,17 +145,17 @@ $(document).ready (function () {
);
}
});
$("#submit-hide-license-error-msg").click (function () {
$("#license_error_msg_dialog" ).dialog('close')
});
}
}
if ($('#msg_change_password').length) {
$( "#msg_change_password" ).dialog({
resizable: true,
draggable: true,
@ -169,11 +167,11 @@ $(document).ready (function () {
background: "black"
}
});
}
if ($('#login_blocked').length) {
$( "#login_blocked" ).dialog({
resizable: true,
draggable: true,
@ -185,9 +183,9 @@ $(document).ready (function () {
background: "black"
}
});
}
forced_title_callback();
});
@ -199,21 +197,21 @@ function forced_title_callback() {
///////////////////////////////////////////
$('#forced_title_layer').css('left', 0);
$('#forced_title_layer').css('top', 0);
///////////////////////////////////////////
// Get info of the image
///////////////////////////////////////////
var img_top = $(this).offset().top;
var img_width = $(this).width();
var img_height = $(this).height();
var img_id = $(this).attr('id');
var img_left_mid = $(this).offset().left + (img_width / 2);
///////////////////////////////////////////
// Put title in the layer
///////////////////////////////////////////
// If the '.forced_title' element has 'use_title_for_force_title' = 1
// into their 'data' prop, the element title will be used for the
// content.
@ -223,46 +221,46 @@ function forced_title_callback() {
else {
var title = $('#forced_title_'+img_id).html();
}
$('#forced_title_layer').html(title);
///////////////////////////////////////////
// Get info of the layer
///////////////////////////////////////////
var layer_width = $('#forced_title_layer').width();
var layer_height = $('#forced_title_layer').height();
///////////////////////////////////////////
// Obtain the new position of the layer
///////////////////////////////////////////
// Jquery doesnt know the padding of the layer
var layer_padding = 4;
// Deduct padding of both sides
var layer_top = img_top - layer_height - (layer_padding * 2) - 5;
if (layer_top < 0) {
layer_top = img_top + img_height + (layer_padding * 2);
}
// Deduct padding of one side
var layer_left = img_left_mid - (layer_width / 2) - layer_padding;
if (layer_left < 0) {
layer_left = 0;
}
var real_layer_width = layer_width + (layer_padding * 2) + 5;
var layer_right = layer_left + real_layer_width;
var screen_width = $(window).width();
if (screen_width < layer_right) {
layer_left = screen_width - real_layer_width;
}
///////////////////////////////////////////
// Set the layer position and show
///////////////////////////////////////////
$('#forced_title_layer').css('left', layer_left);
$('#forced_title_layer').css('top', layer_top);
$('#forced_title_layer').show();

30
pandora_console/include/javascript/pandora_modules.js
View File

@ -78,6 +78,10 @@ function configure_modules_form () {
$("#checkbox-history_data").check ();
$("#text-max").attr ("value", "");
$("#text-min").attr ("value", "");
$("#dynamic_interval_select").attr ("value", 0);
$("#text-dynamic_min").attr ("value", 0);
$("#text-dynamic_max").attr ("value", 0);
$("#checkbox-dynamic_two_tailed").attr ("value", 0);
$("#text-min_warning").attr ("value", 0);
$("#text-max_warning").attr ("value", 0);
$("#text-str_warning").attr ("value", '');
@ -113,6 +117,7 @@ function configure_modules_form () {
js_html_entity_decode (data["name"]));
$("#textarea_description").attr ("value",
js_html_entity_decode (data["description"]));
$("#textarea_description").html(js_html_entity_decode (data["description"]));
$("#textarea_configuration_data").val(configuration_data);
$("#component_loading").hide ();
$("#id_module_type").val(data["type"]);
@ -134,6 +139,15 @@ function configure_modules_form () {
else
$("#checkbox-history_data").uncheck ();
$("#dynamic_interval_select").attr ("value", (data["dynamic_interval"] == 0) ? 0 : data["dynamic_interval"]);
$("#text-dynamic_max").attr ("value", (data["dynamic_max"] == 0) ? 0 : data["dynamic_max"]);
$("#text-dynamic_min").attr ("value", (data["dynamic_min"] == 0) ? 0 : data["dynamic_min"]);
if (data["dynamic_two_tailed"])
$("#checkbox-dynamic_two_tailed").check ();
else
$("#checkbox-dynamic_two_tailed").uncheck ();
$("#text-min_warning").attr ("value", (data["min_warning"] == 0) ? 0 : data["min_warning"]);
$("#text-max_warning").attr ("value", (data["max_warning"] == 0) ? 0 : data["max_warning"]);
$("#text-str_warning").attr ("value", data["str_warning"]);
@ -246,7 +260,7 @@ function configure_modules_form () {
flag_load_plugin_component = true;
$("#text-name").attr ("value", js_html_entity_decode (data["name"]));
$("#textarea_description").attr ("value", js_html_entity_decode (data["description"]));
$("#textarea_description").html (js_html_entity_decode (data["description"]));
$("#id_module_type").val(data["type"]);
$("#text-max").attr ("value", data["max"]);
$("#text-min").attr ("value", data["min"]);
@ -262,6 +276,10 @@ function configure_modules_form () {
.attr ("value", js_html_entity_decode (data["tcp_send"]));
$("#textarea_tcp_rcv")
.attr ("value", js_html_entity_decode (data["tcp_rcv"]));
$("#textarea_tcp_send")
.html (js_html_entity_decode (data["tcp_send"]));
$("#textarea_tcp_rcv")
.html (js_html_entity_decode (data["tcp_rcv"]));
$("#text-snmp_community")
.attr ("value", js_html_entity_decode (data["snmp_community"]));
$("#text-snmp_oid")
@ -281,6 +299,16 @@ function configure_modules_form () {
$("#checkbox-history_data").check ();
else
$("#checkbox-history_data").uncheck ();
$("#dynamic_interval_select").attr ("value", (data["dynamic_interval"] == 0) ? 0 : data["dynamic_interval"]);
$("#text-dynamic_max").attr ("value", (data["dynamic_max"] == 0) ? 0 : data["dynamic_max"]);
$("#text-dynamic_min").attr ("value", (data["dynamic_min"] == 0) ? 0 : data["dynamic_min"]);
if (data["dynamic_two_tailed"])
$("#checkbox-dynamic_two_tailed").check ();
else
$("#checkbox-dynamic_two_tailed").uncheck ();
$("#text-min_warning").attr ("value", (data["min_warning"] == 0) ? 0 : data["min_warning"]);
$("#text-max_warning").attr ("value", (data["max_warning"] == 0) ? 0 : data["max_warning"]);
$("#text-str_warning").attr ("value", data["str_warning"]);

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

@ -240,10 +240,11 @@ div#page {
}
div#main {
width: auto;
margin: 0px 2% 0px 0%;
float: right;
margin: 0px 0% 0px 0%;
float: left;
position: relative;
min-height: 850px;
margin-left:60px;
}
div#main_help {
width: 100%;
@ -465,7 +466,7 @@ div#login_in, #login_f {
-moz-transform: rotate(36deg); /* FF */
-o-transform: rotate(36deg); /* Opera */
-webkit-transform: rotate(36deg); /* Safari and Chrome */
float: right;
margin-top: 18px;
width: 80px;
@ -1247,12 +1248,13 @@ div.title_line {
max-height: 26px;
}
#menu_tab_left li a, #menu_tab_left li span {
/* text-transform: uppercase; */
/*text-transform: uppercase; */
padding: 0px 0px 0px 0px;
color: #fff;
font-size: 8.5pt;
font-weight: bold;
font-size: 9pt;
line-height: 20px;
letter-spacing:1px;
font-family: verdana;
}
#menu_tab_left .mn li a {
display: block;
@ -3031,13 +3033,13 @@ table#policy_modules td * {
margin: 0px;
}
.databox.filters td>img, .databox.filters td>div>a>img,
.databox.filters td>img, .databox.filters td>div>a>img,
.databox.filters td>span>img, .databox.filters td>span>a>img,
.databox.filters td>a>img{
vertical-align: middle;
margin-left: 5px;
}
.databox.data td>img,.databox.data th>img, .databox.data td>div>a>img,
.databox.data td>img,.databox.data th>img, .databox.data td>div>a>img,
.databox.data td>span>img, .databox.data td>span>a>img,
.databox.data td>a>img, .databox.data td>form>a>img {
vertical-align: middle;
@ -3164,7 +3166,7 @@ table#policy_modules td * {
height: 210px;
background: blue;
border-radius: 15px;
top: 50px;
left: 10px;
position: absolute;
@ -3192,7 +3194,7 @@ table#policy_modules td * {
@media screen and (-webkit-min-device-pixel-ratio:0)
{
/* Only for chrome */
.vertical_range {
left: -87px;
top: 93px;
@ -3202,7 +3204,7 @@ table#policy_modules td * {
.home_zoom {
top: 310px;
left: 10px;
display: table-cell;
position: absolute;
font-weight: bolder;
@ -3220,7 +3222,7 @@ table#policy_modules td * {
.zoom_in {
top: 10px;
left: 10px;
display: table-cell;
position: absolute;
font-weight: bolder;
@ -3238,7 +3240,7 @@ table#policy_modules td * {
.zoom_out {
top: 270px;
left: 10px;
display: table-cell;
position: absolute;
font-weight: bolder;
@ -3449,4 +3451,119 @@ div.simple_value > a > span.text > p {
.unicode{
font-family: unicodeFont;
}
}
#alert_messages{
-moz-border-bottom-right-radius: 5px;
-webkit-border-bottom-left-radius: 5px;
border-bottom-right-radius: 5px;
border-bottom-left-radius: 5px;
z-index:2;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
-webkit-transform: translate(-50%, -50%);
position:fixed;
width:650px;
background:white;
}
.modalheader{
text-align:center;
width:100%;
height:37px;
left:0px;
background-color:#82b92e;
}
.modalheadertext{
color:white;
position:relative;
font-family:Nunito;
font-size:13pt;
top:8px;
}
.modalclosex{
cursor:pointer;
display:inline;
float:right;
margin-right:10px;
margin-top:10px;
}
.modalcontent{
color:black;
background:white;
}
.modalcontentimg{
float:left;
margin-left:30px;
margin-top:30px;
margin-bottom:30px;
}
.modalcontenttext{
float:left;
text-align:justify;
color:black;
font-size: 9.5pt;
line-height:13pt;
margin-top:30px;
width:430px;
margin-left:30px;
}
.modalokbutton{
cursor:pointer;
text-align:center;
margin-right:45px;
float:right;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
margin-bottom:30px;
border-radius: 3px;width:90px;height:30px;background-color:white;border: 1px solid #82b92e;
}
.modalokbuttontext{
color:#82b92e;font-family:Nunito;font-size:10pt;position:relative;top:6px;
}
.modalgobutton{
cursor:pointer;text-align:center;margin-right:15px;margin-bottom:30px;float:right;-moz-border-radius: 3px;
-webkit-border-radius: 3px;border-radius: 3px;width:240px;height:30px;background-color:white;border: 1px solid #82b92e;
}
.modalgobuttontext{
color:#82b92e;font-family:Nunito;font-size:10pt;position:relative;top:6px;
}
#opacidad{
opacity:0.5;
z-index:1;
width:100%;
height:100%;
position:absolute;
left:0px;
top:0px;
}
.textodialogo{
margin-left: 0px;
color:#333;
padding:20px;
font-size:9pt;
}
.cargatextodialogo{
max-width:58.5%;
width:58.5%;
min-width:58.5%;
float:left;
margin-left: 0px;
font-size:18pt;
padding:20px;
text-align:center;
}
.cargatextodialogo p, .cargatextodialogo b, .cargatextodialogo a{
font-size:18pt;
}
.readonly{
background-color: #dedede !important;
}

2
pandora_console/install.php
View File

@ -71,7 +71,7 @@
<div style='height: 10px'>
<?php
$version = '6.1dev';
$build = '160921';
$build = '161017';
$banner = "v$version Build $build";
error_reporting(0);

BIN
pandora_console/mobile/images/metaconsole_mobile.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.6 KiB

Some files were not shown because too many files have changed in this diff Show More