Merge tag '3.0.1' into develop

tag 3.0.1
zenoss · May 3, 2018 · 672a184 · 672a184
2 parents 62be9ba + 5c9704f
commit 672a184
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/ZenPacks/zenoss/DnsMonitor/datasources/DnsMonitorDataSource.py b/ZenPacks/zenoss/DnsMonitor/datasources/DnsMonitorDataSource.py
@@ -51,7 +51,7 @@ class DnsMonitorDataSource(PythonDataSource):
         ZENPACKID + '.datasources.DnsMonitorDataSource.DnsMonitorDataSourcePlugin')
     timeout = 15
     eventClass = '/Status/DNS'
-    hostname = '${dev/id}'
+    hostname = '${dev/titleOrId}'
     dnsServer = ''
     expectedIpAddress = ''
 
@@ -152,18 +152,22 @@ def onError(self, result, config):
         perfData = {}
         ds0 = config.datasources[0]
         if hasattr(result.value, 'subFailure'):
-            if isinstance(result.value.subFailure.value, error.DNSNameError):
-                message = ("Domain {} was not found by the server".format(
-                    ds0.params['hostname']))
+            respTime, respTimeOrig = (None, respTime)
+            if isinstance(result.value.subFailure.value, error.DNSServerError):
+                message = "DNS WARNING - {}".format(self.resolver.pickServer()[0])
             elif isinstance(result.value.subFailure.value, InvalidAddressError):
                 message = ("DNS WARNING - "
                     "Server: {} - "
                     "InvalidAddressError".format(self.resolver.pickServer()[0]))
-                respTime = None
             elif isinstance(result.value.subFailure.value, defer.TimeoutError):
                 message = ("CRITICAL - Plugin timed out "
                     "while executing system call")
-                respTime = None                
+            elif isinstance(result.value.subFailure.value, error.DNSNameError):
+                message = "Domain {} was not found by the server".format(
+                    ds0.params['hostname'])
+                respTime = respTimeOrig
+            else:
+                message = "DNS Unknown error"
         else:
             message = '{}'.format(result.getErrorMessage())
             respTime = None

diff --git a/ZenPacks/zenoss/DnsMonitor/objects/objects.xml b/ZenPacks/zenoss/DnsMonitor/objects/objects.xml
@@ -26,7 +26,7 @@ True
 900
 </property>
 <property type="string" id="hostname" mode="w" >
-${dev/id}
+${dev/titleOrId}
 </property>
 <property type="string" id="expectedIpAddress" mode="w" >
 ${dev/manageIp}