diff options
| author | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-03-14 15:21:27 +0000 |
|---|---|---|
| committer | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-03-14 15:21:27 +0000 |
| commit | 25036c9384fcec4d36f4cfc69fe2b86e4ef2c9c6 (patch) | |
| tree | 01e08dad83c7671bb8a19b9c40f2f786b033d99e /src/zabbix_server/housekeeper | |
| parent | f35b829723124ac2c15defd1d5cce44b40b1c8ec (diff) | |
| download | zabbix-25036c9384fcec4d36f4cfc69fe2b86e4ef2c9c6.tar.gz zabbix-25036c9384fcec4d36f4cfc69fe2b86e4ef2c9c6.tar.xz zabbix-25036c9384fcec4d36f4cfc69fe2b86e4ef2c9c6.zip | |
- added "Data overview" for screens
- added "Triggers overview" for screens (Eugene)
- added blinking into Trigger overview (Eugene)
- added screen displaying in other screen (Eugene)
- improved Overview table header, vertical text added (Eugene)
- developed "ZABBIX Clock" module for screens (Eugene)
- developed "ZABBIX server info" module for screens (Eugene)
- developed "Triggers info" module for screens (Eugene)
- developed "Host info" module for screens (Eugene)
- improved screens displaying, added item alignment (Eugene)
- improved ZABBIX server report (Eugene)
- improved images configuration (Eugene)
- added onserver image resizing for thumbs by php (Eugene)
- developed acknowledges system (Eugene)
- added icons displaying for maps (Eugene)
- added maps displaying for maps (Eugene)
- improved maps (Eugene)
git-svn-id: svn://svn.zabbix.com/trunk@2699 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src/zabbix_server/housekeeper')
| -rw-r--r-- | src/zabbix_server/housekeeper/housekeeper.c | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/src/zabbix_server/housekeeper/housekeeper.c b/src/zabbix_server/housekeeper/housekeeper.c index c6efaeea..8060b520 100644 --- a/src/zabbix_server/housekeeper/housekeeper.c +++ b/src/zabbix_server/housekeeper/housekeeper.c @@ -378,7 +378,7 @@ static int housekeeping_alerts(int now) DB_RESULT *result; int res = SUCCEED; - zabbix_log( LOG_LEVEL_DEBUG, "In housekeeping_alarms(%d)", now); + zabbix_log( LOG_LEVEL_DEBUG, "In housekeeping_alerts(%d)", now); snprintf(sql,sizeof(sql)-1,"select alert_history from config"); result = DBselect(sql); @@ -405,7 +405,8 @@ static int housekeeping_alarms(int now) { char sql[MAX_STRING_LEN]; int alarm_history; - DB_RESULT *result; + DB_RESULT *result, *result2; + int i, alarmid; int res = SUCCEED; zabbix_log( LOG_LEVEL_DEBUG, "In housekeeping_alarms(%d)", now); @@ -421,8 +422,20 @@ static int housekeeping_alarms(int now) { alarm_history=atoi(DBget_field(result,0,0)); - snprintf(sql,sizeof(sql)-1,"delete from alarms where clock<%d",now-24*3600*alarm_history); - DBexecute(sql); + snprintf(sql,sizeof(sql)-1,"select alarmid from alarms where clock<%d", now-24*3600*alarm_history); + result2 = DBselect(sql); + for(i=0;i<DBnum_rows(result2);i++) + { + alarmid=atoi(DBget_field(result2,i,0)); + + snprintf(sql,sizeof(sql)-1,"delete from acknowledges where alarmid=%d",alarmid); + DBexecute(sql); + + snprintf(sql,sizeof(sql)-1,"delete from alarms where alarmid=%d",alarmid); + DBexecute(sql); + } + DBfree_result(result2); + zabbix_log( LOG_LEVEL_DEBUG, "Deleted [%ld] records from table [alarms]", DBaffected_rows()); } |