Merge pull request #136 from ccztux/devel

Release 2.2.10
ccztux · Dec 10, 2020 · 6d75974 · 6d75974
2 parents 46a0df3 + 4a93c64
commit 6d75974
Show file tree

Hide file tree

Showing 10 changed files with 69 additions and 68 deletions.
diff --git a/Makefile b/Makefile
@@ -9,9 +9,9 @@
 #  Project website:		https://github.com/ccztux/modpd
 #
 #  Last Modification:	Christian Zettel (ccztux)
-#						2020-12-09
+#						2020-12-10
 #
-#  Version				2.2.9
+#  Version				2.2.10
 #
 #  Description:			Makefile for the modpd NEB module
 #

diff --git a/README.md b/README.md
@@ -164,7 +164,7 @@ service nagios status
 Check if the modpd NEB module was loaded by Nagios®:
 ```bash
 [root@lab01]:~# grep -i modpd /usr/local/nagios/var/nagios.log
-[1582272717] modpd: Copyright © 2017-2020 Christian Zettel (ccztux), all rights reserved, Version: 2.2.9
+[1582272717] modpd: Copyright © 2017-2020 Christian Zettel (ccztux), all rights reserved, Version: 2.2.10
 [1582272717] modpd: Starting...
 [1582272717] Event broker module '/usr/local/nagios/include/modpd.o' initialized successfully.
 ```
@@ -336,8 +336,8 @@ vim /usr/local/nagios/etc/send_nsca.cfg
 Usage: modpd OPTIONS
 
 Author:                 Christian Zettel (ccztux)
-Last modification:      2020-12-09
-Version:                2.2.9
+Last modification:      2020-12-10
+Version:                2.2.10
 
 Description:            modpd (Monitoring Obsessing Data Processor Daemon)
 
@@ -365,9 +365,9 @@ OPTIONS:
 #  Project website:		https://github.com/ccztux/modpd
 #
 #  Last Modification:	Christian Zettel (ccztux)
-#						2020-12-09
+#						2020-12-10
 #
-#  Version				2.2.9
+#  Version				2.2.10
 #
 #  Description:			Config file for modpd (Monitoring Obsessing Data Processor Daemon)
 #
@@ -613,48 +613,48 @@ modpd (PID 6931) is running                                [  OK  ]
 Stopping modpd                                             [  OK  ]
 
 [root@lab01]:~# grep 6931 /usr/local/modpd/var/log/modpd.log
-2020-12-09 12:07:53 |   6931 |                     setLock | Script lock directory exists and permissions are ok
-2020-12-09 12:07:53 |   6931 |                     setLock | Setting lock...
-2020-12-09 12:07:53 |   6931 |                     setLock | Setting lock was successful
-2020-12-09 12:07:53 |   6931 |              checkNamedPipe | Check if named pipe: '/usr/local/modpd/var/rw/modpd.cmd' exists and if it is read/writeable...
-2020-12-09 12:07:53 |   6931 |              checkNamedPipe | Named pipe doesnt exist
-2020-12-09 12:07:53 |   6931 |             createNamedPipe | Creating named pipe...
-2020-12-09 12:07:53 |   6931 |             createNamedPipe | Creating named pipe was successful
-2020-12-09 12:07:53 |   6931 |             buildJobCommand | Building job command...
-2020-12-09 12:07:53 |   6931 |             buildJobCommand | We build the following job command: '/usr/bin/timeout --signal=TERM 8 /usr/bin/php /usr/local/modpd/libexec/send_nrdp.php --usestdin --delim="" --token="[HIDDEN FOR SECURITY]" --url=https://nrdpuser:[HIDDEN FOR SECURITY]@10.0.0.74:443/nrdp'
-2020-12-09 12:07:53 |   6931 |                       _main | Ready to handle jobs...
-2020-12-09 12:08:24 |   6931 |                    logStats | ---- Stats for the last 31 seconds ----
-2020-12-09 12:08:24 |   6931 |                    logStats | modpd is running: 0d 0h 0m 31s
-2020-12-09 12:08:24 |   6931 |                    logStats | Total processed jobs: '4', successful processed jobs: '4', unsuccessful processed jobs: '0', timed out jobs: '0'
-2020-12-09 12:08:24 |   6931 |                    logStats | Handled host checks: '1011', handled service checks: '751', invalid datasets received: '0'
-2020-12-09 12:08:54 |   6931 |                    logStats | ---- Stats for the last 30 seconds ----
-2020-12-09 12:08:54 |   6931 |                    logStats | modpd is running: 0d 0h 1m 1s
-2020-12-09 12:08:54 |   6931 |                    logStats | Total processed jobs: '5', successful processed jobs: '5', unsuccessful processed jobs: '0', timed out jobs: '0'
-2020-12-09 12:08:54 |   6931 |                    logStats | Handled host checks: '1095', handled service checks: '751', invalid datasets received: '0'
-2020-12-09 12:09:21 |   6931 |               signalHandler | Caught: 'SIGTERM', preparing for shutdown...
-2020-12-09 12:09:21 |   6931 |                    logStats | ---- Stats for the last 27 seconds ----
-2020-12-09 12:09:21 |   6931 |                    logStats | modpd is running: 0d 0h 1m 28s
-2020-12-09 12:09:21 |   6931 |                    logStats | Total processed jobs: '5', successful processed jobs: '5', unsuccessful processed jobs: '0', timed out jobs: '0'
-2020-12-09 12:09:21 |   6931 |                    logStats | Handled host checks: '1018', handled service checks: '749', invalid datasets received: '0'
-2020-12-09 12:09:21 |   6931 |               signalHandler | Caught: 'EXIT', shutting down...
-2020-12-09 12:09:21 |   6931 |              checkNamedPipe | Check if named pipe: '/usr/local/modpd/var/rw/modpd.cmd' exists and if it is read/writeable...
-2020-12-09 12:09:22 |   6931 |              checkNamedPipe | Named pipe exists and it is read/writeable
-2020-12-09 12:09:22 |   6931 |             removeNamedPipe | Remove named pipe...
-2020-12-09 12:09:22 |   6931 |             removeNamedPipe | Removing named pipe was successful
-2020-12-09 12:09:22 |   6931 |                   checkLock | Check if lock file: '/usr/local/modpd/var/lock/modpd.lock' exists and if it is read and writeable...
-2020-12-09 12:09:22 |   6931 |                   checkLock | Lock file exists and it is read/writeable
-2020-12-09 12:09:22 |   6931 |                  removeLock | Removing lock...
-2020-12-09 12:09:22 |   6931 |                  removeLock | Removing lock was successful
-2020-12-09 12:09:22 |   6931 |               signalHandler | Exitcode: '143'
-2020-12-09 12:09:22 |   6931 |               signalHandler | modpd was running: 0d 0h 1m 29s
-2020-12-09 12:09:22 |   6931 |               signalHandler | Bye, bye...
+2020-12-10 12:07:53 |   6931 |                     setLock | Script lock directory exists and permissions are ok
+2020-12-10 12:07:53 |   6931 |                     setLock | Setting lock...
+2020-12-10 12:07:53 |   6931 |                     setLock | Setting lock was successful
+2020-12-10 12:07:53 |   6931 |              checkNamedPipe | Check if named pipe: '/usr/local/modpd/var/rw/modpd.cmd' exists and if it is read/writeable...
+2020-12-10 12:07:53 |   6931 |              checkNamedPipe | Named pipe doesnt exist
+2020-12-10 12:07:53 |   6931 |             createNamedPipe | Creating named pipe...
+2020-12-10 12:07:53 |   6931 |             createNamedPipe | Creating named pipe was successful
+2020-12-10 12:07:53 |   6931 |             buildJobCommand | Building job command...
+2020-12-10 12:07:53 |   6931 |             buildJobCommand | We build the following job command: '/usr/bin/timeout --signal=TERM 8 /usr/bin/php /usr/local/modpd/libexec/send_nrdp.php --usestdin --delim="" --token="[HIDDEN FOR SECURITY]" --url=https://nrdpuser:[HIDDEN FOR SECURITY]@10.0.0.74:443/nrdp'
+2020-12-10 12:07:53 |   6931 |                       _main | Ready to handle jobs...
+2020-12-10 12:08:24 |   6931 |                    logStats | ---- Stats for the last 31 seconds ----
+2020-12-10 12:08:24 |   6931 |                    logStats | modpd is running: 0d 0h 0m 31s
+2020-12-10 12:08:24 |   6931 |                    logStats | Total processed jobs: '4', successful processed jobs: '4', unsuccessful processed jobs: '0', timed out jobs: '0'
+2020-12-10 12:08:24 |   6931 |                    logStats | Handled host checks: '1011', handled service checks: '751', invalid datasets received: '0'
+2020-12-10 12:08:54 |   6931 |                    logStats | ---- Stats for the last 30 seconds ----
+2020-12-10 12:08:54 |   6931 |                    logStats | modpd is running: 0d 0h 1m 1s
+2020-12-10 12:08:54 |   6931 |                    logStats | Total processed jobs: '5', successful processed jobs: '5', unsuccessful processed jobs: '0', timed out jobs: '0'
+2020-12-10 12:08:54 |   6931 |                    logStats | Handled host checks: '1095', handled service checks: '751', invalid datasets received: '0'
+2020-12-10 12:09:21 |   6931 |               signalHandler | Caught: 'SIGTERM', preparing for shutdown...
+2020-12-10 12:09:21 |   6931 |                    logStats | ---- Stats for the last 27 seconds ----
+2020-12-10 12:09:21 |   6931 |                    logStats | modpd is running: 0d 0h 1m 28s
+2020-12-10 12:09:21 |   6931 |                    logStats | Total processed jobs: '5', successful processed jobs: '5', unsuccessful processed jobs: '0', timed out jobs: '0'
+2020-12-10 12:09:21 |   6931 |                    logStats | Handled host checks: '1018', handled service checks: '749', invalid datasets received: '0'
+2020-12-10 12:09:21 |   6931 |               signalHandler | Caught: 'EXIT', shutting down...
+2020-12-10 12:09:21 |   6931 |              checkNamedPipe | Check if named pipe: '/usr/local/modpd/var/rw/modpd.cmd' exists and if it is read/writeable...
+2020-12-10 12:09:22 |   6931 |              checkNamedPipe | Named pipe exists and it is read/writeable
+2020-12-10 12:09:22 |   6931 |             removeNamedPipe | Remove named pipe...
+2020-12-10 12:09:22 |   6931 |             removeNamedPipe | Removing named pipe was successful
+2020-12-10 12:09:22 |   6931 |                   checkLock | Check if lock file: '/usr/local/modpd/var/lock/modpd.lock' exists and if it is read and writeable...
+2020-12-10 12:09:22 |   6931 |                   checkLock | Lock file exists and it is read/writeable
+2020-12-10 12:09:22 |   6931 |                  removeLock | Removing lock...
+2020-12-10 12:09:22 |   6931 |                  removeLock | Removing lock was successful
+2020-12-10 12:09:22 |   6931 |               signalHandler | Exitcode: '143'
+2020-12-10 12:09:22 |   6931 |               signalHandler | modpd was running: 0d 0h 1m 29s
+2020-12-10 12:09:22 |   6931 |               signalHandler | Bye, bye...
 ```
 
 
 ## modpd NEB module log snippet
 ```
 [root@lab01]:~# grep -i modpd /usr/local/nagios/var/nagios.log
-[1607079032] modpd: Copyright © 2017-2020 Christian Zettel (ccztux), all rights reserved, Version: 2.2.9
+[1607079032] modpd: Copyright © 2017-2020 Christian Zettel (ccztux), all rights reserved, Version: 2.2.10
 [1607079032] modpd: Starting...
 [1607079032] Event broker module '/usr/local/nagios/include/modpd.o' initialized successfully.
 [1607079332] modpd: The modpd NEB module is running 0d 0h 5m 0s

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.2.9
+2.2.10
diff --git a/etc/init.d/modpd b/etc/init.d/modpd
@@ -11,9 +11,9 @@
 #  Project website:		https://github.com/ccztux/modpd
 #
 #  Last Modification:	Christian Zettel (ccztux)
-#						2020-12-09
+#						2020-12-10
 #
-#  Version				2.2.9
+#  Version				2.2.10
 #
 #  Description:			init script for modpd (Monitoring Obsessing Data Processor Daemon)
 #

diff --git a/etc/logrotate.d/modpd b/etc/logrotate.d/modpd
@@ -9,9 +9,9 @@
 #  Project website:		https://github.com/ccztux/modpd
 #
 #  Last Modification:	Christian Zettel (ccztux)
-#						2020-12-09
+#						2020-12-10
 #
-#  Version				2.2.9
+#  Version				2.2.10
 #
 #  Description:			logrotate config file for modpd (Monitoring Obsessing Data Processor Daemon)
 #
@@ -36,10 +36,11 @@
 
 /usr/local/modpd/var/log/modpd.log
 {
-    weekly
-    rotate 6
-    missingok
-    notifempty
-    sharedscripts
-    compress
+	su nagios nagios
+	weekly
+	rotate 6
+	missingok
+	notifempty
+	sharedscripts
+	compress
 }
diff --git a/etc/sysconfig/modpd b/etc/sysconfig/modpd
@@ -9,9 +9,9 @@
 #  Project website:		https://github.com/ccztux/modpd
 #
 #  Last Modification:	Christian Zettel (ccztux)
-#						2020-12-09
+#						2020-12-10
 #
-#  Version				2.2.9
+#  Version				2.2.10
 #
 #  Description:			Config parameters for the init script of the modpd daemon
 #						(Monitoring Obsessing Data Processor Daemon)

diff --git a/src/Makefile b/src/Makefile
@@ -9,9 +9,9 @@
 #  Project website:		https://github.com/ccztux/modpd
 #
 #  Last Modification:	Christian Zettel (ccztux)
-#						2020-12-09
+#						2020-12-10
 #
-#  Version				2.2.9
+#  Version				2.2.10
 #
 #  Description:			Makefile for the modpd NEB module
 #

diff --git a/src/modpd.c b/src/modpd.c
@@ -9,9 +9,9 @@
 *  Project website:		https://github.com/ccztux/modpd
 *
 *  Last Modification:	Christian Zettel (ccztux)
-*						2020-12-09
+*						2020-12-10
 *
-*  Version				2.2.9
+*  Version				2.2.10
 *
 *  Description:			NEB module to write obsessing data to unix socket
 *						Based on example: nagioscore/module/helloworld.c
@@ -83,12 +83,12 @@ int nebmodule_init(int flags, char *args, nebmodule *handle)
 	neb_set_module_info(modpd_module_handle, NEBMODULE_MODINFO_TITLE, "modpd");
 	neb_set_module_info(modpd_module_handle, NEBMODULE_MODINFO_AUTHOR, "Christian Zettel (ccztux)");
 	neb_set_module_info(modpd_module_handle, NEBMODULE_MODINFO_TITLE, "Copyright © 2017-2020 Christian Zettel (ccztux), all rights reserved");
-	neb_set_module_info(modpd_module_handle, NEBMODULE_MODINFO_VERSION, "2.2.9");
+	neb_set_module_info(modpd_module_handle, NEBMODULE_MODINFO_VERSION, "2.2.10");
 	neb_set_module_info(modpd_module_handle, NEBMODULE_MODINFO_LICENSE, "GPL v2");
 	neb_set_module_info(modpd_module_handle, NEBMODULE_MODINFO_DESC, "Obsessing NEB Module.");
 
 	/* log module info to the Nagios log file */
-	write_to_all_logs("modpd: Copyright © 2017-2020 Christian Zettel (ccztux), all rights reserved, Version: 2.2.9", NSLOG_INFO_MESSAGE);
+	write_to_all_logs("modpd: Copyright © 2017-2020 Christian Zettel (ccztux), all rights reserved, Version: 2.2.10", NSLOG_INFO_MESSAGE);
 
 	/* log a message to the Nagios log file */
 	snprintf(temp_buffer, sizeof(temp_buffer) - 1, "modpd: Starting...\n");

diff --git a/usr/local/modpd/bin/modpd b/usr/local/modpd/bin/modpd
@@ -11,9 +11,9 @@
 #  Project website:		https://github.com/ccztux/modpd
 #
 #  Last Modification:	Christian Zettel (ccztux)
-#						2020-12-09
+#						2020-12-10
 #
-#  Version				2.2.9
+#  Version				2.2.10
 #
 #  Description:			modpd (Monitoring Obsessing Data Processor Daemon)
 #
@@ -1546,11 +1546,11 @@ _main()
 g_pid="${$}"
 g_argc="${#}"
 g_name="${0##*/}"
-g_version="2.2.9"
+g_version="2.2.10"
 g_author="Christian Zettel (ccztux)"
 g_copyright="Copyright © 2017-2020 ${g_author}, all rights reserved"
 g_project_website="https://github.com/ccztux/${g_name}"
-g_last_modification_date="2020-12-09"
+g_last_modification_date="2020-12-10"
 g_minimal_required_bash_version="3"
 g_license="GNU GPLv2"
 g_description="${g_name} (Monitoring Obsessing Data Processor Daemon)"

diff --git a/usr/local/modpd/etc/modpd.sample.conf b/usr/local/modpd/etc/modpd.sample.conf
@@ -11,9 +11,9 @@
 #  Project website:		https://github.com/ccztux/modpd
 #
 #  Last Modification:	Christian Zettel (ccztux)
-#						2020-12-09
+#						2020-12-10
 #
-#  Version				2.2.9
+#  Version				2.2.10
 #
 #  Description:			Config file for modpd (Monitoring Obsessing Data Processor Daemon)
 #