]> granicus.if.org Git - sysstat/log
sysstat
9 years agosa_conv.c: Fix null pointer dereference
Sebastien GODARD [Fri, 5 Jun 2015 13:43:03 +0000 (15:43 +0200)]
sa_conv.c: Fix null pointer dereference

A malformed system activity datafile can lead to a null pointer being
dereferenced in sa_conv.c while trying to upgrade this datafile with
sadf -c.

CID#29707

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
9 years agocifsiostat: Fix possible integer overflowed argument
Sebastien GODARD [Fri, 5 Jun 2015 13:15:13 +0000 (15:15 +0200)]
cifsiostat: Fix possible integer overflowed argument

In io_sys_init(): cifs_nr is used as argument to calloc() function
though it may have a negative value (adding NR_CIFS_PREALLOC constant
may make it overflow). So test the value before using it.

CID#29709

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
9 years agosa_conv.c: Fix untrusted loop bound
Sebastien GODARD [Fri, 22 May 2015 19:26:54 +0000 (21:26 +0200)]
sa_conv.c: Fix untrusted loop bound

Variable file_hdr.sa_act_nr was used to allocate memory and as
a loop boundary in upgrade_header_section() function.
Its value is read from an untrusted source, so check its value before
using it.

CID #29718.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
9 years agosa_common.c: Fix untrusted values used as arguments
Sebastien GODARD [Fri, 22 May 2015 19:06:09 +0000 (21:06 +0200)]
sa_common.c: Fix untrusted values used as arguments

In check_file_actlst() function: file_magic->header_size and
file_hdr->sa_act_nr values were used as arguments to allocate memory via
SREALLOC although they hadn't been tested before.

The argument could be controlled by an attacker, who could invoke the
function with arbitrary values (for example, a very high or negative
buffer size).

CID #29719.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
9 years agosadc.c: Fix time-of-check, time-of-use race condition
Sebastien GODARD [Thu, 21 May 2015 19:40:40 +0000 (21:40 +0200)]
sadc.c: Fix time-of-check, time-of-use race condition

In open_ofile() function: the file's existence was checked (using the
access() syscall) before being opened if present. An attacker could
change the filename's file association or other attributes between the
check and use.

CID #29721.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
9 years agoMerge branch 'ciz-master'
Sebastien GODARD [Thu, 21 May 2015 19:27:30 +0000 (21:27 +0200)]
Merge branch 'ciz-master'

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
9 years agoWhen device-mapper isn't running,
Vitezslav Cizek [Wed, 20 May 2015 21:33:37 +0000 (23:33 +0200)]
When device-mapper isn't running,
but there is a device with major number 253,
sysstat halts because it can't open /dev/mapper.

So when device-mapper isn't found in /proc/devices,
assume it's not running at all.

9 years agoUpdate FAQ
Sebastien GODARD [Mon, 11 May 2015 06:31:53 +0000 (08:31 +0200)]
Update FAQ

Update FAQ to take into account the new message displayed by sar when
sar and sadc are not consistent.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
9 years agoFix untrusted loop bound in sar.c
Sebastien GODARD [Mon, 11 May 2015 06:28:19 +0000 (08:28 +0200)]
Fix untrusted loop bound in sar.c

Variable file_hdr.sa_act_nr was used as a loop boundary in
read_header_data() function. Its value is read from data sent by the
data collector (sadc). Check its value before using it.

Covery defect CID#29715.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
9 years agoTypos and cosmetic fixes
Sebastien GODARD [Fri, 8 May 2015 14:29:44 +0000 (16:29 +0200)]
Typos and cosmetic fixes

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
9 years agoMerge branch 'pschiffe-master'
Sebastien GODARD [Tue, 5 May 2015 20:12:08 +0000 (22:12 +0200)]
Merge branch 'pschiffe-master'

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
9 years agoUse strncpy instead of strcpy in ioconf.c
Peter Schiffer [Tue, 5 May 2015 13:55:47 +0000 (15:55 +0200)]
Use strncpy instead of strcpy in ioconf.c

9 years agoCheck value of variable "major" read from file
Peter Schiffer [Tue, 5 May 2015 13:33:55 +0000 (15:33 +0200)]
Check value of variable "major" read from file

Variables "major" and "indirect" cannot be bigger than "MAX_BLKDEV" because they
are used as array index in "ioconf" and "ioc_refnr" arrays with size "MAX_BLKDEV
+ 1"

9 years agoFixed and simplified some math expressions in pr_stats.c
Peter Schiffer [Tue, 5 May 2015 13:09:45 +0000 (15:09 +0200)]
Fixed and simplified some math expressions in pr_stats.c

Please double check these changes.

9 years agoUse snprintf() instead of sprintf()1
Sebastien GODARD [Sun, 26 Apr 2015 12:27:22 +0000 (14:27 +0200)]
Use snprintf() instead of sprintf()1

Make sure that we don't use more characters than allocated for filename
string.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
9 years agoCosmetic fixes
Sebastien GODARD [Sun, 26 Apr 2015 12:18:57 +0000 (14:18 +0200)]
Cosmetic fixes

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
9 years agoUpdate DTD and XSD documents
Sebastien GODARD [Mon, 13 Apr 2015 06:22:55 +0000 (08:22 +0200)]
Update DTD and XSD documents

Update DTD and XSD documents to take into account FC/HBA XML data.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
9 years agoUpdate XML output for FC/HBA statistics
Sebastien GODARD [Mon, 13 Apr 2015 06:06:23 +0000 (08:06 +0200)]
Update XML output for FC/HBA statistics

Include XML output for FC/HBA statistics within <network> section.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
9 years agoUpdate sar manual page
Sebastien GODARD [Sun, 12 Apr 2015 14:32:22 +0000 (16:32 +0200)]
Update sar manual page

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
9 years agoFC/HBA statistics: Use constants whenever possible
Sebastien GODARD [Sun, 12 Apr 2015 14:18:02 +0000 (16:18 +0200)]
FC/HBA statistics: Use constants whenever possible

Use constants for:
1) Name of /sys files
2) "FC" keyword
3) FC host name length

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
9 years agoUpdate XML output for FC hosts statistics
Sebastien GODARD [Sun, 12 Apr 2015 13:33:51 +0000 (15:33 +0200)]
Update XML output for FC hosts statistics

Rename tags used in XML output for FC hosts to be consistent with names
displayed by sar.
Add tag per="second" in XML output.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
9 years agoUpdate functons used to count number of FC hosts
Sebastien GODARD [Sun, 12 Apr 2015 13:15:54 +0000 (15:15 +0200)]
Update functons used to count number of FC hosts

Update/improve functions used to count number of FC hosts:
1) Move code used to count hosts from sa_wrap.c to its normal location
(count.c).
2) Preallocate FC host structures to take into account a possibly
dynamically registerd host. No structures are allocated only if
/sys/class/fc_host directory is not found.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
9 years agoUpdate FC/HBA statistics display functions
Sebastien GODARD [Sun, 12 Apr 2015 12:43:24 +0000 (14:43 +0200)]
Update FC/HBA statistics display functions

Various fixes in function used to display FC/HBA statistics:
1) Only one function is necessary to display FC/HBA statistics. So
remove print_avg_fchost_stats() function.
2) At the end of the report, display average statistics per host, not a
summary.
3) Update column width used to display statistics (10 characters wide)
to be consistent with other activities display.
4) Move FCHOST column to the right because the host name length may be
greater than 10 characters.
5) Fix timestamp displayed with header line.
6) Remove extra carriage return at the end of display.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
9 years agoMerge branch 'jaunix-fcstats'
Sebastien GODARD [Sun, 12 Apr 2015 09:10:15 +0000 (11:10 +0200)]
Merge branch 'jaunix-fcstats'

9 years agoCosmetic fixes for FC/HBA statistics
Sebastien GODARD [Sun, 12 Apr 2015 09:07:16 +0000 (11:07 +0200)]
Cosmetic fixes for FC/HBA statistics

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
9 years agoMerge branch 'fcstats' of https://github.com/jaunix/sysstat into jaunix-fcstats
Sebastien GODARD [Sun, 12 Apr 2015 07:44:30 +0000 (09:44 +0200)]
Merge branch 'fcstats' of https://github.com/jaunix/sysstat into jaunix-fcstats

9 years agoDocument sar's option --sadc
Sebastien GODARD [Sat, 11 Apr 2015 14:52:05 +0000 (16:52 +0200)]
Document sar's option --sadc

Update sar manual page to document option --sadc.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
9 years agoAdd option --sadc to sar
Sebastien GODARD [Sat, 11 Apr 2015 14:38:43 +0000 (16:38 +0200)]
Add option --sadc to sar

This option tells the user which data collector will be called by sar.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
9 years agoAdded reporting of FC stats in XML format.
Steve Kay [Tue, 7 Apr 2015 21:13:55 +0000 (14:13 -0700)]
Added reporting of FC stats in XML format.

9 years agoAdded handling of "-n FC" argument and FC HBA reading.
Steve Kay [Tue, 7 Apr 2015 21:13:06 +0000 (14:13 -0700)]
Added handling of "-n FC" argument and FC HBA reading.

9 years agoAdded new activity for FC collection.
Steve Kay [Tue, 7 Apr 2015 21:12:05 +0000 (14:12 -0700)]
Added new activity for FC collection.

9 years agoAdded rendering of FC stats.
Steve Kay [Tue, 7 Apr 2015 21:11:16 +0000 (14:11 -0700)]
Added rendering of FC stats.

9 years agoAdd printing+reading of new FC stats.
Steve Kay [Tue, 7 Apr 2015 21:10:15 +0000 (14:10 -0700)]
Add printing+reading of new FC stats.

9 years agoUpdated sar man page to include new "-n FC" option.
Steve Kay [Tue, 7 Apr 2015 21:08:41 +0000 (14:08 -0700)]
Updated sar man page to include new "-n FC" option.

9 years agoFC reporting in JSON format.
Steve Kay [Tue, 7 Apr 2015 21:08:17 +0000 (14:08 -0700)]
FC reporting in JSON format.

9 years agoAdd SYSFS_FCHBA /sys/class/fc_host directory.
Steve Kay [Tue, 7 Apr 2015 21:07:11 +0000 (14:07 -0700)]
Add SYSFS_FCHBA /sys/class/fc_host directory.

9 years agoAdd new activity "fc_act".
Steve Kay [Tue, 7 Apr 2015 21:05:54 +0000 (14:05 -0700)]
Add new activity "fc_act".

9 years agoStarting sysstat 11.1.5
Sebastien GODARD [Tue, 7 Apr 2015 20:20:02 +0000 (22:20 +0200)]
Starting sysstat 11.1.5

Update sysstat version number in configure script.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
9 years agosysstat 11.1.4 v11.1.4
Sebastien GODARD [Tue, 7 Apr 2015 20:14:26 +0000 (22:14 +0200)]
sysstat 11.1.4

sysstat version 11.1.4 final packaging.
lsm and spec files updated.
Changelog added.

NOTE: A stable version (11.0.4) also exists and will be available for
download from my web site:

http://pagesperso-orange.fr/sebastien.godard/

The stable version includes only the bug fixes added in sysstat 11.1.4
but not the new features.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
9 years agoNLS: Sync with Translation Project
Sebastien GODARD [Tue, 7 Apr 2015 19:58:35 +0000 (21:58 +0200)]
NLS: Sync with Translation Project

Sync with Translation Project. Various languages updated.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
9 years agoAdd squeeze target to Makefile
Sebastien GODARD [Mon, 6 Apr 2015 15:58:25 +0000 (17:58 +0200)]
Add squeeze target to Makefile

Add handy "squeeze" target to Makefile, used to remove unneeded trailing
spaces and tabs in source code.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
9 years agoDocument YESTERDAY variable in sysstat(5) manual page
Sebastien GODARD [Sat, 4 Apr 2015 13:43:36 +0000 (15:43 +0200)]
Document YESTERDAY variable in sysstat(5) manual page

YESTERDAY variable can now be set in config file
(/etc/sysconfig/sysstat). So document it in sysstat(5) manual page.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
9 years agoMerge branch 'remove_yesterday' of https://github.com/jimis/sysstat
Sebastien GODARD [Sat, 4 Apr 2015 13:35:49 +0000 (15:35 +0200)]
Merge branch 'remove_yesterday' of https://github.com/jimis/sysstat

9 years agoMerge branch 'sargraph2' of https://github.com/jimis/sysstat
Sebastien GODARD [Sat, 4 Apr 2015 13:16:28 +0000 (15:16 +0200)]
Merge branch 'sargraph2' of https://github.com/jimis/sysstat

9 years agoBy default sa2 now generates summary for YESTERDAY
Dimitrios Apostolou [Fri, 18 Apr 2014 01:01:33 +0000 (03:01 +0200)]
By default sa2 now generates summary for YESTERDAY

This can be overriden by setting YESTERDAY=no in the configuration.
The compile time option was removed to make it clear that this is
controlled in one place, which also led to to logic simplification
and code removal.

This change fixes the following issues:

* Previously summary was being generated at 23:53, which caused up to 7
  datapoints lost if sa1 logging was set to 1 or 5 minute intervals.

* To amend the previous problem, some distributions were compiling with
  YESTERDAY set as a compile-time option, but shipped the cron jobs
  as-is. This caused the additional issue that the report of a day was being
  delayed up to 23:53 of the next day.

* Finally there is a subtle race condition that might happen if sadc tries to
  write to the file while sar is reading it to generate the summary, which
  might cause corrupted sar summaries. This does not occur when reading
  yesterday's files, since they are not written any more.

9 years agosadf sometimes prints comment lines before the header.
Dimitrios Apostolou [Fri, 3 Apr 2015 19:57:48 +0000 (21:57 +0200)]
sadf sometimes prints comment lines before the header.

9 years agoMerge branch 'jimis-sargraph2'
Sebastien GODARD [Fri, 3 Apr 2015 09:10:35 +0000 (11:10 +0200)]
Merge branch 'jimis-sargraph2'

Add new sargraph2 tool.

9 years agoMerge branch 'sargraph2' of https://github.com/jimis/sysstat into jimis-sargraph2
Sebastien GODARD [Fri, 3 Apr 2015 08:53:28 +0000 (10:53 +0200)]
Merge branch 'sargraph2' of https://github.com/jimis/sysstat into jimis-sargraph2

9 years agoMerge branch 'yesterday_tweakable' of https://github.com/jimis/sysstat
Sebastien GODARD [Fri, 3 Apr 2015 08:40:11 +0000 (10:40 +0200)]
Merge branch 'yesterday_tweakable' of https://github.com/jimis/sysstat

9 years agoIntroduce sargraph2 - a sadf plotter
Dimitrios Apostolou [Fri, 3 Apr 2015 01:41:16 +0000 (03:41 +0200)]
Introduce sargraph2 - a sadf plotter

Reimplemented most of the functionality of "sargraph" without any XML
transformations. Tweaked the graphs to be more meaningful and more beautiful,
and enabled optional output to file.

9 years agoImproved regex according to code review.
Dimitrios Apostolou [Wed, 1 Apr 2015 22:54:15 +0000 (00:54 +0200)]
Improved regex according to code review.

9 years agoUse ${VARIABLE} expansion to adhere to the coding style.
Dimitrios Apostolou [Wed, 1 Apr 2015 22:46:07 +0000 (00:46 +0200)]
Use ${VARIABLE} expansion to adhere to the coding style.

9 years agoYESTERDAY variable can now be changed in the generic configuration file.
Dimitrios Apostolou [Fri, 18 Apr 2014 00:53:10 +0000 (02:53 +0200)]
YESTERDAY variable can now be changed in the generic configuration file.

For people logging every 1 min, generating the summary at 23:53 is not good
enough: 7 minutes of data points are lost. What is needed is to generate
the summary early in the next day. In order to generate yesterday's
summary without recompiling you can now add the following line in config:
YESTERDAY="--date=yesterday"

9 years agosa2: Use simple regex to detect files, as in sargraph.
Dimitrios Apostolou [Fri, 18 Apr 2014 01:02:58 +0000 (03:02 +0200)]
sa2: Use simple regex to detect files, as in sargraph.

9 years agosargraph: Rename SA_PATH to SA_DIR to be in accordance with sa2, also simplify regex.
Dimitrios Apostolou [Wed, 1 Apr 2015 11:11:50 +0000 (13:11 +0200)]
sargraph: Rename SA_PATH to SA_DIR to be in accordance with sa2, also simplify regex.

9 years agoMake JSON output consistent with XML one
Sebastien GODARD [Mon, 30 Mar 2015 16:42:03 +0000 (18:42 +0200)]
Make JSON output consistent with XML one

Use only header "cpu-load" for both "sar -u" and "sar -u ALL"
statistics (header "cpu-load-all" is removed). This is what is
done in XML output. So do the same here for JSON output.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
9 years agoAdd shell style configuration for emacs.
Dimitrios Apostolou [Mon, 30 Mar 2015 00:38:15 +0000 (02:38 +0200)]
Add shell style configuration for emacs.

9 years agoAdd --sa-path option to sargraph, and some generic option parsing loop.
Dimitrios Apostolou [Mon, 30 Mar 2015 00:36:40 +0000 (02:36 +0200)]
Add --sa-path option to sargraph, and some generic option parsing loop.

9 years agoDetect all possible sa files.
Dimitrios Apostolou [Sun, 29 Mar 2015 22:51:50 +0000 (00:51 +0200)]
Detect all possible sa files.

9 years agoNo need to customize the paths.
Dimitrios Apostolou [Sun, 29 Mar 2015 22:15:34 +0000 (00:15 +0200)]
No need to customize the paths.

9 years agoStylistic changes.
Dimitrios Apostolou [Sun, 29 Mar 2015 22:09:57 +0000 (00:09 +0200)]
Stylistic changes.

9 years agosargraph now uncompresses gzip compressed sa files if needed.
Dimitrios Apostolou [Sun, 29 Mar 2015 21:57:24 +0000 (23:57 +0200)]
sargraph now uncompresses gzip compressed sa files if needed.

9 years agoXML output modified to enable proper validation
Sebastien GODARD [Sun, 29 Mar 2015 15:27:31 +0000 (17:27 +0200)]
XML output modified to enable proper validation

XML document header modified so that it can be validated against the XSD
document.
Also always use cpu-load header for CPU activity (cpu-load-all has been
removed).

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
9 years agoDTD and XSD documents updated
Sebastien GODARD [Sun, 29 Mar 2015 15:23:30 +0000 (17:23 +0200)]
DTD and XSD documents updated

DTD and XSD documents updated so that XML data, as displayed by sadf -x,
can now be properly validated against them.
Several typos have also been corrected.
Some missing elements or attributes (for memory activity, filesystem
activity) have been added.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
9 years agoMerge branch 'jaunix-mountpoint-xml'
Sebastien GODARD [Sat, 28 Mar 2015 09:18:48 +0000 (10:18 +0100)]
Merge branch 'jaunix-mountpoint-xml'

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
9 years agoMerge branch 'mountpoint-xml' of https://github.com/jaunix/sysstat into jaunix-mountp...
Sebastien GODARD [Sat, 28 Mar 2015 09:13:27 +0000 (10:13 +0100)]
Merge branch 'mountpoint-xml' of https://github.com/jaunix/sysstat into jaunix-mountpoint-xml

9 years agoMerge branch 'jaunix-mountpoint-json'
Sebastien GODARD [Sat, 28 Mar 2015 09:09:16 +0000 (10:09 +0100)]
Merge branch 'jaunix-mountpoint-json'

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
9 years agoMerge branch 'mountpoint-json' of https://github.com/jaunix/sysstat into jaunix-mount...
Sebastien GODARD [Sat, 28 Mar 2015 08:51:28 +0000 (09:51 +0100)]
Merge branch 'mountpoint-json' of https://github.com/jaunix/sysstat into jaunix-mountpoint-json

9 years agorndr output with support for -F MOUNT
Steve Kay [Fri, 27 Mar 2015 23:25:57 +0000 (16:25 -0700)]
rndr output with support for -F MOUNT

9 years agoxml output with support for -F MOUNT
Steve Kay [Fri, 27 Mar 2015 23:09:10 +0000 (16:09 -0700)]
xml output with support for -F MOUNT

9 years agocorrect header so its always "filesystems"
Steve Kay [Fri, 27 Mar 2015 22:55:47 +0000 (15:55 -0700)]
correct header so its always "filesystems"

9 years agojson output with support for -F MOUNT
Steve Kay [Fri, 27 Mar 2015 22:44:35 +0000 (15:44 -0700)]
json output with support for -F MOUNT

9 years agoRewrite code parsing sar's option -F
Sebastien GODARD [Fri, 27 Mar 2015 15:58:45 +0000 (16:58 +0100)]
Rewrite code parsing sar's option -F

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
9 years agoUse proper length for mountp string
Sebastien GODARD [Fri, 27 Mar 2015 15:52:27 +0000 (16:52 +0100)]
Use proper length for mountp string

We read 256 chars for the mountpoint name to (try to) be sure to get it
all, and so ths statvfs() function won't fail in read_filesystem()
function.
Yet only MAX_FS_LEN chars should be saved in stats_filesystem structure.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
9 years agoMerge branch 'jaunix-show-mounts'
Sebastien GODARD [Fri, 27 Mar 2015 15:37:59 +0000 (16:37 +0100)]
Merge branch 'jaunix-show-mounts'

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
9 years agoUpdate configure script
Sebastien GODARD [Tue, 24 Mar 2015 21:07:10 +0000 (22:07 +0100)]
Update configure script

Make configure script consistent with configure.in.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
9 years agoFix issue #48 for good: sar skips long filesystem names
Sebastien GODARD [Tue, 24 Mar 2015 20:38:07 +0000 (21:38 +0100)]
Fix issue #48 for good: sar skips long filesystem names

How the number of filesystems is counted should be consistent with
commit a82d6ab.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
9 years agoMerge branch 'show-mounts' of https://github.com/jaunix/sysstat into jaunix-show...
Sebastien GODARD [Tue, 24 Mar 2015 20:08:12 +0000 (21:08 +0100)]
Merge branch 'show-mounts' of https://github.com/jaunix/sysstat into jaunix-show-mounts

Add option to show mountpoint names instead of filesystem device, via
sar -F MOUNT.

9 years agoFix issue #48: sar skips long filesystem names
Sebastien GODARD [Fri, 20 Mar 2015 17:23:11 +0000 (18:23 +0100)]
Fix issue #48: sar skips long filesystem names

If a filesystem had more than MAX_FS_LEN characters in length, sar
didn't display it.
This patch fixes the problem.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
9 years agoIncrease maximum fs name length to 128
Sebastien GODARD [Fri, 20 Mar 2015 16:10:16 +0000 (17:10 +0100)]
Increase maximum fs name length to 128

Previous value was 72 and was considered a bit too small.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
9 years agoSmall fix in sar help message
Sebastien GODARD [Fri, 20 Mar 2015 13:27:21 +0000 (14:27 +0100)]
Small fix in sar help message

A line was not properly indented in help message displayed by sar -h.
Reported by @stevekay.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
9 years agoCall chkconfig only if $(COPY_ONLY) is set to no
Sebastien GODARD [Thu, 19 Mar 2015 20:22:55 +0000 (21:22 +0100)]
Call chkconfig only if $(COPY_ONLY) is set to no

Call chkconfig (or create corresponding links) only if
$(COPY_ONLY) variable is set to no.
The chkconfig command doesn't take into account the $(DESTDIR) variable
contents, trying to create links outside the $(DESTDIR) tree, which can
be considered as a way to activate sysstat service.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
9 years agoFix installation on systems w/o chkconfig command
Sebastien GODARD [Mon, 16 Mar 2015 20:24:59 +0000 (21:24 +0100)]
Fix installation on systems w/o chkconfig command

On systems without chkconfig command, the variable CHKCONFIG is empty.
Its contents should be enclosed in double quotes to be properly tested.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
9 years agoAdditional fixes for system w/o systemd
Sebastien GODARD [Mon, 16 Mar 2015 20:14:34 +0000 (21:14 +0100)]
Additional fixes for system w/o systemd

For systems without systemd, some variables may get expanded into empty
strings, eg.:

if [ -z "$(SYSTEMD_UNIT_DIR)" -o ! -d $(DESTDIR)$(SYSTEMD_UNIT_DIR) ]...

may be expanded into:

if [ -z "" -o ! -d  ]...

when DESTDIR is also unset. This causes an error when executed:

/bin/sh: line 0: [: argument expected

The solution is to enclose these variables in double quotes.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
9 years agoMerge branch 'jaunix-mpstat'
Sebastien GODARD [Sun, 15 Mar 2015 16:21:28 +0000 (17:21 +0100)]
Merge branch 'jaunix-mpstat'

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
9 years agoAdd option to display mountpoint names instead of filesystem names.
Steve Kay [Fri, 13 Mar 2015 22:24:10 +0000 (15:24 -0700)]
Add option to display mountpoint names instead of filesystem names.

9 years agoColumn widths : revise style to match existing code, use snprintf, calculate widths...
Steve Kay [Fri, 13 Mar 2015 08:57:28 +0000 (01:57 -0700)]
Column widths : revise style to match existing code, use snprintf, calculate widths once.

9 years agofix mpstat SCPU alignment output
Steve Kay [Thu, 12 Mar 2015 23:09:02 +0000 (16:09 -0700)]
fix mpstat SCPU alignment output

9 years agopidstat: Don't stop if gtime and cgtime fields are unavailable
Sebastien GODARD [Thu, 12 Mar 2015 20:39:58 +0000 (21:39 +0100)]
pidstat: Don't stop if gtime and cgtime fields are unavailable

With some old 2.6 kernels, fields "gtime" and "cgtime" (which are
expected to be read from /proc/#/stat file) may not be present.
pidstat used to stop should this case happens.
Fix this since these fields are not mandatory for pidstat to display its
statistics.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
9 years agosysstat init script may sometimes be called rc.sysstat
Sebastien GODARD [Sun, 8 Mar 2015 15:41:16 +0000 (16:41 +0100)]
sysstat init script may sometimes be called rc.sysstat

In some distros sysstat init script is called rc.sysstat.
So use that name with chkconfig and when uninstalling, remove links with
names like S??rc.sysstat and K??rc.sysstat.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
9 years agoEscape parentheses in Makefile
Sebastien GODARD [Sun, 8 Mar 2015 14:28:20 +0000 (15:28 +0100)]
Escape parentheses in Makefile

"make install" crashes when --enable-install-cron has been used at
configuration stage:

if [ ( -z "/usr/lib/systemd/system" -o ! -d /usr/lib/systemd/system ) -a
! -d /etc/cron.d ]; then \
        if [ ! -d /etc/cron.hourly -o ! -d /etc/cron.daily ]; then \
                su root -c "crontab -l > /tmp/crontab-root.save"; \
                /bin/cp -a /tmp/crontab-root.save ./crontab-root.`date
'+%Y%m%d.%H%M%S'`.save; \
                echo "USER'S PREVIOUS CRONTAB SAVED IN CURRENT DIRECTORY
(USING .save SUFFIX)."; \
                su root -c "crontab cron/crontab"; \
        fi \
fi
/bin/sh: -c: line 0: syntax error near unexpected token `-z'
/bin/sh: -c: line 0: `if [ ( -z "/usr/lib/systemd/system" -o ! -d
/usr/lib/systemd/system ) -a ! -d /etc/cron.d ]; then \'
make: *** [install_all] Error 1

This is because parentheses need to be escaped in Makefile.in.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
9 years agoMerge branch 'master' of https://github.com/pschiffe/sysstat
Sebastien GODARD [Tue, 3 Mar 2015 17:07:11 +0000 (18:07 +0100)]
Merge branch 'master' of https://github.com/pschiffe/sysstat

9 years agoDon't look in weird places for programs during configuration
Peter Schiffer [Mon, 2 Mar 2015 20:47:58 +0000 (21:47 +0100)]
Don't look in weird places for programs during configuration

Also, don't pretend that programs exist if they don't (don't use
[value-if-not-found] for some programs).

9 years agopermit hh:mm:ss as well as hh:mm
Steve Kay [Mon, 2 Mar 2015 20:11:42 +0000 (12:11 -0800)]
permit hh:mm:ss as well as hh:mm

9 years agoFixed installation of systemd/cron files on systems w/o systemd
Peter Schiffer [Mon, 2 Mar 2015 16:40:11 +0000 (17:40 +0100)]
Fixed installation of systemd/cron files on systems w/o systemd

9 years agoCreate appropriate directories in DESTDIR if missing
Peter Schiffer [Mon, 2 Mar 2015 14:47:02 +0000 (15:47 +0100)]
Create appropriate directories in DESTDIR if missing

During systemd services / cron files installation to the DESTDIR, some
directories might not exist there, even though they exist outside the DESTDIR.

This is issue because Makefile relies on existence of those directories and
decides what gets installed according to this existence.

This patch creates appropriate directories in DESTDIR if those directories exist
outside of the DESTDIR.

9 years agoReplace spaces with tabs in Makefile.in
Peter Schiffer [Mon, 2 Mar 2015 13:21:41 +0000 (14:21 +0100)]
Replace spaces with tabs in Makefile.in

9 years agoTypo fixed
Sebastien GODARD [Sun, 15 Feb 2015 14:01:46 +0000 (15:01 +0100)]
Typo fixed

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
9 years agoUpdate sysstat(5) manual page
Sebastien GODARD [Sun, 15 Feb 2015 13:52:16 +0000 (14:52 +0100)]
Update sysstat(5) manual page

Be more precise when HISTORY variable is used with system activity data
files named saYYYYMMDD.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
9 years agoSmall fix in FAQ
Sebastien GODARD [Sun, 15 Feb 2015 13:50:15 +0000 (14:50 +0100)]
Small fix in FAQ

Add shell prompt at the beginning of the command line.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>