[Nagios-devel] [patch] Add long_output support to NDOUtils

[Guest]

--Apple-Mail-8--7972025
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
charset=US-ASCII;
delsp=yes;
format=flowed

Hello,


Attached is a patch I wrote for $work which adds long_output support
to NDOUtils. We are currently using it in servers soon to be put in
production, and it currently seems to be working fine. It's against
Nagios CVS as of a couples of weeks ago. The SQL bit to upgrade an
existing database is provided in db/mysql-upgrade-long_output.sql. It
also fixes a small bug that was present in the code (an "#ifdef
BUILLD_NAGIOS_3X" instead of "#ifdef BUILD_NAGIOS_3X".. two days to
find out..)

diffstat < ndoutils-long_output.diff
db/mysql-upgrade-long_output.sql | 18 ++++++++++++++
db/mysql.sql | 5 ++++
include/protoapi.h | 1
src/dbhandlers.c | 48 +++++++++++++++++++++++++
+-------------
src/ndo2db.c | 1
src/ndomod.c | 46 ++++++++++++++++++++++++++++
+--------
6 files changed, 93 insertions(+), 26 deletions(-)

Patch attached in plain and gzipped to avoid being mangled.

--Apple-Mail-8--7972025
Content-Transfer-Encoding: quoted-printable
Content-Type: application/octet-stream; x-unix-mode=0644;
name=ndoutils-long_output.diff
Content-Disposition: attachment;
filename=ndoutils-long_output.diff

---=20db/mysql-upgrade-long_output.sql=091970-01-01-12:00:00.000000000=20=
+0100=0A+++=20db/mysql-upgrade-long_output.sql=092008-11-28=20=
11:18:03.138873455=20+0100=0A@@=20-0,0=20+1,18=20@@=0A+--=20BEGIN=20=
long_output=20patch=0A+=0A+ALTER=20TABLE=20`nagios_hostchecks`=0A+=09ADD=20=
COLUMN=20`long_output`=20varchar(8192)=20NOT=20NULL=20default=20'';=0A+=0A=
+ALTER=20TABLE=20`nagios_hoststatus`=0A+=09ADD=20COLUMN=20`long_output`=20=
varchar(8192)=20NOT=20NULL=20default=20'';=0A+=0A+ALTER=20TABLE=20=
`nagios_servicechecks`=0A+=09ADD=20COLUMN=20`long_output`=20=
varchar(8192)=20NOT=20NULL=20default=20'';=0A+=0A+ALTER=20TABLE=20=
`nagios_servicestatus`=0A+=09ADD=20COLUMN=20`long_output`=20=
varchar(8192)=20NOT=20NULL=20default=20'';=0A+=0A+ALTER=20TABLE=20=
`nagios_statehistory`=0A+=09ADD=20COLUMN=20`long_output`=20varchar(8192)=20=
NOT=20NULL=20default=20'';=0A+=0A+--=20END=20long_output=20patch=0A=
Index:=20db/mysql.sql=0A=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0ARCS=20file:=20=
/cvsroot/nagios/ndoutils/db/mysql.sql,v=0Aretrieving=20revision=201.4=0A=
diff=20-u=20-r1.4=20mysql.sql=0A---=20db/mysql.sql=0929=20Aug=202007=20=
15:20:44=20-0000=091.4=0A+++=20db/mysql.sql=092=20Dec=202008=2015:49:04=20=
-0000=0A@@=20-538,6=20+538,7=20@@=0A=20=20=20`latency`=20double=20NOT=20=
NULL=20default=20'0',=0A=20=20=20`return_code`=20smallint(6)=20NOT=20=
NULL=20default=20'0',=0A=20=20=20`output`=20varchar(255)=20NOT=20NULL=20=
default=20'',=0A+=20=20`long_output`=20varchar(8192)=20NOT=20NULL=20=
default=20'',=0A=20=20=20`perfdata`=20varchar(255)=20NOT=20NULL=20=
default=20'',=0A=20=20=20PRIMARY=20KEY=20=20(`hostcheck_id`),=0A=20=20=20=
UNIQUE=20KEY=20`instance_id`=20=
(`instance_id`,`host_object_id`,`start_time`,`start_time_usec`)=0A@@=20=
-729,6=20+730,7=20@@=0A=20=20=20`host_object_id`=20int(11)=20NOT=20NULL=20=
default=20'0',=0A=20=20=20`status_update_time`=20datetime=20NOT=20NULL=20=
default=20'0000-00-00=2000:00:00',=0A=20=20=20`output`=20varchar(255)=20=
NOT=20NULL=20default=20'',=0A+=20=20`long_output`=20varchar(8192)=20NOT=20=
NULL=20default=20'',=0A=20=20=20`perfdata`=20varchar(255)=20NOT=20NULL=20=
default=20'',=0A=20=20=20`current_state`=20smallint(6)=20NOT=20NULL=20=
default=20'0',=0A=20=20=20`has_been_checked`=20smallint(6)=20NOT=20NULL=20=
default=20'0',=0A@@=20-1002,6=20+1004,7=20@@=0A=20=20=20`latency`=20=
double=20NOT=20NULL=20default=20'0',=0A=20=20=20`return_code`=20=
smallint(6)=20NOT=20NULL=20default=20'0',=0A=20=20=20`output`=20=
varchar(255)=20NOT=20NULL=20default=20'',=0A+=20=20`long_output`=20=
varchar(8192)=20NOT=20NULL=20default=20

...[email truncated]...


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