From 92bf7d380893d3e376a5e358f3d7fe03fec80aae Mon Sep 17 00:00:00 2001 From: navid Date: Tue, 4 Sep 2007 08:27:59 +0000 Subject: Merged branch navid-dev r372:389 into the trunk. git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@390 ef72aa8b-4018-0410-8976-d6e080ef94d8 --- src/README | 10 +- src/extras/htmlog | 407 ++++++++++++++++++++---------------- src/lib/sos/helpers.py | 64 +++++- src/lib/sos/plugins/autofs.py | 9 +- src/lib/sos/plugins/cluster.py | 52 +++-- src/lib/sos/plugins/devicemapper.py | 22 +- src/lib/sos/plugins/filesys.py | 24 +-- src/lib/sos/plugins/general.py | 4 +- src/lib/sos/plugins/kernel.py | 4 +- src/lib/sos/plugins/named.py | 32 +-- src/lib/sos/plugins/networking.py | 2 +- src/lib/sos/plugins/rpm.py | 4 +- src/lib/sos/plugins/squid.py | 6 +- src/lib/sos/plugins/yum.py | 8 +- src/lib/sos/plugintools.py | 14 +- src/lib/sos/policyredhat.py | 126 +++++++---- src/setup.py | 2 +- src/sos.spec | 3 +- src/sosreport | 80 +++++-- src/sosreport.1 | 16 +- 20 files changed, 534 insertions(+), 355 deletions(-) diff --git a/src/README b/src/README index f1dbf2c7..b166c674 100644 --- a/src/README +++ b/src/README @@ -9,23 +9,23 @@ to contribute, and for more information, please visit there. To access to the public source code repository for this project run: - svn checkout https://sos.108.redhat.com/svn/sos/trunk sos + svn export http://svn.fedoraproject.org/svn/hosted/sos/trunk sos --username guest -(all the following as root) -to install locally ==> make install +to install locally (as root) ==> make install to build an rpm ==> make rpm See the Makefile. -Maintainers: +Maintainer: Navid Sheikhol-Eslami -Contributors: +Developers and Contributors: Steve Conklin Pierre Amadio John Berninger + Adam Stokes Thanks to: diff --git a/src/extras/htmlog b/src/extras/htmlog index 387a5d90..87d9e9c1 100755 --- a/src/extras/htmlog +++ b/src/extras/htmlog @@ -2,7 +2,7 @@ #from optparse import OptionParser, Option import time, sys, os, glob -import getopt +import getopt, re #__cmdParser__ = OptionParser() #__cmdParser__.add_option("-i", "--input", action="append", @@ -13,6 +13,178 @@ import getopt # help="How obnoxious we're being about telling the user what we're doing.") #(__cmdLineOpts__, __cmdLineArgs__)=__cmdParser__.parse_args() +class htmlgen_class: + + def __init__(self): + self.html_fname_base = "/tmp/something" + self.page_num = 0 + self.page_line = 0 + self.page_fp = None + self.cur_time = None + self.old_time = None + + self.summary_fp = open(self.html_fname_base + ".html", "w") + self.summary_fp.write("

%s' % (self.page_num-1,self.page_line,event) ) + else: + stime = time.strftime("%H:%M:%S", new_time) + + if not self.old_time or self.old_time != new_time: + self.page_fp.write("""

Generated by SOS htmlogger 1.0 on March 16th 2008
Time	node-1	node-2	node-3
%s
%s
%s	" + msg + "

%s Link

- if not previous_date or previous_date != lowest_date: - print """

""" % (row_class, time.strftime("%H:%M:%S", lowest_date) ) - else: - print """

""" % (row_class, time.strftime("%H:%M:%S", lowest_date) ) + elif re.match(r'.*fence ".*" success', hosts[host].cur_msg()): + events.append(host + " " + hosts[host].cur_msg()) - for host in hosts: - if hosts[host].time() == lowest_date: -# print "

" % hosts[host].tell() - print "

" -# print "

" % hosts[host].tell() - else: - print "

" - print "

Generated by SOS htmlogger 1.0 on March 16th 2008
Time	node-1	node-2	node-3
%s
%s
%s	%d	" + hosts[host].readmsg() + "	%d