';
+ echo $out;
return;
}
@@ -2041,8 +2043,10 @@ if ($graphic_event_group) {
include_once $config['homedir'].'/include/functions_graph.php';
- $prueba = grafico_eventos_grupo(280, 150, '', false, true);
- echo $prueba;
+ $out = '
';
+ $out .= grafico_eventos_grupo(0, 0, '', false, true);
+ $out .= '
';
+ echo $out;
return;
}
diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php
index 8efb03df12..61720a99a4 100755
--- a/pandora_console/include/ajax/module.php
+++ b/pandora_console/include/ajax/module.php
@@ -26,6 +26,8 @@
* ============================================================================
*/
+use PandoraFMS\Enterprise\Metaconsole\Node;
+
// Begin.
if (check_login()) {
global $config;
@@ -59,6 +61,11 @@ if (check_login()) {
0
);
+ $get_data_dataMatrix = (bool) get_parameter(
+ 'get_data_dataMatrix',
+ 0
+ );
+
if ($get_agent_modules_json_by_name === true) {
$agent_name = get_parameter('agent_name');
@@ -1436,4 +1443,190 @@ if (check_login()) {
return;
}
+
+ if ($get_data_dataMatrix === true) {
+ global $config;
+
+ $table_id = get_parameter('table_id', '');
+ $modules = json_decode(
+ io_safe_output(
+ get_parameter('modules', '')
+ ),
+ true
+ );
+ $period = get_parameter('period', 0);
+ $slice = get_parameter('slice', 0);
+
+ // Datatables offset, limit.
+ $start = get_parameter('start', 0);
+ $formatData = (bool) get_parameter('formatData', 0);
+ $length = get_parameter(
+ 'length',
+ $config['block_size']
+ );
+
+ $order = get_datatable_order(true);
+
+ // Total time per page.
+ $time_all_box = ($length * $slice);
+
+ // Total number of boxes.
+ $total_box = ceil($period / $slice);
+
+ if ($start > 0) {
+ $start = ($start / $length);
+ }
+
+ // Uncompress.
+ try {
+ ob_start();
+ $dateNow = get_system_time();
+ $final = ($dateNow - $period);
+ $date = ($dateNow - ($time_all_box * $start));
+
+ if (($date - $time_all_box) > $final) {
+ $datelimit = ($date - $time_all_box);
+ } else {
+ $datelimit = $final;
+ }
+
+ foreach ($modules as $key => $value) {
+ if (is_metaconsole() === true) {
+ try {
+ $node = new Node((int) $value['id_node']);
+ $node->connect();
+ } catch (\Exception $e) {
+ // Unexistent agent.
+ $node->disconnect();
+ }
+ }
+
+ $value['thresholds'] = [
+ 'min_critical' => (empty($value['c_min']) === true) ? null : $value['c_min'],
+ 'max_critical' => (empty($value['c_max']) === true) ? null : $value['c_max'],
+ 'min_warning' => (empty($value['w_min']) === true) ? null : $value['w_min'],
+ 'max_warning' => (empty($value['w_max']) === true) ? null : $value['w_max'],
+ ];
+
+ $module_data = db_uncompress_module_data(
+ $value['id'],
+ $datelimit,
+ $date,
+ $slice,
+ true
+ );
+
+ $uncompressData[] = array_reduce(
+ $module_data,
+ function ($carry, $item) use ($value, $config, $formatData) {
+ // Last value.
+ $vdata = null;
+ if (is_array($item['data']) === true) {
+ foreach ($item['data'] as $v) {
+ $vdata = $v['datos'];
+ }
+ }
+
+ $status = get_status_data_modules(
+ $value['id'],
+ $vdata,
+ $value['thresholds']
+ );
+
+ $resultData = '';
+ if ($vdata !== null && $vdata !== '' && $vdata !== false) {
+ if (isset($formatData) === true
+ && (bool) $formatData === true
+ ) {
+ $resultData .= format_for_graph(
+ $vdata,
+ $config['graph_precision']
+ );
+ } else {
+ $resultData .= sla_truncate(
+ $vdata,
+ $config['graph_precision']
+ );
+ }
+
+ $resultData .= ' '.$value['unit'];
+ } else {
+ $resultData .= '--';
+ }
+
+ $resultData .= '';
+ $carry[] = [
+ 'utimestamp' => $item['utimestamp'],
+ 'Column-'.$value['id'] => $resultData,
+ ];
+
+ return $carry;
+ },
+ []
+ );
+
+ if (is_metaconsole() === true) {
+ $node->disconnect();
+ }
+ }
+
+ if (empty($uncompressData) === false) {
+ $data = array_reduce(
+ $uncompressData,
+ function ($carry, $item) {
+ foreach ($item as $data_module) {
+ foreach ($data_module as $key => $value) {
+ if ($key === 'utimestamp') {
+ $carry[$data_module['utimestamp']]['date'] = date('Y-m-d H:i', (int) $value);
+ } else {
+ $carry[$data_module['utimestamp']][$key] = $value;
+ }
+ }
+ }
+
+ return $carry;
+ }
+ );
+ }
+
+ if (empty($data) === false) {
+ $data = array_reverse(array_values($data));
+ } else {
+ $data = [];
+ }
+
+ // RecordsTotal && recordsfiltered resultados totales.
+ echo json_encode(
+ [
+ 'data' => $data,
+ 'recordsTotal' => $total_box,
+ 'recordsFiltered' => $total_box,
+ ]
+ );
+
+ $response = ob_get_clean();
+
+ // Clean output buffer.
+ while (ob_get_level() !== 0) {
+ ob_end_clean();
+ }
+ } catch (Exception $e) {
+ echo json_encode(
+ ['error' => $e->getMessage()]
+ );
+ }
+
+ // If not valid it will throw an exception.
+ json_decode($response);
+ if (json_last_error() == JSON_ERROR_NONE) {
+ // If valid dump.
+ echo $response;
+ } else {
+ echo json_encode(
+ ['error' => $response]
+ );
+ }
+
+ return;
+ }
}
diff --git a/pandora_console/include/ajax/profile.php b/pandora_console/include/ajax/profile.php
new file mode 100644
index 0000000000..56a29fd31d
--- /dev/null
+++ b/pandora_console/include/ajax/profile.php
@@ -0,0 +1,29 @@
+ md5($password_new),
+ 'password' => password_hash($password_new, PASSWORD_BCRYPT),
'last_pass_change' => date('Y/m/d H:i:s', get_system_time()),
],
['id_user' => $user]
@@ -1050,7 +1061,7 @@ function create_user_and_permisions_ldap(
$values['id_user'] = $id_user;
if ($config['ldap_save_password'] || $config['ad_save_password']) {
- $values['password'] = md5($password);
+ $values['password'] = password_hash($password, PASSWORD_BCRYPT);
}
$values['last_connect'] = 0;
@@ -1482,9 +1493,9 @@ function change_local_user_pass_ldap($id_user, $password)
$local_user_pass = db_get_value_filter('password', 'tusuario', ['id_user' => $id_user]);
$return = false;
- if (md5($password) !== $local_user_pass) {
+ if (password_hash($password, PASSWORD_BCRYPT) !== $local_user_pass) {
$values_update = [];
- $values_update['password'] = md5($password);
+ $values_update['password'] = password_hash($password, PASSWORD_BCRYPT);
$return = db_process_sql_update('tusuario', $values_update, ['id_user' => $id_user]);
}
diff --git a/pandora_console/include/chart_generator.php b/pandora_console/include/chart_generator.php
index 764f8ca3ce..c0ba8eb3ac 100644
--- a/pandora_console/include/chart_generator.php
+++ b/pandora_console/include/chart_generator.php
@@ -42,40 +42,23 @@ require_once $config['homedir'].'/include/functions_agents.php';
require_once $config['homedir'].'/include/functions_tags.php';
$data_raw = get_parameter('data');
-$data_decoded = json_decode(base64_decode($data_raw), true);
+$data_decoded = json_decode(io_safe_output($data_raw), true);
if (json_last_error() === JSON_ERROR_NONE) {
- $data = urldecode($data_decoded['data']);
- $session_id = urldecode($data_decoded['session_id']);
- $data_combined = urldecode($data_decoded['data_combined']);
- $data_module_list = urldecode($data_decoded['data_module_list']);
- $type_graph_pdf = urldecode($data_decoded['type_graph_pdf']);
- $viewport_width = urldecode($data_decoded['viewport_width']);
+ $data = $data_decoded['data'];
+ $session_id = $data_decoded['session_id'];
+ $type_graph_pdf = $data_decoded['type_graph_pdf'];
+
+ $data_combined = [];
+ if (isset($data_decoded['data_combined']) === true) {
+ $data_combined = $data_decoded['data_combined'];
+ }
+
+ $data_module_list = [];
+ if (isset($data_decoded['data_module_list']) === true) {
+ $data_module_list = $data_decoded['data_module_list'];
+ }
}
-
-/**
- * Echo to stdout a PhantomJS callback call.
- *
- * @return void
- */
-function echoPhantomCallback()
-{
- ?>
-
-
Access is not granted
-