| " . __('Legend') . " | |
| " . __("Orange cell when the module group and agent have at least one alarm fired.") . " | |
| " . __("Red cell when the module group and agent have at least one module in critical status and the others in any status") . " | |
| " . __("Yellow cell when the module group and agent have at least one in warning status and the others in grey or green status") . " | |
| " . __("Green cell when the module group and agent have all modules in OK status") . " | |
| " . __("Grey cell when the module group and agent have at least one in unknown status and the others in green status") . " | |
| " .__("Blue cell when the module group and agent have all modules in not init status.") . " | |
";
+ html_print_table($table);
echo "
";
+
+ ui_pagination($counter);
+
+ echo "";
+ echo "";
+ echo "
";
+ echo "
";
+
}
else {
- echo "| " . __('Legend') . " | |
| " . __("Orange cell when the module group and agent have at least one alarm fired.") . " | |
| " . __("Red cell when the module group and agent have at least one module in critical status and the others in any status") . " | |
| " . __("Yellow cell when the module group and agent have at least one in warning status and the others in grey or green status") . " | |
| " . __("Grey cell when the module group and agent have at least one in unknown status and the others in green status") . " | |
| " . __("Green cell when the module group and agent have all modules in OK status") . " | |
| " .__("Blue cell when the module group and agent have all modules in not init status.") . " | |
".__('There are no defined groups or module groups')."
";
+ ui_print_info_message ( array('no_close'=>true, 'message'=> __("This table shows in columns the modules group and in rows agents group. The cell shows all modules") ));
+ ui_print_info_message ( array('no_close'=>true, 'message'=> __('There are no defined groups or module groups') ));
}
-
+
ui_require_css_file('cluetip');
ui_require_jquery_file('cluetip');
?>
@@ -292,7 +272,8 @@ function mainModuleGroups() {
$("a.info_cell").cluetip ({
arrows: true,
attribute: 'rel',
- cluetipClass: 'default'
+ cluetipClass: 'default',
+ width: '200px'
});
});
diff --git a/pandora_console/extensions/realtime_graphs/realtime_graphs.js b/pandora_console/extensions/realtime_graphs/realtime_graphs.js
index 64960cc658..34da7b1704 100644
--- a/pandora_console/extensions/realtime_graphs/realtime_graphs.js
+++ b/pandora_console/extensions/realtime_graphs/realtime_graphs.js
@@ -28,6 +28,11 @@
return formattedTime;
}
},
+ yaxis: {
+ tickFormatter: function (value, axis) {
+ return shortNumber(value);
+ }
+ },
series: {
lines: {
lineWidth: 2,
@@ -158,6 +163,22 @@
});
}
+ function shortNumber (number) {
+ if (Math.round(number) != number) return number;
+ number = Number.parseInt(number);
+ if (Number.isNaN(number)) return number;
+
+ var shorts = ["", "K", "M", "G", "T", "P", "E", "Z", "Y"];
+ var pos = 0;
+
+ while (number >= 1000 || number <= -1000) {
+ pos++;
+ number = number / 1000;
+ }
+
+ return number + " " + shorts[pos];
+ }
+
$('#graph').change(function() {
$('form#realgraph').submit();
});
diff --git a/pandora_console/extras/mr/21.sql b/pandora_console/extras/mr/21.sql
new file mode 100644
index 0000000000..8283aa56a3
--- /dev/null
+++ b/pandora_console/extras/mr/21.sql
@@ -0,0 +1,12 @@
+START TRANSACTION;
+
+ALTER TABLE tlayout_data ADD COLUMN `show_last_value` tinyint(1) UNSIGNED NULL default '0';
+ALTER TABLE tlayout MODIFY `name` varchar(600) NOT NULL;
+
+ALTER TABLE tmetaconsole_setup ADD COLUMN `meta_dbuser` text;
+ALTER TABLE tmetaconsole_setup ADD COLUMN `meta_dbpass` text;
+ALTER TABLE tmetaconsole_setup ADD COLUMN `meta_dbhost` text;
+ALTER TABLE tmetaconsole_setup ADD COLUMN `meta_dbport` text;
+ALTER TABLE tmetaconsole_setup ADD COLUMN `meta_dbname` text;
+
+COMMIT;
diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
index 29c5bb4f8b..b6d3d6d580 100644
--- a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
+++ b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
@@ -341,13 +341,18 @@ CREATE TABLE IF NOT EXISTS `ttrap_custom_values` (
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `tmetaconsole_setup` (
`id` int(10) NOT NULL auto_increment primary key,
- `server_name` text default '',
- `server_url` text default '',
- `dbuser` text default '',
- `dbpass` text default '',
- `dbhost` text default '',
- `dbport` text default '',
- `dbname` text default '',
+ `server_name` text,
+ `server_url` text,
+ `dbuser` text,
+ `dbpass` text,
+ `dbhost` text,
+ `dbport` text,
+ `dbname` text,
+ `meta_dbuser` text,
+ `meta_dbpass` text,
+ `meta_dbhost` text,
+ `meta_dbport` text,
+ `meta_dbname` text,
`auth_token` text default '',
`id_group` int(10) unsigned NOT NULL default 0,
`api_password` text NOT NULL,
@@ -1279,6 +1284,7 @@ ALTER TABLE `tservice` ADD COLUMN `evaluate_sla` int(1) NOT NULL default 0;
-- ---------------------------------------------------------------------
ALTER TABLE tlayout ADD `background_color` varchar(50) NOT NULL default '#FFF';
ALTER TABLE tlayout ADD `is_favourite` int(1) NOT NULL DEFAULT 0;
+ALTER TABLE tlayout MODIFY `name` varchar(600) NOT NULL;
UPDATE tlayout SET is_favourite = 1 WHERE name REGEXP '^(' OR name REGEXP '^\\[';
@@ -1294,6 +1300,7 @@ ALTER TABLE tlayout_data ADD COLUMN `show_on_top` tinyint(1) NOT NULL default '0
ALTER TABLE tlayout_data ADD COLUMN `clock_animation` varchar(60) NOT NULL default "analogic_1";
ALTER TABLE tlayout_data ADD COLUMN `time_format` varchar(60) NOT NULL default "time";
ALTER TABLE tlayout_data ADD COLUMN `timezone` varchar(60) NOT NULL default "Europe/Madrid";
+ALTER TABLE tlayout_data ADD COLUMN `show_last_value` tinyint(1) UNSIGNED NULL default '0';
-- ---------------------------------------------------------------------
-- Table `tagent_custom_fields`
diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php
index 0196fb9393..4e6be0e725 100644
--- a/pandora_console/godmode/agentes/agent_manager.php
+++ b/pandora_console/godmode/agentes/agent_manager.php
@@ -479,6 +479,7 @@ $table->data[3][1] .= __('Autodisable mode') . ' ' .
// Status (Disabled / Enabled)
$table->data[4][0] = __('Status');
$table->data[4][1] = __('Disabled') . ' ' .
+ ui_print_help_tip(__('If the remote configuration is enabled, it will also go into standby mode when disabling it.'), true) . ' ' .
html_print_radio_button_extended ("disabled", 1, '', $disabled, false, '', 'style="margin-right: 40px;"', true);
$table->data[4][1] .= __('Enabled') . ' ' .
html_print_radio_button_extended ("disabled", 0, '', $disabled, false, '', 'style="margin-right: 40px;"', true);
diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index 81c8dc714f..49a9a85d9a 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -755,7 +755,7 @@ if ($update_agent) { // if modified some agent paramenter
$quiet = (int) get_parameter("quiet", 0);
$cps = (int) get_parameter("cps", 0);
- $old_interval = db_get_value('intervalo', 'tagente', 'id_agente', $id_agente);
+ $old_values = db_get_row('tagente', 'id_agente', $id_agente);
$fields = db_get_all_fields_in_table('tagent_custom_fields');
if ($fields === false) $fields = array();
@@ -855,11 +855,21 @@ if ($update_agent) { // if modified some agent paramenter
// Update the agent from the metaconsole cache
enterprise_include_once('include/functions_agents.php');
enterprise_hook ('agent_update_from_cache', array($id_agente, $values,$server_name));
-
- if ($old_interval != $intervalo) {
- enterprise_hook('config_agents_update_config_interval', array($id_agente, $intervalo));
+
+ # Update the configuration files
+ if ($old_values['intervalo'] != $intervalo) {
+ enterprise_hook(
+ 'config_agents_update_config_token',
+ array($id_agente, 'interval', $intervalo)
+ );
}
-
+ if ($old_values['disabled'] != $disabled) {
+ enterprise_hook(
+ 'config_agents_update_config_token',
+ array($id_agente, 'standby', $disabled ? "1" : "0")
+ );
+ }
+
if($tpolicy_group_old){
foreach ($tpolicy_group_old as $key => $value) {
$tpolicy_agents_old= db_get_sql("SELECT * FROM tpolicy_agents
@@ -914,8 +924,9 @@ if ($update_agent) { // if modified some agent paramenter
enterprise_hook ('update_agent', array ($id_agente));
ui_print_success_message (__('Successfully updated'));
+ $unsafe_alias = io_safe_output($alias);
db_pandora_audit("Agent management",
- "Updated agent $alias", false, false, $info);
+ "Updated agent $unsafe_alias", false, false, $info);
}
}
@@ -1416,7 +1427,7 @@ if ($update_module) {
$edit_module = true;
db_pandora_audit("Agent management",
- "Fail to try update module '$name' for agent " . $agent["alias"]);
+ "Fail to try update module '".io_safe_output($name)."' for agent " . io_safe_output($agent["alias"]));
}
else {
if ($prediction_module == 3) {
@@ -1434,7 +1445,7 @@ if ($update_module) {
$agent = db_get_row ('tagente', 'id_agente', $id_agente);
db_pandora_audit("Agent management",
- "Updated module '$name' for agent ".$agent["alias"], false, false, io_json_mb_encode($values));
+ "Updated module '".io_safe_output($name)."' for agent ". io_safe_output($agent["alias"]), false, false, io_json_mb_encode($values));
}
}
@@ -1575,7 +1586,7 @@ if ($create_module) {
$edit_module = true;
$moduletype = $id_module;
db_pandora_audit("Agent management",
- "Fail to try added module '$name' for agent ".$agent["alias"]);
+ "Fail to try added module '".io_safe_output($name)."' for agent ".io_safe_output($agent["alias"]));
}
else {
if ($prediction_module == 3) {
@@ -1593,7 +1604,7 @@ if ($create_module) {
$agent = db_get_row ('tagente', 'id_agente', $id_agente);
db_pandora_audit("Agent management",
- "Added module '$name' for agent ".$agent["alias"], false, true, io_json_mb_encode($values));
+ "Added module '".io_safe_output($name)."' for agent ".io_safe_output($agent["alias"]), false, true, io_json_mb_encode($values));
}
}
@@ -1708,12 +1719,18 @@ if ($delete_module) { // DELETE agent module !
ui_print_error_message(__('There was a problem deleting the module'));
}
else {
- ui_print_success_message(__('Module deleted succesfully'));
+
+ echo '';
$agent = db_get_row ('tagente', 'id_agente', $id_agente);
db_pandora_audit("Agent management",
- "Deleted module '".$module_data["nombre"]."' for agent ".$agent["alias"]);
+ "Deleted module '".io_safe_output($module_data["nombre"])."' for agent ".io_safe_output($agent["alias"]));
}
+
+
}
// MODULE DUPLICATION
@@ -1743,11 +1760,11 @@ if (!empty($duplicate_module)) { // DUPLICATE agent module !
if ($result) {
db_pandora_audit("Agent management",
- "Duplicate module '".$id_duplicate_module."' for agent " . $agent["alias"] . " with the new id for clon " . $result);
+ "Duplicate module '".$id_duplicate_module."' for agent " . io_safe_output($agent["alias"]) . " with the new id for clon " . $result);
}
else {
db_pandora_audit("Agent management",
- "Fail to try duplicate module '".$id_duplicate_module."' for agent " . $agent["alias"]);
+ "Fail to try duplicate module '".$id_duplicate_module."' for agent " . io_safe_output($agent["alias"]));
}
}
@@ -1931,11 +1948,11 @@ switch ($tab) {
resizable: true,
draggable: true,
modal: true,
- height: 220,
+ height: 240,
width: 600,
title: 'Changing the module name of a satellite agent',
open: function(){
- $('#dialog').html('
Warning
The names of the modules of a satellite should not be
altered manually. Unless you are absolutely certain of
the process, do not alter these names.
| Warning |
Warning
If you change the name of this module, various features
associated with this module, such as network maps,
interface graphs or other network modules, may no longer
work. If you are not completely sure of the process, please
do not change the name of the module.
| Warning |
| "; echo __('Search') . ' ' . html_print_input_text ('search_string', $search_string, '', 15, 255, true); + html_print_input_hidden ('search', 1); echo " | "; echo "";
html_print_submit_button (__('Filter'), 'filter', false, 'class="sub search"');
diff --git a/pandora_console/godmode/agentes/module_manager_editor_common.php b/pandora_console/godmode/agentes/module_manager_editor_common.php
index 0b9207a817..0527bea08d 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_common.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_common.php
@@ -160,7 +160,7 @@ else{
$table_simple->data[0][0] = __('Name');
$table_simple->data[0][1] = html_print_input_text_extended ('name',
- io_safe_input(html_entity_decode($name)), 'text-name', '', 45, 100, $disabledBecauseInPolicy, '', $largeClassDisabledBecauseInPolicy, true);
+ io_safe_input(html_entity_decode($name, ENT_QUOTES, "UTF-8")), 'text-name', '', 45, 100, $disabledBecauseInPolicy, '', $largeClassDisabledBecauseInPolicy, true);
//$table_simple->data[0][1] = html_print_input_text ('name',
// io_safe_output($name), '', 45, 100, true, $disabledBecauseInPolicy);
diff --git a/pandora_console/godmode/agentes/module_manager_editor_plugin.php b/pandora_console/godmode/agentes/module_manager_editor_plugin.php
index e79853b30a..a5085122d0 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_plugin.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_plugin.php
@@ -71,7 +71,7 @@ push_table_simple ($data, 'plugin_1');
$data = array ();
$data[0] = 'macro_desc';
$data[0] .= ui_print_help_tip ('macro_help', true);
-$data[1] = html_print_input_text ('macro_name', 'macro_value', '', 100, 255, true);
+$data[1] = html_print_input_text ('macro_name', 'macro_value', '', 100, 1024, true);
$table_simple->colspan['macro_field'][1] = 3;
$table_simple->rowstyle['macro_field'] = 'display:none';
@@ -93,10 +93,10 @@ if (!empty($macros)) {
$m_hide = $m['hide'];
if ($m_hide) {
- $data[1] = html_print_input_password($m['macro'], io_output_password($m['value']), '', 100, 255, true);
+ $data[1] = html_print_input_password($m['macro'], io_output_password($m['value']), '', 100, 1024, true);
}
else {
- $data[1] = html_print_input_text($m['macro'], $m['value'], '', 100, 255, true,
+ $data[1] = html_print_input_text($m['macro'], $m['value'], '', 100, 1024, true,
$disabledBecauseInPolicy, false, '', $classdisabledBecauseInPolicy);
}
$table_simple->colspan['macro'.$m['macro']][1] = 3;
diff --git a/pandora_console/godmode/alerts/alert_list.builder.php b/pandora_console/godmode/alerts/alert_list.builder.php
index 0af888b5aa..4123ff337a 100644
--- a/pandora_console/godmode/alerts/alert_list.builder.php
+++ b/pandora_console/godmode/alerts/alert_list.builder.php
@@ -219,7 +219,7 @@ $(document).ready (function () {
$("#value", $value).append ("");
}
else {
- $("#value", $value).append (data);
+ $("#value", $value).append (parseInt(data));
}
$loading.hide ();
$value.show ();
diff --git a/pandora_console/godmode/alerts/alert_list.list.php b/pandora_console/godmode/alerts/alert_list.list.php
index 0605ab2fed..1737ed1a7d 100644
--- a/pandora_console/godmode/alerts/alert_list.list.php
+++ b/pandora_console/godmode/alerts/alert_list.list.php
@@ -705,18 +705,26 @@ foreach ($simple_alerts as $alert) {
if(check_acl_one_of_groups ($config['id_user'], $all_groups, "LW")) {
$data[4] .= ' ';
+
+ $data[4] .= '';
+
}
if(check_acl_one_of_groups ($config['id_user'], $all_groups, "LM")) {
diff --git a/pandora_console/godmode/alerts/alert_list.php b/pandora_console/godmode/alerts/alert_list.php
index a65b925a44..9a6badcc24 100644
--- a/pandora_console/godmode/alerts/alert_list.php
+++ b/pandora_console/godmode/alerts/alert_list.php
@@ -47,6 +47,7 @@ $add_action = (bool) get_parameter ('add_action');
$update_action = (bool) get_parameter ('update_action');
$delete_action = (bool) get_parameter ('delete_action');
$delete_alert = (bool) get_parameter ('delete_alert');
+$update_alert = (bool) get_parameter ('update_alert'); ////
$disable_alert = (bool) get_parameter ('disable_alert');
$enable_alert = (bool) get_parameter ('enable_alert');
$standbyon_alert = (bool) get_parameter ('standbyon_alert');
@@ -67,10 +68,32 @@ $standby = get_parameter('standby','');
$pure = get_parameter('pure', 0);
$messageAction = '';
+if ($update_alert) {
+
+ $id_alert_agent_module = (int) get_parameter ('id_alert_update');
+
+ $id_alert_template = (int) get_parameter ('template');
+ $id_agent_module = (int) get_parameter ('id_agent_module');
+
+ $values_upd = array();
+
+ if (!empty($id_alert_template))
+ $values_upd['id_agent_module'] = $id_agent_module;
+
+ if (!empty($id_alert_template))
+ $values_upd['id_alert_template'] = $id_alert_template;
+
+ $id = alerts_update_alert_agent_module ($id_alert_agent_module, $values_upd);
+
+ $messageAction = ui_print_result_message ($id,
+ __('Successfully updated'), __('Could not be updated'), '', true);
+
+}
+
if ($create_alert) {
$id_alert_template = (int) get_parameter ('template');
$id_agent_module = (int) get_parameter ('id_agent_module');
-
+
if (db_get_value_sql("SELECT COUNT(id)
FROM talert_template_modules
WHERE id_agent_module = " . $id_agent_module . "
@@ -81,7 +104,7 @@ if ($create_alert) {
}
else {
$id = alerts_create_alert_agent_module ($id_agent_module, $id_alert_template);
-
+
$alert_template_name = db_get_value ("name",
"talert_templates","id", $id_alert_template);
$module_name = db_get_value ("nombre",
@@ -116,6 +139,7 @@ if ($create_alert) {
$values['module_action_threshold'] =
(int)get_parameter ('module_action_threshold');
+
alerts_add_alert_agent_module_action ($id, $action_select, $values);
}
}
diff --git a/pandora_console/godmode/events/custom_events.php b/pandora_console/godmode/events/custom_events.php
index 9b519fa6dd..c8911c0f44 100644
--- a/pandora_console/godmode/events/custom_events.php
+++ b/pandora_console/godmode/events/custom_events.php
@@ -188,7 +188,7 @@ foreach ($fields_available as $key=>$available) {
}
$table->data[0][0] = '' . __('Fields available').'';
-$table->data[1][0] = html_print_select ($fields_available, 'fields_available[]', true, '', '', '', true, true, false, '', false, 'width: 300px');
+$table->data[1][0] = html_print_select ($fields_available, 'fields_available[]', true, '', '', 0, true, true, false, '', false, 'width: 300px');
$table->data[1][1] = '' .
html_print_image('images/darrowright.png', true,
array('id' => 'right', 'title' => __('Add fields to select'))) .
@@ -201,7 +201,7 @@ $table->data[1][1] .= ' ' . $table->data[0][1] = ''; $table->data[0][2] = '' . __('Fields selected') . ''; $table->data[1][2] = html_print_select($result_selected, - 'fields_selected[]', true, '', '', '', true, true, false, '', false, 'width: 300px'); + 'fields_selected[]', true, '', '', 0, true, true, false, '', false, 'width: 300px'); echo ' |