Xymon systems and network monitor

Email Archive: xymon-developer (read-only)

2008:	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct (5)	_Nov (29)	_Dec (10)
2009:	_Jan	_Feb (1)	_Mar	_Apr (2)	_May (1)	_Jun	_Jul	_Aug	_Sep (1)	_Oct	_Nov	_Dec (6)
2010:	_Jan	_Feb (1)	_Mar	_Apr (1)	_May (3)	_Jun (12)	_Jul (139)	_Aug (14)	_Sep (104)	_Oct (223)	_Nov (60)	_Dec (39)
2011:	_Jan (30)	_Feb (21)	_Mar (30)	_Apr (15)	_May (15)	_Jun (7)	_Jul (13)	_Aug (30)	_Sep (26)	_Oct (3)	_Nov (20)	_Dec (45)
2012:	_Jan (96)	_Feb (14)	_Mar (6)	_Apr (44)	_May (50)	_Jun (8)	_Jul (160)	_Aug (39)	_Sep (7)	_Oct	_Nov (6)	_Dec (2)
2013:	_Jan (7)	_Feb (1)	_Mar	_Apr (18)	_May (2)	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec


S	M	T	W	T	F	S
						1

2	3	4	5	6	7	8

9	10	11	12	13	14	15
				(3)
16	17	18	19	20	21	22

23	24	25	26	27	28	29

30	31

[Xymon-developer] SF.net SVN: xymon:[6765] trunk

From: <storner@us...> - 2011-10-13 11:55

Revision: 6765
          http://xymon.svn.sourceforge.net/xymon/?rev=6765&view=rev
Author:   storner
Date:     2011-10-13 11:55:08 +0000 (Thu, 13 Oct 2011)
Log Message:
-----------
Web / loadhosts: Handle case for svcstatus requests where host no longer exists without crashing.

Modified Paths:
--------------
    trunk/lib/loadhosts_net.c
    trunk/web/svcstatus.c

Modified: trunk/lib/loadhosts_net.c
===================================================================
--- trunk/lib/loadhosts_net.c	2011-09-29 11:12:54 UTC (rev 6764)
+++ trunk/lib/loadhosts_net.c	2011-10-13 11:55:08 UTC (rev 6765)
@@ -38,11 +38,6 @@
 
 	if (!targethost) return -1;
 
-	hivalhost = strdup(targethost);
-	memset(hivals, 0, sizeof(hivals));
-	memset(&hival_hostinfo, 0, sizeof(hival_hostinfo));
-	hival_hostinfo.elems = (char **)calloc(1, sizeof(char *));
-
 	msg = (char *)malloc(200 + strlen(targethost));
 	sprintf(msg, "hostinfo clone=%s", targethost);
 
@@ -55,6 +50,16 @@
 	}
 
 	hivalbuf = getsendreturnstr(sres, 1);
+	if (strlen(hivalbuf) == 0) {
+		errprintf("No such host\n");
+		return -2;
+	}
+
+	hivalhost = strdup(targethost);
+	memset(hivals, 0, sizeof(hivals));
+	memset(&hival_hostinfo, 0, sizeof(hival_hostinfo));
+	hival_hostinfo.elems = (char **)calloc(1, sizeof(char *));
+
 	bol = hivalbuf;
 	while (bol && *bol) {
 		int idx;

Modified: trunk/web/svcstatus.c
===================================================================
--- trunk/web/svcstatus.c	2011-09-29 11:12:54 UTC (rev 6764)
+++ trunk/web/svcstatus.c	2011-10-13 11:55:08 UTC (rev 6765)
@@ -162,12 +162,12 @@
 		loadres = load_hostinfo(hostname);
 	}
 
-	if (loadres != 0) {
+	if ((loadres != 0) && (loadres != -2)) {
 		errormsg("Cannot load host configuration");
 		return 1;
 	}
 
-	if ((hinfo = hostinfo(hostname)) == NULL) {
+	if ((loadres == -2) || (hinfo = hostinfo(hostname)) == NULL) {
 		errormsg("No such host");
 		return 1;
 	}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Xymon-developer] SF.net SVN: xymon:[6767] trunk

From: <storner@us...> - 2011-10-13 12:50

Revision: 6767
          http://xymon.svn.sourceforge.net/xymon/?rev=6767&view=rev
Author:   storner
Date:     2011-10-13 12:49:56 +0000 (Thu, 13 Oct 2011)
Log Message:
-----------
xymond: Use STATUSLIFETIME in xymonserver.cfg for the default time a status is valid, instead of hard-coding this to 30.

Modified Paths:
--------------
    trunk/common/xymonserver.cfg.5
    trunk/xymond/etcfiles/xymonserver.cfg.DIST
    trunk/xymond/xymond.c

Modified: trunk/common/xymonserver.cfg.5
===================================================================
--- trunk/common/xymonserver.cfg.5	2011-10-13 11:55:42 UTC (rev 6766)
+++ trunk/common/xymonserver.cfg.5	2011-10-13 12:49:56 UTC (rev 6767)
@@ -144,7 +144,12 @@
 the COMMENT value is displayed next to the hostname on the webpages.
 Default: CDI
 
+.IP STATUSLIFETIME
+The number of minutes that a status is considered valid after an update.
+After this time elapses, the status will go purple.
+Default: 30 minutes
 
+
 .SH DIRECTORIES
 
 .IP XYMONSERVERROOT

Modified: trunk/xymond/etcfiles/xymonserver.cfg.DIST
===================================================================
--- trunk/xymond/etcfiles/xymonserver.cfg.DIST	2011-10-13 11:55:42 UTC (rev 6766)
+++ trunk/xymond/etcfiles/xymonserver.cfg.DIST	2011-10-13 12:49:56 UTC (rev 6767)
@@ -40,6 +40,8 @@
 FQDN="TRUE"			# Use fully-qualified hostnames internally. Keep it TRUE unless you know better.
 XYMONLOGSTATUS="DYNAMIC"	# Are HTML status logs statically or dynamically generated?
 				# Use DYNAMIC with Xymon, unless you run xymond_filestore --status --html
+STATUSLIFETIME="30"		# Default number of minutes a status is valid after an update. After this
+				# time has elapsed, the status will go purple.
 
 PINGCOLUMN="conn"		# Column where the ping-test reports results.
 INFOCOLUMN="info"		# Column where the info-pages are reported.

Modified: trunk/xymond/xymond.c
===================================================================
--- trunk/xymond/xymond.c	2011-10-13 11:55:42 UTC (rev 6766)
+++ trunk/xymond/xymond.c	2011-10-13 12:49:56 UTC (rev 6767)
@@ -176,6 +176,7 @@
 int      clientsavemem = 1;	/* In memory */
 int      clientsavedisk = 0;	/* On disk via the CLICHG channel */
 int      allow_downloads = 1;
+int	 defaultvalidity = 30;	/* Minutes */
 
 
 #define NOTALK 0
@@ -1225,7 +1226,7 @@
 void handle_status(unsigned char *msg, char *sender, char *hostname, char *testname, char *grouplist, 
 		   xymond_log_t *log, int newcolor, char *downcause, int modifyonly)
 {
-	int validity = 30;	/* validity is counted in minutes */
+	int validity = defaultvalidity;
 	time_t now = getcurrenttime(NULL);
 	int msglen, issummary;
 	enum alertstate_t oldalertstatus, newalertstatus;
@@ -4847,6 +4848,11 @@
 		hostsfn = strdup(xgetenv("HOSTSCFG"));
 	}
 
+	if (xgetenv("STATUSLIFETIME")) {
+		int n = atoi(xgetenv("STATUSLIFETIME"));
+		if (n > 0) defaultvalidity = n;
+	}
+
 	/* Make sure we load hosts.cfg file, and not via the network from ourselves */
 	hostsfn = (char *)realloc(hostsfn, strlen(hostsfn) + 2);
 	memmove(hostsfn+1, hostsfn, strlen(hostsfn));

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Xymon-developer] SF.net SVN: xymon:[6766] trunk/web/hostlist.c

From: <storner@us...> - 2011-10-13 11:55

Revision: 6766
          http://xymon.svn.sourceforge.net/xymon/?rev=6766&view=rev
Author:   storner
Date:     2011-10-13 11:55:42 +0000 (Thu, 13 Oct 2011)
Log Message:
-----------
hostlist CGI: Dont crash on a HTTP HEAD request

Modified Paths:
--------------
    trunk/web/hostlist.c

Modified: trunk/web/hostlist.c
===================================================================
--- trunk/web/hostlist.c	2011-10-13 11:55:08 UTC (rev 6765)
+++ trunk/web/hostlist.c	2011-10-13 11:55:42 UTC (rev 6766)
@@ -69,6 +69,7 @@
 	char *req, *board, *l;
 	int argi, res;
 	sendreturn_t *sres;
+	char *cookie;
 	pcre *dummy;
 
 	init_timestamp();
@@ -86,7 +87,8 @@
 		}
 	}
 
-	sethostenv_pagepath(get_cookie("pagepath"));
+	cookie = get_cookie("pagepath");
+	if (cookie) sethostenv_pagepath(cookie);
 
 	cgidata = cgi_request();
 	if (cgidata == NULL) {
@@ -98,9 +100,9 @@
 	}
 	parse_query();
 
-	dummy = compileregex(testfilter);
+	dummy = (testfilter ? compileregex(testfilter) : NULL);
 	if (dummy == NULL) return 1; else freeregex(dummy);
-	dummy = compileregex(pagefilter);
+	dummy = (pagefilter ? compileregex(pagefilter) : NULL);
 	if (dummy == NULL) return 1; else freeregex(dummy);
 
 	sres = newsendreturnbuf(1, NULL);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.