2012-12-31 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* pandoradb_data.sql pandoradb.sql pandoradb.postgreSQL.sql pandoradb.oracle.sql pandoradb.data.postgreSQL.sql pandoradb.data.oracle.sql: Added new column email to ttag table. * include/styles/pandora.css: Fixed loading class. * include/functions_api.php: Fixed get_all_agents api function. * include/functions_ui.php include/javascript/pandora.js: Improvement in agent_autocomplete function. * operation/reporting/reporting_viewer.php godmode/reporting/reporting_builder.php godmode/reporting/reporting_builder.item_editor.php: Fixes in report viewer for metaconsole. * godmode/tag/tag.php godmode/tag/edit_tag.php: Added email fields in editors. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7343 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
parent
56e32fd698
commit
5b861cd064
|
@ -1,3 +1,29 @@
|
||||||
|
2012-12-31 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
|
||||||
|
|
||||||
|
* pandoradb_data.sql
|
||||||
|
pandoradb.sql
|
||||||
|
pandoradb.postgreSQL.sql
|
||||||
|
pandoradb.oracle.sql
|
||||||
|
pandoradb.data.postgreSQL.sql
|
||||||
|
pandoradb.data.oracle.sql: Added new column email to ttag table.
|
||||||
|
|
||||||
|
|
||||||
|
* include/styles/pandora.css: Fixed loading class.
|
||||||
|
|
||||||
|
* include/functions_api.php: Fixed get_all_agents api function.
|
||||||
|
|
||||||
|
* include/functions_ui.php
|
||||||
|
include/javascript/pandora.js: Improvement in agent_autocomplete
|
||||||
|
function.
|
||||||
|
|
||||||
|
* operation/reporting/reporting_viewer.php
|
||||||
|
godmode/reporting/reporting_builder.php
|
||||||
|
godmode/reporting/reporting_builder.item_editor.php: Fixes in report
|
||||||
|
viewer for metaconsole.
|
||||||
|
|
||||||
|
* godmode/tag/tag.php
|
||||||
|
godmode/tag/edit_tag.php: Added email fields in editors.
|
||||||
|
|
||||||
2012-12-28 Sergio Martin <sergio.martin@artica.es>
|
2012-12-28 Sergio Martin <sergio.martin@artica.es>
|
||||||
|
|
||||||
* pandoradb_data.sql
|
* pandoradb_data.sql
|
||||||
|
|
|
@ -1162,7 +1162,7 @@ function create_custom_graph() {
|
||||||
jQuery.ajax ({
|
jQuery.ajax ({
|
||||||
data: params1.join ("&"),
|
data: params1.join ("&"),
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
url: action= <?php echo '"' . ui_get_full_url(false) . '"'; ?> + "/ajax.php",
|
url: action= <?php echo '"' . ui_get_full_url(false, false, false, false) . '"'; ?> + "/ajax.php",
|
||||||
async: false,
|
async: false,
|
||||||
timeout: 10000,
|
timeout: 10000,
|
||||||
success: function (data) {
|
success: function (data) {
|
||||||
|
@ -1178,7 +1178,7 @@ function create_custom_graph() {
|
||||||
jQuery.ajax ({
|
jQuery.ajax ({
|
||||||
data: params1.join ("&"),
|
data: params1.join ("&"),
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
url: action= <?php echo '"' . ui_get_full_url(false) . '"'; ?> + "/ajax.php",
|
url: action= <?php echo '"' . ui_get_full_url(false, false, false, false) . '"'; ?> + "/ajax.php",
|
||||||
async: false,
|
async: false,
|
||||||
timeout: 10000,
|
timeout: 10000,
|
||||||
success: function (data) {
|
success: function (data) {
|
||||||
|
@ -1224,7 +1224,7 @@ function edit_custom_graph() {
|
||||||
jQuery.ajax ({
|
jQuery.ajax ({
|
||||||
data: params1.join ("&"),
|
data: params1.join ("&"),
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
url: action= <?php echo '"' . ui_get_full_url(false) . '"'; ?> + "/ajax.php",
|
url: action= <?php echo '"' . ui_get_full_url(false, false, false, false) . '"'; ?> + "/ajax.php",
|
||||||
async: false,
|
async: false,
|
||||||
timeout: 10000,
|
timeout: 10000,
|
||||||
success: function (data) {
|
success: function (data) {
|
||||||
|
@ -1240,7 +1240,7 @@ function edit_custom_graph() {
|
||||||
jQuery.ajax ({
|
jQuery.ajax ({
|
||||||
data: params1.join ("&"),
|
data: params1.join ("&"),
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
url: action= <?php echo '"' . ui_get_full_url(false) . '"'; ?> + "/ajax.php",
|
url: action= <?php echo '"' . ui_get_full_url(false, false, false, false) . '"'; ?> + "/ajax.php",
|
||||||
async: false,
|
async: false,
|
||||||
timeout: 10000,
|
timeout: 10000,
|
||||||
success: function (data) {
|
success: function (data) {
|
||||||
|
@ -1289,7 +1289,7 @@ function chooseSQLquery() {
|
||||||
jQuery.ajax ({
|
jQuery.ajax ({
|
||||||
data: params1.join ("&"),
|
data: params1.join ("&"),
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
url: action= <?php echo '"' . ui_get_full_url(false) . '"'; ?> + "/ajax.php",
|
url: action= <?php echo '"' . ui_get_full_url(false, false, false, false) . '"'; ?> + "/ajax.php",
|
||||||
async: false,
|
async: false,
|
||||||
timeout: 10000,
|
timeout: 10000,
|
||||||
success: function (data) {
|
success: function (data) {
|
||||||
|
@ -1304,7 +1304,7 @@ function chooseSQLquery() {
|
||||||
jQuery.ajax ({
|
jQuery.ajax ({
|
||||||
data: params.join ("&"),
|
data: params.join ("&"),
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
url: action= <?php echo '"' . ui_get_full_url(false) . '"'; ?> + "/ajax.php",
|
url: action= <?php echo '"' . ui_get_full_url(false, false, false, false) . '"'; ?> + "/ajax.php",
|
||||||
timeout: 10000,
|
timeout: 10000,
|
||||||
dataType: 'json',
|
dataType: 'json',
|
||||||
success: function (data) {
|
success: function (data) {
|
||||||
|
@ -1325,7 +1325,7 @@ function deleteSLARow(id_row) {
|
||||||
jQuery.ajax ({
|
jQuery.ajax ({
|
||||||
data: params.join ("&"),
|
data: params.join ("&"),
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
url: action= <?php echo '"' . ui_get_full_url(false) . '"'; ?> + "/ajax.php",
|
url: action= <?php echo '"' . ui_get_full_url(false, false, false, false) . '"'; ?> + "/ajax.php",
|
||||||
timeout: 10000,
|
timeout: 10000,
|
||||||
dataType: 'json',
|
dataType: 'json',
|
||||||
success: function (data) {
|
success: function (data) {
|
||||||
|
@ -1345,7 +1345,7 @@ function deleteGeneralRow(id_row) {
|
||||||
jQuery.ajax ({
|
jQuery.ajax ({
|
||||||
data: params.join ("&"),
|
data: params.join ("&"),
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
url: action= <?php echo '"' . ui_get_full_url(false) . '"'; ?> + "/ajax.php",
|
url: action= <?php echo '"' . ui_get_full_url(false, false, false, false) . '"'; ?> + "/ajax.php",
|
||||||
timeout: 10000,
|
timeout: 10000,
|
||||||
dataType: 'json',
|
dataType: 'json',
|
||||||
success: function (data) {
|
success: function (data) {
|
||||||
|
@ -1376,7 +1376,7 @@ function addSLARow() {
|
||||||
jQuery.ajax ({
|
jQuery.ajax ({
|
||||||
data: params.join ("&"),
|
data: params.join ("&"),
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
url: action= <?php echo '"' . ui_get_full_url(false) . '"'; ?> + "/ajax.php",
|
url: action= <?php echo '"' . ui_get_full_url(false, false, false, false) . '"'; ?> + "/ajax.php",
|
||||||
async: false,
|
async: false,
|
||||||
timeout: 10000,
|
timeout: 10000,
|
||||||
success: function (data) {
|
success: function (data) {
|
||||||
|
@ -1391,7 +1391,7 @@ function addSLARow() {
|
||||||
jQuery.ajax ({
|
jQuery.ajax ({
|
||||||
data: params.join ("&"),
|
data: params.join ("&"),
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
url: action= <?php echo '"' . ui_get_full_url(false) . '"'; ?> + "/ajax.php",
|
url: action= <?php echo '"' . ui_get_full_url(false, false, false, false) . '"'; ?> + "/ajax.php",
|
||||||
async: false,
|
async: false,
|
||||||
timeout: 10000,
|
timeout: 10000,
|
||||||
success: function (data) {
|
success: function (data) {
|
||||||
|
@ -1412,7 +1412,7 @@ function addSLARow() {
|
||||||
jQuery.ajax ({
|
jQuery.ajax ({
|
||||||
data: params.join ("&"),
|
data: params.join ("&"),
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
url: action= <?php echo '"' . ui_get_full_url(false) . '"'; ?> + "/ajax.php",
|
url: action= <?php echo '"' . ui_get_full_url(false, false, false, false) . '"'; ?> + "/ajax.php",
|
||||||
timeout: 10000,
|
timeout: 10000,
|
||||||
dataType: 'json',
|
dataType: 'json',
|
||||||
success: function (data) {
|
success: function (data) {
|
||||||
|
@ -1464,7 +1464,7 @@ function addGeneralRow() {
|
||||||
jQuery.ajax ({
|
jQuery.ajax ({
|
||||||
data: params.join ("&"),
|
data: params.join ("&"),
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
url: action= <?php echo '"' . ui_get_full_url(false) . '"'; ?> + "/ajax.php",
|
url: action= <?php echo '"' . ui_get_full_url(false, false, false, false) . '"'; ?> + "/ajax.php",
|
||||||
async: false,
|
async: false,
|
||||||
timeout: 10000,
|
timeout: 10000,
|
||||||
success: function (data) {
|
success: function (data) {
|
||||||
|
@ -1479,7 +1479,7 @@ function addGeneralRow() {
|
||||||
jQuery.ajax ({
|
jQuery.ajax ({
|
||||||
data: params.join ("&"),
|
data: params.join ("&"),
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
url: action= <?php echo '"' . ui_get_full_url(false) . '"'; ?> + "/ajax.php",
|
url: action= <?php echo '"' . ui_get_full_url(false, false, false, false) . '"'; ?> + "/ajax.php",
|
||||||
async: false,
|
async: false,
|
||||||
timeout: 10000,
|
timeout: 10000,
|
||||||
success: function (data) {
|
success: function (data) {
|
||||||
|
@ -1494,7 +1494,7 @@ function addGeneralRow() {
|
||||||
jQuery.ajax ({
|
jQuery.ajax ({
|
||||||
data: params.join ("&"),
|
data: params.join ("&"),
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
url: action= <?php echo '"' . ui_get_full_url(false) . '"'; ?> + "/ajax.php",
|
url: action= <?php echo '"' . ui_get_full_url(false, false, false, false) . '"'; ?> + "/ajax.php",
|
||||||
async: false,
|
async: false,
|
||||||
timeout: 10000,
|
timeout: 10000,
|
||||||
success: function (data) {
|
success: function (data) {
|
||||||
|
@ -1512,7 +1512,7 @@ function addGeneralRow() {
|
||||||
jQuery.ajax ({
|
jQuery.ajax ({
|
||||||
data: params.join ("&"),
|
data: params.join ("&"),
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
url: action= <?php echo '"' . ui_get_full_url(false) . '"'; ?> + "/ajax.php",
|
url: action= <?php echo '"' . ui_get_full_url(false, false, false, false) . '"'; ?> + "/ajax.php",
|
||||||
timeout: 10000,
|
timeout: 10000,
|
||||||
dataType: 'json',
|
dataType: 'json',
|
||||||
success: function (data) {
|
success: function (data) {
|
||||||
|
|
|
@ -236,7 +236,7 @@ switch ($action) {
|
||||||
html_print_image("images/god6.png", true, array ("title" => __('Main'))) .'</a>')
|
html_print_image("images/god6.png", true, array ("title" => __('Main'))) .'</a>')
|
||||||
);
|
);
|
||||||
|
|
||||||
if ($enterpriseEnable and !defined('METACONSOLE')) {
|
if ($enterpriseEnable) {
|
||||||
$buttons = reporting_enterprise_add_main_Tabs($buttons);
|
$buttons = reporting_enterprise_add_main_Tabs($buttons);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -34,6 +34,7 @@ $name_tag = (string) get_parameter ("name_tag", "");
|
||||||
$description_tag = (string) get_parameter ("description_tag", "");
|
$description_tag = (string) get_parameter ("description_tag", "");
|
||||||
$description_tag = io_safe_input(strip_tags(io_safe_output($description_tag)));
|
$description_tag = io_safe_input(strip_tags(io_safe_output($description_tag)));
|
||||||
$url_tag = (string) get_parameter ("url_tag", "");
|
$url_tag = (string) get_parameter ("url_tag", "");
|
||||||
|
$email_tag = (string) get_parameter ("email_tag", "");
|
||||||
$tab = (string) get_parameter ("tab", "list");
|
$tab = (string) get_parameter ("tab", "list");
|
||||||
|
|
||||||
$buttons = array(
|
$buttons = array(
|
||||||
|
@ -58,6 +59,7 @@ if ($update_tag && $id_tag != 0) {
|
||||||
$values['name'] = $name_tag;
|
$values['name'] = $name_tag;
|
||||||
$values['description'] = $description_tag;
|
$values['description'] = $description_tag;
|
||||||
$values['url'] = $url_tag;
|
$values['url'] = $url_tag;
|
||||||
|
$values['email'] = $email_tag;
|
||||||
|
|
||||||
$result = false;
|
$result = false;
|
||||||
if ($values['name'] != '')
|
if ($values['name'] != '')
|
||||||
|
@ -85,6 +87,7 @@ if ($create_tag) {
|
||||||
$data['name'] = $name_tag;
|
$data['name'] = $name_tag;
|
||||||
$data['description'] = $description_tag;
|
$data['description'] = $description_tag;
|
||||||
$data['url'] = $url_tag;
|
$data['url'] = $url_tag;
|
||||||
|
$data['email'] = $email_tag;
|
||||||
|
|
||||||
// DB insert
|
// DB insert
|
||||||
$return_create = false;
|
$return_create = false;
|
||||||
|
@ -112,11 +115,13 @@ if ($action == "update" && $id_tag != 0){
|
||||||
$name_tag = $result_tag["name"];
|
$name_tag = $result_tag["name"];
|
||||||
$description_tag = $result_tag["description"];
|
$description_tag = $result_tag["description"];
|
||||||
$url_tag = $result_tag["url"];
|
$url_tag = $result_tag["url"];
|
||||||
|
$email_tag = $result_tag["email"];
|
||||||
} // If current action is create (new) or somethig goes wrong fields are filled with void value
|
} // If current action is create (new) or somethig goes wrong fields are filled with void value
|
||||||
else {
|
else {
|
||||||
$name_tag = "";
|
$name_tag = "";
|
||||||
$description_tag = "";
|
$description_tag = "";
|
||||||
$url_tag = "";
|
$url_tag = "";
|
||||||
|
$email_tag = "";
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create/Update tag form
|
// Create/Update tag form
|
||||||
|
@ -150,6 +155,15 @@ echo "<table border=0 cellpadding=4 cellspacing=4 class=databox width=98%>";
|
||||||
html_print_input_text ('url_tag', $url_tag);
|
html_print_input_text ('url_tag', $url_tag);
|
||||||
echo "</td>";
|
echo "</td>";
|
||||||
echo "</tr>";
|
echo "</tr>";
|
||||||
|
echo "<tr>";
|
||||||
|
echo "<td align=left>";
|
||||||
|
echo '<b>' . __("Email") . '</b>';
|
||||||
|
echo ui_print_help_tip (__("Associated Email direction to use later in alerts associated to Tags."), true);
|
||||||
|
echo "</td>";
|
||||||
|
echo "<td align=center>";
|
||||||
|
html_print_input_text ('email_tag', $email_tag);
|
||||||
|
echo "</td>";
|
||||||
|
echo "</tr>";
|
||||||
echo "<tr>";
|
echo "<tr>";
|
||||||
if ($action == "update"){
|
if ($action == "update"){
|
||||||
echo "<td align=center>";
|
echo "<td align=center>";
|
||||||
|
|
|
@ -140,12 +140,13 @@ if (!empty($result)) {
|
||||||
$table->style[1] = 'text-align:center';
|
$table->style[1] = 'text-align:center';
|
||||||
$table->style[2] = 'text-align:center';
|
$table->style[2] = 'text-align:center';
|
||||||
$table->style[3] = 'text-align:center';
|
$table->style[3] = 'text-align:center';
|
||||||
$table->style[4] = 'text-align:center';
|
$table->style[5] = 'text-align:center';
|
||||||
$table->head[0] = __('Tag name');
|
$table->head[0] = __('Tag name');
|
||||||
$table->head[1] = __('Description');
|
$table->head[1] = __('Description');
|
||||||
$table->head[2] = __('Detail information');
|
$table->head[2] = __('Detail information');
|
||||||
$table->head[3] = __('Number of modules affected');
|
$table->head[3] = __('Number of modules affected');
|
||||||
$table->head[4] = __('Actions');
|
$table->head[4] = __('Email');
|
||||||
|
$table->head[5] = __('Actions');
|
||||||
|
|
||||||
foreach ($result as $tag) {
|
foreach ($result as $tag) {
|
||||||
if ($rowPair)
|
if ($rowPair)
|
||||||
|
@ -165,8 +166,9 @@ if (!empty($result)) {
|
||||||
html_print_image("images/zoom.png", true, array("id" => 'tag-details-'.$tag['id_tag'], "class" => "img_help")) . '</a> ';
|
html_print_image("images/zoom.png", true, array("id" => 'tag-details-'.$tag['id_tag'], "class" => "img_help")) . '</a> ';
|
||||||
|
|
||||||
$data[3] .= tags_get_modules_count($tag["id_tag"]);
|
$data[3] .= tags_get_modules_count($tag["id_tag"]);
|
||||||
$data[4] = "<a href='index.php?sec=gmodules&sec2=godmode/tag/edit_tag&action=update&id_tag=".$tag["id_tag"] . "'>" . html_print_image("images/config.png", true, array("title" => "Edit")) . "</a> ";
|
$data[4] = $tag["email"];
|
||||||
$data[4] .= '<a href="index.php?sec=gmodules&sec2=godmode/tag/tag&delete_tag='.$tag["id_tag"] . '"onclick="if (! confirm (\''.__('Are you sure?').'\')) return false">' . html_print_image("images/cross.png", true, array("title" => "Delete")) . '</a>';
|
$data[5] = "<a href='index.php?sec=gmodules&sec2=godmode/tag/edit_tag&action=update&id_tag=".$tag["id_tag"] . "'>" . html_print_image("images/config.png", true, array("title" => "Edit")) . "</a> ";
|
||||||
|
$data[5] .= '<a href="index.php?sec=gmodules&sec2=godmode/tag/tag&delete_tag='.$tag["id_tag"] . '"onclick="if (! confirm (\''.__('Are you sure?').'\')) return false">' . html_print_image("images/cross.png", true, array("title" => "Delete")) . '</a>';
|
||||||
array_push ($table->data, $data);
|
array_push ($table->data, $data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -799,7 +799,7 @@ function api_get_all_agents($thrash1, $thrash2, $other, $thrash3) {
|
||||||
if (isset($other['data'][0])){
|
if (isset($other['data'][0])){
|
||||||
// Filter by SO
|
// Filter by SO
|
||||||
if ($other['data'][0] != ""){
|
if ($other['data'][0] != ""){
|
||||||
$where .= " AND id_os = " . $other['data'][0];
|
$where .= " AND tconfig_os.id_os = " . $other['data'][0];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (isset($other['data'][1])){
|
if (isset($other['data'][1])){
|
||||||
|
@ -858,7 +858,7 @@ function api_get_all_agents($thrash1, $thrash2, $other, $thrash3) {
|
||||||
$result_agents[] = $agent;
|
$result_agents[] = $agent;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// filter by NORMAL, WARNING, CRITICAL, UNKNOWN
|
// filter by NORMAL, WARNING, CRITICAL, UNKNOWN, ALERT_FIRED
|
||||||
else {
|
else {
|
||||||
$status = agents_get_status($agent['id_agente'], true);
|
$status = agents_get_status($agent['id_agente'], true);
|
||||||
// Filter by status
|
// Filter by status
|
||||||
|
@ -883,6 +883,11 @@ function api_get_all_agents($thrash1, $thrash2, $other, $thrash3) {
|
||||||
$result_agents[] = $agent;
|
$result_agents[] = $agent;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case 'alert_fired':
|
||||||
|
if ($status == 4) {
|
||||||
|
$result_agents[] = $agent;
|
||||||
|
}
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -315,11 +315,7 @@ function config_update_config () {
|
||||||
*/
|
*/
|
||||||
function config_process_config () {
|
function config_process_config () {
|
||||||
global $config;
|
global $config;
|
||||||
<<<<<<< .mine
|
|
||||||
|
|
||||||
=======
|
|
||||||
|
|
||||||
>>>>>>> .r7341
|
|
||||||
$configs = db_get_all_rows_in_table ('tconfig');
|
$configs = db_get_all_rows_in_table ('tconfig');
|
||||||
|
|
||||||
if (empty ($configs)) {
|
if (empty ($configs)) {
|
||||||
|
|
|
@ -2434,6 +2434,13 @@ function ui_print_agent_autocomplete_input($parameters) {
|
||||||
if (isset($parameters['metaconsole_enabled'])) {
|
if (isset($parameters['metaconsole_enabled'])) {
|
||||||
$metaconsole_enabled = $parameters['metaconsole_enabled'];
|
$metaconsole_enabled = $parameters['metaconsole_enabled'];
|
||||||
}
|
}
|
||||||
|
else {
|
||||||
|
// If metaconsole_enabled param is not setted then pick source configuration
|
||||||
|
if (defined('METACONSOLE'))
|
||||||
|
$metaconsole_enabled = true;
|
||||||
|
else
|
||||||
|
$metaconsole_enabled = false;
|
||||||
|
}
|
||||||
|
|
||||||
// Javascript configurations
|
// Javascript configurations
|
||||||
//------------------------------------------------------------------
|
//------------------------------------------------------------------
|
||||||
|
|
|
@ -188,13 +188,14 @@ function agent_changed_by_multiple_agents (event, id_agent, selected) {
|
||||||
else {
|
else {
|
||||||
if (event.data == null)
|
if (event.data == null)
|
||||||
homedir += '.';
|
homedir += '.';
|
||||||
else
|
else {
|
||||||
homedir = event.data.homedir;
|
homedir = event.data.homedir;
|
||||||
|
|
||||||
if (event.data.metaconsole != null) {
|
if (event.data.metaconsole != null) {
|
||||||
id_server = $("#" + event.data.id_server).val();
|
id_server = $("#" + event.data.id_server).val();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
jQuery.post (homedir + '/ajax.php',
|
jQuery.post (homedir + '/ajax.php',
|
||||||
{"page": "operation/agentes/ver_agente",
|
{"page": "operation/agentes/ver_agente",
|
||||||
|
|
|
@ -1042,9 +1042,9 @@ div#main_pure {
|
||||||
#loading {
|
#loading {
|
||||||
position:fixed;
|
position:fixed;
|
||||||
width: 200px;
|
width: 200px;
|
||||||
margin-left: 250px;
|
margin-left: 30%;
|
||||||
text-align:center;
|
text-align:center;
|
||||||
top:300px;
|
top: 50%;
|
||||||
background-color: #999999;
|
background-color: #999999;
|
||||||
padding: 20px;
|
padding: 20px;
|
||||||
}
|
}
|
||||||
|
|
|
@ -153,7 +153,7 @@ html_print_table ($table);
|
||||||
html_print_input_hidden ('id_report', $id_report);
|
html_print_input_hidden ('id_report', $id_report);
|
||||||
echo '</form>';
|
echo '</form>';
|
||||||
|
|
||||||
echo '<div id="loading">';
|
echo '<div id="loading" style="text-align: center;">';
|
||||||
echo html_print_image("images/wait.gif", true, array("border" => '0'));
|
echo html_print_image("images/wait.gif", true, array("border" => '0'));
|
||||||
echo '<strong>'.__('Loading').'...</strong>';
|
echo '<strong>'.__('Loading').'...</strong>';
|
||||||
echo '</div>';
|
echo '</div>';
|
||||||
|
@ -195,6 +195,26 @@ $(document).ready (function () {
|
||||||
|
|
||||||
$('[id^=text-date_init]').datepicker ({changeMonth: true, changeYear: true, showAnim: "slideDown"});
|
$('[id^=text-date_init]').datepicker ({changeMonth: true, changeYear: true, showAnim: "slideDown"});
|
||||||
|
|
||||||
|
|
||||||
|
$("*", "#table1-0").css("display", ""); //Re-show the first row of form.
|
||||||
|
|
||||||
|
/* Show/hide begin date reports controls */
|
||||||
|
$("#checkbox-enable_init_date").click(function() {
|
||||||
|
flag = $("#checkbox-enable_init_date").is(':checked');
|
||||||
|
if (flag == true) {
|
||||||
|
$("#table1-1-1").css("display", "");
|
||||||
|
$("#table1-1-2").css("display", "");
|
||||||
|
$("#string_to").show();
|
||||||
|
$("#string_items").hide();
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
$("#table1-1-1").css("display", "none");
|
||||||
|
$("#table1-1-2").css("display", "");
|
||||||
|
$("#string_to").hide();
|
||||||
|
$("#string_items").show();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
@ -261,27 +281,3 @@ foreach ($contents as $content) {
|
||||||
flush ();
|
flush ();
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
|
|
||||||
<script type="text/javascript">
|
|
||||||
|
|
||||||
$(document).ready (function () {
|
|
||||||
$("*", "#table1-0").css("display", ""); //Re-show the first row of form.
|
|
||||||
|
|
||||||
/* Show/hide begin date reports controls */
|
|
||||||
$("#checkbox-enable_init_date").click(function() {
|
|
||||||
flag = $("#checkbox-enable_init_date").is(':checked');
|
|
||||||
if (flag == true) {
|
|
||||||
$("#table1-1-1").css("display", "");
|
|
||||||
$("#table1-1-2").css("display", "");
|
|
||||||
$("#string_to").show();
|
|
||||||
$("#string_items").hide();
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
$("#table1-1-1").css("display", "none");
|
|
||||||
$("#table1-1-2").css("display", "");
|
|
||||||
$("#string_to").hide();
|
|
||||||
$("#string_items").show();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
|
|
|
@ -611,7 +611,7 @@ INSERT INTO tplugin (id, name, description, max_timeout, execute, plugin_type, m
|
||||||
|
|
||||||
INSERT INTO tagent_custom_fields VALUES (1,'Serial Number',0),(2,'Department',0),(3,'Additional ID',0);
|
INSERT INTO tagent_custom_fields VALUES (1,'Serial Number',0),(2,'Department',0),(3,'Additional ID',0);
|
||||||
|
|
||||||
INSERT INTO ttag VALUES (1,'network','Network equipment','http://artica.es'),(2,'critical','Critical modules',''),(3,'dmz','DMZ Network Zone',''),(4,'performance','Performance anda capacity modules',''),(5,'configuration','','');
|
INSERT INTO ttag VALUES (1,'network','Network equipment','http://artica.es',''),(2,'critical','Critical modules','',''),(3,'dmz','DMZ Network Zone','',''),(4,'performance','Performance anda capacity modules','',''),(5,'configuration','','','');
|
||||||
|
|
||||||
INSERT INTO tevent_response VALUES (1,'Ping to host','Ping to the agent host','ping -c 5 _agent_address_','command',0,620,500,0,''),(2,'SSH to host','Connect via SSH to the agent','http://192.168.70.164:8022/anyterm.html?param=_User_@_agent_address_','url',0,800,450,0,'User'),(3,'Create incident from event','Create a incident from the event with the standard incidents system of Pandora FMS','index.php?sec=workspace&sec2=operation/incidents/incident_detail&insert_form&from_event=_event_id_','url',0,0,0,1,''),(4,'Create Integria IMS incident from event','Create a incident from the event with integria incidents system of Pandora FMS. 

Is necessary to enable and configure the Integria incidents in Pandora FMS setup.','index.php?sec=workspace&sec2=operation/integria_incidents/incident&tab=editor&from_event=_event_id_','url',0,0,0,1,''),(5,'Restart agent','Restart the agent with using UDP protocol.

To use this response is necessary to have installed Pandora FMS server and console in the same machine.','/usr/share/pandora_server/udp_client.pl _agent_address_ 41122 "REFRESH AGENT"','command',0,620,500,0,'');
|
INSERT INTO tevent_response VALUES (1,'Ping to host','Ping to the agent host','ping -c 5 _agent_address_','command',0,620,500,0,''),(2,'SSH to host','Connect via SSH to the agent','http://192.168.70.164:8022/anyterm.html?param=_User_@_agent_address_','url',0,800,450,0,'User'),(3,'Create incident from event','Create a incident from the event with the standard incidents system of Pandora FMS','index.php?sec=workspace&sec2=operation/incidents/incident_detail&insert_form&from_event=_event_id_','url',0,0,0,1,''),(4,'Create Integria IMS incident from event','Create a incident from the event with integria incidents system of Pandora FMS. 

Is necessary to enable and configure the Integria incidents in Pandora FMS setup.','index.php?sec=workspace&sec2=operation/integria_incidents/incident&tab=editor&from_event=_event_id_','url',0,0,0,1,''),(5,'Restart agent','Restart the agent with using UDP protocol.

To use this response is necessary to have installed Pandora FMS server and console in the same machine.','/usr/share/pandora_server/udp_client.pl _agent_address_ 41122 "REFRESH AGENT"','command',0,620,500,0,'');
|
||||||
|
|
||||||
|
|
|
@ -452,7 +452,7 @@ INSERT INTO "tplugin" ("id", "name", "description", "max_timeout", "execute", "p
|
||||||
|
|
||||||
INSERT INTO "tagent_custom_fields" VALUES (1,'Serial Number',0),(2,'Department',0),(3,'Additional ID',0);
|
INSERT INTO "tagent_custom_fields" VALUES (1,'Serial Number',0),(2,'Department',0),(3,'Additional ID',0);
|
||||||
|
|
||||||
INSERT INTO "ttag" VALUES (1,'network','Network equipment','http://artica.es'),(2,'critical','Critical modules',''),(3,'dmz','DMZ Network Zone',''),(4,'performance','Performance anda capacity modules',''),(5,'configuration','','');
|
INSERT INTO "ttag" VALUES (1,'network','Network equipment','http://artica.es',''),(2,'critical','Critical modules','',''),(3,'dmz','DMZ Network Zone','',''),(4,'performance','Performance anda capacity modules','',''),(5,'configuration','','','');
|
||||||
|
|
||||||
INSERT INTO "tevent_response" VALUES (1,'Ping to host','Ping to the agent host','ping -c 5 _agent_address_','command',0,620,500,0,''),(2,'SSH to host','Connect via SSH to the agent','http://192.168.70.164:8022/anyterm.html?param=_User_@_agent_address_','url',0,800,450,0,'User'),(3,'Create incident from event','Create a incident from the event with the standard incidents system of Pandora FMS','index.php?sec=workspace&sec2=operation/incidents/incident_detail&insert_form&from_event=_event_id_','url',0,0,0,1,''),(4,'Create Integria IMS incident from event','Create a incident from the event with integria incidents system of Pandora FMS. 

Is necessary to enable and configure the Integria incidents in Pandora FMS setup.','index.php?sec=workspace&sec2=operation/integria_incidents/incident&tab=editor&from_event=_event_id_','url',0,0,0,1,''),(5,'Restart agent','Restart the agent with using UDP protocol.

To use this response is necessary to have installed Pandora FMS server and console in the same machine.','/usr/share/pandora_server/udp_client.pl _agent_address_ 41122 "REFRESH AGENT"','command',0,620,500,0,'');
|
INSERT INTO "tevent_response" VALUES (1,'Ping to host','Ping to the agent host','ping -c 5 _agent_address_','command',0,620,500,0,''),(2,'SSH to host','Connect via SSH to the agent','http://192.168.70.164:8022/anyterm.html?param=_User_@_agent_address_','url',0,800,450,0,'User'),(3,'Create incident from event','Create a incident from the event with the standard incidents system of Pandora FMS','index.php?sec=workspace&sec2=operation/incidents/incident_detail&insert_form&from_event=_event_id_','url',0,0,0,1,''),(4,'Create Integria IMS incident from event','Create a incident from the event with integria incidents system of Pandora FMS. 

Is necessary to enable and configure the Integria incidents in Pandora FMS setup.','index.php?sec=workspace&sec2=operation/integria_incidents/incident&tab=editor&from_event=_event_id_','url',0,0,0,1,''),(5,'Restart agent','Restart the agent with using UDP protocol.

To use this response is necessary to have installed Pandora FMS server and console in the same machine.','/usr/share/pandora_server/udp_client.pl _agent_address_ 41122 "REFRESH AGENT"','command',0,620,500,0,'');
|
||||||
|
|
||||||
|
|
|
@ -1653,7 +1653,8 @@ CREATE TABLE ttag (
|
||||||
id_tag NUMBER(10, 0) NOT NULL PRIMARY KEY,
|
id_tag NUMBER(10, 0) NOT NULL PRIMARY KEY,
|
||||||
name VARCHAR2(100) default '' NOT NULL,
|
name VARCHAR2(100) default '' NOT NULL,
|
||||||
description CLOB default '' NOT NULL,
|
description CLOB default '' NOT NULL,
|
||||||
url CLOB default '' NOT NULL
|
url CLOB default '' NOT NULL,
|
||||||
|
email CLOB NULL
|
||||||
);
|
);
|
||||||
|
|
||||||
CREATE SEQUENCE ttag_s INCREMENT BY 1 START WITH 1;
|
CREATE SEQUENCE ttag_s INCREMENT BY 1 START WITH 1;
|
||||||
|
|
|
@ -1434,7 +1434,8 @@ CREATE TABLE "ttag" (
|
||||||
"id_tag" SERIAL NOT NULL PRIMARY KEY,
|
"id_tag" SERIAL NOT NULL PRIMARY KEY,
|
||||||
"name" VARCHAR(100) NOT NULL default '',
|
"name" VARCHAR(100) NOT NULL default '',
|
||||||
"description" text NOT NULL default '',
|
"description" text NOT NULL default '',
|
||||||
"url" text NOT NULL default ''
|
"url" text NOT NULL default '',
|
||||||
|
"email" text NULL
|
||||||
);
|
);
|
||||||
|
|
||||||
-- ---------------------------------------------------------------------
|
-- ---------------------------------------------------------------------
|
||||||
|
|
|
@ -1543,6 +1543,7 @@ CREATE TABLE IF NOT EXISTS `ttag` (
|
||||||
`name` varchar(100) NOT NULL default '',
|
`name` varchar(100) NOT NULL default '',
|
||||||
`description` text NOT NULL,
|
`description` text NOT NULL,
|
||||||
`url` mediumtext NOT NULL,
|
`url` mediumtext NOT NULL,
|
||||||
|
`email` text NULL,
|
||||||
PRIMARY KEY (`id_tag`)
|
PRIMARY KEY (`id_tag`)
|
||||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||||
|
|
||||||
|
|
|
@ -440,7 +440,7 @@ INSERT INTO `tplugin` (`id`, `name`, `description`, `max_timeout`, `execute`, `p
|
||||||
|
|
||||||
INSERT INTO `tagent_custom_fields` VALUES (1,'Serial Number',0),(2,'Department',0),(3,'Additional ID',0);
|
INSERT INTO `tagent_custom_fields` VALUES (1,'Serial Number',0),(2,'Department',0),(3,'Additional ID',0);
|
||||||
|
|
||||||
INSERT INTO `ttag` VALUES (1,'network','Network equipment','http://artica.es'),(2,'critical','Critical modules',''),(3,'dmz','DMZ Network Zone',''),(4,'performance','Performance anda capacity modules',''),(5,'configuration','','');
|
INSERT INTO `ttag` VALUES (1,'network','Network equipment','http://artica.es',''),(2,'critical','Critical modules','',''),(3,'dmz','DMZ Network Zone','',''),(4,'performance','Performance anda capacity modules','',''),(5,'configuration','','','');
|
||||||
|
|
||||||
INSERT INTO `tevent_response` VALUES (1,'Ping to host','Ping to the agent host','ping -c 5 _agent_address_','command',0,620,500,0,''),(2,'SSH to host','Connect via SSH to the agent','http://192.168.70.164:8022/anyterm.html?param=_User_@_agent_address_','url',0,800,450,0,'User'),(3,'Create incident from event','Create a incident from the event with the standard incidents system of Pandora FMS','index.php?sec=workspace&sec2=operation/incidents/incident_detail&insert_form&from_event=_event_id_','url',0,0,0,1,''),(4,'Create Integria IMS incident from event','Create a incident from the event with integria incidents system of Pandora FMS. 

Is necessary to enable and configure the Integria incidents in Pandora FMS setup.','index.php?sec=workspace&sec2=operation/integria_incidents/incident&tab=editor&from_event=_event_id_','url',0,0,0,1,''),(5,'Restart agent','Restart the agent with using UDP protocol.

To use this response is necessary to have installed Pandora FMS server and console in the same machine.','/usr/share/pandora_server/udp_client.pl _agent_address_ 41122 "REFRESH AGENT"','command',0,620,500,0,'');
|
INSERT INTO `tevent_response` VALUES (1,'Ping to host','Ping to the agent host','ping -c 5 _agent_address_','command',0,620,500,0,''),(2,'SSH to host','Connect via SSH to the agent','http://192.168.70.164:8022/anyterm.html?param=_User_@_agent_address_','url',0,800,450,0,'User'),(3,'Create incident from event','Create a incident from the event with the standard incidents system of Pandora FMS','index.php?sec=workspace&sec2=operation/incidents/incident_detail&insert_form&from_event=_event_id_','url',0,0,0,1,''),(4,'Create Integria IMS incident from event','Create a incident from the event with integria incidents system of Pandora FMS. 

Is necessary to enable and configure the Integria incidents in Pandora FMS setup.','index.php?sec=workspace&sec2=operation/integria_incidents/incident&tab=editor&from_event=_event_id_','url',0,0,0,1,''),(5,'Restart agent','Restart the agent with using UDP protocol.

To use this response is necessary to have installed Pandora FMS server and console in the same machine.','/usr/share/pandora_server/udp_client.pl _agent_address_ 41122 "REFRESH AGENT"','command',0,620,500,0,'');
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue