tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 16:55:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
mdtrooper 2014-10-08 17:12:35 +02:00
commit e27644a764
50 changed files with 95 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_agents/pc/AIX/pandora_agent.conf
View File

@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents # Base config file for Pandora FMS agents
# Version 5.1SP1, AIX version # Version 5.1SP1RC1, AIX version
# Licensed under GPL license v2, # Licensed under GPL license v2,
# Copyright (c) 2003-2010 Artica Soluciones Tecnologicas # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
# http://www.pandorafms.com # http://www.pandorafms.com

2
pandora_agents/pc/FreeBSD/pandora_agent.conf
View File

@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents # Base config file for Pandora FMS agents
# Version 5.1SP1, FreeBSD Version # Version 5.1SP1RC1, FreeBSD Version
# Licensed under GPL license v2, # Licensed under GPL license v2,
# Copyright (c) 2003-2010 Artica Soluciones Tecnologicas # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
# http://www.pandorafms.com # http://www.pandorafms.com

2
pandora_agents/pc/HP-UX/pandora_agent.conf
View File

@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents # Base config file for Pandora FMS agents
# Version 5.1SP1, HP-UX Version # Version 5.1SP1RC1, HP-UX Version
# Licensed under GPL license v2, # Licensed under GPL license v2,
# Copyright (c) 2003-2009 Artica Soluciones Tecnologicas # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
# http://www.pandorafms.com # http://www.pandorafms.com

2
pandora_agents/pc/Linux/pandora_agent.conf
View File

@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents # Base config file for Pandora FMS agents
# Version 5.1SP1, GNU/Linux # Version 5.1SP1RC1, GNU/Linux
# Licensed under GPL license v2, # Licensed under GPL license v2,
# Copyright (c) 2003-2009 Artica Soluciones Tecnologicas # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
# http://www.pandorafms.com # http://www.pandorafms.com

2
pandora_agents/pc/NT4/pandora_agent.conf
View File

@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents # Base config file for Pandora FMS agents
# Version 5.1SP1, GNU/Linux # Version 5.1SP1RC1, GNU/Linux
# Licensed under GPL license v2, # Licensed under GPL license v2,
# Copyright (c) 2003-2009 Artica Soluciones Tecnologicas # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
# http://www.pandorafms.com # http://www.pandorafms.com

2
pandora_agents/pc/SunOS/pandora_agent.conf
View File

@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents # Base config file for Pandora FMS agents
# Version 5.1SP1, Solaris Version # Version 5.1SP1RC1, Solaris Version
# Licensed under GPL license v2, # Licensed under GPL license v2,
# Copyright (c) 2003-2009 Artica Soluciones Tecnologicas # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
# http://www.pandorafms.com # http://www.pandorafms.com

2
pandora_agents/pc/Win32/pandora_agent.conf
View File

@ -1,6 +1,6 @@
# Base config file for Pandora FMS Windows Agent # Base config file for Pandora FMS Windows Agent
# (c) 2006-2010 Artica Soluciones Tecnologicas # (c) 2006-2010 Artica Soluciones Tecnologicas
# Version 5.1SP1 # Version 5.1SP1RC1
# This program is Free Software, you can redistribute it and/or modify it # This program is Free Software, you can redistribute it and/or modify it
# under the terms of the GNU General Public Licence as published by the Free Software # under the terms of the GNU General Public Licence as published by the Free Software

2
pandora_agents/shellscript/aix/pandora_agent.conf
View File

@ -1,6 +1,6 @@
# Fichero de configuracion base de agentes de Pandora # Fichero de configuracion base de agentes de Pandora
# Base config file for Pandora agents # Base config file for Pandora agents
# Version 5.1SP1, AIX version # Version 5.1SP1RC1, AIX version
# General Parameters # General Parameters
# ================== # ==================

2
pandora_agents/shellscript/bsd-ipso/pandora_agent.conf
View File

@ -1,6 +1,6 @@
# Fichero de configuracion base de agentes de Pandora # Fichero de configuracion base de agentes de Pandora
# Base config file for Pandora agents # Base config file for Pandora agents
# Version 5.1SP1 # Version 5.1SP1RC1
# FreeBSD/IPSO version # FreeBSD/IPSO version
# Licenced under GPL licence, 2003-2007 Sancho Lerena # Licenced under GPL licence, 2003-2007 Sancho Lerena

2
pandora_agents/shellscript/hp-ux/pandora_agent.conf
View File

@ -1,6 +1,6 @@
# Fichero de configuracion base de agentes de Pandora # Fichero de configuracion base de agentes de Pandora
# Base config file for Pandora agents # Base config file for Pandora agents
# Version 5.1SP1, HPUX Version # Version 5.1SP1RC1, HPUX Version
# General Parameters # General Parameters
# ================== # ==================

2
pandora_agents/shellscript/linux/pandora_agent.conf
View File

@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents # Base config file for Pandora FMS agents
# Version 5.1SP1 # Version 5.1SP1RC1
# Licensed under GPL license v2, # Licensed under GPL license v2,
# (c) 2003-2010 Artica Soluciones Tecnologicas # (c) 2003-2010 Artica Soluciones Tecnologicas
# please visit http://pandora.sourceforge.net # please visit http://pandora.sourceforge.net

2
pandora_agents/shellscript/mac_osx/pandora_agent.conf
View File

@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents # Base config file for Pandora FMS agents
# Version 5.1SP1 # Version 5.1SP1RC1
# Licensed under GPL license v2, # Licensed under GPL license v2,
# (c) 2003-2009 Artica Soluciones Tecnologicas # (c) 2003-2009 Artica Soluciones Tecnologicas
# please visit http://pandora.sourceforge.net # please visit http://pandora.sourceforge.net

2
pandora_agents/shellscript/openWRT/pandora_agent.conf
View File

@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents # Base config file for Pandora FMS agents
# Version 5.1SP1 # Version 5.1SP1RC1
# Licensed under GPL license v2, # Licensed under GPL license v2,
# please visit http://pandora.sourceforge.net # please visit http://pandora.sourceforge.net

2
pandora_agents/shellscript/solaris/pandora_agent.conf
View File

@ -1,6 +1,6 @@
# Fichero de configuracion base de agentes de Pandora # Fichero de configuracion base de agentes de Pandora
# Base config file for Pandora agents # Base config file for Pandora agents
# Version 5.1SP1, Solaris version # Version 5.1SP1RC1, Solaris version
# General Parameters # General Parameters
# ================== # ==================

2
pandora_agents/unix/AIX/pandora_agent.conf
View File

@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents # Base config file for Pandora FMS agents
# Version 5.1SP1, AIX version # Version 5.1SP1RC1, AIX version
# Licensed under GPL license v2, # Licensed under GPL license v2,
# Copyright (c) 2003-2010 Artica Soluciones Tecnologicas # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
# http://www.pandorafms.com # http://www.pandorafms.com

2
pandora_agents/unix/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-agent-unix package: pandorafms-agent-unix
Version: 5.1SP1-141008 Version: 5.1SP1RC1
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin 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 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
pandora_version="5.1SP1-141008" pandora_version="5.1SP1RC1"
echo "Test if you has the tools for to make the packages." echo "Test if you has the tools for to make the packages."
whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null

2
pandora_agents/unix/Darwin/pandora_agent.conf
View File

@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents # Base config file for Pandora FMS agents
# Version 5.1SP1, GNU/Linux # Version 5.1SP1RC1, GNU/Linux
# Licensed under GPL license v2, # Licensed under GPL license v2,
# Copyright (c) 2003-2012 Artica Soluciones Tecnologicas # Copyright (c) 2003-2012 Artica Soluciones Tecnologicas
# http://www.pandorafms.com # http://www.pandorafms.com

2
pandora_agents/unix/FreeBSD/pandora_agent.conf
View File

@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents # Base config file for Pandora FMS agents
# Version 5.1SP1, FreeBSD Version # Version 5.1SP1RC1, FreeBSD Version
# Licensed under GPL license v2, # Licensed under GPL license v2,
# Copyright (c) 2003-2010 Artica Soluciones Tecnologicas # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
# http://www.pandorafms.com # http://www.pandorafms.com

2
pandora_agents/unix/HP-UX/pandora_agent.conf
View File

@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents # Base config file for Pandora FMS agents
# Version 5.1SP1, HP-UX Version # Version 5.1SP1RC1, HP-UX Version
# Licensed under GPL license v2, # Licensed under GPL license v2,
# Copyright (c) 2003-2009 Artica Soluciones Tecnologicas # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
# http://www.pandorafms.com # http://www.pandorafms.com

2
pandora_agents/unix/Linux/pandora_agent.conf
View File

@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents # Base config file for Pandora FMS agents
# Version 5.1SP1, GNU/Linux # Version 5.1SP1RC1, GNU/Linux
# Licensed under GPL license v2, # Licensed under GPL license v2,
# Copyright (c) 2003-2014 Artica Soluciones Tecnologicas # Copyright (c) 2003-2014 Artica Soluciones Tecnologicas
# http://www.pandorafms.com # http://www.pandorafms.com

2
pandora_agents/unix/NT4/pandora_agent.conf
View File

@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents # Base config file for Pandora FMS agents
# Version 5.1SP1, GNU/Linux # Version 5.1SP1RC1, GNU/Linux
# Licensed under GPL license v2, # Licensed under GPL license v2,
# Copyright (c) 2003-2009 Artica Soluciones Tecnologicas # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
# http://www.pandorafms.com # http://www.pandorafms.com

2
pandora_agents/unix/NetBSD/pandora_agent.conf
View File

@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents # Base config file for Pandora FMS agents
# Version 5.1SP1, NetBSD Version # Version 5.1SP1RC1, NetBSD Version
# Licensed under GPL license v2, # Licensed under GPL license v2,
# Copyright (c) 2003-2010 Artica Soluciones Tecnologicas # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
# http://www.pandorafms.com # http://www.pandorafms.com

2
pandora_agents/unix/SunOS/pandora_agent.conf
View File

@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents # Base config file for Pandora FMS agents
# Version 5.1SP1, Solaris Version # Version 5.1SP1RC1, Solaris Version
# Licensed under GPL license v2, # Licensed under GPL license v2,
# Copyright (c) 2003-2009 Artica Soluciones Tecnologicas # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
# http://www.pandorafms.com # http://www.pandorafms.com

2
pandora_agents/unix/pandora_agent
View File

@ -40,7 +40,7 @@ my $Sem = undef;
# Semaphore used to control the number of threads # Semaphore used to control the number of threads
my $ThreadSem = undef; my $ThreadSem = undef;
use constant AGENT_VERSION => '5.1SP1'; use constant AGENT_VERSION => '5.1SP1RC1';
use constant AGENT_BUILD => '141008'; use constant AGENT_BUILD => '141008';
# Commands to retrieve total memory information in kB # Commands to retrieve total memory information in kB

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

@ -2,8 +2,8 @@
#Pandora FMS Linux Agent #Pandora FMS Linux Agent
# #
%define name pandorafms_agent_unix %define name pandorafms_agent_unix
%define version 5.1SP1 %define version 5.1SP1RC1
%define release 141008 %define release 1
Summary: Pandora FMS Linux agent, PERL version Summary: Pandora FMS Linux agent, PERL version
Name: %{name} Name: %{name}

4
pandora_agents/unix/pandora_agent.spec
View File

@ -2,8 +2,8 @@
#Pandora FMS Linux Agent #Pandora FMS Linux Agent
# #
%define name pandorafms_agent_unix %define name pandorafms_agent_unix
%define version 5.1SP1 %define version 5.1SP1RC1
%define release 141008 %define release 1
Summary: Pandora FMS Linux agent, PERL version Summary: Pandora FMS Linux agent, PERL version
Name: %{name} Name: %{name}

0
pandora_agents/win32/ChangeLog Normal file
View File

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

@ -1,6 +1,6 @@
# Base config file for Pandora FMS Windows Agent # Base config file for Pandora FMS Windows Agent
# (c) 2006-2014 Artica Soluciones Tecnologicas # (c) 2006-2014 Artica Soluciones Tecnologicas
# Version 5.1SP1 # Version 5.1SP1RC1
# This program is Free Software, you can redistribute it and/or modify it # This program is Free Software, you can redistribute it and/or modify it
# under the terms of the GNU General Public Licence as published by the Free Software # under the terms of the GNU General Public Licence as published by the Free Software

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

@ -3,7 +3,7 @@ AllowLanguageSelection
{Yes} {Yes}
AppName AppName
{Pandora FMS Windows Agent v5.1SP1} {Pandora FMS Windows Agent v5.1SP1RC1}
ApplicationID ApplicationID
{17E3D2CF-CA02-406B-8A80-9D31C17BD08F} {17E3D2CF-CA02-406B-8A80-9D31C17BD08F}
@ -2387,7 +2387,7 @@ Windows,BuildSeparateArchives
{No} {No}
Windows,Executable Windows,Executable
{<%AppName%>-<%Version%>-Setup<%Ext%>} {<%AppName%>-Setup<%Ext%>}
Windows,FileDescription Windows,FileDescription
{<%AppName%> <%Version%> Setup} {<%AppName%> <%Version%> Setup}

2
pandora_agents/win32/pandora.cc
View File

@ -30,7 +30,7 @@ using namespace Pandora;
using namespace Pandora_Strutils; using namespace Pandora_Strutils;
#define PATH_SIZE _MAX_PATH+1 #define PATH_SIZE _MAX_PATH+1
#define PANDORA_VERSION ("5.1SP1(Build 141008)") #define PANDORA_VERSION ("5.1SP1RC1(Build 141008)")
string pandora_path; string pandora_path;
string pandora_dir; string pandora_dir;

2
pandora_agents/win32/versioninfo.rc
View File

@ -11,7 +11,7 @@ BEGIN
VALUE "LegalCopyright", "Artica ST" VALUE "LegalCopyright", "Artica ST"
VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "OriginalFilename", "PandoraAgent.exe"
VALUE "ProductName", "Pandora FMS Windows Agent" VALUE "ProductName", "Pandora FMS Windows Agent"
VALUE "ProductVersion", "(5.1SP1(Build 141008))" VALUE "ProductVersion", "(5.1SP1RC1(Build 141008))"
VALUE "FileVersion", "1.0.0.0" VALUE "FileVersion", "1.0.0.0"
END END
END END

2
pandora_console/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-console package: pandorafms-console
Version: 5.1SP1-141008 Version: 5.1SP1RC1
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin 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 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
pandora_version="5.1SP1-141008" pandora_version="5.1SP1RC1"
package_pear=0 package_pear=0
package_pandora=1 package_pandora=1

2
pandora_console/include/config_process.php
View File

@ -23,7 +23,7 @@
* Pandora build version and version * Pandora build version and version
*/ */
$build_version = 'PC141008'; $build_version = 'PC141008';
$pandora_version = 'v5.1SP1'; $pandora_version = 'v5.1SP1RC1';
// Do not overwrite default timezone set if defined. // Do not overwrite default timezone set if defined.
$script_tz = @date_default_timezone_get(); $script_tz = @date_default_timezone_get();

5
pandora_console/include/functions_tags.php
View File

@ -756,10 +756,9 @@ function tags_get_acl_tags($id_user, $id_group, $access = 'AR', $return_mode = '
break; break;
case 'event_condition': case 'event_condition':
// Return the condition of the tags for tevento table // Return the condition of the tags for tevento table
$condition = "(".tags_get_acl_tags_event_condition($acltags).")"; $condition = tags_get_acl_tags_event_condition($acltags);
if(!empty($condition)) { if(!empty($condition)) {
return " $query_prefix ".$condition; return " $query_prefix "."(".$condition.")";
} }
break; break;
} }

BIN
pandora_console/include/languages/ja.mo
View File

Binary file not shown.

93
pandora_console/include/languages/ja.po
View File

@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: pandora-ja\n" "Project-Id-Version: pandora-ja\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-10-02 13:15+0200\n" "POT-Creation-Date: 2014-10-02 13:15+0200\n"
"PO-Revision-Date: 2014-10-02 09:00+0000\n" "PO-Revision-Date: 2014-10-08 10:58+0000\n"
"Last-Translator: Junichi Satoh <junichi@rworks.jp>\n" "Last-Translator: Junichi Satoh <junichi@rworks.jp>\n"
"Language-Team: Japanese <ja@li.org>\n" "Language-Team: Japanese <ja@li.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-10-02 11:35+0000\n" "X-Launchpad-Export-Date: 2014-10-08 11:45+0000\n"
"X-Generator: Launchpad (build 17196)\n" "X-Generator: Launchpad (build 17196)\n"
#: ../../godmode/menu.php:28 #: ../../godmode/menu.php:28
@ -4287,7 +4287,7 @@ msgstr "実行"
#: ../../godmode/agentes/planned_downtime.editor.php:334 #: ../../godmode/agentes/planned_downtime.editor.php:334
#: ../../godmode/agentes/planned_downtime.list.php:237 #: ../../godmode/agentes/planned_downtime.list.php:237
msgid "Once" msgid "Once"
msgstr "" msgstr "一回のみ"
#: ../../godmode/agentes/planned_downtime.editor.php:335 #: ../../godmode/agentes/planned_downtime.editor.php:335
#: ../../godmode/agentes/planned_downtime.list.php:237 #: ../../godmode/agentes/planned_downtime.list.php:237
@ -12914,11 +12914,11 @@ msgstr "メニューの固定"
#: ../../godmode/setup/setup_visuals.php:423 #: ../../godmode/setup/setup_visuals.php:423
#: ../../include/functions_config.php:451 #: ../../include/functions_config.php:451
msgid "Shortened module graph data" msgid "Shortened module graph data"
msgstr "" msgstr "短縮モジュールグラフデータ"
#: ../../godmode/setup/setup_visuals.php:424 #: ../../godmode/setup/setup_visuals.php:424
msgid "The data number of the module graphs will be rounded and shortened" msgid "The data number of the module graphs will be rounded and shortened"
msgstr "" msgstr "モジュールグラフのデータ数が四捨五入して短くなります"
#: ../../godmode/setup/setup_netflow.php:41 #: ../../godmode/setup/setup_netflow.php:41
#: ../../include/functions_config.php:511 #: ../../include/functions_config.php:511
@ -13989,6 +13989,8 @@ msgid ""
"\t\tIn simple mode only the elements configured as \"critical element\" are " "\t\tIn simple mode only the elements configured as \"critical element\" are "
"used to calculate the service status." "used to calculate the service status."
msgstr "" msgstr ""
"マニュアルモードではウエイトを手動で設定する必要があります。自動モードではウエイトはデフォルトの値があります。\n"
"\t\tシンプルモードでは、\"障害要素\"として設定したもののみがサービスの状態計算に利用されます。"
#: ../../enterprise/godmode/services/services.service.php:206 #: ../../enterprise/godmode/services/services.service.php:206
#: ../../include/ajax/events.php:475 #: ../../include/ajax/events.php:475
@ -18209,6 +18211,8 @@ msgid ""
"any group with that name, will be created if check box is selected. " "any group with that name, will be created if check box is selected. "
"Destination group filter is just used to check agents in that group" "Destination group filter is just used to check agents in that group"
msgstr "" msgstr ""
"移行先のグループは移行元サーバと同じになります。同じ名前のグループが無い場合、チェックボックスがチェックされていると作成されます。移行先のグループフィルタ"
"は、エージェントがグループにあるかどうかのみのチェックに利用されます。"
#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:151 #: ../../enterprise/meta/advanced/agents_setup.move_agents.php:151
msgid "Create group if doesn’t exist in destination" msgid "Create group if doesn’t exist in destination"
@ -18216,7 +18220,7 @@ msgstr "移行先にグループが無い場合に作成する"
#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:151 #: ../../enterprise/meta/advanced/agents_setup.move_agents.php:151
msgid "Based on name" msgid "Based on name"
msgstr "" msgstr "名前ベース"
#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:160 #: ../../enterprise/meta/advanced/agents_setup.move_agents.php:160
msgid "Add agents to destination server" msgid "Add agents to destination server"
@ -19557,7 +19561,7 @@ msgstr "PDF にエクスポート"
#: ../../enterprise/operation/reporting/custom_reporting.php:46 #: ../../enterprise/operation/reporting/custom_reporting.php:46
#: ../../enterprise/operation/reporting/custom_reporting.php:69 #: ../../enterprise/operation/reporting/custom_reporting.php:69
msgid "Send by email" msgid "Send by email"
msgstr "" msgstr "Eメールで送信"
#: ../../enterprise/operation/reporting/custom_reporting.php:54 #: ../../enterprise/operation/reporting/custom_reporting.php:54
msgid "ID Report" msgid "ID Report"
@ -19565,7 +19569,7 @@ msgstr "レポートID"
#: ../../enterprise/operation/reporting/custom_reporting.php:88 #: ../../enterprise/operation/reporting/custom_reporting.php:88
msgid "Send by email " msgid "Send by email "
msgstr "" msgstr "Eメールで送信 "
#: ../../enterprise/extensions/backup.php:57 #: ../../enterprise/extensions/backup.php:57
msgid "Backup" msgid "Backup"
@ -20074,7 +20078,7 @@ msgstr "0 を設定すると手動スキャンです"
#: ../../enterprise/extensions/ipam/ipam_editor.php:85 #: ../../enterprise/extensions/ipam/ipam_editor.php:85
msgid "Operator users" msgid "Operator users"
msgstr "" msgstr "オペレータユーザ"
#: ../../enterprise/extensions/ipam/ipam_editor.php:85 #: ../../enterprise/extensions/ipam/ipam_editor.php:85
msgid "" msgid ""
@ -20173,7 +20177,7 @@ msgstr "管理対象外"
#: ../../enterprise/extensions/ipam/ipam_network.php:224 #: ../../enterprise/extensions/ipam/ipam_network.php:224
msgid "Not Reserved" msgid "Not Reserved"
msgstr "" msgstr "未予約"
#: ../../enterprise/extensions/ipam/ipam_network.php:257 #: ../../enterprise/extensions/ipam/ipam_network.php:257
msgid "DESC" msgid "DESC"
@ -20234,7 +20238,7 @@ msgstr "予約済アドレス"
#: ../../enterprise/extensions/ipam/ipam_network.php:292 #: ../../enterprise/extensions/ipam/ipam_network.php:292
msgid "Unreserved" msgid "Unreserved"
msgstr "" msgstr "未予約"
#: ../../enterprise/extensions/ipam/ipam_network.php:317 #: ../../enterprise/extensions/ipam/ipam_network.php:317
msgid "Filter options" msgid "Filter options"
@ -22305,6 +22309,8 @@ msgid ""
"learn more about Pandora FMS. Monitoring could be overwhelm, but take your " "learn more about Pandora FMS. Monitoring could be overwhelm, but take your "
"time to learn how to use the power of Pandora FMS!" "time to learn how to use the power of Pandora FMS!"
msgstr "" msgstr ""
"初めての Pandora FMS の利用であれば、Pandora FMS "
"に関して学べるいくつかのリンクを紹介します。強力な監視ができますが、Pandora FMS の能力を使いこなすには時間が必要です。"
#: ../../general/login_help_dialog.php:51 #: ../../general/login_help_dialog.php:51
#: ../../general/login_help_dialog.php:53 #: ../../general/login_help_dialog.php:53
@ -22816,7 +22822,7 @@ msgstr "他のモジュール"
#: ../../operation/agentes/graphs.php:92 #: ../../operation/agentes/graphs.php:92
msgid "Modules network no proc" msgid "Modules network no proc"
msgstr "" msgstr "proc以外のネットワークモジュール"
#: ../../operation/agentes/graphs.php:132 #: ../../operation/agentes/graphs.php:132
#: ../../operation/agentes/stat_win.php:276 #: ../../operation/agentes/stat_win.php:276
@ -22843,19 +22849,19 @@ msgstr "アラート表示"
#: ../../operation/agentes/graphs.php:148 #: ../../operation/agentes/graphs.php:148
msgid "the combined graph does not show the alerts into this graph" msgid "the combined graph does not show the alerts into this graph"
msgstr "" msgstr "組み合わせグラフは、グラフ内にアラートを表示しません"
#: ../../operation/agentes/graphs.php:150 #: ../../operation/agentes/graphs.php:150
msgid "Show as one combined graph" msgid "Show as one combined graph"
msgstr "" msgstr "一つの組み合わせグラフとして表示"
#: ../../operation/agentes/graphs.php:152 #: ../../operation/agentes/graphs.php:152
msgid "one combined graph" msgid "one combined graph"
msgstr "" msgstr "一つの組み合わせグラフ"
#: ../../operation/agentes/graphs.php:155 #: ../../operation/agentes/graphs.php:155
msgid "several graphs for each module" msgid "several graphs for each module"
msgstr "" msgstr "モジュールごとの複数のグラフ"
#: ../../operation/agentes/graphs.php:166 #: ../../operation/agentes/graphs.php:166
msgid "Filter graphs" msgid "Filter graphs"
@ -22863,7 +22869,7 @@ msgstr "グラフフィルタ"
#: ../../operation/agentes/graphs.php:177 #: ../../operation/agentes/graphs.php:177
msgid "Combined graph" msgid "Combined graph"
msgstr "" msgstr "組み合わせグラフ"
#: ../../operation/agentes/graphs.php:191 #: ../../operation/agentes/graphs.php:191
msgid "Save as custom graph" msgid "Save as custom graph"
@ -22872,7 +22878,7 @@ msgstr "カスタムグラフとして保存"
#: ../../operation/agentes/graphs.php:225 #: ../../operation/agentes/graphs.php:225
#: ../../operation/agentes/graphs.php:228 #: ../../operation/agentes/graphs.php:228
msgid "Name custom graph" msgid "Name custom graph"
msgstr "" msgstr "カスタムグラフ名"
#: ../../operation/agentes/graphs.php:250 #: ../../operation/agentes/graphs.php:250
msgid "Save custom graph" msgid "Save custom graph"
@ -22880,7 +22886,7 @@ msgstr "カスタムグラフの保存"
#: ../../operation/agentes/graphs.php:271 #: ../../operation/agentes/graphs.php:271
msgid "Custom graph create from the tab graphs in the agent." msgid "Custom graph create from the tab graphs in the agent."
msgstr "" msgstr "エージェントのグラフタブからカスタムグラフを作成"
#: ../../operation/agentes/datos_agente.php:167 #: ../../operation/agentes/datos_agente.php:167
msgid "Received data from" msgid "Received data from"
@ -23981,7 +23987,7 @@ msgstr "トップ %d"
#: ../../operation/snmpconsole/snmp_statistics.php:121 #: ../../operation/snmpconsole/snmp_statistics.php:121
#: ../../operation/snmpconsole/snmp_statistics.php:179 #: ../../operation/snmpconsole/snmp_statistics.php:179
msgid "Number" msgid "Number"
msgstr "" msgstr "数"
#: ../../operation/snmpconsole/snmp_statistics.php:136 #: ../../operation/snmpconsole/snmp_statistics.php:136
#: ../../operation/snmpconsole/snmp_view.php:465 #: ../../operation/snmpconsole/snmp_view.php:465
@ -25039,7 +25045,7 @@ msgstr "グループ化"
#: ../../include/functions_reports.php:578 #: ../../include/functions_reports.php:578
#: ../../include/functions_reporting.php:7584 #: ../../include/functions_reporting.php:7584
msgid "Network interfaces" msgid "Network interfaces"
msgstr "" msgstr "ネットワークインタフェース"
#: ../../include/functions_reports.php:582 #: ../../include/functions_reports.php:582
#: ../../include/functions_reports.php:584 #: ../../include/functions_reports.php:584
@ -25590,31 +25596,31 @@ msgstr "不明エージェント数 %d"
#: ../../include/functions_reporting.php:7584 #: ../../include/functions_reporting.php:7584
#, php-format #, php-format
msgid "Group \"%s\"" msgid "Group \"%s\""
msgstr "" msgstr "グループ \"%s\""
#: ../../include/functions_reporting.php:7629 #: ../../include/functions_reporting.php:7629
#: ../../include/functions_reporting.php:7633 #: ../../include/functions_reporting.php:7633
msgid "" msgid ""
"The group has no agents or none of the agents has any network interface" "The group has no agents or none of the agents has any network interface"
msgstr "" msgstr "グループにエージェントが無いか、ネットワークインタフェースのあるエージェントがありません"
#: ../../include/functions_reporting.php:7646 #: ../../include/functions_reporting.php:7646
#, php-format #, php-format
msgid "Agent '%s'" msgid "Agent '%s'"
msgstr "" msgstr "エージェント '%s'"
#: ../../include/functions_reporting.php:7665 #: ../../include/functions_reporting.php:7665
#, php-format #, php-format
msgid "Interface '%s' throughput graph" msgid "Interface '%s' throughput graph"
msgstr "" msgstr "インタフェース '%s' スループットグラフ"
#: ../../include/functions_reporting.php:7667 #: ../../include/functions_reporting.php:7667
msgid "Mac" msgid "Mac"
msgstr "" msgstr "Mac"
#: ../../include/functions_reporting.php:7668 #: ../../include/functions_reporting.php:7668
msgid "Actual status" msgid "Actual status"
msgstr "" msgstr "現在の状態"
#: ../../include/help/clippy/operation_agentes_status_monitor.php:35 #: ../../include/help/clippy/operation_agentes_status_monitor.php:35
msgid "" msgid ""
@ -25642,11 +25648,11 @@ msgstr "ここでモジュールを編集するには、タイプカラムにあ
#: ../../include/help/clippy/extension_cron_send_email.php:39 #: ../../include/help/clippy/extension_cron_send_email.php:39
msgid "The configuration of email for the task email is in the file:" msgid "The configuration of email for the task email is in the file:"
msgstr "" msgstr "メール送信タスクのメール設定はこのファイルにあります:"
#: ../../include/help/clippy/extension_cron_send_email.php:41 #: ../../include/help/clippy/extension_cron_send_email.php:41
msgid "Please check if the email configuration is correct." msgid "Please check if the email configuration is correct."
msgstr "" msgstr "メール設定が正しいか確認してください。"
#: ../../include/help/clippy/godmode_agentes_modificar_agente.php:35 #: ../../include/help/clippy/godmode_agentes_modificar_agente.php:35
msgid "I'm going to show you how to monitor a server." msgid "I'm going to show you how to monitor a server."
@ -25690,7 +25696,7 @@ msgstr ""
msgid "" msgid ""
"Please note that you have your agent setup to do not add new modules coming " "Please note that you have your agent setup to do not add new modules coming "
"from the data XML." "from the data XML."
msgstr "" msgstr "エージェント設定で、XML で送られてくる新たなモジュールが追加されないようになっていることに注意してください。"
#: ../../include/help/clippy/modules_not_learning_mode.php:41 #: ../../include/help/clippy/modules_not_learning_mode.php:41
msgid "" msgid ""
@ -25699,12 +25705,14 @@ msgid ""
"manually in the interface (with the exact name and type as coming in the XML " "manually in the interface (with the exact name and type as coming in the XML "
"file)." "file)."
msgstr "" msgstr ""
"ローカルプラグインがあるかまたは、手動で新たなモジュールを設定ファイルに追加した場合は、インタフェースで手動作成するまでエージェントに反映されないというこ"
"とを意味します(正しい名前とタイプは XML で送られます)。"
#: ../../include/help/clippy/modules_not_learning_mode.php:42 #: ../../include/help/clippy/modules_not_learning_mode.php:42
msgid "" msgid ""
"You should use the \"normal\" mode (non learn) only when you don't intend to " "You should use the \"normal\" mode (non learn) only when you don't intend to "
"add more modules to the agent." "add more modules to the agent."
msgstr "" msgstr "エージェントにモジュールを追加したくない時のみ、\"通常\"モード(学習しない)を使います。"
#: ../../include/help/clippy/godmode_agentes_configurar_agente.php:35 #: ../../include/help/clippy/godmode_agentes_configurar_agente.php:35
msgid "Now you must go to Modules. Don't worry I'll lead you." msgid "Now you must go to Modules. Don't worry I'll lead you."
@ -27277,7 +27285,7 @@ msgstr "子の表示"
msgid "" msgid ""
"You can not delete the last group in Pandora. A common installation must has " "You can not delete the last group in Pandora. A common installation must has "
"almost one group." "almost one group."
msgstr "" msgstr "最後のグループは削除できません。通常、1つはグループが設定されていなければなりません。"
#: ../../include/functions_menu.php:400 #: ../../include/functions_menu.php:400
msgid "Configure user" msgid "Configure user"
@ -29046,24 +29054,3 @@ msgstr "時間 (ミリ秒)"
#~ msgid "Search text" #~ msgid "Search text"
#~ msgstr "検索文字列" #~ msgstr "検索文字列"
#, php-format
#~ msgid "%s - agents (%s) - %s"
#~ msgstr "%s - エージェント (%s) - %s"
#, php-format
#~ msgid "%s - %s"
#~ msgstr "%s - %s"
#~ msgid "Schedule report"
#~ msgstr "スケジュールレポート"
#~ msgid "Schedule report "
#~ msgstr "スケジュールレポート "
#~ msgid "Scheduled/Email"
#~ msgstr "スケジュール/メール"
#, php-format
#~ msgid "%s - agents (%s)"
#~ msgstr "%s - エージェント (%s)"

2
pandora_console/install.php
View File

@ -62,7 +62,7 @@
<body> <body>
<div style='height: 10px'> <div style='height: 10px'>
<?php <?php
$version = '5.1SP1'; $version = '5.1SP1RC1';
$build = '141008'; $build = '141008';
$banner = "v$version Build $build"; $banner = "v$version Build $build";

4
pandora_console/pandora_console.redhat.spec
View File

@ -2,8 +2,8 @@
# Pandora FMS Console # Pandora FMS Console
# #
%define name pandorafms_console %define name pandorafms_console
%define version 5.1SP1 %define version 5.1SP1RC1
%define release 141008 %define release 1
# User and Group under which Apache is running # User and Group under which Apache is running
%define httpd_name httpd %define httpd_name httpd

4
pandora_console/pandora_console.spec
View File

@ -2,8 +2,8 @@
# Pandora FMS Console # Pandora FMS Console
# #
%define name pandorafms_console %define name pandorafms_console
%define version 5.1SP1 %define version 5.1SP1RC1
%define release 141008 %define release 1
%define httpd_name httpd %define httpd_name httpd
# User and Group under which Apache is running # User and Group under which Apache is running
%define httpd_name apache2 %define httpd_name apache2

2
pandora_console/pandoradb_data.sql
View File

@ -37,7 +37,7 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES
('days_compact','0'), ('days_compact','0'),
('graph_res','5'), ('graph_res','5'),
('step_compact','1'), ('step_compact','1'),
('db_scheme_version','5.1SP1'), ('db_scheme_version','5.1SP1RC1'),
('db_scheme_build','PD141008'), ('db_scheme_build','PD141008'),
('show_unknown','0'), ('show_unknown','0'),
('show_lastalerts','1'), ('show_lastalerts','1'),

2
pandora_server/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-server package: pandorafms-server
Version: 5.1SP1-141008 Version: 5.1SP1RC1
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin 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 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
pandora_version="5.1SP1-141008" pandora_version="5.1SP1RC1"
package_cpan=0 package_cpan=0
package_pandora=1 package_pandora=1

2
pandora_server/conf/pandora_server.conf.new
View File

@ -1,7 +1,7 @@
############################################################################# #############################################################################
# Pandora FMS Server Parameters # Pandora FMS Server Parameters
# Pandora FMS, the Flexible Monitoring System. # Pandora FMS, the Flexible Monitoring System.
# Version 5.1SP1 # Version 5.1SP1RC1
# Licensed under GPL license v2, # Licensed under GPL license v2,
# (c) 2003-2014 Artica Soluciones Tecnologicas # (c) 2003-2014 Artica Soluciones Tecnologicas
# http://www.pandorafms.com # http://www.pandorafms.com

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

@ -42,7 +42,7 @@ our @EXPORT = qw(
); );
# version: Defines actual version of Pandora Server for this module only # version: Defines actual version of Pandora Server for this module only
my $pandora_version = "5.1SP1"; my $pandora_version = "5.1SP1RC1";
my $pandora_build = "141008"; my $pandora_build = "141008";
our $VERSION = $pandora_version." ".$pandora_build; our $VERSION = $pandora_version." ".$pandora_build;

4
pandora_server/pandora_server.redhat.spec
View File

@ -2,8 +2,8 @@
# Pandora FMS Server # Pandora FMS Server
# #
%define name pandorafms_server %define name pandorafms_server
%define version 5.1SP1 %define version 5.1SP1RC1
%define release 141008 %define release 1
Summary: Pandora FMS Server Summary: Pandora FMS Server
Name: %{name} Name: %{name}

4
pandora_server/pandora_server.spec
View File

@ -2,8 +2,8 @@
# Pandora FMS Server # Pandora FMS Server
# #
%define name pandorafms_server %define name pandorafms_server
%define version 5.1SP1 %define version 5.1SP1RC1
%define release 141008 %define release 1
Summary: Pandora FMS Server Summary: Pandora FMS Server
Name: %{name} Name: %{name}

2
pandora_server/util/pandora_db.pl
View File

@ -33,7 +33,7 @@ use PandoraFMS::Tools;
use PandoraFMS::DB; use PandoraFMS::DB;
# version: define current version # version: define current version
my $version = "5.1SP1 PS141008"; my $version = "5.1SP1RC1 PS141008";
# Pandora server configuration # Pandora server configuration
my %conf; my %conf;

2
pandora_server/util/pandora_manage.pl
View File

@ -34,7 +34,7 @@ use Encode::Locale;
Encode::Locale::decode_argv; Encode::Locale::decode_argv;
# version: define current version # version: define current version
my $version = "5.1SP1 PS141008"; my $version = "5.1SP1RC1 PS141008";
# save program name for logging # save program name for logging
my $progname = basename($0); my $progname = basename($0);