From 87ebc49dc9e25431192da18a2c6e834bde698a28 Mon Sep 17 00:00:00 2001 From: m-lopez-f <miguel.lopez@artica.es> Date: Tue, 3 Feb 2015 15:43:44 +0100 Subject: [PATCH 1/3] Changed location of servers down clippy --- pandora_console/general/header.php | 40 +++++++++---------- .../godmode/servers/servers.build_table.php | 9 ++++- 2 files changed, 26 insertions(+), 23 deletions(-) diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php index b8062771c1..3ee9ad6e55 100644 --- a/pandora_console/general/header.php +++ b/pandora_console/general/header.php @@ -27,7 +27,7 @@ $_SESSION["alert_msg"] = ""; // Global errors/warnings checking. config_check(); -$login = get_parameter('login', 0); + ?> <table width="100%" cellpadding="0" cellspacing="0" style="margin:0px; padding:0px; margin-top: 0px; height: 100%" border="0"> <tr> @@ -82,9 +82,6 @@ $login = get_parameter('login', 0); $servers["up"] = (int) servers_check_status (); $servers["down"] = $servers["all"] - $servers["up"]; if ($servers["up"] == 0) { - if (!$login){ - $server_clippy = clippy_context_help("servers_down"); - } //All Servers down or no servers at all $servers_check_img = html_print_image("images/header_down.png", true, array("alt" => 'cross', "class" => 'bot', 'title' => __('All systems').': '.__('Down'))); } @@ -235,40 +232,39 @@ $login = get_parameter('login', 0); } $table->data[0][3] = $maintenance_img; - $table->data[0][4] = $server_clippy; // Main help icon - $table->data[0][5] = ui_print_help_icon ("main_help", true, '', 'images/header_help.png'); + $table->data[0][4] = ui_print_help_icon ("main_help", true, '', 'images/header_help.png'); // Logout - $table->data[0][6] = '<a class="white" href="' . ui_get_full_url('index.php?bye=bye') . '">'; - $table->data[0][6] .= html_print_image("images/header_logout.png", true, array("alt" => __('Logout'), "class" => 'bot', "title" => __('Logout'))); - $table->data[0][6] .= '</a>'; + $table->data[0][5] = '<a class="white" href="' . ui_get_full_url('index.php?bye=bye') . '">'; + $table->data[0][5] .= html_print_image("images/header_logout.png", true, array("alt" => __('Logout'), "class" => 'bot', "title" => __('Logout'))); + $table->data[0][5] .= '</a>'; // User if (is_user_admin ($config["id_user"]) == 1) - $table->data[0][7] = html_print_image("images/header_user_admin.png" , true, array("title" => __('Edit my user'), "class" => 'bot', "alt" => 'user')); + $table->data[0][6] = html_print_image("images/header_user_admin.png" , true, array("title" => __('Edit my user'), "class" => 'bot', "alt" => 'user')); else - $table->data[0][7] = html_print_image("images/header_user.png" , true, array("title" => __('Edit my user'), "class" => 'bot', "alt" => 'user')); + $table->data[0][6] = html_print_image("images/header_user.png" , true, array("title" => __('Edit my user'), "class" => 'bot', "alt" => 'user')); - $table->data[0][7] = '<a href="index.php?sec=workspace&sec2=operation/users/user_edit">' . $table->data[0][7] . '</a>'; + $table->data[0][6] = '<a href="index.php?sec=workspace&sec2=operation/users/user_edit">' . $table->data[0][7] . '</a>'; - $table->data[0][8] = '<a href="index.php?sec=workspace&sec2=operation/users/user_edit" class="white_bold"> (' . $config["id_user"] . ')</a>'; + $table->data[0][7] = '<a href="index.php?sec=workspace&sec2=operation/users/user_edit" class="white_bold"> (' . $config["id_user"] . ')</a>'; // Chat messages - $table->data[0][9] = "<span id='icon_new_messages_chat' style='display: none;'>"; - $table->data[0][9] .= "<a href='index.php?sec=workspace&sec2=operation/users/webchat'>"; - $table->data[0][9] .= html_print_image('images/header_chat.png', true, array("title" => __('New chat message'))); - $table->data[0][9] .= "</a>"; - $table->data[0][9] .= "</span>"; + $table->data[0][8] = "<span id='icon_new_messages_chat' style='display: none;'>"; + $table->data[0][8] .= "<a href='index.php?sec=workspace&sec2=operation/users/webchat'>"; + $table->data[0][8] .= html_print_image('images/header_chat.png', true, array("title" => __('New chat message'))); + $table->data[0][8] .= "</a>"; + $table->data[0][8] .= "</span>"; // Messages $msg_cnt = messages_get_count ($config["id_user"]); if ($msg_cnt > 0) { echo '<div id="dialog_messages" style="display: none"></div>'; - $table->data[0][10] = '<a href="ajax.php?page=operation/messages/message_list" title="' . __("Message overview") . '" id="show_messages_dialog">'; - $table->data[0][10] .= html_print_image ("images/header_email.png", true, array ("title" => __('You have %d unread message(s)', $msg_cnt), "id" => "yougotmail", "class" => "bot", 'style' => 'width:24px;')); - $table->data[0][10] .= '</a>'; + $table->data[0][9] = '<a href="ajax.php?page=operation/messages/message_list" title="' . __("Message overview") . '" id="show_messages_dialog">'; + $table->data[0][9] .= html_print_image ("images/header_email.png", true, array ("title" => __('You have %d unread message(s)', $msg_cnt), "id" => "yougotmail", "class" => "bot", 'style' => 'width:24px;')); + $table->data[0][9] .= '</a>'; } @@ -304,7 +300,7 @@ $login = get_parameter('login', 0); $table->data[0]['searchbar'] = $search_bar; - $table->data[0][12] = ui_print_help_tip (__("Blank characters are used as AND conditions"), true); + $table->data[0][11] = ui_print_help_tip (__("Blank characters are used as AND conditions"), true); html_print_table($table); diff --git a/pandora_console/godmode/servers/servers.build_table.php b/pandora_console/godmode/servers/servers.build_table.php index 78a6da3621..c2f3274361 100644 --- a/pandora_console/godmode/servers/servers.build_table.php +++ b/pandora_console/godmode/servers/servers.build_table.php @@ -14,6 +14,9 @@ // GNU General Public License for more details. // Load global vars + +require_once ('include/functions_clippy.php'); + global $config; check_login(); @@ -29,7 +32,8 @@ global $tiny; $servers = servers_get_info(); if ($servers === false) { - echo "<div class='nf'>".__('There are no servers configured into the database')."</div>"; + $server_clippy = clippy_context_help("servers_down"); + echo "<div class='nf'>".__('There are no servers configured into the database').$server_clippy."</div>"; return; } @@ -109,6 +113,9 @@ foreach ($servers as $server) { } $data[6] = $server['threads'].' : '.$server['queued_modules']; + if ($server['queued_modules'] > 200){ + $data[6] .= clippy_context_help("server_queued_modules"); + } $data[7] = ui_print_timestamp ($server['keepalive'], true); //Only Pandora Administrator can delete servers From 84821a3729369d733bdce438a2a84fd33b0c42e5 Mon Sep 17 00:00:00 2001 From: m-lopez-f <miguel.lopez@artica.es> Date: Tue, 3 Feb 2015 16:08:41 +0100 Subject: [PATCH 2/3] Add help clippy in creation menus or views Add clippy in: Interval agent if this interval is < 300 Network maps>topology group Create a new data server module in field 'Data Configuration' In servers list, in column T/Q, when Q>200 --- .../godmode/agentes/agent_manager.php | 4 +- .../help/clippy/data_configuration_module.php | 64 +++++++++++++++++++ .../help/clippy/interval_agent_min.php | 57 +++++++++++++++++ .../help/clippy/server_queued_modules.php | 58 +++++++++++++++++ .../include/help/clippy/topology_group.php | 57 +++++++++++++++++ .../operation/agentes/networkmap.php | 3 + 6 files changed, 242 insertions(+), 1 deletion(-) create mode 100644 pandora_console/include/help/clippy/data_configuration_module.php create mode 100644 pandora_console/include/help/clippy/interval_agent_min.php create mode 100644 pandora_console/include/help/clippy/server_queued_modules.php create mode 100644 pandora_console/include/help/clippy/topology_group.php diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php index de055054cf..f3654cfb6f 100644 --- a/pandora_console/godmode/agentes/agent_manager.php +++ b/pandora_console/godmode/agentes/agent_manager.php @@ -245,7 +245,9 @@ $table->data[3][1] = html_print_select_groups(false, "AR", false, 'grupo', $grup $table->data[4][0] = __('Interval'); $table->data[4][1] = html_print_extended_select_for_time ('intervalo', $intervalo, '', '', '0', 10, true); - +if($intervalo<300){ + $table->data[4][1] .= clippy_context_help("interval_agent_min"); +} $table->data[5][0] = __('OS'); $table->data[5][1] = html_print_select_from_sql ('SELECT id_os, name FROM tconfig_os', 'id_os', $id_os, '', '', '0', true); diff --git a/pandora_console/include/help/clippy/data_configuration_module.php b/pandora_console/include/help/clippy/data_configuration_module.php new file mode 100644 index 0000000000..1d850fc649 --- /dev/null +++ b/pandora_console/include/help/clippy/data_configuration_module.php @@ -0,0 +1,64 @@ +<?php + +// Pandora FMS - http://pandorafms.com +// ================================================== +// Copyright (c) 2005-2011 Artica Soluciones Tecnologicas +// Please see http://pandorafms.org for full contribution list + +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public License +// as published by the Free Software Foundation; version 2 + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +/** + * @package Include + * @subpackage Clippy + */ + +function clippy_data_configuration_module() { + + $return_tours = array(); + $return_tours['first_step_by_default'] = true; + $return_tours['help_context'] = true; + $return_tours['tours'] = array(); + + //================================================================== + //Help tour about the monitoring with a ping (step 3) + //------------------------------------------------------------------ + $return_tours['tours']['data_configuration_module'] = array(); + $return_tours['tours']['data_configuration_module']['steps'] = array(); + $return_tours['tours']['data_configuration_module']['steps'][] = array( + 'init_step_context' => true, + 'intro' => '<table>' . + '<tr>' . + '<td class="context_help_title">' . + __('Data Configuration Module.') . + '</td>' . + '</tr>' . + + '<td class="context_help_body">' . + __('Please note that information provided here affects how the agent collect information and generate the data XML. Any data/configuration reported by the agent, different from data or description is discarded, and the configuration shown in the console prevails over any configuration coming from the agent, this applies for example for crit/warn thresholds, interval, module group, min/max value, tags, etc.') . + + '</td>' . + '</tr>' . + '<tr>' . + '<td class="context_help_body">' . + __('Information imported FIRST time from the XML will fill the information you can see in the console, but after the first import, system will ignore any update coming from the XML/Agent.') . + + '</td>' . + '</tr>' . + '</table>' + ); + $return_tours['tours']['data_configuration_module']['conf'] = array(); + $return_tours['tours']['data_configuration_module']['conf']['autostart'] = false; + $return_tours['tours']['data_configuration_module']['conf']['show_bullets'] = 0; + $return_tours['tours']['data_configuration_module']['conf']['show_step_numbers'] = 0; + //================================================================== + + return $return_tours; +} +?> diff --git a/pandora_console/include/help/clippy/interval_agent_min.php b/pandora_console/include/help/clippy/interval_agent_min.php new file mode 100644 index 0000000000..34143494f8 --- /dev/null +++ b/pandora_console/include/help/clippy/interval_agent_min.php @@ -0,0 +1,57 @@ +<?php + +// Pandora FMS - http://pandorafms.com +// ================================================== +// Copyright (c) 2005-2011 Artica Soluciones Tecnologicas +// Please see http://pandorafms.org for full contribution list + +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public License +// as published by the Free Software Foundation; version 2 + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +/** + * @package Include + * @subpackage Clippy + */ + +function clippy_interval_agent_min() { + + $return_tours = array(); + $return_tours['first_step_by_default'] = true; + $return_tours['help_context'] = true; + $return_tours['tours'] = array(); + + //================================================================== + //Help tour about the monitoring with a ping (step 3) + //------------------------------------------------------------------ + $return_tours['tours']['interval_agent_min'] = array(); + $return_tours['tours']['interval_agent_min']['steps'] = array(); + $return_tours['tours']['interval_agent_min']['steps'][] = array( + 'init_step_context' => true, + 'intro' => '<table>' . + '<tr>' . + '<td class="context_help_title">' . + __('Interval Agent.') . + '</td>' . + '</tr>' . + '<tr>' . + '<td class="context_help_body">' . + __('Please note that having agents with a monitoring interval below 300 seconds is not recommended. This will impact seriously in the performance of the server. For example, having 200 agents with one minute interval, is the same than having 1000 agents with a 5 minute interval. The probability of getting unknown modules is higher, and the impact on the server is higher because it requires a shorter response time.') . + '</td>' . + '</tr>' . + '</table>' + ); + $return_tours['tours']['interval_agent_min']['conf'] = array(); + $return_tours['tours']['interval_agent_min']['conf']['autostart'] = false; + $return_tours['tours']['interval_agent_min']['conf']['show_bullets'] = 0; + $return_tours['tours']['interval_agent_min']['conf']['show_step_numbers'] = 0; + //================================================================== + + return $return_tours; +} +?> diff --git a/pandora_console/include/help/clippy/server_queued_modules.php b/pandora_console/include/help/clippy/server_queued_modules.php new file mode 100644 index 0000000000..085dbba67b --- /dev/null +++ b/pandora_console/include/help/clippy/server_queued_modules.php @@ -0,0 +1,58 @@ +<?php + +// Pandora FMS - http://pandorafms.com +// ================================================== +// Copyright (c) 2005-2011 Artica Soluciones Tecnologicas +// Please see http://pandorafms.org for full contribution list + +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public License +// as published by the Free Software Foundation; version 2 + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +/** + * @package Include + * @subpackage Clippy + */ + +function clippy_server_queued_modules() { + + $return_tours = array(); + $return_tours['first_step_by_default'] = true; + $return_tours['help_context'] = true; + $return_tours['tours'] = array(); + + //================================================================== + //Help tour about the monitoring with a ping (step 3) + //------------------------------------------------------------------ + $return_tours['tours']['server_queued_modules'] = array(); + $return_tours['tours']['server_queued_modules']['steps'] = array(); + $return_tours['tours']['server_queued_modules']['steps'][] = array( + 'init_step_context' => true, + 'intro' => '<table>' . + '<tr>' . + '<td class="context_help_title">' . + __('Excesive Queued.') . + '</td>' . + '</tr>' . + + '<td class="context_help_body">' . + __('You have too much items in the processing queue. This can happen if your server is too loaded and/or not properly configured. This could be something temporal, or a bottleneck. One possible solution is increase number of server threads, but you should consider getting support about this.') . + + '</td>' . + '</tr>' . + '</table>' + ); + $return_tours['tours']['server_queued_modules']['conf'] = array(); + $return_tours['tours']['server_queued_modules']['conf']['autostart'] = false; + $return_tours['tours']['server_queued_modules']['conf']['show_bullets'] = 0; + $return_tours['tours']['server_queued_modules']['conf']['show_step_numbers'] = 0; + //================================================================== + + return $return_tours; +} +?> diff --git a/pandora_console/include/help/clippy/topology_group.php b/pandora_console/include/help/clippy/topology_group.php new file mode 100644 index 0000000000..54972cb13f --- /dev/null +++ b/pandora_console/include/help/clippy/topology_group.php @@ -0,0 +1,57 @@ +<?php + +// Pandora FMS - http://pandorafms.com +// ================================================== +// Copyright (c) 2005-2011 Artica Soluciones Tecnologicas +// Please see http://pandorafms.org for full contribution list + +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public License +// as published by the Free Software Foundation; version 2 + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +/** + * @package Include + * @subpackage Clippy + */ + +function clippy_topology_group() { + + $return_tours = array(); + $return_tours['first_step_by_default'] = true; + $return_tours['help_context'] = true; + $return_tours['tours'] = array(); + + //================================================================== + //Help tour about the monitoring with a ping (step 3) + //------------------------------------------------------------------ + $return_tours['tours']['topology_group'] = array(); + $return_tours['tours']['topology_group']['steps'] = array(); + $return_tours['tours']['topology_group']['steps'][] = array( + 'init_step_context' => true, + 'intro' => '<table>' . + '<tr>' . + '<td class="context_help_title">' . + __('Topology Group') . + '</td>' . + '</tr>' . + '<tr>' . + '<td class="context_help_body">' . + __('Please note that group topology maps do not show the parent relationship between nodes, it only shows the group parentship and the agent distribution inside them. ') . + '</td>' . + '</tr>' . + '</table>' + ); + $return_tours['tours']['topology_group']['conf'] = array(); + $return_tours['tours']['topology_group']['conf']['autostart'] = false; + $return_tours['tours']['topology_group']['conf']['show_bullets'] = 0; + $return_tours['tours']['topology_group']['conf']['show_step_numbers'] = 0; + //================================================================== + + return $return_tours; +} +?> diff --git a/pandora_console/operation/agentes/networkmap.php b/pandora_console/operation/agentes/networkmap.php index a55ea919c6..f705c31405 100644 --- a/pandora_console/operation/agentes/networkmap.php +++ b/pandora_console/operation/agentes/networkmap.php @@ -335,6 +335,9 @@ $table->class = 'databox'; $table->data = array(); $table->data[0][] = __('Name:') . ' ' . html_print_input_text ('name', $name, '', 25, 50, true); +if ($activeTab == 'groups'){ + $table->data[0][0] .= clippy_context_help("topology_group"); +} $table->data[0][] = __('Group:') . ' ' . html_print_select_groups(false, 'AR', false, 'group', $group, '', 'All', 0, true); if ($activeTab == 'groups' || $activeTab == 'policies' || $activeTab == 'radial_dynamic') { From 93ce434915b7ff48447cc4c4c856431852ad834b Mon Sep 17 00:00:00 2001 From: artica <artica.devel@gmail.com> Date: Wed, 4 Feb 2015 00:01:10 +0100 Subject: [PATCH 3/3] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_console/pandoradb_data.sql | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 2bc68cf693..e53f4f5cf3 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 6.0dev-150203 +Version: 6.0dev-150204 Architecture: all Priority: optional Section: admin diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh index e4317bb051..049a9c3c1d 100644 --- a/pandora_agents/unix/DEBIAN/make_deb_package.sh +++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="6.0dev-150203" +pandora_version="6.0dev-150204" echo "Test if you has the tools for to make the packages." whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent index 95226f8a6a..2208638e9c 100644 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -41,7 +41,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '6.0dev'; -use constant AGENT_BUILD => '150203'; +use constant AGENT_BUILD => '150204'; # Commands to retrieve total memory information in kB use constant TOTALMEMORY_CMDS => { diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index f06db8607a..2ce46c788d 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 6.0dev -%define release 150203 +%define release 150204 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index c52e65795a..f5504ead75 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 6.0dev -%define release 150203 +%define release 150204 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 7e651eb35f..7d6ecf7c50 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{150203} +{150204} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index cabb72b8bc..f364900ed0 100644 --- a/pandora_agents/win32/pandora.cc +++ b/pandora_agents/win32/pandora.cc @@ -30,7 +30,7 @@ using namespace Pandora; using namespace Pandora_Strutils; #define PATH_SIZE _MAX_PATH+1 -#define PANDORA_VERSION ("6.0dev(Build 150203)") +#define PANDORA_VERSION ("6.0dev(Build 150204)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index f6be742429..6f3ca41978 100644 --- a/pandora_agents/win32/versioninfo.rc +++ b/pandora_agents/win32/versioninfo.rc @@ -11,7 +11,7 @@ BEGIN VALUE "LegalCopyright", "Artica ST" VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "ProductName", "Pandora FMS Windows Agent" - VALUE "ProductVersion", "(6.0dev(Build 150203))" + VALUE "ProductVersion", "(6.0dev(Build 150204))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 391fdd8e21..35f57a056c 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 6.0dev-150203 +Version: 6.0dev-150204 Architecture: all Priority: optional Section: admin diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh index 569b4e839b..83d3c74a2b 100644 --- a/pandora_console/DEBIAN/make_deb_package.sh +++ b/pandora_console/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="6.0dev-150203" +pandora_version="6.0dev-150204" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index ce3c72c981..dcef4a18ee 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ /** * Pandora build version and version */ -$build_version = 'PC150203'; +$build_version = 'PC150204'; $pandora_version = 'v6.0dev'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 0119f971c3..40a54af53b 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -63,7 +63,7 @@ <div style='height: 10px'> <?php $version = '6.0dev'; -$build = '150203'; +$build = '150204'; $banner = "v$version Build $build"; error_reporting(0); diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec index 7880838497..80c8958208 100644 --- a/pandora_console/pandora_console.redhat.spec +++ b/pandora_console/pandora_console.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_console %define version 6.0dev -%define release 150203 +%define release 150204 # User and Group under which Apache is running %define httpd_name httpd diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec index 978709ba2d..ecf30a98c9 100644 --- a/pandora_console/pandora_console.spec +++ b/pandora_console/pandora_console.spec @@ -3,7 +3,7 @@ # %define name pandorafms_console %define version 6.0dev -%define release 150203 +%define release 150204 %define httpd_name httpd # User and Group under which Apache is running %define httpd_name apache2 diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index 696fd1549a..be9aef4ca2 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -38,7 +38,7 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES ('graph_res','5'), ('step_compact','1'), ('db_scheme_version','6.0dev'), -('db_scheme_build','PD150203'), +('db_scheme_build','PD150204'), ('show_unknown','0'), ('show_lastalerts','1'), ('style','pandora'), diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control index 9245affd27..1c5df593ee 100644 --- a/pandora_server/DEBIAN/control +++ b/pandora_server/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-server -Version: 6.0dev-150203 +Version: 6.0dev-150204 Architecture: all Priority: optional Section: admin diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh index 1046573aaf..eef6e54631 100644 --- a/pandora_server/DEBIAN/make_deb_package.sh +++ b/pandora_server/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="6.0dev-150203" +pandora_version="6.0dev-150204" package_cpan=0 package_pandora=1 diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm index f7c7e3895c..fdda6debf8 100644 --- a/pandora_server/lib/PandoraFMS/Config.pm +++ b/pandora_server/lib/PandoraFMS/Config.pm @@ -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 = "150203"; +my $pandora_build = "150204"; our $VERSION = $pandora_version." ".$pandora_build; # Setup hash diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index ac40e82889..8f3ac9cc6b 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 6.0dev -%define release 150203 +%define release 150204 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 39bb45687b..1edecf0763 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 6.0dev -%define release 150203 +%define release 150204 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index d737225403..c6e10655ca 100644 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -33,7 +33,7 @@ use PandoraFMS::Tools; use PandoraFMS::DB; # version: define current version -my $version = "6.0dev PS150203"; +my $version = "6.0dev PS150204"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 315e9aae74..f8b462ac90 100644 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -34,7 +34,7 @@ use Encode::Locale; Encode::Locale::decode_argv; # version: define current version -my $version = "6.0dev PS150203"; +my $version = "6.0dev PS150204"; # save program name for logging my $progname = basename($0);