Title: [opsview-base] [253] Added nfdump 1.6.9 with -g patch
- Revision
- 253
- Author
- hstevenson
- Date
- 2013-05-07 14:56:41 +0100 (Tue, 07 May 2013)
Log Message
Added nfdump 1.6.9 with -g patch
Modified Paths
Added Paths
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2013-05-02 16:58:15 UTC (rev 252)
+++ trunk/Makefile 2013-05-07 13:56:41 UTC (rev 253)
@@ -51,6 +51,7 @@
TANGOICONS = tango-icon-theme-0.8.90
WEBICONS = iconsjoy-webicons-3
JSSCRIPTS = anylinkcssmenu.js
+NFDUMP = nfdump-1.6.9
FLOT = flot-0.5
JQUERYSPARKLINES=jquery.sparkline.uncompressed.2.1.js
# EasyXDM is different. Need to install every version available
@@ -157,7 +158,7 @@
${NDOUTILS} nrpe.cfg opsview-base.spec opsview-agent.spec \
allmibs.tar.gz ${CHECK_RADIUS_IH} ${AUTOSSH} ${HYPERGRAPH} ${NMIS} ${FABTABULOUS} \
${NAGVIS} ${DATATABLES} ${TIMELINE} ${TANGOICONS} ${WEBICONS} ${ICOJOY4} ${FLOT} \
- ${JQUERYSPARKLINES} ${EASYXDM} ${SHOWDOWN} ${WMI}
+ ${JQUERYSPARKLINES} ${EASYXDM} ${SHOWDOWN} ${WMI} ${NFDUMP}
all: ${GENERATED}
@@ -172,7 +173,7 @@
install: dirs ${NAGIOS}-install ${NAGIOSPLUG}-install ${NRPE}-install ${NSCA}-install \
_javascript_-install ${NDOUTILS}-install install-mibs \
${CHECK_RADIUS_IH}-install ${AUTOSSH}-install ${NMIS}-install nrpe.cfg-install \
- ${FLOT}-install ${WMI}-install \
+ ${FLOT}-install ${NFDUMP}-install ${WMI}-install \
${ICOJOY4}-install ${FABTABULOUS}-install ${TANGOICONS}-install ${WEBICONS}-install ${NAGVIS}-install \
easyxdm-install \
${SHOWDOWN}-install \
@@ -387,6 +388,8 @@
wmi: ${WMI}
+nfdump: ${NFDUMP}
+
hypergraph: ${HYPERGRAPH}
hypergraph-install: ${HYPERGRAPH}-install
@@ -415,6 +418,18 @@
cd ${WMI} && patch -p1 < ../patches/wmi_fgrep.patch
cd ${WMI} && make -f GNUmakefile
+${NFDUMP}:
+ tar xzf ${NFDUMP}.tar.gz
+ cd ${NFDUMP} && patch -p1 < ../patches/nfdump-relative-time.patch
+
+${NFDUMP}-build: ${NFDUMP}
+ cd ${NFDUMP} && ./configure && make
+
+${NFDUMP}-install: ${NFDUMP}-build
+ for file in nfreplay nfdump nfcapd nfexpire nfanon; do \
+ ${INSTALL} -c -o $(NAGIOS_USER) -g $(NAGIOS_GROUP) -m 0500 ${NFDUMP}/bin/$$file ${DESTDIR}/${BIN_DIR}/$$file; \
+ done
+
${HYPERGRAPH}:
unzip -q ${HYPERGRAPH}.zip -d ${HYPERGRAPH}
Added: trunk/nfdump-1.6.9.tar.gz
===================================================================
(Binary files differ)
Property changes on: trunk/nfdump-1.6.9.tar.gz
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/patches/nfdump-relative-time.patch
===================================================================
--- trunk/patches/nfdump-relative-time.patch (rev 0)
+++ trunk/patches/nfdump-relative-time.patch 2013-05-07 13:56:41 UTC (rev 253)
@@ -0,0 +1,77 @@
+diff -urN nfdump-1.6.9/bin/nfdump.c nfdump-final/bin/nfdump.c
+--- nfdump-1.6.9/bin/nfdump.c 2013-01-01 13:14:07.000000000 +0000
++++ nfdump-final/bin/nfdump.c 2013-05-07 14:31:35.000000000 +0100
+@@ -726,6 +726,7 @@
+ uint16_t Aggregate_Bits;
+ uint32_t limitflows;
+ uint64_t AggregateMasks[AGGR_SIZE];
++long gfile;
+ char Ident[IDENTLEN];
+
+ rfile = Rfile = Mdirs = wfile = ffile = filter = tstring = stat_type = NULL;
+@@ -754,6 +755,7 @@
+ csv_output = 0;
+ is_anonymized = 0;
+ GuessDir = 0;
++ gfile = 0;
+ nameserver = NULL;
+
+ print_format = NULL;
+@@ -770,7 +772,7 @@
+
+ for ( i=0; i<AGGR_SIZE; AggregateMasks[i++] = 0 ) ;
+
+- while ((c = getopt(argc, argv, "6aA:Bbc:D:E:s:hHn:i:j:f:qzr:v:w:K:M:NImO:R:XZt:TVv:x:l:L:o:")) != EOF) {
++ while ((c = getopt(argc, argv, "6aA:Bbc:D:E:s:hHn:i:j:f:qzr:v:w:K:M:NImO:R:XZt:TVv:x:l:L:o:g:")) != EOF) {
+ switch (c) {
+ case 'h':
+ usage(argv[0]);
+@@ -867,7 +869,47 @@
+ ffile = optarg;
+ break;
+ case 't':
+- tstring = optarg;
++ if(!tstring)
++ tstring = optarg;
++ break;
++ case 'g':
++ {
++ time_t rawtime;
++ struct tm *newtime, *start_time, *end_time;
++ char colonPos = 0;
++ rawtime = time(NULL);
++ char *duration = 0;
++ char *colon = NULL;
++ char *rewind;
++
++ tstring = (char *)malloc(sizeof(char) * 40);
++
++ colonPos = strchr(optarg, ':') - optarg;
++ colon = strchr(optarg, ':');
++
++ if ( colon ) {
++ duration = colon + 1;
++ *colon = 0;
++ }
++
++ if ( *optarg == '-' ) {
++ rewind = optarg + 1;
++ rawtime -= atoi(rewind);
++ start_time = localtime( &rawtime );
++ } else {
++ rawtime = atoi(optarg);
++ start_time = localtime(&rawtime);
++ }
++
++ strftime(tstring, 20, "%Y/%m/%d.%H:%M:%S", start_time);
++
++ if ( duration ) {
++ rawtime += atoi(duration);
++ end_time = localtime(&rawtime);
++
++ strftime(tstring+19, 21, "-%Y/%m/%d.%H:%M:%S", end_time);
++ }
++ }
+ break;
+ case 'r':
+ rfile = optarg;
_______________________________________________
Opsview-checkins mailing list
Opsview-checkins@lists.opsview.org
http://lists.opsview.org/lists/listinfo/opsview-checkins
