Merge pull request #189 from CESNET/ipfix-template-export

Ipfix - add option to configure template export rate

Author: SiskaPavel

init/ipfixprobed

@@ -70,7 +70,7 @@ if [ -e "$CONFFILE" ]; then
    if [[ $UDP == "yes" ]]; then
         UDP_PARAM="udp";
    fi
-   output="-o ipfix;host=${HOST:-127.0.0.1};port=${PORT:-4739};id=${LINK:-0};dir=${DIR:-0};${UDP_PARAM}"
+   output="-o ipfix;host=${HOST:-127.0.0.1};port=${PORT:-4739};id=${LINK:-0};dir=${DIR:-0};${UDP_PARAM};template=${TEMPLATE_REFRESH_RATE:-300}"
 
    exec /usr/bin/ipfixprobe "${dpdkinput[@]}" $input $storage $process $output
 else

init/link0.conf.example

@@ -174,3 +174,5 @@ PORT=4739
 # Use UDP yes/no? (instead of TCP)
 UDP=yes
 
+# Export ipfix template every N seconds (UDP)
+TEMPLATE_REFRESH_RATE=300

output/ipfix.cpp

@@ -171,6 +171,7 @@ void IPFIXExporter::init(const char *params)
    odid = parser.m_id;
    mtu = parser.m_mtu;
    dir_bit_field = parser.m_dir;
+   templateRefreshTime = parser.m_template_refresh_time;
 
    if (parser.m_udp) {
       protocol = IPPROTO_UDP;

output/ipfix.hpp

@@ -75,10 +75,12 @@ class IpfixOptParser : public OptionsParser
    bool m_udp;
    uint64_t m_id;
    uint32_t m_dir;
+   uint32_t m_template_refresh_time;
    bool m_verbose;
 
    IpfixOptParser() : OptionsParser("ipfix", "Output plugin for ipfix export"),
-      m_host("127.0.0.1"), m_port(4739), m_mtu(DEFAULT_MTU), m_udp(false), m_id(DEFAULT_EXPORTER_ID), m_dir(0), m_verbose(false)
+      m_host("127.0.0.1"), m_port(4739), m_mtu(DEFAULT_MTU), m_udp(false), m_id(DEFAULT_EXPORTER_ID), m_dir(0), 
+      m_template_refresh_time(TEMPLATE_REFRESH_TIME), m_verbose(false)
    {
       register_option("h", "host", "ADDR", "Remote collector address", [this](const char *arg){m_host = arg; return true;}, OptionFlags::RequiredArgument);
       register_option("p", "port", "PORT", "Remote collector port",
@@ -94,6 +96,9 @@ class IpfixOptParser : public OptionsParser
       register_option("d", "dir", "NUM", "Dir bit field value",
          [this](const char *arg){try {m_dir = str2num<decltype(m_dir)>(arg);} catch(std::invalid_argument &e) {return false;} return true;},
          OptionFlags::RequiredArgument);
+      register_option("t", "template", "NUM", "Template refresh rate (sec)",
+         [this](const char *arg){try {m_template_refresh_time = str2num<decltype(m_template_refresh_time)>(arg);} 
+         catch(std::invalid_argument &e) {return false;} return true;}, OptionFlags::RequiredArgument);
       register_option("v", "verbose", "", "Enable verbose mode", [this](const char *arg){m_verbose = true; return true;}, OptionFlags::NoArgument);
    }
 };