Update Naemon libraries (#46)

Author: satterly

.github/workflows/release.yml

@@ -39,17 +39,17 @@ jobs:
           sudo apt-get -y install \
             libjansson-dev \
             libcurl4-openssl-dev
-      - name: Build artifacts
+      - name: Build Nagios3 artifacts
         id: build-nagios3
         run: |
           make nagios3
           mv src/alerta-neb.o src/alerta-neb.o.nagios3
-      - name: Build artifacts
+      - name: Build Nagios4 artifacts
         id: build-nagios4
         run: |
           make nagios4
           mv src/alerta-neb.o src/alerta-neb.o.nagios4
-      - name: Build artifacts
+      - name: Build Naemon artifacts
         id: build-naemon
         run: |
           make naemon

.github/workflows/test.yml

@@ -38,17 +38,17 @@ jobs:
           sudo apt-get -y install \
             libjansson-dev \
             libcurl4-openssl-dev
-      - name: Build artifacts
+      - name: Build Nagios3 artifacts
         id: build-nagios3
         run: |
           make nagios3
           mv src/alerta-neb.o src/alerta-neb.o.nagios3
-      - name: Build artifacts
+      - name: Build Nagios4 artifacts
         id: build-nagios4
         run: |
           make nagios4
           mv src/alerta-neb.o src/alerta-neb.o.nagios4
-      - name: Build artifacts
+      - name: Build Naemon artifacts
         id: build-naemon
         run: |
           make naemon

include/naemon/broker.h

@@ -10,6 +10,7 @@
 #include "objects_contact.h"
 #include "objects_service.h"
 #include "nebmods.h"
+#include "macros.h"
 
 /*************** EVENT BROKER OPTIONS *****************/
 
@@ -27,7 +28,7 @@
 #define BROKER_COMMENT_DATA         	256	/* DONE */
 #define BROKER_DOWNTIME_DATA		512     /* DONE */
 #define BROKER_SYSTEM_COMMANDS          1024	/* DONE */
-#define BROKER_OCP_DATA_UNUSED          2048	/* reusable */
+#define BROKER_VAULT_MACROS             2048    /* DONE */
 #define BROKER_STATUS_DATA              4096    /* DONE */
 #define BROKER_ADAPTIVE_DATA            8192    /* DONE */
 #define BROKER_EXTERNALCOMMAND_DATA     16384   /* DONE */
@@ -166,6 +167,7 @@
 
 NAGIOS_BEGIN_DECL
 
+struct kvvec *get_global_store(void);
 void broker_program_state(int, int, int);
 void broker_log_data(int, int, int, char *, unsigned long, time_t);
 int broker_event_handler(int, int, int, int, void *, int, int, struct timeval, struct timeval, double, int, int, int, char *, char *, char *);
@@ -191,6 +193,7 @@ void broker_aggregated_status_data(int, int, int);
 void broker_retention_data(int, int, int);
 void broker_acknowledgement_data(int, int, int, int, void *, char *, char *, int, int, int);
 void broker_statechange_data(int, int, int, int, void *, int, int, int, int);
+int broker_vault_macro(char *, char **, int *, nagios_macros *);
 
 NAGIOS_END_DECL
 #endif

include/naemon/buildopts.h

@@ -1,9 +1,9 @@
 #ifndef NAEMON_BUILDOPTS_H__
 #define NAEMON_BUILDOPTS_H__
-#define NAEMON_SYSCONFDIR "/usr/local/etc/naemon"
-#define NAEMON_LOCALSTATEDIR "/usr/local/var"
-#define NAEMON_LOGDIR "/usr/local/var/log/naemon"
-#define NAEMON_LOCKFILE "/usr/local/var/cache/naemon/naemon.pid"
-#define NAEMON_GROUP "naemon"
-#define NAEMON_USER "naemon"
+#define NAEMON_SYSCONFDIR "@@NAEMON_SYSCONFDIR@@"
+#define NAEMON_LOCALSTATEDIR "@@NAEMON_LOCALSTATEDIR@@"
+#define NAEMON_LOGDIR "@@NAEMON_LOGDIR@@"
+#define NAEMON_LOCKFILE "@@NAEMON_LOCKFILE@@"
+#define NAEMON_GROUP "@@NAEMON_GROUP@@"
+#define NAEMON_USER "@@NAEMON_USER@@"
 #endif

include/naemon/common.h

@@ -385,7 +385,7 @@ NAGIOS_END_DECL
 #define CHECK_OPTION_NONE		0	/* no check options */
 #define CHECK_OPTION_FORCE_EXECUTION	1	/* force execution of a check (ignores disabled services/hosts, invalid timeperiods) */
 #define CHECK_OPTION_FRESHNESS_CHECK    2       /* this is a freshness check */
-                                     /* 4          used to be CHECK_OPTION_ORPHAN_CHECK, but is no longer used */
+#define CHECK_OPTION_ORPHAN_CHECK       4       /* flag for scheduled checks from orphan event handler */
 #define CHECK_OPTION_DEPENDENCY_CHECK   8       /* dependency check. different scheduling rules apply */
 #define CHECK_OPTION_ALLOW_POSTPONE     16      /* allow the check to take precedence over an earlier (sooner) scheduled check */
 

include/naemon/defaults.h

@@ -23,6 +23,7 @@
 #define DEFAULT_MAX_CHECK_RESULT_AGE				3600    /* maximum number of seconds that a check result file is considered to be valid */
 #define DEFAULT_MAX_PARALLEL_SERVICE_CHECKS 			0	/* maximum number of service checks we can have running at any given time (0=unlimited) */
 #define DEFAULT_RETENTION_UPDATE_INTERVAL			60	/* minutes between auto-save of retention data */
+#define DEFAULT_RETAINED_SCHEDULING_RANDOMIZE_WINDOW	60	/* number of seconds used for randomizing the re-scheduling of checks missed over a restart */
 #define DEFAULT_RETENTION_SCHEDULING_HORIZON    		900     /* max seconds between program restarts that we will preserve scheduling information */
 #define DEFAULT_STATUS_UPDATE_INTERVAL				60	/* seconds between aggregated status data updates */
 #define DEFAULT_FRESHNESS_CHECK_INTERVAL        		60      /* seconds between service result freshness checks */
@@ -86,6 +87,8 @@
 
 #define DEFAULT_ALLOW_EMPTY_HOSTGROUP_ASSIGNMENT        2        /* Allow assigning to empty hostgroups by default, but warn about it */
 #define DEFAULT_ALLOW_CIRCULAR_DEPENDENCIES             0        /* Allow circular depdendencies */
+#define DEFAULT_HOST_DOWN_DISABLE_SERVICE_CHECKS        0        /* run service checks if the host is down */
+#define DEFAULT_SKIP_CHECK_STATUS                      -1        /* do not change status by default */
 
 #define DEFAULT_HOST_PERFDATA_FILE_TEMPLATE "[HOSTPERFDATA]\t$TIMET$\t$HOSTNAME$\t$HOSTEXECUTIONTIME$\t$HOSTOUTPUT$\t$HOSTPERFDATA$"
 #define DEFAULT_SERVICE_PERFDATA_FILE_TEMPLATE "[SERVICEPERFDATA]\t$TIMET$\t$HOSTNAME$\t$SERVICEDESC$\t$SERVICEEXECUTIONTIME$\t$SERVICELATENCY$\t$SERVICEOUTPUT$\t$SERVICEPERFDATA$"

include/naemon/globals.h

@@ -110,6 +110,7 @@ extern int retain_state_information;
 extern int retention_update_interval;
 extern int use_retained_program_state;
 extern int use_retained_scheduling_info;
+extern int retained_scheduling_randomize_window;
 extern int retention_scheduling_horizon;
 extern char *retention_file;
 extern unsigned long retained_host_attribute_mask;
@@ -144,6 +145,10 @@ extern unsigned long max_debug_file_size;
 
 extern int allow_empty_hostgroup_assignment;
 extern int allow_circular_dependencies;
+extern int host_down_disable_service_checks;
+extern int service_skip_check_dependency_status;
+extern int service_skip_check_host_down_status;
+extern int host_skip_check_dependency_status;
 
 extern time_t last_program_stop;
 extern time_t event_start;

include/naemon/lib/.gitignore

@@ -0,0 +1,14 @@
+test-squeue
+test-iocache
+test-iobroker
+test-bitmap
+test-dkhash
+test-runcmd
+test-fanout
+test-nsutils
+wproc
+#snprintf.h
+core
+stamp-h2
+/test-*.log
+/test-*.trs