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

This commit is contained in:
m-lopez-f 2015-12-01 17:15:49 +01:00
commit 4d558f9919
21 changed files with 22 additions and 22 deletions

View File

@ -462,7 +462,7 @@ fi
# Script banner at start
echo " "
echo "Pandora FMS Agent UNIX Installer $PI_VERSION $PI_BUILD (c) 2008-2010 ArticaST"
echo "Pandora FMS Agent UNIX Installer $PI_VERSION $PI_BUILD (c) 2008-2015 ArticaST"
echo "This program is licensed under GPL2 Terms. http://pandorafms.com"
echo " "

View File

@ -81,7 +81,7 @@ Optional parameters:
##############################################################################
sub tool_api_init () {
print "\nPandora FMS Remote Event Tool Copyright (c) 2013 Artica ST\n";
print "\nPandora FMS Remote Event Tool Copyright (c) 2015 Artica ST\n";
print "This program is Free Software, licensed under the terms of GPL License v2\n";
print "You can download latest versions and documentation at http://www.pandorafms.org\n\n";

View File

@ -155,7 +155,7 @@ help () {
# Script banner at start
echo " "
echo "Pandora FMS $PI_VERSION Console Upgrade (c) 2009-2011 Artica ST"
echo "Pandora FMS $PI_VERSION Console Upgrade (c) 2009-2015 Artica ST"
echo "This program is licensed under GPL2 Terms. http://pandorafms.com"
echo " "

View File

@ -77,7 +77,7 @@ sub help_screen {
sub pandora_init {
my $pa_config = $_[0];
my $init_string = $_[1];
print "\n$init_string $pandora_version Build $pandora_build Copyright (c) 2004-2014 ArticaST\n";
print "\n$init_string $pandora_version Build $pandora_build Copyright (c) 2004-2015 ArticaST\n";
print "This program is OpenSource, licensed under the terms of GPL License version 2.\n";
print "You can download latest versions and documentation at http://www.pandorafms.org \n\n";

View File

@ -9,7 +9,7 @@ use POSIX qw(setsid strftime);
sub show_help {
print "\nSpecific Pandora FMS trap collector for compaq Hardware\n";
print "(c) Sancho Lerena 2010 <slerena@artica.es>\n";
print "(c) Sancho Lerena 2010-2015 <slerena@artica.es>\n";
print "Usage:\n\n";
print " compaq_chassis_trap_manager.pl <destination_agent_name> <TRAP DATA>\n\n";
exit;

View File

@ -12,7 +12,7 @@ use POSIX qw(setsid strftime);
sub show_help {
print "\nSpecific Pandora FMS trap collector for compaq Hardware\n";
print "(c) Sancho Lerena 2010 <slerena@artica.es>\n";
print "(c) Sancho Lerena 2010-2015 <slerena@artica.es>\n";
print "Usage:\n\n";
print " compaq_chassis_trap_manager.pl <destination_agent_name> <TRAP DATA>\n\n";
exit;

View File

@ -6,7 +6,7 @@ use POSIX qw(setsid strftime);
sub show_help {
print "\nSpecific Pandora FMS trap collector for ESX\n";
print "(c) Sancho Lerena 2010 <slerena@artica.es>\n";
print "(c) Sancho Lerena 2010-2015 <slerena@artica.es>\n";
print "Usage:\n\n";
print " esx_trap_manager.pl <destination_agent_name> <TRAP DATA>\n\n";
exit;

View File

@ -60,7 +60,7 @@ Optional parameters:
##############################################################################
sub tool_api_init () {
print "\nIntegria IMS Remote Ticket Tool Copyright (c) 2013 Artica ST\n";
print "\nIntegria IMS Remote Ticket Tool Copyright (c) 2013-2015 Artica ST\n";
print "This program is Free Software, licensed under the terms of GPL License v2\n";
print "You can download latest versions and documentation at http://www.integriaims.com\n\n";
@ -234,4 +234,4 @@ sub tool_api_main () {
print "\nExiting!\n\n";
exit;
}
}

View File

@ -12,7 +12,7 @@ HUMANDATE=`date +%d-%m-%y-%s`
OUTPUT=integrity_check_`date +%d-%m-%y-%s`.data
echo "Pandora FMS Integrity Check tool v1.0"
echo "(c) Pandora FMS Development Team 2014"
echo "(c) Pandora FMS Development Team 2014-2015"
echo " "
if [ $# -lt 2 ]

View File

@ -6,7 +6,7 @@
function help {
echo ""
echo -e "Pandora FMS Command line backup tool. http://www.pandorafms.org"
echo -e "(c) 2009 Sancho Lerena <slerena@gmail.com>, Artica Soluciones Tecnologicas"
echo -e "(c) 2009-2015 Sancho Lerena <slerena@gmail.com>, Artica Soluciones Tecnologicas"
echo ""
echo -e "Syntax:"
echo -e "\t\t-c Path to Pandora FMS console, p.e: /srv/www/htdocs/pandora_console"

View File

@ -1,7 +1,7 @@
#!/bin/bash
echo "Small tool to measure data processing throughput for a Pandora FMS data server"
echo "(c) 2010 Sancho Lerena, slerena@gmail.com"
echo "(c) 2010-2015 Sancho Lerena, slerena@gmail.com"
ANT=0
while [ 1 ]

View File

@ -337,7 +337,7 @@ sub pandora_event_speed {
##############################################################################
sub help_screen{
print "\nPandora FMS Database Speed Test $version Copyright (c) 2012 Artica ST\n";
print "\nPandora FMS Database Speed Test $version Copyright (c) 2012-2015 Artica ST\n";
print "This program is Free Software, licensed under the terms of GPL License v2\n";
print "You can download latest versions and documentation at http://www.pandorafms.org\n\n";

View File

@ -580,7 +580,7 @@ sub pandora_compactdb ($$) {
sub pandora_init ($) {
my $conf = shift;
log_message ('', "\nPandora FMS DB Tool $version Copyright (c) 2004-2009 Artica ST\n");
log_message ('', "\nPandora FMS DB Tool $version Copyright (c) 2004-2015 Artica ST\n");
log_message ('', "This program is Free Software, licensed under the terms of GPL License v2\n");
log_message ('', "You can download latest versions and documentation at http://www.pandorafms.org\n\n");

View File

@ -12,7 +12,7 @@ LINUXINFO=`uname -a`
OUTFILE="/tmp/pandora_diag.$TIMESTAMP.data"
echo " "
echo "Pandora FMS Diagnostic Script v1.0 (c) ArticaST 2009-2011"
echo "Pandora FMS Diagnostic Script v1.0 (c) ArticaST 2009-2015"
echo "http://pandorafms.org. This script is licensed under GPL2 terms"
echo " "
echo "Please wait while this script is collecting data"

View File

@ -94,7 +94,7 @@ exit;
# Print a help screen and exit.
##############################################################################
sub help_screen{
print "\nPandora FMS CLI $version Copyright (c) 2013 Artica ST\n";
print "\nPandora FMS CLI $version Copyright (c) 2013-2015 Artica ST\n";
print "This program is Free Software, licensed under the terms of GPL License v2\n";
print "You can download latest versions and documentation at http://www.pandorafms.org\n\n";
print "$enterprise_msg\n\n";

View File

@ -99,7 +99,7 @@ sub pandora_load_credentials ($) {
$conf->{"quiet"}=0; # Daemon 0 by default
print "\nPandora FMS Plugins migrate tool $version Copyright (c) 2010 Artica ST\n";
print "\nPandora FMS Plugins migrate tool $version Copyright (c) 2010-2015 Artica ST\n";
print "This program is Free Software, licensed under the terms of GPL License v2\n";
# Load config file from command line

View File

@ -72,7 +72,7 @@ sub pandora_load_credentials ($) {
$conf->{"quiet"}=0; # Daemon 0 by default
print "\nPandora FMS Plugins migrate tool $version Copyright (c) 2010 Artica ST\n";
print "\nPandora FMS Plugins migrate tool $version Copyright (c) 2010-2015 Artica ST\n";
print "This program is Free Software, licensed under the terms of GPL License v2\n";
# Load config file from command line

View File

@ -77,7 +77,7 @@ sub pandora_load_credentials ($) {
$conf->{"quiet"}=0; # Daemon 0 by default
print "\nPandora FMS Recode tool $version Copyright (c) 2010 Artica ST\n";
print "\nPandora FMS Recode tool $version Copyright (c) 2010-2015 Artica ST\n";
print "This program is Free Software, licensed under the terms of GPL License v2\n";
print "You can download latest versions and documentation at http://www.pandorafms.org\n\n";

View File

@ -82,7 +82,7 @@ Optional parameters:
##############################################################################
sub tool_api_init () {
print "\nPandora FMS Remote Event Tool Copyright (c) 2013 Artica ST\n";
print "\nPandora FMS Remote Event Tool Copyright (c) 2013-2015 Artica ST\n";
print "This program is Free Software, licensed under the terms of GPL License v2\n";
print "You can download latest versions and documentation at http://www.pandorafms.org\n\n";

View File

@ -76,7 +76,7 @@ Optional parameters:
##############################################################################
sub tool_api_init () {
print "\nPandora FMS Remote Event Tool Copyright (c) 2013 Artica ST\n";
print "\nPandora FMS Remote Event Tool Copyright (c) 2013-2015 Artica ST\n";
print "This program is Free Software, licensed under the terms of GPL License v2\n";
print "You can download latest versions and documentation at http://www.pandorafms.org\n\n";

View File

@ -119,7 +119,7 @@ sub pandora_load_credentials ($) {
$conf->{"quiet"}=0; # Daemon 0 by default
print "\nCopyright (c) 2010 Artica Soluciones Tecnologicas S.L\n";
print "\nCopyright (c) 2010-2015 Artica Soluciones Tecnologicas S.L\n";
print "This code is not free or OpenSource. Please don't redistribute.\n\n";
# Load enterprise module