'.join(otherLinks) + linksHtml += "
".join(otherLinks) return linksHtml except Exception as ex: import cgi + return "%s" % cgi.escape(str(ex)) #################################################################### # Private getter functions that implement DeviceResultInt #################################################################### - security.declareProtected(ZEN_VIEW, 'device') + security.declareProtected(ZEN_VIEW, "device") + def device(self): """ Support DeviceResultInt mixin class. Returns itself @@ -1719,8 +1981,10 @@ def pastSnmpMaxFailures(self): return False # FIXME: cleanup --force option #2660 - security.declareProtected(ZEN_MANAGE_DEVICE_STATUS, - 'getLastPollSnmpUpTime') + security.declareProtected( + ZEN_MANAGE_DEVICE_STATUS, "getLastPollSnmpUpTime" + ) + def getLastPollSnmpUpTime(self): """ Get the value of the snmpUpTime status object @@ -1730,8 +1994,10 @@ def getLastPollSnmpUpTime(self): return self._lastPollSnmpUpTime.getStatus() # FIXME: cleanup --force option #2660 - security.declareProtected(ZEN_MANAGE_DEVICE_STATUS, - 'setLastPollSnmpUpTime') + security.declareProtected( + ZEN_MANAGE_DEVICE_STATUS, "setLastPollSnmpUpTime" + ) + def setLastPollSnmpUpTime(self, value): """ Set the value of the snmpUpTime status object @@ -1745,10 +2011,12 @@ def snmpAgeCheck(self, hours): Returns True if SNMP data was collected more than 24 hours ago """ lastcoll = self.getSnmpLastCollection() - hours = hours/24.0 - if DateTime() > lastcoll + hours: return 1 + hours = hours / 24.0 + if DateTime() > lastcoll + hours: + return 1 + + security.declareProtected(ZEN_CHANGE_DEVICE, "applyProductContext") - security.declareProtected(ZEN_CHANGE_DEVICE, 'applyProductContext') def applyProductContext(self): """ Apply zProperties inherited from Product Contexts. @@ -1780,9 +2048,17 @@ def _applyProdContext(self, context): # Management Functions #################################################################### - security.declareProtected(ZEN_MANAGE_DEVICE, 'collectDevice') - def collectDevice(self, setlog=True, REQUEST=None, generateEvents=False, - background=False, write=None, debug=False): + security.declareProtected(ZEN_MANAGE_DEVICE, "collectDevice") + + def collectDevice( + self, + setlog=True, + REQUEST=None, + generateEvents=False, + background=False, + write=None, + debug=False, + ): """ Collect the configuration of this device AKA Model Device @@ -1794,22 +2070,35 @@ def collectDevice(self, setlog=True, REQUEST=None, generateEvents=False, xmlrpc = isXmlRpc(REQUEST) perfConf = self.getPerformanceServer() if perfConf is None: - msg = "Device %s in unknown state -- remove and remodel" % self.titleOrId() + msg = ( + "Device %s in unknown state -- remove and remodel" + % self.titleOrId() + ) if write is not None: write(msg) log.error("Unable to get collector info: %s", msg) - if xmlrpc: return 1 + if xmlrpc: + return 1 return - perfConf.collectDevice(self, setlog, REQUEST, generateEvents, - background, write, collectPlugins='', - debug=debug) + perfConf.collectDevice( + self, + setlog, + REQUEST, + generateEvents, + background, + write, + collectPlugins="", + debug=debug, + ) if REQUEST: - audit('UI.Device.Remodel', self) - if xmlrpc: return 0 + audit("UI.Device.Remodel", self) + if xmlrpc: + return 0 + + security.declareProtected(ZEN_MANAGE_DEVICE, "runDeviceMonitor") - security.declareProtected(ZEN_MANAGE_DEVICE, 'collectDevice') def runDeviceMonitor(self, REQUEST=None, write=None, debug=False): """ Run monitoring daemon agains the device ones @@ -1818,11 +2107,15 @@ def runDeviceMonitor(self, REQUEST=None, write=None, debug=False): xmlrpc = isXmlRpc(REQUEST) perfConf = self.getPerformanceServer() if perfConf is None: - msg = "Device %s in unknown state -- remove and remodel" % self.titleOrId() + msg = ( + "Device %s in unknown state -- remove and remodel" + % self.titleOrId() + ) if write is not None: write(msg) log.error("Unable to get collector info: %s", msg) - if xmlrpc: return 1 + if xmlrpc: + return 1 return # Getting all the datasources from template signed to that @@ -1834,7 +2127,7 @@ def runDeviceMonitor(self, REQUEST=None, write=None, debug=False): collection_daemons = set() for ds in datasources: if isPythonDataSource(ds): - daemon = _sourcetype_to_collector_map['Python'] + daemon = _sourcetype_to_collector_map["Python"] else: daemon = _sourcetype_to_collector_map.get(ds.sourcetype) if daemon: @@ -1844,54 +2137,111 @@ def runDeviceMonitor(self, REQUEST=None, write=None, debug=False): # zenpython; zenperfsnmp; zencommand if not collection_daemons: if write: - write('Monitoring through UI only support COMMAND, ' - 'SNMP and ZenPython type of datasources') - if xmlrpc: return 1 + write( + "Monitoring through UI only support COMMAND, " + "SNMP and ZenPython type of datasources" + ) + if xmlrpc: + return 1 return # Pass collection_daemons as a list because perfConf.runDeviceMonitor # was written expecting that parameter to be a list. perfConf.runDeviceMonitor( - self, REQUEST, write, list(collection_daemons), debug=debug, + self, + REQUEST, + write, + list(collection_daemons), + debug=debug, ) if REQUEST: - audit('UI.Device.Monitor', self) - if xmlrpc: return 0 + audit("UI.Device.Monitor", self) + if xmlrpc: + return 0 + + security.declareProtected(ZEN_MANAGE_DEVICE, "monitorPerDatasource") - security.declareProtected(ZEN_MANAGE_DEVICE, 'collectDevice') def monitorPerDatasource(self, dsObj, REQUEST=None, write=None): """ Run monitoring daemon against one device and one datasource ones """ - parameter = '--datasource' - value = '%s/%s' % (dsObj.rrdTemplate.obj.id, dsObj.id) + parameter = "--datasource" + value = "%s/%s" % (dsObj.rrdTemplate.obj.id, dsObj.id) if isPythonDataSource(dsObj): - collection_daemon = _sourcetype_to_collector_map['Python'] - elif dsObj.sourcetype == 'COMMAND': - collection_daemon = _sourcetype_to_collector_map['COMMAND'] - elif dsObj.sourcetype == 'SNMP': - collection_daemon = _sourcetype_to_collector_map['SNMP'] - parameter = '--oid' + collection_daemon = _sourcetype_to_collector_map["Python"] + elif dsObj.sourcetype == "COMMAND": + collection_daemon = _sourcetype_to_collector_map["COMMAND"] + elif dsObj.sourcetype == "SNMP": + collection_daemon = _sourcetype_to_collector_map["SNMP"] + parameter = "--oid" value = dsObj.oid else: - collection_daemon = '' + collection_daemon = "" xmlrpc = isXmlRpc(REQUEST) perfConf = self.getPerformanceServer() if not collection_daemon: if write: - write('Modeling through UI only support COMMAND, ' - 'SNMP and ZenPython type of datasources') - if xmlrpc: return 1 + write( + "Modeling through UI only support COMMAND, " + "SNMP and ZenPython type of datasources" + ) + if xmlrpc: + return 1 return - perfConf.runDeviceMonitorPerDatasource(self, REQUEST, write, - collection_daemon, parameter, - value) - if xmlrpc: return 0 - - security.declareProtected(ZEN_DELETE_DEVICE, 'deleteDevice') - def deleteDevice(self, deleteStatus=False, deleteHistory=False, - deletePerf=False, REQUEST=None): + perfConf.runDeviceMonitorPerDatasource( + self, REQUEST, write, collection_daemon, parameter, value + ) + if xmlrpc: + return 0 + + def _removeManageIp(self): + """ + Safely remove the manageIp object from the device. Remove the + ipaddress object from the device:ipaddress relation, and if the + ipaddress does not have any remaining relations, remove the + ipaddress object. + """ + deviceId = self.titleOrId() + manageIp = self.manageIp + ipaddr = self.ipaddress() + log.debug('Set manageIp on {} to empty string'.format(deviceId)) + if ipaddr: + ipaddrString = ipaddr.id + log.debug('Removing ipaddress/manageDevice relation from {} to {}'.format(deviceId, str(ipaddr))) + if ipaddrString != manageIp: + # Shouldn't happen, but manageIp is not the + # IP set on the device. + log.warn('Device {} has a mismatch between manageIp({})' + 'and device ip ({})'.format( + deviceId, manageIp, ipaddrString + ) + ) + # Remove the ip from the ipaddress relation on the device + self.ipaddress.removeRelation(ipaddr) + # removeIpAddresses will only remove IP addresses that are no longer + # attached to any device, so it's safe to call at this point + netFacade = getFacade('network', self.dmd) + ips = [ipaddr.getPrimaryId()] + log.debug('Removing IP address obj {} if no longer used'.format(ipaddrString)) + removeCount, errorCount = netFacade.removeIpAddresses(ips) + if errorCount: + # This most likely means that the IP address is still + # attached to a different device + log.warn('Could not remove ' + 'IP address {}'.format(ipaddrString)) + # Set the manageIp to blank + self.manageIp = '' + + security.declareProtected(ZEN_DELETE_DEVICE, "deleteDevice") + + def deleteDevice( + self, + deleteStatus=False, + deleteHistory=False, + deletePerf=False, + REQUEST=None, + ): """ Delete device from the database @@ -1907,25 +2257,37 @@ def deleteDevice(self, deleteStatus=False, deleteHistory=False, parent = self.getPrimaryParent() if deleteStatus: # Close events for this device - zep = getFacade('zep') - tagFilter = { 'tag_uuids': [IGlobalIdentifier(self).getGUID()] } - eventFilter = { 'tag_filter': [ tagFilter ] } + zep = getFacade("zep") + tagFilter = {"tag_uuids": [IGlobalIdentifier(self).getGUID()]} + eventFilter = {"tag_filter": [tagFilter]} log.debug("Closing events for device: %s", self.getId()) zep.closeEventSummaries(eventFilter=eventFilter) if REQUEST: - audit('UI.Device.Delete', self, deleteStatus=deleteStatus, - deleteHistory=deleteHistory, deletePerf=deletePerf) - self.getDmdRoot("Monitors").deletePreviousCollectorForDevice(self.getId()) - self.dmd.getDmdRoot("ZenLinkManager").remove_device_from_cache(self.getId()) + audit( + "UI.Device.Delete", + self, + deleteStatus=deleteStatus, + deleteHistory=deleteHistory, + deletePerf=deletePerf, + ) + self.getDmdRoot("Monitors").deletePreviousCollectorForDevice( + self.getId() + ) + self.dmd.getDmdRoot("ZenLinkManager").remove_device_from_cache( + self.getId() + ) + self._removeManageIp() parent._delObject(self.getId()) if REQUEST: - if parent.getId()=='devices': + if parent.getId() == "devices": parent = parent.getPrimaryParent() - REQUEST['RESPONSE'].redirect(parent.absolute_url_path() + - "/deviceOrganizerStatus" - '?message=Device deleted') + REQUEST["RESPONSE"].redirect( + parent.absolute_url_path() + "/deviceOrganizerStatus" + "?message=Device deleted" + ) + + security.declareProtected(ZEN_ADMIN_DEVICE, "renameDevice") - security.declareProtected(ZEN_ADMIN_DEVICE, 'renameDevice') def renameDevice(self, newId=None, REQUEST=None, retainGraphData=False): """ Rename device from the DMD. Disallow assignment of @@ -1956,17 +2318,18 @@ def renameDevice(self, newId=None, REQUEST=None, retainGraphData=False): newId = newId.strip() - if newId == '' or newId == oldId: + if newId == "" or newId == oldId: return path device = self.dmd.Devices.findDeviceByIdExact(newId) if device: raise DeviceExistsError( - 'Device already exists with id %s' % newId, device, + "Device already exists with id %s" % newId, + device, ) if REQUEST: - audit('UI.Device.ChangeId', self, id=newId) + audit("UI.Device.ChangeId", self, id=newId) # side effect: self.getId() will return newId after this call try: @@ -1995,25 +2358,29 @@ def reassociatePerfDataAfterRename(self, oldId, newId): self.dmd.JobManager.addJob( FacadeMethodJob, description=( - 'Reassociating performance data for device {} with ' - 'new ID {}'.format(oldId, newId) + "Reassociating performance data for device {} with " + "new ID {}".format(oldId, newId) ), kwargs=dict( - facadefqdn='Products.Zuul.facades.metricfacade.MetricFacade', - method='renameDevice', + facadefqdn="Products.Zuul.facades.metricfacade.MetricFacade", + method="renameDevice", oldId=oldId, - newId=newId - ) + newId=newId, + ), ) - security.declareProtected(ZEN_CHANGE_DEVICE, 'index_object') + security.declareProtected(ZEN_CHANGE_DEVICE, "index_object") + + @deprecated def index_object(self, idxs=None, noips=False): """ Override so ips get indexed on move. DEPRECATED """ pass - security.declareProtected(ZEN_CHANGE_DEVICE, 'unindex_object') + security.declareProtected(ZEN_CHANGE_DEVICE, "unindex_object") + + @deprecated def unindex_object(self): """ Override so ips get unindexed as well. DEPRECATED @@ -2033,7 +2400,12 @@ def getUserCommandEnvironment(self): """ environ = Commandable.getUserCommandEnvironment(self) context = self.primaryAq() - environ.update({'dev': context, 'device': context,}) + environ.update( + { + "dev": context, + "device": context, + } + ) return environ def getUrlForUserCommands(self): @@ -2041,7 +2413,7 @@ def getUrlForUserCommands(self): Returns a URL to redirect to after a command has executed used by Commandable """ - return self.getPrimaryUrlPath() + '/deviceManagement' + return self.getPrimaryUrlPath() + "/deviceManagement" def getHTMLEventSummary(self, severity=4): """ @@ -2050,28 +2422,41 @@ def getHTMLEventSummary(self, severity=4): html = [] html.append("
| %s/%s | ' % ( - klass, ev[1], ev[2]) + klass, + ev[1], + ev[2], + ) return h + info = self.getEventSummary(severity) html += map(evsummarycell, info) - html.append('
|---|
"
- "
"
- "
%s")
+ template = (
+ ""
+ " "
+ "
%s"
+ )
icon = self.getIconPath()
href = altHref if altHref else self.getPrimaryUrlPath()
name = self.titleOrId()
@@ -2234,8 +2636,11 @@ def getPrettyLink(self, target=None, altHref=""):
if not self.checkRemotePerm(ZEN_VIEW, self):
return rendered
else:
- return "%s" % \
- ('target=' + target if target else '', href, rendered)
+ return "%s" % (
+ "target=" + target if target else "",
+ href,
+ rendered,
+ )
def osProcessClassMatchData(self):
"""
@@ -2244,14 +2649,16 @@ def osProcessClassMatchData(self):
"""
matchers = []
for pc in self.getDmdRoot("Processes").getSubOSProcessClassesSorted():
- matchers.append({
- 'includeRegex': pc.includeRegex,
- 'excludeRegex': pc.excludeRegex,
- 'replaceRegex': pc.replaceRegex,
- 'replacement': pc.replacement,
- 'primaryUrlPath': pc.getPrimaryUrlPath(),
- 'primaryDmdId': pc.getPrimaryDmdId(),
- })
+ matchers.append(
+ {
+ "includeRegex": pc.includeRegex,
+ "excludeRegex": pc.excludeRegex,
+ "replaceRegex": pc.replaceRegex,
+ "replacement": pc.replacement,
+ "primaryUrlPath": pc.getPrimaryUrlPath(),
+ "primaryDmdId": pc.getPrimaryDmdId(),
+ }
+ )
return matchers
@@ -2261,6 +2668,7 @@ def manageIpVersion(self):
of the manageIp ip adddress
"""
from ipaddr import IPAddress
+
try:
ip = self.getManageIp()
return IPAddress(ip).version
@@ -2272,8 +2680,9 @@ def manageIpVersion(self):
def snmpwalkPrefix(self):
"""
- This method gets the ip address prefix used for this device when running
- snmpwalk.
+ This method gets the ip address prefix used for this device
+ when running snmpwalk.
+
@rtype: string
@return: Prefix used for snmwalk for this device
"""
@@ -2297,7 +2706,8 @@ def tracerouteCommand(self):
Used by the user commands this returns which traceroute command
this device should use.
@rtype: string
- @return "traceroute" or "traceroute6" depending on if the manageIp is ipv6 or not
+ @return "traceroute" or "traceroute6" depending on if the
+ manageIp is ipv6 or not.
"""
if self.manageIpVersion() == 6:
return "traceroute6"
@@ -2313,17 +2723,22 @@ def getStatus(self, statusclass=None, **kwargs):
if statusclass is None:
statusclass = self.zStatusEventClass
- zep = getFacade('zep', self)
+ zep = getFacade("zep", self)
try:
event_filter = zep.createEventFilter(
tags=[self.getUUID()],
element_sub_identifier=[""],
severity=[SEVERITY_CRITICAL],
- status=[STATUS_NEW, STATUS_ACKNOWLEDGED, STATUS_SUPPRESSED],
- event_class=filter(None, [self.zStatusEventClass]))
+ status=[
+ STATUS_NEW,
+ STATUS_ACKNOWLEDGED,
+ STATUS_SUPPRESSED,
+ ],
+ event_class=filter(None, [self.zStatusEventClass]),
+ )
result = zep.getEventSummaries(0, filter=event_filter, limit=0)
- return int(result['total'])
+ return int(result["total"])
except Exception:
return None
@@ -2336,32 +2751,38 @@ def _getPingStatus(self, statusclass):
if not self.zPingMonitorIgnore and self.getManageIp():
# Override normal behavior - we only care if the manage IP is down
- # need to add the ipinterface component id to search since we may be
- # pinging interfaces and only care about status of the one that
+ # Need to add the ipinterface component id to search since we may
+ # be pinging interfaces and only care about status of the one that
# matches the manage ip. This is potentially expensive
element_sub_identifier = [""]
- ifaces = self.getDeviceComponents(type='IpInterface')
+ ifaces = self.getDeviceComponents(type="IpInterface")
for iface in ifaces:
- if self.manageIp in [ip.partition("/")[0] for ip in iface.getIpAddresses()]:
+ if self.manageIp in [
+ ip.partition("/")[0] for ip in iface.getIpAddresses()
+ ]:
element_sub_identifier.append(iface.id)
break
- zep = getFacade('zep', self)
- event_filter = zep.createEventFilter(tags=[self.getUUID()],
- severity=[SEVERITY_WARNING,SEVERITY_ERROR,SEVERITY_CRITICAL],
- status=[STATUS_NEW,STATUS_ACKNOWLEDGED, STATUS_SUPPRESSED],
- element_sub_identifier=element_sub_identifier,
- event_class=filter(None, [statusclass]),
- details={EventProxy.DEVICE_IP_ADDRESS_DETAIL_KEY: self.getManageIp()})
+ zep = getFacade("zep", self)
+ event_filter = zep.createEventFilter(
+ tags=[self.getUUID()],
+ severity=[SEVERITY_WARNING, SEVERITY_ERROR, SEVERITY_CRITICAL],
+ status=[STATUS_NEW, STATUS_ACKNOWLEDGED, STATUS_SUPPRESSED],
+ element_sub_identifier=element_sub_identifier,
+ event_class=filter(None, [statusclass]),
+ details={
+ EventProxy.DEVICE_IP_ADDRESS_DETAIL_KEY: self.getManageIp()
+ },
+ )
result = zep.getEventSummaries(0, filter=event_filter, limit=0)
- return int(result['total'])
+ return int(result["total"])
else:
return None
def ipAddressAsInt(self):
ip = self.getManageIp()
if ip:
- ip = ip.partition('/')[0]
+ ip = ip.partition("/")[0]
if ip:
return str(numbip(ip))
diff --git a/Products/ZenModel/DeviceClass.py b/Products/ZenModel/DeviceClass.py
index 8df023379b..418fb9c2b4 100644
--- a/Products/ZenModel/DeviceClass.py
+++ b/Products/ZenModel/DeviceClass.py
@@ -832,29 +832,6 @@ def buildDeviceTreeProperties(self):
if not devs.hasProperty(id):
devs._setProperty(id, defaultValue, type)
- def zenPropertyOptions(self, propname):
- """
- Provide a set of default options for a zProperty
-
- @param propname: zProperty name
- @type propname: string
- @return: list of zProperty options
- @rtype: list
- """
- if propname == 'zCollectorPlugins':
- from Products.DataCollector.Plugins import loadPlugins
- return sorted(ldr.pluginName for ldr in loadPlugins(self.dmd))
- if propname == 'zCommandProtocol':
- return ['ssh', 'telnet']
- if propname == 'zSnmpVer':
- return ['v1', 'v2c', 'v3']
- if propname == 'zSnmpAuthType':
- return ['', 'MD5', 'SHA']
- if propname == 'zSnmpPrivType':
- return ['', 'DES', 'AES']
- return DeviceOrganizer.zenPropertyOptions(self, propname)
-
-
def pushConfig(self, REQUEST=None):
"""
This will result in a push of all the devices to live collectors
diff --git a/Products/ZenModel/DeviceHW.py b/Products/ZenModel/DeviceHW.py
index c64c876cb5..f4b566e5cb 100644
--- a/Products/ZenModel/DeviceHW.py
+++ b/Products/ZenModel/DeviceHW.py
@@ -25,7 +25,7 @@ class DeviceHW(Hardware):
meta_type = "DeviceHW"
- totalMemory = 0L
+ totalMemory = 0
_properties = Hardware._properties + (
{'id':'totalMemory', 'type':'long', 'mode':'w'},
diff --git a/Products/ZenModel/FileSystem.py b/Products/ZenModel/FileSystem.py
index 705fd83181..304504ba05 100644
--- a/Products/ZenModel/FileSystem.py
+++ b/Products/ZenModel/FileSystem.py
@@ -57,8 +57,8 @@ class FileSystem(OSComponent):
storageDevice = ""
type = ""
blockSize = 0
- totalBlocks = 0L
- totalFiles = 0L
+ totalBlocks = 0
+ totalFiles = 0
capacity = 0
inodeCapacity = 0
maxNameLen = 0
diff --git a/Products/ZenModel/IpAddress.py b/Products/ZenModel/IpAddress.py
index ae04197dc7..1379dfcbd0 100644
--- a/Products/ZenModel/IpAddress.py
+++ b/Products/ZenModel/IpAddress.py
@@ -104,6 +104,11 @@ def __init__(self, id, netmask=24):
self.title = ipunwrap(id)
self.version = ipobj.version
+ def _pre_remove(self):
+ self.manageDevice.removeRelation()
+ self.interface.removeRelation()
+ self.clientroutes.removeRelation()
+
def setPtrName(self):
try:
data = socket.gethostbyaddr(ipunwrap(self.id))
@@ -284,6 +289,8 @@ def get_indexable_peers(self):
peers = []
if self.device():
peers.append(self.device().primaryAq())
+ if self.manageDevice():
+ peers.append(self.manageDevice().primaryAq())
if self.interface():
peers.append(self.interface().primaryAq())
return peers
diff --git a/Products/ZenModel/IpInterface.py b/Products/ZenModel/IpInterface.py
index 977dfd4d5f..8a3f9180cc 100644
--- a/Products/ZenModel/IpInterface.py
+++ b/Products/ZenModel/IpInterface.py
@@ -207,6 +207,11 @@ def before_object_deleted_handler(self):
notify(IndexingEvent(device, idxs=('macAddresses',), update_metadata=False))
except KeyError:
pass
+ if device._operation != 1:
+ if self.ipaddresses():
+ self.ipaddresses.removeRelation()
+ if self.iproutes():
+ self.iproutes.removeRelation()
def object_added_handler(self):
self._update_device_macs(self.device(), self.macaddress)
@@ -574,9 +579,25 @@ def getRRDTemplates(self):
order.insert(0, templateName)
for name in order:
+ templates = []
template = self.getRRDTemplateByName(name)
- if template:
- return [template]
+ if not template:
+ continue
+ replacement = self.getRRDTemplateByName(
+ '{}-replacement'.format(name))
+
+ if replacement and replacement not in templates:
+ templates.append(replacement)
+ else:
+ templates.append(template)
+
+ addition = self.getRRDTemplateByName(
+ '{}-addition'.format(name))
+
+ if addition and addition not in templates:
+ templates.append(addition)
+ if templates:
+ return templates
return []
diff --git a/Products/ZenModel/IpNetwork.py b/Products/ZenModel/IpNetwork.py
index 0809a197b7..653752cb84 100644
--- a/Products/ZenModel/IpNetwork.py
+++ b/Products/ZenModel/IpNetwork.py
@@ -33,6 +33,7 @@
from Products.ZenModel.ZenossSecurity import *
from Products.ZenModel.interfaces import IObjectEventsSubscriber
+from Products.Jobber.zenjobs import app
from Products.ZenUtils.IpUtil import *
from Products.ZenRelations.RelSchema import *
from IpAddress import IpAddress
@@ -624,7 +625,7 @@ def primarySortKey(self):
>>> net = dmd.Networks.addSubNetwork('1.2.3.0', 24)
>>> net.primarySortKey()
- 16909056L
+ 16909056
"""
return numbip(self.id)
@@ -652,6 +653,12 @@ def addSubNetwork(self, ip, netmask=24):
lambda n: isinstance(n, IpAddress) and n.interface(), netobj.getSubObjects())
for i in ips:
i.interface().ipaddresses._setObject(i.id, i)
+ mips = filter(
+ lambda n: isinstance(n, IpAddress) and n.manageDevice(),
+ netobj.getSubObjects(),
+ )
+ for i in mips:
+ i.manageDevice().ipaddress.addRelation(i)
return self.getSubNetwork(ip)
@@ -933,7 +940,8 @@ class AutoDiscoveryJob(SubprocessJob):
specifying IP ranges, not both. Also accepts a set of zProperties to be
set on devices that are discovered.
"""
- def _run(self, nets=(), ranges=(), zProperties=(), collector='localhost'):
+ name = 'AutoDiscoveryJob'
+ def _run(self, nets=(), ranges=(), zProperties={}, collector='localhost'):
# Store the nets and ranges
self.nets = nets
self.ranges = ranges
@@ -967,6 +975,8 @@ def _run(self, nets=(), ranges=(), zProperties=(), collector='localhost'):
SubprocessJob._run(self, cmd)
+app.register_task(AutoDiscoveryJob)
+
class IpNetworkPrinter(object):
def __init__(self, out):
diff --git a/Products/ZenModel/IpRouteEntry.py b/Products/ZenModel/IpRouteEntry.py
index c26a2f430f..e90fafe2dc 100644
--- a/Products/ZenModel/IpRouteEntry.py
+++ b/Products/ZenModel/IpRouteEntry.py
@@ -22,6 +22,8 @@
from Products.ZenUtils.Utils import localIpCheck, prepId
from Products.ZenRelations.RelSchema import *
+from Products.ZenModel.interfaces import IObjectEventsSubscriber
+from zope.interface import implements
from OSComponent import OSComponent
@@ -61,6 +63,8 @@ class IpRouteEntry(OSComponent):
"""
IpRouteEntry object
"""
+
+ implements(IObjectEventsSubscriber)
meta_type = 'IpRouteEntry'
@@ -106,6 +110,16 @@ class IpRouteEntry(OSComponent):
security = ClassSecurityInfo()
ipcheck = re.compile(r'^127\.|^0\.0\.|^169\.254\.|^224\.|^::1$|^fe80:|^ff').search
+
+ def before_object_deleted_handler(self):
+ device = self.device()
+ if device and device._operation != 1:
+ if self.interface():
+ self.interface.removeRelation()
+ if self.nexthop():
+ self.nexthop.removeRelation()
+ if self.target():
+ self.target.removeRelation()
def __getattr__(self, name):
"""
diff --git a/Products/ZenModel/MaintenanceWindow.py b/Products/ZenModel/MaintenanceWindow.py
index dba95f7588..afe09c35b5 100644
--- a/Products/ZenModel/MaintenanceWindow.py
+++ b/Products/ZenModel/MaintenanceWindow.py
@@ -176,7 +176,7 @@ def niceStartDate(self):
def niceStartDateTime(self):
"Return start time as a string with nice sort qualities"
- return "%s %s" % (Time.convertTimestampToTimeZone(self.start, self.timezone), self.timezone)
+ return "%s %s" % (datetime.fromtimestamp(self.start, self.tzInstance).strftime("%Y/%m/%d %H:%M:%S"), self.timezone)
def niceStartProductionState(self):
"Return a string version of the startProductionState"
diff --git a/Products/ZenModel/MetricMixin.py b/Products/ZenModel/MetricMixin.py
index a5f8401be9..faea727a6b 100644
--- a/Products/ZenModel/MetricMixin.py
+++ b/Products/ZenModel/MetricMixin.py
@@ -139,10 +139,20 @@ def snmpIgnore(self):
return False
def getRRDTemplates(self):
- default = self.getRRDTemplateByName(self.getRRDTemplateName())
+ templates = []
+ defaultName = self.getRRDTemplateName()
+ default = self.getRRDTemplateByName(defaultName)
if not default:
return []
- return [default]
+ replacement = self.getRRDTemplateByName('{}-replacement'.format(defaultName))
+ if replacement:
+ templates.append(replacement)
+ else:
+ templates.append(default)
+ addition = self.getRRDTemplateByName('{}-addition'.format(defaultName))
+ if addition:
+ templates.append(addition)
+ return templates
def getRRDTemplate(self):
try:
@@ -335,7 +345,6 @@ def fetchRRDValues(self, dpnames, cf, resolution, start, end="now"):
results = []
if isinstance(dpnames, basestring):
dpnames = [dpnames]
- facade = getFacade('metric', self.dmd)
# parse start and end into unix timestamps
start, end = self._rrdAtTimeToUnix(start, end)
diff --git a/Products/ZenModel/MibBase.py b/Products/ZenModel/MibBase.py
index 32123b02dd..4f7e20e794 100644
--- a/Products/ZenModel/MibBase.py
+++ b/Products/ZenModel/MibBase.py
@@ -1,22 +1,24 @@
##############################################################################
-#
+#
# Copyright (C) Zenoss, Inc. 2007, all rights reserved.
-#
+#
# This content is made available according to terms specified in
# License.zenoss under the directory where your Zenoss product is installed.
-#
+#
##############################################################################
+from __future__ import absolute_import
-from zope.interface import implements
+from zope.interface import implementer
-from Products.ZenModel.interfaces import IIndexed
-from ZenModelRM import ZenModelRM
-from ZenPackable import ZenPackable
+from .interfaces import IIndexed
+from .ZenModelRM import ZenModelRM
+from .ZenPackable import ZenPackable
+
+@implementer(IIndexed)
class MibBase(ZenModelRM, ZenPackable):
- implements(IIndexed)
- default_catalog = 'mibSearch'
+ default_catalog = "mibSearch"
_relations = ZenPackable._relations[:]
@@ -27,29 +29,28 @@ class MibBase(ZenModelRM, ZenPackable):
description = ""
_properties = (
- {'id':'moduleName', 'type':'string', 'mode':'w'},
- {'id':'nodetype', 'type':'string', 'mode':'w'},
- {'id':'oid', 'type':'string', 'mode':'w'},
- {'id':'status', 'type':'string', 'mode':'w'},
- {'id':'description', 'type':'string', 'mode':'w'},
+ {"id": "moduleName", "type": "string", "mode": "w"},
+ {"id": "nodetype", "type": "string", "mode": "w"},
+ {"id": "oid", "type": "string", "mode": "w"},
+ {"id": "status", "type": "string", "mode": "w"},
+ {"id": "description", "type": "string", "mode": "w"},
)
-
def __init__(self, id, title="", **kwargs):
super(ZenModelRM, self).__init__(id, title)
atts = self.propertyIds()
for key, val in kwargs.items():
- if key in atts: setattr(self, key, val)
-
+ if key in atts:
+ setattr(self, key, val)
def getFullName(self):
- """Return full value name in form MODULE::attribute.
- """
+ """Return full value name in form MODULE::attribute."""
return "%s::%s" % (self.moduleName, self.id)
-
def summary(self):
- """Return summary string for Mib objects.
- """
- return [str(getattr(self, p)) for p in self.propertyIds() \
- if str(getattr(self, p))]
+ """Return summary string for Mib objects."""
+ return [
+ str(getattr(self, p))
+ for p in self.propertyIds()
+ if str(getattr(self, p))
+ ]
diff --git a/Products/ZenModel/MibModule.py b/Products/ZenModel/MibModule.py
index 22ada4ded2..4d3aedb353 100644
--- a/Products/ZenModel/MibModule.py
+++ b/Products/ZenModel/MibModule.py
@@ -7,19 +7,21 @@
#
##############################################################################
+from __future__ import absolute_import
+from AccessControl import ClassSecurityInfo, Permissions
from AccessControl.class_init import InitializeClass
-from AccessControl import ClassSecurityInfo
-from AccessControl import Permissions
-from zope.interface import implements
from zExceptions import BadRequest
+from zope.interface import implementer
from Products.ZenRelations.RelSchema import ToOne, ToManyCont
from Products.ZenWidgets import messaging
-from Products.ZenModel.interfaces import IIndexed
-from ZenModelRM import ZenModelRM
-from ZenPackable import ZenPackable
+from .interfaces import IIndexed
+from .MibNode import MibNode
+from .MibNotification import MibNotification
+from .ZenModelRM import ZenModelRM
+from .ZenPackable import ZenPackable
def createOID(dmd, container, new_node, logger=None):
@@ -33,7 +35,9 @@ def createOID(dmd, container, new_node, logger=None):
logger.warn(
"OID '%s' will be removed from organizer '%s' "
"and added to organizer '%s'.",
- new_node.oid, old_node.moduleName, new_node.moduleName
+ new_node.oid,
+ old_node.moduleName,
+ new_node.moduleName,
)
old_node.getParentNode()._delObject(old_node.id)
try:
@@ -44,44 +48,52 @@ def createOID(dmd, container, new_node, logger=None):
return container._getOb(new_node.id)
+@implementer(IIndexed)
class MibModule(ZenModelRM, ZenPackable):
-
- implements(IIndexed)
- types = ('COUNTER', 'GAUGE', 'DERIVE', 'ABSOLUTE')
+ types = ("COUNTER", "GAUGE", "DERIVE", "ABSOLUTE")
language = ""
contact = ""
description = ""
_properties = (
- {'id': 'language', 'type': 'string', 'mode': 'w'},
- {'id': 'contact', 'type': 'string', 'mode': 'w'},
- {'id': 'description', 'type': 'string', 'mode': 'w'},
+ {"id": "language", "type": "string", "mode": "w"},
+ {"id": "contact", "type": "string", "mode": "w"},
+ {"id": "description", "type": "string", "mode": "w"},
)
_relations = ZenPackable._relations + (
- ("miborganizer", ToOne(ToManyCont, "Products.ZenModel.MibOrganizer", "mibs")),
+ (
+ "miborganizer",
+ ToOne(ToManyCont, "Products.ZenModel.MibOrganizer", "mibs"),
+ ),
("nodes", ToManyCont(ToOne, "Products.ZenModel.MibNode", "module")),
- ("notifications", ToManyCont(ToOne, "Products.ZenModel.MibNotification", "module")),
+ (
+ "notifications",
+ ToManyCont(ToOne, "Products.ZenModel.MibNotification", "module"),
+ ),
)
# Screen action bindings (and tab definitions)
- factory_type_information = ({
- 'immediate_view' : 'viewMibModule',
- 'actions' :
- (
- { 'id' : 'overview'
- , 'name' : 'Overview'
- , 'action' : 'viewMibModule'
- , 'permissions' : (Permissions.view,)
- },
- { 'id' : 'edit'
- , 'name' : 'Edit'
- , 'action' : 'editMibModule'
- , 'permissions' : (Permissions.view,)
- },
- )
- },)
+ factory_type_information = (
+ {
+ "immediate_view": "viewMibModule",
+ "actions": (
+ {
+ "id": "overview",
+ "name": "Overview",
+ "action": "viewMibModule",
+ "permissions": (Permissions.view,),
+ },
+ {
+ "id": "edit",
+ "name": "Edit",
+ "action": "editMibModule",
+ "permissions": (Permissions.view,),
+ },
+ ),
+ },
+ )
security = ClassSecurityInfo()
@@ -94,87 +106,84 @@ def nodeCount(self):
def notificationCount(self):
return self.notifications.countObjects()
- def deleteMibNodes(self, ids=[], REQUEST=None):
- """Delete MibNodes
+ def deleteMibNodes(self, ids, REQUEST=None):
+ """
+ Delete MibNodes
+
+ @type ids: Sequence[str]
"""
for node in self.nodes():
- id = getattr(node, 'id', None)
+ id = getattr(node, "id", None)
if id in ids:
self.nodes._delObject(id)
if REQUEST:
messaging.IMessageSender(self).sendToBrowser(
- 'Mappings Deleted',
- 'Mib nodes deleted: %s' % (', '.join(ids))
+ "Mappings Deleted", "Mib nodes deleted: %s" % (", ".join(ids))
)
return self.callZenScreen(REQUEST)
def addMibNode(self, id, oid, nodetype, REQUEST=None):
- """Add a MibNode
- """
+ """Add a MibNode"""
node = self.createMibNode(
id, oid=oid, nodetype=nodetype, moduleName=self.id
)
if REQUEST:
if node:
messaging.IMessageSender(self).sendToBrowser(
- 'Mib Node Added',
- 'Node %s was created with oid %s.' % (id, oid)
+ "Mib Node Added",
+ "Node %s was created with oid %s." % (id, oid),
)
else:
messaging.IMessageSender(self).sendToBrowser(
- 'Invalid OID',
- 'OID %s is invalid.' % oid,
- priority=messaging.WARNING
+ "Invalid OID",
+ "OID %s is invalid." % oid,
+ priority=messaging.WARNING,
)
return self.callZenScreen(REQUEST)
def createMibNode(self, id, logger=None, **kwargs):
- """Create a MibNotification
- """
- from MibNode import MibNode
+ """Create a MibNotification"""
return createOID(self.dmd, self.nodes, MibNode(id, **kwargs), logger)
- def deleteMibNotifications(self, ids=[], REQUEST=None):
- """Delete MibNotifications
+ def deleteMibNotifications(self, ids, REQUEST=None):
+ """
+ Delete MibNotifications
+
+ @type ids: Sequence[str]
"""
for notification in self.notifications():
- id = getattr(notification, 'id', None)
+ id = getattr(notification, "id", None)
if id in ids:
self.notifications._delObject(id)
if REQUEST:
messaging.IMessageSender(self).sendToBrowser(
- 'Traps Deleted',
- 'Traps deleted: %s' % (', '.join(ids))
+ "Traps Deleted", "Traps deleted: %s" % (", ".join(ids))
)
return self.callZenScreen(REQUEST)
def addMibNotification(self, id, oid, nodetype, REQUEST=None):
- """Add a MibNotification
- """
+ """Add a MibNotification"""
notification = self.createMibNotification(
id, oid=oid, nodetype=nodetype, moduleName=self.id
)
if REQUEST:
if notification:
messaging.IMessageSender(self).sendToBrowser(
- 'Trap added',
- 'Trap %s was created with oid %s.' % (id, oid)
+ "Trap added",
+ "Trap %s was created with oid %s." % (id, oid),
)
else:
messaging.IMessageSender(self).sendToBrowser(
- 'Invalid OID',
- 'OID %s is invalid.' % oid,
- priority=messaging.WARNING
+ "Invalid OID",
+ "OID %s is invalid." % oid,
+ priority=messaging.WARNING,
)
return self.callZenScreen(REQUEST)
def createMibNotification(self, id, logger=None, **kwargs):
- """Create a MibNotification
- """
- from MibNotification import MibNotification
+ """Create a MibNotification"""
return createOID(
- self.dmd, self.notifications,
- MibNotification(id, **kwargs), logger
+ self.dmd, self.notifications, MibNotification(id, **kwargs), logger
)
diff --git a/Products/ZenModel/MibNode.py b/Products/ZenModel/MibNode.py
index 7de83099c1..0585690ba8 100644
--- a/Products/ZenModel/MibNode.py
+++ b/Products/ZenModel/MibNode.py
@@ -1,44 +1,43 @@
##############################################################################
-#
+#
# Copyright (C) Zenoss, Inc. 2007, all rights reserved.
-#
+#
# This content is made available according to terms specified in
# License.zenoss under the directory where your Zenoss product is installed.
-#
+#
##############################################################################
+from __future__ import absolute_import
from AccessControl import Permissions
-from Products.ZenModel.ZenossSecurity import *
-from Products.ZenRelations.RelSchema import *
+from Products.ZenRelations.RelSchema import ToManyCont, ToOne
-from MibBase import MibBase
+from .MibBase import MibBase
-class MibNode(MibBase):
- #syntax = ""
+class MibNode(MibBase):
access = ""
_properties = MibBase._properties + (
- {'id':'access', 'type':'string', 'mode':'w'},
+ {"id": "access", "type": "string", "mode": "w"},
)
_relations = MibBase._relations + (
("module", ToOne(ToManyCont, "Products.ZenModel.MibModule", "nodes")),
)
-
+
# Screen action bindings (and tab definitions)
- factory_type_information = (
- {
- 'immediate_view' : 'viewMibNode',
- 'actions' :
- (
- { 'id' : 'overview'
- , 'name' : 'Overview'
- , 'action' : 'viewMibNode'
- , 'permissions' : ( Permissions.view, )
+ factory_type_information = (
+ {
+ "immediate_view": "viewMibNode",
+ "actions": (
+ {
+ "id": "overview",
+ "name": "Overview",
+ "action": "viewMibNode",
+ "permissions": (Permissions.view,),
},
- )
- },
- )
+ ),
+ },
+ )
diff --git a/Products/ZenModel/MibNotification.py b/Products/ZenModel/MibNotification.py
index 47dd367a32..f86f81d542 100644
--- a/Products/ZenModel/MibNotification.py
+++ b/Products/ZenModel/MibNotification.py
@@ -1,44 +1,46 @@
##############################################################################
-#
+#
# Copyright (C) Zenoss, Inc. 2007, all rights reserved.
-#
+#
# This content is made available according to terms specified in
# License.zenoss under the directory where your Zenoss product is installed.
-#
+#
##############################################################################
+from __future__ import absolute_import
from AccessControl import Permissions
-from Products.ZenModel.ZenossSecurity import *
-from Products.ZenRelations.RelSchema import *
+from Products.ZenRelations.RelSchema import ToManyCont, ToOne
-from MibBase import MibBase
+from .MibBase import MibBase
-class MibNotification(MibBase):
+class MibNotification(MibBase):
objects = []
-
-
+
_properties = MibBase._properties + (
- {'id':'objects', 'type':'lines', 'mode':'w'},
+ {"id": "objects", "type": "lines", "mode": "w"},
)
-
+
_relations = MibBase._relations + (
- ("module", ToOne(ToManyCont, "Products.ZenModel.MibModule", "notifications")),
+ (
+ "module",
+ ToOne(ToManyCont, "Products.ZenModel.MibModule", "notifications"),
+ ),
)
-
+
# Screen action bindings (and tab definitions)
- factory_type_information = (
- {
- 'immediate_view' : 'viewMibNotification',
- 'actions' :
- (
- { 'id' : 'overview'
- , 'name' : 'Overview'
- , 'action' : 'viewMibNotification'
- , 'permissions' : ( Permissions.view, )
+ factory_type_information = (
+ {
+ "immediate_view": "viewMibNotification",
+ "actions": (
+ {
+ "id": "overview",
+ "name": "Overview",
+ "action": "viewMibNotification",
+ "permissions": (Permissions.view,),
},
- )
- },
- )
+ ),
+ },
+ )
diff --git a/Products/ZenModel/MibOrganizer.py b/Products/ZenModel/MibOrganizer.py
index 0f4f20c691..265d9308d1 100644
--- a/Products/ZenModel/MibOrganizer.py
+++ b/Products/ZenModel/MibOrganizer.py
@@ -7,26 +7,29 @@
#
##############################################################################
+from __future__ import absolute_import
+
import logging
-from App.special_dtml import DTMLFile
+import six
+
+from AccessControl import ClassSecurityInfo, Permissions
from AccessControl.class_init import InitializeClass
-from AccessControl import ClassSecurityInfo
-from AccessControl import Permissions
+from App.special_dtml import DTMLFile
from Products.Jobber.jobs import SubprocessJob
-from Products.ZenModel.ZenossSecurity import ZEN_MANAGE_DMD, ZEN_ADD
from Products.ZenRelations.RelSchema import ToOne, ToManyCont
from Products.ZenUtils.Search import makeCaseInsensitiveKeywordIndex
from Products.ZenWidgets import messaging
from Products.ZenUtils.Utils import atomicWrite, binPath, zenPath
-from Organizer import Organizer
-from MibModule import MibModule
-from ZenPackable import ZenPackable
+from .MibModule import MibModule
+from .Organizer import Organizer
+from .ZenossSecurity import ZEN_MANAGE_DMD, ZEN_ADD
+from .ZenPackable import ZenPackable
-log = logging.getLogger('zen.Mibs')
-_pathToMIB = '/var/ext/uploadedMIBs'
+log = logging.getLogger("zen.Mibs")
+_pathToMIB = "/var/ext/uploadedMIBs"
def manage_addMibOrganizer(context, id, REQUEST=None):
@@ -35,12 +38,12 @@ def manage_addMibOrganizer(context, id, REQUEST=None):
context._setObject(id, sc)
sc = context._getOb(id)
if REQUEST is not None:
- REQUEST['RESPONSE'].redirect(
- context.absolute_url_path() + '/manage_main'
+ REQUEST["RESPONSE"].redirect(
+ context.absolute_url_path() + "/manage_main"
)
-addMibOrganizer = DTMLFile('dtml/addMibOrganizer', globals())
+addMibOrganizer = DTMLFile("dtml/addMibOrganizer", globals())
def _oid2name(mibSearch, oid, exactMatch=True, strip=False):
@@ -48,7 +51,7 @@ def _oid2name(mibSearch, oid, exactMatch=True, strip=False):
MibOrganizer class and takes mibSearch as a parameter to make it easier to
unit test.
"""
- oid = oid.strip('.')
+ oid = oid.strip(".")
if exactMatch:
brains = mibSearch(oid=oid)
@@ -57,13 +60,13 @@ def _oid2name(mibSearch, oid, exactMatch=True, strip=False):
else:
return ""
- oidlist = oid.split('.')
+ oidlist = oid.split(".")
for i in range(len(oidlist), 0, -1):
- brains = mibSearch(oid='.'.join(oidlist[:i]))
+ brains = mibSearch(oid=".".join(oidlist[:i]))
if len(brains) < 1:
continue
if len(oidlist[i:]) > 0 and not strip:
- return "%s.%s" % (brains[0].id, '.'.join(oidlist[i:]))
+ return "%s.%s" % (brains[0].id, ".".join(oidlist[i:]))
else:
return brains[0].id
return ""
@@ -72,30 +75,41 @@ def _oid2name(mibSearch, oid, exactMatch=True, strip=False):
class MibOrganizer(Organizer, ZenPackable):
meta_type = "MibOrganizer"
dmdRootName = "Mibs"
- default_catalog = 'mibSearch'
+ default_catalog = "mibSearch"
security = ClassSecurityInfo()
- _relations = Organizer._relations + ZenPackable._relations + (
- ("mibs", ToManyCont(ToOne,"Products.ZenModel.MibModule","miborganizer")),
+ _relations = (
+ Organizer._relations
+ + ZenPackable._relations
+ + (
+ (
+ "mibs",
+ ToManyCont(
+ ToOne, "Products.ZenModel.MibModule", "miborganizer"
+ ),
+ ),
+ )
)
# Screen action bindings (and tab definitions)
- factory_type_information = ({
- 'immediate_view' : 'mibOrganizerOverview',
- 'actions' :
- (
- { 'id' : 'overview'
- , 'name' : 'Overview'
- , 'action' : 'mibOrganizerOverview'
- , 'permissions' : (Permissions.view,)
- },
- )
- },)
+ factory_type_information = (
+ {
+ "immediate_view": "mibOrganizerOverview",
+ "actions": (
+ {
+ "id": "overview",
+ "name": "Overview",
+ "action": "mibOrganizerOverview",
+ "permissions": (Permissions.view,),
+ },
+ ),
+ },
+ )
def __init__(
- self, id=None, description=None, text=None,
- content_type='text/html'):
+ self, id=None, description=None, text=None, content_type="text/html"
+ ):
if not id:
id = self.dmdRootName
super(MibOrganizer, self).__init__(id, description)
@@ -124,22 +138,20 @@ def name2oid(self, name):
"""
Return an oid based on a name in the form MIB::name.
"""
- brains = self.getDmdRoot("Mibs").mibSearch({'id': name})
+ brains = self.getDmdRoot("Mibs").mibSearch({"id": name})
if len(brains) > 0:
return brains[0].oid
- return ''
+ return ""
def countClasses(self):
- """Count all mibs with in a MibOrganizer.
- """
+ """Count all mibs with in a MibOrganizer."""
count = self.mibs.countObjects()
for group in self.children():
count += group.countClasses()
return count
def createMibModule(self, name, path="/"):
- """Create a MibModule
- """
+ """Create a MibModule"""
mibs = self.getDmdRoot(self.dmdRootName)
mod = None
if not mod:
@@ -150,39 +162,35 @@ def createMibModule(self, name, path="/"):
return mod
def manage_addMibModule(self, id, REQUEST=None):
- """Create a new service class in this Organizer.
- """
+ """Create a new service class in this Organizer."""
mm = MibModule(id)
self.mibs._setObject(id, mm)
if REQUEST:
messaging.IMessageSender(self).sendToBrowser(
- 'Mib Module Created',
- 'Mib module %s was created.' % id
+ "Mib Module Created", "Mib module %s was created." % id
)
return self.callZenScreen(REQUEST)
else:
return self.mibs._getOb(id)
def removeMibModules(self, ids=None, REQUEST=None):
- """Remove MibModules from an EventClass.
- """
+ """Remove MibModules from an EventClass."""
if not ids:
return self()
- if isinstance(ids, basestring):
+ if isinstance(ids, six.string_types):
ids = (ids,)
for id in ids:
self.mibs._delObject(id)
if REQUEST:
messaging.IMessageSender(self).sendToBrowser(
- 'Mib Module Deleted',
- 'Mib modules deleted: %s' % ', '.join(ids)
+ "Mib Module Deleted",
+ "Mib modules deleted: %s" % ", ".join(ids),
)
return self()
def moveMibModules(self, moveTarget, ids=None, REQUEST=None):
- """Move MibModules from this organizer to moveTarget.
- """
- if isinstance(ids, basestring):
+ """Move MibModules from this organizer to moveTarget."""
+ if isinstance(ids, six.string_types):
ids = (ids,)
target = self.getChildMoveTarget(moveTarget)
for id in ids:
@@ -192,12 +200,12 @@ def moveMibModules(self, moveTarget, ids=None, REQUEST=None):
target.mibs._setObject(id, rec)
if REQUEST:
messaging.IMessageSender(self).sendToBrowser(
- 'Mib Module Moved',
- 'Mib modules moved to %s.' % moveTarget
+ "Mib Module Moved", "Mib modules moved to %s." % moveTarget
)
- REQUEST['RESPONSE'].redirect(target.getPrimaryUrlPath())
+ REQUEST["RESPONSE"].redirect(target.getPrimaryUrlPath())
+
+ security.declareProtected(ZEN_MANAGE_DMD, "reIndex")
- security.declareProtected(ZEN_MANAGE_DMD, 'reIndex')
def reIndex(self):
"""Go through all devices in this tree and reindex them."""
zcat = self._getOb(self.default_catalog)
@@ -207,7 +215,8 @@ def reIndex(self):
for thing in mib.nodes() + mib.notifications():
thing.index_object()
- security.declareProtected(ZEN_ADD, 'createCatalog')
+ security.declareProtected(ZEN_ADD, "createCatalog")
+
def createCatalog(self):
"""Create a catalog for mibs searching"""
from Products.ZCatalog.ZCatalog import manage_addZCatalog
@@ -216,12 +225,12 @@ def createCatalog(self):
manage_addZCatalog(self, self.default_catalog, self.default_catalog)
zcat = self._getOb(self.default_catalog)
cat = zcat._catalog
- cat.addIndex('oid', makeCaseInsensitiveKeywordIndex('oid'))
- cat.addIndex('id', makeCaseInsensitiveKeywordIndex('id'))
- cat.addIndex('summary', makeCaseInsensitiveKeywordIndex('summary'))
- zcat.addColumn('getPrimaryId')
- zcat.addColumn('id')
- zcat.addColumn('oid')
+ cat.addIndex("oid", makeCaseInsensitiveKeywordIndex("oid"))
+ cat.addIndex("id", makeCaseInsensitiveKeywordIndex("id"))
+ cat.addIndex("summary", makeCaseInsensitiveKeywordIndex("summary"))
+ zcat.addColumn("getPrimaryId")
+ zcat.addColumn("id")
+ zcat.addColumn("oid")
def handleUploadedFile(self, REQUEST):
"""
@@ -235,16 +244,20 @@ def handleUploadedFile(self, REQUEST):
atomicWrite(savedMIBPath, mibs, raiseException=True, createDir=True)
# create the job
- mypath = self.absolute_url_path().replace('/zport/dmd/Mibs', '')
+ mypath = self.absolute_url_path().replace("/zport/dmd/Mibs", "")
if not mypath:
- mypath = '/'
+ mypath = "/"
commandArgs = [
- binPath('zenmib'), 'run', savedMIBPath,
- '--path=%s' % mypath, '--mibdepsdir=%s' % zenPath(_pathToMIB)
+ binPath("zenmib"),
+ "run",
+ savedMIBPath,
+ "--path=%s" % mypath,
+ "--mibdepsdir=%s" % zenPath(_pathToMIB),
]
return self.dmd.JobManager.addJob(
- SubprocessJob, description="Load MIB at %s" % mypath,
- kwargs=dict(cmd=commandArgs)
+ SubprocessJob,
+ description="Load MIB at %s" % mypath,
+ kwargs={"cmd": commandArgs},
)
diff --git a/Products/ZenModel/OperatingSystem.py b/Products/ZenModel/OperatingSystem.py
index 59d4dc540d..32303d9836 100644
--- a/Products/ZenModel/OperatingSystem.py
+++ b/Products/ZenModel/OperatingSystem.py
@@ -34,7 +34,7 @@
class OperatingSystem(Software):
- totalSwap = 0L
+ totalSwap = 0
uname = ""
_properties = Software._properties + (
diff --git a/Products/ZenModel/PerformanceConf.py b/Products/ZenModel/PerformanceConf.py
index 15301717be..f6cd7e07f6 100644
--- a/Products/ZenModel/PerformanceConf.py
+++ b/Products/ZenModel/PerformanceConf.py
@@ -582,7 +582,7 @@ def _getZenModelerCommand(
cmd = [zm]
deviceName = self._escapeParentheses(deviceName)
options = [
- 'run', '--now', '-d', '"{}"'.format(deviceName), '--monitor', performanceMonitor,
+ 'run', '--now', '-d', deviceName, '--monitor', performanceMonitor,
'--collect={}'.format(collectPlugins)
]
cmd.extend(options)
diff --git a/Products/ZenModel/SiteError.py b/Products/ZenModel/SiteError.py
index 91391be0b4..591bf7a949 100644
--- a/Products/ZenModel/SiteError.py
+++ b/Products/ZenModel/SiteError.py
@@ -38,7 +38,7 @@ def cleanUrl(cls, errorUrl):
def createEmailHeader(cls, fromAddress, toAddress, subject):
- ''' Create the smnp header for an error email
+ ''' Create the snmp header for an error email
'''
header = 'To: %s\nFrom: %s\nSubject: %s\n' % (
toAddress, fromAddress, subject)
diff --git a/Products/ZenModel/ThresholdInstance.py b/Products/ZenModel/ThresholdInstance.py
index ee59fa1500..07e97fd32c 100644
--- a/Products/ZenModel/ThresholdInstance.py
+++ b/Products/ZenModel/ThresholdInstance.py
@@ -7,19 +7,16 @@
#
##############################################################################
+import logging
-import os
+from twisted.spread import pb
from Products.ZenModel.PerformanceConf import PerformanceConf
from Products.ZenModel.MonitorClass import MonitorClass
-from Products.ZenUtils.Utils import unused, rrd_daemon_args, rrd_daemon_retry
-
-from twisted.spread import pb
-
-import logging
from Products.ZenUtils.deprecated import deprecated
+from Products.ZenUtils.Utils import unused
-log = logging.getLogger('zen.ThresholdInstance')
+log = logging.getLogger("zen.ThresholdInstance")
class ThresholdContext(pb.Copyable, pb.RemoteCopy):
@@ -31,31 +28,35 @@ class ThresholdContext(pb.Copyable, pb.RemoteCopy):
def __init__(self, context):
self.metricMetaData = {}
if isinstance(context, MonitorClass):
- self.deviceName = "{context.id} hub".format(context=context)
- self.componentName = ''
- self.deviceUrl = 'zport/dmd/Monitors/Hub/{context.id}/viewHubPerformance'.format(context=context)
- self.devicePath = 'Monitors/Hub/{context.id}'.format(context=context)
- self._contextKey = '/'.join(('Daemons', context.id))
+ self.deviceName = "{ctx.id} hub".format(ctx=context)
+ self.componentName = ""
+ self.deviceUrl = (
+ "zport/dmd/Monitors/Hub/{ctx.id}/viewHubPerformance"
+ ).format(ctx=context)
+ self.devicePath = "Monitors/Hub/{ctx.id}".format(ctx=context)
+ self._contextKey = "/".join(("Daemons", context.id))
elif isinstance(context, PerformanceConf):
- self.deviceName = "{context.id} collector".format(context=context)
- self.componentName = ''
- self.deviceUrl = 'zport/dmd/Monitors/Performance/{context.id}/viewDaemonPerformance'.format(context=context)
- self.devicePath = 'Monitors/Performance/{context.id}'.format(context=context)
- self._contextKey = '/'.join(('Daemons', context.id))
+ self.deviceName = "{ctx.id} collector".format(ctx=context)
+ self.componentName = ""
+ self.deviceUrl = (
+ "zport/dmd/Monitors/Performance/{ctx.id}/viewDaemonPerformance"
+ ).format(ctx=context)
+ self.devicePath = "Monitors/Performance/{ctx.id}".format(
+ ctx=context
+ )
+ self._contextKey = "/".join(("Daemons", context.id))
else:
self.deviceName = context.device().id
self.componentName = context.id
if self.componentName == self.deviceName:
- self.componentName = ''
+ self.componentName = ""
self._contextKey = context.getUUID()
self.metricMetaData = context.getMetricMetadata()
self._contextUid = context.getPrimaryId()
-
-
def key(self):
"Unique data that refers this context"
return self.deviceName, self.componentName
@@ -83,9 +84,9 @@ def fileKey(self, dataPoint):
# return os.path.join(self.rrdPath, dataPoint)
-
pb.setUnjellyableForClass(ThresholdContext, ThresholdContext)
+
class ThresholdInstance(pb.Copyable, pb.RemoteCopy):
"""A ThresholdInstance is a threshold to be evaluated in a
collector within a given context."""
@@ -106,7 +107,6 @@ def key(self):
def dataPoints(self):
"Returns the names of the datapoints used to compute the threshold"
-
def checkValue(self, dataPoint, timestamp, value):
"""
Check if the value violates the threshold.
@@ -124,7 +124,6 @@ def check(self, dataPoints):
returns events or an empty sequence"""
raise NotImplementedError()
-
@deprecated
def checkRaw(self, dataPoint, timeOf, value):
"""A new datapoint has been collected, use the given _raw_
@@ -133,8 +132,9 @@ def checkRaw(self, dataPoint, timeOf, value):
"""
raise NotImplementedError()
- def getGraphElements(self, template, context, gopts, namespace, color,
- legend, relatedGps):
+ def getGraphElements(
+ self, template, context, gopts, namespace, color, legend, relatedGps
+ ):
"""Produce a visual indication on the graph of where the
threshold applies."""
unused(template, context, gopts, namespace, color, legend, relatedGps)
@@ -143,16 +143,17 @@ def getGraphElements(self, template, context, gopts, namespace, color,
pb.setUnjellyableForClass(ThresholdInstance, ThresholdInstance)
+
class RRDThresholdInstance(ThresholdInstance):
"""
Deprecated
"""
+
pb.setUnjellyableForClass(RRDThresholdInstance, RRDThresholdInstance)
class MetricThresholdInstance(ThresholdInstance):
-
def __init__(self, id, context, dpNames, eventClass, severity):
self._context = context
self.id = id
@@ -172,7 +173,6 @@ def dataPoints(self):
"Returns the names of the datapoints used to compute the threshold"
return self.dataPointNames
-
def checkValue(self, dataPoint, timestamp, value):
return self._checkImpl(dataPoint, value)
@@ -187,4 +187,5 @@ def _checkImpl(self, dataPoint, value):
"""
raise NotImplementedError()
+
pb.setUnjellyableForClass(MetricThresholdInstance, MetricThresholdInstance)
diff --git a/Products/ZenModel/ValueChangeThreshold.py b/Products/ZenModel/ValueChangeThreshold.py
index 10e91a2436..75ee6b79fe 100644
--- a/Products/ZenModel/ValueChangeThreshold.py
+++ b/Products/ZenModel/ValueChangeThreshold.py
@@ -7,52 +7,56 @@
#
##############################################################################
-
-from Products.ZenModel.ThresholdInstance import MetricThresholdInstance
-
-__doc__= """Threshold to track when a value changes.
-"""
+import logging
from AccessControl.class_init import InitializeClass
-from ThresholdClass import ThresholdClass
-from ThresholdInstance import ThresholdContext
+from twisted.spread import pb
from zenoss.protocols.protobufs.zep_pb2 import SEVERITY_INFO
+
from Products.ZenEvents.ZenEventClasses import Status_Perf
from Products.ZenUtils import Map
-import logging
-log = logging.getLogger('zen.MinMaxCheck')
+from .ThresholdClass import ThresholdClass
+from .ThresholdInstance import MetricThresholdInstance, ThresholdContext
+log = logging.getLogger("zen.MinMaxCheck")
+
+NaN = float("nan")
-NaN = float('nan')
class ValueChangeThreshold(ThresholdClass):
"""
- Threshold that can watch changes in a value
+ Threshold that can watch changes in a value.
"""
eventClass = Status_Perf
severity = SEVERITY_INFO
def createThresholdInstance(self, context):
- """Return the config used by the collector to process change thresholds
"""
- mmt = ValueChangeThresholdInstance(self.id,
- ThresholdContext(context),
- self.dsnames,
- eventClass=self.eventClass,
- severity=self.severity)
+ Return the config used by the collector to process change thresholds.
+ """
+ mmt = ValueChangeThresholdInstance(
+ self.id,
+ ThresholdContext(context),
+ self.dsnames,
+ eventClass=self.eventClass,
+ severity=self.severity,
+ )
return mmt
+
InitializeClass(ValueChangeThreshold)
ValueChangeThresholdClass = ValueChangeThreshold
+
class ValueChangeThresholdInstance(MetricThresholdInstance):
"""
- Threshold that emits an event when a value changes from its previous value. Does not send clear events.
+ Threshold that emits an event when a value changes from its
+ previous value. Does not send clear events.
"""
- lastValues = Map.Locked(Map.Timed({}, 60*60*24)) # 24-hour timeout
+ lastValues = Map.Locked(Map.Timed({}, 60 * 60 * 24)) # 24-hour timeout
def _checkImpl(self, dataPoint, value):
dpKey = self._getDpKey(dataPoint)
@@ -62,7 +66,7 @@ def _checkImpl(self, dataPoint, value):
# Update the value in the map.
ValueChangeThresholdInstance.lastValues[dpKey] = value
# .. Only create a change event if this isn't the first collection
- if lastValue != None:
+ if lastValue is not None:
event = dict(
device=self.context().deviceName,
summary="Value changed from %s to %s" % (lastValue, value),
@@ -71,16 +75,19 @@ def _checkImpl(self, dataPoint, value):
component=self.context().componentName,
current=value,
previous=lastValue,
- severity=self.severity)
+ severity=self.severity,
+ )
return (event,)
return tuple()
def _getDpKey(self, dp):
- return ':'.join(self.context().key()) + ':' + dp
+ return ":".join(self.context().key()) + ":" + dp
def getGraphValues(self, relatedGps, context):
# currently, no visualization implemented for this threshold type
return ()
-from twisted.spread import pb
-pb.setUnjellyableForClass(ValueChangeThresholdInstance, ValueChangeThresholdInstance)
+
+pb.setUnjellyableForClass(
+ ValueChangeThresholdInstance, ValueChangeThresholdInstance
+)
diff --git a/Products/ZenModel/ZDeviceLoader.py b/Products/ZenModel/ZDeviceLoader.py
index 176f0682cf..b5839c339b 100644
--- a/Products/ZenModel/ZDeviceLoader.py
+++ b/Products/ZenModel/ZDeviceLoader.py
@@ -29,6 +29,7 @@
from DateTime import DateTime
from OFS.SimpleItem import SimpleItem
+from Products.Jobber.zenjobs import app
from Products.ZenUtils.Utils import isXmlRpc, setupLoggingHeader
from Products.ZenUtils.Utils import clearWebLoggingStream
from Products.ZenUtils.IpUtil import getHostByName, ipwrap
@@ -182,7 +183,7 @@ class CreateDeviceJob(Job):
"""
Create a new device object.
"""
-
+ name = 'CreateDeviceJob'
# Declare DeviceExistsError as an expected exception so that a traceback
# is not written to zenjobs' log.
throws = Job.throws + (DeviceExistsError,)
@@ -275,6 +276,7 @@ def setCustomProperty(self, dev, cProperty, value):
return dev.setZenProperty(cProperty, value)
+app.register_task(CreateDeviceJob)
# alias the DeviceCreationJob so zenpacks don't break
DeviceCreationJob = CreateDeviceJob
diff --git a/Products/ZenModel/ZenMenuItem.py b/Products/ZenModel/ZenMenuItem.py
index 7c827bdcd8..7240aaa0d1 100644
--- a/Products/ZenModel/ZenMenuItem.py
+++ b/Products/ZenModel/ZenMenuItem.py
@@ -56,12 +56,26 @@ def getMenuItemOwner(self):
parent = aq_parent(parent)
return parent
- def __cmp__(self, other):
- if isinstance(other, ZenMenuItem):
- if other and other.ordering:
- return cmp(other.ordering, self.ordering)
- else:
- return cmp(0.0, self.ordering)
- return cmp(id(self), id(other))
-
+ def __eq__(self, other):
+ if not isinstance(other, ZenMenuItem):
+ return False
+ if self is other:
+ return True
+ return self.ordering == other.ordering
+
+ def __lt__(self, other):
+ if not isinstance(other, ZenMenuItem):
+ return NotImplemented
+ if self is other:
+ return False
+ return self.ordering < other.ordering
+
+ def __le__(self, other):
+ if not isinstance(other, ZenMenuItem):
+ return NotImplemented
+ if self is other:
+ return True
+ return self.ordering <= other.ordering
+
+
InitializeClass(ZenMenuItem)
diff --git a/Products/ZenModel/ZenPack.py b/Products/ZenModel/ZenPack.py
index b305c97437..a040a03114 100644
--- a/Products/ZenModel/ZenPack.py
+++ b/Products/ZenModel/ZenPack.py
@@ -77,7 +77,7 @@ def __init__(self, *args, **kw):
VersionBase.__init__(self, 'Zenoss', *args, **kw)
-def needDir(path, perms=0750):
+def needDir(path, perms=0o750):
if not os.path.isdir(path):
os.mkdir(path, perms)
return path
@@ -343,7 +343,7 @@ def storeBackup(self):
"""
backupDir = zenPath(".ZenPacks")
if not os.path.isdir(backupDir):
- os.makedirs(backupDir, 0750)
+ os.makedirs(backupDir, 0o750)
src = self.eggPath()
filename = ""
@@ -493,7 +493,7 @@ def migrate(self, previousVersion=None):
try:
for instance in instances:
- if instance.version >= migrateCutoff:
+ if instance.version.tuple() >= migrateCutoff:
recover.append(instance)
instance.migrate(self)
except Exception as ex:
diff --git a/Products/ZenModel/ZenPackLoader.py b/Products/ZenModel/ZenPackLoader.py
index 06a89d4c3b..0cfb21612a 100644
--- a/Products/ZenModel/ZenPackLoader.py
+++ b/Products/ZenModel/ZenPackLoader.py
@@ -240,7 +240,7 @@ def _updateConfFile(self, pack):
def load(self, pack, unused):
for fs in findFiles(pack, 'daemons', filter=self.filter):
- os.chmod(fs, 0755)
+ os.chmod(fs, 0o755)
path = self.binPath(fs)
if os.path.lexists(path):
os.remove(path)
@@ -286,7 +286,7 @@ def binPath(self, bin_file):
def load(self, pack, unused):
for fs in findFiles(pack, 'bin', filter=self.filter):
- os.chmod(fs, 0755)
+ os.chmod(fs, 0o755)
path = self.binPath(fs)
if os.path.lexists(path):
os.remove(path)
@@ -314,7 +314,7 @@ def filter(self, f):
def load(self, pack, unused):
for fs in findFiles(pack, 'libexec', filter=self.filter):
- os.chmod(fs, 0755)
+ os.chmod(fs, 0o755)
def upgrade(self, pack, app):
self.unload(pack, app)
diff --git a/Products/ZenModel/ZenPacker.py b/Products/ZenModel/ZenPacker.py
index 11f08e739e..ba906b2e43 100644
--- a/Products/ZenModel/ZenPacker.py
+++ b/Products/ZenModel/ZenPacker.py
@@ -60,6 +60,8 @@ def findObject(self, id):
pass
if len(result) == 0:
try:
+ if isinstance(id, unicode):
+ id = id.encode('utf-8')
result.append(self.dmd.unrestrictedTraverse(id))
except KeyError:
pass
diff --git a/Products/ZenModel/ZenossInfo.py b/Products/ZenModel/ZenossInfo.py
index d586bb17f6..a709ab7c8e 100644
--- a/Products/ZenModel/ZenossInfo.py
+++ b/Products/ZenModel/ZenossInfo.py
@@ -20,7 +20,6 @@
import shutil
import traceback
import logging
-import commands
from AccessControl.class_init import InitializeClass
from OFS.SimpleItem import SimpleItem
@@ -303,19 +302,6 @@ def getRabbitMQVersion(self):
from Products.ZenUtils.qverify import ZenAmqp
return Version.parse("RabbitMQ %s" % ZenAmqp().getVersion())
- @versionmeta("Erlang", "http://www.erlang.org/")
- def getErlangVersion(self):
- retVal, output = commands.getstatusoutput('erl -noshell +V')
- version = None
-
- if not retVal:
- try:
- version = re.findall(r'version (\S+)', output)[0]
- except Exception:
- pass
-
- return Version.parse("Erlang %s" % version)
-
def getAllVersions(self):
"""
Return a list of version numbers for currently tracked component
@@ -329,7 +315,6 @@ def getAllVersions(self):
self.getMySQLVersion,
self.getTwistedVersion,
self.getRabbitMQVersion,
- self.getErlangVersion,
self.getNetSnmpVersion,
self.getPyNetSnmpVersion,
self.getWmiVersion,
diff --git a/Products/ZenModel/data/devices.xml b/Products/ZenModel/data/devices.xml
index 8a8e1b691d..53d6dcc313 100644
--- a/Products/ZenModel/data/devices.xml
+++ b/Products/ZenModel/data/devices.xml
@@ -1,18 +1,30 @@
-