Merge branch 'ndoutils-2.1'

.gitignore

@@ -1,10 +1,47 @@
-autom4te.cache
 Makefile
+autom4te.cache/
 config.log
 config.status
-daemon-init
+uninstall
+
+include/common.h
 include/config.h
 include/dh.h
-src/Makefile
-subst
+include/io.h
+
+config/*.cfg
+config/*.cfg-sample
+
+docs/docbook/en-en/Makefile
+
+nbproject/
 CVS/
+
+src/Makefile
+src/*.o
+src/file2sock
+src/log2ndo
+src/ndo2db-2x
+src/ndo2db-3x
+src/ndo2db-4x
+src/sockdebug
+
+startup/bsd-init
+startup/debian-init
+startup/default-inetd
+startup/default-init
+startup/default-service
+startup/default-socket
+startup/default-socket-svc
+startup/default-xinetd
+startup/mac-inetd.plist
+startup/mac-init.plist
+startup/newbsd-init
+startup/openbsd-init
+startup/openrc-conf
+startup/openrc-init
+startup/rh-upstart-init
+startup/solaris-inetd.xml
+startup/solaris-init.xml
+startup/tmpfile.conf
+startup/upstart-init

Changelog

@@ -2,6 +2,29 @@
 NDO Utils Changelog
 ===================
 
+2.1.0 - 2016-08-01
+------------------
+* Probable fix for ndo2db not responding & growing queue issue (John Frickson)
+* Got rid of uninitialized variable used for sleep() and increased the listen backlog (John Frickson)
+* ndoutils clears all entries from SQL table causing slow startup (John Frickson)
+* Clean up bad returns (John Frickson)
+* Update nagios headers to (mostly) match the ones actually in core (John Frickson)
+* cannot open /xxxx/ndo2db.lock for reading: No such file or directory (box293)
+* Added option to specify alternative mysql TCP port on installdb script (JR Dalrymple)
+* State History does not use actual plugin long_output
+* Have the parent process wait until the lock file is written (David Michael)
+* Accept a socket fd passed from systemd (David Michael)
+* Cross-platform changes (John Frickson)
+* Remove PostgreSQL support stub code (Eric Mislivec)
+* db/upgrade: Fix a schema version typo (Eric Mislivec)
+* Pad usecs to six digits when printing timevals (Eric Mislivec)
+* Make the MySQL socket path a configurable option (Eric Mislivec)
+* Patch situation where db table nagios_logentries has items where `instance_id`,`logentry_time`,`entry_time`,`entry_time_usec` isn't unique enough. - (Scott Wilkerson)
+* Truncate all tables we should (Eric Mislivec)
+* Free memory allocated for config options (Eric Mislivec)
+
+
+
 2.0.0 - 02/28/2014
 ------------------
 * Updated database schema upgrade script to support multiple updates (Eric Stanley, Scott Wilkerson)
@@ -13,16 +36,22 @@ NDO Utils Changelog
 * Replaced ndomod.cfg data_processing_options variable with single options for easier customization (See README) (Mike Guthrie)
 * Added missing maintenance options for table trimming (Mike Guthrie)
 
+
+
 1.5.2 - 06/08/2012
 ------------------
 * Added Linux kernel tuning instructions (Eric Stanley)
 * Added code to limit retries when system resources are too low (Eric Stanley)
 * Added code to retry sending messages queue is full (Mike Guthrie)
 
+
+
 1.5.1 - 05/15/2012
 ------------------
 * Fixed off-by-one error packing data in ndomod.
 
+
+
 1.5 - 02/03/2012
 ----------------
 * Added various performance improvements originally added for Nagios XI (Ethan Galstad)
@@ -31,6 +60,7 @@ NDO Utils Changelog
 * Fixed wrong type of object_id in ndo2db_save_custom_variables() (Michael Friedrich)
 
 
+
 1.4b9 - 10/27/2009
 ------------------
 NOTE: ** Requires Nagios 2.7 or higher, or Nagios 3.0b6 or higher

LEGAL

@@ -0,0 +1,27 @@
+NDOUtils - Nagios Data Output Utilities
+
+Copyright 1999-2009:
+  Ethan Galstad <[email protected]>
+Copyright 2009 until further notice:
+  Nagios Core Development Team and Nagios Community Contributors
+
+For detailed authorship information, refer to the source control management
+history and pay particular attention to commit messages and the THANKS file.
+
+
+NDOUtils is free software: you can redistribute it and/or modify it under the
+terms of the GNU General Public License version 2 as published by the Free
+Software Foundation.
+
+NDOUtils is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with
+NDOUtils. If not, see <http://www.gnu.org/licenses/>.
+
+
+Nagios and the Nagios logo are trademarks, servicemarks, registered trademarks
+or registered servicemarks owned by Nagios Enterprises, LLC. All other
+trademarks, servicemarks, registered trademarks, and registered servicemarks
+are the property of their respective owner(s).