diff options
| author | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2005-07-04 06:34:33 +0000 |
|---|---|---|
| committer | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2005-07-04 06:34:33 +0000 |
| commit | 2ea040cd24640d5cdb43b781025f7e7f96c87be4 (patch) | |
| tree | 9c81128d2a502c4dc727ef7865747847a6b0ab4a /src/libs | |
| parent | cdf4f61a5d660da907e18aff9a481eca8dd9e2a1 (diff) | |
- new utility zabbix_get (Alexei)
- added src/zabbix_get/* (Alexei)
- user timeout time is configurable (Alexei)
- added support of locales on user level (Alexei)
- added support of user profiles (Alexei)
- removed include/local_en.inc.php
- added include/locales/.htaccess (Alexei)
- added include/locales/en_en.inc.php (Alexei)
- added include/locales/de_de.inc.php (Alexei)
- added include/locales/en_en.inc.php (Alexei)
- added column users.lang (Alexei)
- added column users.autologout (Alexei)
- added frontends/php/profile.php (Alexei)
git-svn-id: svn://svn.zabbix.com/trunk@1900 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src/libs')
| -rw-r--r-- | src/libs/zbxdbhigh/db.c | 26 | ||||
| -rw-r--r-- | src/libs/zbxsysinfo/cpu.c | 2 |
2 files changed, 11 insertions, 17 deletions
diff --git a/src/libs/zbxdbhigh/db.c b/src/libs/zbxdbhigh/db.c index 86d7d7f7..cc5d951a 100644 --- a/src/libs/zbxdbhigh/db.c +++ b/src/libs/zbxdbhigh/db.c @@ -732,22 +732,6 @@ void DBdelete_history_by_itemid(int itemid) DBexecute(sql); } -void DBdelete_item(int itemid) -{ - char sql[MAX_STRING_LEN]; - - zabbix_log(LOG_LEVEL_DEBUG,"In DBdelete_item(%d)", itemid); - - DBdelete_triggers_by_itemid(itemid); - DBdelete_history_by_itemid(itemid); - DBdelete_trends_by_itemid(itemid); - - snprintf(sql,sizeof(sql)-1,"delete from items where itemid=%d", itemid); - DBexecute(sql); - - zabbix_log(LOG_LEVEL_DEBUG,"End of DBdelete_item(%d)", itemid); -} - void DBdelete_sysmaps_links_by_shostid(int shostid) { char sql[MAX_STRING_LEN]; @@ -777,6 +761,16 @@ void DBdelete_sysmaps_hosts_by_hostid(int hostid) DBexecute(sql); } +int DBdelete_history_pertial(int itemid) +{ + char sql[MAX_STRING_LEN]; + + snprintf(sql,sizeof(sql)-1,"delete from history where itemid=%d limit 500", itemid); + DBexecute(sql); + + return DBaffected_rows(); +} + void DBdelete_host(int hostid) { int i, itemid; diff --git a/src/libs/zbxsysinfo/cpu.c b/src/libs/zbxsysinfo/cpu.c index a1fde2c6..38cd9757 100644 --- a/src/libs/zbxsysinfo/cpu.c +++ b/src/libs/zbxsysinfo/cpu.c @@ -286,7 +286,7 @@ int PROCLOAD(const char *cmd, const char *parameter,double *value) if(getloadavg_kmem(loadavg,3) == FAIL) { - return STSINFO_RET_FAIL; + return SYSINFO_RET_FAIL; } *value=loadavg[0]; |