Merge branch 'master' of https://github.com/CESNET/nemea

README.md

@@ -3,6 +3,12 @@ NEMEA System
 
 Travis CI build: [![Build Status](https://travis-ci.org/CESNET/Nemea.svg?branch=master)](https://travis-ci.org/CESNET/Nemea)
 
+The Nemea system consists of:
+* [Nemea framework](https://github.com/CESNET/Nemea-Framework): The heart of the system that provides interconnection of modules, data format (and its handling) and common functions, algorithms and data structures.
+* [Nemea modules](https://github.com/CESNET/Nemea-Modules): Base modules of the system for export&storage of flow data, replay of stored flow data, filtering, merging, and others. It also contains a basic flow exporter capable of L7 information. 
+* [Nemea detectors](https://github.com/CESNET/Nemea-Detectors): Detection modules that can detect and report various types of malicious traffic such as DoS, DDoS, scanning, bruteforce attacks.
+* [Nemea Supervisor](https://github.com/CESNET/Nemea-Supervisor): Central management and monitoring module of the Nemea system. It takes care of running modules according to configuration.
+
 This file describes the installation and basic usage of the Nemea system.
 To see more general information, please have a look at
 https://www.liberouter.org/nemea.
@@ -30,8 +36,7 @@ be supplied soon.
 Source Codes installation
 -------------------------
 
-The Nemea system consists of the [Nemea framework](cejkato2/Nemea-Framework), Nemea modules (basic and detection) and Nemea Supervisor. The whole system
-is based on GNU/Autotools build system that makes dependency checking and
+The whole system is based on GNU/Autotools build system that makes dependency checking and
 building process much more easier.
 
 To clone the read-only repositories, use:
@@ -89,10 +94,10 @@ that can be connected with each other. Information about every module can be fou
 ```
 
 Every Nemea module can have one or more communication interfaces (IFC) implemented in
-[libtrap](./nemea-framework/libtrap). There are two types of IFCs: **input** and **output**. Numbers of module's IFCs
+[libtrap](https://github.com/CESNET/Nemea-Framework/tree/master/libtrap). There are two types of IFCs: **input** and **output**. Numbers of module's IFCs
 can be found in its help.
 
-At the beginning, let's try the `logreplay` module ([./modules/logreplay](./modules/logreplay)).
+At the beginning, let's try the `logreplay` module ([modules/logreplay](https://github.com/CESNET/Nemea-Modules/tree/master/logreplay)).
 The help output shows that `logreplay` has one output IFC:
 ```
 Name: LogReplay
@@ -103,7 +108,7 @@ Description:
   of CSV file has to be data format of fields.
 ```
 
-The complement module is `logger` ([./modules/logger](./modules/logger)), help output:
+The complement module is `logger` ([modules/logger](https://github.com/CESNET/Nemea-Modules/tree/master/logger)), help output:
 ```
 Name: Logger
 Inputs: variable
@@ -119,7 +124,7 @@ Description:
 Two modules can be interconnected using one input IFC and one output IFC.
 
 The [./use-cases](./use-cases) directory contains example scripts that demonstrate usage and functionality of
-Nemea modules. `logreplay` and `logger` can be found in [logger-repeater.sh](./use-cases/logger-repeater.sh).
+Nemea modules. `logreplay` and `logger` can be found in [./use-cases/logger-repeater.sh](./use-cases/logger-repeater.sh).
 Start the script to see how flow records are replayed from CSV file by `logreplay` and received by `logger`:
 ```
 cd use-cases
@@ -131,7 +136,7 @@ To get usage of scripts from `use-cases`, execute a script without parameter. Th
 scripts.
 
 `logreplay` is one of possible ways of getting data into the Nemea system.
-There is a [nfreader](./modules/nfreader) module that is able to read and replay `nfdump` files.
+There is a [nfreader](https://github.com/CESNET/Nemea-modules/tree/master/nfreader) module that is able to read and replay `nfdump` files.
 Last but not least, there is an [ipfixcol](https://github.com/CESNET/ipfixcol/) with [ipfixcol2unirec](https://github.com/CESNET/ipfixcol/tree/master/plugins/storage/unirec)
 that is capable of exporting flow data in UniRec format and sending it via libtrap IFC.
 
@@ -142,7 +147,7 @@ The Nemea system can be managed and monitored by a special module called
 [Supervisor](https://github.com/CESNET/Nemea-Supervisor).
 
 Some modules that are contained in Nemea-Modules and Nemea-Detectors provide their default
-configuration in [https://github.com/CESNET/Nemea-Supervisor/tree/master/configs/](nemea-supervisor/configs/).
+configuration in [nemea-supervisor/configs/](https://github.com/CESNET/Nemea-Supervisor/tree/master/configs/).
 To use prepared configuration, run `make` in `nemea-supervisor/configs` and start:
 ```
 nemea-supervisor/supervisor -f nemea-supervisor/configs/supervisor_config.xml

configure.ac

@@ -2,19 +2,27 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.63])
-AC_INIT([nemea], [2.1.0], [[email protected]])
+AC_INIT([nemea], [2.2.1], [[email protected]])
 AM_INIT_AUTOMAKE([foreign subdir-objects])
+RELEASE=1
+AC_SUBST(RELEASE)
+USERNAME=`git config --get user.name`
+USERMAIL=`git config --get user.email`
+AC_SUBST(USERNAME)
+AC_SUBST(USERMAIL)
+# Check for rpmbuild
+AC_CHECK_PROG(RPMBUILD, rpmbuild, rpmbuild, [""])
 
-# Checks for programs.
+AC_SUBST(RPMBUILD)
+if test -z "$RPMBUILD"; then
+	AC_MSG_WARN([Due to missing rpmbuild you will not able to generate RPM package.])
+fi
 
-# Checks for libraries.
+RPM_RELEASE=1
+AC_SUBST(RPM_RELEASE)
+AM_CONDITIONAL(MAKE_RPMS, test x$RPMBUILD != x)
 
-# Checks for header files.
-
-# Checks for typedefs, structures, and compiler characteristics.
-
-# Checks for library functions.
-
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([Makefile
+                  nemea.spec])
 AC_CONFIG_SUBDIRS([nemea-framework nemea-supervisor modules detectors])
 AC_OUTPUT

nemea.spec.in

@@ -0,0 +1,19 @@
+Summary: Nemea system
+Name: nemea
+Version: @PACKAGE_VERSION@
+Release: @RELEASE@
+URL: http://www.liberouter.org/
+#Source: https://www.liberouter.org/
+Group: Liberouter
+License: BSD
+Vendor: CESNET, z.s.p.o.
+Packager: @USERNAME@ <@USERMAIL@>
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
+BuildArch: noarch
+Requires: libtrap nemea-common nemea-modules nemea-detectors nemea-python nemea-pycommon nemea-supervisor
+
+%description
+Meta-package of the Nemea system, the distributed modular system for network traffic analysis and anomaly detection.
+
+%files
+

rpms.sh

@@ -73,37 +73,48 @@ export chuser
    (
       cd libtrap
       su $chuser -p -c "$topdir/generate-rpm.sh"
-      $pkginst install -y -q ./RPM*/RPMS/*/*
+      $pkginst install -y -q $(find \( -name '*noarch.rpm' -o -name '*64.rpm' \))
    )
    (
       cd common
       su $chuser -p -c "$topdir/generate-rpm.sh"
-      $pkginst install -y -q ./RPM*/RPMS/*/*
+      $pkginst install -y -q $(find \( -name '*noarch.rpm' -o -name '*64.rpm' \))
    )
    (
       cd unirec
       su $chuser -p -c "$topdir/generate-rpm.sh"
-      $pkginst install -y -q ./RPM*/RPMS/*/*
+      $pkginst install -y -q $(find \( -name '*noarch.rpm' -o -name '*64.rpm' \))
    )
    (
       cd python
-      su $chuser -p -c "$topdir/generate-rpm.sh"
-      $pkginst install -y -q ./RPM*/RPMS/*/*
+      su $chuser -p -c "python setup.py bdist_rpm"
+      $pkginst install -y -q $(find \( -name '*noarch.rpm' -o -name '*64.rpm' \))
+   )
+   (
+      cd pycommon
+      su $chuser -p -c "python setup.py bdist_rpm"
+      $pkginst install -y -q $(find \( -name '*noarch.rpm' -o -name '*64.rpm' \))
    )
 )
 (
    cd modules
    su $chuser -p -c "$topdir/generate-rpm.sh"
-   $pkginst install -y -q ./RPM*/RPMS/*/*
+   $pkginst install -y -q $(find \( -name '*noarch.rpm' -o -name '*64.rpm' \))
 )
 (
    cd detectors
    su $chuser -p -c "$topdir/generate-rpm.sh"
-   $pkginst install -y -q ./RPM*/RPMS/*/*
+   $pkginst install -y -q $(find \( -name '*noarch.rpm' -o -name '*64.rpm' \))
 )
 (
    cd nemea-supervisor
    su $chuser -p -c "$topdir/generate-rpm.sh"
-   $pkginst install -y -q ./RPM*/RPMS/*/*
+   $pkginst install -y -q $(find \( -name '*noarch.rpm' -o -name '*64.rpm' \))
 )
 
+su $chuser -p -c "$topdir/bootstrap.sh >/dev/null 2>/dev/null&& $topdir/configure -q"
+mkdir -p "`pwd`/RPMBUILD"
+rpmbuild  -ba nemea.spec --define "_topdir `pwd`/RPMBUILD"
+mkdir -p "`pwd`/rpms"
+find -name *.rpm -not -path "./rpms/*" -exec mv {} rpms/ \;
+