"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/monit.h" between
monit-5.25.3.tar.gz and monit-5.26.0.tar.gz

About: Monit is a utility for managing and monitoring processes, files, directories and filesystems (with automatic error recovery).

monit.h  (monit-5.25.3):monit.h  (monit-5.26.0)
skipping to change at line 157 skipping to change at line 157
#define LOCALHOST "localhost" #define LOCALHOST "localhost"
#define PORT_SMTP 25 #define PORT_SMTP 25
#define PORT_SMTPS 465 #define PORT_SMTPS 465
#define PORT_HTTP 80 #define PORT_HTTP 80
#define PORT_HTTPS 443 #define PORT_HTTPS 443
#define SSL_TIMEOUT 15000 #define SSL_TIMEOUT 15000
#define SMTP_TIMEOUT 30000 #define SMTP_TIMEOUT 30000
#define START_DELAY 0
//FIXME: refactor Run_Flags to bit field //FIXME: refactor Run_Flags to bit field
typedef enum { typedef enum {
Run_Once = 0x1, /**< Run Monit only on ce */ Run_Once = 0x1, /**< Run Monit only on ce */
Run_Foreground = 0x2, /**< Don't daemonize Mon it */ //FIXME: cleanup: Run_Foreground and Run_Daemon are mutually exclusive => no need for 2 flags Run_Foreground = 0x2, /**< Don't daemonize Mon it */ //FIXME: cleanup: Run_Foreground and Run_Daemon are mutually exclusive => no need for 2 flags
Run_Daemon = 0x4, /**< Daemonize Mon it */ //FIXME: cleanup: Run_Foreground and Run_Daemon are mutually exclusive => no need for 2 flags Run_Daemon = 0x4, /**< Daemonize Mon it */ //FIXME: cleanup: Run_Foreground and Run_Daemon are mutually exclusive => no need for 2 flags
Run_Log = 0x8, /**< Log enabl ed */ Run_Log = 0x8, /**< Log enabl ed */
Run_UseSyslog = 0x10, /**< Use sysl og */ //FIXME: cleanup: no need for standalone flag ... if syslog is enabled, do n't set Run.files.log, then (Run.flags&Run_Log && ! Run.files.log => syslog) Run_UseSyslog = 0x10, /**< Use sysl og */ //FIXME: cleanup: no need for standalone flag ... if syslog is enabled, do n't set Run.files.log, then (Run.flags&Run_Log && ! Run.files.log => syslog)
Run_FipsEnabled = 0x20, /** FIPS-140 mode enabl ed */ Run_FipsEnabled = 0x20, /** FIPS-140 mode enabl ed */
Run_HandlerInit = 0x40, /**< The handlers queue initializati on */ Run_HandlerInit = 0x40, /**< The handlers queue initializati on */
Run_ProcessEngineEnabled = 0x80, /**< Process monitoring engine enabl ed */ Run_ProcessEngineEnabled = 0x80, /**< Process monitoring engine enabl ed */
skipping to change at line 316 skipping to change at line 314
Resource_CpuSystem, Resource_CpuSystem,
Resource_CpuWait, Resource_CpuWait,
Resource_CpuPercentTotal, Resource_CpuPercentTotal,
Resource_SwapPercent, Resource_SwapPercent,
Resource_SwapKbyte, Resource_SwapKbyte,
Resource_Threads, Resource_Threads,
Resource_ReadBytes, Resource_ReadBytes,
Resource_ReadOperations, Resource_ReadOperations,
Resource_WriteBytes, Resource_WriteBytes,
Resource_WriteOperations, Resource_WriteOperations,
Resource_ServiceTime Resource_ServiceTime,
Resource_LoadAveragePerCore1m,
Resource_LoadAveragePerCore5m,
Resource_LoadAveragePerCore15m
} __attribute__((__packed__)) Resource_Type; } __attribute__((__packed__)) Resource_Type;
typedef enum { typedef enum {
Digest_Cleartext = 1, Digest_Cleartext = 1,
Digest_Crypt, Digest_Crypt,
Digest_Md5, Digest_Md5,
Digest_Pam Digest_Pam
} __attribute__((__packed__)) Digest_Type; } __attribute__((__packed__)) Digest_Type;
typedef enum { typedef enum {
skipping to change at line 643 skipping to change at line 644
int status; /**< HTTP status */ int status; /**< HTTP status */
char *username; char *username;
char *password; char *password;
char *request; /**< HTTP request */ char *request; /**< HTTP request */
char *checksum; /**< Document ch ecksum (optional) */ char *checksum; /**< Document ch ecksum (optional) */
List_T headers; /**< List of headers to send with r equest (optional) */ List_T headers; /**< List of headers to send with r equest (optional) */
} http; } http;
struct { struct {
char *username; char *username;
char *password; char *password;
} mqtt;
struct {
char *username;
char *password;
} mysql; } mysql;
struct { struct {
char *secret; char *secret;
} radius; } radius;
struct { struct {
int maxforward; int maxforward;
char *target; char *target;
} sip; } sip;
struct { struct {
char *username; char *username;
skipping to change at line 687 skipping to change at line 692
double response; /**< ICMP ECHO response time [m s] */ double response; /**< ICMP ECHO response time [m s] */
Outgoing_T outgoing; /**< Outgoing addre ss */ Outgoing_T outgoing; /**< Outgoing addre ss */
EventAction_T action; /**< Description of the action upon event occuren ce */ EventAction_T action; /**< Description of the action upon event occuren ce */
/** For internal use */ /** For internal use */
struct Icmp_T *next; /**< next icmp in cha in */ struct Icmp_T *next; /**< next icmp in cha in */
} *Icmp_T; } *Icmp_T;
typedef struct Dependant_T { typedef struct Dependant_T {
char *dependant; /**< name of dependant servi ce */ char *dependant; /**< name of dependant servi ce */
char *dependant_escaped; /**< URL escaped name of dependant servi ce */
/** For internal use */ /** For internal use */
struct Dependant_T *next; /**< next dependant service in cha in */ struct Dependant_T *next; /**< next dependant service in cha in */
} *Dependant_T; } *Dependant_T;
/** Defines resource data */ /** Defines resource data */
typedef struct Resource_T { typedef struct Resource_T {
Resource_Type resource_id; /**< Which value is check ed */ Resource_Type resource_id; /**< Which value is check ed */
Operator_Type operator; /**< Comparison operat or */ Operator_Type operator; /**< Comparison operat or */
double limit; /**< Limit of the resour ce */ double limit; /**< Limit of the resour ce */
skipping to change at line 1036 skipping to change at line 1042
NetInfo_T net; NetInfo_T net;
ProcessInfo_T process; ProcessInfo_T process;
} *Info_T; } *Info_T;
/** Defines service data */ /** Defines service data */
//FIXME: use union for type-specific rules //FIXME: use union for type-specific rules
typedef struct Service_T { typedef struct Service_T {
/** Common parameters */ /** Common parameters */
char *name; /**< Service descriptive na me */ char *name; /**< Service descriptive na me */
char *name_escaped; /**< Service name URL escap ed */
State_Type (*check)(struct Service_T *);/**< Service verification functi on */ State_Type (*check)(struct Service_T *);/**< Service verification functi on */
boolean_t visited; /**< Service visited flag, set if dependencies are us ed */ boolean_t visited; /**< Service visited flag, set if dependencies are us ed */
Service_Type type; /**< Monitored service ty pe */ Service_Type type; /**< Monitored service ty pe */
Monitor_State monitor; /**< Monitor state fl ag */ Monitor_State monitor; /**< Monitor state fl ag */
Monitor_Mode mode; /**< Monitoring mode for the servi ce */ Monitor_Mode mode; /**< Monitoring mode for the servi ce */
Onreboot_Type onreboot; /**< On reboot mo de */ Onreboot_Type onreboot; /**< On reboot mo de */
Action_Type doaction; /**< Action scheduled by http thre ad */ Action_Type doaction; /**< Action scheduled by http thre ad */
int ncycle; /**< The number of the current cyc le */ int ncycle; /**< The number of the current cyc le */
int nstart; /**< The number of current starts with this servi ce */ int nstart; /**< The number of current starts with this servi ce */
Every_T every; /**< Timespec for when to run check of servi ce */ Every_T every; /**< Timespec for when to run check of servi ce */
skipping to change at line 1160 skipping to change at line 1167
char *log; /**< The file to write logdata in to */ char *log; /**< The file to write logdata in to */
char *pid; /**< This programs pidfi le */ char *pid; /**< This programs pidfi le */
char *id; /**< The file with unique monit id */ char *id; /**< The file with unique monit id */
char *state; /**< The file with the saved runtime sta te */ char *state; /**< The file with the saved runtime sta te */
} files; } files;
char *mygroup; /**< Group Name of the Servi ce */ char *mygroup; /**< Group Name of the Servi ce */
MD_T id; /**< Unique monit id */ MD_T id; /**< Unique monit id */
Limits_T limits; /**< Default limi ts */ Limits_T limits; /**< Default limi ts */
struct SslOptions_T ssl; /**< Default SSL optio ns */ struct SslOptions_T ssl; /**< Default SSL optio ns */
int polltime; /**< In deamon mode, the sleeptime (sec) between r un */ int polltime; /**< In deamon mode, the sleeptime (sec) between r un */
int startdelay; /**< the sleeptime (sec) after start up */ int startdelay; /**< the sleeptime [s] on first start after machine bo ot */
int facility; /** The facility to use when running openlog () */ int facility; /** The facility to use when running openlog () */
int eventlist_slots; /**< The event queue size - number of slo ts */ int eventlist_slots; /**< The event queue size - number of slo ts */
int mailserver_timeout; /**< Connect and read timeout ms for a SMTP serv er */ int mailserver_timeout; /**< Connect and read timeout ms for a SMTP serv er */
time_t incarnation; /**< Unique ID for running monit instan ce */ time_t incarnation; /**< Unique ID for running monit instan ce */
int handler_queue[Handler_Max + 1]; /**< The handlers queue count er */ int handler_queue[Handler_Max + 1]; /**< The handlers queue count er */
Service_T system; /**< The general system servi ce */ Service_T system; /**< The general system servi ce */
char *eventlist_dir; /**< The event queue base directo ry */ char *eventlist_dir; /**< The event queue base directo ry */
/** An object holding Monit HTTP interface setup */ /** An object holding Monit HTTP interface setup */
struct { struct {
 End of changes. 6 change blocks. 
4 lines changed or deleted 11 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)