ambari git commit: AMBARI-11250. Publishing graphs/widgets for a new service requires ambari server code change. (Ivan via Jaimin)

2015-05-27 Thread jaimin 
Repository: ambari
Updated Branches:
  refs/heads/trunk e28a9c073 - 90eae672d


AMBARI-11250. Publishing graphs/widgets for a new service requires ambari 
server code change. (Ivan via Jaimin)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/90eae672
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/90eae672
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/90eae672

Branch: refs/heads/trunk
Commit: 90eae672d26bc2f9f773e948c4cf0e40e330fde3
Parents: e28a9c0
Author: Jaimin Jetly jai...@hortonworks.com
Authored: Wed May 27 11:41:29 2015 -0700
Committer: Jaimin Jetly jai...@hortonworks.com
Committed: Wed May 27 11:41:29 2015 -0700

--
 .../metrics/timeline/AMSPropertyProvider.java   | 23 -
 .../ambari/server/state/ComponentInfo.java  | 11 +++
 .../AMBARI_METRICS/0.1.0/metainfo.xml   |  1 +
 .../HBASE/0.96.0.2.0/metainfo.xml   |  2 +
 .../timeline/AMSPropertyProviderTest.java   | 96 
 5 files changed, 131 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/90eae672/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProvider.java
index 1963d8d..d7d4c0a 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProvider.java
@@ -17,7 +17,10 @@
  */
 package org.apache.ambari.server.controller.metrics.timeline;
 
+import org.apache.ambari.server.api.services.AmbariMetaInfo;
 import org.apache.ambari.server.configuration.ComponentSSLConfiguration;
+import org.apache.ambari.server.controller.AmbariManagementController;
+import org.apache.ambari.server.controller.AmbariServer;
 import org.apache.ambari.server.controller.internal.PropertyInfo;
 import org.apache.ambari.server.controller.metrics.MetricHostProvider;
 import org.apache.ambari.server.controller.metrics.MetricsPropertyProvider;
@@ -27,6 +30,7 @@ import 
org.apache.ambari.server.controller.spi.SystemException;
 import org.apache.ambari.server.controller.spi.TemporalInfo;
 import org.apache.ambari.server.controller.utilities.PropertyHelper;
 import org.apache.ambari.server.controller.utilities.StreamProvider;
+import org.apache.ambari.server.state.StackId;
 import org.apache.commons.lang.StringUtils;
 import org.apache.hadoop.metrics2.sink.timeline.TimelineMetric;
 import org.apache.hadoop.metrics2.sink.timeline.TimelineMetrics;
@@ -317,8 +321,23 @@ public abstract class AMSPropertyProvider extends 
MetricsPropertyProvider {
   } else {
 String componentName = getComponentName(resource);
 if (componentName != null  !componentName.isEmpty()) {
-  if (TIMELINE_APPID_MAP.containsKey(componentName)) {
-componentName = TIMELINE_APPID_MAP.get(componentName);
+  String clusterName = (String) 
resource.getPropertyValue(clusterNamePropertyId);
+  StackId stackId;
+  try {
+AmbariManagementController managementController = 
AmbariServer.getController();
+stackId = 
managementController.getClusters().getCluster(clusterName).getCurrentStackVersion();
+if (stackId != null) {
+  String stackName = stackId.getStackName();
+  String version = stackId.getStackVersion();
+  AmbariMetaInfo ambariMetaInfo = 
managementController.getAmbariMetaInfo();
+  String serviceName = 
ambariMetaInfo.getComponentToService(stackName,version,componentName);
+  String timeLineAppId = ambariMetaInfo.getComponent(stackName, 
version, serviceName, componentName).getTimelineAppid();
+  if (timeLineAppId != null){
+componentName = timeLineAppId;
+  }
+}
+  } catch (Exception e) {
+e.printStackTrace();
   }
   uriBuilder.setParameter(appId, componentName);
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/90eae672/ambari-server/src/main/java/org/apache/ambari/server/state/ComponentInfo.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/state/ComponentInfo.java 
b/ambari-server/src/main/java/org/apache/ambari/server/state/ComponentInfo.java
index 05c0df7..fd68060 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/state/ComponentInfo.java

ambari git commit: AMBARI-11250. Publishing graphs/widgets for a new service requires ambari server code change.

2015-05-19 Thread swagle 
Repository: ambari
Updated Branches:
  refs/heads/trunk 8a7c54c63 - 824bc8b6a


AMBARI-11250. Publishing graphs/widgets for a new service requires ambari 
server code change.


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/824bc8b6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/824bc8b6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/824bc8b6

Branch: refs/heads/trunk
Commit: 824bc8b6a45682638147d24197cdf106c4fe96c5
Parents: 8a7c54c
Author: Siddharth Wagle swa...@hortonworks.com
Authored: Tue May 19 12:55:58 2015 -0700
Committer: Siddharth Wagle swa...@hortonworks.com
Committed: Tue May 19 12:56:06 2015 -0700

--
 .../metrics/timeline/AMSPropertyProvider.java   | 23 -
 .../ambari/server/state/ComponentInfo.java  | 11 +++
 .../AMBARI_METRICS/0.1.0/metainfo.xml   |  1 +
 .../HBASE/0.96.0.2.0/metainfo.xml   |  2 +
 .../timeline/AMSPropertyProviderTest.java   | 96 
 5 files changed, 131 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/824bc8b6/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProvider.java
index 8bd1b2d..d5af2b7 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProvider.java
@@ -17,7 +17,10 @@
  */
 package org.apache.ambari.server.controller.metrics.timeline;
 
+import org.apache.ambari.server.api.services.AmbariMetaInfo;
 import org.apache.ambari.server.configuration.ComponentSSLConfiguration;
+import org.apache.ambari.server.controller.AmbariManagementController;
+import org.apache.ambari.server.controller.AmbariServer;
 import org.apache.ambari.server.controller.internal.PropertyInfo;
 import org.apache.ambari.server.controller.metrics.MetricHostProvider;
 import org.apache.ambari.server.controller.metrics.MetricsPropertyProvider;
@@ -27,6 +30,7 @@ import 
org.apache.ambari.server.controller.spi.SystemException;
 import org.apache.ambari.server.controller.spi.TemporalInfo;
 import org.apache.ambari.server.controller.utilities.PropertyHelper;
 import org.apache.ambari.server.controller.utilities.StreamProvider;
+import org.apache.ambari.server.state.StackId;
 import org.apache.commons.lang.StringUtils;
 import org.apache.hadoop.metrics2.sink.timeline.TimelineMetric;
 import org.apache.hadoop.metrics2.sink.timeline.TimelineMetrics;
@@ -339,8 +343,23 @@ public abstract class AMSPropertyProvider extends 
MetricsPropertyProvider {
   } else {
 String componentName = getComponentName(resource);
 if (componentName != null  !componentName.isEmpty()) {
-  if (TIMELINE_APPID_MAP.containsKey(componentName)) {
-componentName = TIMELINE_APPID_MAP.get(componentName);
+  String clusterName = (String) 
resource.getPropertyValue(clusterNamePropertyId);
+  StackId stackId;
+  try {
+AmbariManagementController managementController = 
AmbariServer.getController();
+stackId = 
managementController.getClusters().getCluster(clusterName).getCurrentStackVersion();
+if (stackId != null) {
+  String stackName = stackId.getStackName();
+  String version = stackId.getStackVersion();
+  AmbariMetaInfo ambariMetaInfo = 
managementController.getAmbariMetaInfo();
+  String serviceName = 
ambariMetaInfo.getComponentToService(stackName, version, componentName);
+  String timeLineAppId = ambariMetaInfo.getComponent(stackName, 
version, serviceName, componentName).getTimelineAppid();
+  if (timeLineAppId != null){
+componentName = timeLineAppId;
+  }
+}
+  } catch (Exception e) {
+e.printStackTrace();
   }
   uriBuilder.setParameter(appId, componentName);
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/824bc8b6/ambari-server/src/main/java/org/apache/ambari/server/state/ComponentInfo.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/state/ComponentInfo.java 
b/ambari-server/src/main/java/org/apache/ambari/server/state/ComponentInfo.java
index 05c0df7..fd68060 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/state/ComponentInfo.java
+++