diff options
| author | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2005-11-07 11:20:23 +0000 |
|---|---|---|
| committer | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2005-11-07 11:20:23 +0000 |
| commit | c24747aacafa259dcfb65c3baeeda0a27311b7fc (patch) | |
| tree | acea6f98ab1b8d9d916aced3588b705b5e180139 /src/libs/zbxsysinfo/linux/linux.c | |
| parent | 2d37b64146ddf9d666ffa88fe0434627f9bd5942 (diff) | |
| download | zabbix-c24747aacafa259dcfb65c3baeeda0a27311b7fc.tar.gz zabbix-c24747aacafa259dcfb65c3baeeda0a27311b7fc.tar.xz zabbix-c24747aacafa259dcfb65c3baeeda0a27311b7fc.zip | |
- added support of vfs.dev.read[*] for Linux (Eugene)
- added support of vfs.dev.write[*] for Linux (Eugene)
git-svn-id: svn://svn.zabbix.com/trunk@2284 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src/libs/zbxsysinfo/linux/linux.c')
| -rw-r--r-- | src/libs/zbxsysinfo/linux/linux.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/libs/zbxsysinfo/linux/linux.c b/src/libs/zbxsysinfo/linux/linux.c index 993d1865..ae3df54f 100644 --- a/src/libs/zbxsysinfo/linux/linux.c +++ b/src/libs/zbxsysinfo/linux/linux.c @@ -170,21 +170,21 @@ ZBX_METRIC parameters_specific[]= {"net.if.obytes15", CF_USEUPARAM, NET_IF_OBYTES15,0, "lo"}, */ /* - {"disk_read_ops1", CF_USEUPARAM, DISKREADOPS1, 0, "hda"}, - {"disk_read_ops5", CF_USEUPARAM, DISKREADOPS5, 0, "hda"}, - {"disk_read_ops15", CF_USEUPARAM, DISKREADOPS15, 0, "hda"}, + {"disk_read_ops1", CF_USEUPARAM, DISKREADOPS1, 0, "sda"}, + {"disk_read_ops5", CF_USEUPARAM, DISKREADOPS5, 0, "sda"}, + {"disk_read_ops15", CF_USEUPARAM, DISKREADOPS15, 0, "sda"}, - {"disk_read_blks1", CF_USEUPARAM, DISKREADBLKS1, 0, "hda"}, - {"disk_read_blks5", CF_USEUPARAM, DISKREADBLKS5, 0, "hda"}, - {"disk_read_blks15", CF_USEUPARAM, DISKREADBLKS15, 0, "hda"}, + {"disk_read_blks1", CF_USEUPARAM, DISKREADBLKS1, 0, "sda"}, + {"disk_read_blks5", CF_USEUPARAM, DISKREADBLKS5, 0, "sda"}, + {"disk_read_blks15", CF_USEUPARAM, DISKREADBLKS15, 0, "sda"}, - {"disk_write_ops1", CF_USEUPARAM, DISKWRITEOPS1, 0, "hda"}, - {"disk_write_ops5", CF_USEUPARAM, DISKWRITEOPS5, 0, "hda"}, - {"disk_write_ops15", CF_USEUPARAM, DISKWRITEOPS15, 0, "hda"}, + {"disk_write_ops1", CF_USEUPARAM, DISKWRITEOPS1, 0, "sda"}, + {"disk_write_ops5", CF_USEUPARAM, DISKWRITEOPS5, 0, "sda"}, + {"disk_write_ops15", CF_USEUPARAM, DISKWRITEOPS15, 0, "sda"}, - {"disk_write_blks1", CF_USEUPARAM, DISKWRITEBLKS1, 0, "hda"}, - {"disk_write_blks5", CF_USEUPARAM, DISKWRITEBLKS5, 0, "hda"}, - {"disk_write_blks15", CF_USEUPARAM, DISKWRITEBLKS15,0, "hda"}, + {"disk_write_blks1", CF_USEUPARAM, DISKWRITEBLKS1, 0, "sda"}, + {"disk_write_blks5", CF_USEUPARAM, DISKWRITEBLKS5, 0, "sda"}, + {"disk_write_blks15", CF_USEUPARAM, DISKWRITEBLKS15,0, "sda"}, */ /* {"system.cpu.load1", 0, SYSTEM_CPU_LOAD1, 0, 0}, @@ -249,8 +249,8 @@ ZBX_METRIC parameters_specific[]= {"vfs.fs.size", CF_USEUPARAM, VFS_FS_SIZE, 0, "/,free"}, {"vfs.fs.inode", CF_USEUPARAM, VFS_FS_INODE, 0, "/,free"}, - {"vfs.dev.read", CF_USEUPARAM, VFS_DEV_READ, 0, "hda,ops,avg1"}, - {"vfs.dev.write", CF_USEUPARAM, VFS_DEV_WRITE, 0, "hda,ops,avg1"}, + {"vfs.dev.read", CF_USEUPARAM, VFS_DEV_READ, 0, "sda,operations"}, + {"vfs.dev.write", CF_USEUPARAM, VFS_DEV_WRITE, 0, "sda,sectors"}, {"vm.memory.size", CF_USEUPARAM, VM_MEMORY_SIZE, 0, "free"}, |