diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 0000000..5854041 --- /dev/null +++ b/AUTHORS @@ -0,0 +1 @@ +Dag Wieers diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..d60c31a --- /dev/null +++ b/COPYING @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..02133f5 --- /dev/null +++ b/ChangeLog @@ -0,0 +1,22 @@ +* 0.4 +- Added interrupt stats +- Order of the stats adhere the order of the options +- Interval more precise, using signals instead of sleep +- Modular rewrite using classes +- Added -D, -I and -N options to customize list +- Allow to specify 'total' for -D and -N to get aggregated numbers +- Added --vmstat option, vmstat alike output +- Implemented a basic interface and disk 'discovery' function +- Replaced hardcoded 4096 by resource.getpagesize() +- Initial public release + +* 0.3 +- Added load stats +- Added memory stats +- Output now fits into space and adds unit +- Converted all values to bytes + +* 0.2 +- Added disk io +- Added proc stats +- Important layout changes diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..5d2d6d5 --- /dev/null +++ b/Makefile @@ -0,0 +1,10 @@ +prefix = /usr +sysconfdir = /etc +bindir = $(prefix)/bin +mandir = $(datadir)/man + +all: install + +install: +# -[ ! -f $(DESTDIR)$(sysconfdir)/dstat.conf ] && install -D -m0644 dstat.conf $(DESTDIR)$(sysconfdir)/dstat.conf + install -D -m0755 dstat $(DESTDIR)$(bindir)/dstat diff --git a/README b/README new file mode 100644 index 0000000..b7311fb --- /dev/null +++ b/README @@ -0,0 +1,23 @@ +Dstat is a versatile replacement for vmstat, iostat and ifstat. Dstat +overcomes some of the limitations and adds some extra features. + +Dstat allows you to view all of your system resources instantly, +you can eg. compare disk usage in combination with interrupts from +your IDE controller, or compare the network bandwidth numbers +directly with the disk throughput (in the same interval). + +Dstat also cleverly gives you the most detailed information in +columns and clearly indicates in what magnitude and unit the output +is displayed. Less confusion, less mistakes. + +Dstat is also unique in letting you aggregate block device throughput +for a certain diskset or network bandwidth for a group of interfaces, +ie. you can see the throughput for all the block devices that make up +a single filesystem or storage system. + +You can customize your dstat output from /etc/dstat.conf and you can +write your own dstat modules to plug into the dstat output. + +Dstat's output, in its current form, is not very useful to be post- +processed by other tools. It's mostly meant for allowing humans to +interprete real-time data as easy as possible. diff --git a/TODO b/TODO new file mode 100644 index 0000000..cf4cc51 --- /dev/null +++ b/TODO @@ -0,0 +1,23 @@ +### Usability ++ Use /etc/dstat.conf to influence output ++ Add --config option ++ Add -o/--output option ++ Make -I eth0,acpi or -I ide0,yenta work ++ Show header when out of display instead of 22 lines (see term ?) ++ Maybe add colors to indicate units better (may become ugly) ++ Allow to force to given magnitude + +### Extensions ++ Add all stats to seperate modules and allow people to plugin their own modules + +### Statistics ++ Add application stats ( -a or -A pid,cmd) ++ Add ip stats (icmp, tcp, udp) ++ Add ntp stats ++ Add user stats (number of users logged on) ++ Add --diff option to print intermediate results (ie. when delay = 5, you see 1sec updates in other color) ++ Look into interfacing with bind, sendmail, postfix, squid, amavisd, ++ Look into interfacing with laus + +### Bugs ++ Implement protection against counter rollovers diff --git a/dstat b/dstat new file mode 100755 index 0000000..514baf8 --- /dev/null +++ b/dstat @@ -0,0 +1,566 @@ +#!/usr/bin/python2 + +import os, sys, glob, re, shutil, getopt, popen2 +import ConfigParser, urlparse, time, signal, resource + +VERSION = "0.4" + +enable = ('yes', 'on', 'true', '1') +disable = ('no', 'off', 'false', '0') + +class Options: + def __init__(self, args): + self.count = -1 + self.sleep = 1 + self.disklist = None + self.intlist = None + self.netlist = None + + try: + opts, args = getopt.getopt (args, 'acdghilmnpsvyD:I:N:', + ['all', 'cpu', 'disk', 'help', 'int', 'load', 'mem', 'net', + 'page', 'proc', 'swap', 'sys', 'version', '--vm', 'vmstat']) + except getopt.error, exc: + print 'dstat: %s, try dstat -h for a list of all the options' % str(exc) + sys.exit(1) + + self.modlist = [] + + for opt, arg in opts: + if opt in ['-a', '--all']: + self.modlist = [ 'cpu', 'disk', 'mem', 'net', 'page', 'sys' ] + elif opt in ['-c', '--cpu']: + self.modlist.append('cpu') + elif opt in ['-h', '--help']: + self.usage() + self.help() + sys.exit(0) + elif opt in ['-d', '--disk']: + self.modlist.append('disk') + elif opt in ['-D']: + self.disklist = arg.split(',') + elif opt in ['-i', '--int']: + self.modlist.append('int') + elif opt in ['-g', '--page']: + self.modlist.append('page') + elif opt in ['-I']: + self.intlist = arg.split(',') + elif opt in ['-m', '--mem']: + self.modlist.append('mem') + elif opt in ['-l', '--load']: + self.modlist.append('load') + elif opt in ['-n', '--net']: + self.modlist.append('net') + elif opt in ['-N']: + self.netlist = arg.split(',') + elif opt in ['-p', '--proc']: + self.modlist.append('proc') + elif opt in ['-s', '--swap']: + self.modlist.append('swap') + elif opt in ['-y', '--sys']: + self.modlist.append('sys') + elif opt in ['-v', '--version']: + self.version() + sys.exit(0) + elif opt in ['--vm', '--vmstat']: + self.modlist = [ 'proc', 'mem', 'page', 'disk', 'sys', 'cpu' ] + self.disklist = ('total',) + + if not self.modlist: + self.modlist = [ 'cpu', 'disk', 'net', 'sys' ] + + if len(args) > 0: + self.sleep = int(args[0]) + + if len(args) > 1: + self.count = int(args[1]) + + def version(self): + print 'Dstat %s' % VERSION + print 'Written by Dag Wieers ' + print 'Homepage at http://dag.wieers.com/home-made/dstat/>' + print + print 'Platform %s/%s' % (os.name, sys.platform) + print 'Python %s' % sys.version + + def usage(self): + print 'usage: dstat [-acdgilmnpsy] [-D dev1..] [-I #..] [-N if1..] [delay [count]]' + + def help(self): + print '''Versatile tool for generating system resource statistics + +Dstat options: + -a, --all enable cpu, disk, mem, net, page and sys (eq. -cdmngy) + -c, --cpu enable cpu stats + -d, --disk enable disk stats + -D total,dev1 include dev1 and total number + -g, --page enable page stats + -i, --int enable interrupt stats + -I 5,9 include int5 and int9 + -l, --load enable load stats + -m, --mem enable memory stats + -n, --net enable network stats + -N if2,total include if2 and total + -p, --proc enable process stats + -s, --swap enable swap stats + -y, --sys enable system stats +''' + +class Config: + def __init__(self): + self.configfile = op.configfile + self.cfg = ConfigParser.ConfigParser() + + (s,b,p,q,f,o) = urlparse.urlparse(self.configfile) + if s in ('http', 'ftp', 'file'): + configfh = urllib.urlopen(self.configfile) + try: + self.cfg.readfp(configfh) + except ConfigParser.MissingSectionHeaderError, e: + die(6, 'Error accessing URL: %s' % self.configfile) + else: + if os.access(self.configfile, os.R_OK): + try: + self.cfg.read(self.configfile) + except: + die(7, 'Syntax error reading file: %s' % self.configfile) + else: + die(6, 'Error accessing file: %s' % self.configfile) + + def getoption(self, section, option, var): + "Get an option from a section from configfile" + try: + var = self.cfg.get(section, option) + info(3, 'Setting option %s in section [%s] to: %s' % (option, section, var)) + except ConfigParser.NoSectionError, e: + info(4, 'Failed to find section [%s] in %s' % (section, op.configfile)) + except ConfigParser.NoOptionError, e: +# info(4, 'Failed to find option %s in [%s], set to default: %s' % (option, section, var)) + info(4, 'Setting option %s in section [%s] to: %s (default)' % (option, section, var)) + return var + +class dstat: + def init(self): + self.title1 = self.set_title1() + self.title2 = self.set_title2() + + self.val = {} + for i in self.vars: self.val[i] = 0 + + self.cn1 = {} + for i in self.vars: self.cn1[i] = 0 + + self.cn2 = {} + for i in self.vars: self.cn2[i] = 0 + + def set_title1(self): + max = len(self.vars) * self.len + len(self.vars) - 1 + return self.name.center(max).replace(' ', '-') + + def set_title2(self): + str = '' + for c, i in enumerate(self.nick): + str = str + i.center(self.len).replace(' ', '_') + if c != len(self.nick)-1: + str = str + ' ' + return str + + def stats(self): + pass + + def show(self): + sep = ' ' + for c, name in enumerate(self.vars): + if self.format == '%s': + sys.stdout.write(self.format % conv(self.len, self.val[name])) + elif self.format in ('%s %s', '%s:%s', '%s-%s'): + sys.stdout.write(self.format % convlist(self.len, self.val[name])) + sep = ':' + else: + sys.stdout.write(self.format % self.val[name]) + if c != len(self.vars)-1: + sys.stdout.write(sep) + +class dstat_cpu(dstat): + def __init__(self): + self.name = 'cpu usage' + self.vars = ('user', 'sys', 'idle', 'wait') + self.len = 3 + self.format = '%3d' + self.nick = ( 'usr', 'sys', 'idl', 'wai' ) + self.init() + self.cn1['sum'] = 0 + + def stats(self): + for line in open('/proc/stat', 'r').readlines(): + list = line.split() + cn = map(int, list[1:]) + if list[0] == 'cpu': + self.cn2['user'] = cn[0] + self.cn2['sys'] = cn[2] + self.cn2['idle'] = cn[3] + self.cn2['wait'] = cn[4] + self.cn2['sum'] = self.cn2['user'] + self.cn2['sys'] + self.cn2['idle'] + self.cn2['wait'] + + for name in self.vars: + self.val[name] = round((self.cn2[name]-self.cn1[name])*100.0/(self.cn2['sum']-self.cn1['sum'])) + + self.cn1.update(self.cn2) + +class dstat_disk(dstat): + def __init__(self): + self.format = '%s %s' + self.len = 11 + self.name = 'disk i/o' + if op.disklist: + self.vars = op.disklist + else: + self.vars = self.discover() +# self.vars = ('hda', 'hdc', 'sda', 'local', 'total') + self.diskset = { + 'local': ('sda', 'hda', 'hdc'), + 'lores': ('sdb', 'sdc', 'sdd', 'sde', 'sdf', 'sdg', 'sdh', 'sdi', 'sdj', 'sdk', 'sdl', 'sdm', 'sdn', 'sdo', 'sdp', 'sdq', 'sdr', 'sds', 'sdt'), + 'hires': ('sdu', 'sdv', 'sdw', 'sdx', 'sdy', 'sdz', 'sdaa', 'sdab', 'sdac', 'sdad' ), + } + self.nick = self.vars + self.init() + + for name in self.vars: self.cn1[name] = (0, 0) + self.cn1['total'] = (0, 0) + for name in self.vars: self.cn2[name] = (0, 0) + self.cn2['total'] = (0, 0) + for name in self.vars: self.val[name] = (0, 0) + self.val['total'] = (0, 0) + + def discover(self): + retlist = [] + for line in open('/proc/diskstats', 'r').readlines(): + list = line.split(); dev = list[2] + if dev in ('hda', 'hdb', 'hdc', 'hdd', 'sda', 'sdb', 'sdc', 'sdd'): + retlist.append(dev) + if len(retlist) > 2: retlist = retlist[0:2] + retlist.sort() + return retlist +# return ('local', 'lores', 'hires') + + def stats(self): + for name in self.vars: self.cn2[name] = (0, 0) + for line in open('/proc/diskstats', 'r').readlines(): + list = line.split() + cn = map(int, list[3:]) + name = list[2] + if name in self.vars: + self.cn2[name] = ( self.cn2[name][0] + cn[2] * 512 / op.sleep, self.cn2[name][1] + cn[6] * 512 / op.sleep) +# for set in self.diskset: + for set in self.vars: + if set in self.diskset and name in self.diskset[set]: + self.cn2[set] = ( self.cn2[set][0] + cn[2] * 512 / op.sleep, self.cn2[set][1] + cn[6] * 512 / op.sleep) + if len(cn) > 7: + self.cn2['total'] = ( self.cn2['total'][0] + cn[2] * 512 / op.sleep, self.cn2['total'][1] + cn[6] * 512 / op.sleep) + + if count != 0: + for name in self.cn2: + self.val[name] = ( self.cn2[name][0]-self.cn1[name][0], self.cn2[name][1]-self.cn1[name][1] ) + + self.cn1.update(self.cn2) + +class dstat_int(dstat): + def __init__(self): + self.format = '%4d' + self.len = 4 + self.name = 'interrupts' + if op.intlist: + self.vars = op.intlist + else: + self.vars = self.discover() + self.nick = self.vars + self.init() + + def discover(self): + return ('5', '9', '10', '14', '15') + + def stats(self): + for line in open('/proc/interrupts', 'r').readlines(): + list = line.split() + name = list[0].split(':')[0] + if name in self.vars: + self.cn2[name] = int(list[1]) + + if count != 0: + for name in self.cn2: + self.val[name] = self.cn2[name]-self.cn1[name] + + self.cn1.update(self.cn2) + +class dstat_load(dstat): + def __init__(self): + self.len = 4 + self.format = '%4.2f' + self.name = 'load avg' + self.nick = ('_1m', '_5m', '_15m') + self.vars = ('load1', 'load5', 'load15') + self.init() + + def stats(self): + for line in open('/proc/loadavg', 'r').readlines(): + list = line.split() + self.val['load1'] = float(list[0]) + self.val['load5'] = float(list[1]) + self.val['load15'] = float(list[2]) + +class dstat_mem(dstat): + def __init__(self): + self.name = 'memory usage' + self.len = 5 + self.format = '%s' + self.nick = ('used', 'free', 'buff', 'cach') + self.vars = ('MemUsed', 'MemFree', 'Buffers', 'Cached') + self.init() + + def stats(self): + for line in open('/proc/meminfo', 'r').readlines(): + list = line.split() + name = list[0].split(':')[0] + if name in self.vars + ('MemTotal',): + self.val[name] = int(list[1]) * 1024 + self.val['MemUsed'] = self.val['MemTotal'] - self.val['MemFree'] - self.val['Buffers'] - self.val['Cached'] + +class dstat_net(dstat): + def __init__(self): + self.name = 'network' + self.len = 11 + self.format = '%s %s' + if op.netlist: + self.vars = op.netlist + else: + self.vars = self.discover() + self.nick = self.vars + self.init() + + for name in self.vars: self.cn1[name] = (0, 0) + self.cn1['total'] = (0, 0) + for name in self.vars: self.cn2[name] = (0, 0) + self.cn2['total'] = (0, 0) + for name in self.vars: self.val[name] = (0, 0) + self.val['total'] = (0, 0) + + def discover(self): + retlist = [] + for line in open('/proc/net/dev', 'r').readlines(): + list = line.split(); iface = list[0].split(':')[0] + if iface in ('eth0', 'eth1', 'eth2', 'wifi0', 'bond0'): + retlist.append(iface) + if len(retlist) > 2: retlist = retlist[0:2] + retlist.sort() + return retlist +# return ('bond0', 'eth0', 'eth1') + + def stats(self): + self.cn2['total'] = (0, 0) + for line in open('/proc/net/dev', 'r').readlines(): + list = line.split() + list2 = list[0].split(':') + name = list2[0] + if len(list2) > 1 and list2[1].strip(): + list = list2[1:] + list[1:] + else: + list = list[1:] + if name in (self.vars) : + cn = map(int, list) + self.cn2[name] = ( round(cn[0] /op.sleep), round(cn[8] /op.sleep) ) + if name in ('bond0', 'bond1', 'bond2', 'eth0', 'eth1', 'eth2', 'eth3', 'eth4', 'eth5'): + cn = map(int, list) + self.cn2['total'] = ( self.cn2['total'][0] + round(cn[0] /op.sleep), self.cn2['total'][1] + round(cn[8] /op.sleep)) + + if count != 0: + for name in self.cn2: + self.val[name] = ( self.cn2[name][0]-self.cn1[name][0], self.cn2[name][1]-self.cn1[name][1] ) + + self.cn1.update(self.cn2) + +class dstat_page(dstat): + def __init__(self): + self.name = 'paging' + self.format = '%s' + self.len = 5 + self.vars = ('pswpin', 'pswpout') + self.nick = ('in', 'out') + self.init() + + def stats(self): + for line in open('/proc/vmstat', 'r').readlines(): + list = line.split() + cn = map(int, list[1:]) + if list[0] in self.vars: + self.cn2[list[0]] = cn[0] * pagesize / op.sleep + if count != 0: + for name in self.vars: + self.val[name] = self.cn2[name]-self.cn1[name] + self.cn1.update(self.cn2) + +class dstat_proc(dstat): + def __init__(self): + self.name = 'procs' + self.format = '%2d' + self.len = 2 +# self.vars = ('procs_running', 'procs_blocked', 'processes') + self.vars = ('procs_running', 'procs_blocked') +# self.nick = ('ru', 'bl', 'nw') + self.nick = ('ru', 'bl') + self.init() + + def stats(self): + for line in open('/proc/stat', 'r').readlines(): + list = line.split() + cn = map(int, list[1:]) + if list[0] in ('processess'): + self.cn2[list[0]] = cn[0] + elif list[0] in self.vars: + self.val[list[0]] = cn[0] + if count != 0: + self.val['processes'] = self.cn2['processes']-self.cn1['processes'] + self.val['procs_running'] = self.val['procs_running']-1 + self.cn1.update(self.cn2) + +class dstat_swap(dstat): + def __init__(self): + self.name = 'swap' + self.len = 5 + self.format = '%s' + self.nick = ('used', 'free') + self.vars = ('SwapUsed', 'SwapFree') + self.init() + + def stats(self): + for line in open('/proc/meminfo', 'r').readlines(): + list = line.split() + name = list[0].split(':')[0] + if name in self.vars + ('SwapTotal',): + self.val[name] = int(list[1]) * 1024 + self.val['SwapUsed'] = self.val['SwapTotal'] - self.val['SwapFree'] + +class dstat_sys(dstat): + def __init__(self): + self.name = 'system' + self.format = '%5d' + self.len = 5 + self.nick = ('int', 'csw') + self.vars = ('intr', 'ctxt') + self.names = { 'intr': 'int', 'ctxt': 'csw' } + self.init() + + def stats(self): + for line in open('/proc/stat', 'r').readlines(): + list = line.split() + cn = map(int, list[1:]) + if list[0] in self.vars: + self.cn2[list[0]] = cn[0] /op.sleep + + if count != 0: + for name in self.vars: + self.val[name] = self.cn2[name]-self.cn1[name] + self.cn1.update(self.cn2) + + def show(self): + for count, name in enumerate(self.vars): + sys.stdout.write('%5d' % self.val[name]) + if count != len(self.vars)-1: + sys.stdout.write(' ') + +def convlist(max, list): + max = max / len(list) + retlist = () + for var in list: + retlist = retlist + (conv(max, var), ) + return retlist + +def conv(max, var): + c = 0 + var = round(var) + while len(str(int(var))) > max-1: + var = int(var / 1024.0) + c = c + 1 + if c == 0: unit = 'B' ### 'b' is better for the eyes than 'B' + elif c == 1: unit = 'k' + elif c == 2: unit = 'm' + elif c == 3: unit = 'g' + elif c == 4: unit = 't' + elif c == 5: unit = 'p' + return str(int(var)).rjust(max-1) + unit + +def handler(signum, frame): + pass + +def main(): + global count, pagesize + count = 0 + pagesize = resource.getpagesize() + + olist = [] + for mod in op.modlist: + if mod == 'cpu': olist.append(dstat_cpu()) + elif mod == 'disk': olist.append(dstat_disk()) + elif mod == 'int': olist.append(dstat_int()) + elif mod == 'load': olist.append(dstat_load()) + elif mod == 'mem': olist.append(dstat_mem()) + elif mod == 'net': olist.append(dstat_net()) + elif mod == 'page': olist.append(dstat_page()) + elif mod == 'proc': olist.append(dstat_proc()) + elif mod == 'swap': olist.append(dstat_swap()) + elif mod == 'sys': olist.append(dstat_sys()) + +# sys.setcheckinterval(op.sleep * 1.5 * 100) + signal.signal(signal.SIGALRM, handler) + signal.alarm(op.sleep) + while count != op.count: + + if count % 23 == 0: + for c, o in enumerate(olist): + sys.stdout.write(o.title1) + if c != len(olist)-1: + sys.stdout.write(' ') + sys.stdout.write('\n') + + for c, o in enumerate(olist): + sys.stdout.write(o.title2) + if c != len(olist)-1: + sys.stdout.write('|') + sys.stdout.write('\n') + + for c, o in enumerate(olist): + o.stats() + o.show() + if c != len(olist)-1: + sys.stdout.write('|') + sys.stdout.write('\n') + + count = count + 1 + + if count != op.count: + signal.pause() + signal.alarm(op.sleep) + +### Workaround for python <= 2.2.1 +try: + True, False +except NameError: + True = 1 + False = 0 +Yes = yes = On = on = True +No = no = Off = off = False + +### Main entrance +if __name__ == '__main__': + op=Options(sys.argv[1:]) +# cf=Config() + try: + main() + except KeyboardInterrupt, e: + print 'Exiting on user request' + sys.exit(6) + except OSError, e: +# print e.errno + print 'OSError: %s' %e + sys.exit(7) + +# vim:ts=4:sw=4 diff --git a/dstat.conf b/dstat.conf new file mode 100644 index 0000000..0f41d77 --- /dev/null +++ b/dstat.conf @@ -0,0 +1,36 @@ +### Dstat configuration file +[main] +interval = 5 +diff = 1 +show = cpu disk net sys + +[cpu] +show = user sys idle wait + +[ints] +show = 5 9 10 14 15 + +[disk] +show = hda hdc lores hires total +lores = sd[b-t] +hires = sd[u-z] sda[a-d] +total = sd[b-z] sda[a-d] + +[load] +show = 1 5 15 + +[mem] +show = used buffers cache free + +[net] +show = bond0 eth0 eth1 +#show = bond? eth? + +[proc] +show = run blocked + +[swap] +show = in out + +[sys] +show = int int diff --git a/dstat.spec b/dstat.spec new file mode 100644 index 0000000..5f5a28d --- /dev/null +++ b/dstat.spec @@ -0,0 +1,68 @@ +# $Id$ +# Authority: dag +# Upstream: Dag Wieers + +Summary: Versatile vmstat, iostat and ifstat replacement +Name: dstat +Version: 0.4 +Release: 1 +License: GPL +Group: System Environment/Base +URL: http://dag.wieers.com/home-made/dstat/ + +Packager: Dag Wieers +Vendor: Dag Apt Repository, http://dag.wieers.com/apt/ + +Source: http://dag.wieers.com/home-made/dstat/dstat-%{version}.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root + +Requires: python + +%description +Dstat is a versatile replacement for vmstat, iostat and ifstat. Dstat +overcomes some of the limitations and adds some extra features. + +Dstat allows you to view all of your system resources instantly, +you can eg. compare disk usage in combination with interrupts from +your IDE controller, or compare the network bandwidth numbers +directly with the disk throughput (in the same interval). + +Dstat also cleverly gives you the most detailed information in +columns and clearly indicates in what magnitude and unit the output +is displayed. Less confusion, less mistakes. + +Dstat is also unique in letting you aggregate block device throughput +for a certain diskset or network bandwidth for a group of interfaces, +ie. you can see the throughput for all the block devices that make up +a single filesystem or storage system. + +You can customize your dstat output from /etc/dstat.conf and you can +write your own dstat modules to plug into the dstat output. + +Dstat's output, in its current form, is not very useful to be post- +processed by other tools. It's mostly meant for allowing humans to +interprete real-time data as easy as possible. + +%prep +%setup + +%build + +%install +%{__rm} -rf %{buildroot} +%makeinstall + +%clean +%{__rm} -rf %{buildroot} + +%files +%defattr(-, root, root, 0755) +%doc AUTHORS ChangeLog COPYING README TODO +#%doc *.conf +#%config(noreplace) %{_sysconfdir}/dconf.conf +#%config(noreplace) %{_sysconfdir}/dconf-custom.conf +%{_bindir}/dstat + +%changelog +* Tue Oct 26 2004 Dag Wieers - 0.4-1 +- Updated to release 0.4.