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://brutus.artica.lan:8081/artica/pandorafms into develop

This commit is contained in:
cesar991 2016-10-03 12:27:13 +02:00
parent 116466627c 7a80fa372d
commit f4103693d0
28 changed files with 68 additions and 25 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-160930
Version: 6.1dev-161003
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-160930"
pandora_version="6.1dev-161003"
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 => '160930';
use constant AGENT_BUILD => '161003';
# 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.1dev
%define release 160930
%define release 161003
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 160930
%define release 161003
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="160930"
PI_BUILD="161003"
OS_NAME=`uname -s`
FORCE=0

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

@ -186,7 +186,7 @@ UpgradeApplicationID
{}
Version
{160930}
{161003}
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 160930)")
#define PANDORA_VERSION ("6.1dev(Build 161003)")
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 160930))"
VALUE "ProductVersion", "(6.1dev(Build 161003))"
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-160930
Version: 6.1dev-161003
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-160930"
pandora_version="6.1dev-161003"
package_pear=0
package_pandora=1

2
pandora_console/general/header.php
View File

@ -188,7 +188,7 @@ config_check();
$_GET['refr'] = null;
}
if (array_search($_GET['sec2'], $config['autorefresh_white_list']) !== false) {
if ($config['autorefresh_white_list'] !== null && array_search($_GET['sec2'], $config['autorefresh_white_list']) !== false) {
$autorefresh_img = html_print_image("images/header_refresh.png", true, array("class" => 'bot', "alt" => 'lightning', 'title' => __('Configure autorefresh')));
if ($_GET['refr']) {

2
pandora_console/include/config_process.php
View File

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

25
pandora_console/include/help/ja/help_reports_label_field.php Executable file
View File

@ -0,0 +1,25 @@
<?php
/**
* @package Include/help/ja
*/
?>
<h1>レポート - ラベルフィールドマクロ</h1>
<p>
次のマクロも使えます: <br />
<ul>
<li><b>_agent_ </b>: レポートアイテムで選択したエージェント名。<li />
<li><b>_agentdescription_ </b>: レポートアイテムで選択したエージェントの説明。<li />
<li><b>_agentgroup_ </b>: エージェントグループ名。<li />
<li><b>_address_</b> : レポートアイテムで選択したエージェントのアドレス。<li />
<ul />
<br />
<ul>
エージェントモジュールのフォームで利用可能なもの<br />
<li><b>_module_ </b>: レポートアイテムで選択したモジュール名。<li />
<li><b>_moduledescription_</b> : レポートアイテムで選択したモジュールの説明。<li />
<ul />
例: エージェント: <b>_agent_</b> / モジュール: <b>_module_</b><br />
</p>

9
pandora_console/include/help/ja/help_snmp_alert_configuration.php Normal file
View File

@ -0,0 +1,9 @@
<?php
/*
* @package Include /help/ja
*/
?>
<h1>アラート設定</h1>
<p>これらは、SNMP アラート設定で必要なフィールドです。フィールドの一部は、"フィールド #x のマッチ" および "カスタム値/OID" フィールドからのマクロを使うことができます。</p>

9
pandora_console/include/help/ja/help_visual_console_editor_list_elements_tab.php Normal file
View File

@ -0,0 +1,9 @@
<?php
/*
* @package Include/help/ja/
*/
?>
<h1>要素一覧</h1>
<p>このタブは、編集中のビジュアルコンソールの要素のファイルまとめて表示します。異なる要素をすばやく編集でき、要素の値を調整する必要がある場合に便利なツールです。</p>

2
pandora_console/install.php
View File

@ -71,7 +71,7 @@
<div style='height: 10px'>
<?php
$version = '6.1dev';
$build = '160930';
$build = '161003';
$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.1dev
%define release 160930
%define release 161003
# 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 160930
%define release 161003
%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

@ -66,7 +66,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','PD160930');
INSERT INTO tconfig (token, value) VALUES('db_scheme_build','PD161003');
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-160930
Version: 6.1dev-161003
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-160930"
pandora_version="6.1dev-161003"
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 = "160930";
my $pandora_build = "161003";
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 160930
%define release 161003
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 160930
%define release 161003
Summary: Pandora FMS Server
Name: %{name}

2
pandora_server/pandora_server_installer
View File

@ -9,7 +9,7 @@
# **********************************************************************
PI_VERSION="6.1dev"
PI_BUILD="160930"
PI_BUILD="161003"
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 PS160930";
my $version = "6.1dev PS161003";
# 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 PS160930";
my $version = "6.1dev PS161003";
# save program name for logging
my $progname = basename($0);