*** ./web/showgraph.c.orig 2015-10-01 08:42:42.000000000 -0600 --- ./web/showgraph.c 2017-11-20 14:44:49.614862000 -0700 *************** *** 1011,1016 **** --- 1011,1030 ---- rrddbs[rrddbcount].rrdparam = (char *)malloc(strlen("http://")+strlen(param)+1); sprintf(rrddbs[rrddbcount].rrdparam, "http://%s", param); } + /* + * Change underscores to spaces as this is a common mangling + * used by temperature and lic backends + */ + else if ((strcmp(gdef->name, "temperature") == 0) || (strcmp(gdef->name, "lic") == 0)) { + char *p; + int i; + + p = param; + for (i=0; (i < strlen(p)); i++) { + if (p[i] == '_') p[i] = ' '; + } + rrddbs[rrddbcount].rrdparam = strdup(p); + } else { rrddbs[rrddbcount].rrdparam = strdup(param); } *** ./xymonnet/protocols.cfg.orig 2015-10-19 04:10:11.000000000 -0600 --- ./xymonnet/protocols.cfg 2017-11-20 14:44:49.619905000 -0700 *************** *** 67,79 **** port 992 [smtp] ! send "mail\r\nquit\r\n" expect "220" options banner port 25 [smtps] ! send "mail\r\nquit\r\n" expect "220" options ssl,banner # No default port-number assignment for smtps - nonstandard according to IANA --- 67,79 ---- port 992 [smtp] ! send "helo localhost\r\nquit\r\n" expect "220" options banner port 25 [smtps] ! send "helo localhost\r\nquit\r\n" expect "220" options ssl,banner # No default port-number assignment for smtps - nonstandard according to IANA *************** *** 248,250 **** --- 248,265 ---- [lpd] port 515 + # NETBIOS Session Service for NT Authentication + [netbios-ssn] + port 139 + + # Simple Network Paging Protocol (SNPP) + [snpp] + send "quit\r\n" + expect "220" + options banner + port 444 + + # line printer spooler (lpd) + [lpd] + port 515 + *** ./xymond/etcfiles/graphs.cfg.orig 2017-01-05 19:21:07.000000000 -0700 --- ./xymond/etcfiles/graphs.cfg 2017-11-20 14:44:49.629880000 -0700 *************** *** 109,121 **** TITLE Disk Utilization YAXIS Used DEF:p@RRDIDX@=@RRDFN@:used:AVERAGE ! CDEF:p@RRDIDX@t=p@RRDIDX@,1024,* ! LINE2:p@RRDIDX@t#@COLOR@:@RRDPARAM@ -l 0 ! GPRINT:p@RRDIDX@:LAST: \: %5.1lf KB (cur) ! GPRINT:p@RRDIDX@:MAX: \: %5.1lf KB (max) ! GPRINT:p@RRDIDX@:MIN: \: %5.1lf KB (min) ! GPRINT:p@RRDIDX@:AVERAGE: \: %5.1lf KB (avg)\n # The qtree graphs are based on the qtree report from filerstats2bb.pl # These handle NetApp storage devices. --- 109,120 ---- TITLE Disk Utilization YAXIS Used DEF:p@RRDIDX@=@RRDFN@:used:AVERAGE ! LINE2:p@RRDIDX@#@COLOR@:@RRDPARAM@ -l 0 ! GPRINT:p@RRDIDX@:LAST: \: %5.1lf%s (cur) ! GPRINT:p@RRDIDX@:MAX: \: %5.1lf%s (max) ! GPRINT:p@RRDIDX@:MIN: \: %5.1lf%s (min) ! GPRINT:p@RRDIDX@:AVERAGE: \: %5.1lf%s (avg)\n # The qtree graphs are based on the qtree report from filerstats2bb.pl # These handle NetApp storage devices. *************** *** 2112,2114 **** --- 2111,2128 ---- ########### end of ifmib graphs ########### + # License Manager (like FlexLM) Utilization + [lic] + FNPATTERN ^lic.(.+).rrd + TITLE License Utilization + YAXIS Licenses + DEF:t@RRDIDX@=@RRDFN@:total:AVERAGE + DEF:u@RRDIDX@=@RRDFN@:used:AVERAGE + LINE2:u@RRDIDX@#@COLOR@:@RRDPARAM@ + COMMENT:\n + GPRINT:t@RRDIDX@:LAST: \: %4.0lf (total) + GPRINT:u@RRDIDX@:LAST: \: %4.0lf (cur) + GPRINT:u@RRDIDX@:MAX: \: %4.0lf (max) + GPRINT:u@RRDIDX@:MIN: \: %4.0lf (min) + GPRINT:u@RRDIDX@:AVERAGE: \: %5.1lf (avg)\n + *** ./xymond/rrd/do_disk.c.orig 2012-07-13 08:05:20.000000000 -0600 --- ./xymond/rrd/do_disk.c 2017-11-20 14:44:49.634868000 -0700 *************** *** 49,55 **** if (strstr(msg, " xfs ") || strstr(msg, " efs ") || strstr(msg, " cxfs ")) dsystype = DT_IRIX; else if (strstr(msg, "DASD")) dsystype = DT_AS400; else if (strstr(msg, "NetWare Volumes")) dsystype = DT_NETWARE; ! else if (strstr(msg, "NetAPP")) dsystype = DT_NETAPP; else if (strstr(msg, "Summary")) dsystype = DT_BBWIN; /* BBWin > 0.10 is almost like Windows/NT */ else if (strstr(msg, "Filesystem")) dsystype = DT_NT; else dsystype = DT_UNIX; --- 49,55 ---- if (strstr(msg, " xfs ") || strstr(msg, " efs ") || strstr(msg, " cxfs ")) dsystype = DT_IRIX; else if (strstr(msg, "DASD")) dsystype = DT_AS400; else if (strstr(msg, "NetWare Volumes")) dsystype = DT_NETWARE; ! else if (strstr(msg, "NetAPP") || strstr(msg, "NetApp")) dsystype = DT_NETAPP; else if (strstr(msg, "Summary")) dsystype = DT_BBWIN; /* BBWin > 0.10 is almost like Windows/NT */ else if (strstr(msg, "Filesystem")) dsystype = DT_NT; else dsystype = DT_UNIX; *************** *** 85,92 **** /* AS/400 reports must contain the word DASD */ if ((dsystype == DT_AS400) && (strstr(curline, "DASD") == NULL)) goto nextline; ! /* All clients except AS/400 report the mount-point with slashes - ALSO Win32 clients. */ ! if ((dsystype != DT_AS400) && (strchr(curline, '/') == NULL)) goto nextline; /* red/yellow filesystems show up twice */ if ((dsystype != DT_NETAPP) && (dsystype != DT_NETWARE) && (dsystype != DT_AS400)) { --- 85,95 ---- /* AS/400 reports must contain the word DASD */ if ((dsystype == DT_AS400) && (strstr(curline, "DASD") == NULL)) goto nextline; ! /* All clients except AS/400 and NetApp aggregates report the mount-point with slashes - ALSO Win32 clients. */ ! if ((dsystype != DT_AS400) && (strchr(curline, '/') == NULL)) { ! if (dsystype != DT_NETAPP) goto nextline; ! if (!strstr(curline, " aggr")) goto nextline; ! } /* red/yellow filesystems show up twice */ if ((dsystype != DT_NETAPP) && (dsystype != DT_NETWARE) && (dsystype != DT_AS400)) { *************** *** 94,99 **** --- 97,103 ---- if ((strstr(curline, " red ") || strstr(curline, " yellow "))) goto nextline; } + if (strstr(curline, " has reached the defined ")) goto nextline; for (columncount=0; (columncount<20); columncount++) columns[columncount] = ""; fsline = xstrdup(curline); columncount = 0; p = strtok(fsline, " "); while (p && (columncount < 20)) { columns[columncount++] = p; p = strtok(NULL, " "); } *************** *** 160,165 **** --- 164,171 ---- pused = atoi(columns[7]); break; } + /* Convert kilobytes to bytes so that RRD is compatible with RRD data ported from Big Brother */ + aused *= 1024; /* Check include/exclude patterns */ wanteddisk = 1; *** ./xymond/rrd/do_temperature.c.orig 2013-07-30 06:47:38.000000000 -0600 --- ./xymond/rrd/do_temperature.c 2017-11-20 14:44:49.638881000 -0700 *************** *** 78,83 **** --- 78,91 ---- else if (strncasecmp(bol, "", 3) == 0) { bol += 3; } bol += strspn(bol, " \t"); + /* Strip off any leading bold and italic HTML tags */ + if (strncasecmp(bol, "", 6) == 0) { bol += 6; } + else if (strncasecmp(bol, "", 3) == 0) { bol += 3; } + else if (strncasecmp(bol, "", 6) == 0) { bol += 6; } + else if (strncasecmp(bol, "", 3) == 0) { bol += 3; } + + bol += strspn(bol, " \t"); + p = bol + strlen(bol) - 1; while ((p > bol) && isspace((int)*p)) p--; while ((p > bol) && isdigit((int)*p)) p--; *** ./xymond/xymond.c.orig 2017-01-05 19:00:06.000000000 -0700 --- ./xymond/xymond.c 2017-11-20 14:44:49.646883000 -0700 *************** *** 62,69 **** /* * The absolute maximum size we'll grow our buffers to accommodate an incoming message. * This is really just an upper bound to squash the bad guys trying to data-flood us. */ ! #define MAX_XYMON_INBUFSZ (10*1024*1024) /* 10 MB */ /* The initial size of an input buffer. Make this large enough for most traffic. */ #define XYMON_INBUF_INITIAL (128*1024) --- 62,70 ---- /* * The absolute maximum size we'll grow our buffers to accommodate an incoming message. * This is really just an upper bound to squash the bad guys trying to data-flood us. + * TSchmidt - increase from 10MB to 100MB since Windows 7+ sends > 10MB on boot. */ ! #define MAX_XYMON_INBUFSZ (100*1024*1024) /* 100 MB */ /* The initial size of an input buffer. Make this large enough for most traffic. */ #define XYMON_INBUF_INITIAL (128*1024)