Collection: $RelDir

From 6fd90ba440b861f0b222687922df0d2edaedadcb Mon Sep 17 00:00:00 2001 From: niki Date: Sun, 11 Dec 2005 15:16:52 +0000 Subject: [PATCH] Merged trunk... huh... --- AUTHORS | 3 + ChangeLog | 120 ++++ INSTALL | 171 ++--- Makefile.am | 3 + README | 3 + collectd.spec | 135 ++++ configure.in | 95 ++- contrib/museum/collection.cgi | 1211 +++++++++++++++++++++++++++++++++ contrib/users | 34 + debian/changelog | 117 ++++ debian/collectd-users.files | 1 + debian/collectd.examples | 12 + debian/control | 6 + debian/rules | 2 +- src/Makefile.am | 8 + src/collectd.c | 6 +- src/collectd.pod | 19 +- src/common.h | 24 + src/config.h.in | 325 --------- src/cpu.c | 231 +++++++ src/cpu.h | 20 + src/load.c | 124 ++++ src/load.h | 15 + src/plugin.c | 1 - src/users.c | 127 ++++ src/users.h | 54 ++ 26 files changed, 2405 insertions(+), 462 deletions(-) create mode 100644 ChangeLog create mode 100644 collectd.spec create mode 100755 contrib/museum/collection.cgi create mode 100644 contrib/users create mode 100644 debian/changelog create mode 100644 debian/collectd-users.files create mode 100644 debian/collectd.examples delete mode 100644 src/config.h.in create mode 100644 src/cpu.c create mode 100644 src/cpu.h create mode 100644 src/load.c create mode 100644 src/load.h create mode 100644 src/users.c create mode 100644 src/users.h diff --git a/AUTHORS b/AUTHORS index c3637724..cac82454 100644 --- a/AUTHORS +++ b/AUTHORS @@ -22,6 +22,9 @@ serial module by: tape module by: Scott Garrett +users module by: + Sebastian Harl + don't-fork-patch by: Alvaro Barcellos diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 00000000..5b4af8de --- /dev/null +++ b/ChangeLog @@ -0,0 +1,120 @@ +2005-12-07, Version 3.5.0 + * A bug in the `load' module under Solaris has been fixed. + * The `users' module has been contributed by Sebastian Harl. It counts + currently logged in users. + +2005-11-15, Version 3.4.0 (Revision 236) + * A PID-file is written to /var/run upon startup. Thanks to `Tommie' + from gentoo's bugzilla for writing the patch. + * The build dependency for librrd has been removed. Binaries built + without librrd are client-only and will multicast their value as + with the `-c' argument. + * A patch by Peter Holik adds a module for monitoring CPU frequencies. + * The newly introduced `-f' switch prevents daemon initialization + (forking, closing standard filehandles, etc.) Thanks to Alvaro + Barcellos for this patch. + +2005-11-04, Version 3.3.0 (Revision 216) + * New modules have been added: + - `serial', for monitoring traffic on the serial interfaces + - `nfs', for graphing NFS procedure calls + - `tape', traffic from/to tape devices + * The the memory.rrd now accepts more than 4Gig of memory. + +2005-10-26, Version 3.2.0 (Revision 200) + * Support for graphing the processes has been added (thanks to Lyonel + Vincent) + * If reading from hddtemp failes collectd will increase the time + between polls up to one day. + * The init.d files have been improved. + * Problems with the spec file have been fixed. + +2005-10-16, Version 3.1.0 (Revision 194) + * Added the `setsid' syscall to the startup code. + * Support for hddtemp has been added (thanks to Vincent Stehlé) + +2005-09-30, Version 3.0.0 (Revision 184) + * The ability to send/receive data to/from the network (think + multicast) has been added. + * Modules have been split up into shared libraries can be loaded at + runtime. The biggest advantage is that the core program doesn't need + to be linked against an external library. + * A patch by George Kargiotakis has been applied: It fixes the sensors + behaviour then more than one sensor is being queried. + +2005-09-16, Version 2.1.0 (Revision 172) + * A module for swap statistics has been added. + +2005-09-09, Version 2.0.0 (Revision 135) + * Filenames can no longer be configured at program startup. The only + options as of this version are the directory and ping hosts. + * CPU statistics now include Wait-IO. If privided under Linux IRQ and + Soft-IRQ statistics are added to `System'. + * Diskstats now collect read and write bytes, not sectors. + * Ping statistics can now be collected for more than one host. There + is no default any more: If no host is given no host will be pinged. + * A self-written patch for libping has been applied so it builds + cleanly. + +2005-09-01, Version 1.8.1 (Revision 123) + * Much improved configure-script: libraries and features may now be + disabled. + * More detailed warnings/error messages when RRD update failes. + +2005-08-29, Version 1.8.0: + * Support for collecting disk statistics under Solaris. + +2005-08-25, Version 1.7.0: + * Support for libstatgrab[1] for load, memory usage and network + traffic. CPU- and disk-usage are not (yet) supported, since + libstatgrab returns insufficient information. I will contact the + authors. + * Improved the CPU-initialization code for Solaris. Apparently CPUs + aren't neccessarily counted linear which is now handled correctly. + [1]: http://www.i-scream.org/libstatgrab/ + +2005-08-21, Version 1.6.0: + * Basic support for Solaris: System load and cpu-usage can be + collected unter Solaris, too. Other stats will follow later. + * Many fixes in the autoconf-script + * Collection/Museum scripts have been added unter contrib/museum + * collectd may now be started in unprivileged mode, though ping + statistics will not work. + +2005-07-17, Version 1.5.1: + * Diskstats-RRDs now use major/minor for naming. Some systems have + weird strings as disk-names.. + +2005-07-17, Version 1.5: + * A new module, diskstats, has been added. It collects information + about the disks and partitions. + +2005-07-11, Version 1.4.2: + * The meminfo mofule has been changed to work with more platforms + and/or kernel versions. + +2005-07-10, Version 1.4.1: Correct traffic stats + * The traffic rrd-file is now created with DS-type `COUNTER' which I + forgot to correct when I changed that module. + +2005-07-09, Version 1.4: More traffic stats + * Traffic is now collected for all interfaces that can be found + * Temperature-statistics are read from lm-sensors if available + +2005-07-08, Version 1.3: CPU stats + * Collecting CPU statistics now + +2004-07-12, Version 1.2: Using syslog + * collectd is now using the syslog facility to report errors, warnings + and the like.. + * The default directory is now /var/db/collectd + +2004-07-10, Version 1.1: Minor changes + * Nothing really usefull to say ;) + +2004-07-09, Version 1.0: Initial Version + * The following modules are provided: + * Load average + * Ping time + * Traffic + * Memory info diff --git a/INSTALL b/INSTALL index 23e5f25d..da55609a 100644 --- a/INSTALL +++ b/INSTALL @@ -1,43 +1,27 @@ -Installation Instructions -************************* - -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free -Software Foundation, Inc. - -This file is free documentation; the Free Software Foundation gives -unlimited permission to copy, distribute and modify it. - Basic Installation ================== -These are generic installation instructions. + These are generic installation instructions. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses those values to create a `Makefile' in each directory of the package. It may also create one or more `.h' files containing system-dependent definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). - - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. (Caching is -disabled by default to prevent problems with accidental use of stale -cache files.) +you can run in the future to recreate the current configuration, a file +`config.cache' that saves the results of its tests to speed up +reconfiguring, and a file `config.log' containing compiler output +(useful mainly for debugging `configure'). If you need to do unusual things to compile the package, please try to figure out how `configure' could check whether to do them, and mail diffs or instructions to the address given in the `README' so they can -be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you -may remove or edit it. +be considered for the next release. If at some point `config.cache' +contains results you don't want to keep, you may remove or edit it. - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You only need -`configure.ac' if you want to change it or regenerate `configure' using -a newer version of `autoconf'. + The file `configure.in' is used to create `configure' by a program +called `autoconf'. You only need `configure.in' if you want to change +it or regenerate `configure' using a newer version of `autoconf'. The simplest way to compile this package is: @@ -70,22 +54,20 @@ The simplest way to compile this package is: Compilers and Options ===================== -Some systems require unusual options for compilation or linking that the -`configure' script does not know about. Run `./configure --help' for -details on some of the pertinent environment variables. + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. You can give `configure' +initial values for variables by setting them in the environment. Using +a Bourne-compatible shell, you can do that on the command line like +this: + CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: - - ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix - - *Note Defining Variables::, for more details. +Or on systems that have the `env' program, you can do it like this: + env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure Compiling For Multiple Architectures ==================================== -You can compile the package for more than one kind of computer at the + You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their own directory. To do this, you must use a version of `make' that supports the `VPATH' variable, such as GNU `make'. `cd' to the @@ -93,28 +75,27 @@ directory where you want the object files and executables to go and run the `configure' script. `configure' automatically checks for the source code in the directory that `configure' is in and in `..'. - If you have to use a `make' that does not support the `VPATH' -variable, you have to compile the package for one architecture at a -time in the source code directory. After you have installed the -package for one architecture, use `make distclean' before reconfiguring -for another architecture. + If you have to use a `make' that does not supports the `VPATH' +variable, you have to compile the package for one architecture at a time +in the source code directory. After you have installed the package for +one architecture, use `make distclean' before reconfiguring for another +architecture. Installation Names ================== -By default, `make install' installs the package's commands under -`/usr/local/bin', include files under `/usr/local/include', etc. You -can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX'. + By default, `make install' will install the package's files in +`/opt/collectd'. You can specify an installation prefix other than +`/opt/collectd' by giving `configure' the option `--prefix=PATH'. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you -pass the option `--exec-prefix=PREFIX' to `configure', the package uses -PREFIX as the prefix for installing programs and libraries. -Documentation and other data files still use the regular prefix. +give `configure' the option `--exec-prefix=PATH', the package will use +PATH as the prefix for installing programs and libraries. +Documentation and other data files will still use the regular prefix. In addition, if you use an unusual directory layout you can give -options like `--bindir=DIR' to specify different values for particular +options like `--bindir=PATH' to specify different values for particular kinds of files. Run `configure --help' for a list of the directories you can set and what kinds of files go in them. @@ -125,7 +106,7 @@ option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. Optional Features ================= -Some packages pay attention to `--enable-FEATURE' options to + Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. They may also pay attention to `--with-PACKAGE' options, where PACKAGE is something like `gnu-as' or `x' (for the X Window System). The @@ -140,86 +121,48 @@ you can use the `configure' options `--x-includes=DIR' and Specifying the System Type ========================== -There may be some features `configure' cannot figure out automatically, -but needs to determine by the type of machine the package will run on. -Usually, assuming the package is built to be run on the _same_ -architectures, `configure' can figure that out, but if it prints a -message saying it cannot guess the machine type, give it the -`--build=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name which has the form: - + There may be some features `configure' can not figure out +automatically, but needs to determine by the type of host the package +will run on. Usually `configure' can figure that out, but if it prints +a message saying it can not guess the host type, give it the +`--host=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name with three fields: CPU-COMPANY-SYSTEM -where SYSTEM can have one of these forms: - - OS KERNEL-OS - - See the file `config.sub' for the possible values of each field. If +See the file `config.sub' for the possible values of each field. If `config.sub' isn't included in this package, then this package doesn't -need to know the machine type. - - If you are _building_ compiler tools for cross-compiling, you should -use the option `--target=TYPE' to select the type of system they will -produce code for. +need to know the host type. - If you want to _use_ a cross compiler, that generates code for a -platform different from the build platform, you should specify the -"host" platform (i.e., that on which the generated programs will -eventually be run) with `--host=TYPE'. + If you are building compiler tools for cross-compiling, you can also +use the `--target=TYPE' option to select the type of system they will +produce code for and the `--build=TYPE' option to select the type of +system on which you are compiling the package. Sharing Defaults ================ -If you want to set default values for `configure' scripts to share, you -can create a site shell script called `config.site' that gives default -values for variables like `CC', `cache_file', and `prefix'. + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. `configure' looks for `PREFIX/share/config.site' if it exists, then `PREFIX/etc/config.site' if it exists. Or, you can set the `CONFIG_SITE' environment variable to the location of the site script. A warning: not all `configure' scripts look for a site script. -Defining Variables +Operation Controls ================== -Variables not defined in a site shell script can be set in the -environment passed to `configure'. However, some packages may run -configure again during the build, and the customized values of these -variables may be lost. In order to avoid this problem, you should set -them in the `configure' command line, using `VAR=value'. For example: - - ./configure CC=/usr/local2/bin/gcc - -causes the specified `gcc' to be used as the C compiler (unless it is -overridden in the site shell script). Here is a another example: - - /bin/bash ./configure CONFIG_SHELL=/bin/bash + `configure' recognizes the following options to control how it +operates. -Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent -configuration-related scripts to be executed by `/bin/bash'. - -`configure' Invocation -====================== - -`configure' recognizes the following options to control how it operates. +`--cache-file=FILE' + Use and save the results of the tests in FILE instead of + `./config.cache'. Set FILE to `/dev/null' to disable caching, for + debugging `configure'. `--help' -`-h' Print a summary of the options to `configure', and exit. -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' - script, and exit. - -`--cache-file=FILE' - Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to - disable caching. - -`--config-cache' -`-C' - Alias for `--cache-file=config.cache'. - `--quiet' `--silent' `-q' @@ -231,6 +174,8 @@ configuration-related scripts to be executed by `/bin/bash'. Look for the package's source code in directory DIR. Usually `configure' can determine that directory automatically. -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. +`--version' + Print the version of Autoconf used to generate the `configure' + script, and exit. +`configure' also accepts some other, not widely useful, options. diff --git a/Makefile.am b/Makefile.am index 35e96eac..c60110c4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,3 +5,6 @@ EXTRA_DIST = collectd.spec contrib debian dist-hook: find $(distdir) -type d -name '.svn' | xargs rm -rf + +install-exec-hook: + $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run diff --git a/README b/README index af8b92d1..794904d6 100644 --- a/README +++ b/README @@ -56,6 +56,9 @@ Features - Traffic (In/Outbound traffic on the interfaces) + - Users + (Currently logged in users) + * Performance: Running as a daemon collectd doesn't spend much time in startup. Since collectd links against libping, librrd and libsensors it doesn't need to start any other processes. diff --git a/collectd.spec b/collectd.spec new file mode 100644 index 00000000..746f6707 --- /dev/null +++ b/collectd.spec @@ -0,0 +1,135 @@ +Summary: Statistics collection daemon for filling RRD files. +Name: collectd +Version: 3.5.0 +Release: 1 +Source: http://verplant.org/collectd/%{name}-%{version}.tar.gz +License: GPL +Group: System Environment/Daemons +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildPrereq: lm_sensors-devel, rrdtool-devel +Requires: rrdtool +Packager: Florian octo Forster +Vendor: Florian octo Forster + +%description +collectd is a small daemon written in C for performance. It reads various +system statistics and updates RRD files, creating them if neccessary. +Since the daemon doesn't need to startup every time it wants to update the +files it's very fast and easy on the system. Also, the statistics are very +fine grained since the files are updated every 10 seconds. + +%package sensors +Summary: libsensors-module for collectd. +Group: System Environment/Daemons +Requires: collectd = %{version}, lm_sensors +%description sensors +This plugin for collectd provides querying of sensors supported by +lm_sensors. + +%package hddtemp +Summary: hddtemp-module for collectd. +Group: System Environment/Daemons +Requires: collectd = %{version}, hddtemp >= 0.3 +%description hddtemp +This plugin for collectd provides querying the hddtemp-daemon. For more +information see hddtemp's homepage: http://www.guzu.net/linux/hddtemp.php + +%prep +rm -rf $RPM_BUILD_ROOT +%setup + +%build +./configure --prefix=%{_prefix} --sbindir=%{_sbindir} --mandir=%{_mandir} --libdir=%{_libdir} +make + +%install +make install DESTDIR=$RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT/etc/default +cp debian/collectd.default $RPM_BUILD_ROOT/etc/default/collectd +mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d +cp contrib/init.d-rh7 $RPM_BUILD_ROOT/etc/rc.d/init.d/collectd +mkdir -p $RPM_BUILD_ROOT/var/lib/collectd +rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.a +rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%doc AUTHORS COPYING ChangeLog INSTALL NEWS README +%doc contrib +%config /etc/default/collectd +%attr(0755,root,root) /etc/rc.d/init.d/collectd +%attr(0755,root,root) %{_sbindir}/collectd +%attr(0444,root,root) %{_mandir}/man1/* +%attr(0444,root,root) %{_libdir}/%{name}/cpu.so* +%attr(0444,root,root) %{_libdir}/%{name}/cpufreq.so* +%attr(0444,root,root) %{_libdir}/%{name}/disk.so* +%attr(0444,root,root) %{_libdir}/%{name}/load.so* +%attr(0444,root,root) %{_libdir}/%{name}/memory.so* +%attr(0444,root,root) %{_libdir}/%{name}/nfs.so* +%attr(0444,root,root) %{_libdir}/%{name}/ping.so* +%attr(0444,root,root) %{_libdir}/%{name}/processes.so* +%attr(0444,root,root) %{_libdir}/%{name}/serial.so* +%attr(0444,root,root) %{_libdir}/%{name}/swap.so* +%attr(0444,root,root) %{_libdir}/%{name}/traffic.so* +%attr(0444,root,root) %{_libdir}/%{name}/users.so* +%dir /var/lib/collectd + +%files sensors +%attr(0444,root,root) %{_libdir}/%{name}/sensors.so* + +%files hddtemp +%attr(0444,root,root) %{_libdir}/%{name}/hddtemp.so* + +%changelog +* Wed Dec 07 2005 Florian octo Forster 3.5.0-1 +- New upstream version + +* Sat Nov 26 2005 Florian octo Forster 3.4.0-1 +- New upstream version + +* Sat Nov 05 2005 Florian octo Forster 3.3.0-1 +- New upstream version + +* Tue Oct 26 2005 Florian octo Forster 3.2.0-1 +- New upstream version +- Added statement to remove the `*.la' files. This fixes a problem when + `Unpackaged files terminate build' is in effect. +- Added `processes.so*' to the main package + +* Fri Oct 14 2005 Florian octo Forster 3.1.0-1 +- New upstream version +- Added package `collectd-hddtemp' + +* Fri Sep 30 2005 Florian octo Forster 3.0.0-1 +- New upstream version +- Split the package into `collectd' and `collectd-sensors' + +* Fri Sep 16 2005 Florian octo Forster 2.1.0-1 +- New upstream version + +* Mon Sep 10 2005 Florian octo Forster 2.0.0-1 +- New upstream version + +* Mon Aug 29 2005 Florian octo Forster 1.8.0-1 +- New upstream version + +* Sun Aug 25 2005 Florian octo Forster 1.7.0-1 +- New upstream version + +* Sun Aug 21 2005 Florian octo Forster 1.6.0-1 +- New upstream version + +* Sun Jul 17 2005 Florian octo Forster 1.5.1-1 +- New upstream version + +* Sun Jul 17 2005 Florian octo Forster 1.5-1 +- New upstream version + +* Mon Jul 11 2005 Florian octo Forster 1.4.2-1 +- New upstream version + +* Sat Jul 09 2005 Florian octo Forster 1.4-1 +- Built on RedHat 7.3 diff --git a/configure.in b/configure.in index 7556ac3c..33d0383c 100644 --- a/configure.in +++ b/configure.in @@ -1,12 +1,15 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(src/collectd.c) -AM_INIT_AUTOMAKE(collectd, 3.4.0-quota) -AM_CONFIG_HEADER(src/config.h src/libping/config.h) +AC_INIT(collectd, 3.5.alpha1-quota) +AC_CONFIG_SRCDIR(src/collectd.c) +AC_CONFIG_HEADERS(src/config.h src/libping/config.h) +AM_INIT_AUTOMAKE(dist-bzip2) AC_LANG(C) AC_PREFIX_DEFAULT("/opt/collectd") -dnl Checks for programs. +# +# Checks for programs. +# AC_PROG_CC AC_PROG_CPP AC_PROG_INSTALL @@ -14,63 +17,100 @@ AC_PROG_LN_S AC_PROG_MAKE_SET dnl configure libtool -#AC_PROG_RANLIB AC_DISABLE_STATIC AC_LIBLTDL_CONVENIENCE AC_SUBST(LTDLINCL) AC_SUBST(LIBLTDL) AC_LIBTOOL_DLOPEN AC_PROG_LIBTOOL +#AC_PROG_RANLIB AC_CONFIG_SUBDIRS(libltdl) -dnl Checks for header files. +# +# Checks for header files. +# AC_HEADER_SYS_WAIT -AC_CHECK_HEADERS(stdarg.h) AC_CHECK_HEADERS(fcntl.h) AC_CHECK_HEADERS(signal.h) -AC_CHECK_HEADERS(limits.h) AC_CHECK_HEADERS(sys/socket.h) AC_CHECK_HEADERS(sys/select.h) -AC_HEADER_TIME +AC_CHECK_HEADERS(netdb.h) AC_CHECK_HEADERS(sys/resource.h) AC_CHECK_HEADERS(errno.h) +AC_CHECK_HEADERS(syslog.h) + +# For cpu modules +AC_CHECK_HEADERS(sys/sysctl.h sys/dkstat.h) + +# For load module +AC_CHECK_HEADERS(sys/loadavg.h) + +# For ping module AC_CHECK_HEADERS(arpa/inet.h) AC_CHECK_HEADERS(netinet/in.h) -AC_CHECK_HEADERS(netdb.h) -AC_CHECK_HEADERS(syslog.h) + +# For users module +AC_CHECK_HEADERS(utmp.h) +AC_CHECK_HEADERS(utmpx.h) + +# For quota module AC_CHECK_HEADERS(grp.h pwd.h) AC_CHECK_HEADERS(ctype.h) +AC_CHECK_HEADERS(limits.h) +AC_CHECK_HEADERS(sys/quota.h) +AC_CHECK_HEADERS(xfs/xqm.h) + +# For mount interface AC_CHECK_HEADERS(paths.h) AC_CHECK_HEADERS(mntent.h) AC_CHECK_HEADERS(sys/fs_types.h) AC_CHECK_HEADERS(sys/mntent.h) AC_CHECK_HEADERS(sys/mnttab.h) AC_CHECK_HEADERS(sys/mount.h) -AC_CHECK_HEADERS(sys/quota.h) AC_CHECK_HEADERS(sys/vfs.h) AC_CHECK_HEADERS(sys/vfstab.h) -AC_CHECK_HEADERS(xfs/xqm.h) + +# For debugging interface (variable number of arguments) +AC_CHECK_HEADERS(stdarg.h) dnl Checking for libraries AC_CHECK_LIB(m, ext) -dnl Checks for typedefs, structures, and compiler characteristics. +# +# Checks for typedefs, structures, and compiler characteristics. +# AC_C_CONST AC_TYPE_PID_T AC_TYPE_SIZE_T +AC_HEADER_TIME -dnl Checks for library functions. +# +# Checks for library functions. +# AC_PROG_GCC_TRADITIONAL AC_CHECK_FUNCS(gettimeofday select strdup strtol) AC_CHECK_FUNCS(socket, , AC_CHECK_LIB(socket, socket)) AC_CHECK_FUNCS(gethostbyname, , AC_CHECK_LIB(nsl, gethostbyname)) AC_CHECK_FUNCS(strchr memcpy strstr strcmp strncmp strncpy strlen) AC_CHECK_FUNCS(strncasecmp strcasecmp) + +# For cpu module +AC_CHECK_FUNCS(sysctlbyname, [have_sysctlbyname="yes"], [have_sysctlbyname="no"]) + +# For load module +AC_CHECK_FUNCS(getloadavg, [have_getloadavg="yes"], [have_getloadavg="no"]) + +# For users module +have_getutent="no" +AC_CHECK_FUNCS(getutent getutxent, [have_getutent="yes"]) + +# For quota module AC_CHECK_FUNCS(quotactl) AC_CHECK_FUNCS(getgrgid getpwuid) + +# For mount interface AC_CHECK_FUNCS(getfsent getvfsent listmntent) AC_FUNC_GETMNTENT - if test "x$ac_cv_func_getmntent" = 'xyes'; then saveCFLAGS="$CFLAGS" CFLAGS="-Wall -Werror $CFLAGS" @@ -217,6 +257,8 @@ AC_ARG_WITH(libstatgrab, AC_HELP_STRING([--with-libstatgrab@<:@=PFX@:>@], [Path ]) if test "x$with_libstatgrab" = "xyes" then + AC_CHECK_LIB(devstat, getdevs) + AC_CHECK_LIB(kvm, kvm_getargv) AC_CHECK_LIB(statgrab, sg_init,, [with_libstatgrab="no (not found)"]) AC_CHECK_HEADERS(statgrab.h,, [with_libstatgrab="no (not found)"]) fi @@ -307,7 +349,7 @@ AM_CONDITIONAL(BUILD_DAEMON, test "x$enable_daemon" = "xyes") AC_ARG_ENABLE(cpu, AC_HELP_STRING([--disable-cpu], [Disable CPU usage statistics]),, [enable_cpu="yes"]) if test "x$enable_cpu" != "xno" then - if test "x$ac_system" = "xLinux" -o "x$with_kstat" = "xyes" -o "x$with_libstatgrab" = "xyes" + if test "x$ac_system" = "xLinux" -o "x$with_kstat" = "xyes" -o "x$have_sysctlbyname" = "xyes" then enable_cpu="yes" else @@ -382,7 +424,7 @@ AM_CONDITIONAL(BUILD_MODULE_HDDTEMP, test "x$enable_hddtemp" = "xyes") AC_ARG_ENABLE(load, AC_HELP_STRING([--disable-load], [Disable system load statistics]),, [enable_load="yes"]) if test "x$enable_load" != "xno" then - if test "x$ac_system" = "xLinux" -o "x$with_kstat" = "xyes" -o "x$with_libstatgrab" = "xyes" + if test "x$have_getloadavg" = "xyes" -o "x$ac_system" = "xLinux" -o "x$with_libstatgrab" = "xyes" then enable_load="yes" else @@ -534,6 +576,22 @@ then fi AM_CONDITIONAL(BUILD_MODULE_TRAFFIC, test "x$enable_traffic" = "xyes") +AC_ARG_ENABLE(users, AC_HELP_STRING([--disable-users], [Disable user count statistics]),, [enable_users="yes"]) +if test "x$enable_users" != "xno" +then + if test "x$have_getutent" = "xyes" + then + enable_users="yes" + else + enable_users="no" + fi +fi +if test "x$enable_users" = "xno" +then + AC_DEFINE(COLLECT_USERS, 0, [Wether or not to collect user count statistics]) +fi +AM_CONDITIONAL(BUILD_MODULE_USERS, test "x$enable_users" = "xyes") + AC_OUTPUT(Makefile src/libping/Makefile src/Makefile) cat <{'Colors'}{"Half$_"} = color_calculate_transparent ($Config->{'Colors'}{'Alpha'}, + $Config->{'Colors'}{'Canvas'}, $Config->{'Colors'}{"Full$_"}); +} + +$Config->{'Colors'}{'HalfBlueGreen'} = color_calculate_transparent ($Config->{'Colors'}{'Alpha'}, + $Config->{'Colors'}{'Canvas'}, $Config->{'Colors'}{'FullGreen'}, $Config->{'Colors'}{'FullBlue'}); +$Config->{'Colors'}{'HalfRedBlue'} = color_calculate_transparent ($Config->{'Colors'}{'Alpha'}, + $Config->{'Colors'}{'Canvas'}, $Config->{'Colors'}{'FullBlue'}, $Config->{'Colors'}{'FullRed'}); + +our $GraphDefs; +{ + my $Alpha = $Config->{'Colors'}{'Alpha'}; + my $Canvas = $Config->{'Colors'}{'Canvas'}; + + my $FullRed = $Config->{'Colors'}{'FullRed'}; + my $FullGreen = $Config->{'Colors'}{'FullGreen'}; + my $FullBlue = $Config->{'Colors'}{'FullBlue'}; + my $FullYellow = $Config->{'Colors'}{'FullYellow'}; + my $FullCyan = $Config->{'Colors'}{'FullCyan'}; + my $FullMagenta= $Config->{'Colors'}{'FullMagenta'}; + + my $HalfRed = $Config->{'Colors'}{'HalfRed'}; + my $HalfGreen = $Config->{'Colors'}{'HalfGreen'}; + my $HalfBlue = $Config->{'Colors'}{'HalfBlue'}; + my $HalfYellow = $Config->{'Colors'}{'HalfYellow'}; + my $HalfCyan = $Config->{'Colors'}{'HalfCyan'}; + my $HalfMagenta= $Config->{'Colors'}{'HalfMagenta'}; + + my $HalfBlueGreen = $Config->{'Colors'}{'HalfBlueGreen'}; + my $HalfRedBlue = $Config->{'Colors'}{'HalfRedBlue'}; + + $GraphDefs = + { + cpu => ['DEF:user_avg={file}:user:AVERAGE', + 'DEF:user_min={file}:user:MIN', + 'DEF:user_max={file}:user:MAX', + 'DEF:nice_avg={file}:nice:AVERAGE', + 'DEF:nice_min={file}:nice:MIN', + 'DEF:nice_max={file}:nice:MAX', + 'DEF:syst_avg={file}:syst:AVERAGE', + 'DEF:syst_min={file}:syst:MIN', + 'DEF:syst_max={file}:syst:MAX', + 'DEF:wait_avg={file}:wait:AVERAGE', + 'DEF:wait_min={file}:wait:MIN', + 'DEF:wait_max={file}:wait:MAX', + 'CDEF:user_avg_notnull=user_avg,UN,0,user_avg,IF', + 'CDEF:nice_avg_notnull=nice_avg,UN,0,nice_avg,IF', + 'CDEF:syst_avg_notnull=syst_avg,UN,0,syst_avg,IF', + 'CDEF:wait_avg_notnull=wait_avg,UN,0,wait_avg,IF', + 'CDEF:nice_acc=syst_avg,wait_avg_notnull,user_avg,nice_avg_notnull,+,+,+', + 'CDEF:user_acc=syst_avg,wait_avg_notnull,user_avg,+,+', + 'CDEF:wait_acc=syst_avg,wait_avg_notnull,+', + 'CDEF:syst_acc=syst_avg', + "AREA:nice_acc#$HalfGreen", + "AREA:user_acc#$HalfBlue", + "AREA:wait_acc#$HalfYellow", + "AREA:syst_acc#$HalfRed", + "LINE1:nice_acc#$FullGreen:Nice ", + 'GPRINT:nice_min:MIN:%5.1lf%% Min,', + 'GPRINT:nice_avg:AVERAGE:%5.1lf%% Avg,', + 'GPRINT:nice_max:MAX:%5.1lf%% Max,', + 'GPRINT:nice_avg:LAST:%5.1lf%% Last\l', + "LINE1:user_acc#$FullBlue:User ", + 'GPRINT:user_min:MIN:%5.1lf%% Min,', + 'GPRINT:user_avg:AVERAGE:%5.1lf%% Avg,', + 'GPRINT:user_max:MAX:%5.1lf%% Max,', + 'GPRINT:user_avg:LAST:%5.1lf%% Last\l', + "LINE1:wait_acc#$FullYellow:Wait-IO", + 'GPRINT:wait_min:MIN:%5.1lf%% Min,', + 'GPRINT:wait_avg:AVERAGE:%5.1lf%% Avg,', + 'GPRINT:wait_max:MAX:%5.1lf%% Max,', + 'GPRINT:wait_avg:LAST:%5.1lf%% Last\l', + "LINE1:syst_acc#$FullRed:System ", + 'GPRINT:syst_min:MIN:%5.1lf%% Min,', + 'GPRINT:syst_avg:AVERAGE:%5.1lf%% Avg,', + 'GPRINT:syst_max:MAX:%5.1lf%% Max,', + 'GPRINT:syst_avg:LAST:%5.1lf%% Last\l' + ], + disk => [ + 'DEF:rtime_avg={file}:rtime:AVERAGE', + 'DEF:rtime_min={file}:rtime:MIN', + 'DEF:rtime_max={file}:rtime:MAX', + 'DEF:wtime_avg={file}:wtime:AVERAGE', + 'DEF:wtime_min={file}:wtime:MIN', + 'DEF:wtime_max={file}:wtime:MAX', + 'CDEF:rtime_avg_ms=rtime_avg,1000,/', + 'CDEF:rtime_min_ms=rtime_min,1000,/', + 'CDEF:rtime_max_ms=rtime_max,1000,/', + 'CDEF:wtime_avg_ms=wtime_avg,1000,/', + 'CDEF:wtime_min_ms=wtime_min,1000,/', + 'CDEF:wtime_max_ms=wtime_max,1000,/', + 'CDEF:total_avg_ms=rtime_avg_ms,wtime_avg_ms,+', + 'CDEF:total_min_ms=rtime_min_ms,wtime_min_ms,+', + 'CDEF:total_max_ms=rtime_max_ms,wtime_max_ms,+', + "AREA:total_max_ms#$HalfRed", + "AREA:total_min_ms#$Canvas", + "LINE1:wtime_avg_ms#$FullGreen:Write", + 'GPRINT:wtime_min_ms:MIN:%5.1lf%s Min,', + 'GPRINT:wtime_avg_ms:AVERAGE:%5.1lf%s Avg,', + 'GPRINT:wtime_max_ms:MAX:%5.1lf%s Max,', + 'GPRINT:wtime_avg_ms:LAST:%5.1lf%s Last\n', + "LINE1:rtime_avg_ms#$FullBlue:Read ", + 'GPRINT:rtime_min_ms:MIN:%5.1lf%s Min,', + 'GPRINT:rtime_avg_ms:AVERAGE:%5.1lf%s Avg,', + 'GPRINT:rtime_max_ms:MAX:%5.1lf%s Max,', + 'GPRINT:rtime_avg_ms:LAST:%5.1lf%s Last\n', + "LINE1:total_avg_ms#$FullRed:Total", + 'GPRINT:total_min_ms:MIN:%5.1lf%s Min,', + 'GPRINT:total_avg_ms:AVERAGE:%5.1lf%s Avg,', + 'GPRINT:total_max_ms:MAX:%5.1lf%s Max,', + 'GPRINT:total_avg_ms:LAST:%5.1lf%s Last' + ], + hddtemp => [ + 'DEF:temp_avg={file}:value:AVERAGE', + 'DEF:temp_min={file}:value:MIN', + 'DEF:temp_max={file}:value:MAX', + "AREA:temp_max#$HalfBlue", + "AREA:temp_min#$Canvas", + "LINE1:temp_avg#$FullBlue:Temperature", + 'GPRINT:temp_min:MIN:%4.1lf Min,', + 'GPRINT:temp_avg:AVERAGE:%4.1lf Avg,', + 'GPRINT:temp_max:MAX:%4.1lf Max,', + 'GPRINT:temp_avg:LAST:%4.1lf Last\l' + ], + load => ['DEF:s_avg={file}:shortterm:AVERAGE', + 'DEF:s_min={file}:shortterm:MIN', + 'DEF:s_max={file}:shortterm:MAX', + 'DEF:m_avg={file}:midterm:AVERAGE', + 'DEF:m_min={file}:midterm:MIN', + 'DEF:m_max={file}:midterm:MAX', + 'DEF:l_avg={file}:longterm:AVERAGE', + 'DEF:l_min={file}:longterm:MIN', + 'DEF:l_max={file}:longterm:MAX', + "AREA:s_max#$HalfGreen", + "AREA:s_min#$Canvas", + "LINE1:s_avg#$FullGreen: 1m average", + 'GPRINT:s_min:MIN:%4.2lf Min,', + 'GPRINT:s_avg:AVERAGE:%4.2lf Avg,', + 'GPRINT:s_max:MAX:%4.2lf Max,', + 'GPRINT:s_avg:LAST:%4.2lf Last\n', + "LINE1:m_avg#$FullBlue: 5m average", + 'GPRINT:m_min:MIN:%4.2lf Min,', + 'GPRINT:m_avg:AVERAGE:%4.2lf Avg,', + 'GPRINT:m_max:MAX:%4.2lf Max,', + 'GPRINT:m_avg:LAST:%4.2lf Last\n', + "LINE1:l_avg#$FullRed:15m average", + 'GPRINT:l_min:MIN:%4.2lf Min,', + 'GPRINT:l_avg:AVERAGE:%4.2lf Avg,', + 'GPRINT:l_max:MAX:%4.2lf Max,', + 'GPRINT:l_avg:LAST:%4.2lf Last' + ], + mails => ['DEF:rawgood={file}:good:AVERAGE', + 'DEF:rawspam={file}:spam:AVERAGE', + 'CDEF:good=rawgood,UN,0,rawgood,IF', + 'CDEF:spam=rawspam,UN,0,rawspam,IF', + 'CDEF:negspam=spam,-1,*', + "AREA:good#$HalfGreen", + "LINE1:good#$FullGreen:Good mails", + 'GPRINT:good:AVERAGE:%4.1lf Avg,', + 'GPRINT:good:MAX:%4.1lf Max,', + 'GPRINT:good:LAST:%4.1lf Last\n', + "AREA:negspam#$HalfRed", + "LINE1:negspam#$FullRed:Spam mails", + 'GPRINT:spam:AVERAGE:%4.1lf Avg,', + 'GPRINT:spam:MAX:%4.1lf Max,', + 'GPRINT:spam:LAST:%4.1lf Last', + 'HRULE:0#000000'], + memory => [ + 'DEF:used_avg={file}:used:AVERAGE', + 'DEF:free_avg={file}:free:AVERAGE', + 'DEF:buffers_avg={file}:buffers:AVERAGE', + 'DEF:cached_avg={file}:cached:AVERAGE', + 'DEF:used_min={file}:used:MIN', + 'DEF:free_min={file}:free:MIN', + 'DEF:buffers_min={file}:buffers:MIN', + 'DEF:cached_min={file}:cached:MIN', + 'DEF:used_max={file}:used:MAX', + 'DEF:free_max={file}:free:MAX', + 'DEF:buffers_max={file}:buffers:MAX', + 'DEF:cached_max={file}:cached:MAX', + 'CDEF:free_cached_buffers_used=free_avg,cached_avg,+,buffers_avg,+,used_avg,+', + 'CDEF:cached_buffers_used=cached_avg,buffers_avg,+,used_avg,+', + 'CDEF:buffers_used=buffers_avg,used_avg,+', + "AREA:free_cached_buffers_used#$HalfGreen", + "AREA:cached_buffers_used#$HalfBlue", + "AREA:buffers_used#$HalfYellow", + "AREA:used_avg#$HalfRed", + "LINE1:free_cached_buffers_used#$FullGreen:Free ", + 'GPRINT:free_min:MIN:%5.1lf%s Min,', + 'GPRINT:free_avg:AVERAGE:%5.1lf%s Avg,', + 'GPRINT:free_max:MAX:%5.1lf%s Max,', + 'GPRINT:free_avg:LAST:%5.1lf%s Last\n', + "LINE1:cached_buffers_used#$FullBlue:Page cache ", + 'GPRINT:cached_min:MIN:%5.1lf%s Min,', + 'GPRINT:cached_avg:AVERAGE:%5.1lf%s Avg,', + 'GPRINT:cached_max:MAX:%5.1lf%s Max,', + 'GPRINT:cached_avg:LAST:%5.1lf%s Last\n', + "LINE1:buffers_used#$FullYellow:Buffer cache", + 'GPRINT:buffers_min:MIN:%5.1lf%s Min,', + 'GPRINT:buffers_avg:AVERAGE:%5.1lf%s Avg,', + 'GPRINT:buffers_max:MAX:%5.1lf%s Max,', + 'GPRINT:buffers_avg:LAST:%5.1lf%s Last\n', + "LINE1:used_avg#$FullRed:Used ", + 'GPRINT:used_min:MIN:%5.1lf%s Min,', + 'GPRINT:used_avg:AVERAGE:%5.1lf%s Avg,', + 'GPRINT:used_max:MAX:%5.1lf%s Max,', + 'GPRINT:used_avg:LAST:%5.1lf%s Last' + ], + nfs3_procedures => [ + "DEF:null_avg={file}:null:AVERAGE", + "DEF:getattr_avg={file}:getattr:AVERAGE", + "DEF:setattr_avg={file}:setattr:AVERAGE", + "DEF:lookup_avg={file}:lookup:AVERAGE", + "DEF:access_avg={file}:access:AVERAGE", + "DEF:readlink_avg={file}:readlink:AVERAGE", + "DEF:read_avg={file}:read:AVERAGE", + "DEF:write_avg={file}:write:AVERAGE", + "DEF:create_avg={file}:create:AVERAGE", + "DEF:mkdir_avg={file}:mkdir:AVERAGE", + "DEF:symlink_avg={file}:symlink:AVERAGE", + "DEF:mknod_avg={file}:mknod:AVERAGE", + "DEF:remove_avg={file}:remove:AVERAGE", + "DEF:rmdir_avg={file}:rmdir:AVERAGE", + "DEF:rename_avg={file}:rename:AVERAGE", + "DEF:link_avg={file}:link:AVERAGE", + "DEF:readdir_avg={file}:readdir:AVERAGE", + "DEF:readdirplus_avg={file}:readdirplus:AVERAGE", + "DEF:fsstat_avg={file}:fsstat:AVERAGE", + "DEF:fsinfo_avg={file}:fsinfo:AVERAGE", + "DEF:pathconf_avg={file}:pathconf:AVERAGE", + "DEF:commit_avg={file}:commit:AVERAGE", + "DEF:null_max={file}:null:MAX", + "DEF:getattr_max={file}:getattr:MAX", + "DEF:setattr_max={file}:setattr:MAX", + "DEF:lookup_max={file}:lookup:MAX", + "DEF:access_max={file}:access:MAX", + "DEF:readlink_max={file}:readlink:MAX", + "DEF:read_max={file}:read:MAX", + "DEF:write_max={file}:write:MAX", + "DEF:create_max={file}:create:MAX", + "DEF:mkdir_max={file}:mkdir:MAX", + "DEF:symlink_max={file}:symlink:MAX", + "DEF:mknod_max={file}:mknod:MAX", + "DEF:remove_max={file}:remove:MAX", + "DEF:rmdir_max={file}:rmdir:MAX", + "DEF:rename_max={file}:rename:MAX", + "DEF:link_max={file}:link:MAX", + "DEF:readdir_max={file}:readdir:MAX", + "DEF:readdirplus_max={file}:readdirplus:MAX", + "DEF:fsstat_max={file}:fsstat:MAX", + "DEF:fsinfo_max={file}:fsinfo:MAX", + "DEF:pathconf_max={file}:pathconf:MAX", + "DEF:commit_max={file}:commit:MAX", + "CDEF:other_avg=null_avg,readlink_avg,create_avg,mkdir_avg,symlink_avg,mknod_avg,remove_avg,rmdir_avg,rename_avg,link_avg,readdir_avg,readdirplus_avg,fsstat_avg,fsinfo_avg,pathconf_avg,+,+,+,+,+,+,+,+,+,+,+,+,+,+", + "CDEF:other_max=null_max,readlink_max,create_max,mkdir_max,symlink_max,mknod_max,remove_max,rmdir_max,rename_max,link_max,readdir_max,readdirplus_max,fsstat_max,fsinfo_max,pathconf_max,+,+,+,+,+,+,+,+,+,+,+,+,+,+", + "CDEF:stack_read=read_avg", + "CDEF:stack_getattr=stack_read,getattr_avg,+", + "CDEF:stack_access=stack_getattr,access_avg,+", + "CDEF:stack_lookup=stack_access,lookup_avg,+", + "CDEF:stack_write=stack_lookup,write_avg,+", + "CDEF:stack_commit=stack_write,commit_avg,+", + "CDEF:stack_setattr=stack_commit,setattr_avg,+", + "CDEF:stack_other=stack_setattr,other_avg,+", + "AREA:stack_other#$HalfRed", + "AREA:stack_setattr#$HalfGreen", + "AREA:stack_commit#$HalfYellow", + "AREA:stack_write#$HalfGreen", + "AREA:stack_lookup#$HalfBlue", + "AREA:stack_access#$HalfMagenta", + "AREA:stack_getattr#$HalfCyan", + "AREA:stack_read#$HalfBlue", + "LINE1:stack_other#$FullRed:Other ", + 'GPRINT:other_max:MAX:%5.1lf Max,', + 'GPRINT:other_avg:AVERAGE:%5.1lf Avg,', + 'GPRINT:other_avg:LAST:%5.1lf Last\l', + "LINE1:stack_setattr#$FullGreen:setattr", + 'GPRINT:setattr_max:MAX:%5.1lf Max,', + 'GPRINT:setattr_avg:AVERAGE:%5.1lf Avg,', + 'GPRINT:setattr_avg:LAST:%5.1lf Last\l', + "LINE1:stack_commit#$FullYellow:commit ", + 'GPRINT:commit_max:MAX:%5.1lf Max,', + 'GPRINT:commit_avg:AVERAGE:%5.1lf Avg,', + 'GPRINT:commit_avg:LAST:%5.1lf Last\l', + "LINE1:stack_write#$FullGreen:write ", + 'GPRINT:write_max:MAX:%5.1lf Max,', + 'GPRINT:write_avg:AVERAGE:%5.1lf Avg,', + 'GPRINT:write_avg:LAST:%5.1lf Last\l', + "LINE1:stack_lookup#$FullBlue:lookup ", + 'GPRINT:lookup_max:MAX:%5.1lf Max,', + 'GPRINT:lookup_avg:AVERAGE:%5.1lf Avg,', + 'GPRINT:lookup_avg:LAST:%5.1lf Last\l', + "LINE1:stack_access#$FullMagenta:access ", + 'GPRINT:access_max:MAX:%5.1lf Max,', + 'GPRINT:access_avg:AVERAGE:%5.1lf Avg,', + 'GPRINT:access_avg:LAST:%5.1lf Last\l', + "LINE1:stack_getattr#$FullCyan:getattr", + 'GPRINT:getattr_max:MAX:%5.1lf Max,', + 'GPRINT:getattr_avg:AVERAGE:%5.1lf Avg,', + 'GPRINT:getattr_avg:LAST:%5.1lf Last\l', + "LINE1:stack_read#$FullBlue:read ", + 'GPRINT:read_max:MAX:%5.1lf Max,', + 'GPRINT:read_avg:AVERAGE:%5.1lf Avg,', + 'GPRINT:read_avg:LAST:%5.1lf Last\l' + ], + partition => [ + "DEF:rbyte_avg={file}:rbytes:AVERAGE", + "DEF:rbyte_min={file}:rbytes:MIN", + "DEF:rbyte_max={file}:rbytes:MAX", + "DEF:wbyte_avg={file}:wbytes:AVERAGE", + "DEF:wbyte_min={file}:wbytes:MIN", + "DEF:wbyte_max={file}:wbytes:MAX", + 'CDEF:overlap=wbyte_avg,rbyte_avg,GT,rbyte_avg,wbyte_avg,IF', + "AREA:wbyte_avg#$HalfGreen", + "AREA:rbyte_avg#$HalfBlue", + "AREA:overlap#$HalfBlueGreen", + "LINE1:wbyte_avg#$FullGreen:Write", + 'GPRINT:wbyte_min:MIN:%5.1lf%s Min,', + 'GPRINT:wbyte_avg:AVERAGE:%5.1lf%s Avg,', + 'GPRINT:wbyte_max:MAX:%5.1lf%s Max,', + 'GPRINT:wbyte_avg:LAST:%5.1lf%s Last\l', + "LINE1:rbyte_avg#$FullBlue:Read ", + 'GPRINT:rbyte_min:MIN:%5.1lf%s Min,', + 'GPRINT:rbyte_avg:AVERAGE:%5.1lf%s Avg,', + 'GPRINT:rbyte_max:MAX:%5.1lf%s Max,', + 'GPRINT:rbyte_avg:LAST:%5.1lf%s Last\l' + ], + ping => ['DEF:ping_avg={file}:ping:AVERAGE', + 'DEF:ping_min={file}:ping:MIN', + 'DEF:ping_max={file}:ping:MAX', + "AREA:ping_max#$HalfBlue", + "AREA:ping_min#$Canvas", + "LINE1:ping_avg#$FullBlue:Ping", + 'GPRINT:ping_min:MIN:%4.1lf ms Min,', + 'GPRINT:ping_avg:AVERAGE:%4.1lf ms Avg,', + 'GPRINT:ping_max:MAX:%4.1lf ms Max,', + 'GPRINT:ping_avg:LAST:%4.1lf ms Last'], + processes => [ + "DEF:running_avg={file}:running:AVERAGE", + "DEF:running_min={file}:running:MIN", + "DEF:running_max={file}:running:MAX", + "DEF:sleeping_avg={file}:sleeping:AVERAGE", + "DEF:sleeping_min={file}:sleeping:MIN", + "DEF:sleeping_max={file}:sleeping:MAX", + "DEF:zombies_avg={file}:zombies:AVERAGE", + "DEF:zombies_min={file}:zombies:MIN", + "DEF:zombies_max={file}:zombies:MAX", + "DEF:stopped_avg={file}:stopped:AVERAGE", + "DEF:stopped_min={file}:stopped:MIN", + "DEF:stopped_max={file}:stopped:MAX", + "DEF:paging_avg={file}:paging:AVERAGE", + "DEF:paging_min={file}:paging:MIN", + "DEF:paging_max={file}:paging:MAX", + "DEF:blocked_avg={file}:blocked:AVERAGE", + "DEF:blocked_min={file}:blocked:MIN", + "DEF:blocked_max={file}:blocked:MAX", + 'CDEF:paging_acc=sleeping_avg,running_avg,stopped_avg,zombies_avg,blocked_avg,paging_avg,+,+,+,+,+', + 'CDEF:blocked_acc=sleeping_avg,running_avg,stopped_avg,zombies_avg,blocked_avg,+,+,+,+', + 'CDEF:zombies_acc=sleeping_avg,running_avg,stopped_avg,zombies_avg,+,+,+', + 'CDEF:stopped_acc=sleeping_avg,running_avg,stopped_avg,+,+', + 'CDEF:running_acc=sleeping_avg,running_avg,+', + 'CDEF:sleeping_acc=sleeping_avg', + "AREA:paging_acc#$HalfYellow", + "AREA:blocked_acc#$HalfCyan", + "AREA:zombies_acc#$HalfRed", + "AREA:stopped_acc#$HalfMagenta", + "AREA:running_acc#$HalfGreen", + "AREA:sleeping_acc#$HalfBlue", + "LINE1:paging_acc#$FullYellow:Paging ", + 'GPRINT:paging_min:MIN:%5.1lf Min,', + 'GPRINT:paging_avg:AVERAGE:%5.1lf Average,', + 'GPRINT:paging_max:MAX:%5.1lf Max,', + 'GPRINT:paging_avg:LAST:%5.1lf Last\l', + "LINE1:blocked_acc#$FullCyan:Blocked ", + 'GPRINT:blocked_min:MIN:%5.1lf Min,', + 'GPRINT:blocked_avg:AVERAGE:%5.1lf Average,', + 'GPRINT:blocked_max:MAX:%5.1lf Max,', + 'GPRINT:blocked_avg:LAST:%5.1lf Last\l', + "LINE1:zombies_acc#$FullRed:Zombies ", + 'GPRINT:zombies_min:MIN:%5.1lf Min,', + 'GPRINT:zombies_avg:AVERAGE:%5.1lf Average,', + 'GPRINT:zombies_max:MAX:%5.1lf Max,', + 'GPRINT:zombies_avg:LAST:%5.1lf Last\l', + "LINE1:stopped_acc#$FullMagenta:Stopped ", + 'GPRINT:stopped_min:MIN:%5.1lf Min,', + 'GPRINT:stopped_avg:AVERAGE:%5.1lf Average,', + 'GPRINT:stopped_max:MAX:%5.1lf Max,', + 'GPRINT:stopped_avg:LAST:%5.1lf Last\l', + "LINE1:running_acc#$FullGreen:Running ", + 'GPRINT:running_min:MIN:%5.1lf Min,', + 'GPRINT:running_avg:AVERAGE:%5.1lf Average,', + 'GPRINT:running_max:MAX:%5.1lf Max,', + 'GPRINT:running_avg:LAST:%5.1lf Last\l', + "LINE1:sleeping_acc#$FullBlue:Sleeping", + 'GPRINT:sleeping_min:MIN:%5.1lf Min,', + 'GPRINT:sleeping_avg:AVERAGE:%5.1lf Average,', + 'GPRINT:sleeping_max:MAX:%5.1lf Max,', + 'GPRINT:sleeping_avg:LAST:%5.1lf Last\l' + ], + sensors => [ + 'DEF:temp_avg={file}:value:AVERAGE', + 'DEF:temp_min={file}:value:MIN', + 'DEF:temp_max={file}:value:MAX', + "AREA:temp_max#$HalfBlue", + "AREA:temp_min#$Canvas", + "LINE1:temp_avg#$FullBlue:Value", + 'GPRINT:temp_min:MIN:%4.1lf Min,', + 'GPRINT:temp_avg:AVERAGE:%4.1lf Avg,', + 'GPRINT:temp_max:MAX:%4.1lf Max,', + 'GPRINT:temp_avg:LAST:%4.1lf Last\l' + ], + swap => [ + 'DEF:used_avg={file}:used:AVERAGE', + 'DEF:used_min={file}:used:MIN', + 'DEF:used_max={file}:used:MAX', + 'DEF:free_avg={file}:free:AVERAGE', + 'DEF:free_min={file}:free:MIN', + 'DEF:free_max={file}:free:MAX', + 'DEF:cach_avg={file}:cached:AVERAGE', + 'DEF:cach_min={file}:cached:MIN', + 'DEF:cach_max={file}:cached:MAX', + 'DEF:resv_avg={file}:resv:AVERAGE', + 'DEF:resv_min={file}:resv:MIN', + 'DEF:resv_max={file}:resv:MAX', + 'CDEF:cach_avg_notnull=cach_avg,UN,0,cach_avg,IF', + 'CDEF:resv_avg_notnull=resv_avg,UN,0,resv_avg,IF', + 'CDEF:used_acc=used_avg', + 'CDEF:resv_acc=used_acc,resv_avg_notnull,+', + 'CDEF:cach_acc=resv_acc,cach_avg_notnull,+', + 'CDEF:free_acc=cach_acc,free_avg,+', + "AREA:free_acc#$HalfGreen", + "AREA:cach_acc#$HalfBlue", + "AREA:resv_acc#$HalfYellow", + "AREA:used_acc#$HalfRed", + "LINE1:free_acc#$FullGreen:Free ", + 'GPRINT:free_min:MIN:%5.1lf%s Min,', + 'GPRINT:free_avg:AVERAGE:%5.1lf%s Avg,', + 'GPRINT:free_max:MAX:%5.1lf%s Max,', + 'GPRINT:free_avg:LAST:%5.1lf%s Last\n', + "LINE1:cach_acc#$FullBlue:Cached ", + 'GPRINT:cach_min:MIN:%5.1lf%s Min,', + 'GPRINT:cach_avg:AVERAGE:%5.1lf%s Avg,', + 'GPRINT:cach_max:MAX:%5.1lf%s Max,', + 'GPRINT:cach_avg:LAST:%5.1lf%s Last\l', + "LINE1:resv_acc#$FullYellow:Reserved", + 'GPRINT:resv_min:MIN:%5.1lf%s Min,', + 'GPRINT:resv_avg:AVERAGE:%5.1lf%s Avg,', + 'GPRINT:resv_max:MAX:%5.1lf%s Max,', + 'GPRINT:resv_avg:LAST:%5.1lf%s Last\n', + "LINE1:used_acc#$FullRed:Used ", + 'GPRINT:used_min:MIN:%5.1lf%s Min,', + 'GPRINT:used_avg:AVERAGE:%5.1lf%s Avg,', + 'GPRINT:used_max:MAX:%5.1lf%s Max,', + 'GPRINT:used_avg:LAST:%5.1lf%s Last\l' + ], + traffic => ['DEF:out_min_raw={file}:outgoing:MIN', + 'DEF:out_avg_raw={file}:outgoing:AVERAGE', + 'DEF:out_max_raw={file}:outgoing:MAX', + 'DEF:inc_min_raw={file}:incoming:MIN', + 'DEF:inc_avg_raw={file}:incoming:AVERAGE', + 'DEF:inc_max_raw={file}:incoming:MAX', + 'CDEF:out_min=out_min_raw,8,*', + 'CDEF:out_avg=out_avg_raw,8,*', + 'CDEF:out_max=out_max_raw,8,*', + 'CDEF:inc_min=inc_min_raw,8,*', + 'CDEF:inc_avg=inc_avg_raw,8,*', + 'CDEF:inc_max=inc_max_raw,8,*', + 'CDEF:overlap=out_avg,inc_avg,GT,inc_avg,out_avg,IF', + 'CDEF:mytime=out_avg_raw,TIME,TIME,IF', + 'CDEF:sample_len_raw=mytime,PREV(mytime),-', + 'CDEF:sample_len=sample_len_raw,UN,0,sample_len_raw,IF', + 'CDEF:out_avg_sample=out_avg_raw,UN,0,out_avg_raw,IF,sample_len,*', + 'CDEF:out_avg_sum=PREV,UN,0,PREV,IF,out_avg_sample,+', + 'CDEF:inc_avg_sample=inc_avg_raw,UN,0,inc_avg_raw,IF,sample_len,*', + 'CDEF:inc_avg_sum=PREV,UN,0,PREV,IF,inc_avg_sample,+', + "AREA:out_avg#$HalfGreen", + "AREA:inc_avg#$HalfBlue", + "AREA:overlap#$HalfBlueGreen", + "LINE1:out_avg#$FullGreen:Outgoing", + 'GPRINT:out_avg:AVERAGE:%5.1lf%s Avg,', + 'GPRINT:out_max:MAX:%5.1lf%s Max,', + 'GPRINT:out_avg:LAST:%5.1lf%s Last', + 'GPRINT:out_avg_sum:LAST:(ca. %5.1lf%sB Total)\l', + "LINE1:inc_avg#$FullBlue:Incoming", + #'GPRINT:inc_min:MIN:%5.1lf %s Min,', + 'GPRINT:inc_avg:AVERAGE:%5.1lf%s Avg,', + 'GPRINT:inc_max:MAX:%5.1lf%s Max,', + 'GPRINT:inc_avg:LAST:%5.1lf%s Last', + 'GPRINT:inc_avg_sum:LAST:(ca. %5.1lf%sB Total)\l' + ], + cpufreq => [ + 'DEF:cpufreq_avg={file}:value:AVERAGE', + 'DEF:cpufreq_min={file}:value:MIN', + 'DEF:cpufreq_max={file}:value:MAX', + "AREA:cpufreq_max#$HalfBlue", + "AREA:cpufreq_min#$Canvas", + "LINE1:cpufreq_avg#$FullBlue:Frequency", + 'GPRINT:cpufreq_min:MIN:%5.1lf%s Min,', + 'GPRINT:cpufreq_avg:AVERAGE:%5.1lf%s Avg,', + 'GPRINT:cpufreq_max:MAX:%5.1lf%s Max,', + 'GPRINT:cpufreq_avg:LAST:%5.1lf%s Last\l' + ], + users => [ + 'DEF:users_avg={file}:users:AVERAGE', + 'DEF:users_min={file}:users:MIN', + 'DEF:users_max={file}:users:MAX', + "AREA:users_max#$HalfBlue", + "AREA:users_min#$Canvas", + "LINE1:users_avg#$FullBlue:Users", + 'GPRINT:users_min:MIN:%4.1lf Min,', + 'GPRINT:users_avg:AVERAGE:%4.1lf Average,', + 'GPRINT:users_max:MAX:%4.1lf Max,', + 'GPRINT:users_avg:LAST:%4.1lf Last\l' + ], + }; + $GraphDefs->{'disk'} = $GraphDefs->{'partition'}; + $GraphDefs->{'meminfo'} = $GraphDefs->{'memory'}; +} + +our $GraphArgs = +{ + cpu => ['-t', '{host} cpu{inst} usage', '-v', 'Percent', '-l', '0'], + cpufreq => ['-t', '{host} cpu{inst} usage', '-v', 'Mhz'], + #disk => ['-t', '{host} disk {inst} IO wait', '-v', 'Seconds'], + disk => ['-t', '{host} disk {inst} usage', '-v', 'Byte/s'], + hddtemp => ['-t', '{host} hdd temperature {inst}', '-v', '°Celsius'], + load => ['-t', '{host} load average', '-v', 'System load', '-X', '0'], + mails => ['-t', '{host} mail count', '-v', 'Amount', '-X', '0'], + memory => ['-t', '{host} memory usage', '-v', 'Bytes', '-b', '1024', '-l', '0'], + nfs3_procedures => ['-t', '{host} NFSv3 {inst} procedures', '-v', 'Procedures/s' ], + partition => ['-t', '{host} partition {inst} usage', '-v', 'Byte/s'], + ping => ['-t', '{host} ping to {inst}', '-v', 'ms'], + processes => ['-t', '{host} processes', '-v', 'Processes'], + sensors => ['-t', '{host} sensor {inst}', '-v', '°Celsius'], + swap => ['-t', '{host} swap usage', '-v', 'Bytes', '-b', '1024', '-l', '0'], + traffic => ['-t', '{host} {inst} traffic', '-v', 'Bit/s'], + users => ['-t', '{host} users', '-v', 'Users'], +}; + +our $GraphMulti = +{ + cpu => \&output_graph_cpu, + cpufreq => 1, + disk => 1, + load => 0, + mails => 0, + memory => 0, + partition => 1, + ping => \&output_graph_ping, + sensors => 1, + traffic => 1, + users => 1 +}; + +our @Info; +if (defined ($ENV{'GATEWAY_INTERFACE'})) +{ + @Info = ($ENV{'PATH_INFO'} || '') =~ m#([\w\-\.]+)#g; +} +else +{ + @Info = @ARGV; +} + +parse_pathinfo (@Info); + +if ($TimeSpan) +{ + output_graph (); +} +else +{ + output_page (); +} + +exit (0); + +sub output_graph_cpu +{ + my @inst = @_; + my @ret = (); + + die if (@inst < 2); + + for (@inst) + { + push (@ret, + "DEF:user_avg_$_=$AbsDir/cpu-$_.rrd:user:AVERAGE", + "DEF:user_min_$_=$AbsDir/cpu-$_.rrd:user:MIN", + "DEF:user_max_$_=$AbsDir/cpu-$_.rrd:user:MAX", + "DEF:nice_avg_$_=$AbsDir/cpu-$_.rrd:nice:AVERAGE", + "DEF:nice_min_$_=$AbsDir/cpu-$_.rrd:nice:MIN", + "DEF:nice_max_$_=$AbsDir/cpu-$_.rrd:nice:MAX", + "DEF:syst_avg_$_=$AbsDir/cpu-$_.rrd:syst:AVERAGE", + "DEF:syst_min_$_=$AbsDir/cpu-$_.rrd:syst:MIN", + "DEF:syst_max_$_=$AbsDir/cpu-$_.rrd:syst:MAX", + "DEF:wait_avg_$_=$AbsDir/cpu-$_.rrd:wait:AVERAGE", + "DEF:wait_min_$_=$AbsDir/cpu-$_.rrd:wait:MIN", + "DEF:wait_max_$_=$AbsDir/cpu-$_.rrd:wait:MAX"); + } + + for (qw(user nice syst wait)) + { + my $def = $_; + my $cdef; + + my $default_value = ($def eq 'user' or $def eq 'syst') ? 'UNKN' : '0'; + + for (qw(avg min max)) + { + my $cf = $_; + + for (@inst) + { + push (@ret, "CDEF:${def}_${cf}_notnull_${_}=${def}_${cf}_${_},UN,0,${def}_${cf}_${_},IF"); + push (@ret, "CDEF:${def}_${cf}_defined_${_}=${def}_${cf}_${_},UN,0,1,IF"); + } + + $cdef = "CDEF:${def}_${cf}_num=" . join (',', map { "${def}_${cf}_defined_${_}" } (@inst)); + $cdef .= ',+' x (scalar (@inst) - 1); + push (@ret, $cdef); + + $cdef = "CDEF:${def}_${cf}=${def}_${cf}_num," . join (',', map { "${def}_${cf}_notnull_${_}" } (@inst)); + $cdef .= ',+' x (scalar (@inst) - 1); + $cdef .= ",${def}_${cf}_num,${def}_${cf}_num,1,IF,/,$default_value,IF"; + push (@ret, $cdef); + push (@ret, "CDEF:${def}_${cf}_notnull=${def}_${cf},UN,0,${def}_${cf},IF"); + } + } + + push (@ret, + "CDEF:nice_acc=syst_avg_notnull,wait_avg_notnull,user_avg_notnull,nice_avg_notnull,+,+,+", + "CDEF:user_acc=syst_avg_notnull,wait_avg_notnull,user_avg_notnull,+,+", + "CDEF:wait_acc=syst_avg_notnull,wait_avg_notnull,+", + "CDEF:syst_acc=syst_avg_notnull"); + + push (@ret, grep { $_ !~ m/^C?DEF/ } (@{$GraphDefs->{'cpu'}})); + + return (@ret); +} + +sub output_graph_ping +{ + my @inst = @_; + my @ret = (); + + die if (@inst < 2); + + my @colors = get_n_colors (scalar (@inst)); + + for (my $i = 0; $i < scalar (@inst); $i++) + { + my $inst = $inst[$i]; + push (@ret, + "DEF:avg_$i=$AbsDir/ping-$inst.rrd:ping:AVERAGE", + "DEF:min_$i=$AbsDir/ping-$inst.rrd:ping:MIN", + "DEF:max_$i=$AbsDir/ping-$inst.rrd:ping:MAX"); + } + + for (my $i = 0; $i < scalar (@inst); $i++) + { + my $inst = $inst[$i]; + my $color = $colors[$i]; + + if (length ($inst) > 15) + { + $inst = substr ($inst, 0, 12) . '...'; + } + else + { + $inst = sprintf ('%-15s', $inst); + } + + push (@ret, + "LINE1:avg_$i#$color:$inst", + "GPRINT:min_$i:MIN:%4.1lf ms Min,", + "GPRINT:avg_$i:AVERAGE:%4.1lf ms Avg,", + "GPRINT:max_$i:MAX:%4.1lf ms Max,", + "GPRINT:avg_$i:LAST:%4.1lf ms Last\\l"); + } + + return (@ret); +} + +sub output_graph +{ + die unless (defined ($GraphDefs->{$Type})); + + my $host; + my @cmd = (); + my $file = $AbsDir . '/'; + my $files = get_all_files ($AbsDir); + + # + # get hostname + # + if ($RelDir =~ m#([^/]+)$#) + { + $host = $1; + } + else + { + $host = $Config->{'HostName'}; + } + + # + # get timespan + # + if ($TimeSpan =~ m/(\d+)/) + { + $TimeSpan = -1 * int ($1); + } + else + { + my %t = (hour => -3600, day => -86400, week => -604800, month => -2678400, year => -31622400); + die unless (defined ($t{$TimeSpan})); + $TimeSpan = $t{$TimeSpan}; + } + + if (scalar (@{$files->{$Type}}) == 1) + { + $Inst = $files->{$Type}[0]; + } + + push (@cmd, '-', '-a', 'PNG', '-s', $TimeSpan); + push (@cmd, @{$GraphArgs->{$Type}}) if (defined ($GraphArgs->{$Type})); + + for (qw(Back ShadeA ShadeB Font Canvas Grid MGrid Frame Arrow)) + { + push (@cmd, '-c', uc ($_) . '#' . $Config->{'Colors'}{$_}); + } + + if ((length ($Inst) == 0) and (ref ($GraphMulti->{$Type}) eq 'CODE')) + { + push (@cmd, $GraphMulti->{$Type}->(@{$files->{$Type}})); + } + else + { + if (length ("$Inst")) + { + $file .= "$Type-$Inst.rrd"; + } + else + { + $file .= "$Type.rrd"; + } + + die ("File not found: $file") unless (-e $file); + + push (@cmd, @{$GraphDefs->{$Type}}); + } + + for (@cmd) + { + $_ =~ s/{file}/$file/g; + $_ =~ s/{host}/$host/g; + $_ =~ s/{inst}/$Inst/g; + $_ =~ s/{type}/$Type/g; + } + + $| = 1; + + print STDOUT <

/tmp/collection.log") or die ("open: $!"); + flock ($fh, LOCK_EX) or die ("flock: $!"); + + print $fh join ("\n\t", @cmd) . "\n"; + + close ($fh); + } + + RRDs::graph (@cmd); + + die ('RRDs::error: ' . RRDs::error ()) if (RRDs::error ()); +} + +sub output_page +{ + my $files = get_all_files ($AbsDir); + my $dirs = get_all_dirs ($AbsDir); + + print STDOUT <

+ + Collection: $RelDir + + + + +HEADER + + my $MySelf = defined ($ENV{'GATEWAY_INTERFACE'}) ? $ENV{'SCRIPT_NAME'} : $0; + + if ((length ($Type) != 0) and (length ($Inst) == 0) and (ref ($GraphMulti->{$Type}) eq 'CODE') and (scalar (@{$files->{$Type}}) > 1)) + { + print qq(\t\t

Go up

\n); + + print "\t\t

+ +

Daily

Weekly

Monthly

Yearly

+HTML + } + elsif (length ($Type) != 0) + { + my $ext = length ($Inst) ? "$Type/$Inst" : $Type; + + if ((ref ($GraphMulti->{$Type}) eq 'CODE') and (scalar (@{$files->{$Type}}) > 1)) + { + print qq(

Go up

\n); + } + else + { + print qq(

Go up

\n); + } + + print <Daily +