Merge remote-tracking branch 'origin/develop' into feature/meta-agent-cache
This commit is contained in:
Alejandro Gallardo Escobar
commit
8a348c2411
|
|
@ -1,5 +1,5 @@
|
|||
package: pandorafms-agent-unix
|
||||
Version: 6.0dev-150417
|
||||
Version: 6.0dev-150423
|
||||
Architecture: all
|
||||
Priority: optional
|
||||
Section: admin
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
|
||||
pandora_version="6.0dev-150417"
|
||||
pandora_version="6.0dev-150423"
|
||||
|
||||
echo "Test if you has the tools for to make the packages."
|
||||
whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ my $Sem = undef;
|
|||
my $ThreadSem = undef;
|
||||
|
||||
use constant AGENT_VERSION => '6.0dev';
|
||||
use constant AGENT_BUILD => '150417';
|
||||
use constant AGENT_BUILD => '150423';
|
||||
|
||||
# Commands to retrieve total memory information in kB
|
||||
use constant TOTALMEMORY_CMDS => {
|
||||
|
|
@ -754,8 +754,31 @@ sub read_config (;$) {
|
|||
$RemoteConfFile = "$AgentMD5.conf";
|
||||
$RemoteMD5File = "$AgentMD5.md5";
|
||||
|
||||
# Set the maximun number of threads
|
||||
$ThreadSem = Thread::Semaphore->new ($Conf{'agent_threads'}) if defined ($Sem);
|
||||
# Load thread support if agent_threads is greater than 1.
|
||||
if ($Conf{'agent_threads'} > 1) {
|
||||
eval {
|
||||
local $SIG{__DIE__};
|
||||
require threads;
|
||||
require threads::shared;
|
||||
require Thread::Semaphore;
|
||||
};
|
||||
if (!$@) {
|
||||
$Sem = Thread::Semaphore->new;
|
||||
$ThreadSem = Thread::Semaphore->new ($Conf{'agent_threads'});
|
||||
threads::shared::share (\$Xml);
|
||||
threads::shared::share (\$Sem);
|
||||
log_message ('log', 'Using thread library.');
|
||||
} else {
|
||||
log_message ('log', 'Thread library is not available. agent_threads is set to 1 (disabled).');
|
||||
$Conf{'agent_threads'} = 1;
|
||||
$Sem = undef;
|
||||
$ThreadSem = undef;
|
||||
}
|
||||
} else {
|
||||
$Sem = undef;
|
||||
$ThreadSem = undef;
|
||||
log_message ('log', 'Thread is disabled.');
|
||||
}
|
||||
|
||||
# Set tentacle client options
|
||||
if ($Conf{'transfer_mode'} eq 'tentacle') {
|
||||
|
|
@ -1205,7 +1228,7 @@ sub guess_os_version ($) {
|
|||
################################################################################
|
||||
sub exec_module ($) {
|
||||
my $module = shift;
|
||||
|
||||
print "THREAD " . threads->tid() . " EXECUTING MODULE " . $module->{'name'} . "\n";
|
||||
# Need something to execute
|
||||
if ($module->{'func'} == 0) {
|
||||
$ThreadSem->up () if (defined ($ThreadSem) && $Conf{'agent_threads'} > 1);
|
||||
|
|
@ -2064,27 +2087,6 @@ error ("Temporal directory '" . $Conf{'temporal'} . "' does not exist.") unless
|
|||
$Conf{'server_path'} = fix_directory ($Conf{'server_path'});
|
||||
$Conf{'secondary_server_path'} = fix_directory ($Conf{'secondary_server_path'});
|
||||
|
||||
# Load thread support if agent_threads is greater than 1.
|
||||
if ($Conf{'agent_threads'} > 1) {
|
||||
eval {
|
||||
local $SIG{__DIE__};
|
||||
require threads;
|
||||
require threads::shared;
|
||||
require Thread::Semaphore;
|
||||
};
|
||||
if (!$@) {
|
||||
$Sem = Thread::Semaphore->new;
|
||||
threads::shared::share (\$Xml);
|
||||
threads::shared::share (\$Sem);
|
||||
log_message ('log', 'Using thread library.');
|
||||
} else {
|
||||
log_message ('log', 'Thread library is not available. agent_threads is set to 1 (disabled).');
|
||||
$Conf{'agent_threads'} = 1;
|
||||
}
|
||||
} else {
|
||||
log_message ('log', 'Thread is disabled.');
|
||||
}
|
||||
|
||||
# Startup delay
|
||||
log_message ('log', 'Sleeping for ' . $Conf{'delayed_startup'} . ' seconds.') if ($Conf{'delayed_startup'} > 0);
|
||||
sleep ($Conf{'delayed_startup'});
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#
|
||||
%define name pandorafms_agent_unix
|
||||
%define version 6.0dev
|
||||
%define release 150417
|
||||
%define release 150423
|
||||
|
||||
Summary: Pandora FMS Linux agent, PERL version
|
||||
Name: %{name}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#
|
||||
%define name pandorafms_agent_unix
|
||||
%define version 6.0dev
|
||||
%define release 150417
|
||||
%define release 150423
|
||||
|
||||
Summary: Pandora FMS Linux agent, PERL version
|
||||
Name: %{name}
|
||||
|
|
|
|||
|
|
@ -47,9 +47,9 @@ pidof_pandora () {
|
|||
fi
|
||||
if [ "$ZONE" = "global" ]
|
||||
then
|
||||
PANDORA_PID=`ps -f -z global | grep "$TRUNCATED_DAEMON" | grep -v grep | head -1 | awk '{ print $2 }'`
|
||||
PANDORA_PID=`ps -f -z global | grep "$TRUNCATED_DAEMON" | grep -v grep | awk '{ print $2 }'`
|
||||
else
|
||||
PANDORA_PID=`ps -Af | grep "$TRUNCATED_DAEMON" | grep -v grep | head -1 | awk '{ print $2 }'`
|
||||
PANDORA_PID=`ps -Af | grep "$TRUNCATED_DAEMON" | grep -v grep | awk '{ print $2 }'`
|
||||
fi
|
||||
elif [ "$OS_NAME" = "Linux" ] && [ -x /usr/sbin/vzpid ]
|
||||
then
|
||||
|
|
@ -66,7 +66,7 @@ pidof_pandora () {
|
|||
fi
|
||||
done
|
||||
else
|
||||
PANDORA_PID=`ps -Af | grep "$DAEMON $PANDORA_PATH" | grep -v grep | head -1 | awk '{ print $2 }'`
|
||||
PANDORA_PID=`ps -Af | grep "$DAEMON $PANDORA_PATH" | grep -v grep | awk '{ print $2 }'`
|
||||
fi
|
||||
|
||||
echo $PANDORA_PID
|
||||
|
|
@ -90,7 +90,14 @@ case "$1" in
|
|||
su $PANDORA_USER -c "PATH=$PATH nohup $DAEMON $PANDORA_PATH >/dev/null 2>$LOGFILE &"
|
||||
sleep 2
|
||||
PANDORA_PID=`pidof_pandora`
|
||||
echo "Pandora FMS Agent is now running with PID $PANDORA_PID"
|
||||
if [ "$PANDORA_PID" = "" ]
|
||||
then
|
||||
|
||||
echo "Pandora FMS Agent could not be started. Please check the file $LOGFILE."
|
||||
exit 1
|
||||
else
|
||||
echo "Pandora FMS Agent is now running with PID $PANDORA_PID"
|
||||
fi
|
||||
;;
|
||||
|
||||
stop)
|
||||
|
|
|
|||
|
|
@ -186,7 +186,7 @@ UpgradeApplicationID
|
|||
{}
|
||||
|
||||
Version
|
||||
{150417}
|
||||
{150423}
|
||||
|
||||
ViewReadme
|
||||
{Yes}
|
||||
|
|
|
|||
|
|
@ -392,16 +392,16 @@ Pandora_Module_Logevent::getLogEvents (list<string> &event_list, unsigned char d
|
|||
event << "]";
|
||||
}
|
||||
|
||||
|
||||
// Remove carriage returns and new lines in between the description.
|
||||
output = "";
|
||||
for (size_t i = 0; i < description.size(); i++) {
|
||||
if (description[i] != '\n' && description[i] != '\r') {
|
||||
output += description[i];
|
||||
}
|
||||
}
|
||||
output += '\n';
|
||||
|
||||
|
||||
// Remove carriage returns and new lines in between the description.
|
||||
output = "";
|
||||
for (size_t i = 0; i < description.size(); i++) {
|
||||
if (description[i] != '\n' && description[i] != '\r') {
|
||||
output += description[i];
|
||||
}
|
||||
}
|
||||
output += '\n';
|
||||
|
||||
// Print the event description
|
||||
event << " ";
|
||||
event << output;
|
||||
|
|
@ -508,7 +508,7 @@ Pandora_Module_Logevent::getEventDescription (PEVENTLOGRECORD pevlr, char *messa
|
|||
exe_file_path_end = ((char *) exe_file_path) + _MAX_PATH * sizeof (TCHAR);
|
||||
|
||||
while (1) {
|
||||
// Load the DLL
|
||||
// Load the DLL
|
||||
module = LoadLibraryEx (dll_start, 0, flags);
|
||||
if(module == NULL) {
|
||||
pandoraDebug("LoadLibraryEx error %d. Exe file path %s.", GetLastError(), exe_file_path);
|
||||
|
|
@ -572,7 +572,7 @@ Pandora_Module_Logevent::getEventDescriptionXPATH (PEVENTLOGRECORD pevlr) {
|
|||
}
|
||||
|
||||
// Build the XPATH query
|
||||
query = "Event/System[EventID=" + inttostr(pevlr->EventID & EVENT_ID_MASK) + "]";
|
||||
query = "Event/System[EventRecordID=" + inttostr(pevlr->RecordNumber) + "]";
|
||||
pwsQuery = strAnsiToUnicode (query.c_str());
|
||||
pwsPath = strAnsiToUnicode (this->source.c_str());
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ using namespace Pandora;
|
|||
using namespace Pandora_Strutils;
|
||||
|
||||
#define PATH_SIZE _MAX_PATH+1
|
||||
#define PANDORA_VERSION ("6.0dev(Build 150417)")
|
||||
#define PANDORA_VERSION ("6.0dev(Build 150423)")
|
||||
|
||||
string pandora_path;
|
||||
string pandora_dir;
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ BEGIN
|
|||
VALUE "LegalCopyright", "Artica ST"
|
||||
VALUE "OriginalFilename", "PandoraAgent.exe"
|
||||
VALUE "ProductName", "Pandora FMS Windows Agent"
|
||||
VALUE "ProductVersion", "(6.0dev(Build 150417))"
|
||||
VALUE "ProductVersion", "(6.0dev(Build 150423))"
|
||||
VALUE "FileVersion", "1.0.0.0"
|
||||
END
|
||||
END
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
package: pandorafms-console
|
||||
Version: 6.0dev-150417
|
||||
Version: 6.0dev-150423
|
||||
Architecture: all
|
||||
Priority: optional
|
||||
Section: admin
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
|
||||
pandora_version="6.0dev-150417"
|
||||
pandora_version="6.0dev-150423"
|
||||
|
||||
package_pear=0
|
||||
package_pandora=1
|
||||
|
|
|
|||
|
|
@ -138,7 +138,7 @@ function mainAgentsModules() {
|
|||
}
|
||||
$count++;
|
||||
}
|
||||
|
||||
$total_pagination = count($agents);
|
||||
$all_modules = agents_get_modules($agents, false, $filter_module_group, true, false);
|
||||
|
||||
$modules_by_name = array();
|
||||
|
|
@ -242,13 +242,12 @@ function mainAgentsModules() {
|
|||
|
||||
echo "</tr>";
|
||||
|
||||
$filter_agents = array('offset' => (int) $offset,
|
||||
'limit' => (int) $config['block_size'], 'disabled' => 0);
|
||||
$filter_agents = array('offset' => (int) $offset, 'disabled' => 0);
|
||||
if ($group_id > 0) {
|
||||
$filter_agents['id_grupo'] = $group_id;
|
||||
}
|
||||
// Prepare pagination
|
||||
ui_pagination ((int)count(agents_get_agents ($filter_agents)));
|
||||
ui_pagination ($total_pagination);
|
||||
|
||||
foreach ($agents as $agent) {
|
||||
// Get stats for this group
|
||||
|
|
|
|||
|
|
@ -127,7 +127,10 @@ if ($get_module_detail) {
|
|||
'style="margin-right: 15px;"', true) . __("Choose a time from now");
|
||||
$formtable->data[0][1] = html_print_select ($periods, 'period', $period, '', '', 0, true, false, false);
|
||||
$formtable->data[0][2] = '';
|
||||
$formtable->data[0][3] = "<a href='javascript: show_module_detail_dialog(" . $module_id .", ". $agentId.", \"" . $server_name . "\", 0, -1)'>". html_print_image ("images/refresh.png", true, array ("style" => 'vertical-align: middle;', "border" => "0" )) . "</a>";
|
||||
$formtable->data[0][3] = "<a href='javascript: show_module_detail_dialog(" . $module_id .", ". $agentId.", \"" . $server_name .
|
||||
"\", 0, -1,\"" . modules_get_agentmodule_name( $module_id ) . "\")'>" .
|
||||
html_print_image ("images/refresh.png", true, array ("style" => 'vertical-align: middle;', "border" => "0" )) .
|
||||
"</a>";
|
||||
$formtable->rowspan[0][3] = 2;
|
||||
$formtable->cellstyle[0][3] = 'vertical-align: middle;';
|
||||
|
||||
|
|
@ -1012,7 +1015,7 @@ if ($list_modules) {
|
|||
$id_agente . ", " .
|
||||
"\"" . $server_name . "\", " .
|
||||
0 . ", " .
|
||||
SECONDS_1DAY . ")'>". html_print_image ("images/binary.png", true, array ("border" => "0", "alt" => "")) . "</a>";
|
||||
SECONDS_1DAY . ", \" " . modules_get_agentmodule_name( $module["id_agente_modulo"] ) . "\")'>". html_print_image ("images/binary.png", true, array ("border" => "0", "alt" => "")) . "</a>";
|
||||
}
|
||||
|
||||
if ($module['estado'] == 3) {
|
||||
|
|
|
|||
|
|
@ -1385,7 +1385,7 @@ class Tree {
|
|||
"type" => $graphType,
|
||||
"period" => SECONDS_1DAY,
|
||||
"id" => $module['id'],
|
||||
"label" => rawurlencode(urlencode(base64_encode($module['name']))),
|
||||
"label" => base64_encode($module['name']),
|
||||
"refresh" => SECONDS_10MINUTES
|
||||
);
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
/**
|
||||
* Pandora build version and version
|
||||
*/
|
||||
$build_version = 'PC150417';
|
||||
$build_version = 'PC150423';
|
||||
$pandora_version = 'v6.0dev';
|
||||
|
||||
// Do not overwrite default timezone set if defined.
|
||||
|
|
|
|||
|
|
@ -181,14 +181,26 @@ function mysql_db_get_row ($table, $field_search, $condition, $fields = false) {
|
|||
* @return mixed A matrix with all the values in the table
|
||||
*/
|
||||
function mysql_db_get_all_rows_in_table($table, $order_field = "", $order = 'ASC') {
|
||||
if ($order_field != "") {
|
||||
return db_get_all_rows_sql ("SELECT *
|
||||
FROM `".$table."`
|
||||
ORDER BY ".$order_field . " " . $order);
|
||||
}
|
||||
else {
|
||||
return db_get_all_rows_sql ("SELECT * FROM `".$table."`");
|
||||
$sql = "
|
||||
SELECT *
|
||||
FROM `".$table."`";
|
||||
|
||||
if (!empty($order_field)) {
|
||||
if (is_array($order_field)) {
|
||||
foreach ($order_field as $i => $o) {
|
||||
$order_field[$i] = $o . " " . $order;
|
||||
}
|
||||
$sql .= "
|
||||
ORDER BY " . implode(",", $order_field);
|
||||
}
|
||||
else {
|
||||
$sql .= "
|
||||
ORDER BY ".$order_field . " " . $order;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
return db_get_all_rows_sql($sql);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -14,3 +14,6 @@ value1,tag1;value2,tag2;value3,tag3
|
|||
例:
|
||||
<br><br>
|
||||
1,Number one;2,Number two;3,Number three;4,Number four
|
||||
|
||||
<br><br>
|
||||
<i>_html_editor_</i>という値を設定することにより、HTML エディタとしてフィールドを設定することもできます。
|
||||
|
|
|
|||
|
|
@ -8,3 +8,73 @@
|
|||
|
||||
<p>Pandora FMS は、複数のエージェントグループで複数のユーザが異なる権限で作業できるウェブ管理ツールです。ユーザのパーミッションは、プロファイルで定義できます。</p>
|
||||
|
||||
<p>以下にコンソールでそれぞれの ACL でどのような権限があるかの一覧を示します。</p>
|
||||
|
||||
<table cellpadding=4 cellspacing=0 style='background-color: #f0f0f0;'>
|
||||
<tr><th style='background-color: #cacaca'>機能<th style='background-color: #cacaca'>ACL
|
||||
|
||||
<tr><td>エージェントデータ参照 (全てのタブ)<td>AR
|
||||
<tr><td>概要表示<td>AR
|
||||
<tr><td>グループ表示<td>AR
|
||||
<tr><td>ビジュアルコンソール編集<td>RW
|
||||
<tr><td>レポート作成<td>RW
|
||||
<tr><td>ユーザ定義グラフ作成<td>RW
|
||||
<tr><td>レポート、ビジュアルマップおよび、カスタムグラフ表示<td>RR
|
||||
<tr><td>レポートテンプレートの適用<td>RR
|
||||
<tr><td>レポートテンプレート作成<td>RM
|
||||
<tr><td>インシデント作成<td>IW
|
||||
<tr><td>インシデント参照<td>IR
|
||||
<tr><td>インシデント削除<td>IW
|
||||
<tr><td>他のユーザのインシデントの所有者になる<td>IM
|
||||
<tr><td>他のユーザのインシデント削除<td>IM
|
||||
<tr><td>イベント参照<td>ER
|
||||
<tr><td>イベントの承諾とコメント<td>EW
|
||||
<tr><td>イベント削除<td>EM
|
||||
<tr><td>応答の実行<td>EW
|
||||
<tr><td>イベントからインシデントを作成 (応答)<td>EW&IW
|
||||
<tr><td>応答管理<td>PM
|
||||
<tr><td>フィルタ管理<td>EW
|
||||
<tr><td>イベントカラムのカスタマイズ<td>PM
|
||||
<tr><td>イベントの所有者変更 / 再オープン<td>EM
|
||||
<tr><td>ユーザ参照<td>AR
|
||||
<tr><td>SNMP コンソール参照<td>AR
|
||||
<tr><td>トラップの承諾<td>IW
|
||||
<tr><td>メッセージ<td>IW
|
||||
<tr><td>Cron ジョブ<td>PM
|
||||
<tr><td>ツリー表示<td>AR
|
||||
<tr><td>アップデートマネージャ (操作と管理) <td>PM
|
||||
<tr><td>拡張モジュールグループ<td>AR
|
||||
<tr><td>エージェント管理<td>AW
|
||||
<tr><td>リモートエージェント設定管理 <td>AW
|
||||
<tr><td>エージェントへのアラート割り当て<td>LW
|
||||
<tr><td>アラートテンプレート、アラート、コマンドの定義、アラート設定、削除<td>LM
|
||||
<tr><td>グループ管理<td>PM
|
||||
<tr><td>インベントリモジュール作成<td>PM
|
||||
<tr><td>モジュール管理 (全てのサブオプションを含む)<td>PM
|
||||
<tr><td>一括操作管理<td>AW
|
||||
<tr><td>エージェント作成<td>AW
|
||||
<tr><td>リモート設定の複製<td>AW
|
||||
<tr><td>計画停止管理<td>AW
|
||||
<tr><td>アラート管理<td>LW
|
||||
<tr><td>ユーザ管理<td>UM
|
||||
<tr><td>SNMP コンソール管理 (アラートと MIB ロード)<td>PM
|
||||
<tr><td>プロファイル管理<td>PM
|
||||
<tr><td>サーバ管理<td>PM
|
||||
<tr><td>システム監査<td>PM
|
||||
<tr><td>設定<td>PM
|
||||
<tr><td>データベースメンテナンス<td>DM
|
||||
<tr><td>管理拡張メニュー<td>PM
|
||||
<tr><td>検索バー<td>AR
|
||||
<tr><td>ポリシー管理<td>AW
|
||||
<tr><td>エージェント / モジュール / アラートの無効化<td>AD
|
||||
<tr><td>アラートの承諾<td>LM&AR または AW&LW
|
||||
<tr><td>ネットワークマップ表示<td>MR
|
||||
<tr><td>ネットワークマップ編集<td>MW
|
||||
<tr><td>自分のネットワークマップ削除<td>MW
|
||||
<tr><td>任意のネットワークマップ削除<td>MM
|
||||
<tr><td>ビジュアルコンソール表示<td>VR
|
||||
<tr><td>ビジュアルコンソール編集<td>VW
|
||||
<tr><td>自分のビジュアルコンソール削除<td>VW
|
||||
<tr><td>任意のビジュアルコンソール削除<td>VM
|
||||
|
||||
</table>
|
||||
|
|
|
|||
|
|
@ -390,7 +390,7 @@ TreeController = {
|
|||
try {
|
||||
var serverName = element.serverName.length > 0 ? element.serverName : '';
|
||||
if ($("#module_details_window").length > 0)
|
||||
show_module_detail_dialog(element.id, '', serverName, 0, 86400);
|
||||
show_module_detail_dialog(element.id, '', serverName, 0, 86400, element.name.replace(/ /g , " ") );
|
||||
}
|
||||
catch (error) {
|
||||
// console.log(error);
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -10,14 +10,14 @@ msgstr ""
|
|||
"Project-Id-Version: index.es\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2015-04-15 11:14+0200\n"
|
||||
"PO-Revision-Date: 2015-04-15 09:49+0000\n"
|
||||
"Last-Translator: Vanessa <vanessa.gil@artica.es>\n"
|
||||
"PO-Revision-Date: 2015-04-16 12:38+0000\n"
|
||||
"Last-Translator: Carlos Moreno <carlos.moreno@artica.es>\n"
|
||||
"Language-Team: Español; Castellano <>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2015-04-15 09:56+0000\n"
|
||||
"X-Generator: Launchpad (build 17428)\n"
|
||||
"X-Launchpad-Export-Date: 2015-04-20 12:08+0000\n"
|
||||
"X-Generator: Launchpad (build 17430)\n"
|
||||
"Language: \n"
|
||||
|
||||
#: ../../general/links_menu.php:20 ../../godmode/menu.php:242
|
||||
|
|
@ -6894,27 +6894,27 @@ msgstr "Gestión de informes"
|
|||
|
||||
#: ../../godmode/users/profile_list.php:321
|
||||
msgid "Network maps reading"
|
||||
msgstr ""
|
||||
msgstr "Lectura de mapas de red"
|
||||
|
||||
#: ../../godmode/users/profile_list.php:322
|
||||
msgid "Network maps writing"
|
||||
msgstr ""
|
||||
msgstr "Escritura de mapas de red"
|
||||
|
||||
#: ../../godmode/users/profile_list.php:323
|
||||
msgid "Network maps management"
|
||||
msgstr ""
|
||||
msgstr "Gestión de mapas de red"
|
||||
|
||||
#: ../../godmode/users/profile_list.php:324
|
||||
msgid "Visual console reading"
|
||||
msgstr ""
|
||||
msgstr "Lectura de consola visual"
|
||||
|
||||
#: ../../godmode/users/profile_list.php:325
|
||||
msgid "Visual console writing"
|
||||
msgstr ""
|
||||
msgstr "Escritura de consola visual"
|
||||
|
||||
#: ../../godmode/users/profile_list.php:326
|
||||
msgid "Visual console management"
|
||||
msgstr ""
|
||||
msgstr "Gestión de consola visual"
|
||||
|
||||
#: ../../godmode/users/profile_list.php:327
|
||||
#: ../../enterprise/extensions/check_acls.php:60
|
||||
|
|
@ -6996,7 +6996,7 @@ msgstr "Gestionar usuarios"
|
|||
|
||||
#: ../../godmode/users/configure_profile.php:291
|
||||
msgid "Manage database"
|
||||
msgstr ""
|
||||
msgstr "Gestión de la base de datos"
|
||||
|
||||
#: ../../godmode/users/configure_profile.php:297 ../../operation/menu.php:264
|
||||
#: ../../enterprise/godmode/reporting/graph_template_editor.php:217
|
||||
|
|
@ -7024,15 +7024,15 @@ msgstr "Gestionar informes"
|
|||
|
||||
#: ../../godmode/users/configure_profile.php:325
|
||||
msgid "View network maps"
|
||||
msgstr ""
|
||||
msgstr "Ver mapas de red"
|
||||
|
||||
#: ../../godmode/users/configure_profile.php:329
|
||||
msgid "Edit network maps"
|
||||
msgstr ""
|
||||
msgstr "Editar mapas de red"
|
||||
|
||||
#: ../../godmode/users/configure_profile.php:333
|
||||
msgid "Manage network maps"
|
||||
msgstr ""
|
||||
msgstr "Gestionar mapas de red"
|
||||
|
||||
#: ../../godmode/users/configure_profile.php:339
|
||||
#: ../../include/functions_menu.php:443
|
||||
|
|
@ -7041,7 +7041,7 @@ msgstr "Ver consola visual"
|
|||
|
||||
#: ../../godmode/users/configure_profile.php:343
|
||||
msgid "Edit visual console"
|
||||
msgstr ""
|
||||
msgstr "Editar consola visual"
|
||||
|
||||
#: ../../godmode/users/configure_profile.php:347
|
||||
#: ../../include/functions_menu.php:471
|
||||
|
|
@ -7230,6 +7230,8 @@ msgid ""
|
|||
"Strict ACL is not recommended for admin users because performance could be "
|
||||
"affected."
|
||||
msgstr ""
|
||||
"ACL Estricto no está recomendado para usuarios admin porque el rendimiento "
|
||||
"podría verse afectado."
|
||||
|
||||
#: ../../godmode/users/configure_user.php:300
|
||||
#: ../../godmode/users/configure_user.php:310
|
||||
|
|
@ -7257,6 +7259,8 @@ msgstr "Las contraseñas no coinciden"
|
|||
msgid ""
|
||||
"Strict ACL is not recommended for this user. Performance could be affected."
|
||||
msgstr ""
|
||||
"ACL Estricto no está recomendado para este usuario. El rendimiento podría "
|
||||
"verse afectado"
|
||||
|
||||
#: ../../godmode/users/configure_user.php:395
|
||||
msgid "Profile added successfully"
|
||||
|
|
@ -9199,7 +9203,7 @@ msgstr "Ninguna categoría encontrada"
|
|||
|
||||
#: ../../godmode/menu.php:28
|
||||
msgid "Resources"
|
||||
msgstr ""
|
||||
msgstr "Recursos"
|
||||
|
||||
#: ../../godmode/menu.php:34
|
||||
#: ../../enterprise/meta/monitoring/wizard/wizard.main.php:200
|
||||
|
|
@ -9339,7 +9343,7 @@ msgstr "Configuración"
|
|||
|
||||
#: ../../godmode/menu.php:193 ../../godmode/menu.php:196
|
||||
msgid "General Setup"
|
||||
msgstr ""
|
||||
msgstr "Configuracion general"
|
||||
|
||||
#: ../../godmode/menu.php:204 ../../godmode/setup/setup.php:81
|
||||
#: ../../godmode/setup/setup.php:111
|
||||
|
|
@ -9384,7 +9388,7 @@ msgstr "Licencia"
|
|||
|
||||
#: ../../godmode/menu.php:235
|
||||
msgid "Admin tools"
|
||||
msgstr ""
|
||||
msgstr "Herramientas administrativas"
|
||||
|
||||
#: ../../godmode/menu.php:241
|
||||
msgid "System audit log"
|
||||
|
|
@ -10000,7 +10004,7 @@ msgstr "La fecha de fin debe ser mayor que la fecha de inicio"
|
|||
|
||||
#: ../../godmode/agentes/planned_downtime.editor.php:163
|
||||
msgid "The end date must be higher than the current time"
|
||||
msgstr ""
|
||||
msgstr "La fecha fin debería ser posterior a la fecha actual"
|
||||
|
||||
#: ../../godmode/agentes/planned_downtime.editor.php:168
|
||||
#: ../../godmode/agentes/planned_downtime.editor.php:438
|
||||
|
|
@ -16347,7 +16351,7 @@ msgstr ""
|
|||
|
||||
#: ../../operation/users/user_edit.php:674
|
||||
msgid "Deactivate"
|
||||
msgstr ""
|
||||
msgstr "Desactivado"
|
||||
|
||||
#: ../../operation/users/user_edit.php:706
|
||||
msgid "The double autentication was deactivated successfully"
|
||||
|
|
@ -16541,7 +16545,7 @@ msgstr "Monitorización"
|
|||
|
||||
#: ../../operation/menu.php:37
|
||||
msgid "Views"
|
||||
msgstr ""
|
||||
msgstr "Vistas"
|
||||
|
||||
#: ../../operation/menu.php:50 ../../operation/tree.php:87
|
||||
#: ../../enterprise/meta/general/main_header.php:82
|
||||
|
|
@ -16583,7 +16587,7 @@ msgstr "Generador de traps SNMP"
|
|||
|
||||
#: ../../operation/menu.php:105
|
||||
msgid "Topology maps"
|
||||
msgstr ""
|
||||
msgstr "Mapas topológicos"
|
||||
|
||||
#: ../../operation/menu.php:114
|
||||
#: ../../operation/agentes/networkmap.groups.php:132
|
||||
|
|
@ -16639,7 +16643,7 @@ msgstr "Mensaje nuevo"
|
|||
|
||||
#: ../../operation/menu.php:369
|
||||
msgid "Tools"
|
||||
msgstr ""
|
||||
msgstr "Herramientas"
|
||||
|
||||
#: ../../operation/menu.php:375 ../../operation/agentes/exportdata.php:36
|
||||
msgid "Export data"
|
||||
|
|
@ -16752,23 +16756,23 @@ msgstr "Filtro de control de eventos"
|
|||
|
||||
#: ../../operation/events/events_list.php:675
|
||||
msgid "Error creating filter."
|
||||
msgstr ""
|
||||
msgstr "Error creando filtro."
|
||||
|
||||
#: ../../operation/events/events_list.php:676
|
||||
msgid "Error creating filter is duplicated."
|
||||
msgstr ""
|
||||
msgstr "Error creando filtro al estar duplicado."
|
||||
|
||||
#: ../../operation/events/events_list.php:677
|
||||
msgid "Filter created."
|
||||
msgstr ""
|
||||
msgstr "Filtro creado."
|
||||
|
||||
#: ../../operation/events/events_list.php:679
|
||||
msgid "Filter updated."
|
||||
msgstr ""
|
||||
msgstr "Filtro actualizado."
|
||||
|
||||
#: ../../operation/events/events_list.php:680
|
||||
msgid "Error updating filter."
|
||||
msgstr ""
|
||||
msgstr "Error actualizando filtro."
|
||||
|
||||
#: ../../operation/events/events_list.php:990
|
||||
msgid "Filter name cannot be left blank"
|
||||
|
|
@ -17108,7 +17112,7 @@ msgstr "Políticas"
|
|||
#: ../../operation/tree.php:88
|
||||
#, php-format
|
||||
msgid "Sort the agents by %s"
|
||||
msgstr ""
|
||||
msgstr "Ordenar los agentes por %s"
|
||||
|
||||
#: ../../operation/tree.php:91
|
||||
msgid "tags"
|
||||
|
|
@ -17148,7 +17152,7 @@ msgstr "Buscar módulo"
|
|||
|
||||
#: ../../operation/tree.php:193
|
||||
msgid "Tree search"
|
||||
msgstr ""
|
||||
msgstr "Búsqueda de árbol"
|
||||
|
||||
#: ../../operation/tree.php:281
|
||||
#: ../../enterprise/include/functions_reporting_csv.php:775
|
||||
|
|
@ -17310,7 +17314,7 @@ msgstr "Gestionar"
|
|||
|
||||
#: ../../operation/agentes/ver_agente.php:887
|
||||
msgid "Log Viewer"
|
||||
msgstr ""
|
||||
msgstr "Visor de sucesos"
|
||||
|
||||
#: ../../operation/agentes/ver_agente.php:979
|
||||
#: ../../enterprise/include/functions_reporting_pdf.php:4092
|
||||
|
|
@ -17322,7 +17326,7 @@ msgstr "Últimos datos"
|
|||
#: ../../operation/agentes/interface_traffic_graph_win.php:48
|
||||
#: ../../operation/agentes/stat_win.php:44
|
||||
msgid "There was a problem connecting with the node"
|
||||
msgstr ""
|
||||
msgstr "Hubo un problema conectando con el nodo"
|
||||
|
||||
#: ../../operation/agentes/interface_traffic_graph_win.php:66
|
||||
msgid "In"
|
||||
|
|
@ -17641,7 +17645,7 @@ msgstr "No se pudo guardar el mapa de red"
|
|||
|
||||
#: ../../operation/agentes/networkmap.php:249
|
||||
msgid "There was an error loading the network map"
|
||||
msgstr ""
|
||||
msgstr "Hubo un error cargando el mapa de red"
|
||||
|
||||
#: ../../operation/agentes/networkmap.php:301
|
||||
#: ../../operation/snmpconsole/snmp_view.php:74
|
||||
|
|
@ -17924,7 +17928,7 @@ msgstr "Refrescar datos"
|
|||
|
||||
#: ../../operation/agentes/tactical.php:175
|
||||
msgid "Report of State"
|
||||
msgstr ""
|
||||
msgstr "Informe de Estado"
|
||||
|
||||
#: ../../operation/agentes/tactical.php:233
|
||||
#: ../../include/functions_events.php:864
|
||||
|
|
@ -18441,7 +18445,7 @@ msgstr ""
|
|||
|
||||
#: ../../index.php:228 ../../enterprise/meta/index.php:247
|
||||
msgid "The code shouldn't be empty"
|
||||
msgstr ""
|
||||
msgstr "El código no debería estar vacío"
|
||||
|
||||
#: ../../index.php:240 ../../enterprise/meta/index.php:259
|
||||
msgid "Expired login"
|
||||
|
|
@ -19188,11 +19192,11 @@ msgstr "Borrado masivo de políticas de alertas"
|
|||
|
||||
#: ../../enterprise/godmode/massive/massive_operations.php:80
|
||||
msgid "Masive tags module policy edition"
|
||||
msgstr ""
|
||||
msgstr "Edición masiva de de módulos por política"
|
||||
|
||||
#: ../../enterprise/godmode/massive/massive_operations.php:81
|
||||
msgid "Masive modules policy tags edition"
|
||||
msgstr ""
|
||||
msgstr "Edición masiva de etiquetas por política"
|
||||
|
||||
#: ../../enterprise/godmode/massive/massive_operations.php:89
|
||||
msgid "Massive alert SNMP deletion"
|
||||
|
|
@ -19226,11 +19230,11 @@ msgstr "Etiquetas usadas"
|
|||
|
||||
#: ../../enterprise/godmode/massive/massive_tags_edit_policy.php:101
|
||||
msgid "Modules unused"
|
||||
msgstr ""
|
||||
msgstr "Módulos sin usar"
|
||||
|
||||
#: ../../enterprise/godmode/massive/massive_tags_edit_policy.php:117
|
||||
msgid "Modules used"
|
||||
msgstr ""
|
||||
msgstr "Módulos usados"
|
||||
|
||||
#: ../../enterprise/godmode/massive/massive_delete_alerts_snmp.php:165
|
||||
#: ../../enterprise/godmode/massive/massive_modify_alerts_snmp.php:216
|
||||
|
|
@ -19552,7 +19556,7 @@ msgstr "Colector de Logs"
|
|||
|
||||
#: ../../enterprise/godmode/menu.php:118
|
||||
msgid "Password policy"
|
||||
msgstr ""
|
||||
msgstr "Política de contraseñas"
|
||||
|
||||
#: ../../enterprise/godmode/agentes/collection_manager.php:37
|
||||
#: ../../enterprise/operation/agentes/collection_view.php:47
|
||||
|
|
@ -21640,7 +21644,7 @@ msgstr "Fecha de inicio"
|
|||
|
||||
#: ../../enterprise/operation/log/log_viewer.php:334
|
||||
msgid "The start date cannot be greater than the end date"
|
||||
msgstr ""
|
||||
msgstr "La fecha de inicio no puede ser posterior a la fecha fin"
|
||||
|
||||
#: ../../enterprise/operation/inventory/inventory.php:262
|
||||
msgid "Export this list to CSV"
|
||||
|
|
@ -21747,7 +21751,7 @@ msgstr "Error al procesar mapa"
|
|||
|
||||
#: ../../enterprise/operation/agentes/agent_inventory.php:56
|
||||
msgid "This agent has not modules inventory"
|
||||
msgstr ""
|
||||
msgstr "Este agente no tiene módulos de inventario"
|
||||
|
||||
#: ../../enterprise/operation/agentes/agent_inventory.php:159
|
||||
#: ../../enterprise/operation/agentes/agent_inventory.php:160
|
||||
|
|
@ -22090,7 +22094,7 @@ msgstr "Vista de grupo"
|
|||
|
||||
#: ../../enterprise/meta/monitoring/group_view.php:74
|
||||
msgid "Summary by status"
|
||||
msgstr ""
|
||||
msgstr "Resumen por estado"
|
||||
|
||||
#: ../../enterprise/meta/monitoring/group_view.php:78
|
||||
msgid "% Monitors Critical"
|
||||
|
|
@ -22106,7 +22110,7 @@ msgstr "% Monitores Ok"
|
|||
|
||||
#: ../../enterprise/meta/monitoring/group_view.php:81
|
||||
msgid "% Agents Unknown"
|
||||
msgstr ""
|
||||
msgstr "% Agentes Desconocidos"
|
||||
|
||||
#: ../../enterprise/meta/monitoring/group_view.php:101
|
||||
msgid "Group or Tag"
|
||||
|
|
@ -23002,7 +23006,7 @@ msgstr ""
|
|||
|
||||
#: ../../enterprise/meta/include/functions_wizard_meta.php:2475
|
||||
msgid "Module successfully added."
|
||||
msgstr ""
|
||||
msgstr "Módulo añadido con éxito."
|
||||
|
||||
#: ../../enterprise/meta/include/functions_wizard_meta.php:2547
|
||||
#: ../../enterprise/meta/include/functions_wizard_meta.php:2636
|
||||
|
|
@ -23047,7 +23051,7 @@ msgstr "Guardar en grupo"
|
|||
|
||||
#: ../../enterprise/meta/include/functions_networkmap_meta.php:512
|
||||
msgid "Filter by tag"
|
||||
msgstr "Filtrar por tag"
|
||||
msgstr "Filtrar por etiqueta"
|
||||
|
||||
#: ../../enterprise/meta/include/functions_networkmap_meta.php:518
|
||||
msgid "Filter by agents"
|
||||
|
|
@ -25554,7 +25558,7 @@ msgstr ""
|
|||
|
||||
#: ../../enterprise/extensions/check_acls.php:197
|
||||
msgid "Only admin users can see this section."
|
||||
msgstr ""
|
||||
msgstr "Solo los usuarios administradores pueden ver esta sección."
|
||||
|
||||
#: ../../enterprise/extensions/check_acls.php:201
|
||||
msgid "Check ACL"
|
||||
|
|
@ -27596,7 +27600,7 @@ msgstr "Borrar elemento"
|
|||
|
||||
#: ../../include/functions_visual_map_editor.php:556
|
||||
msgid "Copy item"
|
||||
msgstr ""
|
||||
msgstr "Copiar elemento"
|
||||
|
||||
#: ../../include/functions_visual_map_editor.php:584
|
||||
msgid "No image or name defined."
|
||||
|
|
@ -27735,7 +27739,7 @@ msgstr "Respuesta personalizada"
|
|||
|
||||
#: ../../include/functions_events.php:1931
|
||||
msgid "There was an error connecting to the node"
|
||||
msgstr ""
|
||||
msgstr "Hubo un error conectando al nodo"
|
||||
|
||||
#: ../../include/functions_events.php:1970
|
||||
msgid "Agent details"
|
||||
|
|
@ -28774,7 +28778,7 @@ msgstr "%d Agentes desconocidos"
|
|||
#: ../../include/functions_reporting.php:7853
|
||||
#, php-format
|
||||
msgid "%d not init agents"
|
||||
msgstr ""
|
||||
msgstr "%d agentes no iniciados"
|
||||
|
||||
#: ../../include/functions_reporting.php:7975
|
||||
#, php-format
|
||||
|
|
@ -30291,11 +30295,11 @@ msgstr "Configuración BD"
|
|||
|
||||
#: ../../extensions/db_status.php:67
|
||||
msgid "DB User with privileges"
|
||||
msgstr ""
|
||||
msgstr "Usuario de BD con privilegios"
|
||||
|
||||
#: ../../extensions/db_status.php:69
|
||||
msgid "DB Password for this user"
|
||||
msgstr ""
|
||||
msgstr "Password BD para este usuario"
|
||||
|
||||
#: ../../extensions/db_status.php:73
|
||||
msgid "DB Hostname"
|
||||
|
|
@ -31646,9 +31650,6 @@ msgstr "Logs sistema"
|
|||
#~ msgid "No items defined"
|
||||
#~ msgstr "No se han definido elementos"
|
||||
|
||||
#~ msgid "Agent unknown"
|
||||
#~ msgstr "Agente desconocido"
|
||||
|
||||
#~ msgid ""
|
||||
#~ "Red cell when the module group and agent have at least one module in "
|
||||
#~ "critical state and the others in any state."
|
||||
|
|
@ -31679,27 +31680,9 @@ msgstr "Logs sistema"
|
|||
#~ msgid "hour"
|
||||
#~ msgstr "hora"
|
||||
|
||||
#~ msgid "There are no defined maps in this view"
|
||||
#~ msgstr "No hay mapas definidos en esta vista"
|
||||
|
||||
#~ msgid "Add map"
|
||||
#~ msgstr "Añadir mapa"
|
||||
|
||||
#~ msgid "No selected"
|
||||
#~ msgstr "No seleccionado"
|
||||
|
||||
#~ msgid "Manage custom fields"
|
||||
#~ msgstr "Gestionar campos personalizados"
|
||||
|
||||
#~ msgid "Manage recon script"
|
||||
#~ msgstr "Gestionar script recon"
|
||||
|
||||
#~ msgid "Manage SNMP console"
|
||||
#~ msgstr "Consola SNMP"
|
||||
|
||||
#~ msgid "Manage tags"
|
||||
#~ msgstr "Gestionar etiquetas"
|
||||
|
||||
#~ msgid ""
|
||||
#~ "Pandora FMS Sanity tool is used to remove bad database structure data, "
|
||||
#~ "created modules with missing status, or modules that cannot be initialized "
|
||||
|
|
@ -31721,26 +31704,5 @@ msgstr "Logs sistema"
|
|||
#~ msgid "This server has no recon tasks assigned"
|
||||
#~ msgstr "Este servidor no tiene ninguna tarea de reconocimiento asignada"
|
||||
|
||||
#~ msgid "Manage monitoring"
|
||||
#~ msgstr "Gestionar la monitorización"
|
||||
|
||||
#~ msgid "ACL Setup"
|
||||
#~ msgstr "Configuración de ACL"
|
||||
|
||||
#~ msgid "Dictionary"
|
||||
#~ msgstr "Diccionario"
|
||||
|
||||
#~ msgid "Configuration could not be saved"
|
||||
#~ msgstr "La configuración no se puede guardar"
|
||||
|
||||
#~ msgid "Configuration saved"
|
||||
#~ msgstr "Configuración guardada"
|
||||
|
||||
#~ msgid "Manage plugins"
|
||||
#~ msgstr "Gestionar plugins"
|
||||
|
||||
#~ msgid "Network View"
|
||||
#~ msgstr "Vista de red"
|
||||
|
||||
#~ msgid "Manage categories"
|
||||
#~ msgstr "Gestionar categorías"
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@
|
|||
<div style='height: 10px'>
|
||||
<?php
|
||||
$version = '6.0dev';
|
||||
$build = '150417';
|
||||
$build = '150423';
|
||||
$banner = "v$version Build $build";
|
||||
|
||||
error_reporting(0);
|
||||
|
|
@ -538,6 +538,7 @@ function install_step2() {
|
|||
$res += check_extension("mbstring","PHP Multibyte String");
|
||||
$res += check_extension("zip","PHP Zip");
|
||||
$res += check_extension("zlib","PHP Zlib extension");
|
||||
$res += check_extension("json","PHP json extension");
|
||||
$res += check_extension("curl","CURL (Client URL Library)");
|
||||
if (PHP_OS == "FreeBSD") {
|
||||
$res += check_exists ("/usr/local/bin/twopi","Graphviz Binary");
|
||||
|
|
|
|||
|
|
@ -331,7 +331,7 @@ ui_require_jquery_file("ui.datepicker-" . get_user_language(), "include/javascri
|
|||
});
|
||||
|
||||
// Show the modal window of an module
|
||||
function show_module_detail_dialog(module_id, id_agent, server_name, offset, period) {
|
||||
function show_module_detail_dialog(module_id, id_agent, server_name, offset, period,module_name) {
|
||||
|
||||
var server_name = '';
|
||||
var extra_parameters = '';
|
||||
|
|
@ -347,7 +347,7 @@ ui_require_jquery_file("ui.datepicker-" . get_user_language(), "include/javascri
|
|||
|
||||
extra_parameters = '&selection_mode=' + selection_mode + '&date_from=' + date_from + '&date_to=' + date_to + '&time_from=' + time_from + '&time_to=' + time_to;
|
||||
}
|
||||
|
||||
title = <?php echo "\"" . __("Module: ") . "\"" ?>;
|
||||
$.ajax({
|
||||
type: "POST",
|
||||
url: "<?php echo ui_get_full_url('ajax.php', false, false, false); ?>",
|
||||
|
|
@ -361,6 +361,7 @@ ui_require_jquery_file("ui.datepicker-" . get_user_language(), "include/javascri
|
|||
resizable: true,
|
||||
draggable: true,
|
||||
modal: true,
|
||||
title: title + module_name,
|
||||
overlay: {
|
||||
opacity: 0.5,
|
||||
background: "black"
|
||||
|
|
@ -369,7 +370,7 @@ ui_require_jquery_file("ui.datepicker-" . get_user_language(), "include/javascri
|
|||
height: 500
|
||||
})
|
||||
.show ();
|
||||
refresh_pagination_callback (module_id, id_agent, "");
|
||||
refresh_pagination_callback (module_id, id_agent, "",module_name);
|
||||
datetime_picker_callback();
|
||||
forced_title_callback();
|
||||
}
|
||||
|
|
@ -394,7 +395,7 @@ ui_require_jquery_file("ui.datepicker-" . get_user_language(), "include/javascri
|
|||
}
|
||||
datetime_picker_callback();
|
||||
|
||||
function refresh_pagination_callback (module_id, id_agent, server_name) {
|
||||
function refresh_pagination_callback (module_id, id_agent, server_name,module_name) {
|
||||
$(".binary_dialog").click( function() {
|
||||
|
||||
var classes = $(this).attr('class');
|
||||
|
|
@ -405,7 +406,7 @@ ui_require_jquery_file("ui.datepicker-" . get_user_language(), "include/javascri
|
|||
|
||||
var period = $('#period').val();
|
||||
|
||||
show_module_detail_dialog(module_id, id_agent, server_name, offset, period);
|
||||
show_module_detail_dialog(module_id, id_agent, server_name, offset, period,module_name);
|
||||
return false;
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
if (! isset($_SESSION['id_usuario'])) {
|
||||
session_start();
|
||||
session_write_close();
|
||||
//session_write_close();
|
||||
}
|
||||
|
||||
// Global & session management
|
||||
|
|
@ -55,7 +55,8 @@ if (file_exists ('../../include/languages/'.$user_language.'.mo')) {
|
|||
}
|
||||
|
||||
echo '<link rel="stylesheet" href="../../include/styles/pandora.css" type="text/css"/>';
|
||||
$label = str_replace('%3D', '=', get_parameter('label', ''));
|
||||
|
||||
$label = get_parameter('label');
|
||||
$label = base64_decode($label);
|
||||
$id = get_parameter('id');
|
||||
//$label = rawurldecode(urldecode(base64_decode(get_parameter('label', ''))));
|
||||
|
|
|
|||
|
|
@ -654,22 +654,6 @@ switch ($sortField) {
|
|||
break;
|
||||
}
|
||||
break;
|
||||
case 'data':
|
||||
switch ($sort) {
|
||||
case 'up':
|
||||
$selectDataUp = $selected;
|
||||
$order = array(
|
||||
'field' => 'tagente_estado.datos',
|
||||
'order' => 'ASC');
|
||||
break;
|
||||
case 'down':
|
||||
$selectDataDown = $selected;
|
||||
$order = array(
|
||||
'field' => 'tagente_estado.datos',
|
||||
'order' => 'DESC');
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case 'timestamp':
|
||||
switch ($sort) {
|
||||
case 'up':
|
||||
|
|
@ -933,6 +917,7 @@ if(defined('METACONSOLE')){
|
|||
$table->width = "100%";
|
||||
$table->cellpadding = '0';
|
||||
$table->cellspacing = '0';
|
||||
$table->class = "databox";
|
||||
}
|
||||
$table->head = array ();
|
||||
$table->data = array ();
|
||||
|
|
@ -989,11 +974,6 @@ $table->head[8] = __('Warn');
|
|||
$table->align[8] = "left";
|
||||
|
||||
$table->head[9] = __('Data');
|
||||
if (! defined ('METACONSOLE')) {
|
||||
$table->head[9] .= ' <a href="index.php?sec=estado&sec2=operation/agentes/status_monitor&refr=' . $refr . '&offset=' . $offset . '&ag_group=' . $ag_group . '&ag_freestring=' . $ag_freestring . '&ag_modulename=' . $ag_modulename . '&status=' . $status . $ag_custom_fields_params . '&sort_field=data&sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectDataUp, "alt" => "up")) . '</a>' .
|
||||
'<a href="index.php?sec=estado&sec2=operation/agentes/status_monitor&refr=' . $refr . '&modulegroup='.$modulegroup . '&offset=' . $offset . '&ag_group=' . $ag_group . '&ag_freestring=' . $ag_freestring . '&ag_modulename=' . $ag_modulename . '&status=' . $status . $ag_custom_fields_params . '&sort_field=data&sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectDataDown, "alt" => "down")) . '</a>';
|
||||
}
|
||||
|
||||
$table->align[9] = "left";
|
||||
|
||||
$table->head[10] = __('Timestamp');
|
||||
|
|
@ -1224,7 +1204,7 @@ foreach ($result as $row) {
|
|||
"type" => $graph_type,
|
||||
"period" => SECONDS_1DAY,
|
||||
"id" => $row["id_agente_modulo"],
|
||||
"label" => rawurlencode(urlencode(base64_encode($row["module_name"]))),
|
||||
"label" => base64_encode($row["module_name"]),
|
||||
"refresh" => SECONDS_10MINUTES
|
||||
);
|
||||
|
||||
|
|
@ -1244,7 +1224,7 @@ foreach ($result as $row) {
|
|||
"show_module_detail_dialog(" .
|
||||
$row["id_agente_modulo"] . ", ".
|
||||
$row['id_agent'] . ", \"" .
|
||||
$row['server_name'] . "\", 0, " . SECONDS_1DAY . ")'>" .
|
||||
$row['server_name'] . "\", 0, " . SECONDS_1DAY . ', "' . $row["module_name"] . "\")'>" .
|
||||
html_print_image ("images/binary.png", true,
|
||||
array ("border" => "0", "alt" => "")) . "</a>";
|
||||
|
||||
|
|
@ -1409,7 +1389,7 @@ ui_require_javascript_file('pandora_modules');
|
|||
}
|
||||
|
||||
// Show the modal window of an module
|
||||
function show_module_detail_dialog(module_id, id_agent, server_name, offset, period) {
|
||||
function show_module_detail_dialog(module_id, id_agent, server_name, offset, period, module_name) {
|
||||
if (period == -1) {
|
||||
if ($("#period").length == 1) {
|
||||
period = $('#period').val();
|
||||
|
|
@ -1418,8 +1398,7 @@ ui_require_javascript_file('pandora_modules');
|
|||
period = <?php echo SECONDS_1DAY; ?>;
|
||||
}
|
||||
}
|
||||
valor = $("hidden_name_module_"+module_id);
|
||||
console.log(valor);
|
||||
title = <?php echo "\"" . __("Module: ") . "\"" ?>;
|
||||
$.ajax({
|
||||
type: "POST",
|
||||
url: "<?php echo ui_get_full_url('ajax.php', false, false, false); ?>",
|
||||
|
|
@ -1433,6 +1412,7 @@ ui_require_javascript_file('pandora_modules');
|
|||
resizable: true,
|
||||
draggable: true,
|
||||
modal: true,
|
||||
title: title + module_name,
|
||||
overlay: {
|
||||
opacity: 0.5,
|
||||
background: "black"
|
||||
|
|
@ -1442,12 +1422,12 @@ ui_require_javascript_file('pandora_modules');
|
|||
})
|
||||
.show ();
|
||||
|
||||
refresh_pagination_callback (module_id, id_agent, server_name);
|
||||
refresh_pagination_callback (module_id, id_agent, server_name,module_name);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
function refresh_pagination_callback (module_id, id_agent, server_name) {
|
||||
function refresh_pagination_callback (module_id, id_agent, server_name,module_name) {
|
||||
|
||||
$(".binary_dialog").click( function() {
|
||||
var classes = $(this).attr('class');
|
||||
|
|
@ -1458,7 +1438,7 @@ ui_require_javascript_file('pandora_modules');
|
|||
|
||||
var period = $('#period').val();
|
||||
|
||||
show_module_detail_dialog(module_id, id_agent, server_name, offset, period);
|
||||
show_module_detail_dialog(module_id, id_agent, server_name, offset, period,module_name);
|
||||
|
||||
return false;
|
||||
});
|
||||
|
|
|
|||
|
|
@ -265,6 +265,7 @@ enterprise_hook('close_meta_frame');
|
|||
recipient: $("div#tree-controller-recipient"),
|
||||
detailRecipient: $("div#tree-controller-detail-recipient"),
|
||||
page: parameters['page'],
|
||||
emptyMessage: "<?php echo __('No data found'); ?>",
|
||||
tree: data.tree,
|
||||
baseURL: "<?php echo ui_get_full_url(false, false, false, defined('METACONSOLE')); ?>",
|
||||
ajaxURL: "<?php echo ui_get_full_url('ajax.php', false, false, false); ?>",
|
||||
|
|
@ -320,7 +321,7 @@ enterprise_hook('close_meta_frame');
|
|||
.prop("id", "module_details_window")
|
||||
.appendTo('body');
|
||||
|
||||
function show_module_detail_dialog(module_id, id_agent, server_name, offset, period) {
|
||||
function show_module_detail_dialog(module_id, id_agent, server_name, offset, period, module_name) {
|
||||
var params = {};
|
||||
var f = new Date();
|
||||
period = $('#period').val();
|
||||
|
|
@ -343,7 +344,7 @@ enterprise_hook('close_meta_frame');
|
|||
params.id_module = module_id;
|
||||
params.offset = offset;
|
||||
params.period = period;
|
||||
|
||||
title = <?php echo "'" . __("Module: ") . "'" ?> ;
|
||||
$.ajax({
|
||||
type: "POST",
|
||||
url: "<?php echo ui_get_full_url('ajax.php', false, false, false); ?>",
|
||||
|
|
@ -357,6 +358,7 @@ enterprise_hook('close_meta_frame');
|
|||
resizable: true,
|
||||
draggable: true,
|
||||
modal: true,
|
||||
title: title + module_name,
|
||||
overlay: {
|
||||
opacity: 0.5,
|
||||
background: "black"
|
||||
|
|
@ -365,7 +367,7 @@ enterprise_hook('close_meta_frame');
|
|||
height: 500
|
||||
})
|
||||
.show ();
|
||||
refresh_pagination_callback(module_id, id_agent, server_name);
|
||||
refresh_pagination_callback(module_id, id_agent, server_name, module_name);
|
||||
datetime_picker_callback();
|
||||
forced_title_callback();
|
||||
}
|
||||
|
|
@ -389,7 +391,7 @@ enterprise_hook('close_meta_frame');
|
|||
|
||||
}
|
||||
|
||||
function refresh_pagination_callback (module_id, id_agent, server_name) {
|
||||
function refresh_pagination_callback (module_id, id_agent, server_name,module_name) {
|
||||
|
||||
$(".binary_dialog").click( function() {
|
||||
|
||||
|
|
@ -401,7 +403,7 @@ enterprise_hook('close_meta_frame');
|
|||
|
||||
var period = $('#period').val();
|
||||
|
||||
show_module_detail_dialog(module_id, id_agent, server_name, offset, period);
|
||||
show_module_detail_dialog(module_id, id_agent, server_name, offset, period,module_name);
|
||||
return false;
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#
|
||||
%define name pandorafms_console
|
||||
%define version 6.0dev
|
||||
%define release 150417
|
||||
%define release 150423
|
||||
|
||||
# User and Group under which Apache is running
|
||||
%define httpd_name httpd
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#
|
||||
%define name pandorafms_console
|
||||
%define version 6.0dev
|
||||
%define release 150417
|
||||
%define release 150423
|
||||
%define httpd_name httpd
|
||||
# User and Group under which Apache is running
|
||||
%define httpd_name apache2
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES
|
|||
('graph_res','5'),
|
||||
('step_compact','1'),
|
||||
('db_scheme_version','6.0dev'),
|
||||
('db_scheme_build','PD150417'),
|
||||
('db_scheme_build','PD150423'),
|
||||
('show_unknown','0'),
|
||||
('show_lastalerts','1'),
|
||||
('style','pandora'),
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
package: pandorafms-server
|
||||
Version: 6.0dev-150417
|
||||
Version: 6.0dev-150423
|
||||
Architecture: all
|
||||
Priority: optional
|
||||
Section: admin
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
|
||||
pandora_version="6.0dev-150417"
|
||||
pandora_version="6.0dev-150423"
|
||||
|
||||
package_cpan=0
|
||||
package_pandora=1
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ our @EXPORT = qw(
|
|||
|
||||
# version: Defines actual version of Pandora Server for this module only
|
||||
my $pandora_version = "6.0dev";
|
||||
my $pandora_build = "150417";
|
||||
my $pandora_build = "150423";
|
||||
our $VERSION = $pandora_version." ".$pandora_build;
|
||||
|
||||
# Setup hash
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#
|
||||
%define name pandorafms_server
|
||||
%define version 6.0dev
|
||||
%define release 150417
|
||||
%define release 150423
|
||||
|
||||
Summary: Pandora FMS Server
|
||||
Name: %{name}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#
|
||||
%define name pandorafms_server
|
||||
%define version 6.0dev
|
||||
%define release 150417
|
||||
%define release 150423
|
||||
|
||||
Summary: Pandora FMS Server
|
||||
Name: %{name}
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ use PandoraFMS::Tools;
|
|||
use PandoraFMS::DB;
|
||||
|
||||
# version: define current version
|
||||
my $version = "6.0dev PS150417";
|
||||
my $version = "6.0dev PS150423";
|
||||
|
||||
# Pandora server configuration
|
||||
my %conf;
|
||||
|
|
@ -99,6 +99,9 @@ sub pandora_purgedb ($$) {
|
|||
|
||||
# Delete old export data
|
||||
pandora_delete_old_export_data ($dbh, $ulimit_timestamp);
|
||||
|
||||
# Delete sessions data
|
||||
pandora_delete_old_session_data ($dbh, $ulimit_timestamp);
|
||||
|
||||
# Delete old inventory data
|
||||
if (enterprise_load (\%conf) != 0) {
|
||||
|
|
@ -949,6 +952,18 @@ sub pandora_delete_old_export_data {
|
|||
};
|
||||
}
|
||||
|
||||
##############################################################################
|
||||
# Delete old session data.
|
||||
##############################################################################
|
||||
sub pandora_delete_old_session_data {
|
||||
my ($dbh, $ulimit_timestamp) = @_;
|
||||
|
||||
log_message ('PURGE', "Deleting old session data from tsessions_php\n");
|
||||
while(db_do ($dbh, "DELETE FROM tsessions_php WHERE last_active < ? LIMIT $SMALL_OPERATION_STEP", $ulimit_timestamp) ne '0E0') {
|
||||
usleep (10000);
|
||||
};
|
||||
}
|
||||
|
||||
###############################################################################
|
||||
# Main
|
||||
###############################################################################
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ use Encode::Locale;
|
|||
Encode::Locale::decode_argv;
|
||||
|
||||
# version: define current version
|
||||
my $version = "6.0dev PS150417";
|
||||
my $version = "6.0dev PS150423";
|
||||
|
||||
# save program name for logging
|
||||
my $progname = basename($0);
|
||||
|
|
|
|||
Loading…
Reference in New Issue