Fix for PR

inverse-inc · Feb 12, 2018 · e2d93b8 · e2d93b8
1 parent 0e05389
commit e2d93b8
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 1 deletion.
diff --git a/addons/monit/monit_checks_configurations/00_packetfence.tt b/addons/monit/monit_checks_configurations/00_packetfence.tt
@@ -131,6 +131,12 @@ CHECK PROCESS packetfence-netdata MATCHING "netdata"
     stop program  = "[% SERVICE_BIN %] packetfence-netdata stop"
     if 3 restarts within 10 cycles then alert
 
+CHECK PROCESS packetfence-stat MATCHING "pfstats"
+    group PacketFence
+    start program = "[% SERVICE_BIN %] packetfence-stats restart"
+    stop program  = "[% SERVICE_BIN %] packetfence-stats stop"
+    if 3 restarts within 10 cycles then alert
+
 [% IF DOMAINS.size > 0 %]
 CHECK PROCESS packetfence-winbind MATCHING "winbindd-wrapper"
     group PacketFence

diff --git a/conf/documentation.conf b/conf/documentation.conf
@@ -370,6 +370,13 @@ description=<<EOT
 Should netdata be managed by PacketFence?
 EOT
 
+[services.pfstats]
+type=toggle
+options=enabled|disabled
+description=<<EOT
+Should pfstats be managed by PacketFence?
+EOT
+
 [services.httpd_binary]
 type=hidden
 description=<<EOT
@@ -446,6 +453,12 @@ description=<<EOT
 Location of the netdata binary.
 EOT
 
+[services.pfstats_binary]
+type=hidden
+description=<<EOT
+Location of the pfstats binary.
+EOT
+
 [services.radsniff_binary]
 type=hidden
 description=<<EOT

diff --git a/conf/systemd/packetfence-stats.service b/conf/systemd/packetfence-stats.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=PacketFence Collectd to Statsd daemon
+Description=PacketFence Stats daemon
 Wants=packetfence-base.target packetfence-config.service packetfence-iptables.service
 After=packetfence-base.target packetfence-config.service packetfence-iptables.service
 

diff --git a/lib/pf/cmd/pf/service.pm b/lib/pf/cmd/pf/service.pm
@@ -37,6 +37,7 @@ Services managed by PacketFence:
   pfmon            | PF monitoring daemon
   pfqueue          | PF queueing service
   pfsetvlan        | PF VLAN isolation daemon
+  pfstats          | PF statistics daemon
   radiusd          | FreeRADIUS daemon
   radsniff         | radsniff daemon
   redis_ntlm_cache | Redis for the NTLM cache

diff --git a/packetfence.rsyslog b/packetfence.rsyslog
@@ -143,3 +143,9 @@ if $programname == "pfdhcp" then -/usr/local/pf/logs/packetfence.log
 # MARIADB
 if $syslogtag contains "mysqld" then -/usr/local/pf/logs/mariadb_error.log
 & stop
+
+# pfstats
+if $syslogtag contains "pfstats" then -/usr/local/pf/logs/pfstats.log
+& stop
+
+