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:
m-lopez-f 2015-12-23 16:27:24 +01:00
parent 2ac55ccdb7 d7b8bdc369
commit 3bc021c4d7
31 changed files with 1245 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_agents/unix/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-agent-unix
Version: 6.1dev-151222
Version: 6.1dev-151223
Architecture: all
Priority: optional
Section: admin

2
pandora_agents/unix/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
pandora_version="6.1dev-151222"
pandora_version="6.1dev-151223"
echo "Test if you has the tools for to make the packages."
whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null

2
pandora_agents/unix/pandora_agent
View File

@ -41,7 +41,7 @@ my $Sem = undef;
my $ThreadSem = undef;
use constant AGENT_VERSION => '6.1dev';
use constant AGENT_BUILD => '151222';
use constant AGENT_BUILD => '151223';
# Commands to retrieve total memory information in kB
use constant TOTALMEMORY_CMDS => {

2
pandora_agents/unix/pandora_agent.redhat.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_agent_unix
%define version 6.1dev
%define release 151222
%define release 151223
Summary: Pandora FMS Linux agent, PERL version
Name: %{name}

2
pandora_agents/unix/pandora_agent.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_agent_unix
%define version 6.1dev
%define release 151222
%define release 151223
Summary: Pandora FMS Linux agent, PERL version
Name: %{name}

2
pandora_agents/unix/pandora_agent_installer
View File

@ -10,7 +10,7 @@
# **********************************************************************
PI_VERSION="6.1dev"
PI_BUILD="151222"
PI_BUILD="151223"
OS_NAME=`uname -s`
FORCE=0

107
pandora_agents/win32/bin/pandora_agent.conf
View File

@ -201,72 +201,73 @@ module_end
#module_description Last update for Antivirus Signature file
#module_end
# Windows inventory module (This information will be displayed only in enterprise version)
## Windows inventory module (This information will be displayed only in enterprise version)
## Please check the WMI is healthy before activate this functionality
module_begin
module_plugin cscript.exe //B //t:20 "%PROGRAMFILES%\Pandora_Agent\util\cpuinfo.vbs"
module_crontab * 12-15 * * 1
module_end
# module_begin
# module_plugin cscript.exe //B //t:20 "%PROGRAMFILES%\Pandora_Agent\util\cpuinfo.vbs"
# module_crontab * 12-15 * * 1
# module_end
module_begin
module_plugin cscript.exe //B //t:20 "%PROGRAMFILES%\Pandora_Agent\util\moboinfo.vbs"
module_crontab * 12-15 * * 1
module_end
# module_begin
# module_plugin cscript.exe //B //t:20 "%PROGRAMFILES%\Pandora_Agent\util\moboinfo.vbs"
# module_crontab * 12-15 * * 1
# module_end
module_begin
module_plugin cscript.exe //B //t:20 "%PROGRAMFILES%\Pandora_Agent\util\diskdrives.vbs"
module_crontab * 12-15 * * 1
module_end
# module_begin
# module_plugin cscript.exe //B //t:20 "%PROGRAMFILES%\Pandora_Agent\util\diskdrives.vbs"
# module_crontab * 12-15 * * 1
# module_end
module_begin
module_plugin cscript.exe //B //t:20 "%PROGRAMFILES%\Pandora_Agent\util\cdromdrives.vbs"
module_crontab * 12-15 * * 1
module_end
# module_begin
# module_plugin cscript.exe //B //t:20 "%PROGRAMFILES%\Pandora_Agent\util\cdromdrives.vbs"
# module_crontab * 12-15 * * 1
# module_end
module_begin
module_plugin cscript.exe //B //t:20 "%PROGRAMFILES%\Pandora_Agent\util\videocardinfo.vbs"
module_crontab * 12-15 * * 1
module_end
# module_begin
# module_plugin cscript.exe //B //t:20 "%PROGRAMFILES%\Pandora_Agent\util\videocardinfo.vbs"
# module_crontab * 12-15 * * 1
# module_end
module_begin
module_plugin cscript.exe //B //t:20 "%PROGRAMFILES%\Pandora_Agent\util\ifaces.vbs"
module_crontab * 12-15 * * 1
module_end
# module_begin
# module_plugin cscript.exe //B //t:20 "%PROGRAMFILES%\Pandora_Agent\util\ifaces.vbs"
# module_crontab * 12-15 * * 1
# module_end
module_begin
module_plugin cscript.exe //B //t:20 "%PROGRAMFILES%\Pandora_Agent\util\monitors.vbs"
module_crontab * 12-15 * * 1
module_end
# module_begin
# module_plugin cscript.exe //B //t:20 "%PROGRAMFILES%\Pandora_Agent\util\monitors.vbs"
# module_crontab * 12-15 * * 1
# module_end
module_begin
module_plugin cscript.exe //B //t:20 "%PROGRAMFILES%\Pandora_Agent\util\printers.vbs"
module_crontab * 12-15 * * 1
module_end
# module_begin
# module_plugin cscript.exe //B //t:20 "%PROGRAMFILES%\Pandora_Agent\util\printers.vbs"
# module_crontab * 12-15 * * 1
# module_end
module_begin
module_plugin cscript.exe //B //t:20 "%PROGRAMFILES%\Pandora_Agent\util\raminfo.vbs"
module_crontab * 12-15 * * 1
module_end
# module_begin
# module_plugin cscript.exe //B //t:20 "%PROGRAMFILES%\Pandora_Agent\util\raminfo.vbs"
# module_crontab * 12-15 * * 1
# module_end
module_begin
module_plugin cscript.exe //B //t:20 "%PROGRAMFILES%\Pandora_Agent\util\software_installed.vbs"
module_crontab * 12-15 * * 1
module_end
# module_begin
# module_plugin cscript.exe //B //t:20 "%PROGRAMFILES%\Pandora_Agent\util\software_installed.vbs"
# module_crontab * 12-15 * * 1
# module_end
module_begin
module_plugin cscript.exe //B //t:20 "%PROGRAMFILES%\Pandora_Agent\util\userslogged.vbs"
module_crontab * 12-15 * * 1
module_end
# module_begin
# module_plugin cscript.exe //B //t:20 "%PROGRAMFILES%\Pandora_Agent\util\userslogged.vbs"
# module_crontab * 12-15 * * 1
# module_end
module_begin
module_plugin cscript.exe //B //t:20 "%PROGRAMFILES%\Pandora_Agent\util\productkey.vbs"
module_crontab * 12-15 * * 1
module_end
# module_begin
# module_plugin cscript.exe //B //t:20 "%PROGRAMFILES%\Pandora_Agent\util\productkey.vbs"
# module_crontab * 12-15 * * 1
# module_end
module_begin
module_plugin cscript.exe //B //t:20 "%PROGRAMFILES%\Pandora_Agent\util\productID.vbs"
module_crontab * 12-15 * * 1
module_end
# module_begin
# module_plugin cscript.exe //B //t:20 "%PROGRAMFILES%\Pandora_Agent\util\productID.vbs"
# module_crontab * 12-15 * * 1
# module_end
## Plugin example for custom fields (version, architecture, IP, IPv6, MAC)
# module_begin

2
pandora_agents/win32/installer/pandora.mpi
View File

@ -186,7 +186,7 @@ UpgradeApplicationID
{}
Version
{151222}
{151223}
ViewReadme
{Yes}

2
pandora_agents/win32/pandora.cc
View File

@ -30,7 +30,7 @@ using namespace Pandora;
using namespace Pandora_Strutils;
#define PATH_SIZE _MAX_PATH+1
#define PANDORA_VERSION ("6.1dev(Build 151222)")
#define PANDORA_VERSION ("6.1dev(Build 151223)")
string pandora_path;
string pandora_dir;

2
pandora_agents/win32/versioninfo.rc
View File

@ -11,7 +11,7 @@ BEGIN
VALUE "LegalCopyright", "Artica ST"
VALUE "OriginalFilename", "PandoraAgent.exe"
VALUE "ProductName", "Pandora FMS Windows Agent"
VALUE "ProductVersion", "(6.1dev(Build 151222))"
VALUE "ProductVersion", "(6.1dev(Build 151223))"
VALUE "FileVersion", "1.0.0.0"
END
END

2
pandora_console/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-console
Version: 6.1dev-151222
Version: 6.1dev-151223
Architecture: all
Priority: optional
Section: admin

2
pandora_console/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
pandora_version="6.1dev-151222"
pandora_version="6.1dev-151223"
package_pear=0
package_pandora=1

7
pandora_console/godmode/groups/group_list.php
View File

@ -72,6 +72,9 @@ if (is_ajax ()) {
$privilege = (string) get_parameter ('privilege', '');
// Is is possible add keys prefix to avoid auto sorting in js object conversion
$keys_prefix = (string) get_parameter ('keys_prefix', '');
// This attr is for the operation "bulk alert accions add", it controls the query that take the agents
// from db
$add_alert_bulk_op = get_parameter ('add_alert_bulk_op', false);
// Ids of agents to be include in the SQL clause as id_agent IN ()
$filter_agents_json = (string) get_parameter ('filter_agents_json', '');
$status_agents = (int)get_parameter('status_agents', AGENT_STATUS_ALL);
@ -113,10 +116,10 @@ if (is_ajax ()) {
}
if ( $id_group == 0 && $privilege != '') {
$groups = users_get_groups ($config["id_user"], $privilege, false);
// if group ID doesn't matter and $privilege is specified (like 'AW'),
// retruns all agents that current user has $privilege privilege for.
$agents = agents_get_group_agents(
array_keys (users_get_groups ($config["id_user"], $privilege, false)),$filter,"none",false,$recursion);
$agents = agents_get_group_agents(array_keys($groups), $filter, "none", false, $recursion, false, '|', $add_alert_bulk_op);
}
else {
$agents = agents_get_group_agents($id_group, $filter, "none",

1
pandora_console/godmode/massive/massive_add_action_alerts.php
View File

@ -220,6 +220,7 @@ $(document).ready (function () {
$("#id_group").pandoraSelectGroupAgent ({
agentSelect: "select#id_agents",
privilege: "AW",
add_alert_bulk_op: true,
recursion: function() {return recursion},
filter_agents_json: filter_agents_json,
callbackPost: function () {

2
pandora_console/include/config_process.php
View File

@ -22,7 +22,7 @@
/**
* Pandora build version and version
*/
$build_version = 'PC151222';
$build_version = 'PC151223';
$pandora_version = 'v6.1dev';
// Do not overwrite default timezone set if defined.

10
pandora_console/include/functions_agents.php
View File

@ -805,7 +805,7 @@ function agents_common_modules ($id_agent, $filter = false, $indexed = true, $ge
* @return array An array with all agents in the group or an empty array
*/
function agents_get_group_agents ($id_group = 0, $search = false,
$case = "lower", $noACL = false, $childGroups = false, $serialized = false, $separator = '|') {
$case = "lower", $noACL = false, $childGroups = false, $serialized = false, $separator = '|', $add_alert_bulk_op = false) {
global $config;
@ -901,6 +901,11 @@ function agents_get_group_agents ($id_group = 0, $search = false,
}
unset($search['status']);
}
if ($add_alert_bulk_op) {
if (isset($search['id_agente'])) {
$filter['id_agente'] = $search['id_agente'];
}
}
if (is_metaconsole() && isset($search['id_server'])) {
$filter['id_tmetaconsole_setup'] = $search['id_server'];
@ -912,12 +917,13 @@ function agents_get_group_agents ($id_group = 0, $search = false,
unset ($search["id_server"]);
}
if (!$add_alert_bulk_op) {
// Add the rest of the filter from the search array
foreach ($search as $key => $value) {
$filter[] = $value;
}
}
}
else {
$filter['disabled'] = 0;
}

1117
pandora_console/include/functions_groupview.php Normal file
View File

File diff suppressed because it is too large Load Diff

1
pandora_console/include/javascript/jquery.pandora.controls.js
View File

@ -44,6 +44,7 @@
"filter_agents_json" : config.filter_agents_json,
"disabled" : config.disabled ? 1 : 0,
"status_agents" : config.status_agents,
"add_alert_bulk_op" : config.add_alert_bulk_op,
"privilege" : config.privilege,
// Add a key prefix to avoid auto sorting in js object conversion
"keys_prefix" : "_"

2
pandora_console/install.php
View File

@ -63,7 +63,7 @@
<div style='height: 10px'>
<?php
$version = '6.1dev';
$build = '151222';
$build = '151223';
$banner = "v$version Build $build";
error_reporting(0);

64
pandora_console/operation/agentes/group_view.php
View File

@ -17,6 +17,7 @@ require_once ("include/config.php");
require_once ("include/functions_reporting.php");
require_once ($config['homedir'] . "/include/functions_agents.php");
require_once ($config['homedir'] . '/include/functions_users.php');
require_once ("include/functions_groupview.php");
check_login ();
// ACL Check
@ -64,34 +65,18 @@ else {
// Header
ui_print_page_header (__("Group view"), "images/group.png", false, "", false, $updated_time);
$strict_user = db_get_value('strict_acl', 'tusuario', 'id_user', $config['id_user']);
//Groups and tags
$result_groups = group_get_groups_list($config['id_user'], $strict_user,
'AR', true, true);
$count = count($result_groups);
$all_data = groupview_status_modules_agents ($config['id_user'], $strict_user, 'AR', $strict_user);
if ($count == 1) {
if ($result_groups[0]['_id_'] == 0) {
unset($result_groups[0]);
}
}
$total_agentes = $all_data["_total_agents_"];
$monitor_ok = $all_data["_monitors_ok_"];
$monitor_warning = $all_data["_monitors_warning_"];
$monitor_critical = $all_data["_monitors_critical_"];
$monitor_unknown = $all_data["_monitors_unknown_"];
$total = $monitor_ok + $monitor_warning + $monitor_critical + $monitor_unknown;
$total_agentes = 0;
$monitor_ok = 0;
$monitor_warning = 0;
$monitor_critical = 0;
$monitor_unknown = 0;
$agents_unknown = 0;
foreach ($result_groups as $data) {
$total_agentes += $data["_total_agents_"];
$monitor_ok += $data["_monitors_ok_"];
$monitor_warning += $data["_monitors_warning_"];
$monitor_critical += $data["_monitors_critical_"];
$monitor_unknown += $data["_monitors_unknown_"];
}
$total = $monitor_ok + $monitor_warning + $monitor_critical+$monitor_unknown;
$total_ok = format_numeric (($monitor_ok*100)/$total,0);
$total_warning = format_numeric (($monitor_warning*100)/$total,0);
$total_critical = format_numeric (($monitor_critical*100)/$total,0);
@ -111,6 +96,19 @@ echo '<table cellpadding="0" cellspacing="0" border="0" width="100%" class="data
echo "</tr>";
echo "</table>";
//Groups and tags
$result_groups = groupview_get_groups_list($config['id_user'], $strict_user,
'AR', true, true);
$count = count($result_groups);
if ($count == 1) {
if ($result_groups[0]['_id_'] == 0) {
unset($result_groups[0]);
}
}
ui_pagination($count);
if (!empty($result_groups)) {
@ -220,9 +218,13 @@ if (!empty($result_groups)) {
$link = "<a class='group_view_data $color_class' style='font-weight: bold; font-size: 18px; text-align: center;'
href='index.php?sec=estado&sec2=operation/agentes/estado_agente&group_id=".$data['_id_']."'>";
}
if ($data["_id_"] == 0) {
$agent_counter = agents_get_group_agents($groups_id);
echo $link . count($agent_counter) . "</a>";
}
$agent_counter = agents_get_group_agents($groups_id);
if ($data["_total_agents_"] > 0) {
echo $link . count($agent_counter) . "</a>";
echo $link . $data["_total_agents_"] . "</a>";
}
echo "</td>";
@ -235,12 +237,8 @@ if (!empty($result_groups)) {
$link = "<a class='group_view_data $color_class' style='font-weight: bold; font-size: 18px; text-align: center;'
href='index.php?sec=estado&sec2=operation/agentes/estado_agente&group_id=".$data['_id_']."&status=" . AGENT_STATUS_UNKNOWN ."'>";
}
$search = array(
'status' => AGENT_STATUS_UNKNOWN
);
$agent_counter_unknown = agents_get_group_agents($groups_id, $search);
if ($data["_agents_unknown_"] > 0) {
echo $link . count($agent_counter_unknown) . "</a>";
echo $link . $data["_agents_unknown_"] . "</a>";
}
echo "</td>";
@ -253,12 +251,8 @@ if (!empty($result_groups)) {
$link = "<a class='group_view_data $color_class' style='font-weight: bold; font-size: 18px; text-align: center;'
href='index.php?sec=estado&sec2=operation/agentes/estado_agente&group_id=".$data['_id_']."&status=" . AGENT_STATUS_NOT_INIT ."'>";
}
$search = array(
'status' => AGENT_STATUS_NOT_INIT
);
$agent_counter_not_init = agents_get_group_agents($groups_id, $search);
if ($data["_agents_not_init_"] > 0) {
echo $link . count($agent_counter_not_init) . "</a>";
echo $link . $data["_agents_not_init_"] . "</a>";
}
echo "</td>";

2
pandora_console/pandora_console.redhat.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 6.1dev
%define release 151222
%define release 151223
# User and Group under which Apache is running
%define httpd_name httpd

2
pandora_console/pandora_console.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 6.1dev
%define release 151222
%define release 151223
%define httpd_name httpd
# User and Group under which Apache is running
%define httpd_name apache2

2
pandora_console/pandoradb.data.oracle.sql
View File

@ -65,7 +65,7 @@ INSERT INTO tconfig (token, value) VALUES ('graph_res','5');
INSERT INTO tconfig (token, value) VALUES ('step_compact','1');
INSERT INTO tconfig (token, value) VALUES ('db_scheme_first_version','6.0orc');
INSERT INTO tconfig (token, value) VALUES('db_scheme_version','6.1dev');
INSERT INTO tconfig (token, value) VALUES('db_scheme_build','PD151222');
INSERT INTO tconfig (token, value) VALUES('db_scheme_build','PD151223');
INSERT INTO tconfig (token, value) VALUES ('show_unknown','0');
INSERT INTO tconfig (token, value) VALUES ('show_lastalerts','1');
INSERT INTO tconfig (token, value) VALUES ('style','pandora');

2
pandora_server/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-server
Version: 6.1dev-151222
Version: 6.1dev-151223
Architecture: all
Priority: optional
Section: admin

2
pandora_server/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
pandora_version="6.1dev-151222"
pandora_version="6.1dev-151223"
package_cpan=0
package_pandora=1

2
pandora_server/lib/PandoraFMS/Config.pm
View File

@ -43,7 +43,7 @@ our @EXPORT = qw(
# version: Defines actual version of Pandora Server for this module only
my $pandora_version = "6.1dev";
my $pandora_build = "151222";
my $pandora_build = "151223";
our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash

2
pandora_server/pandora_server.redhat.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_server
%define version 6.1dev
%define release 151222
%define release 151223
Summary: Pandora FMS Server
Name: %{name}

2
pandora_server/pandora_server.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_server
%define version 6.1dev
%define release 151222
%define release 151223
Summary: Pandora FMS Server
Name: %{name}

2
pandora_server/pandora_server_installer
View File

@ -9,7 +9,7 @@
# **********************************************************************
PI_VERSION="6.1dev"
PI_BUILD="151222"
PI_BUILD="151223"
MODE=$1
if [ $# -gt 1 ]; then

2
pandora_server/util/pandora_db.pl
View File

@ -33,7 +33,7 @@ use PandoraFMS::Tools;
use PandoraFMS::DB;
# version: define current version
my $version = "6.1dev PS151222";
my $version = "6.1dev PS151223";
# Pandora server configuration
my %conf;

2
pandora_server/util/pandora_manage.pl
View File

@ -35,7 +35,7 @@ use Encode::Locale;
Encode::Locale::decode_argv;
# version: define current version
my $version = "6.1dev PS151222";
my $version = "6.1dev PS151223";
# save program name for logging
my $progname = basename($0);