From 92f18af52f5e926a200a5dce7dde875a34d4bcc2 Mon Sep 17 00:00:00 2001
From: Joseph Hanson <jhanson@zenoss.com>
Date: Mon, 17 Aug 2015 13:19:22 -0500
Subject: [PATCH] Fixes ZEN-19746

cherry-pick commit 5206c59db0f7586b1778b7e09809aedc10dc270e
(committed by "zendev port cherry-pick")
---
 Products/Zuul/infos/metricserver.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Products/Zuul/infos/metricserver.py b/Products/Zuul/infos/metricserver.py
index f9a2d53285..9fd327b555 100644
--- a/Products/Zuul/infos/metricserver.py
+++ b/Products/Zuul/infos/metricserver.py
@@ -156,6 +156,8 @@ def id(self):
 
     @property
     def name(self):
+        if self._multiContext:
+            return "%s %s" % (self._context.id, self._object.id)
         # RPN expressions use the DataPointGraphPoint id to reference other datapoints for the graph, central query
         # uses the "name" property to resolve references in RPN expression.
         return self._object.id