Menu
▾
▴
[Nagios-checkins] CVS: nagios/xdata xodtemplate.c,1.51,1.52 xodtemplate.h,1.27,1.28
|
From: Ethan G. <ega...@us...> - 2003-05-19 00:15:22
|
Update of /cvsroot/nagios/nagios/xdata
In directory sc8-pr-cvs1:/tmp/cvs-serv24330/xdata
Modified Files:
xodtemplate.c xodtemplate.h
Log Message:
Added host result freshness checking
Index: xodtemplate.c
===================================================================
RCS file: /cvsroot/nagios/nagios/xdata/xodtemplate.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -r1.51 -r1.52
*** xodtemplate.c 14 May 2003 04:06:34 -0000 1.51
--- xodtemplate.c 19 May 2003 00:15:18 -0000 1.52
***************
*** 4,8 ****
*
* Copyright (c) 2001-2003 Ethan Galstad (na...@na...)
! * Last Modified: 05-13-2003
*
* Description:
--- 4,8 ----
*
* Copyright (c) 2001-2003 Ethan Galstad (na...@na...)
! * Last Modified: 05-18-2003
*
* Description:
***************
*** 1039,1042 ****
--- 1039,1046 ----
new_host->event_handler_enabled=TRUE;
new_host->have_event_handler_enabled=FALSE;
+ new_host->check_freshness=FALSE;
+ new_host->have_check_freshness=FALSE;
+ new_host->freshness_threshold=0;
+ new_host->have_freshness_threshold=0;
new_host->flap_detection_enabled=TRUE;
new_host->have_flap_detection_enabled=FALSE;
***************
*** 2407,2410 ****
--- 2411,2422 ----
temp_host->have_event_handler_enabled=TRUE;
}
+ else if(!strcmp(variable,"check_freshness")){
+ temp_host->check_freshness=(atoi(value)>0)?TRUE:FALSE;
+ temp_host->have_check_freshness=TRUE;
+ }
+ else if(!strcmp(variable,"freshness_threshold")){
+ temp_host->freshness_threshold=atoi(value);
+ temp_host->have_freshness_threshold=TRUE;
+ }
else if(!strcmp(variable,"low_flap_threshold")){
temp_host->low_flap_threshold=strtod(value,NULL);
***************
*** 5444,5447 ****
--- 5456,5467 ----
this_host->have_event_handler_enabled=TRUE;
}
+ if(this_host->have_check_freshness==FALSE && template_host->have_check_freshness==TRUE){
+ this_host->check_freshness=template_host->check_freshness;
+ this_host->have_check_freshness=TRUE;
+ }
+ if(this_host->have_freshness_threshold==FALSE && template_host->have_freshness_threshold==TRUE){
+ this_host->freshness_threshold=template_host->freshness_threshold;
+ this_host->have_freshness_threshold=TRUE;
+ }
if(this_host->have_low_flap_threshold==FALSE && template_host->have_low_flap_threshold==TRUE){
this_host->low_flap_threshold=template_host->low_flap_threshold;
***************
*** 7150,7154 ****
/* add the host definition */
! new_host=add_host(this_host->host_name,this_host->alias,(this_host->address==NULL)?this_host->host_name:this_host->address,this_host->check_period,this_host->check_interval,this_host->max_check_attempts,this_host->notify_on_recovery,this_host->notify_on_down,this_host->notify_on_unreachable,this_host->notify_on_flapping,this_host->notification_interval,this_host->notification_period,this_host->notifications_enabled,this_host->check_command,this_host->active_checks_enabled,this_host->passive_checks_enabled,this_host->event_handler,this_host->event_handler_enabled,this_host->flap_detection_enabled,this_host->low_flap_threshold,this_host->high_flap_threshold,this_host->stalk_on_up,this_host->stalk_on_down,this_host->stalk_on_unreachable,this_host->process_perf_data,this_host->failure_prediction_enabled,this_host->failure_prediction_options,this_host->retain_status_information,this_host->retain_nonstatus_information,this_host->obsess_over_host);
/* return with an error if we couldn't add the host */
--- 7170,7174 ----
/* add the host definition */
! new_host=add_host(this_host->host_name,this_host->alias,(this_host->address==NULL)?this_host->host_name:this_host->address,this_host->check_period,this_host->check_interval,this_host->max_check_attempts,this_host->notify_on_recovery,this_host->notify_on_down,this_host->notify_on_unreachable,this_host->notify_on_flapping,this_host->notification_interval,this_host->notification_period,this_host->notifications_enabled,this_host->check_command,this_host->active_checks_enabled,this_host->passive_checks_enabled,this_host->event_handler,this_host->event_handler_enabled,this_host->flap_detection_enabled,this_host->low_flap_threshold,this_host->high_flap_threshold,this_host->stalk_on_up,this_host->stalk_on_down,this_host->stalk_on_unreachable,this_host->process_perf_data,this_host->failure_prediction_enabled,this_host->failure_prediction_options,this_host->check_freshness,this_host->freshness_threshold,this_host->retain_status_information,this_host->retain_nonstatus_information,this_host->obsess_over_host);
/* return with an error if we couldn't add the host */
***************
*** 7670,7673 ****
--- 7690,7695 ----
fprintf(fp,"high_flap_threshold\t%f\n",temp_host->high_flap_threshold);
fprintf(fp,"flap_detection_enabled\t%d\n",temp_host->flap_detection_enabled);
+ fprintf(fp,"freshness_threshold\t%d\n",temp_host->freshness_threshold);
+ fprintf(fp,"check_freshness\t%d\n",temp_host->check_freshness);
fprintf(fp,"notification_options\t");
x=0;
Index: xodtemplate.h
===================================================================
RCS file: /cvsroot/nagios/nagios/xdata/xodtemplate.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** xodtemplate.h 14 May 2003 03:04:48 -0000 1.27
--- xodtemplate.h 19 May 2003 00:15:19 -0000 1.28
***************
*** 4,8 ****
*
* Copyright (c) 2001-2003 Ethan Galstad (na...@na...)
! * Last Modified: 05-13-2003
*
* License:
--- 4,8 ----
*
* Copyright (c) 2001-2003 Ethan Galstad (na...@na...)
! * Last Modified: 05-18-2003
*
* License:
***************
*** 163,166 ****
--- 163,168 ----
char *event_handler;
int event_handler_enabled;
+ int check_freshness;
+ int freshness_threshold;
float low_flap_threshold;
float high_flap_threshold;
***************
*** 189,192 ****
--- 191,196 ----
int have_obsess_over_host;
int have_event_handler_enabled;
+ int have_check_freshness;
+ int have_freshness_threshold;
int have_low_flap_threshold;
int have_high_flap_threshold;
|