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

Merge branch 'pandora_6.0' of https://192.168.50.5:8081/artica/pandorafms into pandora_6.0

This commit is contained in:
m-lopez-f 2016-09-09 09:37:26 +02:00
parent 42c3e83578 a17737206d
commit b36b1b2113
25 changed files with 59 additions and 27 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.0SP3-160908
Version: 6.0SP3-160909
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.0SP3-160908"
pandora_version="6.0SP3-160909"
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.0SP3';
use constant AGENT_BUILD => '160908';
use constant AGENT_BUILD => '160909';
# Agent log default file size maximum and instances
use constant DEFAULT_MAX_LOG_SIZE => 600000;

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

@ -3,7 +3,7 @@
#
%define name pandorafms_agent_unix
%define version 6.0SP3
%define release 160908
%define release 160909
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.0SP3
%define release 160908
%define release 160909
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.0SP3"
PI_BUILD="160908"
PI_BUILD="160909"
OS_NAME=`uname -s`
FORCE=0

38
pandora_agents/unix/plugins/grep_log
View File

@ -53,6 +53,12 @@ my $Idx_size = 0;
# Regular expression to be matched
my $Reg_exp = '';
# Flag to show or not summary module
my $summary_flag = 0;
# Number of coincidences found
my $coincidences = 0;
###############################################################################
# SUB error_msg
# Print an error message and exit.
@ -72,7 +78,7 @@ sub error_msg ($) {
# Print a help message.
###############################################################################
sub print_help () {
print "Usage: $0 <log_file> <module_name> <pattern> <up_lines_extra> <bot_lines_extra>\n";
print "Usage: $0 <log_file> <module_name> <pattern> <up_lines_extra> <bot_lines_extra> [--summary]\n";
}
###############################################################################
@ -193,6 +199,7 @@ sub parse_log (;$$) {
push @lines, $line;
if ($line =~ m/$Reg_exp/i) {
push @nl_found, $nl;
$coincidences++;
}
$nl++;
}
@ -236,6 +243,21 @@ sub parse_log (;$$) {
return @data;
}
###############################################################################
# SUB print_summary
# Print module summary to stdout.
###############################################################################
sub print_summary() {
my $output = "<module>\n";
$output .= "<name><![CDATA[" . $Module_name . " coincidences]]></name>\n";
$output .= "<type><![CDATA[async_data]]></type>\n";
$output .= "<datalist>\n";
$output .= "<data><value><![CDATA[$coincidences]]></value></data>\n";
$output .= "</datalist>\n";
$output .= "</module>\n";
print stdout $output;
}
###############################################################################
# SUB parse_log
# Print log data to stdout.
@ -245,6 +267,7 @@ sub print_log (@) {
# No data
if ($#data < 0) {
print_summary() if ($summary_flag == 1);
return;
}
@ -263,7 +286,9 @@ sub print_log (@) {
}
# Regular module
else {
my $output = "<module>\n";
my $output;
print_summary() if ($summary_flag == 1);
$output = "<module>\n";
$output .= "<name><![CDATA[" . $Module_name . "]]></name>\n";
$output .= "<type><![CDATA[async_string]]></type>\n";
$output .= "<datalist>\n";
@ -292,8 +317,15 @@ if ($#ARGV < 2) {
$Log_file = $ARGV[0];
$Module_name = $ARGV[1];
$Reg_exp = $ARGV[2];
my $up_lines = $ARGV[3];
my $up_lines = $ARGV[3];
my $bot_lines = $ARGV[4];
my $sum_flag = $ARGV[5];
if ( ( defined($up_lines) && ($up_lines eq "--summary"))
|| ( defined($bot_lines) && ($bot_lines eq "--summary"))
|| ( defined($sum_flag) && ($sum_flag eq "--summary")) ) {
$summary_flag = 1;
}
# Create index file storage directory
if ( ! -d $Idx_dir) {
mkdir($Idx_dir) || error_msg("Error creating directory $Idx_dir: "

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

@ -186,7 +186,7 @@ UpgradeApplicationID
{}
Version
{160908}
{160909}
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.0SP3(Build 160908)")
#define PANDORA_VERSION ("6.0SP3(Build 160909)")
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.0SP3(Build 160908))"
VALUE "ProductVersion", "(6.0SP3(Build 160909))"
VALUE "FileVersion", "1.0.0.0"
END
END

2
pandora_console/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-console
Version: 6.0SP3-160908
Version: 6.0SP3-160909
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.0SP3-160908"
pandora_version="6.0SP3-160909"
package_pear=0
package_pandora=1

2
pandora_console/include/config_process.php
View File

@ -22,7 +22,7 @@
/**
* Pandora build version and version
*/
$build_version = 'PC160908';
$build_version = 'PC160909';
$pandora_version = 'v6.0SP3';
// Do not overwrite default timezone set if defined.

2
pandora_console/install.php
View File

@ -71,7 +71,7 @@
<div style='height: 10px'>
<?php
$version = '6.0SP3';
$build = '160908';
$build = '160909';
$banner = "v$version Build $build";
error_reporting(0);

2
pandora_console/pandora_console.redhat.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 6.0SP3
%define release 160908
%define release 160909
# 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.0SP3
%define release 160908
%define release 160909
%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.0SP3');
INSERT INTO tconfig (token, value) VALUES('db_scheme_build','PD160908');
INSERT INTO tconfig (token, value) VALUES('db_scheme_build','PD160909');
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.0SP3-160908
Version: 6.0SP3-160909
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.0SP3-160908"
pandora_version="6.0SP3-160909"
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.0SP3";
my $pandora_build = "160908";
my $pandora_build = "160909";
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.0SP3
%define release 160908
%define release 160909
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.0SP3
%define release 160908
%define release 160909
Summary: Pandora FMS Server
Name: %{name}

2
pandora_server/pandora_server_installer
View File

@ -9,7 +9,7 @@
# **********************************************************************
PI_VERSION="6.0SP3"
PI_BUILD="160908"
PI_BUILD="160909"
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.0SP3 PS160908";
my $version = "6.0SP3 PS160909";
# 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.0SP3 PS160908";
my $version = "6.0SP3 PS160909";
# save program name for logging
my $progname = basename($0);