Added missing cybermon-alert script to Makefile, fixed indicator bug causing

not(not(...)) to not operate correctly.

Author: cybermaggedon

indicators/cyberprobe/fsm_extract.py

@@ -11,8 +11,6 @@
   a = lt.And([lt.Match("ipv4", "10.0.0.1"), lt.Match("ipv4", "192.168.0.1")])
   fsm = fsme.extract(a)
   m = fsme.mapify(fsm)
-
-FIXME: I think there's a bug where Not(Not(...)) doesn't work.
 """
 
 import itertools

indicators/cyberprobe/logictree.py

@@ -198,6 +198,7 @@ def record_end(self, state):
         if not self in state: state[self] = ElementState()
         if state[self].active: return
 
+        self.e.record_end(state)
         if self.e in state:
             if state[self.e].active:
                 return

subscribers/Makefile.am

@@ -1,9 +1,11 @@
 
-bin_SCRIPTS = cybermon-elasticsearch cybermon-gaffer cybermon-monitor \
-	cybermon-bigquery cybermon-cassandra cybermon-dump cybermon-geoip
+bin_SCRIPTS = cybermon-alert cybermon-elasticsearch cybermon-gaffer	\
+	cybermon-monitor cybermon-bigquery cybermon-cassandra		\
+	cybermon-dump cybermon-geoip
 
-EXTRA_DIST = cybermon-elasticsearch cybermon-gaffer cybermon-monitor \
-	cybermon-bigquery cybermon-cassandra cybermon-dump cybermon-geoip
+EXTRA_DIST = cybermon-alert cybermon-elasticsearch cybermon-gaffer	\
+	cybermon-monitor cybermon-bigquery cybermon-cassandra		\
+	cybermon-dump cybermon-geoip
 
 cyberprobe_PYTHON = cyberprobe/qcomms.py
 cyberprobedir = $(pythondir)/cyberprobe