This is an automated email from the ASF dual-hosted git repository.

amagyar pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git

commit b614378a9c6edc23ab628f2acf8af5ef11ba68d5
Author: Attila Magyar <amag...@hortonworks.com>
AuthorDate: Mon Mar 12 20:35:03 2018 +0100

    AMBARI-22755. Show OneFS JMX metrics on the UI (amagyar)
---
 .../ambari/server/controller/internal/ConfigBasedJmxHostProvider.java | 4 ++--
 .../server/controller/internal/StackDefinedPropertyProvider.java      | 2 +-
 .../main/java/org/apache/ambari/server/state/{alert => }/UriInfo.java | 2 +-
 .../src/main/java/org/apache/ambari/server/state/alert/AmsSource.java | 2 ++
 .../main/java/org/apache/ambari/server/state/alert/MetricSource.java  | 1 +
 .../main/java/org/apache/ambari/server/state/alert/ServerSource.java  | 2 ++
 .../src/main/java/org/apache/ambari/server/state/alert/WebSource.java | 2 ++
 .../java/org/apache/ambari/server/state/stack/MetricDefinition.java   | 2 +-
 .../server/controller/internal/ConfigBasedJmxHostProviderTest.java    | 2 +-
 .../java/org/apache/ambari/server/state/{alert => }/UriInfoTest.java  | 2 +-
 10 files changed, 14 insertions(+), 7 deletions(-)

diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigBasedJmxHostProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigBasedJmxHostProvider.java
index ff513c5..5291898 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigBasedJmxHostProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigBasedJmxHostProvider.java
@@ -30,10 +30,10 @@ import java.util.Set;
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.controller.jmx.JMXHostProvider;
 import org.apache.ambari.server.state.ConfigHelper;
-import org.apache.ambari.server.state.alert.UriInfo;
+import org.apache.ambari.server.state.UriInfo;
 
 /**
- * I'm a special {@link JMXHostProvider} that resolves JMX URIs based on 
cluster configuration.
+ * A special {@link JMXHostProvider} that resolves JMX URIs based on cluster 
configuration.
  */
 public class ConfigBasedJmxHostProvider implements JMXHostProvider {
   private final Map<String, UriInfo> overriddenJmxUris;
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProvider.java
index 99ad46f..4e1d07e 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProvider.java
@@ -50,7 +50,7 @@ import org.apache.ambari.server.state.Clusters;
 import org.apache.ambari.server.state.ConfigHelper;
 import org.apache.ambari.server.state.Service;
 import org.apache.ambari.server.state.StackId;
-import org.apache.ambari.server.state.alert.UriInfo;
+import org.apache.ambari.server.state.UriInfo;
 import org.apache.ambari.server.state.stack.Metric;
 import org.apache.ambari.server.state.stack.MetricDefinition;
 import org.slf4j.Logger;
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/state/alert/UriInfo.java 
b/ambari-server/src/main/java/org/apache/ambari/server/state/UriInfo.java
similarity index 99%
rename from 
ambari-server/src/main/java/org/apache/ambari/server/state/alert/UriInfo.java
rename to 
ambari-server/src/main/java/org/apache/ambari/server/state/UriInfo.java
index a2f1497..f7713c4 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/state/alert/UriInfo.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/UriInfo.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.ambari.server.state.alert;
+package org.apache.ambari.server.state;
 
 import java.net.URI;
 import java.util.Map;
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/state/alert/AmsSource.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/state/alert/AmsSource.java
index f739115..ab8b671 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/state/alert/AmsSource.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/state/alert/AmsSource.java
@@ -20,6 +20,8 @@ package org.apache.ambari.server.state.alert;
 import java.util.List;
 import java.util.Objects;
 
+import org.apache.ambari.server.state.UriInfo;
+
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.gson.annotations.SerializedName;
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/state/alert/MetricSource.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/state/alert/MetricSource.java
index ff7565e..bfb3021 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/state/alert/MetricSource.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/state/alert/MetricSource.java
@@ -26,6 +26,7 @@ import java.util.Objects;
 import java.util.Optional;
 
 import org.apache.ambari.server.controller.jmx.JMXMetricHolder;
+import org.apache.ambari.server.state.UriInfo;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
 import org.springframework.expression.spel.support.StandardEvaluationContext;
 
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/state/alert/ServerSource.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/state/alert/ServerSource.java
index 642428e..bc59f81 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/state/alert/ServerSource.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/state/alert/ServerSource.java
@@ -19,6 +19,8 @@ package org.apache.ambari.server.state.alert;
 
 import java.util.Objects;
 
+import org.apache.ambari.server.state.UriInfo;
+
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.gson.annotations.SerializedName;
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/state/alert/WebSource.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/state/alert/WebSource.java
index 16d8aad..33d8dbb 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/state/alert/WebSource.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/state/alert/WebSource.java
@@ -19,6 +19,8 @@ package org.apache.ambari.server.state.alert;
 
 import java.util.Objects;
 
+import org.apache.ambari.server.state.UriInfo;
+
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.gson.annotations.SerializedName;
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/MetricDefinition.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/MetricDefinition.java
index ed3c2a2..6d2b126 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/MetricDefinition.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/MetricDefinition.java
@@ -24,7 +24,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 
-import org.apache.ambari.server.state.alert.UriInfo;
+import org.apache.ambari.server.state.UriInfo;
 import org.codehaus.jackson.annotate.JsonIgnore;
 import org.codehaus.jackson.annotate.JsonProperty;
 
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigBasedJmxHostProviderTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigBasedJmxHostProviderTest.java
index 3e86b63..744ff84 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigBasedJmxHostProviderTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigBasedJmxHostProviderTest.java
@@ -32,7 +32,7 @@ import java.util.Set;
 
 import org.apache.ambari.server.controller.jmx.JMXHostProvider;
 import org.apache.ambari.server.state.ConfigHelper;
-import org.apache.ambari.server.state.alert.UriInfo;
+import org.apache.ambari.server.state.UriInfo;
 import org.easymock.EasyMockRule;
 import org.easymock.EasyMockSupport;
 import org.easymock.Mock;
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/state/alert/UriInfoTest.java
 b/ambari-server/src/test/java/org/apache/ambari/server/state/UriInfoTest.java
similarity index 97%
rename from 
ambari-server/src/test/java/org/apache/ambari/server/state/alert/UriInfoTest.java
rename to 
ambari-server/src/test/java/org/apache/ambari/server/state/UriInfoTest.java
index c37b2ca..b8b13f3 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/state/alert/UriInfoTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/state/UriInfoTest.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.ambari.server.state.alert;
+package org.apache.ambari.server.state;
 
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertThat;

-- 
To stop receiving notification emails like this one, please contact
amag...@apache.org.

Reply via email to