Projet

Général

Profil

Révision 33b2f3ed

ID33b2f3ed8b3b6ab8b10492433e2bf704c95bf435
Parent 8b955667
Enfant 8b1d5376

Ajouté par Lars Kruse il y a plus de 6 ans

Plugin lxc: use comprehensible names for variables

Voir les différences:

plugins/lxc/lxc-multigraph
197 197
graph_category lxc
198 198
EOF
199 199

  
200
   for n in $active_guests
200
   for guest_name in $active_guests
201 201
   do
202
      for i in user system
202
      for cpu_usage in user system
203 203
      do
204 204
         cat <<EOF
205
$(clean_fieldname "cpu_${i}__${n}").label $n: $(echo "${i:0:1}" | tr "[:lower:]" "[:upper:]")${i:1}
206
$(clean_fieldname "cpu_${i}__${n}").type DERIVE
207
$(clean_fieldname "cpu_${i}__${n}").min 0
205
$(clean_fieldname "cpu_${cpu_usage}__${guest_name}").label $guest_name: $(echo "${cpu_usage:0:1}" | tr "[:lower:]" "[:upper:]")${cpu_usage:1}
206
$(clean_fieldname "cpu_${cpu_usage}__${guest_name}").type DERIVE
207
$(clean_fieldname "cpu_${cpu_usage}__${guest_name}").min 0
208 208
EOF
209 209
      done
210 210
   done
......
218 218
graph_category lxc
219 219
EOF
220 220

  
221
   for n in $active_guests
221
   for guest_name in $active_guests
222 222
   do
223 223
      cat <<EOF
224
$(clean_fieldname "cpu_time__${n}").label $n: CPU time
225
$(clean_fieldname "cpu_time__${n}").type DERIVE
226
$(clean_fieldname "cpu_time__${n}").min 0
224
$(clean_fieldname "cpu_time__${guest_name}").label $guest_name: CPU time
225
$(clean_fieldname "cpu_time__${guest_name}").type DERIVE
226
$(clean_fieldname "cpu_time__${guest_name}").min 0
227 227
EOF
228 228
   done
229 229

  
......
234 234
graph_category lxc
235 235
EOF
236 236

  
237
   for n in $active_guests
237
   for guest_name in $active_guests
238 238
   do
239 239
      cat <<EOF
240
$(clean_fieldname "logins__${n}").label $n: logins
241
$(clean_fieldname "logins__${n}").type GAUGE
240
$(clean_fieldname "logins__${guest_name}").label $guest_name: logins
241
$(clean_fieldname "logins__${guest_name}").type GAUGE
242 242
EOF
243 243
   done
244 244

  
......
252 252
graph_info This graph shows the traffic of active LXC containers.
253 253
EOF
254 254

  
255
   for n in $active_guests
255
   for guest_name in $active_guests
256 256
   do
257
      device=$(lxc_netdev "$n")
257
      device=$(lxc_netdev "$guest_name")
258 258
      if [ -z "$device" ]; then
259 259
         continue
260 260
      fi
261 261
      cat <<EOF
262
$(clean_fieldname "net__${n}_down").label $n
263
$(clean_fieldname "net__${n}_down").type DERIVE
264
$(clean_fieldname "net__${n}_down").graph no
265
$(clean_fieldname "net__${n}_down").cdef $(clean_fieldname "net__${n}_down"),8,*
266
$(clean_fieldname "net__${n}_down").min 0
267
$(clean_fieldname "net__${n}_up").label $n
268
$(clean_fieldname "net__${n}_up").type DERIVE
269
$(clean_fieldname "net__${n}_up").negative $(clean_fieldname "net__${n}_down")
270
$(clean_fieldname "net__${n}_up").cdef $(clean_fieldname "net__${n}_up"),8,*
271
$(clean_fieldname "net__${n}_up").min 0
262
$(clean_fieldname "net__${guest_name}_down").label $guest_name
263
$(clean_fieldname "net__${guest_name}_down").type DERIVE
264
$(clean_fieldname "net__${guest_name}_down").graph no
265
$(clean_fieldname "net__${guest_name}_down").cdef $(clean_fieldname "net__${guest_name}_down"),8,*
266
$(clean_fieldname "net__${guest_name}_down").min 0
267
$(clean_fieldname "net__${guest_name}_up").label $guest_name
268
$(clean_fieldname "net__${guest_name}_up").type DERIVE
269
$(clean_fieldname "net__${guest_name}_up").negative $(clean_fieldname "net__${guest_name}_down")
270
$(clean_fieldname "net__${guest_name}_up").cdef $(clean_fieldname "net__${guest_name}_up"),8,*
271
$(clean_fieldname "net__${guest_name}_up").min 0
272 272
EOF
273 273
      if [ -r "/sys/class/net/$device/speed" ]; then
274 274
         megabit_per_second=$(cat "/sys/class/net/$device/speed")
275 275
         bps=$((megabit_per_second * 1000 * 1000))
276 276
         cat <<EOF
277
$(clean_fieldname "net__${n}_down").max $bps
278
$(clean_fieldname "net__${n}_up").max $bps
277
$(clean_fieldname "net__${guest_name}_down").max $bps
278
$(clean_fieldname "net__${guest_name}_up").max $bps
279 279
EOF
280 280
      fi
281 281
   done
......
288 288
graph_vlabel Number of processes
289 289
graph_category lxc
290 290
EOF
291
   for n in $active_guests
291
   for guest_name in $active_guests
292 292
   do
293 293
      cat <<EOF
294
$(clean_fieldname "lxc_proc__${n}").label $n: processes
295
$(clean_fieldname "lxc_proc__${n}").type GAUGE
296
$(clean_fieldname "lxc_proc__${n}").min 0
294
$(clean_fieldname "lxc_proc__${guest_name}").label $guest_name: processes
295
$(clean_fieldname "lxc_proc__${guest_name}").type GAUGE
296
$(clean_fieldname "lxc_proc__${guest_name}").min 0
297 297
EOF
298 298
   done
299 299

  
......
306 306
graph_category lxc
307 307
EOF
308 308

  
309
   for n in $active_guests
309
   for guest_name in $active_guests
310 310
   do
311 311
      if [ "$ram_display_stacked" != "true" ]; then
312 312
         draw_style="LINE1"
......
315 315
      fi
316 316

  
317 317
      cat <<EOF
318
$(clean_fieldname "mem_usage__${n}").label ${n}: Mem usage
319
$(clean_fieldname "mem_usage__${n}").type GAUGE
320
$(clean_fieldname "mem_usage__${n}").draw $draw_style
321
$(clean_fieldname "mem_cache__${n}").label ${n}: Cache
322
$(clean_fieldname "mem_cache__${n}").type GAUGE
323
$(clean_fieldname "mem_active__${n}").label ${n}: Active
324
$(clean_fieldname "mem_active__${n}").type GAUGE
325
$(clean_fieldname "mem_inactive__${n}").label ${n}: Inactive
326
$(clean_fieldname "mem_inactive__${n}").type GAUGE
318
$(clean_fieldname "mem_usage__${guest_name}").label ${guest_name}: Mem usage
319
$(clean_fieldname "mem_usage__${guest_name}").type GAUGE
320
$(clean_fieldname "mem_usage__${guest_name}").draw $draw_style
321
$(clean_fieldname "mem_cache__${guest_name}").label ${guest_name}: Cache
322
$(clean_fieldname "mem_cache__${guest_name}").type GAUGE
323
$(clean_fieldname "mem_active__${guest_name}").label ${guest_name}: Active
324
$(clean_fieldname "mem_active__${guest_name}").type GAUGE
325
$(clean_fieldname "mem_inactive__${guest_name}").label ${guest_name}: Inactive
326
$(clean_fieldname "mem_inactive__${guest_name}").type GAUGE
327 327
EOF
328 328
   done
329 329

  
......
333 333
# --- DATA OUTPUT
334 334

  
335 335
echo "multigraph lxc_cpu"
336
for n in $active_guests
336
for guest_name in $active_guests
337 337
do
338
   for i in user system
338
   for cpu_usage in user system
339 339
   do
340
      echo "$(clean_fieldname "cpu_${i}__${n}").value $(lxc_cgroup -n "$n" cpuacct.stat | grep "$i" | awk '{ print $2; }')"
340
      echo "$(clean_fieldname "cpu_${cpu_usage}__${guest_name}").value $(lxc_cgroup -n "$guest_name" cpuacct.stat | grep "$cpu_usage" | awk '{ print $2; }')"
341 341
   done
342 342
done
343 343

  
344 344
echo "multigraph lxc_cpu_time"
345
for n in $active_guests
345
for guest_name in $active_guests
346 346
do
347
   echo "$(clean_fieldname "cpu_time__${n}").value $(lxc_cgroup -n "$n" cpuacct.usage)"
347
   echo "$(clean_fieldname "cpu_time__${guest_name}").value $(lxc_cgroup -n "$guest_name" cpuacct.usage)"
348 348
done
349 349

  
350 350
echo "multigraph lxc_logins"
351
for n in $active_guests
351
for guest_name in $active_guests
352 352
do
353
   echo "$(clean_fieldname "logins__${n}").value $(lxc-attach -n "$n" users | wc -w)"
353
   echo "$(clean_fieldname "logins__${guest_name}").value $(lxc-attach -n "$guest_name" users | wc -w)"
354 354
done
355 355

  
356 356
echo "multigraph lxc_net"
357
for n in $active_guests
357
for guest_name in $active_guests
358 358
do
359
   device=$(lxc_netdev "$n")
359
   device=$(lxc_netdev "$guest_name")
360 360
   if [ -z "$device" ]; then
361 361
      value_up="U"
362 362
      value_down="U"
......
366 366
   fi
367 367

  
368 368
   cat <<EOF
369
$(clean_fieldname "net__${n}_up").value $value_up
370
$(clean_fieldname "net__${n}_down").value $value_down
369
$(clean_fieldname "net__${guest_name}_up").value $value_up
370
$(clean_fieldname "net__${guest_name}_down").value $value_down
371 371
EOF
372 372
done
373 373

  
374 374
echo "multigraph lxc_proc"
375
for n in $active_guests
375
for guest_name in $active_guests
376 376
do
377
   echo "$(clean_fieldname "lxc_proc__${n}").value $(lxc_count_processes "$n")"
377
   echo "$(clean_fieldname "lxc_proc__${guest_name}").value $(lxc_count_processes "$guest_name")"
378 378
done
379 379

  
380 380
echo "multigraph lxc_ram"
381
for n in $active_guests
381
for guest_name in $active_guests
382 382
do
383 383
   cat <<EOF
384
$(clean_fieldname "mem_usage__${n}").value $(lxc_cgroup -n "$n" memory.usage_in_bytes)
385
$(clean_fieldname "mem_cache__${n}").value $(lxc_cgroup -n "$n" memory.stat | grep total_cache | awk '{print $2;}')
386
$(clean_fieldname "mem_active__${n}").value $(lxc_cgroup -n "$n" memory.stat | grep total_active_anon | awk '{print $2;}')
387
$(clean_fieldname "mem_inactive__${n}").value $(lxc_cgroup -n "$n" memory.stat | grep total_inactive_anon | awk '{print $2;}')
384
$(clean_fieldname "mem_usage__${guest_name}").value $(lxc_cgroup -n "$guest_name" memory.usage_in_bytes)
385
$(clean_fieldname "mem_cache__${guest_name}").value $(lxc_cgroup -n "$guest_name" memory.stat | grep total_cache | awk '{print $2;}')
386
$(clean_fieldname "mem_active__${guest_name}").value $(lxc_cgroup -n "$guest_name" memory.stat | grep total_active_anon | awk '{print $2;}')
387
$(clean_fieldname "mem_inactive__${guest_name}").value $(lxc_cgroup -n "$guest_name" memory.stat | grep total_inactive_anon | awk '{print $2;}')
388 388
EOF
389 389
done

Formats disponibles : Unified diff