"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/monit.h" between
monit-5.27.2.tar.gz and monit-5.28.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.27.2):monit.h  (monit-5.28.0)
skipping to change at line 588 skipping to change at line 588
/** For internal use */ /** For internal use */
struct Generic_T *next; struct Generic_T *next;
} *Generic_T; } *Generic_T;
typedef struct Outgoing_T { typedef struct Outgoing_T {
char *ip; /**< Outgoing IP addre ss */ char *ip; /**< Outgoing IP addre ss */
struct sockaddr_storage addr; struct sockaddr_storage addr;
socklen_t addrlen; socklen_t addrlen;
} Outgoing_T; } Outgoing_T;
typedef struct ResponseTime_T {
Operator_Type operator;
double current; /**< Current response time [m
s] */
double limit; /**< Response time limit [m
s] */
} ResponseTime_T;
/** Defines a port object */ /** Defines a port object */
typedef struct Port_T { typedef struct Port_T {
char *hostname; /**< Hostname to che ck */ char *hostname; /**< Hostname to che ck */
union { union {
struct { struct {
char *pathname; /**< Unix socket pathna me */ char *pathname; /**< Unix socket pathna me */
} unix; } unix;
struct { struct {
int port; /**< Port numb er */ int port; /**< Port numb er */
struct { struct {
struct SslOptions_T options; struct SslOptions_T options;
struct { struct {
int validDays; int validDays;
int minimumDays; int minimumDays;
} certificate; } certificate;
} ssl; } ssl;
} net; } net;
} target; } target;
Outgoing_T outgoing; /**< Outgoing addre ss */ Outgoing_T outgoing; /**< Outgoing addre ss */
bool check_invers; /**< Whether to alert on a connection succe ss */
int timeout; /**< The timeout in [ms] to wait for connect or read i /o */ int timeout; /**< The timeout in [ms] to wait for connect or read i /o */
int retry; /**< Number of connection retry before reporting an err or */ int retry; /**< Number of connection retry before reporting an err or */
volatile int socket; /**< Socket used for connecti on */ volatile int socket; /**< Socket used for connecti on */
double response; /**< Socket connection response time [m s] */ struct ResponseTime_T responsetime; /**< Response time lim it */
Socket_Type type; /**< Socket type used for connection (UDP/TC P) */ Socket_Type type; /**< Socket type used for connection (UDP/TC P) */
Socket_Family family; /**< Socket family used for connection (NET/UNI X) */ Socket_Family family; /**< Socket family used for connection (NET/UNI X) */
Connection_State is_available; /**< Server/port availabili ty */ Connection_State is_available; /**< Server/port availabili ty */
EventAction_T action; /**< Description of the action upon event occurren ce */ EventAction_T action; /**< Description of the action upon event occurren ce */
/** Protocol specific parameters */ /** Protocol specific parameters */
union { union {
struct { struct {
char *username; char *username;
char *password; char *password;
char *path; /**< status path */ char *path; /**< status path */
skipping to change at line 698 skipping to change at line 705
/** For internal use */ /** For internal use */
struct Port_T *next; /**< next port in cha in */ struct Port_T *next; /**< next port in cha in */
} *Port_T; } *Port_T;
/** Defines a ICMP/Ping object */ /** Defines a ICMP/Ping object */
typedef struct Icmp_T { typedef struct Icmp_T {
int type; /**< ICMP type us ed */ int type; /**< ICMP type us ed */
int size; /**< ICMP echo requests si ze */ int size; /**< ICMP echo requests si ze */
int count; /**< ICMP echo requests cou nt */ int count; /**< ICMP echo requests cou nt */
int timeout; /**< The timeout in milliseconds to wait for respon se */ int timeout; /**< The timeout in milliseconds to wait for respon se */
bool check_invers; /**< Whether to alert on a connection succe ss */
Connection_State is_available; /**< Flag for the server is availabili ty */ Connection_State is_available; /**< Flag for the server is availabili ty */
Socket_Family family; /**< ICMP family used for connecti on */ Socket_Family family; /**< ICMP family used for connecti on */
double response; /**< ICMP ECHO response time [m s] */ struct ResponseTime_T responsetime; /**< Response time lim it */
Outgoing_T outgoing; /**< Outgoing addre ss */ Outgoing_T outgoing; /**< Outgoing addre ss */
EventAction_T action; /**< Description of the action upon event occurren ce */ EventAction_T action; /**< Description of the action upon event occurren 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_urlescaped; /**< URL escaped name of dependant servi ce */ char *dependant_urlescaped; /**< URL escaped name of dependant servi ce */
skipping to change at line 810 skipping to change at line 818
typedef struct Uptime_T { typedef struct Uptime_T {
Operator_Type operator; /**< Comparison operat or */ Operator_Type operator; /**< Comparison operat or */
unsigned long long uptime; /**< Uptime waterma rk */ unsigned long long uptime; /**< Uptime waterma rk */
EventAction_T action; /**< Description of the action upon event occurren ce */ EventAction_T action; /**< Description of the action upon event occurren ce */
/** For internal use */ /** For internal use */
struct Uptime_T *next; /**< next uptime in cha in */ struct Uptime_T *next; /**< next uptime in cha in */
} *Uptime_T; } *Uptime_T;
typedef struct LinkStatus_T { typedef struct LinkStatus_T {
bool check_invers; /**< Whether to alert on a link up */
EventAction_T action; /**< Description of the action upon event occurren ce */ EventAction_T action; /**< Description of the action upon event occurren ce */
/** For internal use */ /** For internal use */
struct LinkStatus_T *next; /**< next link in chain */ struct LinkStatus_T *next; /**< next link in chain */
} *LinkStatus_T; } *LinkStatus_T;
typedef struct LinkSpeed_T { typedef struct LinkSpeed_T {
int duplex; /**< Last duplex stat us */ int duplex; /**< Last duplex stat us */
long long speed; /**< Last speed [bp s] */ long long speed; /**< Last speed [bp s] */
EventAction_T action; /**< Description of the action upon event occurren ce */ EventAction_T action; /**< Description of the action upon event occurren ce */
skipping to change at line 847 skipping to change at line 856
int rangecount; /**< Time range to watch: cou nt */ int rangecount; /**< Time range to watch: cou nt */
unsigned long long limit; /**< Data waterma rk */ unsigned long long limit; /**< Data waterma rk */
EventAction_T action; /**< Description of the action upon event occurren ce */ EventAction_T action; /**< Description of the action upon event occurren ce */
/** For internal use */ /** For internal use */
struct Bandwidth_T *next; /**< next bandwidth in cha in */ struct Bandwidth_T *next; /**< next bandwidth in cha in */
} *Bandwidth_T; } *Bandwidth_T;
/** Defines checksum object */ /** Defines checksum object */
typedef struct Checksum_T { typedef struct Checksum_T {
bool initialized; /**< true if checksum was initialized */ bool initialized; /**< true if checksum was initializ
bool test_changes; /**< true if we only should test for changes */ ed */
bool test_changes; /**< true if we only should test for chang
es */
Hash_Type type; /**< The type of hash (e.g. md5 or sha 1) */ Hash_Type type; /**< The type of hash (e.g. md5 or sha 1) */
int length; /**< Length of the ha sh */ int length; /**< Length of the ha sh */
MD_T hash; /**< A checksum hash computed for the pa th */ char hash[MD_SIZE + 1]; /**< A checksum hash computed for the pa th */
EventAction_T action; /**< Description of the action upon event occurren ce */ EventAction_T action; /**< Description of the action upon event occurren ce */
} *Checksum_T; } *Checksum_T;
/** Defines permission object */ /** Defines permission object */
typedef struct Perm_T { typedef struct Perm_T {
bool test_changes; /**< true if we only should test for changes */ bool test_changes; /**< true if we only should test for changes */
int perm; /**< Access permissi on */ int perm; /**< Access permissi on */
EventAction_T action; /**< Description of the action upon event occurren ce */ EventAction_T action; /**< Description of the action upon event occurren ce */
} *Perm_T; } *Perm_T;
skipping to change at line 1090 skipping to change at line 1099
//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_urlescaped; /**< Service name URL escap ed */ char *name_urlescaped; /**< Service name URL escap ed */
StringBuffer_T name_htmlescaped; /**< Service name HTML escap ed */ StringBuffer_T name_htmlescaped; /**< Service name HTML escap ed */
State_Type (*check)(struct Service_T *);/**< Service verification functi on */ State_Type (*check)(struct Service_T *);/**< Service verification functi on */
bool onrebootRestored; bool onrebootRestored;
bool visited; /**< Service visited flag, set if dependencies are used */ bool visited; /**< Service visited flag, set if dependencies are used */
bool inverseStatus;
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 */
command_t start; /**< The start command for the servi ce */ command_t start; /**< The start command for the servi ce */
command_t stop; /**< The stop command for the servi ce */ command_t stop; /**< The stop command for the servi ce */
skipping to change at line 1154 skipping to change at line 1164
/** Internal monit events */ /** Internal monit events */
EventAction_T action_MONIT_START; /**< Monit instance start/reload acti on */ EventAction_T action_MONIT_START; /**< Monit instance start/reload acti on */
EventAction_T action_MONIT_STOP; /**< Monit instance stop acti on */ EventAction_T action_MONIT_STOP; /**< Monit instance stop acti on */
EventAction_T action_ACTION; /**< Action requested by CLI or G UI */ EventAction_T action_ACTION; /**< Action requested by CLI or G UI */
/** Runtime parameters */ /** Runtime parameters */
int error; /**< Error flags bitm ap */ int error; /**< Error flags bitm ap */
int error_hint; /**< Failed/Changed hint for error bitm ap */ int error_hint; /**< Failed/Changed hint for error bitm ap */
union Info_T inf; /**< Service check resu lt */ union Info_T inf; /**< Service check resu lt */
struct timeval collected; /**< When were data collect ed */ //FIXME: replace with unsigned long long? (all places where timeval is use d) ... Time_milli()? struct timeval collected; /**< When were data collect ed */ //FIXME: replace with unsigned long long? (all places where timeval is use d) ... Time_milli()?
char *token; /**< Action tok en */
/** Events */ /** Events */
struct myevent { struct myevent {
#define EVENT_VERSION 4 /**< The event structure version */ #define EVENT_VERSION 4 /**< The event structure version */
long id; /**< The event identi fication */ long id; /**< The event identi fication */
struct timeval collected; /**< When the event occurred */ struct timeval collected; /**< When the event occurred */
struct Service_T *source; /**< Even t source */ struct Service_T *source; /**< Even t source */
Monitor_Mode mode; /**< Monitoring mode for the service */ Monitor_Mode mode; /**< Monitoring mode for the service */
Service_Type type; /**< Monitored serv ice type */ Service_Type type; /**< Monitored serv ice type */
State_Type state; /**< Te st state */ State_Type state; /**< Te st state */
 End of changes. 10 change blocks. 
6 lines changed or deleted 19 lines changed or added

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