← Back to branch summary

~ubuntu-dev/ubuntu/lucid/zabbix/lucid-201002110857

« back to all changes in this revision

Viewing changes to src/libs/zbxsysinfo/osf/osf.c

  • Committer: Bazaar Package Importer
  • Author(s): Michael Ablassmeier
  • Date: 2007-07-02 09:06:51 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20070702090651-8l6fl3fjw9rh6l2u
Tags: 1:1.4.1-2
Add patch from SVN in order to fix Incorrect processing of character '%'
in user parameters and remote commands.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/libs/zbxsysinfo/osf/osf.c
17
17
** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
18
18
**/
19
19
 
20
 
#include "config.h"
21
20
#include "common.h"
22
21
#include "sysinfo.h"
23
22
 
25
24
/*      KEY                     FLAG    FUNCTION        ADD_PARAM       TEST_PARAM */
26
25
        {
27
26
 
28
 
/* Outdated */
29
 
/* incorrect OLD naming */
30
 
        {"cpu",                 CF_USEUPARAM,   OLD_CPU,        0,      "idle1"},
31
 
/*
32
 
        {"cpu[idle1]",          0,      0,      0,      0},
33
 
        {"cpu[idle5]",          0,      0,      0,      0},
34
 
        {"cpu[idle15]",         0,      0,      0,      0},
35
 
        {"cpu[nice1]",          0,      0,      0,      0},
36
 
        {"cpu[nice5]",          0,      0,      0,      0},
37
 
        {"cpu[nice15]",         0,      0,      0,      0},
38
 
        {"cpu[system1]",        0,      0,      0,      0},
39
 
        {"cpu[system5]",        0,      0,      0,      0},
40
 
        {"cpu[system15]",       0,      0,      0,      0},
41
 
        {"cpu[user1]",          0,      0,      0,      0},
42
 
        {"cpu[user5]",          0,      0,      0,      0},
43
 
        {"cpu[user15]",         0,      0,      0,      0},
44
 
*/
45
 
        {"io",                  CF_USEUPARAM,   OLD_IO,         0,      "disk_io"},
46
 
/*
47
 
        {"io[disk_io]",         0,      0,      0,      0},
48
 
        {"io[disk_rio]",        0,      0,      0,      0},
49
 
        {"io[disk_wio]",        0,      0,      0,      0},
50
 
        {"io[disk_rblk]",       0,      0,      0,      0},
51
 
        {"io[disk_wblk]",       0,      0,      0,      0},
52
 
*/
53
 
        {"kern",                CF_USEUPARAM,   OLD_KERNEL,     0,      "maxfiles"},
54
 
/*
55
 
        {"kern[maxfiles]",      0,      0,      0,      0},
56
 
        {"kern[maxproc]",       0,      0,      0,      0},
57
 
*/
58
 
        {"memory",              CF_USEUPARAM,   OLD_MEMORY,     0,      "buffers"},
59
 
/*
60
 
        {"memory[buffers]",     0,      0,      0,      0},
61
 
        {"memory[cached]",      0,      0,      0,      0},
62
 
        {"memory[free]",        0,      0,      0,      0},
63
 
        {"memory[shared]",      0,      0,      0,      0},
64
 
        {"memory[total]",       0,      0,      0,      0},
65
 
*/
66
 
        {"system",              CF_USEUPARAM,   OLD_SYSTEM,     0,      "uname"},
67
 
/*
68
 
        {"system[proccount]",   0,      0,      0,      0},
69
 
 
70
 
        {"system[procload]",    0,      0,      0,      0},
71
 
        {"system[procload5]",   0,      0,      0,      0},
72
 
        {"system[procload15]",  0,      0,      0,      0},
73
 
        {"system[hostname]",    0,      0,      0,      0},
74
 
        {"system[uname]",       0,      0,      0,      0},
75
 
        {"system[uptime]",      0,      0,      0,      0},
76
 
        {"system[users]",       0,      0,      0,      0},
77
 
 
78
 
        {"system[procrunning]", 0,      0,      0,      0},
79
 
*/
80
 
        {"sensor",              CF_USEUPARAM,   OLD_SENSOR,     0,      "temp1"},
81
 
/*
82
 
        {"sensor[temp1]",       0,      0,      0,      0},
83
 
        {"sensor[temp2]",       0,      0,      0,      0},
84
 
        {"sensor[temp3]",       0,      0,      0,      0},
85
 
*/      
86
 
        {"swap",                CF_USEUPARAM,   OLD_SWAP,       0,      "total"},
87
 
/*
88
 
        {"swap[free]",          0,      0,      0,      0},
89
 
        {"swap[total]",         0,      0,      0,      0},
90
 
*/
91
 
        {"version",             CF_USEUPARAM,   OLD_VERSION,    0,      "zabbix_agent"},
92
 
/*
93
 
        {"version[zabbix_agent]",       0,      OLD_VERSION,            0,      0},
94
 
*/
95
 
/* correct OLD naming */        
96
 
/*
97
 
        {"cksum",               CF_USEUPARAM,   VFS_FILE_CKSUM,         0,      "/etc/services"},
98
 
*/
99
 
/*
100
 
        {"diskfree",            CF_USEUPARAM,   VFS_FS_FREE,            0,      "/"},
101
 
        {"disktotal",           CF_USEUPARAM,   VFS_FS_TOTAL,           0,      "/"},
102
 
        {"diskused",            CF_USEUPARAM,   VFS_FS_USED,            0,      "/"},
103
 
        {"diskfree_perc",       CF_USEUPARAM,   VFS_FS_PFREE,           0,      "/"},
104
 
        {"diskused_perc",       CF_USEUPARAM,   VFS_FS_PUSED,           0,      "/"},
105
 
*/
106
 
/*
107
 
        {"file",                CF_USEUPARAM,   VFS_FILE_EXISTS,        0,      "/etc/passwd"},
108
 
        {"filesize",            CF_USEUPARAM,   VFS_FILE_SIZE,          0,      "/etc/passwd"},
109
 
*/
110
 
/*
111
 
        {"inodefree",           CF_USEUPARAM,   VFS_FS_INODE_FREE,      0,      "/"},
112
 
        {"inodetotal",          CF_USEUPARAM,   VFS_FS_INODE_TOTAL,     0,      "/"},
113
 
        {"inodefree_perc",      CF_USEUPARAM,   VFS_FS_INODE_PFREE,     0,      "/"},
114
 
*/
115
 
/*
116
 
        {"md5sum",              CF_USEUPARAM,   VFS_FILE_MD5SUM,        0,      "/etc/services"},
117
 
*/
118
 
/*
119
 
        {"netloadin1",          CF_USEUPARAM,   NET_IF_IBYTES1,         0,      "lo"},
120
 
        {"netloadin5",          CF_USEUPARAM,   NET_IF_IBYTES5,         0,      "lo"},
121
 
        {"netloadin15",         CF_USEUPARAM,   NET_IF_IBYTES15,        0,      "lo"},
122
 
        {"netloadout1",         CF_USEUPARAM,   NET_IF_OBYTES1,         0,      "lo"},
123
 
        {"netloadout5",         CF_USEUPARAM,   NET_IF_OBYTES5,         0,      "lo"},
124
 
        {"netloadout15",        CF_USEUPARAM,   NET_IF_OBYTES15,        0,      "lo"},
125
 
*/
126
 
/*
127
 
        {"ping",                0,              AGENT_PING,             0,      0},
128
 
*/      
129
 
/* New naming  */
130
 
/*
131
 
        {"system.cpu.idle1",    0,      SYSTEM_CPU_IDLE1,       0,      0},
132
 
        {"system.cpu.idle5",    0,      SYSTEM_CPU_IDLE5,       0,      0},
133
 
        {"system.cpu.idle15",   0,      SYSTEM_CPU_IDLE15,      0,      0},
134
 
        {"system.cpu.nice1",    0,      SYSTEM_CPU_NICE1,       0,      0},
135
 
        {"system.cpu.nice5",    0,      SYSTEM_CPU_NICE5,       0,      0},
136
 
        {"system.cpu.nice15",   0,      SYSTEM_CPU_NICE15,      0,      0},
137
 
        {"system.cpu.sys1",     0,      SYSTEM_CPU_SYS1,        0,      0},
138
 
        {"system.cpu.sys5",     0,      SYSTEM_CPU_SYS5,        0,      0},
139
 
        {"system.cpu.sys15",    0,      SYSTEM_CPU_SYS15,       0,      0},
140
 
        {"system.cpu.user1",    0,      SYSTEM_CPU_USER1,       0,      0},
141
 
        {"system.cpu.user5",    0,      SYSTEM_CPU_USER5,       0,      0},
142
 
        {"system.cpu.user15",   0,      SYSTEM_CPU_USER15,      0,      0},
143
 
*/
144
 
/*
145
 
        {"vm.memory.total",     0,      VM_MEMORY_TOTAL,        0,      0},
146
 
        {"vm.memory.shared",    0,      VM_MEMORY_SHARED,       0,      0},
147
 
        {"vm.memory.buffers",   0,      VM_MEMORY_BUFFERS,      0,      0},
148
 
        {"vm.memory.cached",    0,      VM_MEMORY_CACHED,       0,      0},
149
 
        {"vm.memory.free",      0,      VM_MEMORY_FREE,         0,      0},
150
 
*/
151
 
/*
152
 
        {"vfs.fs.free",         CF_USEUPARAM,   VFS_FS_FREE,            0,      "/"},
153
 
        {"vfs.fs.total",        CF_USEUPARAM,   VFS_FS_TOTAL,           0,      "/"},
154
 
        {"vfs.fs.used",         CF_USEUPARAM,   VFS_FS_USED,            0,      "/"},
155
 
        {"vfs.fs.pfree",        CF_USEUPARAM,   VFS_FS_PFREE,           0,      "/"},
156
 
        {"vfs.fs.pused",        CF_USEUPARAM,   VFS_FS_PUSED,           0,      "/"},
157
 
*/
158
 
/*
159
 
        {"vfs.fs.inode.free",   CF_USEUPARAM,   VFS_FS_INODE_FREE,      0,      "/"},
160
 
        {"vfs.fs.inode.total",  CF_USEUPARAM,   VFS_FS_INODE_TOTAL,     0,      "/"},
161
 
        {"vfs.fs.inode.pfree",  CF_USEUPARAM,   VFS_FS_INODE_PFREE,     0,      "/"},
162
 
*/
163
 
/*
164
 
        {"net.if.ibytes1",      CF_USEUPARAM,   NET_IF_IBYTES1, 0,      "lo"},
165
 
        {"net.if.ibytes5",      CF_USEUPARAM,   NET_IF_IBYTES5, 0,      "lo"},
166
 
        {"net.if.ibytes15",     CF_USEUPARAM,   NET_IF_IBYTES15,0,      "lo"},
167
 
 
168
 
        {"net.if.obytes1",      CF_USEUPARAM,   NET_IF_OBYTES1, 0,      "lo"},
169
 
        {"net.if.obytes5",      CF_USEUPARAM,   NET_IF_OBYTES5, 0,      "lo"},
170
 
        {"net.if.obytes15",     CF_USEUPARAM,   NET_IF_OBYTES15,0,      "lo"},
171
 
*/
172
 
/*
173
 
        {"disk_read_ops1",      CF_USEUPARAM,   DISKREADOPS1,   0,      "hda"},
174
 
        {"disk_read_ops5",      CF_USEUPARAM,   DISKREADOPS5,   0,      "hda"},
175
 
        {"disk_read_ops15",     CF_USEUPARAM,   DISKREADOPS15,  0,      "hda"},
176
 
 
177
 
        {"disk_read_blks1",     CF_USEUPARAM,   DISKREADBLKS1,  0,      "hda"},
178
 
        {"disk_read_blks5",     CF_USEUPARAM,   DISKREADBLKS5,  0,      "hda"},
179
 
        {"disk_read_blks15",    CF_USEUPARAM,   DISKREADBLKS15, 0,      "hda"},
180
 
 
181
 
        {"disk_write_ops1",     CF_USEUPARAM,   DISKWRITEOPS1,  0,      "hda"},
182
 
        {"disk_write_ops5",     CF_USEUPARAM,   DISKWRITEOPS5,  0,      "hda"},
183
 
        {"disk_write_ops15",    CF_USEUPARAM,   DISKWRITEOPS15, 0,      "hda"},
184
 
 
185
 
        {"disk_write_blks1",    CF_USEUPARAM,   DISKWRITEBLKS1, 0,      "hda"},
186
 
        {"disk_write_blks5",    CF_USEUPARAM,   DISKWRITEBLKS5, 0,      "hda"},
187
 
        {"disk_write_blks15",   CF_USEUPARAM,   DISKWRITEBLKS15,0,      "hda"},
188
 
*/
189
 
/*
190
 
        {"system.cpu.load1",    0,      SYSTEM_CPU_LOAD1,       0,      0},
191
 
        {"system.cpu.load5",    0,      SYSTEM_CPU_LOAD5,       0,      0},
192
 
        {"system.cpu.load15",   0,      SYSTEM_CPU_LOAD15,      0,      0},
193
 
*/
194
 
 
195
 
/****************************************
196
 
        All these perameters require more than 1 second to retrieve.
197
 
 
198
 
        {"swap[in]"             ,EXECUTE, 0, "vmstat -n 1 2|tail -1|cut -b37-40"},
199
 
        {"swap[out]"            ,EXECUTE, 0, "vmstat -n 1 2|tail -1|cut -b41-44"},
200
 
 
201
 
        {"system[interrupts]"   ,EXECUTE, 0, "vmstat -n 1 2|tail -1|cut -b57-61"},
202
 
        {"system[switches]"     ,EXECUTE, 0, "vmstat -n 1 2|tail -1|cut -b62-67"},
203
 
***************************************/
204
 
 
205
 
/*      {"tcp_count"            ,EXECUTE,       0, "netstat -tn|grep EST|wc -l"}, */
206
 
/*
207
 
        {"check_port",          CF_USEUPARAM,   CHECK_PORT,             0,      "80"},
208
 
        {"check_service",       CF_USEUPARAM,   CHECK_SERVICE,          0,      "ssh,127.0.0.1,22"},
209
 
        {"check_service_perf",  CF_USEUPARAM,   CHECK_SERVICE_PERF,     0,      "ssh,127.0.0.1,22"},
210
 
*/
211
 
/*
212
 
        {"dns",                 CF_USEUPARAM,   CHECK_DNS,              0,      "127.0.0.1,localhost"},
213
 
*/
214
 
        {"agent.ping",          0,      AGENT_PING,             0,      0},
215
 
        {"agent.version",       0,      AGENT_VERSION,          0,      0},
216
 
 
217
 
        {"kernel.maxfiles",     0,      KERNEL_MAXFILES,        0,      0},
218
 
        {"kernel.maxproc",      0,      KERNEL_MAXPROC,         0,      0},
219
 
 
220
 
        {"vfs.file.cksum",      CF_USEUPARAM,   VFS_FILE_CKSUM,         0,      "/etc/services"},
221
 
        {"vfs.file.md5sum",     CF_USEUPARAM,   VFS_FILE_MD5SUM,        0,      "/etc/services"},
222
 
 
223
 
/************************************
224
 
 *          NEW FUNCTIONS           *
225
 
 ************************************/
 
27
        {"kernel.maxfiles",     0,              KERNEL_MAXFILES,        0,      0},
 
28
        {"kernel.maxproc",      0,              KERNEL_MAXPROC,         0,      0},
 
29
 
 
30
        {"vfs.fs.size",         CF_USEUPARAM,   VFS_FS_SIZE,            0,      "/,free"},
 
31
        {"vfs.fs.inode",        CF_USEUPARAM,   VFS_FS_INODE,           0,      "/,free"},
 
32
 
 
33
        {"vfs.dev.read",        CF_USEUPARAM,   VFS_DEV_READ,           0,      "hda,ops,avg1"},
 
34
        {"vfs.dev.write",       CF_USEUPARAM,   VFS_DEV_WRITE,          0,      "hda,ops,avg1"},
 
35
 
 
36
        {"net.tcp.listen",      CF_USEUPARAM,   NET_TCP_LISTEN,         0,      "80"},  
 
37
 
 
38
        {"net.if.in",           CF_USEUPARAM,   NET_IF_IN,              0,      "lo,bytes"},
 
39
        {"net.if.out",          CF_USEUPARAM,   NET_IF_OUT,             0,      "lo,bytes"},
 
40
        {"net.if.total",        CF_USEUPARAM,   NET_IF_TOTAL,           0,      "lo,bytes"},
 
41
        {"net.if.collisions",   CF_USEUPARAM,   NET_IF_COLLISIONS,      0,      "lo"},
 
42
 
 
43
        {"vm.memory.size",      CF_USEUPARAM,   VM_MEMORY_SIZE,         0,      "free"},
 
44
 
 
45
        {"proc.num",            CF_USEUPARAM,   PROC_NUM,               0,      "inetd,,"},
 
46
        {"proc.mem",            CF_USEUPARAM,   PROC_MEMORY,            0,      "inetd,,"},
226
47
 
227
48
        {"system.cpu.switches", 0,              SYSTEM_CPU_SWITCHES,    0,      0},
228
49
        {"system.cpu.intr",     0,              SYSTEM_CPU_INTR,        0,      0},
229
 
 
230
 
        {"net.tcp.dns",         CF_USEUPARAM,   CHECK_DNS,              0,      "127.0.0.1,localhost"},
231
 
 
232
 
        {"net.tcp.listen",      CF_USEUPARAM,   NET_TCP_LISTEN, 0,      "80"},  
233
 
 
234
 
        {"net.tcp.port",        CF_USEUPARAM,   CHECK_PORT,             0,      ",80"},
235
 
        {"net.tcp.service",     CF_USEUPARAM,   CHECK_SERVICE,          0,      "ssh,127.0.0.1,22"},
236
 
        {"net.tcp.service.perf",CF_USEUPARAM,   CHECK_SERVICE_PERF,     0,      "ssh,127.0.0.1,22"},
237
 
 
238
 
        {"net.if.in",           CF_USEUPARAM,   NET_IF_IN,      0,      "lo,bytes"},
239
 
        {"net.if.out",          CF_USEUPARAM,   NET_IF_OUT,     0,      "lo,bytes"},
240
 
        {"net.if.total",        CF_USEUPARAM,   NET_IF_TOTAL,   0,      "lo,bytes"},
241
 
        {"net.if.collisions",   CF_USEUPARAM,   NET_IF_COLLISIONS,      0,      "lo"},
242
 
 
243
 
        {"vfs.fs.size",         CF_USEUPARAM,   VFS_FS_SIZE,    0,      "/,free"},
244
 
        {"vfs.fs.inode",        CF_USEUPARAM,   VFS_FS_INODE,   0,      "/,free"},
245
 
 
246
 
        {"vfs.dev.read",        CF_USEUPARAM,   VFS_DEV_READ,   0,      "hda,ops,avg1"},
247
 
        {"vfs.dev.write",       CF_USEUPARAM,   VFS_DEV_WRITE,  0,      "hda,ops,avg1"},
248
 
 
249
 
        {"vm.memory.size",      CF_USEUPARAM,   VM_MEMORY_SIZE, 0,      "free"},
250
 
 
251
 
        {"proc.num",            CF_USEUPARAM,   PROC_NUM,       0,      "inetd,,"},
252
 
        {"proc.mem",            CF_USEUPARAM,   PROC_MEMORY,    0,      "inetd,,"},
253
 
 
254
50
        {"system.cpu.util",     CF_USEUPARAM,   SYSTEM_CPU_UTIL,        0,      "all,user,avg1"},
255
 
 
256
51
        {"system.cpu.load",     CF_USEUPARAM,   SYSTEM_CPU_LOAD,        0,      "all,avg1"},
257
52
 
258
53
        {"system.swap.size",    CF_USEUPARAM,   SYSTEM_SWAP_SIZE,       0,      "all,free"},
259
54
        {"system.swap.in",      CF_USEUPARAM,   SYSTEM_SWAP_IN,         0,      "all"},
260
55
        {"system.swap.out",     CF_USEUPARAM,   SYSTEM_SWAP_OUT,        0,      "all,count"},   
261
56
 
262
 
        {"system.hostname",     0,      SYSTEM_HOSTNAME,        0,      0},
263
 
 
264
 
        {"system.uname",        0,      SYSTEM_UNAME,           0,      0},
265
 
        {"system.uptime",       0,      SYSTEM_UPTIME,          0,      0},
266
 
        {"system.users.num",    0,      SYSTEM_UNUM,            0,      0},
 
57
        {"system.uptime",       0,              SYSTEM_UPTIME,          0,      0},
267
58
 
268
59
        {0}
269
60
        };