tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center

This commit is contained in:
Daniel Barbero Martin 2021-03-17 08:47:45 +01:00
parent 505e724384 610d41290e
commit 6ec4b0cf98
49 changed files with 589 additions and 523 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_agents/Dockerfile
View File

@ -1,15 +1,15 @@
FROM centos:centos8
MAINTAINER Pandora FMS Team <info@pandorafms.com>
FROM centos:7
LABEL maintainer="Pandora FMS Team <info@pandorafms.com>"
# Add Pandora FMS agent installer
ADD unix /opt/pandora/pandora_agent/unix
RUN export LC_ALL=C
RUN dnf install -y dnf-plugins-core; dnf config-manager --set-enabled PowerTools
RUN yum -y update
# Install dependencies
RUN dnf -y install \
RUN yum -y install \
epel-release \
unzip \
perl \
@ -17,7 +17,7 @@ RUN dnf -y install \
sed \
perl-YAML-Tiny \
"perl(Sys::Syslog)" \
&& dnf clean all
&& yum clean all
# Install Pandora FMS agent

2
pandora_agents/unix/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-agent-unix
Version: 7.0NG.752-210315
Version: 7.0NG.752-210317
Architecture: all
Priority: optional
Section: admin

2
pandora_agents/unix/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
pandora_version="7.0NG.752-210315"
pandora_version="7.0NG.752-210317"
echo "Test if you has the tools for to make the packages."
whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null

4
pandora_agents/unix/pandora_agent
View File

@ -1016,7 +1016,7 @@ my $Sem = undef;
my $ThreadSem = undef;
use constant AGENT_VERSION => '7.0NG.752';
use constant AGENT_BUILD => '210315';
use constant AGENT_BUILD => '210317';
# Agent log default file size maximum and instances
use constant DEFAULT_MAX_LOG_SIZE => 600000;
@ -4143,7 +4143,7 @@ while (1) {
@address_list = `ip addr show 2>$DevNull | sed -e '/127.0.0/d' -e '/\\([0-9][0-9]*\\.\\)\\{3\\}[0-9][0-9]*/!d' -e 's/^[ \\t]*\\([^ \\t]*\\)[ \\t]*\\([^ \\t]*\\)[ \\t].*/\\2/' -e 's/\\/.*//'`;
}
else {
@address_list = `ifconfig -a 2>$DevNull | sed -e '/127.0.0/d' -e '/\\([0-9][0-9]*\\.\\)\\{3\\}[0-9][0-9]*/!d' -e 's/^[ \\t]*\\([^ \\t]*\\)[ \\t]*\\([^ \\t]*\\)[ \\t].*/\\2/' -e 's/.*://'`;
@address_list = `ifconfig -a 2>$DevNull | grep -i inet | grep -v 'inet6' | grep -v '0.0.0.0' | grep -v '::/0' | awk '{print \$2}' | grep -v '127.0.0.1'`;
}
for (my $i = 0; $i <= $#address_list; $i++) {

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

@ -3,7 +3,7 @@
#
%define name pandorafms_agent_unix
%define version 7.0NG.752
%define release 210315
%define release 210317
Summary: Pandora FMS Linux agent, PERL version
Name: %{name}

2
pandora_agents/unix/pandora_agent.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_agent_unix
%define version 7.0NG.752
%define release 210315
%define release 210317
Summary: Pandora FMS Linux agent, PERL version
Name: %{name}

2
pandora_agents/unix/pandora_agent_installer
View File

@ -10,7 +10,7 @@
# **********************************************************************
PI_VERSION="7.0NG.752"
PI_BUILD="210315"
PI_BUILD="210317"
OS_NAME=`uname -s`
FORCE=0

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

@ -186,7 +186,7 @@ UpgradeApplicationID
{}
Version
{210315}
{210317}
ViewReadme
{Yes}

2
pandora_agents/win32/pandora.cc
View File

@ -30,7 +30,7 @@ using namespace Pandora;
using namespace Pandora_Strutils;
#define PATH_SIZE _MAX_PATH+1
#define PANDORA_VERSION ("7.0NG.752(Build 210315)")
#define PANDORA_VERSION ("7.0NG.752(Build 210317)")
string pandora_path;
string pandora_dir;

2
pandora_agents/win32/versioninfo.rc
View File

@ -11,7 +11,7 @@ BEGIN
VALUE "LegalCopyright", "Artica ST"
VALUE "OriginalFilename", "PandoraAgent.exe"
VALUE "ProductName", "Pandora FMS Windows Agent"
VALUE "ProductVersion", "(7.0NG.752(Build 210315))"
VALUE "ProductVersion", "(7.0NG.752(Build 210317))"
VALUE "FileVersion", "1.0.0.0"
END
END

2
pandora_console/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-console
Version: 7.0NG.752-210315
Version: 7.0NG.752-210317
Architecture: all
Priority: optional
Section: admin

2
pandora_console/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
pandora_version="7.0NG.752-210315"
pandora_version="7.0NG.752-210317"
package_pear=0
package_pandora=1

28
pandora_console/godmode/agentes/configurar_agente.php
View File

@ -367,7 +367,7 @@ $img_style = [
if ($id_agente) {
// View tab.
$viewtab['text'] = '<a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$id_agente.'">'.html_print_image(
'images/operation.png',
'images/eye.png',
true,
[
'title' => __('View'),
@ -563,6 +563,27 @@ if ($id_agente) {
$agent_wizard['active'] = false;
}
$total_incidents = agents_get_count_incidents($id_agente);
// Incident tab.
if ($total_incidents > 0) {
$incidenttab['text'] = '<a href="index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente&amp;tab=incident&amp;id_agente='.$id_agente.'">'.html_print_image(
'images/book_edit.png',
true,
[
'title' => __('Incidents'),
'class' => 'invert_filter',
]
).'</a>';
if ($tab == 'incident') {
$incidenttab['active'] = true;
} else {
$incidenttab['active'] = false;
}
}
if (check_acl_one_of_groups($config['id_user'], $all_groups, 'AW')) {
if ($has_remote_conf) {
$agent_name = agents_get_name($id_agente);
@ -616,6 +637,11 @@ if ($id_agente) {
];
}
// Only if the agent has incidents associated show incidents tab.
if ($total_incidents) {
$onheader['incident'] = $incidenttab;
}
} else {
$onheader = [
'view' => $viewtab,

2
pandora_console/godmode/agentes/modificar_agente.php
View File

@ -754,7 +754,7 @@ if ($agents !== false) {
echo '</em>';
}
echo '</span><div class="left actions clear_left">';
echo '</span><div class="left actions clear_left" style=" visibility: hidden">';
if ($check_aw) {
if ($agent['id_os'] == CLUSTER_OS_ID) {
if (enterprise_installed()) {

903
pandora_console/godmode/agentes/planned_downtime.editor.php
View File

File diff suppressed because it is too large Load Diff

2
pandora_console/godmode/alerts/alert_special_days.php
View File

@ -551,7 +551,7 @@ for ($month = 1; $month <= 12; $month++) {
$cal_table->data[$cal_line][$week] .= '<a href="index.php?sec=galertas&sec2=godmode/alerts/configure_alert_special_days&create_special_day=1&date='.$date.'" title=';
$cal_table->data[$cal_line][$week] .= __('Create');
$cal_table->data[$cal_line][$week] .= '>'.html_print_image(
'images/add.png',
'images/add_mc.png',
true,
['class' => 'invert_filter']
).'</a>';

23
pandora_console/godmode/massive/massive_edit_modules.php
View File

@ -803,11 +803,11 @@ $table->data['edit1'][1] = '<table width="100%">';
true
);
$table->data['edit36'][2] = __('Auth password').ui_print_help_tip(__('The pass length must be eight character minimum.'), true);
$table->data['edit36'][3] = html_print_input_text('plugin_pass_snmp', '', '', 15, 60, true);
$table->data['edit36'][3] = html_print_input_password('plugin_pass_snmp', '', '', 15, 60, true);
$table->data['edit37'][0] = __('Privacy method');
$table->data['edit37'][1] = html_print_select(['DES' => __('DES'), 'AES' => __('AES')], 'custom_string_1', '', '', __('No change'), '', true);
$table->data['edit37'][1] = html_print_select(['DES' => __('DES'), 'AES' => __('AES')], 'snmp3_privacy_method', '', '', __('No change'), '', true);
$table->data['edit37'][2] = __('Privacy pass').ui_print_help_tip(__('The pass length must be eight character minimum.'), true);
$table->data['edit37'][3] = html_print_input_text('custom_string_2', '', '', 15, 60, true);
$table->data['edit37'][3] = html_print_input_password('snmp3_privacy_pass', '', '', 15, 60, true);
$table->data['edit38'][0] = __('Auth method');
$table->data['edit38'][1] = html_print_select(['MD5' => __('MD5'), 'SHA' => __('SHA')], 'plugin_parameter', '', '', __('No change'), '', true);
$table->data['edit38'][2] = __('Security level');
@ -1670,7 +1670,7 @@ $(document).ready (function () {
}
});
$('#tcp_send').change(function() {
$('#snmp_version').change(function() {
if($(this).val() == 3) {
$("tr#delete_table-edit36, tr#delete_table-edit37, tr#delete_table-edit38").show();
}
@ -2096,7 +2096,7 @@ function process_manage_edit($module_name, $agents_select=null, $module_status='
}
// Specific snmp reused fields
if (get_parameter('tcp_send', '') == 3) {
if (get_parameter('snmp_version', '') == 3) {
$plugin_user_snmp = get_parameter('plugin_user_snmp', '');
if ($plugin_user_snmp != '') {
$values['plugin_user'] = $plugin_user_snmp;
@ -2107,7 +2107,12 @@ function process_manage_edit($module_name, $agents_select=null, $module_status='
$values['plugin_pass'] = io_input_password($plugin_pass_snmp);
}
$snmp3_privacy_pass = get_parameter('custom_string_2', '');
$snmp3_privacy_method = get_parameter('snmp3_privacy_method', '');
if ($snmp3_privacy_method != '') {
$values['custom_string_1'] = io_input_password($snmp3_privacy_method);
}
$snmp3_privacy_pass = get_parameter('snmp3_privacy_pass', '');
if ($snmp3_privacy_pass != '') {
$values['custom_string_2'] = io_input_password($snmp3_privacy_pass);
}
@ -2209,7 +2214,11 @@ function process_manage_edit($module_name, $agents_select=null, $module_status='
}
// Set tcp_send value according to module type since the purpose of this field in database varies in case of SNMP modules.
if ($module['id_tipo_modulo'] >= 15 && $module['id_tipo_modulo'] <= 18) {
if ($module['id_tipo_modulo'] == MODULE_TYPE_REMOTE_SNMP
|| $module['id_tipo_modulo'] == MODULE_TYPE_REMOTE_SNMP_INC
|| $module['id_tipo_modulo'] == MODULE_TYPE_REMOTE_SNMP_STRING
|| $module['id_tipo_modulo'] <= MODULE_TYPE_REMOTE_SNMP_PROC
) {
if ($snmp_version != '') {
$values['tcp_send'] = $snmp_version;
} else {

2
pandora_console/godmode/modules/manage_network_components.php
View File

@ -918,7 +918,7 @@ if (isset($data)) {
);
}
echo '<form method="post" action="'.$url.'">';
echo '<form method="post" action="'.$url.'" class="float-right">';
echo '<div class="right">';
html_print_input_hidden('new_component', 1);
html_print_select(

4
pandora_console/godmode/reporting/graph_builder.main.php
View File

@ -285,11 +285,11 @@ $output .= '</table>';
if ($edit_graph) {
$output .= "<div class='w100p'>";
$output .= "<input class='right' type=submit name='store' class='sub upd' value='".__('Update')."'>";
$output .= "<input type=submit name='store' class='sub upd right' value='".__('Update')."'>";
$output .= '</div>';
} else {
$output .= "<div class='w100p'>";
$output .= "<input class='right' type=submit name='store' class='sub next' value='".__('Create')."'>";
$output .= "<input type=submit name='store' class='sub next right' value='".__('Create')."'>";
$output .= '</div>';
}

3
pandora_console/godmode/reporting/graphs.php
View File

@ -349,7 +349,6 @@ $table_aux = new stdClass();
ui_pagination(count($graphs), false, 0, 0, false, 'offset', true, 'pagination-bottom');
echo "<div class='right'>";
html_print_submit_button(__('Delete'), 'delete_btn', false, 'class="sub delete"');
echo '</div>';
echo '</form>';
}
@ -361,6 +360,8 @@ $table_aux = new stdClass();
echo '</form>';
}
echo '</div>';
echo '</div>';
} else {
include_once $config['homedir'].'/general/first_task/custom_graphs.php';

15
pandora_console/godmode/reporting/reporting_builder.item_editor.php
View File

@ -2763,17 +2763,13 @@ $class = 'databox filters';
</td>
</tr>
<<<<<<< HEAD
<tr id="row_filter_search" class="datos">
<td class="bolder"><?php echo __('Free search'); ?></td>
=======
<tr id="row_summary" style="" class="datos">
<td style="font-weight:bold;">
<tr id="row_summary"class="datos">
<td class="bolder">
<?php
echo __('Summary');
?>
</td>
<td style="">
<td>
<?php
html_print_checkbox_switch(
'summary',
@ -2788,9 +2784,8 @@ $class = 'databox filters';
</td>
</tr>
<tr id="row_filter_search" style="" class="datos">
<td style="font-weight:bold;"><?php echo __('Include filter'); ?></td>
>>>>>>> origin/develop
<tr id="row_filter_search" class="datos">
<td class="bolder"><?php echo __('Include filter'); ?></td>
<td>
<?php
html_print_input_text('filter_search', $filter_search);

4
pandora_console/godmode/reporting/reporting_builder.list_items.php
View File

@ -664,7 +664,7 @@ if (defined('METACONSOLE')) {
if (check_acl($config['id_user'], 0, 'RM')) {
html_print_input_hidden('ids_items_to_delete', '');
html_print_submit_button(__('Delete'), 'delete_btn', false, 'class="sub delete"');
html_print_submit_button(__('Delete'), 'delete_btn', false, 'class="sub delete right"');
}
echo '</div>';
@ -687,7 +687,7 @@ if (defined('METACONSOLE')) {
echo "<div class='pdd_b_20px right; w100p'>";
html_print_input_hidden('ids_items_to_delete', '');
html_print_submit_button(__('Delete'), 'delete_btn', false, 'class="sub delete"');
html_print_submit_button(__('Delete'), 'delete_btn', false, 'class="sub delete right mrgn_btn_15px"');
echo '</div>';
echo '</form>';
}

2
pandora_console/godmode/setup/setup.php
View File

@ -218,7 +218,7 @@ $buttons['websocket_engine'] = [
$buttons['external_tools'] = [
'active' => false,
'text' => '<a href="'.ui_get_full_url('index.php?sec=gsetup&sec2=godmode/setup/setup&section=external_tools').'">'.html_print_image('images/nettool.png', true, ['title' => __('External Tools')]).'</a>',
'text' => '<a href="'.ui_get_full_url('index.php?sec=gsetup&sec2=godmode/setup/setup&section=external_tools').'">'.html_print_image('images/nettool.png', true, ['title' => __('External Tools'), 'class' => 'invert_filter']).'</a>',
];
if ($config['activate_gis']) {

14
pandora_console/godmode/setup/setup_visuals.php
View File

@ -131,6 +131,20 @@ $table_styles->style[0] = 'font-weight: bold;';
$table_styles->size[0] = '50%';
$table_styles->data = [];
$table_styles->data[$row][0] = __('Style template');
$table_styles->data[$row][1] = html_print_select(
themes_get_css(),
'style',
$config['style'].'.css',
'',
'',
'',
true
);
$row++;
$table_styles->data[$row][0] = __('Status icon set');
$iconsets['default'] = __('Colors');
$iconsets['faces'] = __('Faces');

2
pandora_console/include/class/ConfigPEN.class.php
View File

@ -246,7 +246,7 @@ class ConfigPEN extends HTML
$tmp->options .= $tmp->pen;
$tmp->options .= '\')" >';
$tmp->options .= html_print_image(
'images/eye.png',
'images/operation.png',
true,
[
'title' => __('Show'),

2
pandora_console/include/config_process.php
View File

@ -20,7 +20,7 @@
/**
* Pandora build version and version
*/
$build_version = 'PC210315';
$build_version = 'PC210317';
$pandora_version = 'v7.0NG.752';
// Do not overwrite default timezone set if defined.

4
pandora_console/include/functions_config.php
View File

@ -1948,6 +1948,10 @@ function config_process_config()
config_update_value('collection_max_size', 1000000);
}
if (!isset($config['policy_add_max_agents'])) {
config_update_value('policy_add_max_agents', 200);
}
if (!isset($config['event_replication'])) {
config_update_value('event_replication', 0);
}

2
pandora_console/include/functions_html.php
View File

@ -4037,7 +4037,7 @@ function html_print_autocomplete_modules(
ob_start();
$module_icon = 'images/module.png';
$module_icon = 'images/search_module.png';
if ($config['style'] === 'pandora_black') {
$module_icon = 'images/brick.menu.png';
}

4
pandora_console/include/functions_snmp_browser.php
View File

@ -144,7 +144,7 @@ function snmp_browser_get_html_tree(
// Branch or leave with branches!
if (isset($sub_level['__OID__'])) {
$output .= "<a onfocus='javascript: this.blur();' href='javascript: snmpGet(\"".addslashes($sub_level['__OID__'])."\");'>";
$output .= '<img src="'.$url.'/../../images/eye.png" class="vertical_middle">';
$output .= '<img src="'.$url.'/../../images/operation.png" class="vertical_middle">';
$output .= '</a>';
}
@ -1024,7 +1024,7 @@ function snmp_browser_print_container(
if ($snmp_version == 3) {
$output .= '<div id="snmp3_browser_options">';
} else {
$output .= '<div id="snmp3_browser_options" class="invisible">';
$output .= '<div id="snmp3_browser_options" style="display: none;">';
}
$output .= ui_toggle(

6
pandora_console/include/functions_themes.php
View File

@ -43,7 +43,11 @@ function themes_get_css($path=false)
$retval = [];
foreach ($files as $file) {
// Skip '..' and '.' entries and files not ended in '.css'
if ($file === 'pandora_green_old.css') {
continue;
}
// Skip '..' and '.' entries and files not ended in '.css'.
if ($path && ($file == '.' || $file == '..' || strtolower(substr($file, (strlen($file) - 4))) !== '.css')) {
continue;
}

2
pandora_console/include/functions_ui.php
View File

@ -4689,7 +4689,7 @@ function ui_print_agent_autocomplete_input($parameters)
}
// Default value.
$icon_agent = 'images/agent.png';
$icon_agent = 'images/search_agent.png';
if ($config['style'] === 'pandora_black') {
$icon_agent = 'images/agent_mc.menu.png';

4
pandora_console/include/javascript/pandora_dashboards.js
View File

@ -452,7 +452,7 @@ function initialiceLayout(data) {
$(".add-widget").show();
$(".new-widget-message").hide();
$("#container-layout").addClass("container-layout");
$("#add-widget").show();
$("#add-widget").removeClass("invisible");
} else {
grid.movable(".grid-stack-item", false);
grid.resizable(".grid-stack-item", false);
@ -461,7 +461,7 @@ function initialiceLayout(data) {
$(".add-widget").hide();
$(".new-widget-message").show();
$("#container-layout").removeClass("container-layout");
$("#add-widget").hide();
$("#add-widget").addClass("invisible");
}
});

2
pandora_console/install.php
View File

@ -129,7 +129,7 @@
<div style='height: 10px'>
<?php
$version = '7.0NG.752';
$build = '210315';
$build = '210317';
$banner = "v$version Build $build";
error_reporting(0);

2
pandora_console/operation/agentes/estado_agente.php
View File

@ -709,7 +709,7 @@ $table->class = 'info_table';
$table->head = [];
$table->head[0] = __('Agent').ui_get_sorting_arrows($url_up_agente, $url_down_agente, $selectNameUp, $selectNameDown);
$table->size[0] = '10%';
$table->size[0] = '12%';
$table->head[1] = __('Description').ui_get_sorting_arrows($url_up_description, $url_down_description, $selectDescriptionUp, $selectDescriptionDown);
$table->size[1] = '16%';

4
pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php
View File

@ -265,7 +265,7 @@ $table_files_section->data[1][0] .= html_print_textarea(
$table_files_section->data[2][0] .= '<div class="w100p right">'.html_print_submit_button(__('Upload'), 'accion', false, 'class="sub wand"', true).'</div>';
$upload_file_form = '<div>';
$upload_file_form = '<div class="w100p">';
if (check_acl($config['id_user'], 0, 'IW')) {
$upload_file_form .= '<form method="post" id="file_control" enctype="multipart/form-data">'.'<h4>'.__('Add attachment').'</h4>'.html_print_table($table_files_section, true).html_print_input_hidden('upload_file', 1, true);
@ -359,7 +359,7 @@ if (!empty($comments)) {
$comment_table = __('No comments found');
}
$upload_comment_form = '<div>';
$upload_comment_form = '<div class="w100p">';
if (check_acl($config['id_user'], 0, 'IW')) {
$upload_comment_form .= '<form method="post" id="comment_form" enctype="multipart/form-data"><h4>'.__('Add comment').'</h4>'.html_print_table($table_comments_section, true).html_print_input_hidden('upload_comment', 1, true).'</form>';

6
pandora_console/operation/snmpconsole/snmp_browser.php
View File

@ -82,10 +82,10 @@ ui_print_page_header(
// SNMP tree container.
snmp_browser_print_container(false, '100%', '60%', '', true);
// Div for modal
echo '<div id="modal" class="invisible"></div>';
// Div for modal.
echo '<div id="modal" style="display:none"></div>';
// Div for loading modal.
echo '<div id="loading_modal" class="invisible"></div>';
echo '<div id="loading_modal" style="display:none"></div>';
?>

2
pandora_console/pandora_console.redhat.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 7.0NG.752
%define release 210315
%define release 210317
# User and Group under which Apache is running
%define httpd_name httpd

2
pandora_console/pandora_console.rhel7.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 7.0NG.752
%define release 210315
%define release 210317
# User and Group under which Apache is running
%define httpd_name httpd

2
pandora_console/pandora_console.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 7.0NG.752
%define release 210315
%define release 210317
%define httpd_name httpd
# User and Group under which Apache is running
%define httpd_name apache2

8
pandora_console/views/dashboard/layout.php
View File

@ -43,10 +43,10 @@
$output = '';
// Div for modal update dashboard.
$output .= '<div id="modal-update-dashboard" class=""></div>';
$output .= '<div id="modal-add-widget" class=""></div>';
$output .= '<div id="modal-config-widget" class=""></div>';
$output .= '<div id="modal-slides-dialog" class=""></div>';
$output .= '<div id="modal-update-dashboard" style="display:none;"></div>';
$output .= '<div id="modal-add-widget" style="display:none;"></div>';
$output .= '<div id="modal-config-widget" style="display:none;"></div>';
$output .= '<div id="modal-slides-dialog" style="display:none;"></div>';
// Layout.
$output .= '<div class="container-fluid">';

2
pandora_server/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-server
Version: 7.0NG.752-210315
Version: 7.0NG.752-210317
Architecture: all
Priority: optional
Section: admin

2
pandora_server/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
pandora_version="7.0NG.752-210315"
pandora_version="7.0NG.752-210317"
package_cpan=0
package_pandora=1

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

@ -45,7 +45,7 @@ our @EXPORT = qw(
# version: Defines actual version of Pandora Server for this module only
my $pandora_version = "7.0NG.752";
my $pandora_build = "210315";
my $pandora_build = "210317";
our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash

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

@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
# version: Defines actual version of Pandora Server for this module only
my $pandora_version = "7.0NG.752";
my $pandora_build = "210315";
my $pandora_build = "210317";
our $VERSION = $pandora_version." ".$pandora_build;
our %EXPORT_TAGS = ( 'all' => [ qw() ] );

2
pandora_server/pandora_server.redhat.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_server
%define version 7.0NG.752
%define release 210315
%define release 210317
Summary: Pandora FMS Server
Name: %{name}

2
pandora_server/pandora_server.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_server
%define version 7.0NG.752
%define release 210315
%define release 210317
Summary: Pandora FMS Server
Name: %{name}

4
pandora_server/pandora_server_installer
View File

@ -9,7 +9,7 @@
# **********************************************************************
PI_VERSION="7.0NG.752"
PI_BUILD="210315"
PI_BUILD="210317"
MODE=$1
if [ $# -gt 1 ]; then
@ -313,7 +313,7 @@ install () {
mkdir $DESTDIR$PANDORA_SPOOL/data_in/commands 2> /dev/null
chmod 2770 $DESTDIR$PANDORA_SPOOL/data_in/commands
mkdir -p $DESTDIR$PANDORA_LOG 2> /dev/null
chown -R pandora $DESTDIR$PANDORA_LOG 2> /dev/null
chown -R pandora:apache $DESTDIR$PANDORA_LOG 2> /dev/null
chmod 2774 $DESTDIR$PANDORA_LOG 2> /dev/null
echo "Giving proper permission to /var/spool/pandora"

4
pandora_server/util/pandora_db.pl
View File

@ -35,7 +35,7 @@ use PandoraFMS::Config;
use PandoraFMS::DB;
# version: define current version
my $version = "7.0NG.752 PS210315";
my $version = "7.0NG.752 PS210317";
# Pandora server configuration
my %conf;
@ -404,8 +404,10 @@ sub pandora_purgedb ($$) {
}
# Delete old tgraph_source data
log_message ('PURGE', 'Deleting old tgraph_source data.');
db_do ($dbh,"DELETE FROM tgraph_source WHERE id_graph NOT IN (SELECT id_graph FROM tgraph)");
# Delete network traffic old data.
log_message ('PURGE', 'Deleting old network matrix data.');
if ($conf->{'_delete_old_network_matrix'} > 0) {

2
pandora_server/util/pandora_manage.pl
View File

@ -36,7 +36,7 @@ use Encode::Locale;
Encode::Locale::decode_argv;
# version: define current version
my $version = "7.0NG.752 PS210315";
my $version = "7.0NG.752 PS210317";
# save program name for logging
my $progname = basename($0);