') AS user_comment, - GROUP_CONCAT(DISTINCT id_evento SEPARATOR ',') AS similar_ids, - COUNT(id_evento) AS event_rep, MAX(utimestamp) AS timestamp_rep, - MIN(utimestamp) AS timestamp_rep_min, - (SELECT owner_user FROM $table WHERE id_evento = MAX(te.id_evento)) owner_user, - (SELECT id_usuario FROM $table WHERE id_evento = MAX(te.id_evento)) id_usuario, - (SELECT id_agente FROM $table WHERE id_evento = MAX(te.id_evento)) id_agente, - (SELECT criticity FROM $table WHERE id_evento = MAX(te.id_evento)) AS criticity, - (SELECT ack_utimestamp FROM $table WHERE id_evento = MAX(te.id_evento)) AS ack_utimestamp, - (SELECT nombre FROM tagente_modulo WHERE id_agente_modulo = te.id_agentmodule) AS module_name - FROM $table te $event_lj - WHERE 1=1 ".$sql_post.' - GROUP BY estado, evento, id_agente, id_agentmodule'.$groupby_extra; - $sql .= ' '.events_get_sql_order($sort_field, $order, 2); - $sql .= ' LIMIT '.$offset.','.$pagination; + $sql = sprintf( + 'SELECT *, + MAX(id_evento) AS id_evento, + GROUP_CONCAT( + DISTINCT user_comment SEPARATOR "
" + ) AS user_comment, + GROUP_CONCAT( + DISTINCT id_evento SEPARATOR "," + ) AS similar_ids, + COUNT(id_evento) AS event_rep, MAX(utimestamp) AS timestamp_rep, + MIN(utimestamp) AS timestamp_rep_min, + (SELECT owner_user + FROM %s + WHERE id_evento = MAX(te.id_evento)) AS owner_user, + (SELECT id_usuario + FROM %s + WHERE id_evento = MAX(te.id_evento)) AS id_usuario, + (SELECT id_agente + FROM %s + WHERE id_evento = MAX(te.id_evento)) AS id_agente, + (SELECT criticity + FROM %s + WHERE id_evento = MAX(te.id_evento)) AS criticity, + (SELECT ack_utimestamp + FROM %s + WHERE id_evento = MAX(te.id_evento)) AS ack_utimestamp, + (SELECT nombre + FROM tagente_modulo + WHERE id_agente_modulo = te.id_agentmodule) AS module_name + FROM %s te %s + %s + GROUP BY estado, evento, id_agente, id_agentmodule %s + %s + LIMIT %d, %d', + $table, + $table, + $table, + $table, + $table, + $table, + $event_lj, + $sql_post, + $groupby_extra, + events_get_sql_order($sort_field, $order, 2), + $offset, + $pagination + ); } - // Extract the events by filter (or not) from db + // Extract the events by filter (or not) from db. $events = db_get_all_rows_sql($sql, $history_db); if ($total) { @@ -2959,7 +2997,8 @@ function events_get_agent( $type = []; foreach ($filter_event_type as $event_type) { if ($event_type != '') { - // If normal, warning, could be several (going_up_warning, going_down_warning... too complex. + // If normal, warning, could be several + // (going_up_warning, going_down_warning... too complex. // Shown to user only "warning, critical and normal". if ($event_type == 'warning' || $event_type == 'critical' || $event_type == 'normal') { $type[] = " event_type LIKE '%".$event_type."%' "; @@ -2979,10 +3018,10 @@ function events_get_agent( } if ($events_group) { - $sql_where .= sprintf( + $secondary_groups = sprintf( ' INNER JOIN tgrupo tg - ON (te.id_grupo = tg.id_grupo AND tg.id_grupo = %s) - OR (tg.id_grupo = tasg.id_group AND tasg.id_group = %s) + ON (te.id_grupo = tg.id_grupo AND tg.id_grupo IN (%s)) + OR (tg.id_grupo = tasg.id_group AND tasg.id_group IN (%s)) WHERE utimestamp > %d AND utimestamp <= %d ', join(',', $id_group), @@ -2990,22 +3029,27 @@ function events_get_agent( $datelimit, $date ); - } else if ($events_module) { - $sql_where .= sprintf( - ' AND id_agentmodule = %d AND utimestamp > %d - AND utimestamp <= %d ', - $id_agent_module, - $datelimit, - $date - ); + $sql_where = $secondary_groups.' '.$sql_where; } else { - $sql_where .= sprintf( - ' AND id_agente = %d AND utimestamp > %d - AND utimestamp <= %d ', - $id_agent, - $datelimit, - $date - ); + $sql_where = ' WHERE 1=1 '.$sql_where; + + if ($events_module) { + $sql_where .= sprintf( + ' AND id_agentmodule = %d AND utimestamp > %d + AND utimestamp <= %d ', + $id_agent_module, + $datelimit, + $date + ); + } else { + $sql_where .= sprintf( + ' AND id_agente = %d AND utimestamp > %d + AND utimestamp <= %d ', + $id_agent, + $datelimit, + $date + ); + } } if (is_metaconsole() && $id_server) { @@ -3025,11 +3069,7 @@ function events_get_agent( } else { return events_get_events_no_grouped( $sql_where, - 0, - 1000, (is_metaconsole() && $id_server) ? true : false, - false, - false, $history ); } @@ -3682,6 +3722,38 @@ function events_get_response_target( $event_response = db_get_row('tevent_response', 'id', $response_id); $target = io_safe_output($event_response['target']); + if (strpos($target, '_agent_alias_') !== false) { + if ($meta) { + $agente_table_name = 'tmetaconsole_agent'; + $filter = [ + 'id_tagente' => $event['id_agente'], + 'id_tmetaconsole_setup' => $server_id, + ]; + } else { + $agente_table_name = 'tagente'; + $filter = ['id_agente' => $event['id_agente']]; + } + + $alias = db_get_value_filter('alias', $agente_table_name, $filter); + $target = str_replace('_agent_alias_', io_safe_output($alias), $target); + } + + if (strpos($target, '_agent_name_') !== false) { + if ($meta) { + $agente_table_name = 'tmetaconsole_agent'; + $filter = [ + 'id_tagente' => $event['id_agente'], + 'id_tmetaconsole_setup' => $server_id, + ]; + } else { + $agente_table_name = 'tagente'; + $filter = ['id_agente' => $event['id_agente']]; + } + + $name = db_get_value_filter('nombre', $agente_table_name, $filter); + $target = str_replace('_agent_name_', io_safe_output($name), $target); + } + // Substitute each macro. if (strpos($target, '_agent_address_') !== false) { if ($meta) { @@ -3761,7 +3833,7 @@ function events_get_response_target( if (strpos($target, '_group_name_') !== false) { $target = str_replace( '_group_name_', - groups_get_name($event['id_grupo'], true), + io_safe_output(groups_get_name($event['id_grupo'], true)), $target ); } @@ -3777,7 +3849,7 @@ function events_get_response_target( if (strpos($target, '_event_date_') !== false) { $target = str_replace( '_event_date_', - date($config['date_format'], $event['utimestamp']), + io_safe_output(date($config['date_format'], $event['utimestamp'])), $target ); } @@ -3801,7 +3873,7 @@ function events_get_response_target( if (strpos($target, '_alert_id_') !== false) { $target = str_replace( '_alert_id_', - empty($event['is_alert_am']) ? __('N/A') : $event['is_alert_am'], + empty($event['id_alert_am']) ? __('N/A') : $event['id_alert_am'], $target ); } @@ -3883,6 +3955,15 @@ function events_get_response_target( $target = str_replace('_current_user_', $config['id_user'], $target); } + // This will replace the macro with the command timeout value. + if (strpos($target, '_command_timeout_') !== false) { + $target = str_replace( + '_command_timeout_', + $event_response['command_timeout'], + $target + ); + } + return $target; } @@ -6963,7 +7044,7 @@ function events_get_field_value_by_event_id( if (strpos($value, '_group_name_') !== false) { $value = str_replace( '_group_name_', - groups_get_name($event['id_grupo'], true), + io_safe_output(groups_get_name($event['id_grupo'], true)), $value ); } @@ -6979,7 +7060,9 @@ function events_get_field_value_by_event_id( if (strpos($value, '_event_date_') !== false) { $value = str_replace( '_event_date_', - date($config['date_format'], $event['utimestamp']), + io_safe_output( + date($config['date_format'], $event['utimestamp']) + ), $value ); } diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php index 4fd1439f8f..f40b75e3b2 100644 --- a/pandora_console/include/functions_graph.php +++ b/pandora_console/include/functions_graph.php @@ -2541,13 +2541,9 @@ function graphic_agentaccess( } else { $options['generals']['pdf']['width'] = 350; $options['generals']['pdf']['height'] = 125; - if (!empty($data_array)) { - $imgbase64 = '
;
- $imgbase64 .= ')
';
- } else {
- $imgbase64 .= vbar_graph($data_array, $options, 2);
- }
+ $imgbase64 = ';
+ $imgbase64 .= ')
';
return $imgbase64;
}
diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index 539bc46dc6..479adc67c8 100755
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -2957,7 +2957,7 @@ function reporting_group_report($report, $content)
if (empty($id_group)) {
$events = [];
} else {
- $sql_where = sprintf(' AND id_grupo IN (%s) AND estado<>1 ', implode(',', $id_group));
+ $sql_where = sprintf(' WHERE id_grupo IN (%s) AND estado<>1 ', implode(',', $id_group));
$events = events_get_events_grouped(
$sql_where,
0,
diff --git a/pandora_console/include/functions_treeview.php b/pandora_console/include/functions_treeview.php
index 25e0f67020..67bed22be3 100755
--- a/pandora_console/include/functions_treeview.php
+++ b/pandora_console/include/functions_treeview.php
@@ -802,7 +802,7 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false)
$events_graph = '';
$events_graph .= graph_graphic_agentevents(
$id_agente,
- '385px;',
+ '340px;margin:0',
45,
SECONDS_1DAY,
'',
diff --git a/pandora_console/include/graphs/flot/jquery.flot.exportdata.pandora.js b/pandora_console/include/graphs/flot/jquery.flot.exportdata.pandora.js
index 6466a72835..47b8879ace 100644
--- a/pandora_console/include/graphs/flot/jquery.flot.exportdata.pandora.js
+++ b/pandora_console/include/graphs/flot/jquery.flot.exportdata.pandora.js
@@ -1,425 +1,424 @@
-(function ($) {
- var options = {
- export: {
- export_data: false, // or true
- labels_long: null,
- homeurl: "",
- },
- };
+(function($) {
+ var options = {
+ export: {
+ export_data: false, // or true
+ labels_long: null,
+ homeurl: ""
+ }
+ };
- function init(plot) {
- plot.exportDataCSV = function (args) {
- //amount = plot.getOptions().export.type,
- //options = options || {};
+ function init(plot) {
+ plot.exportDataCSV = function(args) {
+ //amount = plot.getOptions().export.type,
+ //options = options || {};
- // Options
- var type = "csv";
- type = type.toLowerCase().trim();
+ // Options
+ var type = "csv";
+ type = type.toLowerCase().trim();
- var graphData,
- dataObject,
- dataObjects = plot.getData(),
- result = [];
+ var graphData,
+ dataObject,
+ dataObjects = plot.getData(),
+ result = [];
- // Throw errors
- var retrieveDataOject = function (dataObjects) {
- var result;
+ // Throw errors
+ var retrieveDataOject = function(dataObjects) {
+ var result;
- if (typeof dataObjects === "undefined")
- throw new Error("Empty parameter");
+ if (typeof dataObjects === "undefined")
+ throw new Error("Empty parameter");
- // Try to retrieve the avg set (not 100% reliable, I know)
- if (dataObjects.length == 1) {
- result = dataObjects.shift();
- }
- if (dataObjects.length > 1) {
- dataObjects.forEach(function (element) {
- if (/^Avg.:/i.test(element.label)) result = element;
- });
+ // Try to retrieve the avg set (not 100% reliable, I know)
+ if (dataObjects.length == 1) {
+ result = dataObjects.shift();
+ }
+ if (dataObjects.length > 1) {
+ dataObjects.forEach(function(element) {
+ if (/^Avg.:/i.test(element.label)) result = element;
+ });
- // If the avg set is missing, retrieve the first set
- if (typeof result === "undefined") result = dataObjects.shift();
- }
+ // If the avg set is missing, retrieve the first set
+ if (typeof result === "undefined") result = dataObjects.shift();
+ }
- if (typeof result === "undefined") throw new Error("Empty result");
+ if (typeof result === "undefined") throw new Error("Empty result");
- return result;
- };
+ return result;
+ };
- // Throw errors
- var processDataObject = function (dataObject) {
- var result;
+ // Throw errors
+ var processDataObject = function(dataObject) {
+ var result;
- if (typeof dataObject === "undefined")
- throw new Error("Empty parameter");
+ if (typeof dataObject === "undefined")
+ throw new Error("Empty parameter");
- if (
- typeof dataObject.data === "undefined" ||
- !(dataObject.data instanceof Array)
- )
- throw new Error("Object malformed");
+ if (
+ typeof dataObject.data === "undefined" ||
+ !(dataObject.data instanceof Array)
+ )
+ throw new Error("Object malformed");
- /* {
- * head: [,,...,],
- * data: [
- * [,,...,],
- * [,,...,],
- * ...,
- * [,,...,],
- * ]
- * }
- */
- if (type === "csv") {
- result = {
- head: ["timestap", "date", "value", "label"],
- data: [],
- };
+ /* {
+ * head: [,,...,],
+ * data: [
+ * [,,...,],
+ * [,,...,],
+ * ...,
+ * [,,...,],
+ * ]
+ * }
+ */
+ if (type === "csv") {
+ result = {
+ head: ["timestamp", "date", "value", "label"],
+ data: []
+ };
- dataObject.data.forEach(function (item, index) {
- var timestap = item[0];
+ dataObject.data.forEach(function(item, index) {
+ var timestamp = item[0];
- var d = new Date(item[0]);
- var monthNames = [
- "Jan",
- "Feb",
- "Mar",
- "Apr",
- "May",
- "Jun",
- "Jul",
- "Aug",
- "Sep",
- "Oct",
- "Nov",
- "Dec",
- ];
+ var d = new Date(item[0]);
+ var monthNames = [
+ "Jan",
+ "Feb",
+ "Mar",
+ "Apr",
+ "May",
+ "Jun",
+ "Jul",
+ "Aug",
+ "Sep",
+ "Oct",
+ "Nov",
+ "Dec"
+ ];
- date_format =
- (d.getDate() < 10 ? "0" : "") +
- d.getDate() +
- " " +
- monthNames[d.getMonth()] +
- " " +
- d.getFullYear() +
- " " +
- (d.getHours() < 10 ? "0" : "") +
- d.getHours() +
- ":" +
- (d.getMinutes() < 10 ? "0" : "") +
- d.getMinutes() +
- ":" +
- (d.getSeconds() < 10 ? "0" : "") +
- d.getSeconds();
+ date_format =
+ (d.getDate() < 10 ? "0" : "") +
+ d.getDate() +
+ " " +
+ monthNames[d.getMonth()] +
+ " " +
+ d.getFullYear() +
+ " " +
+ (d.getHours() < 10 ? "0" : "") +
+ d.getHours() +
+ ":" +
+ (d.getMinutes() < 10 ? "0" : "") +
+ d.getMinutes() +
+ ":" +
+ (d.getSeconds() < 10 ? "0" : "") +
+ d.getSeconds();
- var date = date_format;
+ var date = date_format;
- var value = item[1];
+ var value = item[1];
- var clean_label = plot.getOptions().export.labels_long[
- dataObject.label
- ];
- clean_label = clean_label.replace(new RegExp(" ", "g"), " ");
- result.data.push([timestap, date, value, clean_label]);
- });
- } else if (type === "json") {
- /* [
- * {
- * 'date': ,
- * 'value':
- * }
- * ],
- * [
- * {
- * 'date': ,
- * 'value':
- * }
- * ],
- * ...,
- * [
- * {
- * 'date': ,
- * 'value':
- * }
- * ]
- */
- result = [];
+ var clean_label = plot.getOptions().export.labels_long[
+ dataObject.label
+ ];
+ clean_label = clean_label.replace(new RegExp(" ", "g"), " ");
+ result.data.push([timestamp, date, value, clean_label]);
+ });
+ } else if (type === "json") {
+ /* [
+ * {
+ * 'date': ,
+ * 'value':
+ * }
+ * ],
+ * [
+ * {
+ * 'date': ,
+ * 'value':
+ * }
+ * ],
+ * ...,
+ * [
+ * {
+ * 'date': ,
+ * 'value':
+ * }
+ * ]
+ */
+ result = [];
- dataObject.data.forEach(function (item, index) {
- var date = "",
- value = item[1];
+ dataObject.data.forEach(function(item, index) {
+ var date = "",
+ value = item[1];
- // Long labels are preferred
- if (typeof labels_long[index] !== "undefined")
- date = labels_long[index];
- else if (typeof labels[index] !== "undefined") date = labels[index];
+ // Long labels are preferred
+ if (typeof labels_long[index] !== "undefined")
+ date = labels_long[index];
+ else if (typeof labels[index] !== "undefined") date = labels[index];
- result.push({
- date: date,
- value: value,
- label: dataObject.label,
- });
- });
- }
+ result.push({
+ date: date,
+ value: value,
+ label: dataObject.label
+ });
+ });
+ }
- if (typeof result === "undefined") throw new Error("Empty result");
+ if (typeof result === "undefined") throw new Error("Empty result");
- return result;
- };
+ return result;
+ };
- try {
- var elements = [];
- dataObject = retrieveDataOject(dataObjects);
- if (dataObject) {
- elements.push(processDataObject(dataObject));
- }
- dataObjects.forEach(function (element) {
- elements.push(processDataObject(element));
- });
- graphData = elements;
+ try {
+ var elements = [];
+ dataObject = retrieveDataOject(dataObjects);
+ if (dataObject) {
+ elements.push(processDataObject(dataObject));
+ }
+ dataObjects.forEach(function(element) {
+ elements.push(processDataObject(element));
+ });
+ graphData = elements;
+ // Transform the object data into a string
+ // cause PHP has limitations in the number
+ // of POST params received.
+ var graphDataStr = JSON.stringify(graphData);
- // Transform the object data into a string
- // cause PHP has limitations in the number
- // of POST params received.
- var graphDataStr = JSON.stringify(graphData);
+ // Build form
+ var $form = $(""),
+ $dataInput = $(""),
+ $typeInput = $(""),
+ $separatorInput = $(""),
+ $excelInput = $("");
- // Build form
- var $form = $(""),
- $dataInput = $(""),
- $typeInput = $(""),
- $separatorInput = $(""),
- $excelInput = $("");
+ $dataInput
+ .prop("name", "data")
+ .prop("type", "text")
+ .prop("value", graphDataStr);
- $dataInput
- .prop("name", "data")
- .prop("type", "text")
- .prop("value", graphDataStr);
+ $typeInput
+ .prop("name", "type")
+ .prop("type", "text")
+ .prop("value", type);
- $typeInput
- .prop("name", "type")
- .prop("type", "text")
- .prop("value", type);
+ $separatorInput
+ .prop("name", "separator")
+ .prop("type", "text")
+ .prop("value", ";");
- $separatorInput
- .prop("name", "separator")
- .prop("type", "text")
- .prop("value", ";");
+ $excelInput
+ .prop("name", "excel_encoding")
+ .prop("type", "text")
+ .prop("value", 0);
- $excelInput
- .prop("name", "excel_encoding")
- .prop("type", "text")
- .prop("value", 0);
+ $form
+ .prop("method", "POST")
+ .prop(
+ "action",
+ plot.getOptions().export.homeurl + "include/graphs/export_data.php"
+ )
+ .append($dataInput, $typeInput, $separatorInput, $excelInput)
+ .hide()
+ // Firefox made me write into the DOM for this :(
+ .appendTo("body")
+ .submit();
+ } catch (e) {
+ alert("There was an error exporting the data");
+ }
+ };
- $form
- .prop("method", "POST")
- .prop(
- "action",
- plot.getOptions().export.homeurl + "include/graphs/export_data.php"
- )
- .append($dataInput, $typeInput, $separatorInput, $excelInput)
- .hide()
- // Firefox made me write into the DOM for this :(
- .appendTo("body")
- .submit();
- } catch (e) {
- alert("There was an error exporting the data");
- }
- };
+ plot.exportDataJSON = function(args) {
+ //amount = plot.getOptions().export.type,
+ //options = options || {};
- plot.exportDataJSON = function (args) {
- //amount = plot.getOptions().export.type,
- //options = options || {};
+ // Options
+ var type = "json";
+ type = type.toLowerCase().trim();
- // Options
- var type = "json";
- type = type.toLowerCase().trim();
+ var graphData,
+ dataObject,
+ dataObjects = plot.getData(),
+ result = [];
- var graphData,
- dataObject,
- dataObjects = plot.getData(),
- result = [];
+ // Throw errors
+ var retrieveDataOject = function(dataObjects) {
+ var result;
- // Throw errors
- var retrieveDataOject = function (dataObjects) {
- var result;
+ if (typeof dataObjects === "undefined")
+ throw new Error("Empty parameter");
- if (typeof dataObjects === "undefined")
- throw new Error("Empty parameter");
+ // Try to retrieve the avg set (not 100% reliable, I know)
+ if (dataObjects.length == 1) {
+ result = dataObjects.shift();
+ }
+ if (dataObjects.length > 1) {
+ dataObjects.forEach(function(element) {
+ if (/^Avg.:/i.test(element.label)) result = element;
+ });
- // Try to retrieve the avg set (not 100% reliable, I know)
- if (dataObjects.length == 1) {
- result = dataObjects.shift();
- }
- if (dataObjects.length > 1) {
- dataObjects.forEach(function (element) {
- if (/^Avg.:/i.test(element.label)) result = element;
- });
+ // If the avg set is missing, retrieve the first set
+ if (typeof result === "undefined") result = dataObjects.shift();
+ }
- // If the avg set is missing, retrieve the first set
- if (typeof result === "undefined") result = dataObjects.shift();
- }
+ if (typeof result === "undefined") throw new Error("Empty result");
- if (typeof result === "undefined") throw new Error("Empty result");
+ return result;
+ };
- return result;
- };
+ // Throw errors
+ var processDataObject = function(dataObject) {
+ var result;
- // Throw errors
- var processDataObject = function (dataObject) {
- var result;
+ if (typeof dataObject === "undefined")
+ throw new Error("Empty parameter");
- if (typeof dataObject === "undefined")
- throw new Error("Empty parameter");
+ if (
+ typeof dataObject.data === "undefined" ||
+ !(dataObject.data instanceof Array)
+ )
+ throw new Error("Object malformed");
- if (
- typeof dataObject.data === "undefined" ||
- !(dataObject.data instanceof Array)
- )
- throw new Error("Object malformed");
+ /* {
+ * head: [,,...,],
+ * data: [
+ * [,,...,],
+ * [,,...,],
+ * ...,
+ * [,,...,],
+ * ]
+ * }
+ */
+ if (type === "csv") {
+ result = {
+ head: ["date", "value", "label"],
+ data: []
+ };
- /* {
- * head: [,,...,],
- * data: [
- * [,,...,],
- * [,,...,],
- * ...,
- * [,,...,],
- * ]
- * }
- */
- if (type === "csv") {
- result = {
- head: ["date", "value", "label"],
- data: [],
- };
+ dataObject.data.forEach(function(item, index) {
+ var date = "",
+ value = item[1];
- dataObject.data.forEach(function (item, index) {
- var date = "",
- value = item[1];
+ // Long labels are preferred
+ if (
+ typeof plot.getOptions().export.labels_long[index] !== "undefined"
+ )
+ date = plot.getOptions().export.labels_long[index];
+ else if (typeof labels[index] !== "undefined") date = labels[index];
- // Long labels are preferred
- if (
- typeof plot.getOptions().export.labels_long[index] !== "undefined"
- )
- date = plot.getOptions().export.labels_long[index];
- else if (typeof labels[index] !== "undefined") date = labels[index];
+ result.data.push([date, value, dataObject.label]);
+ });
+ } else if (type === "json") {
+ /* [
+ * {
+ * 'date': ,
+ * 'value':
+ * }
+ * ],
+ * [
+ * {
+ * 'date': ,
+ * 'value':
+ * }
+ * ],
+ * ...,
+ * [
+ * {
+ * 'date': ,
+ * 'value':
+ * }
+ * ]
+ */
+ result = [];
- result.data.push([date, value, dataObject.label]);
- });
- } else if (type === "json") {
- /* [
- * {
- * 'date': ,
- * 'value':
- * }
- * ],
- * [
- * {
- * 'date': ,
- * 'value':
- * }
- * ],
- * ...,
- * [
- * {
- * 'date': ,
- * 'value':
- * }
- * ]
- */
- result = [];
+ dataObject.data.forEach(function(item, index) {
+ var date = "",
+ value = item[1];
- dataObject.data.forEach(function (item, index) {
- var date = "",
- value = item[1];
+ // Long labels are preferred
+ if (typeof labels_long[index] !== "undefined")
+ date = labels_long[index];
+ else if (typeof labels[index] !== "undefined") date = labels[index];
- // Long labels are preferred
- if (typeof labels_long[index] !== "undefined")
- date = labels_long[index];
- else if (typeof labels[index] !== "undefined") date = labels[index];
+ result.push({
+ date: date,
+ value: value,
+ label: dataObject.label
+ });
+ });
+ }
- result.push({
- date: date,
- value: value,
- label: dataObject.label,
- });
- });
- }
+ if (typeof result === "undefined") throw new Error("Empty result");
- if (typeof result === "undefined") throw new Error("Empty result");
+ return result;
+ };
- return result;
- };
+ try {
+ var elements = [];
+ var custom_graph = $("input:hidden[name=custom_graph]").value;
- try {
- var elements = [];
- var custom_graph = $("input:hidden[name=custom_graph]").value;
+ if (custom_graph) {
+ dataObject = retrieveDataOject(dataObjects);
+ dataObjects.forEach(function(element) {
+ elements.push(processDataObject(element));
+ });
+ graphData = elements;
+ } else {
+ dataObject = retrieveDataOject(dataObjects);
+ elements.push(processDataObject(dataObject));
+ graphData = elements;
+ }
- if (custom_graph) {
- dataObject = retrieveDataOject(dataObjects);
- dataObjects.forEach(function (element) {
- elements.push(processDataObject(element));
- });
- graphData = elements;
- } else {
- dataObject = retrieveDataOject(dataObjects);
- elements.push(processDataObject(dataObject));
- graphData = elements;
- }
+ // Transform the object data into a string
+ // cause PHP has limitations in the number
+ // of POST params received.
+ var graphDataStr = JSON.stringify(graphData);
- // Transform the object data into a string
- // cause PHP has limitations in the number
- // of POST params received.
- var graphDataStr = JSON.stringify(graphData);
+ // Build form
+ var $form = $(""),
+ $dataInput = $(""),
+ $typeInput = $(""),
+ $separatorInput = $(""),
+ $excelInput = $("");
- // Build form
- var $form = $(""),
- $dataInput = $(""),
- $typeInput = $(""),
- $separatorInput = $(""),
- $excelInput = $("");
+ $dataInput
+ .prop("name", "data")
+ .prop("type", "text")
+ .prop("value", graphDataStr);
- $dataInput
- .prop("name", "data")
- .prop("type", "text")
- .prop("value", graphDataStr);
+ $typeInput
+ .prop("name", "type")
+ .prop("type", "text")
+ .prop("value", type);
- $typeInput
- .prop("name", "type")
- .prop("type", "text")
- .prop("value", type);
+ $separatorInput
+ .prop("name", "separator")
+ .prop("type", "text")
+ .prop("value", ";");
- $separatorInput
- .prop("name", "separator")
- .prop("type", "text")
- .prop("value", ";");
+ $excelInput
+ .prop("name", "excel_encoding")
+ .prop("type", "text")
+ .prop("value", 0);
- $excelInput
- .prop("name", "excel_encoding")
- .prop("type", "text")
- .prop("value", 0);
+ $form
+ .prop("method", "POST")
+ .prop(
+ "action",
+ plot.getOptions().export.homeurl + "include/graphs/export_data.php"
+ )
+ .append($dataInput, $typeInput, $separatorInput, $excelInput)
+ .hide()
+ // Firefox made me write into the DOM for this :(
+ .appendTo("body")
+ .submit();
+ } catch (e) {
+ alert("There was an error exporting the data");
+ }
+ };
+ }
- $form
- .prop("method", "POST")
- .prop(
- "action",
- plot.getOptions().export.homeurl + "include/graphs/export_data.php"
- )
- .append($dataInput, $typeInput, $separatorInput, $excelInput)
- .hide()
- // Firefox made me write into the DOM for this :(
- .appendTo("body")
- .submit();
- } catch (e) {
- alert("There was an error exporting the data");
- }
- };
- }
-
- $.plot.plugins.push({
- init: init,
- options: options,
- name: "exportdata",
- version: "0.1",
- });
+ $.plot.plugins.push({
+ init: init,
+ options: options,
+ name: "exportdata",
+ version: "0.1"
+ });
})(jQuery);
diff --git a/pandora_console/include/graphs/functions_flot.php b/pandora_console/include/graphs/functions_flot.php
index dc4e556292..81c9cc79cf 100644
--- a/pandora_console/include/graphs/functions_flot.php
+++ b/pandora_console/include/graphs/functions_flot.php
@@ -346,13 +346,7 @@ function menu_graph(
$threshold = true;
}
- $return .= "
";
+ $return .= "
";
$return .= "
![".__(](".$params[ "\".__(")
";
if ($threshold) {
@@ -745,13 +739,12 @@ function flot_slicesbar_graph(
// Set some containers to legend, graph, timestamp tooltip, etc.
$height = ((int) $height + 15);
- if ($stat_win) {
- $return = "";
- } else {
- $return = "";
- }
- $return .= "";
+ $style = 'width:'.$width.'%;';
+ $style .= 'height:'.$height.'px;';
+ $return = "";
+
+ $return .= "";
// Set a weird separator to serialize and unserialize
// passing data from php to javascript.
diff --git a/pandora_console/include/javascript/pandora.js b/pandora_console/include/javascript/pandora.js
index f99ae01c79..e7f007a425 100644
--- a/pandora_console/include/javascript/pandora.js
+++ b/pandora_console/include/javascript/pandora.js
@@ -786,13 +786,12 @@ function post_process_select_events_unit(name, selected) {
function post_process_select_events(name) {
$("." + name + "_toggler").click(function() {
var value = $("#text-" + name + "_text").val();
-
var count = $("#" + name + "_select option").filter(function(i, item) {
if (Number($(item).val()) == Number(value)) return true;
else return false;
}).length;
- if (count != 1) {
+ if (count < 1) {
$("#" + name + "_select").append(
$(""
);
- }
- // Normal group
- else {
+ } else {
+ // Normal group.
$group.addClass("tree-group").hide();
}
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 5f0f9024c7..922ed8c79a 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -462,6 +462,10 @@ select:-internal-list-box {
width: 120px;
max-width: 120px;
}
+.w200px {
+ width: 200px;
+ max-width: 200px;
+}
.w240px {
width: 240px;
max-width: 240px;
@@ -3074,6 +3078,12 @@ div#stat-win-module-graph div.nodata_container {
}
.menu_graph {
+ width: 30px;
+ height: 150px;
+ left: 100%;
+ position: absolute;
+ top: 0px;
+ background-color: transparent;
-moz-border-top-right-radius: 6px;
-webkit-border-top-right-radius: 6px;
border-top-right-radius: 6px;
@@ -5866,7 +5876,7 @@ table.table_modal_alternate tr td:first-child {
}
.flot-text {
- width: 101%;
+ width: 100%;
}
/*Font header feedback*/
diff --git a/pandora_console/install.php b/pandora_console/install.php
index f706f1dff4..7bf0897508 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
status) {
case 0:
diff --git a/pandora_console/operation/agentes/stat_win.php b/pandora_console/operation/agentes/stat_win.php
index 1d26666b57..d5e22eb06b 100644
--- a/pandora_console/operation/agentes/stat_win.php
+++ b/pandora_console/operation/agentes/stat_win.php
@@ -35,6 +35,7 @@ require_once $config['homedir'].'/include/functions_graph.php';
require_once $config['homedir'].'/include/functions_modules.php';
require_once $config['homedir'].'/include/functions_agents.php';
require_once $config['homedir'].'/include/functions_tags.php';
+require_once $config['homedir'].'/include/php_to_js_values.php';
enterprise_include_once('include/functions_agents.php');
check_login();
diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php
index a49db7b7f4..db1e052ab9 100644
--- a/pandora_console/operation/agentes/status_monitor.php
+++ b/pandora_console/operation/agentes/status_monitor.php
@@ -1,6 +1,5 @@
false,
- 'text' => ''.html_print_image('images/custom_columns.png', true, ['title' => __('Custom fields')]).'',
+ 'text' => ''.html_print_image('images/custom_columns.png', true, ['title' => __('Custom fields')]).'',
'operation' => true,
];
@@ -79,22 +78,27 @@ if (! defined('METACONSOLE')) {
ui_meta_print_header(__('Monitor view'));
}
-$ag_freestring = (string) get_parameter('ag_freestring');
-$moduletype = (string) get_parameter('moduletype');
-$datatype = (string) get_parameter('datatype');
-$ag_modulename = (string) get_parameter('ag_modulename');
-$refr = (int) get_parameter('refr', 0);
-$offset = (int) get_parameter('offset', 0);
-$status = (int) get_parameter('status', 4);
-$modulegroup = (int) get_parameter('modulegroup', -1);
-$tag_filter = (int) get_parameter('tag_filter', 0);
-$min_hours_status = (string) get_parameter('min_hours_status', '');
-// Sort functionality
-$sortField = get_parameter('sort_field');
-$sort = get_parameter('sort', 'none');
-// When the previous page was a visualmap and show only one module
-$id_module = (int) get_parameter('id_module', 0);
-$ag_custom_fields = (array) get_parameter('ag_custom_fields', []);
+$recursion = get_parameter_switch('recursion', false);
+if ($recursion === false) {
+ $recursion = get_parameter('recursion', false);
+}
+
+$ag_freestring = (string) get_parameter('ag_freestring');
+$moduletype = (string) get_parameter('moduletype');
+$datatype = (string) get_parameter('datatype');
+$ag_modulename = (string) get_parameter('ag_modulename');
+$refr = (int) get_parameter('refr', 0);
+$offset = (int) get_parameter('offset', 0);
+$status = (int) get_parameter('status', 4);
+$modulegroup = (int) get_parameter('modulegroup', -1);
+$tag_filter = (int) get_parameter('tag_filter', 0);
+$min_hours_status = (string) get_parameter('min_hours_status', '');
+// Sort functionality.
+$sortField = get_parameter('sort_field');
+$sort = get_parameter('sort', 'none');
+// When the previous page was a visualmap and show only one module.
+$id_module = (int) get_parameter('id_module', 0);
+$ag_custom_fields = (array) get_parameter('ag_custom_fields', []);
$module_option = (int) get_parameter('module_option', 1);
$autosearch = false;
@@ -161,11 +165,22 @@ if (is_numeric($ag_group)) {
// Agent group selector
if (!is_metaconsole()) {
if ($ag_group > 0 && check_acl($config['id_user'], $ag_group, 'AR')) {
- $sql_conditions_group = sprintf(
- ' AND (tagente.id_grupo = %d OR tasg.id_group = %d)',
- $ag_group,
- $ag_group
- );
+ if ($recursion) {
+ $all_groups = groups_get_children_ids($ag_group, true);
+
+ // User has explicit permission on group 1 ?
+ $sql_conditions_group = sprintf(
+ ' AND (tagente.id_grupo IN (%s) OR tasg.id_group IN (%s)) ',
+ implode(',', $all_groups),
+ implode(',', $all_groups)
+ );
+ } else {
+ $sql_conditions_group = sprintf(
+ ' AND (tagente.id_grupo = %d OR tasg.id_group = %d)',
+ $ag_group,
+ $ag_group
+ );
+ }
} else if ($user_groups != '') {
// User has explicit permission on group 1 ?
$sql_conditions_group = ' AND (
@@ -175,11 +190,22 @@ if (!is_metaconsole()) {
}
} else {
if (((int) $ag_group !== 0) && (check_acl($config['id_user'], $id_ag_group, 'AR'))) {
- $sql_conditions_group = sprintf(
- ' AND (tagente.id_grupo IN (%s) OR tasg.id_group IN (%s))',
- $ag_group,
- $ag_group
- );
+ if ($recursion) {
+ $all_groups = groups_get_children_ids($ag_group, true);
+
+ // User has explicit permission on group 1 ?
+ $sql_conditions_group = sprintf(
+ ' AND (tagente.id_grupo IN (%s) OR tasg.id_group IN (%s)) ',
+ implode(',', $all_groups),
+ implode(',', $all_groups)
+ );
+ } else {
+ $sql_conditions_group = sprintf(
+ ' AND (tagente.id_grupo IN (%s) OR tasg.id_group IN (%s))',
+ $ag_group,
+ $ag_group
+ );
+ }
} else if ($user_groups != '') {
// User has explicit permission on group 1 ?
$sql_conditions_group = ' AND (
@@ -355,7 +381,8 @@ $table->style[3] = 'font-weight: bold;';
$table->style[4] = 'font-weight: bold;';
$table->data[0][0] = __('Group');
-$table->data[0][1] = html_print_select_groups(
+$table->data[0][1] = '';
$fields = [];
$fields[AGENT_MODULE_STATUS_NORMAL] = __('Normal');
@@ -701,8 +740,7 @@ foreach ($custom_fields as $custom_field) {
$table_custom_fields->data[] = $row;
}
-
-$filters = '
';
+$table->data[0][1] .= html_print_select_groups(
$config['id_user'],
'AR',
true,
@@ -375,6 +402,18 @@ $table->data[0][1] = html_print_select_groups(
'id_grupo',
false
);
+$table->data[0][1] .= '
';
+$table->data[0][1] .= html_print_input(
+ [
+ 'type' => 'checkbox',
+ 'name' => 'recursion',
+ 'return' => true,
+ 'checked' => $recursion,
+ 'value' => 1,
+ ]
+);
+$table->data[0][1] .= __('Recursion');
+$table->data[0][1] .= '