Nagios Support Forum

This is a multi-part message in MIME format.
--------------010404060107090709020700
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 15/06/08 12:52 PM, Thomas Guyot-Sionnest wrote:
> On 14/06/08 11:16 PM, Yann JOUANIN wrote:
>> I finished coding the XSDJSON backend for Nagios, it works on Nagios 2 (I'm
>> finishing the Nagios3 version).
>> Now by enabling USE_XSDJSON, the file status.dat is formatted in JSON format
>> and the CGI are reading status from this format.
>
>> For the ones who want to test it, file are available on :
>
>> http://nagios2json.svn.sourceforge.net/ ... trunk/NAGI
>> OS2/
>
> Awesome work!
>
> I made it as a single patch for 2.x-cvs which also includes configure.in
> modifications.
>
> After applying the patch, be sure to run "autoconf" then you can
> configure Nagios with JSON routines with:
>
> ./configure --enable-xsdjson
>
> Configure will print the following near the end:
> We'll use JSON routines (in xdata/xsdjson.*) for status data I/O...
>
> Then usual make and make install to get everything installed.
>
> I haven't tested it yet (lack of time) but it does build successfully
> with JSON routines.
>
> Enjoy

As Yann pointed to in private my patch does not set USE_XSDJSON 1 in
config.h. Being used to have autoheader to write config.h.in for me I
forgot to update this one, and didn't realized the define was missing
(the code was built but not used).

This new patch fix this and should work properly. I also verified the
proper function are present in the object files (still no time to test,
unfortunately).

Thomas
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFIWx9Q6dZ+Kt5BchYRAp7yAJ4qN0mgr20zrh74f4MZYDRQnhQvNgCg4Nmi
Jxea0hpbrGIhHxsNPe6ME2o=
=dSlN
-----END PGP SIGNATURE-----

--------------010404060107090709020700
Content-Type: text/x-diff;
name="nagios2.JSON_Status-beta1-2.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="nagios2.JSON_Status-beta1-2.patch"

diff -uNr nagios.orig/common/statusdata.c nagios/common/statusdata.c
--- nagios.orig/common/statusdata.c 2008-06-19 22:26:29.000000000 -0400
+++ nagios/common/statusdata.c 2008-06-19 22:22:55.000000000 -0400
@@ -3,7 +3,7 @@
* STATUSDATA.C - External status data for Nagios CGIs
*
* Copyright (c) 2000-2005 Ethan Galstad ([email protected])
- * Last Modified: 07-25-2005
+ * Last Modified: 06-19-2008
*
* License:
*
@@ -43,6 +43,10 @@
#include "../xdata/xsddefault.h" /* default routines */
#endif

+#ifdef USE_XSDJSON
+#include "../xdata/xsdjson.h" /* JSON routines */
+#endif
+

#ifdef NSCORE
extern int aggregate_status_updates;
@@ -75,6 +79,10 @@
result=xsddefault_initialize_status_data(config_file);
#endif

+#ifdef USE_XSDJSON
+ result=xsdjson_initialize_status_data(config_file);
+#endif
+
return result;
}

@@ -93,6 +101,10 @@
result=xsddefault_save_status_data();
#endif

+#ifdef USE_XSDJSON
+ result=xsdjson_save_status_data();
+#endif
+
#ifdef USE_EVENT_BROKER
/* send data to event broker */
broker_aggregated_status_data(NEBTYPE_AGGREGATEDSTATUS_ENDDUMP,NEBFLAG_NONE,NEBATTR_NONE,NULL);
@@ -114,6 +126,10 @@
result=xsddefault_cleanup_status_data(config_file,delete_status_data);
#endif

+#ifdef USE_XSDJSON
+ result=xsdjson_cleanup_status_data(config_file,delete_status_data);
+#endif
+
return result;
}

@@ -198,10 +214,15 @@
#ifdef USE_XSDDEFAULT
result=xsddefault_read_status_data(config_file,options);
#endif
+
#ifdef USE_XSDDB
result=xsddb_read_status_data(config_file,options);
#endif

+#ifdef USE_XSDJSON
+ result=xsdjson_read_status_data(config_file,options);
+#endif
+
return result;
}

diff -uNr nagios.orig/configure.in nagios/configure.in
--- nagios.orig/configure.in 2008-06-19 22:26:29.000000000 -0400
+++ nagios/configure.in 2008-06-15 12:45:48.000000000 -0400
@@ -219,11 +219,24 @@
USE_PGSQL=no

dnl Status data
-AC_DEFINE_UNQUOTED(USE_XSDDEFAULT)
-XSDC="xsddefault.c"
-XSDH="xsddefault.h"
-XSDCOMMENT="Default (text f

...[email truncated]...


This post was automatically imported from historical nagios-devel mailing list archives
Original poster: [email protected]