diff options
| author | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2001-09-01 12:08:48 +0000 |
|---|---|---|
| committer | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2001-09-01 12:08:48 +0000 |
| commit | 408699215525747e2fa40f69b81c2247e65831f1 (patch) | |
| tree | 58010fd3c89807417c77059d09bcbb59d0e47186 | |
| parent | d6695b516efde0ee340fd580902e8511bfaa8d48 (diff) | |
| download | zabbix-408699215525747e2fa40f69b81c2247e65831f1.tar.gz zabbix-408699215525747e2fa40f69b81c2247e65831f1.tar.xz zabbix-408699215525747e2fa40f69b81c2247e65831f1.zip | |
MInor changes.
git-svn-id: svn://svn.zabbix.com/trunk@181 97f52cf1-0a1b-0410-bd0e-c28be96e8082
| -rw-r--r-- | doc/manual.txt | 128 | ||||
| -rw-r--r-- | src/zabbix_agent/sysinfo.c | 6 | ||||
| -rw-r--r-- | src/zabbix_agent/zabbix_agent.c | 2 |
3 files changed, 68 insertions, 68 deletions
diff --git a/doc/manual.txt b/doc/manual.txt index 47c7ffd1..ace43020 100644 --- a/doc/manual.txt +++ b/doc/manual.txt @@ -576,71 +576,71 @@ Similiar expressions could be useful to monitor changes in important files, such 5.3 Supported parameters by platform -PARAMETER | DEBIAN WOODY | Solaris | HP-UX 11.00 | FreeBSD - | (i386) | +PARAMETER | Debian Woody | Debian Potato | HP-UX 11.00 | FreeBSD + | (i386) | (i386) | --------------------------------------------------------------------------------------- -memory[total] | X | -memory[shared] | X | -memory[buffers] | X | -memory[cached] | X | -memory[free] | X | - -diskfree[/] | X | -diskfree[/opt] | X | -diskfree[/tmp] | X | -diskfree[/usr] | X | -diskfree[/home] | X | -diskfree[/var] | X | - -inodefree[/] | X | -inodefree[/opt] | X | -inodefree[/tmp] | X | -inodefree[/usr] | X | -inodefree[/home] | X | -inodefree[/var] | X | - -cksum[/etc/inetd_conf] | X | -cksum[/etc/services] | X | -cksum[/vmlinuz] | X | -cksum[/etc/passwd] | X | -cksum[/usr/sbin/sshd] | X | -cksum[/usr/bin/ssh] | X | - -filesize[/var/log/syslog] | X | - -swap[free] | X | -swap[total] | X | - -swap[in] | X | -swap[out] | X | - -system[interrupts] | X | -system[switches] | X | - -io[disk_io] | X | -io[disk_rio] | X | -io[disk_wio] | X | -io[disk_rblk] | X | -io[disk_wblk] | X | - -system[procload] | X | -system[procload5] | X | -system[procload15] | X | -system[proccount] | X | -system[procrunning] | X | -system[uptime] | X | -system[users] | X | - -ping | X | -tcp_count | X | - -net[listen_21] | X | -net[listen_22] | X | -net[listen_23] | X | -net[listen_25] | X | -net[listen_80] | X | -net[listen_110] | X | -net[listen_143] | X | +memory[total] | X | X | +memory[shared] | X | X | +memory[buffers] | X | X | +memory[cached] | X | X | +memory[free] | X | X | + +diskfree[/] | X | X | +diskfree[/opt] | X | X | +diskfree[/tmp] | X | X | +diskfree[/usr] | X | X | +diskfree[/home] | X | X | +diskfree[/var] | X | X | + +inodefree[/] | X | X | +inodefree[/opt] | X | X | +inodefree[/tmp] | X | X | +inodefree[/usr] | X | X | +inodefree[/home] | X | X | +inodefree[/var] | X | X | + +cksum[/etc/inetd_conf] | X | X | +cksum[/etc/services] | X | X | +cksum[/vmlinuz] | X | X | +cksum[/etc/passwd] | X | X | +cksum[/usr/sbin/sshd] | X | X | +cksum[/usr/bin/ssh] | X | X | + +filesize[/var/log/syslog] | X | X | + +swap[free] | X | X | +swap[total] | X | X | + +swap[in] | X | X | +swap[out] | X | X | + +system[interrupts] | X | X | +system[switches] | X | X | + +io[disk_io] | X | X | +io[disk_rio] | X | X | +io[disk_wio] | X | X | +io[disk_rblk] | X | X | +io[disk_wblk] | X | X | + +system[procload] | X | X | +system[procload5] | X | X | +system[procload15] | X | X | +system[proccount] | X | X | +system[procrunning] | X | X | +system[uptime] | X | X | +system[users] | X | X | + +ping | X | X | +tcp_count | X | X | + +net[listen_21] | X | X | +net[listen_22] | X | X | +net[listen_23] | X | X | +net[listen_25] | X | X | +net[listen_80] | X | X | +net[listen_110] | X | X | +net[listen_143] | X | X | 6. Chapter 6 (Upgrading) diff --git a/src/zabbix_agent/sysinfo.c b/src/zabbix_agent/sysinfo.c index 84c722c4..9edfeb7b 100644 --- a/src/zabbix_agent/sysinfo.c +++ b/src/zabbix_agent/sysinfo.c @@ -498,7 +498,7 @@ float PROCLOAD(void) return dyn.psd_avg_1_min; } #else - return FAIL; + return getPROC("/proc/loadavg",1,1); #endif #endif } @@ -529,7 +529,7 @@ float PROCLOAD5(void) return dyn.psd_avg_5_min; } #else - return FAIL; + return getPROC("/proc/loadavg",1,2); #endif #endif } @@ -560,7 +560,7 @@ float PROCLOAD15(void) return dyn.psd_avg_5_min; } #else - return FAIL; + return getPROC("/proc/loadavg",1,3); #endif #endif } diff --git a/src/zabbix_agent/zabbix_agent.c b/src/zabbix_agent/zabbix_agent.c index acaee6aa..c4e77e3a 100644 --- a/src/zabbix_agent/zabbix_agent.c +++ b/src/zabbix_agent/zabbix_agent.c @@ -1,4 +1,4 @@ -/*#define TEST_PARAMETERS*/ +#define TEST_PARAMETERS #include "config.h" |