diff options
| -rw-r--r-- | src/lib/Server/Plugins/DBStats.py | 25 | ||||
| -rw-r--r-- | src/lib/Server/Plugins/__init__.py | 2 | ||||
| -rwxr-xr-x | src/lib/Server/Reports/importscript.py | 2 |
3 files changed, 26 insertions, 3 deletions
diff --git a/src/lib/Server/Plugins/DBStats.py b/src/lib/Server/Plugins/DBStats.py new file mode 100644 index 000000000..410bed4d7 --- /dev/null +++ b/src/lib/Server/Plugins/DBStats.py @@ -0,0 +1,25 @@ +import Bcfg2.Server.Plugin +import Bcfg2.Server.Reports.importscript +import lxml.etree, time + +class DBStats(Bcfg2.Server.Plugin.StatisticsPlugin): + __name__ = 'DBStats' + __version__ = '$Id: $' + + def __init__(self, core, datastore): + self.cpath = "%s/Metadata/clients.xml" % datastore + self.core = core + + def StoreStatistics(self, mdata, xdata): + newstats = xdata.find("Statistics") + newstats.set('time', time.asctime(time.localtime())) + e = lxml.etree.Element('Node', name=mdata.hostname) + e.append(newstats) + container = lxml.etree.Element("ConfigStatistics") + container.append(e) + + # FIXME need to build a metadata interface to expose a list of clients + Bcfg2.Server.Reports.importscript.load_stats( + self.core.metadata.clientdata, container, 0) + + diff --git a/src/lib/Server/Plugins/__init__.py b/src/lib/Server/Plugins/__init__.py index db17e5c26..00c161d64 100644 --- a/src/lib/Server/Plugins/__init__.py +++ b/src/lib/Server/Plugins/__init__.py @@ -2,5 +2,5 @@ __revision__ = '$Revision$' __all__ = ['Account', 'Base', 'Bundler', 'Cfg', 'Hostbase', 'Metadata', - 'Pkgmgr', 'Rules', 'SSHbase', 'Svcmgr', 'TCheetah', + 'Pkgmgr', 'Rules', 'SSHbase', 'Statistics', 'Svcmgr', 'TCheetah', 'SGenshi', 'TGenshi', 'Vhost'] diff --git a/src/lib/Server/Reports/importscript.py b/src/lib/Server/Reports/importscript.py index fbc3c81f9..1b625deec 100755 --- a/src/lib/Server/Reports/importscript.py +++ b/src/lib/Server/Reports/importscript.py @@ -203,8 +203,6 @@ def load_stats(cdata, sdata, vlevel): connection._commit() #Clients are consistent - raise SystemExit, 0 - if __name__ == '__main__': from sys import argv verb = 0 |