From: <jcc...@us...> - 2015-04-09 11:51:08
|
Revision: 7626 http://sourceforge.net/p/xymon/code/7626 Author: jccleaver Date: 2015-04-09 11:51:06 +0000 (Thu, 09 Apr 2015) Log Message: ----------- CREDITS/Changelog updates Modified Paths: -------------- branches/4.x-master/CREDITS branches/4.x-master/Changes branches/4.x-master/debian/changelog branches/4.x-master/include/version.h Modified: branches/4.x-master/CREDITS =================================================================== --- branches/4.x-master/CREDITS 2015-04-09 11:49:26 UTC (rev 7625) +++ branches/4.x-master/CREDITS 2015-04-09 11:51:06 UTC (rev 7626) @@ -47,10 +47,12 @@ Eric Schwimmer Bill Simaz Andy Smith +Bernard Spil Gavin Stone-Tolcher Jeff Stoner David Stuffle Christian Thibodeau +John Thurston Rick Waegner Rob Watson Modified: branches/4.x-master/Changes =================================================================== --- branches/4.x-master/Changes 2015-04-09 11:49:26 UTC (rev 7625) +++ branches/4.x-master/Changes 2015-04-09 11:51:06 UTC (rev 7626) @@ -1,3 +1,20 @@ +Changes from 4.3.19 -> 4.xx.yy (00 Apr 2015) +=========================================== + +* rev xxyy + +* Summaries should be properly displayed again +* An icon for green acknowledged states is now included -- ironically, the + original icon that the other checkmarks were based off of. +* The various utilities in cgi-bin and cgi-secure are now hardlinked to + cgiwrap at install time instead of softlink, to allow for FollowSymLinks-less + apache configurations +* The protocol section of URLs in hosts.cfg is now case-insensitive, and ftps + URLs (FTP-over-SSL, not sftp) are recognized as a protocol. +* hosts.cfg docs have been clarified to include delayyellow and delayred as + allowable options (Reported by John Thurston) +* 'optional include' and 'optional directory' syntax has been documented + Changes from 4.3.18 -> 4.3.19 (30 Mar 2015) =========================================== @@ -29,7 +46,7 @@ after any TIME= filter. Use (e.g.) to exclude Wednesday afternoons on a line which is already restricted to 9:00a to 5:00p on weekdays only. * The included version of c-ares has been bumped to version 1.10.0. -* Support for older EGD (entropy gathering daemon) has been removed +* Support for older EGD (entropy gathering daemon) has been removed (Thanks, Bernard Spil) * A crash when xymond_rrd was run in --debug mode on non GNU/glibc systems has been fixed * The msgs and procs tests are now HTML-encoded to ensure that lines with brackets Modified: branches/4.x-master/debian/changelog =================================================================== --- branches/4.x-master/debian/changelog 2015-04-09 11:49:26 UTC (rev 7625) +++ branches/4.x-master/debian/changelog 2015-04-09 11:51:06 UTC (rev 7626) @@ -1,4 +1,23 @@ +xymon (4.xx.yy) unstable; urgency=medium + + * rev xxxx + + * Summaries should be properly displayed again + * An icon for green acknowledged states is now included -- ironically, the + original icon that the other checkmarks were based off of. + * The various utilities in cgi-bin and cgi-secure are now hardlinked to + cgiwrap at install time instead of softlink, to allow for FollowSymLinks-less + apache configurations + * The protocol section of URLs in hosts.cfg is now case-insensitive, and ftps + URLs (FTP-over-SSL, not sftp) are recognized as a protocol. + * hosts.cfg docs have been clarified to include delayyellow and delayred as + allowable options (Reported by John Thurston) +* 'optional include' and 'optional directory' syntax has been documented + + -- Japheth Cleaver <cle...@te...> XXX, 00 Apr 2015 22:39:17 -0700 + + xymon (4.3.19) unstable; urgency=medium * rev 7619 @@ -29,7 +48,7 @@ after any TIME= filter. Use (e.g.) to exclude Wednesday afternoons on a line which is already restricted to 9:00a to 5:00p on weekdays only. * The included version of c-ares has been bumped to version 1.10.0. - * Support for older EGD (entropy gathering daemon) has been removed + * Support for older EGD (entropy gathering daemon) has been removed (Thanks, Bernard Spil) * A crash when xymond_rrd was run in --debug mode on non GNU/glibc systems has been fixed * The msgs and procs tests are now HTML-encoded to ensure that lines with brackets Modified: branches/4.x-master/include/version.h =================================================================== --- branches/4.x-master/include/version.h 2015-04-09 11:49:26 UTC (rev 7625) +++ branches/4.x-master/include/version.h 2015-04-09 11:51:06 UTC (rev 7626) @@ -11,7 +11,7 @@ #ifndef __VERSION_H__ #define __VERSION_H__ -#define VERSION "4.3.19" +#define VERSION "4.x-master" #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jcc...@us...> - 2015-04-10 20:36:16
|
Revision: 7627 http://sourceforge.net/p/xymon/code/7627 Author: jccleaver Date: 2015-04-10 20:36:07 +0000 (Fri, 10 Apr 2015) Log Message: ----------- Honor pulldata=IP:PORT specifiers (Reported by John Thurston) Modified Paths: -------------- branches/4.x-master/Changes branches/4.x-master/RELEASENOTES branches/4.x-master/common/xymon-xmh.5 branches/4.x-master/debian/changelog branches/4.x-master/lib/loadhosts.c branches/4.x-master/lib/loadhosts.h branches/4.x-master/xymond/xymond.c branches/4.x-master/xymond/xymonfetch.c Modified: branches/4.x-master/Changes =================================================================== --- branches/4.x-master/Changes 2015-04-09 11:51:06 UTC (rev 7626) +++ branches/4.x-master/Changes 2015-04-10 20:36:07 UTC (rev 7627) @@ -14,6 +14,8 @@ * hosts.cfg docs have been clarified to include delayyellow and delayred as allowable options (Reported by John Thurston) * 'optional include' and 'optional directory' syntax has been documented +* pulldata directives in the hosts.cfg file now honor a given IP address and port + XMH_FLAG_PULLDATA is now retired; XMH_PULLDATA must be used in its place Changes from 4.3.18 -> 4.3.19 (30 Mar 2015) =========================================== Modified: branches/4.x-master/RELEASENOTES =================================================================== --- branches/4.x-master/RELEASENOTES 2015-04-09 11:51:06 UTC (rev 7626) +++ branches/4.x-master/RELEASENOTES 2015-04-10 20:36:07 UTC (rev 7627) @@ -1,5 +1,5 @@ <<<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>>> - * * * Release notes for Xymon 4.3.19 * * * + * * * Release notes for Xymon 4.xx.yy * * * <<<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>>> @@ -10,6 +10,19 @@ Changes file. +Changes for 4.3.20 +================== +Remote summaries have been broken for a while but should now display again + +Documentation for various directives in hosts.cfg(5) has been added + +pullclient=IP:PORT directives are honored, if the defaults for the host are +incorrect + +cgiwrap is now installed via hardlinking (or as packaged); FollowSymLinks +is no longer needed for the xymon cgi-bin directories and can be removed. + + Changes for 4.3.19 ================== This is mostly a bugfix release (see the Changes file for a full list), Modified: branches/4.x-master/common/xymon-xmh.5 =================================================================== --- branches/4.x-master/common/xymon-xmh.5 2015-04-09 11:51:06 UTC (rev 7626) +++ branches/4.x-master/common/xymon-xmh.5 2015-04-10 20:36:07 UTC (rev 7627) @@ -67,6 +67,9 @@ .IP XMH_DOWNTIME Value of the DOWNTIME tag. +.IP XMH_PULLDATA +Value of the PULLDATA tag (including IP:PORT, if any) + .IP XMH_FLAG_DIALUP Value of the "dialup" tag. @@ -112,9 +115,6 @@ .IP XMH_FLAG_PREFER Value of the "prefer" tag. -.IP XMH_FLAG_PULLDATA -Value of the PULLDATA tag. - .IP XMH_FLAG_TESTIP Value of the "testip" tag. Modified: branches/4.x-master/debian/changelog =================================================================== --- branches/4.x-master/debian/changelog 2015-04-09 11:51:06 UTC (rev 7626) +++ branches/4.x-master/debian/changelog 2015-04-10 20:36:07 UTC (rev 7627) @@ -13,7 +13,8 @@ URLs (FTP-over-SSL, not sftp) are recognized as a protocol. * hosts.cfg docs have been clarified to include delayyellow and delayred as allowable options (Reported by John Thurston) -* 'optional include' and 'optional directory' syntax has been documented + * 'optional include' and 'optional directory' syntax has been documented + * pulldata directives in the hosts.cfg file now honor a given IP address and port -- Japheth Cleaver <cle...@te...> XXX, 00 Apr 2015 22:39:17 -0700 Modified: branches/4.x-master/lib/loadhosts.c =================================================================== --- branches/4.x-master/lib/loadhosts.c 2015-04-09 11:51:06 UTC (rev 7626) +++ branches/4.x-master/lib/loadhosts.c 2015-04-10 20:36:07 UTC (rev 7627) @@ -164,8 +164,8 @@ xmh_item_name[XMH_FLAG_NOCLEAR] = "XMH_FLAG_NOCLEAR"; xmh_item_key[XMH_FLAG_HIDEHTTP] = "HIDEHTTP"; xmh_item_name[XMH_FLAG_HIDEHTTP] = "XMH_FLAG_HIDEHTTP"; - xmh_item_key[XMH_FLAG_PULLDATA] = "PULLDATA"; - xmh_item_name[XMH_FLAG_PULLDATA] = "XMH_FLAG_PULLDATA"; + xmh_item_key[XMH_PULLDATA] = "PULLDATA"; + xmh_item_name[XMH_PULLDATA] = "XMH_PULLDATA"; xmh_item_key[XMH_FLAG_MULTIHOMED] = "MULTIHOMED"; xmh_item_name[XMH_FLAG_MULTIHOMED] = "XMH_MULTIHOMED"; xmh_item_key[XMH_FLAG_HTTP_HEADER_MATCH] = "headermatch"; @@ -603,6 +603,12 @@ if (p == NULL) p = xmh_find_item(host, XMH_FLAG_NOBB2); return p; + case XMH_PULLDATA: + /* special - can be 'pulldata=IP:PORT' or just 'pulldata' */ + p = xmh_find_item(host, XMH_PULLDATA); + if ((p != NULL) && (*(p) == '\0')) p = xmh_item_key[XMH_PULLDATA]; /* mirror flag semantics */ + return p; + default: return xmh_find_item(host, item); } Modified: branches/4.x-master/lib/loadhosts.h =================================================================== --- branches/4.x-master/lib/loadhosts.h 2015-04-09 11:51:06 UTC (rev 7626) +++ branches/4.x-master/lib/loadhosts.h 2015-04-10 20:36:07 UTC (rev 7627) @@ -52,7 +52,7 @@ XMH_FLAG_LDAPFAILYELLOW, XMH_FLAG_NOCLEAR, XMH_FLAG_HIDEHTTP, - XMH_FLAG_PULLDATA, + XMH_PULLDATA, XMH_FLAG_MULTIHOMED, XMH_FLAG_SNI, XMH_FLAG_NOSNI, Modified: branches/4.x-master/xymond/xymond.c =================================================================== --- branches/4.x-master/xymond/xymond.c 2015-04-09 11:51:06 UTC (rev 7626) +++ branches/4.x-master/xymond/xymond.c 2015-04-10 20:36:07 UTC (rev 7627) @@ -1547,7 +1547,7 @@ * - some multi-homed hosts use a random IP for sending us data. */ if ( (strcmp(log->sender, "xymond") != 0) && (strcmp(sender, "xymond") != 0) && (strcmp(sender, "0.0.0.0") != 0)) { - if ((xmh_item(hinfo, XMH_FLAG_PULLDATA) == NULL) && (xmh_item(hinfo, XMH_FLAG_MULTIHOMED) == NULL)) { + if ((xmh_item(hinfo, XMH_PULLDATA) == NULL) && (xmh_item(hinfo, XMH_FLAG_MULTIHOMED) == NULL)) { log_multisrc(log, sender); } } Modified: branches/4.x-master/xymond/xymonfetch.c =================================================================== --- branches/4.x-master/xymond/xymonfetch.c 2015-04-09 11:51:06 UTC (rev 7626) +++ branches/4.x-master/xymond/xymonfetch.c 2015-04-10 20:36:07 UTC (rev 7627) @@ -484,7 +484,7 @@ char *hname; clients_t *newclient; - if (!xmh_item(hostwalk, XMH_FLAG_PULLDATA)) continue; + if (!xmh_item(hostwalk, XMH_PULLDATA)) continue; hname = xmh_item(hostwalk, XMH_HOSTNAME); handle = xtreeFind(clients, hname); @@ -613,7 +613,7 @@ /* Deleted hosts stay in our tree - but should disappear from the known hosts */ hostwalk = hostinfo(clientwalk->hostname); if (!hostwalk) continue; - pullstr = xmh_item(hostwalk, XMH_FLAG_PULLDATA); if (!pullstr) continue; + pullstr = xmh_item(hostwalk, XMH_PULLDATA); if (!pullstr) continue; ip = strchr(pullstr, '='); port = atoi(xgetenv("XYMONDPORT")); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jcc...@us...> - 2015-04-13 18:15:42
|
Revision: 7628 http://sourceforge.net/p/xymon/code/7628 Author: jccleaver Date: 2015-04-13 18:15:39 +0000 (Mon, 13 Apr 2015) Log Message: ----------- Fix timespec/extimespec alert display in confreport.sh Modified Paths: -------------- branches/4.x-master/Changes branches/4.x-master/debian/changelog branches/4.x-master/lib/loadalerts.c Modified: branches/4.x-master/Changes =================================================================== --- branches/4.x-master/Changes 2015-04-10 20:36:07 UTC (rev 7627) +++ branches/4.x-master/Changes 2015-04-13 18:15:39 UTC (rev 7628) @@ -16,7 +16,10 @@ * 'optional include' and 'optional directory' syntax has been documented * pulldata directives in the hosts.cfg file now honor a given IP address and port XMH_FLAG_PULLDATA is now retired; XMH_PULLDATA must be used in its place +* confreport.sh not displaying time-restricted alerts properly has been fixed + (Reported by Gavin Stone-Tolcher) + Changes from 4.3.18 -> 4.3.19 (30 Mar 2015) =========================================== Modified: branches/4.x-master/debian/changelog =================================================================== --- branches/4.x-master/debian/changelog 2015-04-10 20:36:07 UTC (rev 7627) +++ branches/4.x-master/debian/changelog 2015-04-13 18:15:39 UTC (rev 7628) @@ -15,6 +15,8 @@ allowable options (Reported by John Thurston) * 'optional include' and 'optional directory' syntax has been documented * pulldata directives in the hosts.cfg file now honor a given IP address and port + * confreport.sh not displaying time-restricted alerts properly has been fixed + (Reported by Gavin Stone-Tolcher) -- Japheth Cleaver <cle...@te...> XXX, 00 Apr 2015 22:39:17 -0700 Modified: branches/4.x-master/lib/loadalerts.c =================================================================== --- branches/4.x-master/lib/loadalerts.c 2015-04-10 20:36:07 UTC (rev 7627) +++ branches/4.x-master/lib/loadalerts.c 2015-04-13 18:15:39 UTC (rev 7628) @@ -1221,8 +1221,10 @@ sprintf(l, "<td align=center>%s</td>", durationstring(recip->interval)); addtobuffer(buf, l); - if (timespec) sprintf(l, "<td align=center>%s</td>", timespec); else strcpy(l, "<td align=center>-</td>"); - if (extimespec) sprintf(l, "<td align=center>%s</td>", extimespec); else strcpy(l, "<td align=center>-</td>"); + if (timespec && extimespec) sprintf(l, "<td align=center>%s, except %s</td>", timespec, extimespec); + else if (timespec) sprintf(l, "<td align=center>%s</td>", timespec); + else if (extimespec) sprintf(l, "<td align=center>all, except %s</td>", extimespec); + else strcpy(l, "<td align=center>-</td>"); addtobuffer(buf, l); addtobuffer(buf, "<td>"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jcc...@us...> - 2015-04-13 18:33:05
|
Revision: 7629 http://sourceforge.net/p/xymon/code/7629 Author: jccleaver Date: 2015-04-13 18:32:57 +0000 (Mon, 13 Apr 2015) Log Message: ----------- Planned downtime should obviate purples as well (Thanks, Torsten Richter Modified Paths: -------------- branches/4.x-master/Changes branches/4.x-master/RELEASENOTES branches/4.x-master/common/hosts.cfg.5 branches/4.x-master/debian/changelog branches/4.x-master/xymond/xymond.c Modified: branches/4.x-master/Changes =================================================================== --- branches/4.x-master/Changes 2015-04-13 18:15:39 UTC (rev 7628) +++ branches/4.x-master/Changes 2015-04-13 18:32:57 UTC (rev 7629) @@ -18,6 +18,8 @@ XMH_FLAG_PULLDATA is now retired; XMH_PULLDATA must be used in its place * confreport.sh not displaying time-restricted alerts properly has been fixed (Reported by Gavin Stone-Tolcher) +* Planned downtime settings are now applied to 'purple' statuses as well + (Thanks, Torsten Richter) Changes from 4.3.18 -> 4.3.19 (30 Mar 2015) Modified: branches/4.x-master/RELEASENOTES =================================================================== --- branches/4.x-master/RELEASENOTES 2015-04-13 18:15:39 UTC (rev 7628) +++ branches/4.x-master/RELEASENOTES 2015-04-13 18:32:57 UTC (rev 7629) @@ -22,7 +22,9 @@ cgiwrap is now installed via hardlinking (or as packaged); FollowSymLinks is no longer needed for the xymon cgi-bin directories and can be removed. +Planned downtime settings are now applied to 'purple' statuses as well + Changes for 4.3.19 ================== This is mostly a bugfix release (see the Changes file for a full list), Modified: branches/4.x-master/common/hosts.cfg.5 =================================================================== --- branches/4.x-master/common/hosts.cfg.5 2015-04-13 18:15:39 UTC (rev 7628) +++ branches/4.x-master/common/hosts.cfg.5 2015-04-13 18:32:57 UTC (rev 7629) @@ -624,7 +624,7 @@ reboot a server every Monday between 5 and 6 pm. What happens is that if a test fails during the specified time, -it is reported with status BLUE instead of yellow or red. Thus +it is reported with status BLUE instead of red, yellow, or purple. Thus you can still see when the service was unavailable, but alarms will not be triggered and the downtime is not counted in the availability calculations generated by the Xymon reports. Modified: branches/4.x-master/debian/changelog =================================================================== --- branches/4.x-master/debian/changelog 2015-04-13 18:15:39 UTC (rev 7628) +++ branches/4.x-master/debian/changelog 2015-04-13 18:32:57 UTC (rev 7629) @@ -17,6 +17,8 @@ * pulldata directives in the hosts.cfg file now honor a given IP address and port * confreport.sh not displaying time-restricted alerts properly has been fixed (Reported by Gavin Stone-Tolcher) + * Planned downtime settings are now applied to 'purple' statuses as well + (Thanks, Torsten Richter) -- Japheth Cleaver <cle...@te...> XXX, 00 Apr 2015 22:39:17 -0700 Modified: branches/4.x-master/xymond/xymond.c =================================================================== --- branches/4.x-master/xymond/xymond.c 2015-04-13 18:15:39 UTC (rev 7628) +++ branches/4.x-master/xymond/xymond.c 2015-04-13 18:32:57 UTC (rev 7629) @@ -1244,7 +1244,7 @@ done: if (colstr) { - if ((*color == COL_RED) || (*color == COL_YELLOW)) { + if ((*color == COL_RED) || (*color == COL_YELLOW) || (*color == COL_PURPLE)) { char *cause; cause = check_downtime(hostname, testname); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jcc...@us...> - 2015-04-17 15:56:00
|
Revision: 7632 http://sourceforge.net/p/xymon/code/7632 Author: jccleaver Date: 2015-04-17 15:55:57 +0000 (Fri, 17 Apr 2015) Log Message: ----------- Add httphead= support for HEAD requests Modified Paths: -------------- branches/4.x-master/common/hosts.cfg.5 branches/4.x-master/lib/url.c branches/4.x-master/lib/url.h branches/4.x-master/xymonnet/httptest.c Modified: branches/4.x-master/common/hosts.cfg.5 =================================================================== --- branches/4.x-master/common/hosts.cfg.5 2015-04-17 15:41:08 UTC (rev 7631) +++ branches/4.x-master/common/hosts.cfg.5 2015-04-17 15:55:57 UTC (rev 7632) @@ -1245,6 +1245,9 @@ watch for data that should NOT be present in the response, e.g. a server error message. +.IP httphead[=COLUMN];URL +This is used to perform an HTTP HEAD request instead of a GET. + .IP httpstatus[=COLUMN];URL;okstatusexpr;notokstatusexpr This is used to explicitly test for certain HTTP statuscodes returned when the URL is requested. The \fBokstatusexpr\fR and Modified: branches/4.x-master/lib/url.c =================================================================== --- branches/4.x-master/lib/url.c 2015-04-17 15:41:08 UTC (rev 7631) +++ branches/4.x-master/lib/url.c 2015-04-17 15:55:57 UTC (rev 7632) @@ -536,6 +536,12 @@ } else if (strncmp(inp, "httpstatus=", 11) == 0) { weburl->testtype = WEBTEST_STATUS; urlstart = gethttpcolumn(inp+11, &weburl->columnname); + } else if (strncmp(inp, "httphead;", 9) == 0) { + weburl->testtype = WEBTEST_HEAD; + urlstart = strchr(inp, ';') + 1; + } else if (strncmp(inp, "httphead=", 9) == 0) { + weburl->testtype = WEBTEST_HEAD; + urlstart = gethttpcolumn(inp+9, &weburl->columnname); } else if (strncmp(inp, "http=", 5) == 0) { /* Plain URL test, but in separate column */ weburl->testtype = WEBTEST_PLAIN; @@ -548,6 +554,7 @@ switch (weburl->testtype) { case WEBTEST_PLAIN: + case WEBTEST_HEAD: break; case WEBTEST_CONT: Modified: branches/4.x-master/lib/url.h =================================================================== --- branches/4.x-master/lib/url.h 2015-04-17 15:41:08 UTC (rev 7631) +++ branches/4.x-master/lib/url.h 2015-04-17 15:55:57 UTC (rev 7632) @@ -26,7 +26,7 @@ } urlelem_t; enum webtesttype_t { - WEBTEST_PLAIN, WEBTEST_CONTENT, WEBTEST_CONT, WEBTEST_NOCONT, WEBTEST_POST, WEBTEST_NOPOST, WEBTEST_TYPE, WEBTEST_STATUS, WEBTEST_SOAP, WEBTEST_NOSOAP, + WEBTEST_PLAIN, WEBTEST_CONTENT, WEBTEST_CONT, WEBTEST_NOCONT, WEBTEST_POST, WEBTEST_NOPOST, WEBTEST_TYPE, WEBTEST_STATUS, WEBTEST_HEAD, WEBTEST_SOAP, WEBTEST_NOSOAP, }; typedef struct weburl_t { Modified: branches/4.x-master/xymonnet/httptest.c =================================================================== --- branches/4.x-master/xymonnet/httptest.c 2015-04-17 15:41:08 UTC (rev 7631) +++ branches/4.x-master/xymonnet/httptest.c 2015-04-17 15:55:57 UTC (rev 7632) @@ -385,6 +385,7 @@ switch (httptest->weburl.testtype) { case WEBTEST_PLAIN: + case WEBTEST_HEAD: case WEBTEST_STATUS: httptest->contentcheck = CONTENTCHECK_NONE; break; @@ -499,7 +500,8 @@ load_cookies(); /* Generate the request */ - addtobuffer(httprequest, (httptest->weburl.postdata ? "POST " : "GET ")); + addtobuffer(httprequest, (httptest->weburl.postdata ? "POST " : + (httptest->weburl.testtype == WEBTEST_HEAD) ? "HEAD " : "GET ")); switch (httpversion) { case HTTPVER_10: addtobuffer(httprequest, (httptest->weburl.proxyurl ? httptest->url : httptest->weburl.desturl->relurl)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jcc...@us...> - 2015-04-17 16:28:45
|
Revision: 7633 http://sourceforge.net/p/xymon/code/7633 Author: jccleaver Date: 2015-04-17 16:28:37 +0000 (Fri, 17 Apr 2015) Log Message: ----------- Update changelog Modified Paths: -------------- branches/4.x-master/Changes branches/4.x-master/RELEASENOTES branches/4.x-master/debian/changelog Modified: branches/4.x-master/Changes =================================================================== --- branches/4.x-master/Changes 2015-04-17 15:55:57 UTC (rev 7632) +++ branches/4.x-master/Changes 2015-04-17 16:28:37 UTC (rev 7633) @@ -20,6 +20,10 @@ (Reported by Gavin Stone-Tolcher) * Planned downtime settings are now applied to 'purple' statuses as well (Thanks, Torsten Richter) +* Column documentation links should be working again (Reported by Andy Smith) +* Fix missing null termination in certain logfetch situations (Reported by + Johan Sj\x9Aberg) +* New httphead tag to force an http request using HEAD instead of GET Changes from 4.3.18 -> 4.3.19 (30 Mar 2015) Modified: branches/4.x-master/RELEASENOTES =================================================================== --- branches/4.x-master/RELEASENOTES 2015-04-17 15:55:57 UTC (rev 7632) +++ branches/4.x-master/RELEASENOTES 2015-04-17 16:28:37 UTC (rev 7633) @@ -24,7 +24,9 @@ Planned downtime settings are now applied to 'purple' statuses as well +http checks can now be performed using a HEAD request if desired. + Changes for 4.3.19 ================== This is mostly a bugfix release (see the Changes file for a full list), Modified: branches/4.x-master/debian/changelog =================================================================== --- branches/4.x-master/debian/changelog 2015-04-17 15:55:57 UTC (rev 7632) +++ branches/4.x-master/debian/changelog 2015-04-17 16:28:37 UTC (rev 7633) @@ -19,7 +19,12 @@ (Reported by Gavin Stone-Tolcher) * Planned downtime settings are now applied to 'purple' statuses as well (Thanks, Torsten Richter) + * Column documentation links should be working again (Reported by Andy Smith) + * Fix missing null termination in certain logfetch situations (Reported by + Johan Sj�berg) + * New httphead tag to force an http request using HEAD instead of GET + -- Japheth Cleaver <cle...@te...> XXX, 00 Apr 2015 22:39:17 -0700 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jcc...@us...> - 2015-04-18 05:13:42
|
Revision: 7634 http://sourceforge.net/p/xymon/code/7634 Author: jccleaver Date: 2015-04-18 05:13:39 +0000 (Sat, 18 Apr 2015) Log Message: ----------- Fix mem leak in Windows svcs test state parser Modified Paths: -------------- branches/4.x-master/Changes branches/4.x-master/debian/changelog branches/4.x-master/xymond/client_config.c Modified: branches/4.x-master/Changes =================================================================== --- branches/4.x-master/Changes 2015-04-17 16:28:37 UTC (rev 7633) +++ branches/4.x-master/Changes 2015-04-18 05:13:39 UTC (rev 7634) @@ -24,6 +24,7 @@ * Fix missing null termination in certain logfetch situations (Reported by Johan Sj\x9Aberg) * New httphead tag to force an http request using HEAD instead of GET +* Fix a memory leak introduced in parsing Windows SVCS test data Changes from 4.3.18 -> 4.3.19 (30 Mar 2015) Modified: branches/4.x-master/debian/changelog =================================================================== --- branches/4.x-master/debian/changelog 2015-04-17 16:28:37 UTC (rev 7633) +++ branches/4.x-master/debian/changelog 2015-04-18 05:13:39 UTC (rev 7634) @@ -23,6 +23,7 @@ * Fix missing null termination in certain logfetch situations (Reported by Johan Sj�berg) * New httphead tag to force an http request using HEAD instead of GET + * Fix a memory leak introduced in parsing Windows SVCS test data -- Japheth Cleaver <cle...@te...> XXX, 00 Apr 2015 22:39:17 -0700 Modified: branches/4.x-master/xymond/client_config.c =================================================================== --- branches/4.x-master/xymond/client_config.c 2015-04-17 16:28:37 UTC (rev 7633) +++ branches/4.x-master/xymond/client_config.c 2015-04-18 05:13:39 UTC (rev 7634) @@ -3480,7 +3480,7 @@ if ((*walk)->rule->rule.svc.stateexp) sz += strlen((*walk)->rule->rule.svc.stateexp->pattern) + 10; - (*walk)->rule->statustext = (char *)malloc(sz + 1); + if ((*walk)->rule->statustext == NULL) (*walk)->rule->statustext = (char *)malloc(sz + 1); p = (*walk)->rule->statustext; if ((*walk)->rule->rule.svc.svcname) { p += sprintf(p, "%s is %s/%s", (*walk)->rule->rule.svc.svcname, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jcc...@us...> - 2015-04-23 06:14:39
|
Revision: 7639 http://sourceforge.net/p/xymon/code/7639 Author: jccleaver Date: 2015-04-23 06:14:36 +0000 (Thu, 23 Apr 2015) Log Message: ----------- Fix div-by-zero when 0MB physical memory reported Modified Paths: -------------- branches/4.x-master/Changes branches/4.x-master/debian/changelog branches/4.x-master/xymond/rrd/do_la.c Modified: branches/4.x-master/Changes =================================================================== --- branches/4.x-master/Changes 2015-04-19 16:55:49 UTC (rev 7638) +++ branches/4.x-master/Changes 2015-04-23 06:14:36 UTC (rev 7639) @@ -25,6 +25,8 @@ Johan Sj\x9Aberg) * New httphead tag to force an http request using HEAD instead of GET * Fix a memory leak introduced in parsing Windows SVCS test data +* A divide-by-zero condition when systems erroneously report 0MB of physical + memory has been corrected (Reported by John Thurston) Changes from 4.3.18 -> 4.3.19 (30 Mar 2015) Modified: branches/4.x-master/debian/changelog =================================================================== --- branches/4.x-master/debian/changelog 2015-04-19 16:55:49 UTC (rev 7638) +++ branches/4.x-master/debian/changelog 2015-04-23 06:14:36 UTC (rev 7639) @@ -24,8 +24,9 @@ Johan Sj�berg) * New httphead tag to force an http request using HEAD instead of GET * Fix a memory leak introduced in parsing Windows SVCS test data + * A divide-by-zero condition when systems erroneously report 0MB of physical + memory has been corrected (Reported by John Thurston) - -- Japheth Cleaver <cle...@te...> XXX, 00 Apr 2015 22:39:17 -0700 Modified: branches/4.x-master/xymond/rrd/do_la.c =================================================================== --- branches/4.x-master/xymond/rrd/do_la.c 2015-04-19 16:55:49 UTC (rev 7638) +++ branches/4.x-master/xymond/rrd/do_la.c 2015-04-23 06:14:36 UTC (rev 7639) @@ -255,6 +255,7 @@ } if (found == 4) { + if (!phystotal || !pagetotal) { errprintf("Host %s cpu report had 0 total physical/pagefile memory listed\n", hostname); return 0; } phystotal = phystotal / 100; pagetotal = pagetotal / 100; realuse = 100 - (physavail / phystotal); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jcc...@us...> - 2015-04-28 16:35:53
|
Revision: 7642 http://sourceforge.net/p/xymon/code/7642 Author: jccleaver Date: 2015-04-28 16:35:50 +0000 (Tue, 28 Apr 2015) Log Message: ----------- Parse both ack. log formats; document --ack-log option to xymond (Thanks, Andy Smith) Modified Paths: -------------- branches/4.x-master/Changes branches/4.x-master/debian/changelog branches/4.x-master/lib/acknowledgementslog.c branches/4.x-master/xymond/xymond.8 Modified: branches/4.x-master/Changes =================================================================== --- branches/4.x-master/Changes 2015-04-25 01:51:25 UTC (rev 7641) +++ branches/4.x-master/Changes 2015-04-28 16:35:50 UTC (rev 7642) @@ -27,6 +27,9 @@ * Fix a memory leak introduced in parsing Windows SVCS test data * A divide-by-zero condition when systems erroneously report 0MB of physical memory has been corrected (Reported by John Thurston) +* Parse either critical config or xymond-formatted acknowledgements on the + report page, and add documentation for the --ack-log option in xymond + (Thanks, Andy Smith) Changes from 4.3.18 -> 4.3.19 (30 Mar 2015) Modified: branches/4.x-master/debian/changelog =================================================================== --- branches/4.x-master/debian/changelog 2015-04-25 01:51:25 UTC (rev 7641) +++ branches/4.x-master/debian/changelog 2015-04-28 16:35:50 UTC (rev 7642) @@ -26,6 +26,9 @@ * Fix a memory leak introduced in parsing Windows SVCS test data * A divide-by-zero condition when systems erroneously report 0MB of physical memory has been corrected (Reported by John Thurston) + * Parse either critical config or xymond-formatted acknowledgements on the + report page, and add documentation for the --ack-log option in xymond + (Thanks, Andy Smith) -- Japheth Cleaver <cle...@te...> XXX, 00 Apr 2015 22:39:17 -0700 Modified: branches/4.x-master/lib/acknowledgementslog.c =================================================================== --- branches/4.x-master/lib/acknowledgementslog.c 2015-04-25 01:51:25 UTC (rev 7641) +++ branches/4.x-master/lib/acknowledgementslog.c 2015-04-28 16:35:50 UTC (rev 7642) @@ -172,7 +172,11 @@ if (fgets(l, sizeof(l), acknowledgementslog) && /* Skip to start of line */ fgets(l, sizeof(l), acknowledgementslog)) { /* 2015-03-07 18:17:03 myserver disk andy 1 1425724570 1425752223 1425838623 testing message */ - sscanf(l, "%*u-%*u-%*u %*u:%*u:%*u %*s %*s %*s %*u %*u %u %*u %*s", &uicurtime); + if ( sscanf(l, "%*u-%*u-%*u %*u:%*u:%*u %*s %*s %*s %*u %*u %u %*u %*s", &uicurtime) == 0 ) { + /* that didnt work - try the old format + 1430040985 630949 30 630949 np_filename_not_used myserver.procs red testing log format \nAcked by: andy (127.0.0.1) */ + sscanf(l, "%u\t%*u\t%*u\t%*u\tnp_filename_not_used\t%*s\t%*s\t%*s", &uicurtime); + } curtime = uicurtime; done = (curtime < firstevent); } @@ -205,10 +209,29 @@ struct htnames_t *eventcolumn; int ovector[30]; - /*itemsfound = sscanf(l, "%*u-%*u-%*u %*u:%*u:%*u %s %s %s %*u %*u %u %*u %s", host, svc, recipient, &etim, message);*/ + /* 2015-03-07 18:17:03 myserver disk andy 1 1425724570 1425752223 1425838623 testing message */ itemsfound = sscanf(l, "%*u-%*u-%*u %*u:%*u:%*u %s %s %s %*u %*u %u %*u %[^\t\n]", host, svc, recipient, &etim, message); + if (itemsfound != 5) { + /* 1430040985 630949 30 630949 np_filename_not_used myserver.procs red testing log format \nAcked by: andy (127.0.0.1) */ + itemsfound = sscanf(l, "%u\t%*u\t%*u\t%*u\tnp_filename_not_used\t%s\t%*s\t%[^\n]", &etim, host, message); + if (itemsfound != 3) continue; + p = strrchr(host, '.'); + if (p) { + *p = '\0'; + strcpy(svc,p+1); + } + /* Xymon uses \n in the ack message, for the "acked by" data. Cut it off. */ + p = strstr(message, "\\nAcked by:"); + if (p) { + strcpy(recipient,p+12); + *(p-1) = '\0'; + } + else { + strcpy(recipient,"UnknownUser"); + } + p = strchr(recipient, '('); if (p) *(p-1) = '\0'; + } eventtime = etim; - if (itemsfound != 5) continue; if (eventtime < firstevent) continue; if (eventtime > lastevent) break; Modified: branches/4.x-master/xymond/xymond.8 =================================================================== --- branches/4.x-master/xymond/xymond.8 2015-04-25 01:51:25 UTC (rev 7641) +++ branches/4.x-master/xymond/xymond.8 2015-04-28 16:35:50 UTC (rev 7642) @@ -230,6 +230,13 @@ ack for red. Hence alerts will restart when the red ack expires, even if the status by then has changed to yellow. +.IP "--ack-log=FILENAME" +Log acknowledgements created on the Critical Systems page to FILENAME. +NB, acknowledgements created by the Acknowledge Alert CGI are +automatically written to acknowledge.log in the Xymon server log +directory. Alerts from the Critical Systems page can be directed to the +same log. + .IP "--debug" Enable debugging output. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jcc...@us...> - 2015-05-01 00:44:57
|
Revision: 7643 http://sourceforge.net/p/xymon/code/7643 Author: jccleaver Date: 2015-05-01 00:44:54 +0000 (Fri, 01 May 2015) Log Message: ----------- Allow customized/multiple graphs to be displayed on a given test via svcstatus (Thanks, Werner Maier) Modified Paths: -------------- branches/4.x-master/CREDITS branches/4.x-master/Changes branches/4.x-master/RELEASENOTES branches/4.x-master/common/xymonserver.cfg.5 branches/4.x-master/debian/changelog branches/4.x-master/lib/htmllog.c branches/4.x-master/xymond/etcfiles/xymonserver.cfg.DIST Modified: branches/4.x-master/CREDITS =================================================================== --- branches/4.x-master/CREDITS 2015-04-28 16:35:50 UTC (rev 7642) +++ branches/4.x-master/CREDITS 2015-05-01 00:44:54 UTC (rev 7643) @@ -31,6 +31,7 @@ Jeremy Laidman Patrick Lin Brian Lynch +Werner Maier Thomas Mattsson Daniel J McDonald Werner Michels Modified: branches/4.x-master/Changes =================================================================== --- branches/4.x-master/Changes 2015-04-28 16:35:50 UTC (rev 7642) +++ branches/4.x-master/Changes 2015-05-01 00:44:54 UTC (rev 7643) @@ -30,6 +30,8 @@ * Parse either critical config or xymond-formatted acknowledgements on the report page, and add documentation for the --ack-log option in xymond (Thanks, Andy Smith) +* The graphs to be displayed on a specific status page can be customized + with environment variables - see xymonserver.cfg(5). From Werner Maier. Changes from 4.3.18 -> 4.3.19 (30 Mar 2015) Modified: branches/4.x-master/RELEASENOTES =================================================================== --- branches/4.x-master/RELEASENOTES 2015-04-28 16:35:50 UTC (rev 7642) +++ branches/4.x-master/RELEASENOTES 2015-05-01 00:44:54 UTC (rev 7643) @@ -26,7 +26,12 @@ http checks can now be performed using a HEAD request if desired. +Which RRD graphs are displayed on a status page can now be customized on +a per-test basis through the use of environment variables. For example, +GRAPHS_cpu="la,vmstat1" will cause an additional graph to be shown on +cpu tests. (Submitted by Werner Maier) + Changes for 4.3.19 ================== This is mostly a bugfix release (see the Changes file for a full list), Modified: branches/4.x-master/common/xymonserver.cfg.5 =================================================================== --- branches/4.x-master/common/xymonserver.cfg.5 2015-04-28 16:35:50 UTC (rev 7642) +++ branches/4.x-master/common/xymonserver.cfg.5 2015-05-01 00:44:54 UTC (rev 7643) @@ -500,7 +500,12 @@ external script mechanism to collect data from custom tests. Note: All TCP tests are automatically added. -This is also used by the +.IP GRAPH_<COLUMNAME> +List of GRAPHs that should be displayed on the corresponding colmn page. Note +this will override the default, so to add multiple graphs you should include +the origina one (e.g. GRAPH_cpu="la,vmstat1"). + +These are used together by the .I svcstatus.cgi(1) script to determine if the detailed status view of a test should include a graph. Modified: branches/4.x-master/debian/changelog =================================================================== --- branches/4.x-master/debian/changelog 2015-04-28 16:35:50 UTC (rev 7642) +++ branches/4.x-master/debian/changelog 2015-05-01 00:44:54 UTC (rev 7643) @@ -29,6 +29,8 @@ * Parse either critical config or xymond-formatted acknowledgements on the report page, and add documentation for the --ack-log option in xymond (Thanks, Andy Smith) + * The graphs to be displayed on a specific status page can be customized + with environment variables - see xymonserver.cfg(5). From Werner Maier. -- Japheth Cleaver <cle...@te...> XXX, 00 Apr 2015 22:39:17 -0700 Modified: branches/4.x-master/lib/htmllog.c =================================================================== --- branches/4.x-master/lib/htmllog.c 2015-04-28 16:35:50 UTC (rev 7642) +++ branches/4.x-master/lib/htmllog.c 2015-05-01 00:44:54 UTC (rev 7643) @@ -182,6 +182,9 @@ xymonrrd_t *rrd = NULL; xymongraph_t *graph = NULL; char *tplfile = "hostsvc"; + char *graphs; + char *graphsenv; + char *graphsptr; time_t now = getcurrenttime(NULL); if (graphtime == 0) { @@ -493,7 +496,29 @@ if (may_have_rrd) { fprintf(output, "<!-- linecount=%d -->\n", linecount); - fprintf(output, "%s\n", xymon_graph_data(hostname, displayname, service, color, graph, linecount, HG_WITHOUT_STALE_RRDS, HG_PLAIN_LINK, locatorbased, now-graphtime, now)); + fprintf(output, "<a name=\"begingraph\"> </a>\n"); + + /* Get the GRAPHS_* environment setting */ + graphs = (char *)malloc(7 + strlen(service) + 1); + sprintf(graphs, "GRAPHS_%s", service); + graphsenv=getenv(graphs); + if (graphsenv) { + fprintf(output, "<!-- GRAPHS_%s: %s -->\n", service, graphsenv); + /* check for strtokens */ + graphsptr = strtok(graphsenv,","); + while (graphsptr != NULL) { + // fprintf(output, "<!-- found: %s -->\n", graphsptr); + graph->xymonrrdname = strdup(graphsptr); + fprintf(output, "%s\n", xymon_graph_data(hostname, displayname, graphsptr, color, graph, linecount, HG_WITHOUT_STALE_RRDS, HG_PLAIN_LINK, locatorbased, now-graphtime, now)); + // next token + graphsptr = strtok(NULL,","); + } + + } + else { + fprintf(output, "%s\n", xymon_graph_data(hostname, displayname, service, color, graph, linecount, HG_WITHOUT_STALE_RRDS, HG_PLAIN_LINK, locatorbased, now-graphtime, now)); + } + xfree(graphs); } } Modified: branches/4.x-master/xymond/etcfiles/xymonserver.cfg.DIST =================================================================== --- branches/4.x-master/xymond/etcfiles/xymonserver.cfg.DIST 2015-04-28 16:35:50 UTC (rev 7642) +++ branches/4.x-master/xymond/etcfiles/xymonserver.cfg.DIST 2015-05-01 00:44:54 UTC (rev 7643) @@ -153,8 +153,16 @@ # included. # The format here is "COLUMN=RRDSERVICE". If you leave out the "=RRDSERVICE" # part, it is assumed to be the same as the COLUMN value. + +# GRAPH_<columnname> entries define what graphs to display on COLUMNs, if not the +# default ones indicated above. This can allow you to display additional graphs on +# a status page, even if xymond_rrd is not using the TEST2RRD data above. +# If present, overrides the column RRD value above for display purposes, so be sure +# to include the that, if desured +# eg, GRAPH_cpu="la,vmstat1" + # -# This is also used by the svcstatus.cgi script to determine if the detailed +# TEST2RRD and GRAPH_* are used by the svcstatus.cgi script to determine if the detailed # status view of a test should include a graph. TEST2RRD="cpu=la,disk,inode,qtree,memory,$PINGCOLUMN=tcp,http=tcp,dns=tcp,dig=tcp,time=ntpstat,vmstat,iostat,netstat,temperature,apache,bind,sendmail,mailq,nmailq=mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,files,procs=processes,ports,clock,lines,deltalines,ops,stats,cifs,JVM,JMS,HitCache,Session,JDBCConn,ExecQueue,JTA,TblSpace,RollBack,MemReq,InvObj,snapmirr,snaplist,snapshot,if_load=devmon,temp=devmon,paging,mdc,mdchitpct,cics,dsa,getvis,maxuser,nparts,xymongen,xymonnet,xymonproxy,xymond" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jcc...@us...> - 2015-05-01 02:44:05
|
Revision: 7644 http://sourceforge.net/p/xymon/code/7644 Author: jccleaver Date: 2015-05-01 02:44:02 +0000 (Fri, 01 May 2015) Log Message: ----------- Add 'clientlog' column (and 'noclient' support) + minor tuning Modified Paths: -------------- branches/4.x-master/Changes branches/4.x-master/RELEASENOTES branches/4.x-master/common/hosts.cfg.5 branches/4.x-master/common/xymon-xmh.5 branches/4.x-master/debian/changelog branches/4.x-master/lib/environ.c branches/4.x-master/lib/loadhosts.c branches/4.x-master/lib/loadhosts.h branches/4.x-master/web/svcstatus-info.c branches/4.x-master/web/svcstatus.c branches/4.x-master/xymond/etcfiles/columndoc.csv branches/4.x-master/xymond/etcfiles/xymonserver.cfg.DIST branches/4.x-master/xymond/xymond.c branches/4.x-master/xymongen/pagegen.c Modified: branches/4.x-master/Changes =================================================================== --- branches/4.x-master/Changes 2015-05-01 00:44:54 UTC (rev 7643) +++ branches/4.x-master/Changes 2015-05-01 02:44:02 UTC (rev 7644) @@ -32,6 +32,11 @@ (Thanks, Andy Smith) * The graphs to be displayed on a specific status page can be customized with environment variables - see xymonserver.cfg(5). From Werner Maier. +* When clients are in "server" mode (sending raw data to the xymond server + to be centrally processed), a 'clientlog' column will now be shown on + xymon pages (similar to trends and info columns). This can be disabled on + a per-host basis by adding a 'noclient' tag to the hosts.cfg line, + or globally by adding that to the .default. host. Changes from 4.3.18 -> 4.3.19 (30 Mar 2015) Modified: branches/4.x-master/RELEASENOTES =================================================================== --- branches/4.x-master/RELEASENOTES 2015-05-01 00:44:54 UTC (rev 7643) +++ branches/4.x-master/RELEASENOTES 2015-05-01 02:44:02 UTC (rev 7644) @@ -31,7 +31,11 @@ GRAPHS_cpu="la,vmstat1" will cause an additional graph to be shown on cpu tests. (Submitted by Werner Maier) +A new column will be displayed on all xymon pages allowing direct access +to a server's raw clientlog (similar to the special info and trends columns). +This can be disabled with a "noclient" tag in hosts.cfg + Changes for 4.3.19 ================== This is mostly a bugfix release (see the Changes file for a full list), Modified: branches/4.x-master/common/hosts.cfg.5 =================================================================== --- branches/4.x-master/common/hosts.cfg.5 2015-05-01 00:44:54 UTC (rev 7643) +++ branches/4.x-master/common/hosts.cfg.5 2015-05-01 02:44:02 UTC (rev 7644) @@ -1371,7 +1371,7 @@ \fBNOTE:\fR The ".default." host entry will only accept the following tags - others are silently ignored: delayyellow, delayred, NOCOLUMNS, COMMENT, DESCR, CLASS, dialup, testip, nonongreen, nodisp, noinfo, -notrends, TRENDS, NOPROPRED, NOPROPYELLOW, NOPROPPURPLE, NOPROPACK, +notrends, noclient, TRENDS, NOPROPRED, NOPROPYELLOW, NOPROPPURPLE, NOPROPACK, REPORTTIME, WARNPCT, NET, noclear, nosslcert, ssldays, DOWNTIME, depends, noping, noconn, trace, notrace, HIDEHTTP, browser, pulldata. Specifically, note that network tests, "badTEST" settings, and alternate pageset Modified: branches/4.x-master/common/xymon-xmh.5 =================================================================== --- branches/4.x-master/common/xymon-xmh.5 2015-05-01 00:44:54 UTC (rev 7643) +++ branches/4.x-master/common/xymon-xmh.5 2015-05-01 02:44:02 UTC (rev 7644) @@ -88,6 +88,9 @@ .IP XMH_FLAG_NOCLEAR Value of the NOCLEAR tag. +.IP XMH_FLAG_NOCLIENT +Value of the "noclient" tag. + .IP XMH_FLAG_NOCONN Value of the "noconn" tag. Modified: branches/4.x-master/debian/changelog =================================================================== --- branches/4.x-master/debian/changelog 2015-05-01 00:44:54 UTC (rev 7643) +++ branches/4.x-master/debian/changelog 2015-05-01 02:44:02 UTC (rev 7644) @@ -31,6 +31,11 @@ (Thanks, Andy Smith) * The graphs to be displayed on a specific status page can be customized with environment variables - see xymonserver.cfg(5). From Werner Maier. + * When clients are in "server" mode (sending raw data to the xymond server + to be centrally processed), a 'clientlog' column will now be shown on + xymon pages (similar to trends and info columns). This can be disabled on + a per-host basis by adding a 'noclient' tag to the hosts.cfg line, + or globally by adding that to the .default. host. -- Japheth Cleaver <cle...@te...> XXX, 00 Apr 2015 22:39:17 -0700 Modified: branches/4.x-master/lib/environ.c =================================================================== --- branches/4.x-master/lib/environ.c 2015-05-01 00:44:54 UTC (rev 7643) +++ branches/4.x-master/lib/environ.c 2015-05-01 02:44:02 UTC (rev 7644) @@ -49,6 +49,7 @@ { "PINGCOLUMN", "conn" }, { "INFOCOLUMN", "info" }, { "TRENDSCOLUMN", "trends" }, + { "CLIENTCOLUMN", "clientlog" }, { "DOCOMBO", "TRUE" }, { "MAXMSGSPERCOMBO", "100" }, { "SLEEPBETWEENMSGS", "0" }, Modified: branches/4.x-master/lib/loadhosts.c =================================================================== --- branches/4.x-master/lib/loadhosts.c 2015-05-01 00:44:54 UTC (rev 7643) +++ branches/4.x-master/lib/loadhosts.c 2015-05-01 02:44:02 UTC (rev 7644) @@ -136,6 +136,8 @@ xmh_item_name[XMH_FLAG_NOINFO] = "XMH_FLAG_NOINFO"; xmh_item_key[XMH_FLAG_NOTRENDS] = "notrends"; xmh_item_name[XMH_FLAG_NOTRENDS] = "XMH_FLAG_NOTRENDS"; + xmh_item_key[XMH_FLAG_NOCLIENT] = "noclient"; + xmh_item_name[XMH_FLAG_NOCLIENT] = "XMH_FLAG_NOCLIENT"; xmh_item_key[XMH_FLAG_NODISP] = "nodisp"; xmh_item_name[XMH_FLAG_NODISP] = "XMH_FLAG_NODISP"; xmh_item_key[XMH_FLAG_NONONGREEN] = "nonongreen"; Modified: branches/4.x-master/lib/loadhosts.h =================================================================== --- branches/4.x-master/lib/loadhosts.h 2015-05-01 00:44:54 UTC (rev 7643) +++ branches/4.x-master/lib/loadhosts.h 2015-05-01 02:44:02 UTC (rev 7644) @@ -38,6 +38,7 @@ XMH_DELAYYELLOW, XMH_FLAG_NOINFO, XMH_FLAG_NOTRENDS, + XMH_FLAG_NOCLIENT, XMH_FLAG_NODISP, XMH_FLAG_NONONGREEN, XMH_FLAG_NOBB2, Modified: branches/4.x-master/web/svcstatus-info.c =================================================================== --- branches/4.x-master/web/svcstatus-info.c 2015-05-01 00:44:54 UTC (rev 7643) +++ branches/4.x-master/web/svcstatus-info.c 2015-05-01 02:44:02 UTC (rev 7644) @@ -94,7 +94,7 @@ eol = strchr(walk, '\n'); if (eol) *eol = '\0'; tok = gettok(walk, "|"); - if ( tok && (strcmp(tok, xgetenv("INFOCOLUMN")) != 0) && (strcmp(tok, xgetenv("TRENDSCOLUMN")) != 0) ) { + if ( tok && (strcmp(tok, xgetenv("INFOCOLUMN")) != 0) && (strcmp(tok, xgetenv("TRENDSCOLUMN")) != 0) && (strcmp(tok, xgetenv("CLIENTCOLUMN")) != 0) ) { tnames[testcount].name = strdup(tok); tok = gettok(NULL, "|"); if (tok) { tnames[testcount].color = parse_color(tok); tok = gettok(NULL, "|"); } if (tok) { tnames[testcount].distime = atol(tok); tok = gettok(NULL, "|"); } Modified: branches/4.x-master/web/svcstatus.c =================================================================== --- branches/4.x-master/web/svcstatus.c 2015-05-01 00:44:54 UTC (rev 7643) +++ branches/4.x-master/web/svcstatus.c 2015-05-01 02:44:02 UTC (rev 7644) @@ -138,6 +138,14 @@ return 1; } + if (strcmp(service, xgetenv("CLIENTCOLUMN")) == 0) { + /* Make this a client request */ + char *p = strdup(basename(hostname)); + xfree(hostname); hostname = p; /* no need to convert to dots, since we'll already have them */ + xfree(service); /* service does double-duty as the 'section' param */ + outform = FRM_CLIENT; + } + if (outform == FRM_STATUS) { char *p, *req; Modified: branches/4.x-master/xymond/etcfiles/columndoc.csv =================================================================== --- branches/4.x-master/xymond/etcfiles/columndoc.csv 2015-05-01 00:44:54 UTC (rev 7643) +++ branches/4.x-master/xymond/etcfiles/columndoc.csv 2015-05-01 02:44:02 UTC (rev 7644) @@ -51,6 +51,7 @@ xymonproxy;The <b>xymonproxy</b> column shows the status of the Xymon xymonproxy task. xymonproxy is used to forward Xymon status-reports from one part of the network to another, so a failure of this task may result in servers that are not being monitored.; xymonnet;The <b>xymonnet</b> column shows the status of the Xymon network-service monitoring task. This task is responsible for testing all of the network services being monitored. ; xymond;The <b>xymond</b> column shows the status of the central Xymon daemon.; +clientlog;The <b>clientlog</b> column shows the current raw client message last sent by the host.; info;The <b>info</b> column shows static information about how this host is configured in the Xymon system.; trends;The <b>trends</b> column holds a collection of the graphs that show trends in the utilisation, response-times etc. for the services monitored on this host.; graphs;The <b>graphs</b> column holds a collection of the graphs that show trends in the utilisation, response-times etc. for the services monitored on this host.; Modified: branches/4.x-master/xymond/etcfiles/xymonserver.cfg.DIST =================================================================== --- branches/4.x-master/xymond/etcfiles/xymonserver.cfg.DIST 2015-05-01 00:44:54 UTC (rev 7643) +++ branches/4.x-master/xymond/etcfiles/xymonserver.cfg.DIST 2015-05-01 02:44:02 UTC (rev 7644) @@ -49,6 +49,8 @@ INFOCOLUMNGIF="green.gif" # Icon file used for the info-column. TRENDSCOLUMN="trends" # Column where the RRD graphs are reported. TRENDSCOLUMNGIF="green.gif" # Icon file used for the trends-column. +CLIENTCOLUMN="clientlog" # Column where raw client logs are reported. +CLIENTCOLUMNGIF="green.gif" # Icon file used for the client-column. MAXMSGSPERCOMBO="100" # How many individual messages to combine in a combo-message. 0=unlimited. SLEEPBETWEENMSGS="0" # Delay between sending each combo message, in milliseconds. Modified: branches/4.x-master/xymond/xymond.c =================================================================== --- branches/4.x-master/xymond/xymond.c 2015-05-01 00:44:54 UTC (rev 7643) +++ branches/4.x-master/xymond/xymond.c 2015-05-01 02:44:02 UTC (rev 7644) @@ -3918,9 +3918,10 @@ xtreePos_t hosthandle; xymond_hostlist_t *hwalk; xymond_log_t *lwalk, *firstlog; - xymond_log_t infologrec, rrdlogrec; time_t *dummytimes; - testinfo_t trendstest, infotest; + static testinfo_t trendstest, infotest, clienttest; + static xymond_log_t trendslogrec, infologrec, clientlogrec; + static int faketestinit = 0; hostfilter_rec_t *logfilter; boardfield_t *logfields; char *fields = NULL; @@ -3936,22 +3937,32 @@ response = newstrbuffer(lastboardsize); - /* Setup fake log-records for the "info" and "trends" data. */ + /* Setup fake log-records for the "clientlog", "info" and "trends" data. */ dummytimes = (time_t *)calloc((flapcount > 0) ? flapcount : 1, sizeof(time_t)); - memset(&infotest, 0, sizeof(infotest)); - infotest.name = xgetenv("INFOCOLUMN"); - memset(&infologrec, 0, sizeof(infologrec)); - infologrec.test = &infotest; - memset(&trendstest, 0, sizeof(trendstest)); - trendstest.name = xgetenv("TRENDSCOLUMN"); - memset(&rrdlogrec, 0, sizeof(rrdlogrec)); - rrdlogrec.test = &trendstest; + if (!faketestinit) { + memset(&clienttest, 0, sizeof(clienttest)); + clienttest.name = xgetenv("CLIENTCOLUMN"); + memset(&clientlogrec, 0, sizeof(clientlogrec)); + clientlogrec.test = &clienttest; - infologrec.color = rrdlogrec.color = COL_GREEN; - infologrec.message = rrdlogrec.message = ""; - infologrec.lastchange = rrdlogrec.lastchange = dummytimes; + memset(&infotest, 0, sizeof(infotest)); + infotest.name = xgetenv("INFOCOLUMN"); + memset(&infologrec, 0, sizeof(infologrec)); + infologrec.test = &infotest; + memset(&trendstest, 0, sizeof(trendstest)); + trendstest.name = xgetenv("TRENDSCOLUMN"); + memset(&trendslogrec, 0, sizeof(trendslogrec)); + trendslogrec.test = &trendstest; + + clientlogrec.color = infologrec.color = trendslogrec.color = COL_GREEN; + clientlogrec.message = infologrec.message = trendslogrec.message = ""; + faketestinit = 1; + } + clientlogrec.lastchange = infologrec.lastchange = trendslogrec.lastchange = dummytimes; + + for (hosthandle = xtreeFirst(rbhosts); (hosthandle != xtreeEnd(rbhosts)); hosthandle = xtreeNext(rbhosts, hosthandle)) { hwalk = xtreeData(rbhosts, hosthandle); if (!hwalk) { @@ -3975,18 +3986,22 @@ /* Host/pagename filter */ if (!match_host_filter(hinfo, logfilter, 0, NULL)) continue; - /* Handle NOINFO and NOTRENDS here */ + /* Handle NOINFO, NOCLIENT and NOTRENDS here */ + if (hwalk->clientmsgs && !xmh_item(hinfo, XMH_FLAG_NOCLIENT)) { + clientlogrec.next = firstlog; + firstlog = &clientlogrec; + } if (!xmh_item(hinfo, XMH_FLAG_NOINFO)) { infologrec.next = firstlog; firstlog = &infologrec; } if (!xmh_item(hinfo, XMH_FLAG_NOTRENDS)) { - rrdlogrec.next = firstlog; - firstlog = &rrdlogrec; + trendslogrec.next = firstlog; + firstlog = &trendslogrec; } } - rrdlogrec.host = infologrec.host = hwalk; + clientlogrec.host = trendslogrec.host = infologrec.host = hwalk; for (lwalk = firstlog; (lwalk); lwalk = lwalk->next) { if (!match_test_filter(lwalk, logfilter)) continue; @@ -4862,9 +4877,10 @@ hostname = knownhost(hostname, hostip, ghosthandling); if (hostname == NULL) continue; - /* Ignore the "info" and "trends" data, since we generate on the fly now. */ + /* Ignore the "client", "info" and "trends" data, since we generate on the fly now. */ if (strcmp(testname, xgetenv("INFOCOLUMN")) == 0) continue; if (strcmp(testname, xgetenv("TRENDSCOLUMN")) == 0) continue; + if (strcmp(testname, xgetenv("CLIENTCOLUMN")) == 0) continue; /* Rename the now-forgotten internal statuses */ if (strcmp(hostname, getenv("MACHINEDOTS")) == 0) { Modified: branches/4.x-master/xymongen/pagegen.c =================================================================== --- branches/4.x-master/xymongen/pagegen.c 2015-05-01 00:44:54 UTC (rev 7643) +++ branches/4.x-master/xymongen/pagegen.c 2015-05-01 02:44:02 UTC (rev 7644) @@ -111,9 +111,10 @@ /* pagetype is now known NOT to be PAGE_NORMAL */ - /* TRENDS and INFO columns are always included on non-Xymon pages */ + /* CLIENT, TRENDS and INFO columns are always included on non-Xymon pages */ if (strcmp(column->name, xgetenv("INFOCOLUMN")) == 0) return 1; if (strcmp(column->name, xgetenv("TRENDSCOLUMN")) == 0) return 1; + if (strcmp(column->name, xgetenv("CLIENTCOLUMN")) == 0) return 1; if (includecolumns) { int result; @@ -441,7 +442,7 @@ col_list_t *groupcols, *gc; int genstatic; int columncount; - char *xymonskin, *infocolumngif, *trendscolumngif; + char *xymonskin, *infocolumngif, *trendscolumngif, *clientcolumngif; int rowcount = 0; int usetooltip = 0; @@ -451,6 +452,7 @@ xymonskin = strdup(xgetenv("XYMONSKIN")); infocolumngif = strdup(getenv("INFOCOLUMNGIF") ? getenv("INFOCOLUMNGIF") : dotgiffilename(COL_GREEN, 0, 1)); trendscolumngif = strdup(getenv("TRENDSCOLUMNGIF") ? getenv("TRENDSCOLUMNGIF") : dotgiffilename(COL_GREEN, 0, 1)); + clientcolumngif = strdup(getenv("CLIENTCOLUMNGIF") ? getenv("CLIENTCOLUMNGIF") : dotgiffilename(COL_GREEN, 0, 1)); switch (tooltipuse) { case TT_STDONLY: usetooltip = (pagetype == PAGE_NORMAL); break; @@ -566,6 +568,10 @@ htmlalttag = alttag(e->column->name, COL_GREEN, 0, 1, h->ip); img = trendscolumngif; } + else if (strcmp(e->column->name, xgetenv("CLIENTCOLUMN")) == 0) { + htmlalttag = alttag(e->column->name, COL_GREEN, 0, 1, h->ip); + img = clientcolumngif; + } else { htmlalttag = alttag(e->column->name, e->color, e->acked, e->propagate, e->age); } @@ -576,7 +582,7 @@ /* A summary host. */ fprintf(output, "<A HREF=\"%s\">", e->sumurl); } - else if (genstatic && strcmp(e->column->name, xgetenv("INFOCOLUMN")) && strcmp(e->column->name, xgetenv("TRENDSCOLUMN"))) { + else if (genstatic && strcmp(e->column->name, xgetenv("INFOCOLUMN")) && strcmp(e->column->name, xgetenv("TRENDSCOLUMN")) && strcmp(e->column->name, xgetenv("CLIENTCOLUMN"))) { /* * Dont use htmlextension here - it's for the * pages generated dynamically. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jcc...@us...> - 2015-05-01 02:48:45
|
Revision: 7645 http://sourceforge.net/p/xymon/code/7645 Author: jccleaver Date: 2015-05-01 02:48:42 +0000 (Fri, 01 May 2015) Log Message: ----------- When possible, use uname syscall instead of forking Linux for name and OS Modified Paths: -------------- branches/4.x-master/build/genconfig.sh branches/4.x-master/common/xymoncmd.c Modified: branches/4.x-master/build/genconfig.sh =================================================================== --- branches/4.x-master/build/genconfig.sh 2015-05-01 02:44:02 UTC (rev 7644) +++ branches/4.x-master/build/genconfig.sh 2015-05-01 02:48:42 UTC (rev 7645) @@ -80,6 +80,14 @@ echo "#undef HAVE_STRTOLL_H" >>include/config.h fi +echo "Checking for uname" +$CC -c -o build/testfile.o $CFLAGS build/test-uname.c 1>/dev/null 2>&1 +if test $? -eq 0; then + echo "#define HAVE_UNAME 1" >>include/config.h +else + echo "#undef HAVE_UNAME" >>include/config.h +fi + # This is experimental for 4.3.x #echo "Checking for POSIX binary tree functions" #$CC -c -o build/testfile.o $CFLAGS build/test-bintree.c 1>/dev/null 2>&1 @@ -90,6 +98,7 @@ #fi + echo "#endif" >>include/config.h echo "config.h created" Modified: branches/4.x-master/common/xymoncmd.c =================================================================== --- branches/4.x-master/common/xymoncmd.c 2015-05-01 02:44:02 UTC (rev 7644) +++ branches/4.x-master/common/xymoncmd.c 2015-05-01 02:48:42 UTC (rev 7645) @@ -24,6 +24,9 @@ #include <limits.h> #include "libxymon.h" +#ifdef HAVE_UNAME +#include <sys/utsname.h> +#endif static void xymon_default_envs(char *envfn) { @@ -31,9 +34,21 @@ char buf[1024]; char *evar; char *homedir, *p; + int hasuname = 0; +#ifdef HAVE_UNAME + struct utsname u_name; +#endif +#ifdef HAVE_UNAME + hasuname = (uname(&u_name) != -1); + if (!hasuname) errprintf("uname() failed: %s\n", strerror(errno)); +#endif + if (getenv("MACHINEDOTS") == NULL) { if (getenv("HOSTNAME") != NULL) sprintf(buf, "%s", xgetenv("HOSTNAME")); +#ifdef HAVE_UNAME + else if (hasuname) sprintf(buf, "%s", u_name.nodename); +#endif else { fd = popen("uname -n", "r"); if (fd && fgets(buf, sizeof(buf), fd)) { @@ -50,12 +65,19 @@ xgetenv("MACHINE"); if (getenv("SERVEROSTYPE") == NULL) { +#ifdef HAVE_UNAME + if (hasuname) sprintf(buf, "%s", u_name.sysname); + else { +#else + { +#endif fd = popen("uname -s", "r"); if (fd && fgets(buf, sizeof(buf), fd)) { p = strchr(buf, '\n'); if (p) *p = '\0'; pclose(fd); } else strcpy(buf, "unix"); + } for (p=buf; (*p); p++) *p = (char) tolower((int)*p); evar = (char *)malloc(strlen(buf) + 14); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jcc...@us...> - 2015-05-01 02:59:46
|
Revision: 7646 http://sourceforge.net/p/xymon/code/7646 Author: jccleaver Date: 2015-05-01 02:59:44 +0000 (Fri, 01 May 2015) Log Message: ----------- Test for setenv() and use in some common places if possible Modified Paths: -------------- branches/4.x-master/build/genconfig.sh branches/4.x-master/lib/environ.c Modified: branches/4.x-master/build/genconfig.sh =================================================================== --- branches/4.x-master/build/genconfig.sh 2015-05-01 02:48:42 UTC (rev 7645) +++ branches/4.x-master/build/genconfig.sh 2015-05-01 02:59:44 UTC (rev 7646) @@ -88,6 +88,15 @@ echo "#undef HAVE_UNAME" >>include/config.h fi +echo "Checking for setenv" +$CC -c -o build/testfile.o $CFLAGS build/test-setenv.c 1>/dev/null 2>&1 +if test $? -eq 0; then + echo "#define HAVE_SETENV 1" >>include/config.h +else + echo "#undef HAVE_SETENV" >>include/config.h +fi + + # This is experimental for 4.3.x #echo "Checking for POSIX binary tree functions" #$CC -c -o build/testfile.o $CFLAGS build/test-bintree.c 1>/dev/null 2>&1 Modified: branches/4.x-master/lib/environ.c =================================================================== --- branches/4.x-master/lib/environ.c 2015-05-01 02:48:42 UTC (rev 7645) +++ branches/4.x-master/lib/environ.c 2015-05-01 02:59:44 UTC (rev 7646) @@ -164,10 +164,17 @@ /* If MACHINE is undefined, but MACHINEDOTS is there, create MACHINE */ char *oneenv, *p; +#ifdef HAVE_SETENV + oneenv = strdup(xgetenv("MACHINEDOTS")); + p = oneenv; while ((p = strchr(p, '.')) != NULL) *p = ','; + setenv(name, oneenv, 1); + xfree(oneenv); +#else oneenv = (char *)malloc(10 + strlen(xgetenv("MACHINEDOTS"))); sprintf(oneenv, "%s=%s", name, xgetenv("MACHINEDOTS")); p = oneenv; while ((p = strchr(p, '.')) != NULL) *p = ','; putenv(oneenv); +#endif result = getenv(name); } @@ -183,10 +190,13 @@ * If we got a result, put it into the environment so it will stay there. * Allocate memory for this new environment string - this stays allocated. */ +#ifdef HAVE_SETENV + setenv(name, result, 1); +#else newstr = malloc(strlen(name) + strlen(result) + 2); sprintf(newstr, "%s=%s", name, result); putenv(newstr); - +#endif /* * Return pointer to the environment string. */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jcc...@us...> - 2015-05-01 03:51:08
|
Revision: 7649 http://sourceforge.net/p/xymon/code/7649 Author: jccleaver Date: 2015-05-01 03:51:06 +0000 (Fri, 01 May 2015) Log Message: ----------- Add additional protocol.cfg/xymonnet support Modified Paths: -------------- branches/4.x-master/Changes branches/4.x-master/RELEASENOTES branches/4.x-master/debian/changelog branches/4.x-master/xymonnet/protocols.cfg Modified: branches/4.x-master/Changes =================================================================== --- branches/4.x-master/Changes 2015-05-01 03:16:21 UTC (rev 7648) +++ branches/4.x-master/Changes 2015-05-01 03:51:06 UTC (rev 7649) @@ -37,6 +37,9 @@ xymon pages (similar to trends and info columns). This can be disabled on a per-host basis by adding a 'noclient' tag to the hosts.cfg line, or globally by adding that to the .default. host. +* Add protocols.cfg entries for amqp(s), svn, ircd, and mail (submission). + (Note that smtp testing here may suffer the same occasional issue as + regular smtp conversations with regard to out-of-order commands.) Changes from 4.3.18 -> 4.3.19 (30 Mar 2015) Modified: branches/4.x-master/RELEASENOTES =================================================================== --- branches/4.x-master/RELEASENOTES 2015-05-01 03:16:21 UTC (rev 7648) +++ branches/4.x-master/RELEASENOTES 2015-05-01 03:51:06 UTC (rev 7649) @@ -35,7 +35,11 @@ to a server's raw clientlog (similar to the special info and trends columns). This can be disabled with a "noclient" tag in hosts.cfg +Additional sample protocols.cfg services are present, for svn, amqp(s) and +ircd. (Note that different ircd servers respond differently and the included +protocol conversation may require modification to work on your server.) + Changes for 4.3.19 ================== This is mostly a bugfix release (see the Changes file for a full list), Modified: branches/4.x-master/debian/changelog =================================================================== --- branches/4.x-master/debian/changelog 2015-05-01 03:16:21 UTC (rev 7648) +++ branches/4.x-master/debian/changelog 2015-05-01 03:51:06 UTC (rev 7649) @@ -36,6 +36,9 @@ xymon pages (similar to trends and info columns). This can be disabled on a per-host basis by adding a 'noclient' tag to the hosts.cfg line, or globally by adding that to the .default. host. + * Add protocols.cfg entries for amqp(s), svn, ircd, and mail (submission). + (Note that smtp testing here may suffer the same occasional issue as + regular smtp conversations with regard to out-of-order commands.) -- Japheth Cleaver <cle...@te...> XXX, 00 Apr 2015 22:39:17 -0700 Modified: branches/4.x-master/xymonnet/protocols.cfg =================================================================== --- branches/4.x-master/xymonnet/protocols.cfg 2015-05-01 03:16:21 UTC (rev 7648) +++ branches/4.x-master/xymonnet/protocols.cfg 2015-05-01 03:51:06 UTC (rev 7649) @@ -78,6 +78,12 @@ options ssl,banner # No default port-number assignment for smtps - nonstandard according to IANA +[submission|msa] + send "ehlo xymonnet.localdomain\r\nmail\r\nquit\r\n" + expect "220" + options banner + port 587 + [pop2|pop-2] send "quit\r\n" expect "+OK" @@ -158,6 +164,12 @@ options banner port 783 +# From Mark Felder +[svn] + expect "( success" + options banner + port 3690 + # From http://www.mail-archive.com/wha...@li.../msg06678.html [oratns] send "\x00\x57\x00\x00\x01\x00\x00\x00\x01\x36\x01\x2C\x00\x00\x08\x00\x7F\xFF\xA3\x0A\x00\x00\x01\x00\x00\x1D\x00\x3A\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x08\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00(CONNECT_DATA=(COMMAND=ping))" @@ -172,6 +184,18 @@ [qmqp] port 628 +# Advanced Message Queuing Protocol +[amqp] + send "PING\r\n\r\n" + expect "AMQP" + options banner + +# Advanced Message Queuing Protocol over SSL +[amqps] + send "PING\r\n\r\n\r\n\r\n" + expect "AMQP" + options ssl,banner + # vnc "Virtual Network Computing" - method from bb-vnc.tar.gz # From Richard Finegold [vnc] @@ -212,6 +236,13 @@ options banner port 444 +# Internet Relay Chat +[ircd] + send "NICK xymonnet\r\nUSER xymond 0 * :Xymonnet\r\nTIME\r\nVERSION\r\nQUIT\r\n" + options banner + port 6667 + # de facto ircd port is 6667 + # line printer spooler (lpd) [lpd] port 515 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jcc...@us...> - 2015-05-01 03:55:46
|
Revision: 7650 http://sourceforge.net/p/xymon/code/7650 Author: jccleaver Date: 2015-05-01 03:55:44 +0000 (Fri, 01 May 2015) Log Message: ----------- Display remote status summaries on nongreen page too Modified Paths: -------------- branches/4.x-master/Changes branches/4.x-master/RELEASENOTES branches/4.x-master/debian/changelog branches/4.x-master/xymongen/pagegen.c Modified: branches/4.x-master/Changes =================================================================== --- branches/4.x-master/Changes 2015-05-01 03:51:06 UTC (rev 7649) +++ branches/4.x-master/Changes 2015-05-01 03:55:44 UTC (rev 7650) @@ -3,7 +3,8 @@ * rev xxyy -* Summaries should be properly displayed again +* Summaries should be properly displayed again, and will display on the + nongreen.html page as well. * An icon for green acknowledged states is now included -- ironically, the original icon that the other checkmarks were based off of. * The various utilities in cgi-bin and cgi-secure are now hardlinked to Modified: branches/4.x-master/RELEASENOTES =================================================================== --- branches/4.x-master/RELEASENOTES 2015-05-01 03:51:06 UTC (rev 7649) +++ branches/4.x-master/RELEASENOTES 2015-05-01 03:55:44 UTC (rev 7650) @@ -12,7 +12,8 @@ Changes for 4.3.20 ================== -Remote summaries have been broken for a while but should now display again +Remote summaries display had been broken for a while but should now be working +again. Summaries are now also displayed on the nongreen.html page Documentation for various directives in hosts.cfg(5) has been added Modified: branches/4.x-master/debian/changelog =================================================================== --- branches/4.x-master/debian/changelog 2015-05-01 03:51:06 UTC (rev 7649) +++ branches/4.x-master/debian/changelog 2015-05-01 03:55:44 UTC (rev 7650) @@ -3,7 +3,8 @@ * rev xxxx - * Summaries should be properly displayed again + * Summaries should be properly displayed again, and will display on the + nongreen.html page as well. * An icon for green acknowledged states is now included -- ironically, the original icon that the other checkmarks were based off of. * The various utilities in cgi-bin and cgi-secure are now hardlinked to Modified: branches/4.x-master/xymongen/pagegen.c =================================================================== --- branches/4.x-master/xymongen/pagegen.c 2015-05-01 03:51:06 UTC (rev 7649) +++ branches/4.x-master/xymongen/pagegen.c 2015-05-01 03:55:44 UTC (rev 7650) @@ -1271,6 +1271,9 @@ fprintf(output, "%s", xgetenv("XYMONALLOKTEXT")); } + /* Summaries on nongreenpage as well */ + do_summaries(dispsums, output); + if ((snapshot == 0) && (summarytype == PAGE_NONGREEN)) { do_nongreenext(output, "XYMONNONGREENEXT", "mkbb"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jcc...@us...> - 2015-05-07 19:12:10
|
Revision: 7651 http://sourceforge.net/p/xymon/code/7651 Author: jccleaver Date: 2015-05-07 19:12:07 +0000 (Thu, 07 May 2015) Log Message: ----------- Fix Solaris crash when testing xymond_alert with non-existent host Modified Paths: -------------- branches/4.x-master/Changes branches/4.x-master/debian/changelog branches/4.x-master/lib/loadalerts.c Modified: branches/4.x-master/Changes =================================================================== --- branches/4.x-master/Changes 2015-05-01 03:55:44 UTC (rev 7650) +++ branches/4.x-master/Changes 2015-05-07 19:12:07 UTC (rev 7651) @@ -1,4 +1,4 @@ -Changes from 4.3.19 -> 4.xx.yy (00 Apr 2015) +Changes from 4.3.19 -> 4.xx.yy (00 May 2015) =========================================== * rev xxyy @@ -41,6 +41,8 @@ * Add protocols.cfg entries for amqp(s), svn, ircd, and mail (submission). (Note that smtp testing here may suffer the same occasional issue as regular smtp conversations with regard to out-of-order commands.) +* Fix a crash on non-glibc systems when testing xymond_alert configs with + a host not in hosts.cfg (Reported by John Thurston) Changes from 4.3.18 -> 4.3.19 (30 Mar 2015) Modified: branches/4.x-master/debian/changelog =================================================================== --- branches/4.x-master/debian/changelog 2015-05-01 03:55:44 UTC (rev 7650) +++ branches/4.x-master/debian/changelog 2015-05-07 19:12:07 UTC (rev 7651) @@ -40,8 +40,10 @@ * Add protocols.cfg entries for amqp(s), svn, ircd, and mail (submission). (Note that smtp testing here may suffer the same occasional issue as regular smtp conversations with regard to out-of-order commands.) + * Fix a crash on non-glibc systems when testing xymond_alert configs with + a host not in hosts.cfg (Reported by John Thurston) - -- Japheth Cleaver <cle...@te...> XXX, 00 Apr 2015 22:39:17 -0700 + -- Japheth Cleaver <cle...@te...> XXX, 00 May 2015 22:39:17 -0700 xymon (4.3.19) unstable; urgency=medium Modified: branches/4.x-master/lib/loadalerts.c =================================================================== --- branches/4.x-master/lib/loadalerts.c 2015-05-01 03:55:44 UTC (rev 7650) +++ branches/4.x-master/lib/loadalerts.c 2015-05-07 19:12:07 UTC (rev 7651) @@ -804,15 +804,22 @@ */ static char *pgnames = NULL; + char *dgname = NULL; int pgmatchres, pgexclres; time_t duration = (getcurrenttime(NULL) - alert->eventstart); int result, cfid = 0; char *pgtok, *cfline = NULL; void *hinfo = hostinfo(alert->hostname); + if (!hinfo) { + errprintf("Checking criteria for host '%s', which is not defined\n", alert->hostname); + hinfo = localhostinfo(alert->hostname); + }; + /* The top-level page needs a name - cannot match against an empty string */ if (pgnames) xfree(pgnames); pgnames = strdup((*alert->location == '\0') ? "/" : alert->location); + dgname = textornull(xmh_item(hinfo, XMH_DGNAME)); if (crit) { cfid = crit->cfid; cfline = crit->cfline; } if (!cfid && rulecrit) cfid = rulecrit->cfid; @@ -820,7 +827,7 @@ if (!cfline) cfline = "<undefined>"; traceprintf("Matching host:service:dgroup:page '%s:%s:%s:%s' against rule line %d\n", - alert->hostname, alert->testname, xmh_item(hinfo, XMH_DGNAME), alert->location, cfid); + alert->hostname, alert->testname, dgname, alert->location, cfid); if (alert->state == A_PAGING) { /* Check max-duration now - it's fast and easy. */ @@ -916,11 +923,11 @@ return 0; } - if (crit && crit->dgspec && !namematch(xmh_item(hinfo, XMH_DGNAME), crit->dgspec, crit->dgspecre)) { + if (crit && crit->dgspec && !namematch(dgname, crit->dgspec, crit->dgspecre)) { traceprintf("Failed '%s' (displaygroup not in include list)\n", cfline); return 0; } - if (crit && crit->exdgspec && namematch(xmh_item(hinfo, XMH_DGNAME), crit->exdgspec, crit->exdgspecre)) { + if (crit && crit->exdgspec && namematch(dgname, crit->exdgspec, crit->exdgspecre)) { traceprintf("Failed '%s' (displaygroup excluded)\n", cfline); return 0; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jcc...@us...> - 2015-05-07 19:33:48
|
Revision: 7652 http://sourceforge.net/p/xymon/code/7652 Author: jccleaver Date: 2015-05-07 19:33:45 +0000 (Thu, 07 May 2015) Log Message: ----------- Use 'Available' memory figure to calculate 'Actual Used' on recent Linux kernels Modified Paths: -------------- branches/4.x-master/Changes branches/4.x-master/RELEASENOTES branches/4.x-master/debian/changelog branches/4.x-master/xymond/client/linux.c Modified: branches/4.x-master/Changes =================================================================== --- branches/4.x-master/Changes 2015-05-07 19:12:07 UTC (rev 7651) +++ branches/4.x-master/Changes 2015-05-07 19:33:45 UTC (rev 7652) @@ -43,6 +43,9 @@ regular smtp conversations with regard to out-of-order commands.) * Fix a crash on non-glibc systems when testing xymond_alert configs with a host not in hosts.cfg (Reported by John Thurston) +* On newer Linux kernels with recent procps-ng, use the "Available" memory + reported by the kernel to give a more accurate reading for "Actual Used" + in the client's memory status. (Reported by Dominique Frise) Changes from 4.3.18 -> 4.3.19 (30 Mar 2015) Modified: branches/4.x-master/RELEASENOTES =================================================================== --- branches/4.x-master/RELEASENOTES 2015-05-07 19:12:07 UTC (rev 7651) +++ branches/4.x-master/RELEASENOTES 2015-05-07 19:33:45 UTC (rev 7652) @@ -15,6 +15,12 @@ Remote summaries display had been broken for a while but should now be working again. Summaries are now also displayed on the nongreen.html page +The "Actual Used" memory figure on recent Linux kernels is now taken from +the "Available" memory reported back from free (or /proc/meminfo), which should +give a more accurate response. Physical Memory Used is still reported as the +combination of Kernel Physical Use + buffers/cache, however this may change in +a future release. + Documentation for various directives in hosts.cfg(5) has been added pullclient=IP:PORT directives are honored, if the defaults for the host are Modified: branches/4.x-master/debian/changelog =================================================================== --- branches/4.x-master/debian/changelog 2015-05-07 19:12:07 UTC (rev 7651) +++ branches/4.x-master/debian/changelog 2015-05-07 19:33:45 UTC (rev 7652) @@ -42,6 +42,9 @@ regular smtp conversations with regard to out-of-order commands.) * Fix a crash on non-glibc systems when testing xymond_alert configs with a host not in hosts.cfg (Reported by John Thurston) + * On newer Linux kernels with recent procps-ng, use the "Available" memory + reported by the kernel to give a more accurate reading for "Actual Used" + in the client's memory status. (Reported by Dominique Frise) -- Japheth Cleaver <cle...@te...> XXX, 00 May 2015 22:39:17 -0700 Modified: branches/4.x-master/xymond/client/linux.c =================================================================== --- branches/4.x-master/xymond/client/linux.c 2015-05-07 19:12:07 UTC (rev 7651) +++ branches/4.x-master/xymond/client/linux.c 2015-05-07 19:33:45 UTC (rev 7652) @@ -72,6 +72,18 @@ unix_ifstat_report(hostname, clienttype, os, hinfo, fromline, timestr, ifstatstr); unix_vmstat_report(hostname, clienttype, os, hinfo, fromline, timestr, vmstatstr); + /* + * Sigh. Recent kernels + procps-ng change things up a bit. If 'available' is present + * (roughly, 3.14+ and 2.6.27+, but depends on the vendor), then we'll use the inverse of that: + * (Physical - Available = ACTUALUSED) + * Otherwise, it's: + * (Physical Used - (buffers + cached) = ACTUALUSED) + * + * See discussions at http://lists.xymon.com/pipermail/xymon/2015-April/041628.html + * If the legacy meminfo display is NOT used, we should get the old format still + * + */ + if (freestr) { char *p; long memphystotal, memphysused, memphysfree, @@ -79,23 +91,48 @@ memswaptotal, memswapused, memswapfree; memphystotal = memswaptotal = memphysused = memswapused = memactused = memactfree = -1; - p = strstr(freestr, "\nMem:"); - if (p && (sscanf(p, "\nMem: %ld %ld %ld", &memphystotal, &memphysused, &memphysfree) == 3)) { - memphystotal /= 1024; - memphysused /= 1024; - memphysfree /= 1024; + + /* check for old style */ + p = strstr(freestr, "\n-/+ buffers/cache:"); + if (p) { + if (sscanf(p, "\n-/+ buffers/cache: %ld %ld", &memactused, &memactfree) == 2) { + memactused /= 1024; + memactfree /= 1024; + } + p = strstr(freestr, "\nMem:"); + if (p && (sscanf(p, "\nMem: %ld %ld %ld", &memphystotal, &memphysused, &memphysfree) == 3)) { + memphystotal /= 1024; + memphysused /= 1024; + memphysfree /= 1024; + } + } + /* check for new style */ + else if (strstr(freestr, "available\n")) { + long shared, buffcache; + p = strstr(freestr, "\nMem:"); + if (p && (sscanf(p, "\nMem: %ld %ld %ld %ld %ld %ld", &memphystotal, &memphysused, &memphysfree, + &shared, &buffcache, &memactfree) == 6)) { + memphystotal /= 1024; + memphysused /= 1024; + memphysfree /= 1024; + /* Provide a Physical Used value that's compatible with previous thresholds. However, use the */ + /* new 'Available' line as the basis for "Actual Used", since it'll be more accurate. */ + memactfree /= 1024; + memactused = memphystotal - memactfree; if (memactused < 0) memactused = 0; + memphysused += (buffcache / 1024); + + } + } + else errprintf(" -> No readable memory data for %s in freestr\n", hostname); + + /* There's always a swap line */ p = strstr(freestr, "\nSwap:"); if (p && (sscanf(p, "\nSwap: %ld %ld %ld", &memswaptotal, &memswapused, &memswapfree) == 3)) { memswaptotal /= 1024; memswapused /= 1024; memswapfree /= 1024; } - p = strstr(freestr, "\n-/+ buffers/cache:"); - if (p && (sscanf(p, "\n-/+ buffers/cache: %ld %ld", &memactused, &memactfree) == 2)) { - memactused /= 1024; - memactfree /= 1024; - } unix_memory_report(hostname, clienttype, os, hinfo, fromline, timestr, memphystotal, memphysused, memactused, memswaptotal, memswapused); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jcc...@us...> - 2015-05-13 03:56:32
|
Revision: 7657 http://sourceforge.net/p/xymon/code/7657 Author: jccleaver Date: 2015-05-13 03:56:29 +0000 (Wed, 13 May 2015) Log Message: ----------- Forward port r7656 Revision Links: -------------- http://sourceforge.net/p/xymon/code/7656 Modified Paths: -------------- branches/4.x-master/build/Makefile.rules branches/4.x-master/xymonnet/c-ares-shim.sh Modified: branches/4.x-master/build/Makefile.rules =================================================================== --- branches/4.x-master/build/Makefile.rules 2015-05-13 03:55:39 UTC (rev 7656) +++ branches/4.x-master/build/Makefile.rules 2015-05-13 03:56:29 UTC (rev 7657) @@ -135,7 +135,7 @@ rm -rf debbuild rpmbuild allclean: clean - (cd xymonnet/c-ares && $(MAKE) clean) || true + (cd xymonnet/c-ares 2>/dev/null && $(MAKE) clean) || true clean: $(MAKE) -C build clean Modified: branches/4.x-master/xymonnet/c-ares-shim.sh =================================================================== --- branches/4.x-master/xymonnet/c-ares-shim.sh 2015-05-13 03:55:39 UTC (rev 7656) +++ branches/4.x-master/xymonnet/c-ares-shim.sh 2015-05-13 03:56:29 UTC (rev 7657) @@ -6,9 +6,9 @@ # for i in $CFLAGS; do - if [ `echo $i | grep -c -e '-I' -e '-D' -e '-L'` -eq 0 ]; then + if [ `echo $i | grep -c '\-I'` -eq 0 -a `echo $i | grep -c '\-D'` -eq 0 -a `echo $i | grep -c '\-L'` -eq 0 ]; then CFF="$CFF $i" - elif [ `echo $i | grep -c -e '-L'` -eq 0 ]; then + elif [ `echo $i | grep -c '\-L'` -eq 0 ]; then CPF="$CPF $i" else echo "REJECTING '${i}' in CFLAGS" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jcc...@us...> - 2015-05-21 14:25:49
|
Revision: 7662 http://sourceforge.net/p/xymon/code/7662 Author: jccleaver Date: 2015-05-21 14:25:46 +0000 (Thu, 21 May 2015) Log Message: ----------- Forward update release notes Modified Paths: -------------- branches/4.x-master/Changes branches/4.x-master/RELEASENOTES branches/4.x-master/debian/changelog Modified: branches/4.x-master/Changes =================================================================== --- branches/4.x-master/Changes 2015-05-15 15:19:04 UTC (rev 7661) +++ branches/4.x-master/Changes 2015-05-21 14:25:46 UTC (rev 7662) @@ -1,8 +1,16 @@ -Changes from 4.3.19 -> 4.xx.yy (00 May 2015) +Changes from 4.3.20 -> 4.3.21 (XX May 2015) =========================================== -* rev xxyy +* rev 76XX +* RSS feeds should now display the short description of the event again. + + +Changes from 4.3.19 -> 4.3.20 (15 May 2015) +=========================================== + +* rev 7661 + * Summaries should be properly displayed again, and will display on the nongreen.html page as well. * An icon for green acknowledged states is now included -- ironically, the Modified: branches/4.x-master/RELEASENOTES =================================================================== --- branches/4.x-master/RELEASENOTES 2015-05-15 15:19:04 UTC (rev 7661) +++ branches/4.x-master/RELEASENOTES 2015-05-21 14:25:46 UTC (rev 7662) @@ -10,6 +10,11 @@ Changes file. +Changes for 4.3.21 +================== +RSS feeds should now display the short description of the event again. + + Changes for 4.3.20 ================== Remote summaries display had been broken for a while but should now be working @@ -23,7 +28,7 @@ Documentation for various directives in hosts.cfg(5) has been added -pullclient=IP:PORT directives are honored, if the defaults for the host are +pulldata=IP:PORT directives are honored, if the defaults for the host are incorrect cgiwrap is now installed via hardlinking (or as packaged); FollowSymLinks Modified: branches/4.x-master/debian/changelog =================================================================== --- branches/4.x-master/debian/changelog 2015-05-15 15:19:04 UTC (rev 7661) +++ branches/4.x-master/debian/changelog 2015-05-21 14:25:46 UTC (rev 7662) @@ -1,8 +1,17 @@ -xymon (4.xx.yy) unstable; urgency=medium +xymon (4.3.21) unstable; urgency=medium - * rev xxxx + * rev 76XX + * RSS feeds should now display the short description of the event again. + + -- Japheth Cleaver <cle...@te...> Fri, XX May 2015 08:15:00 -0700 + + +xymon (4.3.20) unstable; urgency=medium + + * rev 7661 + * Summaries should be properly displayed again, and will display on the nongreen.html page as well. * An icon for green acknowledged states is now included -- ironically, the @@ -46,7 +55,7 @@ reported by the kernel to give a more accurate reading for "Actual Used" in the client's memory status. (Reported by Dominique Frise) - -- Japheth Cleaver <cle...@te...> XXX, 00 May 2015 22:39:17 -0700 + -- Japheth Cleaver <cle...@te...> Fri, 15 May 2015 08:15:00 -0700 xymon (4.3.19) unstable; urgency=medium This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jcc...@us...> - 2015-05-23 01:13:16
|
Revision: 7666 http://sourceforge.net/p/xymon/code/7666 Author: jccleaver Date: 2015-05-23 01:13:14 +0000 (Sat, 23 May 2015) Log Message: ----------- Prep docs and remove FollowSymLinks Modified Paths: -------------- branches/4.x-master/Changes branches/4.x-master/debian/changelog branches/4.x-master/docs/xymon-apacheconf.txt branches/4.x-master/xymond/etcfiles/xymon-apache-open.DIST branches/4.x-master/xymond/etcfiles/xymon-apache-secure.DIST Modified: branches/4.x-master/Changes =================================================================== --- branches/4.x-master/Changes 2015-05-23 01:03:56 UTC (rev 7665) +++ branches/4.x-master/Changes 2015-05-23 01:13:14 UTC (rev 7666) @@ -1,7 +1,7 @@ -Changes from 4.3.20 -> 4.3.21 (XX May 2015) +Changes from 4.3.20 -> 4.3.21 (22 May 2015) =========================================== -* rev 76XX +* rev 7668 * RSS feeds should now display the short description of the event again. Modified: branches/4.x-master/debian/changelog =================================================================== --- branches/4.x-master/debian/changelog 2015-05-23 01:03:56 UTC (rev 7665) +++ branches/4.x-master/debian/changelog 2015-05-23 01:13:14 UTC (rev 7666) @@ -1,11 +1,11 @@ xymon (4.3.21) unstable; urgency=medium - * rev 76XX + * rev 7668 * RSS feeds should now display the short description of the event again. - -- Japheth Cleaver <cle...@te...> Fri, XX May 2015 08:15:00 -0700 + -- Japheth Cleaver <cle...@te...> Fri, 22 May 2015 18:15:00 -0700 xymon (4.3.20) unstable; urgency=medium Modified: branches/4.x-master/docs/xymon-apacheconf.txt =================================================================== --- branches/4.x-master/docs/xymon-apacheconf.txt 2015-05-23 01:03:56 UTC (rev 7665) +++ branches/4.x-master/docs/xymon-apacheconf.txt 2015-05-23 01:13:14 UTC (rev 7666) @@ -27,7 +27,7 @@ ScriptAlias /xymon-cgi/ "/usr/local/xymon/cgi-bin/" <Directory "/usr/local/xymon/cgi-bin"> AllowOverride None - Options FollowSymLinks ExecCGI Includes + Options ExecCGI Includes <IfModule mod_authz_core.c> # Apache 2.4+ Require all granted @@ -41,7 +41,7 @@ ScriptAlias /xymon-seccgi/ "/usr/local/xymon/cgi-secure/" <Directory "/usr/local/xymon/cgi-secure"> AllowOverride None - Options FollowSymLinks ExecCGI Includes + Options ExecCGI Includes <IfModule mod_authz_core.c> # Apache 2.4+ Require all granted Modified: branches/4.x-master/xymond/etcfiles/xymon-apache-open.DIST =================================================================== --- branches/4.x-master/xymond/etcfiles/xymon-apache-open.DIST 2015-05-23 01:03:56 UTC (rev 7665) +++ branches/4.x-master/xymond/etcfiles/xymon-apache-open.DIST 2015-05-23 01:13:14 UTC (rev 7666) @@ -27,7 +27,7 @@ ScriptAlias @XYMONCGIURL@/ "@CGIDIR@/" <Directory "@CGIDIR@"> AllowOverride None - Options ExecCGI FollowSymLinks Includes + Options ExecCGI Includes <IfModule mod_authz_core.c> # Apache 2.4+ Require all granted Modified: branches/4.x-master/xymond/etcfiles/xymon-apache-secure.DIST =================================================================== --- branches/4.x-master/xymond/etcfiles/xymon-apache-secure.DIST 2015-05-23 01:03:56 UTC (rev 7665) +++ branches/4.x-master/xymond/etcfiles/xymon-apache-secure.DIST 2015-05-23 01:13:14 UTC (rev 7666) @@ -27,7 +27,7 @@ ScriptAlias @XYMONCGIURL@/ "@CGIDIR@/" <Directory "@CGIDIR@"> AllowOverride None - Options ExecCGI FollowSymLinks Includes + Options ExecCGI Includes <IfModule mod_authz_core.c> # Apache 2.4+ Require all granted @@ -41,7 +41,7 @@ ScriptAlias @SECUREXYMONCGIURL@/ "@SECURECGIDIR@/" <Directory "@SECURECGIDIR@"> AllowOverride None - Options ExecCGI FollowSymLinks Includes + Options ExecCGI Includes <IfModule mod_authz_core.c> # Apache 2.4+ Require all granted This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jcc...@us...> - 2015-06-11 22:39:03
|
Revision: 7669 http://sourceforge.net/p/xymon/code/7669 Author: jccleaver Date: 2015-06-11 22:39:01 +0000 (Thu, 11 Jun 2015) Log Message: ----------- Don't leave xymond_hostdata or xymond_history zombies Modified Paths: -------------- branches/4.x-master/Changes branches/4.x-master/debian/changelog branches/4.x-master/xymond/xymond_history.c branches/4.x-master/xymond/xymond_hostdata.c Modified: branches/4.x-master/Changes =================================================================== --- branches/4.x-master/Changes 2015-05-23 01:17:25 UTC (rev 7668) +++ branches/4.x-master/Changes 2015-06-11 22:39:01 UTC (rev 7669) @@ -1,3 +1,12 @@ +Changes from 4.3.21 -> 4.#### () +=========================================== + +* rev #### + +* Ensure we don't leave xymond_hostdata or xymond_history zombies lying around + after dropping host records (Reported by Scot Kreienkamp) + + Changes from 4.3.20 -> 4.3.21 (22 May 2015) =========================================== Modified: branches/4.x-master/debian/changelog =================================================================== --- branches/4.x-master/debian/changelog 2015-05-23 01:17:25 UTC (rev 7668) +++ branches/4.x-master/debian/changelog 2015-06-11 22:39:01 UTC (rev 7669) @@ -1,4 +1,14 @@ +xymon (4.####) unstable; urgency=medium + + * rev #### + + * Ensure we don't leave xymond_hostdata or xymond_history zombies lying around + after dropping host records (Reported by Scot Kreienkamp) + + -- Japheth Cleaver <cle...@te...> Fri, 22 May 2015 18:15:00 -0700 + + xymon (4.3.21) unstable; urgency=medium * rev 7668 Modified: branches/4.x-master/xymond/xymond_history.c =================================================================== --- branches/4.x-master/xymond/xymond_history.c 2015-05-23 01:17:25 UTC (rev 7668) +++ branches/4.x-master/xymond/xymond_history.c 2015-06-11 22:39:01 UTC (rev 7669) @@ -178,7 +178,7 @@ setup_signalhandler("xymond_history"); memset(&sa, 0, sizeof(sa)); sa.sa_handler = sig_handler; - sigaction(SIGCHLD, &sa, NULL); + signal(SIGCHLD, SIG_IGN); sigaction(SIGHUP, &sa, NULL); signal(SIGPIPE, SIG_DFL); @@ -196,9 +196,6 @@ int trend; int childstat; - /* Pickup any finished child processes to avoid zombies */ - while (wait3(&childstat, WNOHANG, NULL) > 0) ; - if (rotatefiles && alleventsfd) { fclose(alleventsfd); alleventsfd = fopen(alleventsfn, "a"); Modified: branches/4.x-master/xymond/xymond_hostdata.c =================================================================== --- branches/4.x-master/xymond/xymond_hostdata.c 2015-05-23 01:17:25 UTC (rev 7668) +++ branches/4.x-master/xymond/xymond_hostdata.c 2015-06-11 22:39:01 UTC (rev 7669) @@ -132,6 +132,7 @@ setup_signalhandler("xymond_hostdata"); memset(&sa, 0, sizeof(sa)); sa.sa_handler = sig_handler; + signal(SIGCHLD, SIG_IGN); sigaction(SIGHUP, &sa, NULL); signal(SIGPIPE, SIG_DFL); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jcc...@us...> - 2015-09-06 00:15:43
|
Revision: 7671 http://sourceforge.net/p/xymon/code/7671 Author: jccleaver Date: 2015-09-06 00:15:40 +0000 (Sun, 06 Sep 2015) Log Message: ----------- HTML tag standardization in option lists (From ha...@ca...) Modified Paths: -------------- branches/4.x-master/Changes branches/4.x-master/debian/changelog branches/4.x-master/lib/headfoot.c branches/4.x-master/web/acknowledge.c branches/4.x-master/web/svcstatus-info.c Modified: branches/4.x-master/Changes =================================================================== --- branches/4.x-master/Changes 2015-07-29 18:34:47 UTC (rev 7670) +++ branches/4.x-master/Changes 2015-09-06 00:15:40 UTC (rev 7671) @@ -5,6 +5,7 @@ * Ensure we don't leave xymond_hostdata or xymond_history zombies lying around after dropping host records (Reported by Scot Kreienkamp) +* Fix up HTML list layout to reflect current standards (Thanks, ha...@ca...) Changes from 4.3.20 -> 4.3.21 (22 May 2015) Modified: branches/4.x-master/debian/changelog =================================================================== --- branches/4.x-master/debian/changelog 2015-07-29 18:34:47 UTC (rev 7670) +++ branches/4.x-master/debian/changelog 2015-09-06 00:15:40 UTC (rev 7671) @@ -5,6 +5,7 @@ * Ensure we don't leave xymond_hostdata or xymond_history zombies lying around after dropping host records (Reported by Scot Kreienkamp) + * Fix up HTML list layout to reflect current standards (Thanks, ha...@ca...) -- Japheth Cleaver <cle...@te...> Fri, 22 May 2015 18:15:00 -0700 Modified: branches/4.x-master/lib/headfoot.c =================================================================== --- branches/4.x-master/lib/headfoot.c 2015-07-29 18:34:47 UTC (rev 7670) +++ branches/4.x-master/lib/headfoot.c 2015-09-06 00:15:40 UTC (rev 7671) @@ -354,15 +354,15 @@ char *selstr; if (!criteditslawkdays) { - if (isdefault) selstr = "SELECTED"; + if (isdefault) selstr = " selected"; else selstr = ""; } else { - if (strchr(criteditslawkdays, wkday)) selstr = "SELECTED"; + if (strchr(criteditslawkdays, wkday)) selstr = " selected"; else selstr = ""; } - sprintf(result, "<option value=\"%c\" %s>%s</option>\n", wkday, selstr, valtxt); + sprintf(result, "<option value=\"%c\"%s>%s</option>\n", wkday, selstr, valtxt); return result; } @@ -710,11 +710,11 @@ nowtm = localtime(&selectedtime); for (i=1; (i <= 12); i++) { - if (i == (nowtm->tm_mon + 1)) selstr = "SELECTED"; else selstr = ""; + if (i == (nowtm->tm_mon + 1)) selstr = " selected"; else selstr = ""; monthtm.tm_mon = (i-1); monthtm.tm_mday = 1; monthtm.tm_year = nowtm->tm_year; monthtm.tm_hour = monthtm.tm_min = monthtm.tm_sec = monthtm.tm_isdst = 0; strftime(mname, sizeof(mname)-1, "%B", &monthtm); - fprintf(output, "<OPTION VALUE=\"%d\" %s>%s\n", i, selstr, mname); + fprintf(output, "<option value=\"%d\"%s>%s</option>\n", i, selstr, mname); } MEMUNDEFINE(mname); @@ -731,7 +731,7 @@ monthtm.tm_mon = (i-1); monthtm.tm_mday = 1; monthtm.tm_year = nowtm->tm_year; monthtm.tm_hour = monthtm.tm_min = monthtm.tm_sec = monthtm.tm_isdst = 0; strftime(mname, sizeof(mname)-1, "%B", &monthtm); - fprintf(output, "<OPTION VALUE=\"%d\">%s\n", i, mname); + fprintf(output, "<option value=\"%d\">%s</option>\n", i, mname); } MEMUNDEFINE(mname); @@ -745,8 +745,8 @@ nowtm = localtime(&selectedtime); strftime(weekstr, sizeof(weekstr)-1, "%V", nowtm); weeknum = atoi(weekstr); for (i=1; (i <= 53); i++) { - if (i == weeknum) selstr = "SELECTED"; else selstr = ""; - fprintf(output, "<OPTION VALUE=\"%d\" %s>%d\n", i, selstr, i); + if (i == weeknum) selstr = " selected"; else selstr = ""; + fprintf(output, "<option value=\"%d\"%s>%d</option>\n", i, selstr, i); } } else if (strcmp(t_start, "REPDAYLIST") == 0) { @@ -755,8 +755,8 @@ nowtm = localtime(&selectedtime); for (i=1; (i <= 31); i++) { - if (i == nowtm->tm_mday) selstr = "SELECTED"; else selstr = ""; - fprintf(output, "<OPTION VALUE=\"%d\" %s>%d\n", i, selstr, i); + if (i == nowtm->tm_mday) selstr = " selected"; else selstr = ""; + fprintf(output, "<option value=\"%d\"%s>%d</option>\n", i, selstr, i); } } else if (strcmp(t_start, "DAYLIST") == 0) { @@ -764,7 +764,7 @@ nowtm = localtime(&selectedtime); for (i=1; (i <= 31); i++) { - fprintf(output, "<OPTION VALUE=\"%d\">%d\n", i, i); + fprintf(output, "<option value=\"%d\">%d</option>\n", i, i); } } else if (strcmp(t_start, "REPYEARLIST") == 0) { @@ -777,8 +777,8 @@ endyear = nowtm->tm_year + 1900; for (i=beginyear; (i <= endyear); i++) { - if (i == (nowtm->tm_year + 1900)) selstr = "SELECTED"; else selstr = ""; - fprintf(output, "<OPTION VALUE=\"%d\" %s>%d\n", i, selstr, i); + if (i == (nowtm->tm_year + 1900)) selstr = " selected"; else selstr = ""; + fprintf(output, "<option value=\"%d\"%s>%d</option>\n", i, selstr, i); } } else if (strcmp(t_start, "FUTUREYEARLIST") == 0) { @@ -791,8 +791,8 @@ endyear = nowtm->tm_year + 1900 + 5; for (i=beginyear; (i <= endyear); i++) { - if (i == (nowtm->tm_year + 1900)) selstr = "SELECTED"; else selstr = ""; - fprintf(output, "<OPTION VALUE=\"%d\" %s>%d\n", i, selstr, i); + if (i == (nowtm->tm_year + 1900)) selstr = " selected"; else selstr = ""; + fprintf(output, "<option value=\"%d\"%s>%d</option>\n", i, selstr, i); } } else if (strcmp(t_start, "YEARLIST") == 0) { @@ -804,7 +804,7 @@ endyear = nowtm->tm_year + 1900 + 5; for (i=beginyear; (i <= endyear); i++) { - fprintf(output, "<OPTION VALUE=\"%d\">%d\n", i, i); + fprintf(output, "<option value=\"%d\">%d</option>\n", i, i); } } else if (strcmp(t_start, "REPHOURLIST") == 0) { @@ -813,15 +813,15 @@ char *selstr; for (i=0; (i <= 24); i++) { - if (i == nowtm->tm_hour) selstr = "SELECTED"; else selstr = ""; - fprintf(output, "<OPTION VALUE=\"%d\" %s>%d\n", i, selstr, i); + if (i == nowtm->tm_hour) selstr = " selected"; else selstr = ""; + fprintf(output, "<option value=\"%d\"%s>%d</option>\n", i, selstr, i); } } else if (strcmp(t_start, "HOURLIST") == 0) { int i; for (i=0; (i <= 24); i++) { - fprintf(output, "<OPTION VALUE=\"%d\">%d\n", i, i); + fprintf(output, "<option value=\"%d\">%d</option>\n", i, i); } } else if (strcmp(t_start, "REPMINLIST") == 0) { @@ -830,15 +830,15 @@ char *selstr; for (i=0; (i <= 59); i++) { - if (i == nowtm->tm_min) selstr = "SELECTED"; else selstr = ""; - fprintf(output, "<OPTION VALUE=\"%02d\" %s>%02d\n", i, selstr, i); + if (i == nowtm->tm_min) selstr = " selected"; else selstr = ""; + fprintf(output, "<option value=\"%02d\"%s>%02d</option>\n", i, selstr, i); } } else if (strcmp(t_start, "MINLIST") == 0) { int i; for (i=0; (i <= 59); i++) { - fprintf(output, "<OPTION VALUE=\"%02d\">%02d\n", i, i); + fprintf(output, "<option value=\"%02d\">%02d</option>\n", i, i); } } else if (strcmp(t_start, "REPSECLIST") == 0) { @@ -846,8 +846,8 @@ char *selstr; for (i=0; (i <= 59); i++) { - if (i == 0) selstr = "SELECTED"; else selstr = ""; - fprintf(output, "<OPTION VALUE=\"%02d\" %s>%02d\n", i, selstr, i); + if (i == 0) selstr = " selected"; else selstr = ""; + fprintf(output, "<option value=\"%02d\"%s>%02d</option>\n", i, selstr, i); } } else if (strcmp(t_start, "HOSTFILTER") == 0) { @@ -872,7 +872,7 @@ rec = (treerec_t *)xtreeData(hostnames, handle); if (wanted_host(rec->name)) { - fprintf(output, "<OPTION VALUE=\"%s\">%s</OPTION>\n", rec->name, rec->name); + fprintf(output, "<option value=\"%s\">%s</option>\n", rec->name, rec->name); } } } @@ -943,7 +943,7 @@ for (handle = xtreeFirst(testnames); (handle != xtreeEnd(testnames)); handle = xtreeNext(testnames, handle)) { rec = (treerec_t *)xtreeData(testnames, handle); - fprintf(output, "<OPTION VALUE=\"%s\">%s</OPTION>\n", rec->name, rec->name); + fprintf(output, "<option value=\"%s\">%s</option>\n", rec->name, rec->name); } } else if (strcmp(t_start, "DISABLELIST") == 0) { @@ -1172,8 +1172,8 @@ listrec_t *walk; for (walk = pool->listhead; (walk); walk = walk->next) - fprintf(output, "<OPTION VALUE=\"%s\" %s %s>%s</OPTION>\n", - walk->val, (walk->selected ? "SELECTED" : ""), (walk->extra ? walk->extra : ""), + fprintf(output, "<option value=\"%s\"%s %s>%s</option>\n", + walk->val, (walk->selected ? " selected" : ""), (walk->extra ? walk->extra : ""), walk->name); } @@ -1192,8 +1192,8 @@ char *selstr; for (i=1; (i <= 3); i++) { - selstr = ((i == criteditprio) ? "SELECTED" : ""); - fprintf(output, "<option value=\"%d\" %s>%d</option>\n", i, selstr, i); + selstr = ((i == criteditprio) ? " selected" : ""); + fprintf(output, "<option value=\"%d\"%s>%d</option>\n", i, selstr, i); } } @@ -1230,8 +1230,8 @@ curr = (criteditslastart ? (atoi(criteditslastart) / 100) : 0); for (i=0; (i <= 23); i++) { - selstr = ((i == curr) ? "SELECTED" : ""); - fprintf(output, "<option value=\"%02i00\" %s>%02i:00</option>\n", i, selstr, i); + selstr = ((i == curr) ? " selected" : ""); + fprintf(output, "<option value=\"%02i00\"%s>%02i:00</option>\n", i, selstr, i); } } @@ -1241,8 +1241,8 @@ curr = (criteditslaend ? (atoi(criteditslaend) / 100) : 24); for (i=1; (i <= 24); i++) { - selstr = ((i == curr) ? "SELECTED" : ""); - fprintf(output, "<option value=\"%02i00\" %s>%02i:00</option>\n", i, selstr, i); + selstr = ((i == curr) ? " selected" : ""); + fprintf(output, "<option value=\"%02i00\"%s>%02i:00</option>\n", i, selstr, i); } } @@ -1255,12 +1255,12 @@ tm = localtime(&t); - selstr = ((t == 0) ? "SELECTED" : ""); - fprintf(output, "<option value=\"0\" %s>%s</option>\n", selstr, defstr); + selstr = ((t == 0) ? " selected" : ""); + fprintf(output, "<option value=\"0\"%s>%s</option>\n", selstr, defstr); for (i=1; (i <= 31); i++) { - selstr = ( (t && (tm->tm_mday == i)) ? "SELECTED" : ""); - fprintf(output, "<option value=\"%d\" %s>%d</option>\n", i, selstr, i); + selstr = ( (t && (tm->tm_mday == i)) ? " selected" : ""); + fprintf(output, "<option value=\"%d\"%s>%d</option>\n", i, selstr, i); } } @@ -1280,15 +1280,15 @@ now = getcurrenttime(NULL); memcpy(&nowtm, localtime(&now), sizeof(tm)); - selstr = ((t == 0) ? "SELECTED" : ""); - fprintf(output, "<option value=\"0\" %s>%s</option>\n", selstr, defstr); + selstr = ((t == 0) ? " selected" : ""); + fprintf(output, "<option value=\"0\"%s>%s</option>\n", selstr, defstr); for (i=1; (i <= 12); i++) { - selstr = ( (t && (tm.tm_mon == (i -1))) ? "SELECTED" : ""); + selstr = ( (t && (tm.tm_mon == (i -1))) ? " selected" : ""); monthtm.tm_mon = (i-1); monthtm.tm_mday = 1; monthtm.tm_year = nowtm.tm_year; monthtm.tm_hour = monthtm.tm_min = monthtm.tm_sec = monthtm.tm_isdst = 0; strftime(mname, sizeof(mname)-1, "%B", &monthtm); - fprintf(output, "<OPTION VALUE=\"%d\" %s>%s</option>\n", i, selstr, mname); + fprintf(output, "<option value=\"%d\"%s>%s</option>\n", i, selstr, mname); } } @@ -1310,12 +1310,12 @@ beginyear = nowtm.tm_year + 1900; endyear = nowtm.tm_year + 1900 + 5; - selstr = ((t == 0) ? "SELECTED" : ""); - fprintf(output, "<option value=\"0\" %s>%s</option>\n", selstr, defstr); + selstr = ((t == 0) ? " selected" : ""); + fprintf(output, "<option value=\"0\"%s>%s</option>\n", selstr, defstr); for (i=beginyear; (i <= endyear); i++) { - selstr = ( (t && (tm.tm_year == (i - 1900))) ? "SELECTED" : ""); - fprintf(output, "<OPTION VALUE=\"%d\" %s>%d</option>\n", i, selstr, i); + selstr = ( (t && (tm.tm_year == (i - 1900))) ? " selected" : ""); + fprintf(output, "<option value=\"%d\"%s>%d</option>\n", i, selstr, i); } } Modified: branches/4.x-master/web/acknowledge.c =================================================================== --- branches/4.x-master/web/acknowledge.c 2015-07-29 18:34:47 UTC (rev 7670) +++ branches/4.x-master/web/acknowledge.c 2015-09-06 00:15:40 UTC (rev 7671) @@ -172,7 +172,7 @@ fprintf(output, " <td align=left>%s</td>\n", (hname ? htmlquoted(hname) : " ")); fprintf(output, " <td align=left>%s</td>\n", (tname ? htmlquoted(tname) : " ")); - fprintf(output, " <TD NOWRAP><INPUT TYPE=TEXT NAME=\"DELAY_%s\" SIZE=4 MAXLENGTH=6><SELECT NAME=\"PERIOD_%s\"><OPTION VALUE=\"min\" SELECTED>min(s)<OPTION VALUE=\"hour\">hour(s)<OPTION VALUE=\"day\">day(s)</SELECT></TD>\n", numstr, numstr); + fprintf(output, " <TD NOWRAP><INPUT TYPE=TEXT NAME=\"DELAY_%s\" SIZE=4 MAXLENGTH=6><select NAME=\"PERIOD_%s\"><option value=\"min\" selected>min(s)</option><option value=\"hour\">hour(s)</option><option value=\"day\">day(s)</option></select></TD>\n", numstr, numstr); fprintf(output, " <TD><INPUT TYPE=TEXT NAME=\"MESSAGE_%s\" SIZE=60 MAXLENGTH=80></TD>\n", numstr); Modified: branches/4.x-master/web/svcstatus-info.c =================================================================== --- branches/4.x-master/web/svcstatus-info.c 2015-07-29 18:34:47 UTC (rev 7670) +++ branches/4.x-master/web/svcstatus-info.c 2015-09-06 00:15:40 UTC (rev 7671) @@ -529,18 +529,18 @@ sprintf(istr, "%d", i); - if (i == (nowtm->tm_mon + 1)) selstr = "SELECTED"; else selstr = ""; + if (i == (nowtm->tm_mon + 1)) selstr = " selected"; else selstr = ""; monthtm.tm_mon = (i-1); monthtm.tm_mday = 1; monthtm.tm_year = nowtm->tm_year; monthtm.tm_hour = monthtm.tm_min = monthtm.tm_sec = monthtm.tm_isdst = 0; strftime(mname, sizeof(mname)-1, "%B", &monthtm); - addtobuffer(buf, "<OPTION VALUE=\""); + addtobuffer(buf, "<option value=\""); addtobuffer(buf, istr); - addtobuffer(buf, "\" "); + addtobuffer(buf, "\""); addtobuffer(buf, selstr); addtobuffer(buf, ">"); addtobuffer(buf, mname); - addtobuffer(buf, "</OPTION>\n"); + addtobuffer(buf, "</option>\n"); } addtobuffer(buf, "</SELECT>\n"); @@ -551,15 +551,15 @@ sprintf(istr, "%d", i); - if (i == nowtm->tm_mday) selstr = "SELECTED"; else selstr = ""; + if (i == nowtm->tm_mday) selstr = " selected"; else selstr = ""; - addtobuffer(buf, "<OPTION VALUE=\""); + addtobuffer(buf, "<option value=\""); addtobuffer(buf, istr); - addtobuffer(buf, "\" "); + addtobuffer(buf, "\""); addtobuffer(buf, selstr); addtobuffer(buf, ">"); addtobuffer(buf, istr); - addtobuffer(buf, "</OPTION>\n"); + addtobuffer(buf, "</option>\n"); } addtobuffer(buf, "</SELECT>\n"); @@ -570,15 +570,15 @@ sprintf(istr, "%d", i); - if (i == (nowtm->tm_year + 1900)) selstr = "SELECTED"; else selstr = ""; + if (i == (nowtm->tm_year + 1900)) selstr = " selected"; else selstr = ""; - addtobuffer(buf, "<OPTION VALUE=\""); + addtobuffer(buf, "<option value=\""); addtobuffer(buf, istr); - addtobuffer(buf, "\" "); + addtobuffer(buf, "\""); addtobuffer(buf, selstr); addtobuffer(buf, ">"); addtobuffer(buf, istr); - addtobuffer(buf, "</OPTION>\n"); + addtobuffer(buf, "</option>\n"); } addtobuffer(buf, "</SELECT>\n"); @@ -589,14 +589,14 @@ sprintf(istr, "%d", i); - if (i == nowtm->tm_hour) selstr = "SELECTED"; else selstr = ""; - addtobuffer(buf, "<OPTION VALUE=\""); + if (i == nowtm->tm_hour) selstr = " selected"; else selstr = ""; + addtobuffer(buf, "<option value=\""); addtobuffer(buf, istr); - addtobuffer(buf, "\" "); + addtobuffer(buf, "\""); addtobuffer(buf, selstr); addtobuffer(buf, ">"); addtobuffer(buf, istr); - addtobuffer(buf, "</OPTION>\n"); + addtobuffer(buf, "</option>\n"); } addtobuffer(buf, "</SELECT>\n"); @@ -607,14 +607,14 @@ sprintf(istr, "%02d", i); - if (i == nowtm->tm_min) selstr = "SELECTED"; else selstr = ""; - addtobuffer(buf, "<OPTION VALUE=\""); + if (i == nowtm->tm_min) selstr = " selected"; else selstr = ""; + addtobuffer(buf, "<option value=\""); addtobuffer(buf, istr); - addtobuffer(buf, "\" "); + addtobuffer(buf, "\""); addtobuffer(buf, selstr); addtobuffer(buf, ">"); addtobuffer(buf, istr); - addtobuffer(buf, "</OPTION>\n"); + addtobuffer(buf, "</option>\n"); } addtobuffer(buf, "</SELECT>\n"); @@ -642,18 +642,18 @@ sprintf(istr, "%d", i); - if (i == (nowtm->tm_mon + 1)) selstr = "SELECTED"; else selstr = ""; + if (i == (nowtm->tm_mon + 1)) selstr = " selected"; else selstr = ""; monthtm.tm_mon = (i-1); monthtm.tm_mday = 1; monthtm.tm_year = nowtm->tm_year; monthtm.tm_hour = monthtm.tm_min = monthtm.tm_sec = monthtm.tm_isdst = 0; strftime(mname, sizeof(mname)-1, "%B", &monthtm); - addtobuffer(buf, "<OPTION VALUE=\""); + addtobuffer(buf, "<option value=\""); addtobuffer(buf, istr); - addtobuffer(buf, "\" "); + addtobuffer(buf, "\""); addtobuffer(buf, selstr); addtobuffer(buf, ">"); addtobuffer(buf, mname); - addtobuffer(buf, "</OPTION>\n"); + addtobuffer(buf, "</option>\n"); } addtobuffer(buf, "</SELECT>\n"); @@ -664,15 +664,15 @@ sprintf(istr, "%d", i); - if (i == nowtm->tm_mday) selstr = "SELECTED"; else selstr = ""; + if (i == nowtm->tm_mday) selstr = " selected"; else selstr = ""; - addtobuffer(buf, "<OPTION VALUE=\""); + addtobuffer(buf, "<option value=\""); addtobuffer(buf, istr); - addtobuffer(buf, "\" "); + addtobuffer(buf, "\""); addtobuffer(buf, selstr); addtobuffer(buf, ">"); addtobuffer(buf, istr); - addtobuffer(buf, "</OPTION>\n"); + addtobuffer(buf, "</option>\n"); } addtobuffer(buf, "</SELECT>\n"); @@ -683,15 +683,15 @@ sprintf(istr, "%d", i); - if (i == (nowtm->tm_year + 1900)) selstr = "SELECTED"; else selstr = ""; + if (i == (nowtm->tm_year + 1900)) selstr = " selected"; else selstr = ""; - addtobuffer(buf, "<OPTION VALUE=\""); + addtobuffer(buf, "<option value=\""); addtobuffer(buf, istr); - addtobuffer(buf, "\" "); + addtobuffer(buf, "\""); addtobuffer(buf, selstr); addtobuffer(buf, ">"); addtobuffer(buf, istr); - addtobuffer(buf, "</OPTION>\n"); + addtobuffer(buf, "</option>\n"); } addtobuffer(buf, "</SELECT>\n"); @@ -702,14 +702,14 @@ sprintf(istr, "%d", i); - if (i == nowtm->tm_hour) selstr = "SELECTED"; else selstr = ""; - addtobuffer(buf, "<OPTION VALUE=\""); + if (i == nowtm->tm_hour) selstr = " selected"; else selstr = ""; + addtobuffer(buf, "<option value=\""); addtobuffer(buf, istr); - addtobuffer(buf, "\" "); + addtobuffer(buf, "\""); addtobuffer(buf, selstr); addtobuffer(buf, ">"); addtobuffer(buf, istr); - addtobuffer(buf, "</OPTION>\n"); + addtobuffer(buf, "</option>\n"); } addtobuffer(buf, "</SELECT>\n"); @@ -720,14 +720,14 @@ sprintf(istr, "%02d", i); - if (i == nowtm->tm_min) selstr = "SELECTED"; else selstr = ""; - addtobuffer(buf, "<OPTION VALUE=\""); + if (i == nowtm->tm_min) selstr = " selected"; else selstr = ""; + addtobuffer(buf, "<option value=\""); addtobuffer(buf, istr); - addtobuffer(buf, "\" "); + addtobuffer(buf, "\""); addtobuffer(buf, selstr); addtobuffer(buf, ">"); addtobuffer(buf, istr); - addtobuffer(buf, "</OPTION>\n"); + addtobuffer(buf, "</option>\n"); } addtobuffer(buf, "</SELECT>\n"); addtobuffer(buf, " </td></tr>\n"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jcc...@us...> - 2015-09-22 23:02:18
|
Revision: 7674 http://sourceforge.net/p/xymon/code/7674 Author: jccleaver Date: 2015-09-22 23:02:15 +0000 (Tue, 22 Sep 2015) Log Message: ----------- Fix r7643 docs referring to GRAPHS_cpu as GRAPH_cpu (Thanks, Galen Johnson) Revision Links: -------------- http://sourceforge.net/p/xymon/code/7643 Modified Paths: -------------- branches/4.x-master/Changes branches/4.x-master/common/xymonserver.cfg.5 branches/4.x-master/debian/changelog branches/4.x-master/xymond/etcfiles/xymonserver.cfg.DIST Modified: branches/4.x-master/Changes =================================================================== --- branches/4.x-master/Changes 2015-09-15 11:04:51 UTC (rev 7673) +++ branches/4.x-master/Changes 2015-09-22 23:02:15 UTC (rev 7674) @@ -6,6 +6,8 @@ * Ensure we don't leave xymond_hostdata or xymond_history zombies lying around after dropping host records (Reported by Scot Kreienkamp) * Fix up HTML list layout to reflect current standards (Thanks, ha...@ca...) +* Fix documentation incorrectly describing multigraph syntax as (e.g.) GRAPH_cpu. + Should be GRAPHS_cpu (Thanks, Galen Johnson) Changes from 4.3.20 -> 4.3.21 (22 May 2015) Modified: branches/4.x-master/common/xymonserver.cfg.5 =================================================================== --- branches/4.x-master/common/xymonserver.cfg.5 2015-09-15 11:04:51 UTC (rev 7673) +++ branches/4.x-master/common/xymonserver.cfg.5 2015-09-22 23:02:15 UTC (rev 7674) @@ -500,10 +500,10 @@ external script mechanism to collect data from custom tests. Note: All TCP tests are automatically added. -.IP GRAPH_<COLUMNAME> +.IP GRAPHS_<COLUMNAME> List of GRAPHs that should be displayed on the corresponding colmn page. Note this will override the default, so to add multiple graphs you should include -the origina one (e.g. GRAPH_cpu="la,vmstat1"). +the original one (e.g. GRAPHS_cpu="la,vmstat1"). These are used together by the .I svcstatus.cgi(1) Modified: branches/4.x-master/debian/changelog =================================================================== --- branches/4.x-master/debian/changelog 2015-09-15 11:04:51 UTC (rev 7673) +++ branches/4.x-master/debian/changelog 2015-09-22 23:02:15 UTC (rev 7674) @@ -6,7 +6,10 @@ * Ensure we don't leave xymond_hostdata or xymond_history zombies lying around after dropping host records (Reported by Scot Kreienkamp) * Fix up HTML list layout to reflect current standards (Thanks, ha...@ca...) + * Fix documentation incorrectly describing multigraph syntax as (e.g.) GRAPH_cpu. + Should be GRAPHS_cpu (Thanks, Galen Johnson) + -- Japheth Cleaver <cle...@te...> Fri, 22 May 2015 18:15:00 -0700 Modified: branches/4.x-master/xymond/etcfiles/xymonserver.cfg.DIST =================================================================== --- branches/4.x-master/xymond/etcfiles/xymonserver.cfg.DIST 2015-09-15 11:04:51 UTC (rev 7673) +++ branches/4.x-master/xymond/etcfiles/xymonserver.cfg.DIST 2015-09-22 23:02:15 UTC (rev 7674) @@ -156,15 +156,15 @@ # The format here is "COLUMN=RRDSERVICE". If you leave out the "=RRDSERVICE" # part, it is assumed to be the same as the COLUMN value. -# GRAPH_<columnname> entries define what graphs to display on COLUMNs, if not the +# GRAPHS_<columnname> entries define what graphs to display on COLUMNs, if not the # default ones indicated above. This can allow you to display additional graphs on # a status page, even if xymond_rrd is not using the TEST2RRD data above. # If present, overrides the column RRD value above for display purposes, so be sure -# to include the that, if desured -# eg, GRAPH_cpu="la,vmstat1" +# to include the that, if desired +# eg, GRAPHS_cpu="la,vmstat1" # -# TEST2RRD and GRAPH_* are used by the svcstatus.cgi script to determine if the detailed +# TEST2RRD and GRAPHS_* are used by the svcstatus.cgi script to determine if the detailed # status view of a test should include a graph. TEST2RRD="cpu=la,disk,inode,qtree,memory,$PINGCOLUMN=tcp,http=tcp,dns=tcp,dig=tcp,time=ntpstat,vmstat,iostat,netstat,temperature,apache,bind,sendmail,mailq,nmailq=mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,files,procs=processes,ports,clock,lines,deltalines,ops,stats,cifs,JVM,JMS,HitCache,Session,JDBCConn,ExecQueue,JTA,TblSpace,RollBack,MemReq,InvObj,snapmirr,snaplist,snapshot,if_load=devmon,temp=devmon,paging,mdc,mdchitpct,cics,dsa,getvis,maxuser,nparts,xymongen,xymonnet,xymonproxy,xymond" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jcc...@us...> - 2015-10-01 01:05:54
|
Revision: 7675 http://sourceforge.net/p/xymon/code/7675 Author: jccleaver Date: 2015-10-01 01:05:52 +0000 (Thu, 01 Oct 2015) Log Message: ----------- Move ntpdate config to env variable (Thanks, Axel Beckert) Modified Paths: -------------- branches/4.x-master/Changes branches/4.x-master/debian/changelog branches/4.x-master/xymond/etcfiles/xymonserver.cfg.DIST branches/4.x-master/xymonnet/xymonnet.c Modified: branches/4.x-master/Changes =================================================================== --- branches/4.x-master/Changes 2015-09-22 23:02:15 UTC (rev 7674) +++ branches/4.x-master/Changes 2015-10-01 01:05:52 UTC (rev 7675) @@ -8,6 +8,7 @@ * Fix up HTML list layout to reflect current standards (Thanks, ha...@ca...) * Fix documentation incorrectly describing multigraph syntax as (e.g.) GRAPH_cpu. Should be GRAPHS_cpu (Thanks, Galen Johnson) +* Move ntpdate config to env variable (Thanks, Axel Beckert, pointed out by Matt Vander Werf) Changes from 4.3.20 -> 4.3.21 (22 May 2015) Modified: branches/4.x-master/debian/changelog =================================================================== --- branches/4.x-master/debian/changelog 2015-09-22 23:02:15 UTC (rev 7674) +++ branches/4.x-master/debian/changelog 2015-10-01 01:05:52 UTC (rev 7675) @@ -8,8 +8,8 @@ * Fix up HTML list layout to reflect current standards (Thanks, ha...@ca...) * Fix documentation incorrectly describing multigraph syntax as (e.g.) GRAPH_cpu. Should be GRAPHS_cpu (Thanks, Galen Johnson) + * Move ntpdate config to env variable (Thanks, Axel Beckert, pointed out by Matt Vander Werf) - -- Japheth Cleaver <cle...@te...> Fri, 22 May 2015 18:15:00 -0700 Modified: branches/4.x-master/xymond/etcfiles/xymonserver.cfg.DIST =================================================================== --- branches/4.x-master/xymond/etcfiles/xymonserver.cfg.DIST 2015-09-22 23:02:15 UTC (rev 7674) +++ branches/4.x-master/xymond/etcfiles/xymonserver.cfg.DIST 2015-10-01 01:05:52 UTC (rev 7675) @@ -132,7 +132,7 @@ IPTEST_2_CLEAR_ON_FAILED_CONN="TRUE" # If TRUE, then failing network tests go CLEAR if conn-test fails. NONETPAGE="" # Network tests that go YELLOW upon failure FPING="@FPING@" # Path and options for the ping program. -NTPDATE="ntpdate" # Path to the 'ntpdate' program +NTPDATE="ntpdate -p 1" # Path to the 'ntpdate' program TRACEROUTE="traceroute" # How to do traceroute on failing ping tests. Requires "trace" in hosts.cfg . XYMONROUTERTEXT="router" # What to call a failing intermediate network device. NETFAILTEXT="not OK" # Text indicating a network test failed Modified: branches/4.x-master/xymonnet/xymonnet.c =================================================================== --- branches/4.x-master/xymonnet/xymonnet.c 2015-09-22 23:02:15 UTC (rev 7674) +++ branches/4.x-master/xymonnet/xymonnet.c 2015-10-01 01:05:52 UTC (rev 7675) @@ -1076,7 +1076,7 @@ sprintf(cmd, "%s -u -d %d %s 2>&1", cmdpath, extcmdtimeout-1, ip_to_test(t->host)); } else { - sprintf(cmd, "%s -u -q -p 2 %s 2>&1", cmdpath, ip_to_test(t->host)); + sprintf(cmd, "%s -u -q %s 2>&1", cmdpath, ip_to_test(t->host)); } t->open = (run_command(cmd, "no server suitable for synchronization", t->banner, 1, extcmdtimeout) == 0); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jcc...@us...> - 2015-10-01 05:31:51
|
Revision: 7676 http://sourceforge.net/p/xymon/code/7676 Author: jccleaver Date: 2015-10-01 05:31:49 +0000 (Thu, 01 Oct 2015) Log Message: ----------- Increase xymonnet timing resolution / Allow sci-exp in RRD NCV interpretation Modified Paths: -------------- branches/4.x-master/CREDITS branches/4.x-master/Changes branches/4.x-master/debian/changelog branches/4.x-master/xymond/rrd/do_ncv.c branches/4.x-master/xymond/rrd/do_net.c branches/4.x-master/xymonnet/dns.c branches/4.x-master/xymonnet/httpresult.c branches/4.x-master/xymonnet/ldaptest.c branches/4.x-master/xymonnet/xymonnet.c branches/4.x-master/xymonnet/xymonping.c Modified: branches/4.x-master/CREDITS =================================================================== --- branches/4.x-master/CREDITS 2015-10-01 01:05:52 UTC (rev 7675) +++ branches/4.x-master/CREDITS 2015-10-01 05:31:49 UTC (rev 7676) @@ -6,6 +6,7 @@ Marco Avvisano Paul Backer +Axel Beckert Olivier Beau Adamets Bluejay Brian Buchanan Modified: branches/4.x-master/Changes =================================================================== --- branches/4.x-master/Changes 2015-10-01 01:05:52 UTC (rev 7675) +++ branches/4.x-master/Changes 2015-10-01 05:31:49 UTC (rev 7676) @@ -9,6 +9,8 @@ * Fix documentation incorrectly describing multigraph syntax as (e.g.) GRAPH_cpu. Should be GRAPHS_cpu (Thanks, Galen Johnson) * Move ntpdate config to env variable (Thanks, Axel Beckert, pointed out by Matt Vander Werf) +* Supports scientific notation for NCV data (Thanks, Axel Beckert) +* Increase resolution of xymonnet poll timing results (Thanks, Christoph Berg) Changes from 4.3.20 -> 4.3.21 (22 May 2015) Modified: branches/4.x-master/debian/changelog =================================================================== --- branches/4.x-master/debian/changelog 2015-10-01 01:05:52 UTC (rev 7675) +++ branches/4.x-master/debian/changelog 2015-10-01 05:31:49 UTC (rev 7676) @@ -9,7 +9,10 @@ * Fix documentation incorrectly describing multigraph syntax as (e.g.) GRAPH_cpu. Should be GRAPHS_cpu (Thanks, Galen Johnson) * Move ntpdate config to env variable (Thanks, Axel Beckert, pointed out by Matt Vander Werf) + * Supports scientific notation for NCV data (Thanks, Axel Beckert) + * Increase resolution of xymonnet poll timing results (Thanks, Christoph Berg) + -- Japheth Cleaver <cle...@te...> Fri, 22 May 2015 18:15:00 -0700 Modified: branches/4.x-master/xymond/rrd/do_ncv.c =================================================================== --- branches/4.x-master/xymond/rrd/do_ncv.c 2015-10-01 01:05:52 UTC (rev 7675) +++ branches/4.x-master/xymond/rrd/do_ncv.c 2015-10-01 05:31:49 UTC (rev 7676) @@ -84,7 +84,7 @@ val = l + strspn(l, " \t"); /* Find the end of the value string */ l = val; if ((*l == '-') || (*l == '+')) l++; /* Pass leading sign */ - l += strspn(l, "0123456789.+-"); /* and the numbers. */ + l += strspn(l, "0123456789.+-eE"); /* and the numbers. */ if( *val ) { int iseol = (*l == '\n'); Modified: branches/4.x-master/xymond/rrd/do_net.c =================================================================== --- branches/4.x-master/xymond/rrd/do_net.c 2015-10-01 01:05:52 UTC (rev 7675) +++ branches/4.x-master/xymond/rrd/do_net.c 2015-10-01 05:31:49 UTC (rev 7676) @@ -145,7 +145,7 @@ p = strstr(msg, "\nSeconds:"); if (p && (sscanf(p+1, "Seconds: %f", &seconds) == 1)) { setupfn2("%s.%s.rrd", "tcp", testname); - snprintf(rrdvalues, sizeof(rrdvalues), "%d:%.2f", (int)tstamp, seconds); + snprintf(rrdvalues, sizeof(rrdvalues), "%d:%f", (int)tstamp, seconds); return create_and_update_rrd(hostname, testname, classname, pagepaths, xymonnet_params, xymonnet_tpl); } } Modified: branches/4.x-master/xymonnet/dns.c =================================================================== --- branches/4.x-master/xymonnet/dns.c 2015-10-01 01:05:52 UTC (rev 7675) +++ branches/4.x-master/xymonnet/dns.c 2015-10-01 05:31:49 UTC (rev 7676) @@ -357,7 +357,7 @@ tst = strtok(NULL, ","); } xfree(tspec); - sprintf(msg, "\nSeconds: %u.%03u\n", (unsigned int)tspent->tv_sec, (unsigned int)tspent->tv_nsec/1000000); + sprintf(msg, "\nSeconds: %u.%.9ld\n", (unsigned int)tspent->tv_sec, tspent->tv_nsec); addtobuffer(banner, msg); ares_destroy(channel); Modified: branches/4.x-master/xymonnet/httpresult.c =================================================================== --- branches/4.x-master/xymonnet/httpresult.c 2015-10-01 01:05:52 UTC (rev 7675) +++ branches/4.x-master/xymonnet/httpresult.c 2015-10-01 05:31:49 UTC (rev 7676) @@ -295,9 +295,9 @@ } if (req->faileddeps) addtostatus(req->faileddeps); - sprintf(urlmsg, "\nSeconds: %5d.%02d\n\n", + sprintf(urlmsg, "\nSeconds: %u.%.9ld\n\n", (unsigned int)req->tcptest->totaltime.tv_sec, - (unsigned int)req->tcptest->totaltime.tv_nsec / 10000000 ); + req->tcptest->totaltime.tv_nsec); addtostatus(urlmsg); xfree(urlmsg); } Modified: branches/4.x-master/xymonnet/ldaptest.c =================================================================== --- branches/4.x-master/xymonnet/ldaptest.c 2015-10-01 01:05:52 UTC (rev 7675) +++ branches/4.x-master/xymonnet/ldaptest.c 2015-10-01 05:31:49 UTC (rev 7676) @@ -476,8 +476,8 @@ } if (req->faileddeps) addtostatus(req->faileddeps); - sprintf(msgline, "\nSeconds: %u.%02u\n", - (unsigned int)req->duration.tv_sec, (unsigned int)req->duration.tv_nsec / 10000000); + sprintf(msgline, "\nSeconds: %u.%.9ld\n", + (unsigned int)req->duration.tv_sec, req->duration.tv_nsec); addtostatus(msgline); } @@ -496,9 +496,9 @@ req = (ldap_data_t *) t->privdata; printf("URL : %s\n", t->testspec); - printf("Time spent : %u.%02u\n", + printf("Time spent : %u.%.9ld\n", (unsigned int)req->duration.tv_sec, - (unsigned int)req->duration.tv_nsec / 10000000); + req->duration.tv_nsec); printf("LDAP output:\n%s\n", textornull(req->output)); printf("------------------------------------------------------\n"); } Modified: branches/4.x-master/xymonnet/xymonnet.c =================================================================== --- branches/4.x-master/xymonnet/xymonnet.c 2015-10-01 01:05:52 UTC (rev 7675) +++ branches/4.x-master/xymonnet/xymonnet.c 2015-10-01 05:31:49 UTC (rev 7676) @@ -1774,8 +1774,8 @@ } if (t->duration.tv_sec != -1) { - sprintf(msgtext, "\nSeconds: %u.%02u\n", - (unsigned int)t->duration.tv_sec, (unsigned int)t->duration.tv_nsec / 10000000); + sprintf(msgtext, "\nSeconds: %u.%.9ld\n", + (unsigned int)t->duration.tv_sec, t->duration.tv_nsec); addtostatus(msgtext); } addtostatus("\n\n"); Modified: branches/4.x-master/xymonnet/xymonping.c =================================================================== --- branches/4.x-master/xymonnet/xymonping.c 2015-10-01 01:05:52 UTC (rev 7675) +++ branches/4.x-master/xymonnet/xymonping.c 2015-10-01 05:31:49 UTC (rev 7676) @@ -356,11 +356,11 @@ if (hosts[idx]->received > 0) { printf("%s is alive", inet_ntoa(hosts[idx]->addr.sin_addr)); rtt_usecs = (hosts[idx]->rtt_total.tv_sec*1000000 + (hosts[idx]->rtt_total.tv_nsec / 1000)) / hosts[idx]->received; - if (rtt_usecs >= 1000) { - printf(" (%lu ms)\n", rtt_usecs / 1000); + if (rtt_usecs >= 3000) { + printf(" (%.1f ms)\n", rtt_usecs / 1000.0); } else { - printf(" (0.%02lu ms)\n", (rtt_usecs / 10)); + printf(" (%u usec)\n", rtt_usecs); } } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |