tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop

This commit is contained in:
Alejandro Gallardo Escobar 2015-08-05 14:38:46 +02:00
parent cc6d0932a3 4d62e41d24
commit 863537a85c
2 changed files with 72 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
pandora_console/include/functions_modules.php
View File

@ -762,6 +762,56 @@ function modules_get_agentmodule ($id_agentmodule) {
}
}
function modules_get_table_data($id_agent_module) {
$id_type = db_get_value('id_tipo_modulo',
'tagente_modulo', 'id_agente_modulo', $id_agent_module);
$name_type = db_get_value('nombre', 'ttipo_modulo', 'id_tipo', $id_type);
$chunks = explode('_', $name_type);
$subtype = end($chunks);
switch ($subtype) {
case 'data':
case 'proc':
case 'icmp':
case 'tcp':
case 'snmp':
case 'inc':
// Numeric
return "tagente_datos";
break;
case 'log4x':
// Log4x
return "tagente_datos_log4x";
break;
case 'string':
// String
return "tagente_datos_string";
break;
default:
return null;
break;
}
}
function modules_get_raw_data($id_agent_module, $date_init, $date_end) {
$table = modules_get_table_data($id_agent_module);
$datelimit = $date_init - $date_end;
$search_in_history_db = db_search_in_history_db($datelimit);
$data = db_get_all_rows_sql('
SELECT *
FROM ' . $table . '
WHERE id_agente_modulo = ' . $id_agent_module . '
AND utimestamp >= ' . $date_init . '
AND utimestamp <= ' . $date_end, $search_in_history_db);
return $data;
}
function modules_get_agent_group($id_agent_module) {
$return = false;

26
pandora_console/include/styles/pandora.css
View File

@ -454,6 +454,12 @@ div#login_in, #login_f {
.version_login{
transform: rotate(36deg);
/* Old browser support */
-ms-transform: rotate(36deg); /* IE */
-moz-transform: rotate(36deg); /* FF */
-o-transform: rotate(36deg); /* Opera */
-webkit-transform: rotate(36deg); /* Safari and Chrome */
float: right;
margin-top: 18px;
width: 80px;
@ -3056,22 +3062,34 @@ table#policy_modules td * {
@-webkit-keyframes spinner {
0% {
-webkit-transform: rotate(0deg);
-ms-transform: rotate(0deg); /* IE */
-moz-transform: rotate(0deg); /* FF */
-o-transform: rotate(0deg); /* Opera */
-webkit-transform: rotate(0deg); /* Safari and Chrome */
transform: rotate(0deg);
}
100% {
-webkit-transform: rotate(359deg);
-ms-transform: rotate(359deg); /* IE */
-moz-transform: rotate(359deg); /* FF */
-o-transform: rotate(359deg); /* Opera */
-webkit-transform: rotate(359deg); /* Safari and Chrome */
transform: rotate(359deg);
}
}
@keyframes spinner {
0% {
-webkit-transform: rotate(0deg);
-ms-transform: rotate(0deg); /* IE */
-moz-transform: rotate(0deg); /* FF */
-o-transform: rotate(0deg); /* Opera */
-webkit-transform: rotate(0deg); /* Safari and Chrome */
transform: rotate(0deg);
}
100% {
-webkit-transform: rotate(359deg);
-ms-transform: rotate(359deg); /* IE */
-moz-transform: rotate(359deg); /* FF */
-o-transform: rotate(359deg); /* Opera */
-webkit-transform: rotate(359deg); /* Safari and Chrome */
transform: rotate(359deg);
}
}