Merge pull request #115 from ccztux/devel

Release 2.2.5
ccztux · Dec 6, 2020 · f241817 · f241817
2 parents 23d7322 + fbbeefe
commit f241817
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 17 deletions.
diff --git a/Makefile b/Makefile
@@ -11,7 +11,7 @@
 #  Last Modification:	Christian Zettel (ccztux)
 #						2020-12-06
 #
-#  Version				2.2.4
+#  Version				2.2.5
 #
 #  Description:			Makefile for the modpd NEB module
 #

diff --git a/README.md b/README.md
@@ -124,7 +124,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.4
+[1582272717] modpd: Copyright © 2017-2020 Christian Zettel (ccztux), all rights reserved, Version: 2.2.5
 [1582272717] modpd: Starting...
 [1582272717] Event broker module '/usr/local/nagios/include/modpd.o' initialized successfully.
 ```
@@ -297,7 +297,7 @@ Usage: modpd OPTIONS
 
 Author:                 Christian Zettel (ccztux)
 Last modification:      2020-12-06
-Version:                2.2.4
+Version:                2.2.5
 
 Description:            modpd (Monitoring Obsessing Data Processor Daemon)
 
@@ -327,7 +327,7 @@ OPTIONS:
 #  Last Modification:	Christian Zettel (ccztux)
 #						2020-12-06
 #
-#  Version				2.2.4
+#  Version				2.2.5
 #
 #  Description:			Config file for modpd (Monitoring Obsessing Data Processor Daemon)
 #
@@ -614,7 +614,7 @@ Stopping modpd                                             [  OK  ]
 ## 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.4
+[1607079032] modpd: Copyright © 2017-2020 Christian Zettel (ccztux), all rights reserved, Version: 2.2.5
 [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.4
+2.2.5
diff --git a/etc/init.d/modpd b/etc/init.d/modpd
@@ -13,7 +13,7 @@
 #  Last Modification:	Christian Zettel (ccztux)
 #						2020-12-06
 #
-#  Version				2.2.4
+#  Version				2.2.5
 #
 #  Description:			init script for modpd (Monitoring Obsessing Data Processor Daemon)
 #

diff --git a/etc/logrotate.d/modpd b/etc/logrotate.d/modpd
@@ -11,7 +11,7 @@
 #  Last Modification:	Christian Zettel (ccztux)
 #						2020-12-06
 #
-#  Version				2.2.4
+#  Version				2.2.5
 #
 #  Description:			logrotate config file for modpd (Monitoring Obsessing Data Processor Daemon)
 #

diff --git a/etc/sysconfig/modpd b/etc/sysconfig/modpd
@@ -11,7 +11,7 @@
 #  Last Modification:	Christian Zettel (ccztux)
 #						2020-12-06
 #
-#  Version				2.2.4
+#  Version				2.2.5
 #
 #  Description:			Config parameters for the init script of the modpd daemon
 #						(Monitoring Obsessing Data Processor Daemon)

diff --git a/src/Makefile b/src/Makefile
@@ -11,7 +11,7 @@
 #  Last Modification:	Christian Zettel (ccztux)
 #						2020-12-06
 #
-#  Version				2.2.4
+#  Version				2.2.5
 #
 #  Description:			Makefile for the modpd NEB module
 #

diff --git a/src/modpd.c b/src/modpd.c
@@ -11,7 +11,7 @@
 *  Last Modification:	Christian Zettel (ccztux)
 *						2020-12-06
 *
-*  Version				2.2.4
+*  Version				2.2.5
 *
 *  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.4");
+	neb_set_module_info(modpd_module_handle, NEBMODULE_MODINFO_VERSION, "2.2.5");
 	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.4", NSLOG_INFO_MESSAGE);
+	write_to_all_logs("modpd: Copyright © 2017-2020 Christian Zettel (ccztux), all rights reserved, Version: 2.2.5", 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
@@ -13,7 +13,7 @@
 #  Last Modification:	Christian Zettel (ccztux)
 #						2020-12-06
 #
-#  Version				2.2.4
+#  Version				2.2.5
 #
 #  Description:			modpd (Monitoring Obsessing Data Processor Daemon)
 #
@@ -1518,7 +1518,7 @@ _main()
 script_pid="${$}"
 script_argc="${#}"
 script_name="${0##*/}"
-script_version="2.2.4"
+script_version="2.2.5"
 script_author="Christian Zettel (ccztux)"
 script_copyright="Copyright © 2017-2020 ${script_author}, all rights reserved"
 script_project_website="https://github.com/ccztux/modpd"

diff --git a/usr/local/modpd/etc/modpd.sample.conf b/usr/local/modpd/etc/modpd.sample.conf
@@ -13,7 +13,7 @@
 #  Last Modification:	Christian Zettel (ccztux)
 #						2020-12-06
 #
-#  Version				2.2.4
+#  Version				2.2.5
 #
 #  Description:			Config file for modpd (Monitoring Obsessing Data Processor Daemon)
 #

diff --git a/usr/local/modpd/libexec/.gitkeep b/usr/local/modpd/libexec/.gitkeep
diff --git a/usr/local/modpd/libexec/README.md b/usr/local/modpd/libexec/README.md
@@ -1 +1 @@
-Here you can place your obsessing script like send_nrdp, send_nsca and so on...
+In this directory you should place the client script of your choice (send_nrdp.php or send_nsca).