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

#12509 fixed status agents disabled

This commit is contained in:
Daniel Cebrian 2023-12-13 12:04:00 +01:00
parent 70d8b344b7
commit 6e246d5d29
4 changed files with 124 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pandora_console/include/functions_graph.php
View File

@ -5115,7 +5115,8 @@ function graph_so_by_group($id_group, $width=300, $height=200, $recursive=true,
FROM tagente a FROM tagente a
LEFT JOIN tagent_secondary_group g ON g.id_agent = a.id_agente LEFT JOIN tagent_secondary_group g ON g.id_agent = a.id_agente
LEFT JOIN tconfig_os os ON a.id_os = os.id_os LEFT JOIN tconfig_os os ON a.id_os = os.id_os
WHERE a.id_grupo IN (%s) OR g.id_group IN (%s) WHERE (a.id_grupo IN (%s) OR g.id_group IN (%s))
AND a.disabled = 0
GROUP BY os.id_os', GROUP BY os.id_os',
implode(',', $id_groups), implode(',', $id_groups),
implode(',', $id_groups) implode(',', $id_groups)
@ -5205,13 +5206,14 @@ function graph_events_agent_by_group($id_group, $width=300, $height=200, $noWate
// with it and then the number of times it occured. GROUP BY statement // with it and then the number of times it occured. GROUP BY statement
// is required if both DISTINCT() and COUNT() are in the statement. // is required if both DISTINCT() and COUNT() are in the statement.
$sql = sprintf( $sql = sprintf(
'SELECT DISTINCT(id_agente) AS id_agente, 'SELECT DISTINCT(te.id_agente) AS id_agente,
COUNT(id_agente) AS count COUNT(te.id_agente) AS count
FROM tevento te FROM tevento te
LEFT JOIN tagente a ON a.id_agente = te.id_agente
LEFT JOIN tagent_secondary_group g ON g.id_agent = te.id_agente LEFT JOIN tagent_secondary_group g ON g.id_agent = te.id_agente
WHERE 1=1 AND estado = 0 WHERE 1=1 AND estado = 0
%s %s %s %s AND a.disabled = 0
GROUP BY id_agente GROUP BY te.id_agente
ORDER BY count DESC LIMIT 8', ORDER BY count DESC LIMIT 8',
$tags_condition, $tags_condition,
$filter_groups $filter_groups

3
pandora_console/include/functions_groups.php
View File

@ -2503,7 +2503,8 @@ function groups_get_heat_map_agents(array $id_group, float $width=0, float $heig
$sql = 'SELECT * FROM tagente a $sql = 'SELECT * FROM tagente a
LEFT JOIN tagent_secondary_group g ON g.id_agent = a.id_agente LEFT JOIN tagent_secondary_group g ON g.id_agent = a.id_agente
WHERE a.id_grupo IN ('.implode(',', $id_group).') OR g.id_group IN ('.implode(',', $id_group).')'; WHERE (a.id_grupo IN ('.implode(',', $id_group).') OR g.id_group IN ('.implode(',', $id_group).'))
AND a.disabled = 0';
$all_agents = db_get_all_rows_sql($sql); $all_agents = db_get_all_rows_sql($sql);
if (empty($all_agents)) { if (empty($all_agents)) {

5
pandora_console/include/lib/TacticalView/elements/Agents.php
View File

@ -352,6 +352,7 @@ class Agents extends Element
*/ */
public function getStatusGraph():string public function getStatusGraph():string
{ {
$data = [];
$agents = agents_get_agents( $agents = agents_get_agents(
false, false,
[ [
@ -435,6 +436,7 @@ class Agents extends Element
// To avoid that if a value is too small it is not seen. // To avoid that if a value is too small it is not seen.
$percentages = []; $percentages = [];
$total = array_sum($data); $total = array_sum($data);
if ($total > 0) {
foreach ($data as $key => $value) { foreach ($data as $key => $value) {
$percentage = (($value / $total) * 100); $percentage = (($value / $total) * 100);
if ($percentage < 1 && $percentage > 0) { if ($percentage < 1 && $percentage > 0) {
@ -443,6 +445,9 @@ class Agents extends Element
$percentages[$key] = format_numeric($percentage, 0); $percentages[$key] = format_numeric($percentage, 0);
} }
} else {
$percentages = [];
}
$data = $percentages; $data = $percentages;

8
pandora_console/include/lib/TacticalView/elements/Groups.php
View File

@ -113,6 +113,8 @@ class Groups extends Element
$id_groups = implode(',', $id_groups); $id_groups = implode(',', $id_groups);
$modules = modules_get_modules_in_group($id_groups); $modules = modules_get_modules_in_group($id_groups);
$heatmap = '';
if (is_array($modules) === true) {
$total_groups = count($modules); $total_groups = count($modules);
if ($total_groups === 0) { if ($total_groups === 0) {
return graph_nodata_image(['width' => '400']); return graph_nodata_image(['width' => '400']);
@ -134,7 +136,7 @@ class Groups extends Element
$square_length = min(($width / floor($width / $low)), ($height / floor($height / $low))); $square_length = min(($width / floor($width / $low)), ($height / floor($height / $low)));
// Print starmap. // Print starmap.
$heatmap = sprintf( $heatmap .= sprintf(
'<svg id="svg" style="width: %spx; height: %spx;">', '<svg id="svg" style="width: %spx; height: %spx;">',
$width, $width,
$height $height
@ -224,6 +226,7 @@ class Groups extends Element
$cont++; $cont++;
} }
}
$heatmap .= '<script type="text/javascript"> $heatmap .= '<script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
@ -289,7 +292,8 @@ class Groups extends Element
$sql = 'SELECT * FROM tagente a $sql = 'SELECT * FROM tagente a
LEFT JOIN tagent_secondary_group g ON g.id_agent = a.id_agente LEFT JOIN tagent_secondary_group g ON g.id_agent = a.id_agente
WHERE g.id_group IN ('.$id_groups.') OR a.id_grupo IN ('.$id_groups.')'; WHERE (g.id_group IN ('.$id_groups.') OR a.id_grupo IN ('.$id_groups.'))
AND a.disabled = 0';
$all_agents = db_get_all_rows_sql($sql); $all_agents = db_get_all_rows_sql($sql);
if (empty($all_agents)) { if (empty($all_agents)) {
return null; return null;