my %color = ();
my %mainsettings = ();
&General::readhash("${General::swroot}/main/settings", \%mainsettings);
-&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
+&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", \%color);
use POSIX();
$cgiparams{'SECTION'} = 'ipfire';
my %sections = (
+ 'apcupsd' => '(apcupsd\[.*?\]: )',
'auth' => '(\w+\(pam_unix\)\[.*\]: )',
- 'wio' => '(wio|wio\[.*\])',
+ 'wio' => '(wio:|wio\[.*\])',
'captive' => '(Captive:)',
'clamav' => '(clamd\[.*\]: |freshclam\[.*\]: )',
'collectd' => '(collectd\[.*\]: )',
'cron' => '(fcron\[.*\]: )',
'ddns' => '(ddns\[\d+\]:)',
'dhcp' => '(dhcpd: )',
- 'dma' => '(dma\[.*\]: )',
+ 'dma' => '(dma: |dma\[.*\]: |postfix/\w*\[\d*\]: )',
'guardian' => '(guardian\[.*\]: )',
+ 'haproxy' => '(haproxy\[.*?\]: )',
+ 'ipblocklist' => '(ipblocklist: )',
'ipfire' => '(ipfire: )',
'ipsec' => '(ipsec_[\w_]+: |pluto\[.*\]: |charon: |vpnwatch: )',
'kernel' => '(kernel: (?!DROP_))',
+ 'monit' => '(monit\[.*?\]: )',
'ntp' => '(ntpd(?:ate)?\[.*\]: )',
- 'oinkmaster' => '(oinkmaster\[.*\]: )',
+ 'nut' => '(upsmon\[.*?\]: )',
+ 'oinkmaster' => '(oinkmaster\[.*\]: )',
'openvpn' => '(openvpnserver\[.*\]: |.*n2n\[.*\]: )',
'pakfire' => '(pakfire:)',
'red' => '(red:|pppd\[.*\]: |chat\[.*\]|pppoe\[.*\]|pptp\[.*\]|pppoa\[.*\]|pppoa3\[.*\]|pppoeci\[.*\]|ipppd|ipppd\[.*\]|kernel: ippp\d|kernel: isdn.*|ibod\[.*\]|dhcpcd\[.*\]|modem_run\[.*\])',
- 'snort' => '(snort\[.*\]: )',
+ 'samba' => '(nmbd|smbd|winbind)\[\d+\]:',
+ 'suricata' => '(suricata: )',
'squid' => '(squid\[.*\]: |squid: )',
'ssh' => '(sshd(?:\(.*\))?\[.*\]: )',
- 'unbound' => '(unbound: \[.*:.*\])(.*:.*$)',
+ 'unbound' => '(unbound: \[.*?\])(.*:.*$)',
'urlfilter bl' => '(installpackage\[urlfilter\]: )',
- 'wireless' => '(hostapd:|kernel: ath.*:|kernel: wifi[0-9]:)'
+ 'wireless' => '(hostapd:|kernel: ath.*:|kernel: wifi[0-9]:)',
+ 'zabbix_agentd' => '(zabbix_agentd\[.*?\]: )'
);
# Translations for the %sections array.
my %trsections = (
+ 'apcupsd' => 'APCUPS',
'auth' => "$Lang::tr{'loginlogout'}",
- 'wio' => 'Who Is Online?',
- 'captive' => $Lang::tr{'captive'},
+ 'wio' => 'Who Is Online?',
+ 'captive' => $Lang::tr{'Captive'},
'clamav' => 'ClamAV',
'collectd' => 'Collectd',
'cron' => 'Cron',
'dhcp' => "$Lang::tr{'dhcp server'}",
'dma' => 'Mail',
'guardian' => "$Lang::tr{'guardian'}",
+ 'haproxy' => 'HAProxy',
+ 'ipblocklist' => "$Lang::tr{'ipblocklist'}",
'ipfire' => 'IPFire',
'ipsec' => 'IPSec',
'kernel' => "$Lang::tr{'kernel'}",
+ 'monit' => 'Monit',
'ntp' => 'NTP',
- 'oinkmaster' => 'Oinkmaster',
+ 'nut' => 'NUT',
+ 'oinkmaster' => 'Oinkmaster',
'openvpn' => 'OpenVPN',
'pakfire' => 'Pakfire',
'red' => 'RED',
- 'snort' => "$Lang::tr{'intrusion detection'}",
+ 'samba' => $Lang::tr{'samba'},
+ 'suricata' => "$Lang::tr{'intrusion detection'}",
'squid' => "$Lang::tr{'web proxy'}",
'ssh' => 'SSH',
'unbound' => 'DNS: Unbound',
'urlfilter bl' => 'URLFilter Blacklist',
- 'wireless' => 'Wireless'
+ 'wireless' => 'Wireless',
+ 'zabbix_agentd' => 'Zabbix Agent'
);
#&General::log("reading $filestr");
READ:while (<FILE>) {
my $line = $_;
- if ($line =~ /^${monthstr} ${daystr} ..:..:.. [\w\-]+ ${section}(.*)/) {
+ if ($line =~ /^${monthstr} ${daystr} ..:..:.. [\w\-\.]+ ${section}(.*)/) {
# when standard viewing, just keep in memory the correct slice
# it starts a '$start' and size is $viewport
# If export, then keep all lines...
foreach $_ (@log)
{
- /^... (..) (..:..:..) [\w\-]+ ${section}(.*)$/;
+ /^... (..) (..:..:..) [\w\-\.]+ ${section}(.*)$/;
my $day = $1;
$day =~ tr / /0/;
my $time = $cgiparams{'DAY'} ? "$2" : "$day/$2" ;
#print '<tt>';
foreach $_ (@log)
{
- /^... (..) (..:..:..) [\w\-]+ ${section}(.*)$/;
+ /^... (..) (..:..:..) [\w\-\.]+ ${section}(.*)$/;
my $day = $1;
$day =~ tr / /0/;
my $time = $cgiparams{'DAY'} ? "$2" : "$day/$2" ;