Changes on enterpise alert icons, limit screens and favicons
(cherry picked from commit b722e70620)
This commit is contained in:
enriquecd
parent
d711f8493a
commit
908bf8ee94
|
|
@ -1,5 +1,13 @@
|
|||
<?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;
|
||||
}
|
||||
|
|
@ -38,6 +46,21 @@ switch ($tipo) {
|
|||
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;
|
||||
}
|
||||
|
|
@ -98,7 +121,22 @@ switch ($tipo) {
|
|||
case "updatemodal":
|
||||
echo __("WARNING: You are just one click of an automated update. This may result on a damaged system, including loss of data and operation. Check you have a recent backup. OpenSource updates are automated created packages, and there is no WARRANTY or SUPPORT. If you need professional support and warranty, please upgrade to Enterprise Version.");
|
||||
break;
|
||||
default:
|
||||
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 <a href='https://pandorafms.com/'>Enterprise Version</a> for a professional supported system with improved capacity on network monitoring, including distributed servers.");
|
||||
break;
|
||||
case "monitoreventsmodal":
|
||||
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 <a href='https://pandorafms.com/'>Enterprise Version</a> for a professional supported system with improved capacity on network monitoring, including distributed servers.");
|
||||
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;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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;';
|
||||
|
|
|
|||
|
|
@ -89,14 +89,14 @@ 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);
|
||||
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);
|
||||
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>";
|
||||
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>';
|
||||
|
||||
|
|
|
|||
|
|
@ -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') . ' » '. $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)
|
||||
|
|
|
|||
|
|
@ -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') . ' » ' .
|
||||
__('Network component management'), "", false,
|
||||
"network_component", true,"sell",true,"module");
|
||||
"network_component", true,"sell",true,"modulemodal");
|
||||
$sec = 'gmodules';
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,16 @@ if (! check_acl ($config['id_user'], 0, "PM")) {
|
|||
}
|
||||
|
||||
// Header
|
||||
ui_print_page_header (__('Module management')." » ".__('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')." » ".__('Module template management'), "images/gm_modules.png", false, "template_tab", true,"",true,"modulemodal");
|
||||
|
||||
|
||||
require_once ('include/functions_network_profiles.php');
|
||||
|
|
|
|||
|
|
@ -173,7 +173,7 @@ $table_styles->data[$row][0] = __('Custom logo in login') . ui_print_help_icon("
|
|||
$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] .= " " . html_print_button(__("View"), 'custom_logo_preview_', $open, '', 'class="sub camera"', true,false,$open,'visualmodal');
|
||||
$table_styles->data[$row][1] .= " " . html_print_button(__("View"), 'custom_logo_preview', $open, '', 'class="sub camera"', true,false,$open,'visualmodal');
|
||||
$row++;
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -84,6 +84,15 @@ echo "<div id='box_online' class='cargatextodialogo'>";
|
|||
|
||||
echo "<div class='progressbar' style='display: none;'><img class='progressbar_img' src='' /></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 "<div id='updatemodal' 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>
|
||||
";
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 3.7 KiB After Width: | Height: | Size: 3.6 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 3.7 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 5.9 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 4.5 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 3.2 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 285 B |
Binary file not shown.
|
After Width: | Height: | Size: 123 B |
Binary file not shown.
|
After Width: | Height: | Size: 3.7 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 3.0 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 318 B After Width: | Height: | Size: 1.1 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 318 B |
Binary file not shown.
|
Before Width: | Height: | Size: 681 B After Width: | Height: | Size: 8.5 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 681 B |
|
|
@ -453,8 +453,25 @@ 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(!enterprise_installed()){
|
||||
$open=true;
|
||||
}
|
||||
|
||||
if(!$open){
|
||||
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')))
|
||||
|
|
@ -479,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')))
|
||||
|
|
@ -1005,13 +1024,26 @@ 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(!$open){
|
||||
|
||||
|
||||
if (!isset ($config["custom_logo"])) {
|
||||
config_update_value ('custom_logo', 'pandora_logo_head.png');
|
||||
}
|
||||
if (!isset ($config["custom_logo_login"])) {
|
||||
config_update_value ('custom_logo_login', 'pandora_logo.png');
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
if (!isset ($config['history_db_enabled'])) {
|
||||
config_update_value ( 'history_db_enabled', false);
|
||||
|
|
|
|||
|
|
@ -5441,13 +5441,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')));
|
||||
$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')));
|
||||
$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;
|
||||
|
||||
|
|
@ -5604,9 +5608,18 @@ function reporting_get_stats_agents_monitors($data) {
|
|||
$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')));
|
||||
$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;
|
||||
|
||||
|
|
@ -8254,12 +8267,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] = ' ';
|
||||
$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;
|
||||
|
|
@ -8274,9 +8287,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] = ' ';
|
||||
|
||||
$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;
|
||||
|
|
@ -8286,8 +8303,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] = ' ';
|
||||
}
|
||||
|
||||
|
||||
$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;
|
||||
|
|
@ -8387,8 +8412,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] = " ";
|
||||
}
|
||||
$table_srv->colspan[count($table_srv->data)][1] = 2;
|
||||
$table_srv->rowclass[] = '';
|
||||
$table_srv->data[] = $tdata;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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>';
|
||||
|
|
@ -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" />';
|
||||
|
||||
|
|
@ -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 . '"> ' . ' ';
|
||||
$buffer .= '<span style="">' .
|
||||
$buffer .= '<span style="margin-right:10px;">' .
|
||||
ui_print_truncate_text($title, 46);
|
||||
if ($modal){
|
||||
$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>
|
||||
";
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -75,12 +75,12 @@ $(document).ready (function () {
|
|||
|
||||
// Creacion de ventana modal y botones
|
||||
|
||||
$("#publienterprise").click (function () {
|
||||
$(".publienterprise").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("class")},
|
||||
"message":$(this).attr("id")},
|
||||
function (data, status) {
|
||||
$("#alert_messages").hide ()
|
||||
.empty ()
|
||||
|
|
|
|||
|
|
@ -396,11 +396,20 @@ if ($config["pure"] == 0 || $meta) {
|
|||
$section_string = __('List');
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/* 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 (! defined ('METACONSOLE')) {
|
||||
unset($onheader['history']);
|
||||
ui_print_page_header (__("Events"), "images/op_events.png",
|
||||
false, "eventview", false, $onheader,true, "events");
|
||||
false, "eventview", false, $onheader,true, "eventsmodal");
|
||||
}
|
||||
else {
|
||||
unset($onheader['rss']);
|
||||
|
|
|
|||
Loading…
Reference in New Issue