Selaa lähdekoodia

AMBARI-7837. Slider View: time-series data for Slider Apps metrics missing on some clusters

Sumit Mohanty 10 vuotta sitten
vanhempi
commit
ec6b44eca0

+ 2 - 0
contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewController.java

@@ -44,6 +44,8 @@ public interface SliderAppsViewController {
   public static final String PROPERTY_YARN_RM_WEBAPP_URL = "yarn.rm.webapp.url";
   public static final String PROPERTY_SLIDER_SECURITY_ENABLED = "slider.security.enabled";
 
+  public static final String METRICS_API_NAME = "Metrics API";
+
   public ViewStatus getViewStatus();
 
   /**

+ 2 - 2
contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java

@@ -720,8 +720,8 @@ public class SliderAppsViewControllerImpl implements SliderAppsViewController {
           quickLinks = sliderAppClient
               .getQuickLinks(appMasterData.publisherUrl);
         }
-        if (quickLinks != null && quickLinks.containsKey("Metrics")) {
-          String metricsUrl = quickLinks.get("Metrics");
+        if (quickLinks != null && quickLinks.containsKey(METRICS_API_NAME)) {
+          String metricsUrl = quickLinks.get(METRICS_API_NAME);
           MetricsHolder metricsHolder = appMetrics.get(matchedAppType
               .uniqueName());
           app.setMetrics(sliderAppClient.getGangliaMetrics(metricsUrl,

+ 2 - 1
contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/client/SliderAppMasterClient.java

@@ -36,6 +36,7 @@ import org.apache.ambari.view.slider.SliderAppType;
 import org.apache.ambari.view.slider.SliderAppTypeComponent;
 import org.apache.ambari.view.slider.TemporalInfo;
 import org.apache.commons.httpclient.HttpException;
+import org.apache.ambari.view.slider.SliderAppsViewController;
 import org.apache.log4j.Logger;
 
 import com.google.gson.JsonElement;
@@ -105,7 +106,7 @@ public class SliderAppMasterClient extends BaseHttpClient {
           } else if ("org.apache.slider.metrics.ui".equals(entry.getKey())) {
             quickLinks.put("Metrics UI", entry.getValue().getAsString());
           } else if ("org.apache.slider.metrics".equals(entry.getKey())) {
-            quickLinks.put("Metrics API", entry.getValue().getAsString());
+            quickLinks.put(SliderAppsViewController.METRICS_API_NAME, entry.getValue().getAsString());
           } else {
             quickLinks.put(entry.getKey(), entry.getValue().getAsString());
           }