Merge branch 'develop' into feature/feature/ZEN-26894-fix-production-…

…state-sort-error
zenoss · Mar 16, 2017 · 35a37bb · 35a37bb
2 parents 5d2e55f + 0d7725f
commit 35a37bb
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Products/Zuul/infos/metricserver.py b/Products/Zuul/infos/metricserver.py
@@ -75,7 +75,7 @@ def contextTitle(self):
         """
         For the reports we need the context in the title.
         """
-        title = self._context.device().deviceClass().getOrganizerName() + "/" + self._context.device().titleOrId()
+        title = self._context.device().deviceClass().getOrganizerName() + " - " + self._context.device().titleOrId()
         if isinstance(self._context, DeviceComponent):
             title =  "%s - %s" %(title, self._context.titleOrId())
         return "%s - %s" % (self.titleGroup, title)
@@ -395,7 +395,7 @@ class OSProcessMetricServiceGraphDefinition(MetricServiceGraphDefinition):
 
     @property
     def contextTitle(self):
-        return "{graphTitle} - {organizerName}/{deviceTitle} - {componentTitle}".format(
+        return "{graphTitle} - {organizerName} - {deviceTitle} - {componentTitle}".format(
             graphTitle=self._object.titleOrId(),
             organizerName=self._context.device().deviceClass().getOrganizerName(),
             deviceTitle=self._context.device().titleOrId(),