From c6e86a67972462fde57a9dbb5fb1b1e87ab5eca4 Mon Sep 17 00:00:00 2001 From: Johannes Findeisen Date: Thu, 30 May 2013 00:45:46 +0200 Subject: [PATCH] new docs for version 0.3 --- docs/api-objects.txt | 3 + docs/class-tree.html | 2 +- docs/help.html | 2 +- docs/identifier-index.html | 26 ++- docs/linspector-module.html | 2 +- docs/linspector-pysrc.html | 2 +- docs/linspector.lib-module.html | 2 +- docs/linspector.lib-pysrc.html | 2 +- docs/linspector.lib.config-module.html | 2 +- docs/linspector.lib.config-pysrc.html | 2 +- docs/linspector.lib.config.config-module.html | 2 +- docs/linspector.lib.config.config-pysrc.html | 2 +- ...pector.lib.config.config.Config-class.html | 2 +- .../linspector.lib.config.filters-module.html | 2 +- docs/linspector.lib.config.filters-pysrc.html | 2 +- ...ector.lib.config.filters.Filter-class.html | 2 +- ...nspector.lib.config.hostgroups-module.html | 2 +- ...inspector.lib.config.hostgroups-pysrc.html | 42 ++-- ...lib.config.hostgroups.HostGroup-class.html | 2 +- ...fig.hostgroups.HostGroupService-class.html | 4 +- docs/linspector.lib.config.hosts-module.html | 2 +- docs/linspector.lib.config.hosts-pysrc.html | 209 +++++++++--------- ...inspector.lib.config.hosts.Host-class.html | 19 +- ...or.lib.config.hosts.HostService-class.html | 2 +- .../linspector.lib.config.layouts-module.html | 2 +- docs/linspector.lib.config.layouts-pysrc.html | 2 +- ...ector.lib.config.layouts.Layout-class.html | 2 +- ...r.lib.config.layouts.LayoutList-class.html | 2 +- .../linspector.lib.config.members-module.html | 2 +- docs/linspector.lib.config.members-pysrc.html | 2 +- ...ector.lib.config.members.Member-class.html | 2 +- ...lib.config.members.MemberFilter-class.html | 2 +- .../linspector.lib.config.periods-module.html | 2 +- docs/linspector.lib.config.periods-pysrc.html | 2 +- ...r.lib.config.periods.CronPeriod-class.html | 2 +- ...r.lib.config.periods.DatePeriod-class.html | 2 +- ...b.config.periods.IntervalPeriod-class.html | 2 +- ...ector.lib.config.periods.Period-class.html | 2 +- ...linspector.lib.config.services-module.html | 2 +- .../linspector.lib.config.services-pysrc.html | 2 +- ...tor.lib.config.services.Service-class.html | 2 +- docs/linspector.lib.core-module.html | 2 +- docs/linspector.lib.core-pysrc.html | 2 +- docs/linspector.lib.core.command-module.html | 2 +- docs/linspector.lib.core.command-pysrc.html | 91 ++++---- ...pector.lib.core.command.Command-class.html | 21 +- docs/linspector.lib.core.daemon-module.html | 2 +- docs/linspector.lib.core.daemon-pysrc.html | 2 +- ...nspector.lib.core.daemon.Daemon-class.html | 2 +- docs/linspector.lib.core.job-module.html | 36 ++- docs/linspector.lib.core.job-pysrc.html | 92 ++++---- ...linspector.lib.core.job.JobInfo-class.html | 4 +- ...tor.lib.core.linspector_daemon-module.html | 2 +- ...ctor.lib.core.linspector_daemon-pysrc.html | 2 +- ...spector_daemon.LinspectorDaemon-class.html | 2 +- docs/linspector.lib.core.logger-module.html | 2 +- docs/linspector.lib.core.logger-pysrc.html | 2 +- ...nspector.lib.core.logger.Logger-class.html | 2 +- docs/module-tree.html | 2 +- docs/toc-everything.html | 3 +- docs/toc-linspector.lib.core.job-module.html | 4 +- 61 files changed, 387 insertions(+), 263 deletions(-) diff --git a/docs/api-objects.txt b/docs/api-objects.txt index b2e7aac..853325c 100644 --- a/docs/api-objects.txt +++ b/docs/api-objects.txt @@ -38,6 +38,7 @@ linspector.lib.core.command.__package__ linspector.lib.core.command-module.html# linspector.lib.core.daemon linspector.lib.core.daemon-module.html linspector.lib.core.daemon.__package__ linspector.lib.core.daemon-module.html#__package__ linspector.lib.core.job linspector.lib.core.job-module.html +linspector.lib.core.job.generateId linspector.lib.core.job-module.html#generateId linspector.lib.core.job.__package__ linspector.lib.core.job-module.html#__package__ linspector.lib.core.linspector_daemon linspector.lib.core.linspector_daemon-module.html linspector.lib.core.linspector_daemon.__package__ linspector.lib.core.linspector_daemon-module.html#__package__ @@ -56,6 +57,7 @@ linspector.lib.config.hostgroups.HostGroupService linspector.lib.config.hostgrou linspector.lib.config.hostgroups.HostGroupService.__str__ linspector.lib.config.hostgroups.HostGroupService-class.html#__str__ linspector.lib.config.hostgroups.HostGroupService.__init__ linspector.lib.config.hostgroups.HostGroupService-class.html#__init__ linspector.lib.config.hosts.Host linspector.lib.config.hosts.Host-class.html +linspector.lib.config.hosts.Host.getHostServiceByName linspector.lib.config.hosts.Host-class.html#getHostServiceByName linspector.lib.config.hosts.Host.__str__ linspector.lib.config.hosts.Host-class.html#__str__ linspector.lib.config.hosts.Host.__init__ linspector.lib.config.hosts.Host-class.html#__init__ linspector.lib.config.hosts.HostService linspector.lib.config.hosts.HostService-class.html @@ -101,6 +103,7 @@ linspector.lib.config.services.Service.__init__ linspector.lib.config.services.S linspector.lib.core.command.Command linspector.lib.core.command.Command-class.html linspector.lib.core.command.Command.getError linspector.lib.core.command.Command-class.html#getError linspector.lib.core.command.Command.__str__ linspector.lib.core.command.Command-class.html#__str__ +linspector.lib.core.command.Command.getAllOutput linspector.lib.core.command.Command-class.html#getAllOutput linspector.lib.core.command.Command.getOutput linspector.lib.core.command.Command-class.html#getOutput linspector.lib.core.command.Command.call linspector.lib.core.command.Command-class.html#call linspector.lib.core.command.Command.getReturnCode linspector.lib.core.command.Command-class.html#getReturnCode diff --git a/docs/class-tree.html b/docs/class-tree.html index 36035c0..e61e0f9 100644 --- a/docs/class-tree.html +++ b/docs/class-tree.html @@ -134,7 +134,7 @@
- Generated by Epydoc 3.0.1 on Wed May 29 06:07:36 2013 + Generated by Epydoc 3.0.1 on Thu May 30 00:45:00 2013
- Generated by Epydoc 3.0.1 on Wed May 29 06:07:36 2013 + Generated by Epydoc 3.0.1 on Thu May 30 00:45:00 2013 - - - - - + + + + + + + + + + @@ -556,7 +564,7 @@
getCommand()
-(in HostService)		getName()
-(in Period)		getOutput()
-(in Command)
generateId()
+(in linspector.lib.core.job)		 getError()
(in Command)		 getNextExecutionTime()
(in JobInfo)
getAllOutput()
+(in Command)		getHostServiceByName()
+(in Host)		getOutput()
+(in Command)
getCommand()
+(in HostService)		getName()
+(in Period)		 getReturnCode()
(in Command)
- Generated by Epydoc 3.0.1 on Wed May 29 06:07:36 2013 + Generated by Epydoc 3.0.1 on Thu May 30 00:45:00 2013
- Generated by Epydoc 3.0.1 on Wed May 29 06:07:37 2013 + Generated by Epydoc 3.0.1 on Thu May 30 00:45:00 2013
- Generated by Epydoc 3.0.1 on Wed May 29 06:07:37 2013 + Generated by Epydoc 3.0.1 on Thu May 30 00:45:00 2013
- Generated by Epydoc 3.0.1 on Wed May 29 06:07:37 2013 + Generated by Epydoc 3.0.1 on Thu May 30 00:45:00 2013
- Generated by Epydoc 3.0.1 on Wed May 29 06:07:37 2013 + Generated by Epydoc 3.0.1 on Thu May 30 00:45:00 2013
- Generated by Epydoc 3.0.1 on Wed May 29 06:07:37 2013 + Generated by Epydoc 3.0.1 on Thu May 30 00:45:00 2013
- Generated by Epydoc 3.0.1 on Wed May 29 06:07:37 2013 + Generated by Epydoc 3.0.1 on Thu May 30 00:45:00 2013
- Generated by Epydoc 3.0.1 on Wed May 29 06:07:37 2013 + Generated by Epydoc 3.0.1 on Thu May 30 00:45:00 2013
- Generated by Epydoc 3.0.1 on Wed May 29 06:07:37 2013 + Generated by Epydoc 3.0.1 on Thu May 30 00:45:01 2013
- Generated by Epydoc 3.0.1 on Wed May 29 06:07:37 2013 + Generated by Epydoc 3.0.1 on Thu May 30 00:45:00 2013
- Generated by Epydoc 3.0.1 on Wed May 29 06:07:37 2013 + Generated by Epydoc 3.0.1 on Thu May 30 00:45:00 2013
- Generated by Epydoc 3.0.1 on Wed May 29 06:07:37 2013 + Generated by Epydoc 3.0.1 on Thu May 30 00:45:00 2013
- Generated by Epydoc 3.0.1 on Wed May 29 06:07:37 2013 + Generated by Epydoc 3.0.1 on Thu May 30 00:45:00 2013
- Generated by Epydoc 3.0.1 on Wed May 29 06:07:37 2013 + Generated by Epydoc 3.0.1 on Thu May 30 00:45:00 2013 27 28
29 -class HostGroupService: -
30 - def __init__(self, service, periods): -
31 self.service = service -32 self.periods = periods +
30 - def __init__(self, services, periods): +
31 self.services = services +32 self.periods = periods
33
34 - def __str__(self): -
35 return "HostgroupService { " + str(self.service) + ", " + str(self.periods) + "}" +
35 return "HostgroupService { " + str([str(s) for s in self.services]) + ", " + str([p.name for p in self.periods]) + "}"
36 37
38 -def parseHostGroupList(hostgroups, hosts, members, periods, services, log):
39 parsedHostGroups = [] -40 for hgname, hgValues in hostgroups.items(): -41 hostGroup = HostGroup(hgname) -42 hostGroup.members = filter(lambda m: m.nameid in hgValues['members'], members) -43 hostGroup.hosts = filter(lambda h: h.name in hgValues['hosts'], hosts) +40 for hgname, hgValues in hostgroups.items(): +41 hostGroup = HostGroup(hgname) +42 hostGroup.members = [m for m in members if m.nameid in hgValues['members']] +43 hostGroup.hosts = [h for h in hosts if h.name in hgValues['hosts']] 44 hostGroup.threshold = hgValues['threshold'] 45 if 'parent' in hgValues: 46 hostGroup.parent = hgValues['parent'] -47 hostGroup.services = [] +47 hostGroup.services = [] 48 for serviceName, servicePeriods in hgValues['services'].items(): -49 service = filter(lambda s: s.name in serviceName, services) -50 if len(service) == 0: -51 log.w("Service " + serviceName + " is not defined for Hostgroup " + hgname) -52 continue -53 service = service[0] -54 hostGroupPeriods = filter(lambda p: p.name in servicePeriods, periods) -55 hostGroup.services.append(HostGroupService(service, hostGroupPeriods)) -56 parsedHostGroups.append(hostGroup) -57 return parsedHostGroups -
58