linspector/linspector-old
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

whitespacing.... :)

Browse source
This commit is contained in:
Johannes Findeisen 2013-06-18 02:58:40 +02:00
commit 927fff0c5e
22 changed files with 66 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/config/hostgroups.py
View file

@ -44,16 +44,14 @@ class HostGroup:
def _to_config_dict(self, configDict):
me = {}
me["members"] = [member.nameid for member in self.get_members()]
me["hosts"] = self.hosts
me["hosts"] = self.hosts
me["parents"] = [hg.get_name() for hg in self.get_parents()]
#TODO implement delegation
#me["services"] = [service._to_config_dict(configDict) for service in self.get_services()]
#me["processors"] = [processor._to_config_dict(configDict) for processor in self.get_processors()]
configDict["hostgroups"][self.get_name()] = me
def __add_internal(self,l,item):
def __add_internal(self, l, item):
if isinstance(item, list):
l.extend(item)
else:
@ -91,7 +89,6 @@ class HostGroup:
def get_members(self):
return self.members
def __str__(self):
ret = "HostGroup: " + self.name + " threshold: " + str(self.threshold) + " parent: " + self.parent + "\n"
@ -140,4 +137,4 @@ def parseHostGroupList(hostgroups, hosts, members, periods, services, log):
hostGroupPeriods = [p for p in periods if p.name in servicePeriods]
hostGroup.services.append(HostGroupService(services, hostGroupPeriods))
parsedHostGroups.append(hostGroup)
return parsedHostGroups
return parsedHostGroups

3
lib/config/hosts.py
View file

@ -115,5 +115,4 @@ def parseHostList(hosts, services, log):
log.w("Service " + servicename + " not defined in host " + host.name)
#replace host.service member by parsed HostService Objects
host.services = hostServices
return parsedHosts
return parsedHosts

7
lib/config/layouts.py
View file

@ -16,7 +16,6 @@ class Layout:
else:
self._hostgroups = hostgroups
def _to_config_dict(self, configDict):
me = {}
me["hostgroups"] = [hg.name for hg in self.get_hostgroups()]
@ -24,8 +23,7 @@ class Layout:
configDict["layouts"][self.get_name()] = me
for hostgroup in self.get_hostgroups():
hostgroup._to_config_dict(configDict)
def get_name(self):
return self._name
@ -35,7 +33,6 @@ class Layout:
def get_hostgroups(self):
return self._hostgroups
def __str__(self):
ret = "Layout: 'Name:" + str(self.name) + "', 'Enabled: " + str(self.enabled) + " "
for group in self.hostgroups:
@ -78,4 +75,4 @@ class LayoutList:
ret += "Plugins: " + str(self.plugins) + "\n"
for layout in self.layouts:
ret += str(layout) + "\n"
return ret
return ret

4
lib/config/members.py
View file

@ -27,8 +27,6 @@ class Member:
for f in self.filters:
ret += str(f)
return ret
class MemberFilter:
@ -56,4 +54,4 @@ def parseMemberList(members, filters, log):
if not found:
log.w("filter: " + filtername + " is not defined in member " + member.name)
member.filters = mFilter
return parsedMembers
return parsedMembers

55
lib/config/parser.py
View file

@ -1,6 +1,5 @@
from os.path import isfile
import json
import imp
import sys
from layouts import Layout
@ -8,13 +7,11 @@ from hostgroups import HostGroup
from members import Member
from periods import CronPeriod, DatePeriod, IntervalPeriod
from lib.services.service import Service
from lib.processors.processor import Processor
from lib.parsers.parser import Parser
from lib.tasks.task import Task
MOD_SERVICES = "services"
MOD_PROCESSORS = "processors"
MOD_PARSERS = "parsers"
@ -40,15 +37,14 @@ class ConfigurationException(Exception):
return repr(self.msg)
class ConfigParser:
def __init__(self, log):
'''
"""
initializes a new ConfigParser Object
params:
log: pre configured logger Object to post messages while parsing"
'''
"""
self.log = log
self.hostgroups = {}
self.members = {}
@ -65,12 +61,12 @@ class ConfigParser:
layout._to_config_dict(configDict)
def _read_json_config(self, configFilename):
'''
"""
reads the config File and returns a dictionary, while lowering the first keys
params:
configFilename: the path under which the configuration file should be found
'''
"""
if not isfile(configFilename):
msg = "config file not found at " + str(configFilename)
raise ConfigurationException(msg, self.log)
@ -84,11 +80,11 @@ class ConfigParser:
return json.loads(config)
def _get_as_list(self, configValue):
'''
"""
In some cases the config permits to define a list or a single value.
returns the value as list
'''
"""
return configValue if isinstance(configValue, list) else [configValue]
def _create_raw_Object(self, jsonDict, msgName, creator):
@ -114,9 +110,9 @@ class ConfigParser:
return layouts
def create_hostgroups_from_json(self, jsonHostGroups):
'''
"""
creates Hostgroups from the jsonConfig
'''
"""
hostgroups = []
for hgName, hgValues in jsonHostGroups.items():
try:
@ -128,9 +124,9 @@ class ConfigParser:
return hostgroups
def create_members_from_json(self, jsonMembers):
'''
"""
creates Members from the jsonConfig
'''
"""
members = []
for memberName, memberValues in jsonMembers.items():
try:
@ -172,7 +168,6 @@ class ConfigParser:
self.log.w("Error while replace: " + str(Exception))
del items[:]
items.extend(repl)
def replace_pointer(self, objectList, replObjectList, id_list_func, id_get_func):
for obj in objectList:
@ -186,12 +181,8 @@ class ConfigParser:
del idList[:]
idList.extend(replacements)
def parse_config(self, configFilename):
'''
"""
parses the json configuration and returns a list of layouts,
which contains all nessesary information of the config file.
It will only parse nessesary Objects.
@ -202,7 +193,7 @@ class ConfigParser:
params:
configFilename: indicates which configuration file to parse
'''
"""
self.jsonDict = self._read_json_config(configFilename)
@ -214,8 +205,7 @@ class ConfigParser:
for layout in layouts:
for hgName in layout.get_hostgroups():
hostgroupNames.add(hgName)
jsonHostgroups = {}
for hgName in hostgroupNames:
if not hgName in self.jsonDict[KEY_HOSTGROUPS]:
@ -244,8 +234,6 @@ class ConfigParser:
self.members = self.create_members_from_json(jsonMembers)
def parsePeriodList(name, values):
if "date" in values:
return DatePeriod(name, **values)
@ -257,18 +245,13 @@ def parsePeriodList(name, values):
comp = ["year", "month", "day", "week", "day_of_week", "hour", "minute", "second"]
if len([i for i in comp if i in values]) > 0 :
return CronPeriod(name, **values)
else:
raise ConfigurationException("could not determine correct Period(" + repr(values)+").")
class FullConfigParser(ConfigParser):
def parse_config(self, configFilename):
'''
"""
parses the json configuration and returns a list of layouts,
which contains all nessesary information of the config file.
parses the full config
@ -279,7 +262,7 @@ class FullConfigParser(ConfigParser):
params:
configFilename: indicates which configuration file to parse
'''
"""
self.jsonDict = self._read_json_config(configFilename)
# first step
@ -328,8 +311,4 @@ class FullConfigParser(ConfigParser):
id_get_func = lambda hostgroup: hostgroup.get_name()
self.replace_pointer(layouts, hostgroups, id_list_func, id_get_func)
return layouts
return layouts

6
lib/config/periods.py
View file

@ -66,8 +66,4 @@ class DatePeriod(Period):
return ret
def createJob(self, scheduler, jobInfo, func):
return scheduler.add_date_job(func, self.date, jobInfo)
return scheduler.add_date_job(func, self.date, jobInfo)