';
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index f031621c65..7cae2b21b8 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -20,7 +20,7 @@
/**
* Pandora build version and version
*/
-$build_version = 'PC220621';
+$build_version = 'PC220622';
$pandora_version = 'v7.0NG.762';
// Do not overwrite default timezone set if defined.
diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index b0a24a9084..7993ce3db6 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -14,7 +14,7 @@
* |___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______|
*
* ============================================================================
- * Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
+ * Copyright (c) 2005-2022 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 General Public License
@@ -2364,10 +2364,10 @@ function events_print_event_table(
// Get class name, for the link color, etc.
$data[$i] = "
".agents_get_alias($event['id_agente']).'';
// For System or SNMP generated alerts.
- } else if ($event['event_type'] == 'system') {
+ } else if ($event['event_type'] === 'system') {
$data[$i] = __('System');
} else {
- $data[$i] = __('Alert').'SNMP';
+ $data[$i] = '';
}
$i++;
diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index a02d140290..b081b7e69f 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -2690,7 +2690,9 @@ function html_print_input_password(
}
if ($class) {
- $attr['class'] = $class;
+ $attr['class'] = $class.' '.'password_input';
+ } else {
+ $attr['class'] = 'password_input';
}
if ($disabled === false) {
@@ -2761,7 +2763,9 @@ function html_print_input_text(
}
if ($class != '') {
- $attr['class'] = $class;
+ $attr['class'] = $class.' '.'text_input';
+ } else {
+ $attr['class'] = 'text_input';
}
if ($onChange != '') {
@@ -4554,7 +4558,7 @@ function html_print_autocomplete_modules(
100,
false,
'',
- ['style' => 'background: url('.$module_icon.') no-repeat right; '.$text_color.'']
+ ['style' => 'border: none; padding: 2px 5px; margin-bottom: 4px; border-bottom: 1px solid #ccc; border-radius: 0; background: url('.$module_icon.') no-repeat right; '.$text_color.'']
);
html_print_input_hidden($name.'_hidden', $id_agent_module);
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 49cfaf0f3f..57abcee37d 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -5900,7 +5900,7 @@ function ui_print_agent_autocomplete_input($parameters)
}
$attrs = [];
- $attrs['style'] = 'padding-right: 20px; background: url('.$icon_image.') no-repeat right; '.$text_color.'';
+ $attrs['style'] = 'padding-right: 20px; padding: 2px 5px; margin-bottom: 4px; border: none; border-bottom: 1px solid #ccc; border-radius: 0; background: url('.$icon_image.') no-repeat right; '.$text_color.'';
if (!$disabled_javascript_on_blur_function) {
$attrs['onblur'] = $javascript_on_blur_function_name.'()';
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index da9d972f4a..d49361fae6 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -9054,3 +9054,21 @@ div#err_msg_centralised {
padding-top: 15px;
}
}
+
+.text_input {
+ background-color: transparent !important;
+ border: none;
+ border-radius: 0;
+ border-bottom: 1px solid #ccc;
+ margin-bottom: 4px;
+ padding: 2px 5px;
+}
+
+.password_input {
+ background-color: transparent !important;
+ border: none !important;
+ border-radius: 0 !important;
+ border-bottom: 1px solid #ccc !important;
+ margin-bottom: 4px !important;
+ padding: 2px 5px !important;
+}
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 16458f531d..37124fc2e0 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
[ qw() ] );
diff --git a/pandora_server/lib/PandoraFMS/SNMPServer.pm b/pandora_server/lib/PandoraFMS/SNMPServer.pm
index 492dfdfa60..581c1b441d 100644
--- a/pandora_server/lib/PandoraFMS/SNMPServer.pm
+++ b/pandora_server/lib/PandoraFMS/SNMPServer.pm
@@ -40,6 +40,7 @@ use PandoraFMS::ProducerConsumerServer;
# Inherits from PandoraFMS::ProducerConsumerServer
our @ISA = qw(PandoraFMS::ProducerConsumerServer);
+our @EXPORT = qw(start_snmptrapd);
# Global variables
my @TaskQueue :shared;
@@ -442,26 +443,29 @@ sub start_snmptrapd ($) {
# Manual start of snmptrapd
if ($config->{'snmp_trapd'} eq 'manual') {
- logger ($config, "No SNMP trap daemon configured. Start snmptrapd manually.", 1);
- print_message ($config, " [*] No SNMP trap daemon configured. Start snmptrapd manually.", 1);
+ my $noSNMPTrap = "No SNMP trap daemon configured. Start snmptrapd manually.";
+ logger ($config, $noSNMPTrap, 1);
+ print_message ($config, " [*] $noSNMPTrap", 1);
if (! -f $config->{'snmp_logfile'}) {
- logger ($config, "SNMP log file " . $config->{'snmp_logfile'} . " not found.", 1);
- print_message ($config, " [E] SNMP log file " . $config->{'snmp_logfile'} . " not found.", 1);
+ my $noLogFile = "SNMP log file " . $config->{'snmp_logfile'} . " not found.";
+ logger ($config, $noLogFile, 1);
+ print_message ($config, " [E] $noLogFile", 1);
return 1;
}
-
+
return 0;
}
-
+
if ( -e $pid_file && open (PIDFILE, $pid_file)) {
my $pid =
+ 0;
- close PIDFILE;
+ close PIDFILE;
# Check if snmptrapd is running
if ($snmptrapd_running = kill (0, $pid)) {
- logger ($config, "snmptrapd (pid $pid) is already running, attempting to kill it...", 1);
- print_message ($config, "snmptrapd (pid $pid) is already running, attempting to kill it...", 1);
+ my $alreadyRunning = "snmptrapd (pid $pid) is already running, attempting to kill it...";
+ logger ($config, $alreadyRunning, 1);
+ print_message ($config, " [*] $alreadyRunning ", 1);
kill (9, $pid);
}
}
@@ -471,17 +475,20 @@ sub start_snmptrapd ($) {
# Select agent-addr field of the PDU or PDU source address for V1 traps
my $address_format = ($config->{'snmp_pdu_address'} eq '0' ? '%a' : '%b');
-
+
my $snmptrapd_args = ' -t -On -n' . $snmp_ignore_authfailure . ' -Lf ' . $config->{'snmp_logfile'} . ' -p ' . $pid_file;
$snmptrapd_args .= ' --format1=SNMPv1[**]%4y-%02.2m-%l[**]%02.2h:%02.2j:%02.2k[**]' . $address_format . '[**]%N[**]%w[**]%W[**]%q[**]%v\\\n';
$snmptrapd_args .= ' --format2=SNMPv2[**]%4y-%02.2m-%l[**]%02.2h:%02.2j:%02.2k[**]%b[**]%v\\\n';
if (system ($config->{'snmp_trapd'} . $snmptrapd_args . " >$DEVNULL 2>&1") != 0) {
- logger ($config, " [E] Could not start snmptrapd.", 1);
- print_message ($config, " [E] Could not start snmptrapd.", 1);
+ my $showError = "Could not start snmptrapd.";
+ logger ($config, $showError, 1);
+ print_message ($config, " [E] $showError ", 1);
return 1;
}
+ print_message ($config, " [*] snmptrapd started and running.", 1);
+
return 0;
}
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index c04b045fc8..debe0dcacf 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 7.0NG.762
-%define release 220621
+%define release 220622
Summary: Pandora FMS Server
Name: %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 4b995009bd..25e79e7786 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -3,7 +3,7 @@
#
%define name pandorafms_server
%define version 7.0NG.762
-%define release 220621
+%define release 220622
Summary: Pandora FMS Server
Name: %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 7949e21322..3fa3adf952 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
# **********************************************************************
PI_VERSION="7.0NG.762"
-PI_BUILD="220621"
+PI_BUILD="220622"
MODE=$1
if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 39e7c34516..a179a136ff 100755
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -35,7 +35,7 @@ use PandoraFMS::Config;
use PandoraFMS::DB;
# version: define current version
-my $version = "7.0NG.762 Build 220621";
+my $version = "7.0NG.762 Build 220622";
# Pandora server configuration
my %conf;
diff --git a/pandora_server/util/pandora_logrotate b/pandora_server/util/pandora_logrotate
index 3ac2623122..1abb6ff648 100644
--- a/pandora_server/util/pandora_logrotate
+++ b/pandora_server/util/pandora_logrotate
@@ -49,11 +49,15 @@
}
/var/log/pandora/pandora_snmptrap.log {
+ su pandora apache
weekly
missingok
size 500000
rotate 1
maxage 30
notifempty
+ postrotate
+ pandora_manage /etc/pandora/pandora_server.conf --start_snmptrapd > /dev/null 2>/dev/null || true
+ endscript
copytruncate
}
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index d69946d6d3..fd84475a9e 100755
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
Encode::Locale::decode_argv;
# version: define current version
-my $version = "7.0NG.762 Build 220621";
+my $version = "7.0NG.762 Build 220622";
# save program name for logging
my $progname = basename($0);
@@ -231,6 +231,7 @@ sub help_screen{
print "\nTOOLS:\n\n" unless $param ne '';
help_screen_line('--exec_from_file', ' ', "Execute any CLI option \n\t with macros from CSV file");
help_screen_line('--create_snmp_trap', ' ', "Create a new trap definition. \n\tSeverity 0 (Maintenance), 1(Info) , 2 (Normal), 3 (Warning), 4 (Critical), 5 (Minor) and 6 (Major)");
+ help_screen_line('--start_snmptrapd', '[no parameters needed]', "Start the snmptrap process or restart if it is running");
print "\nSETUP:\n\n" unless $param ne '';
help_screen_line('--set_event_storm_protection', '', "Enable (1) or disable (0) event \n\t storm protection");
@@ -279,7 +280,7 @@ sub api_call($$$;$$$$) {
my $ua = new LWP::UserAgent;
my $url = $pa_config->{"console_api_url"};
my $response = $ua->post($url, $params);
-
+
if ($response->is_success) {
$content = $response->decoded_content();
}
@@ -1188,6 +1189,16 @@ sub cli_enable_group() {
pandora_enable_group ($conf, $dbh, $id_group);
}
+##############################################################################
+# Start snmptrap process.
+# Related option: --start_snmptrapd
+##############################################################################
+sub cli_start_snmptrapd() {
+ use PandoraFMS::SNMPServer;
+ print_log "[INFO] Starting snmptrap process. \n";
+ PandoraFMS::SNMPServer::start_snmptrapd(\%conf);
+}
+
##############################################################################
# Create an agent.
# Related option: --created_agent
@@ -7526,6 +7537,10 @@ sub pandora_manage_main ($$$) {
param_check($ltotal, 1);
cli_enable_group();
}
+ elsif ($param eq '--start_snmptrapd') {
+ #param_check($ltotal, 0);
+ cli_start_snmptrapd();
+ }
elsif ($param eq '--create_agent') {
param_check($ltotal, 8, 4);
cli_create_agent();