You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2015/09/12 03:04:50 UTC
[6/6] ambari git commit: AMBARI-13069. Attributes of configuration
property should be stack API driven. (jaimin)
AMBARI-13069. Attributes of configuration property should be stack API driven. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/70ca8500
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/70ca8500
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/70ca8500
Branch: refs/heads/trunk
Commit: 70ca85005b49a93970164af9a047bebd2b290427
Parents: 93a2106
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Fri Sep 11 18:04:24 2015 -0700
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Fri Sep 11 18:04:24 2015 -0700
----------------------------------------------------------------------
...StackLevelConfigurationResourceProvider.java | 22 +-
.../server/state/ValueAttributesInfo.java | 90 +
.../1.6.1.2.2.0/configuration/accumulo-env.xml | 53 +
.../configuration/accumulo-log4j.xml | 3 +
.../1.6.1.2.2.0/configuration/accumulo-site.xml | 13 +
.../0.1.0/configuration/ams-env.xml | 4 +
.../0.1.0/configuration/ams-hbase-log4j.xml | 3 +
.../configuration/ams-hbase-security-site.xml | 54 +
.../0.1.0/configuration/ams-log4j.xml | 3 +
.../0.1.0/configuration/ams-site.xml | 18 +
.../0.5.0.2.1/configuration/falcon-env.xml | 22 +
.../configuration/falcon-startup.properties.xml | 3 +
.../1.4.0.2.0/configuration/flume-conf.xml | 4 +
.../FLUME/1.4.0.2.0/configuration/flume-env.xml | 10 +
.../0.96.0.2.0/configuration/hbase-env.xml | 15 +
.../0.96.0.2.0/configuration/hbase-log4j.xml | 3 +
.../0.96.0.2.0/configuration/hbase-site.xml | 14 +
.../HDFS/2.1.0.2.0/configuration/hadoop-env.xml | 25 +
.../HDFS/2.1.0.2.0/configuration/hdfs-log4j.xml | 3 +
.../HDFS/2.1.0.2.0/configuration/hdfs-site.xml | 28 +-
.../HIVE/0.12.0.2.0/configuration/hive-env.xml | 34 +
.../configuration/hive-exec-log4j.xml | 3 +
.../0.12.0.2.0/configuration/hive-log4j.xml | 3 +
.../HIVE/0.12.0.2.0/configuration/hive-site.xml | 29 +
.../0.12.0.2.0/configuration/webhcat-log4j.xml | 3 +
.../0.12.0.2.0/configuration/webhcat-site.xml | 6 +
.../KAFKA/0.8.1.2.2/configuration/kafka-env.xml | 5 +
.../0.8.1.2.2/configuration/kafka-log4j.xml | 3 +
.../1.10.3-10/configuration/kerberos-env.xml | 86 +
.../1.10.3-10/configuration/krb5-conf.xml | 17 +
.../0.5.0.2.2/configuration/gateway-log4j.xml | 3 +
.../KNOX/0.5.0.2.2/configuration/knox-env.xml | 58 +-
.../KNOX/0.5.0.2.2/configuration/ldap-log4j.xml | 3 +
.../ranger-knox-plugin-properties.xml | 11 +
.../KNOX/0.5.0.2.2/configuration/topology.xml | 4 +
.../KNOX/0.5.0.2.2/configuration/users-ldif.xml | 4 +
.../1.0.0.2.3/configuration/mahout-log4j.xml | 3 +
.../OOZIE/4.0.0.2.0/configuration/oozie-env.xml | 23 +
.../4.0.0.2.0/configuration/oozie-log4j.xml | 3 +
.../4.0.0.2.0/configuration/oozie-site.xml | 20 +
.../4.2.0.2.3/configuration/oozie-site.xml | 20 +
.../PIG/0.12.0.2.0/configuration/pig-log4j.xml | 3 +
.../0.12.0.2.0/configuration/pig-properties.xml | 4 +
.../0.4.0/configuration/admin-properties.xml | 85 +
.../RANGER/0.4.0/configuration/ranger-env.xml | 12 +
.../0.4.0/configuration/usersync-properties.xml | 3 +
.../0.5.0.2.3/configuration/kms-log4j.xml | 5 +-
.../configuration/ranger-kms-audit.xml | 4 +
.../0.60.0.2.2/configuration/slider-log4j.xml | 3 +
.../1.2.0.2.2/configuration/spark-defaults.xml | 6 +
.../configuration/spark-javaopts-properties.xml | 3 +
.../configuration/spark-log4j-properties.xml | 3 +
.../configuration/spark-metrics-properties.xml | 3 +
.../0.9.1.2.1/configuration/storm-site.xml | 65 +
.../configuration-mapred/mapred-env.xml | 14 +
.../YARN/2.1.0.2.0/configuration/yarn-env.xml | 24 +
.../YARN/2.1.0.2.0/configuration/yarn-log4j.xml | 3 +
.../YARN/2.1.0.2.0/configuration/yarn-site.xml | 3 +
.../3.4.5.2.0/configuration/zoo.cfg.xml | 18 +
.../3.4.5.2.0/configuration/zookeeper-env.xml | 10 +
.../3.4.5.2.0/configuration/zookeeper-log4j.xml | 3 +
.../src/main/resources/properties.json | 1 +
.../HDP/2.0.6/configuration/cluster-env.xml | 8 +
.../GLUSTERFS/configuration/core-site.xml | 2 +
.../GLUSTERFS/configuration/hadoop-env.xml | 30 +-
.../services/HBASE/configuration/hbase-site.xml | 4 +
.../services/HIVE/configuration/hive-site.xml | 32 +
.../services/OOZIE/configuration/oozie-site.xml | 16 +
.../PIG/configuration/pig-properties.xml | 5 +
.../services/YARN/configuration/yarn-env.xml | 5 +
.../services/HBASE/configuration/hbase-env.xml | 19 +
.../services/HBASE/configuration/hbase-site.xml | 18 +
.../ranger-hbase-plugin-properties.xml | 14 +-
.../services/HDFS/configuration/core-site.xml | 3 +
.../services/HDFS/configuration/hadoop-env.xml | 3 +-
.../services/HDFS/configuration/hdfs-log4j.xml | 3 +
.../services/HDFS/configuration/hdfs-site.xml | 3 +
.../ranger-hdfs-plugin-properties.xml | 16 +-
.../services/HIVE/configuration/hive-env.xml | 1 +
.../services/HIVE/configuration/hive-site.xml | 33 +-
.../ranger-hive-plugin-properties.xml | 8 +
.../HIVE/configuration/webhcat-site.xml | 6 +
.../ranger-storm-plugin-properties.xml | 11 +
.../services/STORM/configuration/storm-site.xml | 6 +
.../GLUSTERFS/configuration/core-site.xml | 2 +
.../GLUSTERFS/configuration/hadoop-env.xml | 28 +-
.../services/HBASE/configuration/hbase-site.xml | 1 +
.../services/OOZIE/configuration/oozie-site.xml | 4 +
.../ACCUMULO/configuration/accumulo-log4j.xml | 3 +
.../services/HBASE/configuration/hbase-site.xml | 4 +
.../HBASE/configuration/ranger-hbase-audit.xml | 4 +
.../configuration/ranger-hbase-security.xml | 1 +
.../services/HDFS/configuration/hadoop-env.xml | 4 +
.../services/HDFS/configuration/hdfs-site.xml | 2 +
.../HDFS/configuration/ranger-hdfs-audit.xml | 4 +
.../HIVE/configuration/ranger-hive-audit.xml | 4 +
.../HIVE/configuration/ranger-hive-security.xml | 1 +
.../KAFKA/configuration/ranger-kafka-audit.xml | 4 +
.../ranger-kafka-plugin-properties.xml | 10 +
.../KNOX/configuration/ranger-knox-audit.xml | 4 +
.../PIG/configuration/pig-properties.xml | 5 +
.../RANGER/configuration/ranger-admin-site.xml | 76 +
.../RANGER/configuration/ranger-env.xml | 1 +
.../RANGER/configuration/ranger-ugsync-site.xml | 39 +
.../STORM/configuration/ranger-storm-audit.xml | 4 +
.../services/STORM/configuration/storm-site.xml | 4 +
.../2.3/services/TEZ/configuration/tez-site.xml | 3 +
.../YARN/configuration/ranger-yarn-audit.xml | 4 +
.../ranger-yarn-plugin-properties.xml | 10 +
.../services/YARN/configuration/yarn-log4j.xml | 3 +
.../services/YARN/configuration/yarn-site.xml | 3 +
.../HDPWIN/2.1/configuration/cluster-env.xml | 14 +
.../AMBARI_METRICS/configuration/ams-env.xml | 4 +
.../AMBARI_METRICS/configuration/ams-site.xml | 1 +
.../FALCON/configuration/falcon-env.xml | 11 +
.../services/FLUME/configuration/flume-conf.xml | 4 +
.../services/HBASE/configuration/hbase-env.xml | 10 +
.../services/HBASE/configuration/hbase-site.xml | 1 +
.../services/HDFS/configuration/hadoop-env.xml | 11 +
.../services/HDFS/configuration/hdfs-site.xml | 9 +
.../services/HIVE/configuration/hive-env.xml | 28 +
.../services/HIVE/configuration/hive-site.xml | 8 +
.../services/OOZIE/configuration/oozie-env.xml | 23 +
.../services/OOZIE/configuration/oozie-site.xml | 8 +
.../YARN/configuration-mapred/mapred-env.xml | 10 +
.../services/YARN/configuration/yarn-env.xml | 10 +
.../ZOOKEEPER/configuration/zoo.cfg.xml | 1 +
.../ZOOKEEPER/configuration/zookeeper-env.xml | 10 +
.../services/HBASE/configuration/hbase-env.xml | 4 +
.../services/HBASE/configuration/hbase-site.xml | 10 +
.../services/HDFS/configuration/hdfs-log4j.xml | 3 +
.../services/HIVE/configuration/hive-site.xml | 33 +-
.../HIVE/configuration/webhcat-site.xml | 6 +
.../services/STORM/configuration/storm-site.xml | 6 +
.../services/HBASE/configuration/hbase-site.xml | 4 +
.../services/HDFS/configuration/hdfs-site.xml | 2 +
.../services/OOZIE/configuration/oozie-env.xml | 23 +
.../services/OOZIE/configuration/oozie-site.xml | 4 +
.../services/STORM/configuration/storm-site.xml | 4 +
.../2.3/services/TEZ/configuration/tez-site.xml | 3 +
.../server/api/services/AmbariMetaInfoTest.java | 70 +-
.../services/YARN/configuration/yarn-site.xml | 14 +
ambari-web/app/assets/test/tests.js | 3 +
ambari-web/app/data/HDP2.2/site_properties.js | 341 --
ambari-web/app/data/HDP2.3/site_properties.js | 415 +--
ambari-web/app/data/HDP2/site_properties.js | 3138 +++++-------------
.../configs/objects/service_config_property.js | 3 +-
.../app/models/configs/stack_config_property.js | 86 +-
ambari-web/app/utils/config.js | 6 +-
.../test/data/HDP2.2/site_properties_test.js | 68 +
.../test/data/HDP2.3/site_properties_test.js | 68 +
.../test/data/HDP2/site_properties_test.js | 73 +-
ambari-web/test/utils/config_test.js | 21 +-
153 files changed, 2776 insertions(+), 3279 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackLevelConfigurationResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackLevelConfigurationResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackLevelConfigurationResourceProvider.java
index 0525488..86d617e 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackLevelConfigurationResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackLevelConfigurationResourceProvider.java
@@ -19,12 +19,6 @@
package org.apache.ambari.server.controller.internal;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
import org.apache.ambari.server.AmbariException;
import org.apache.ambari.server.controller.AmbariManagementController;
import org.apache.ambari.server.controller.StackConfigurationResponse;
@@ -38,6 +32,13 @@ import org.apache.ambari.server.controller.spi.Resource.Type;
import org.apache.ambari.server.controller.spi.SystemException;
import org.apache.ambari.server.controller.spi.UnsupportedPropertyException;
import org.apache.ambari.server.controller.utilities.PropertyHelper;
+import org.apache.commons.lang.StringUtils;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
public class StackLevelConfigurationResourceProvider extends
ReadOnlyResourceProvider {
@@ -51,6 +52,9 @@ public class StackLevelConfigurationResourceProvider extends
public static final String PROPERTY_NAME_PROPERTY_ID = PropertyHelper
.getPropertyId("StackLevelConfigurations", "property_name");
+ public static final String PROPERTY_DISPLAY_NAME_PROPERTY_ID = PropertyHelper
+ .getPropertyId("StackLevelConfigurations", "property_display_name");
+
public static final String PROPERTY_VALUE_PROPERTY_ID = PropertyHelper
.getPropertyId("StackLevelConfigurations", "property_value");
@@ -133,6 +137,12 @@ public class StackLevelConfigurationResourceProvider extends
setResourceProperty(resource, PROPERTY_DESCRIPTION_PROPERTY_ID,
response.getPropertyDescription(), requestedIds);
+
+ //should not be returned if empty
+ if (StringUtils.isNotEmpty(response.getPropertyDisplayName())) {
+ setResourceProperty(resource, PROPERTY_DISPLAY_NAME_PROPERTY_ID,
+ response.getPropertyDisplayName(), requestedIds);
+ }
setResourceProperty(resource, PROPERTY_PROPERTY_TYPE_PROPERTY_ID,
response.getPropertyType(), requestedIds);
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/java/org/apache/ambari/server/state/ValueAttributesInfo.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/ValueAttributesInfo.java b/ambari-server/src/main/java/org/apache/ambari/server/state/ValueAttributesInfo.java
index 8054c54..e8cd074 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/ValueAttributesInfo.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/ValueAttributesInfo.java
@@ -36,6 +36,24 @@ public class ValueAttributesInfo {
private String minimum;
private String unit;
private String delete;
+ private Boolean visible;
+ private Boolean overridable;
+
+ @XmlElement(name = "empty-value-valid")
+ @JsonProperty("empty_value_valid")
+ private Boolean emptyValueValid;
+
+ @XmlElement(name = "read-only")
+ @JsonProperty("read_only")
+ private Boolean readOnly;
+
+ @XmlElement(name = "editable-only-at-install")
+ @JsonProperty("editable_only_at_install")
+ private Boolean editableOnlyAtInstall;
+
+ @XmlElement(name = "show-property-name")
+ @JsonProperty("show_property_name")
+ private Boolean showPropertyName;
@XmlElement(name = "increment-step")
@JsonProperty("increment_step")
@@ -128,6 +146,54 @@ public class ValueAttributesInfo {
this.delete = delete;
}
+ public Boolean getEmptyValueValid() {
+ return emptyValueValid;
+ }
+
+ public void setEmptyValueValid(Boolean isEmptyValueValid) {
+ this.emptyValueValid = isEmptyValueValid;
+ }
+
+ public Boolean getVisible() {
+ return visible;
+ }
+
+ public void setVisible(Boolean isVisible) {
+ this.visible = isVisible;
+ }
+
+ public Boolean getReadOnly() {
+ return readOnly;
+ }
+
+ public void setReadOnly(Boolean isReadOnly) {
+ this.readOnly = isReadOnly;
+ }
+
+ public Boolean getEditableOnlyAtInstall() {
+ return editableOnlyAtInstall;
+ }
+
+ public void setEditableOnlyAtInstall(Boolean isEditableOnlyAtInstall) {
+ this.editableOnlyAtInstall = isEditableOnlyAtInstall;
+ }
+
+ public Boolean getOverridable() {
+ return overridable;
+ }
+
+ public void setOverridable(Boolean isOverridable) {
+ this.overridable = isOverridable;
+ }
+
+ public Boolean getShowPropertyName() {
+ return showPropertyName;
+ }
+
+ public void setShowPropertyName(Boolean isPropertyNameVisible) {
+ this.showPropertyName = isPropertyNameVisible;
+ }
+
@Override
public boolean equals(Object o) {
if (this == o) return true;
@@ -138,6 +204,18 @@ public class ValueAttributesInfo {
if (entries != null ? !entries.equals(that.entries) : that.entries != null) return false;
if (entriesEditable != null ? !entriesEditable.equals(that.entriesEditable) : that.entriesEditable != null)
return false;
+ if (emptyValueValid != null ? !emptyValueValid.equals(that.emptyValueValid) : that.emptyValueValid != null)
+ return false;
+ if (visible != null ? !visible.equals(that.visible) : that.visible != null)
+ return false;
+ if (readOnly != null ? !readOnly.equals(that.readOnly) : that.readOnly != null)
+ return false;
+ if (editableOnlyAtInstall != null ? !editableOnlyAtInstall.equals(that.editableOnlyAtInstall) : that.editableOnlyAtInstall != null)
+ return false;
+ if (overridable != null ? !overridable.equals(that.overridable) : that.overridable != null)
+ return false;
+ if (showPropertyName != null ? !showPropertyName.equals(that.showPropertyName) : that.showPropertyName != null)
+ return false;
if (maximum != null ? !maximum.equals(that.maximum) : that.maximum != null) return false;
if (minimum != null ? !minimum.equals(that.minimum) : that.minimum != null) return false;
if (selectionCardinality != null ? !selectionCardinality.equals(that.selectionCardinality) : that.selectionCardinality != null)
@@ -161,6 +239,12 @@ public class ValueAttributesInfo {
result = 31 * result + (entriesEditable != null ? entriesEditable.hashCode() : 0);
result = 31 * result + (selectionCardinality != null ? selectionCardinality.hashCode() : 0);
result = 31 * result + (incrementStep != null ? incrementStep.hashCode() : 0);
+ result = 31 * result + (emptyValueValid != null ? emptyValueValid.hashCode() : 0);
+ result = 31 * result + (visible != null ? visible.hashCode() : 0);
+ result = 31 * result + (readOnly != null ? readOnly.hashCode() : 0);
+ result = 31 * result + (editableOnlyAtInstall != null ? editableOnlyAtInstall.hashCode() : 0);
+ result = 31 * result + (overridable != null ? overridable.hashCode() : 0);
+ result = 31 * result + (showPropertyName != null ? showPropertyName.hashCode() : 0);
return result;
}
@@ -173,6 +257,12 @@ public class ValueAttributesInfo {
", minimum='" + minimum + '\'' +
", unit='" + unit + '\'' +
", delete='" + delete + '\'' +
+ ", emptyValueValid='" + emptyValueValid + '\'' +
+ ", visible='" + visible + '\'' +
+ ", readOnly='" + readOnly + '\'' +
+ ", editableOnlyAtInstall='" + editableOnlyAtInstall + '\'' +
+ ", overridable='" + overridable + '\'' +
+ ", showPropertyName='" + showPropertyName + '\'' +
", incrementStep='" + incrementStep + '\'' +
", entriesEditable=" + entriesEditable +
", selectionCardinality='" + selectionCardinality + '\'' +
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml
index 67da50e..4e82773 100644
--- a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml
+++ b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml
@@ -25,40 +25,68 @@
<name>accumulo_root_password</name>
<value></value>
<property-type>PASSWORD</property-type>
+ <display-name>Accumulo root password</display-name>
<description>Password for the Accumulo root user. This password will be
used to initialize Accumulo and to create the trace user. Changing this
will not change the password for the Accumulo root user.</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property require-input="true">
<name>instance_secret</name>
<value></value>
+ <display-name>Instance Secret</display-name>
<property-type>PASSWORD</property-type>
<description>A secret unique to a given instance that all Accumulo server
processes must know in order to communicate with one
another.</description>
+ <value-attributes>
+ <editable-only-at-install>true</editable-only-at-install>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property require-input="false">
<name>trace_password</name>
<value>trace</value>
+ <display-name>Trace user password</display-name>
<property-type>PASSWORD</property-type>
<description>Password for the trace user. The trace user will be created
with this password if that user does not already exist. Changing this
will not change the password for the trace user.</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>accumulo_log_dir</name>
<value>/var/log/accumulo</value>
+ <display-name>Accumulo Log Dir</display-name>
<description>Log Directories for Accumulo.</description>
+ <value-attributes>
+ <editable-only-at-install>true</editable-only-at-install>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>accumulo_pid_dir</name>
<value>/var/run/accumulo</value>
+ <display-name>Accumulo PID Dir</display-name>
<description>Pid Directory for Accumulo.</description>
+ <value-attributes>
+ <editable-only-at-install>true</editable-only-at-install>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>accumulo_instance_name</name>
<value>hdp-accumulo-instance</value>
+ <display-name>Instance Name</display-name>
<description>Accumulo Instance Name.</description>
+ <value-attributes>
+ <editable-only-at-install>true</editable-only-at-install>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>accumulo_user</name>
@@ -69,31 +97,55 @@
<property>
<name>accumulo_master_heapsize</name>
<value>1024</value>
+ <display-name>Accumulo Master Maximum Java heap size</display-name>
<description>Accumulo Master Heap Size.</description>
+ <value-attributes>
+ <unit>MB</unit>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>accumulo_tserver_heapsize</name>
<value>1536</value>
+ <display-name>Accumulo TServer Maximum Java heap size</display-name>
<description>Accumulo Tablet Server Heap Size.</description>
+ <value-attributes>
+ <unit>MB</unit>
+ </value-attributes>
</property>
<property>
<name>accumulo_monitor_heapsize</name>
<value>1024</value>
+ <display-name>Accumulo Monitor Maximum Java heap size</display-name>
<description>Accumulo Monitor Heap Size.</description>
+ <value-attributes>
+ <unit>MB</unit>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>accumulo_gc_heapsize</name>
<value>256</value>
+ <display-name>Accumulo GC Maximum Java heap size</display-name>
<description>Accumulo Garbage Collector Heap Size.</description>
+ <value-attributes>
+ <unit>MB</unit>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>accumulo_other_heapsize</name>
<value>1024</value>
+ <display-name>Accumulo Other Maximum Java heap size</display-name>
<description>Heap size for other Accumulo processes.</description>
+ <value-attributes>
+ <unit>MB</unit>
+ </value-attributes>
</property>
<property>
<name>accumulo_monitor_bind_all</name>
<value>false</value>
+ <display-name>Monitor Bind All Interfaces</display-name>
<description>Controls whether the monitor binds to all interfaces.</description>
</property>
<property>
@@ -120,6 +172,7 @@ export ACCUMULO_KILL_CMD='kill -9 %p'
<property>
<name>server_content</name>
<description>The template for a server accumulo-env.sh file.</description>
+ <display-name>Server accumulo-env template</display-name>
<value>
#! /usr/bin/env bash
export HADOOP_PREFIX={{hadoop_prefix}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-log4j.xml b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-log4j.xml
index e8f6e56..ed1f803 100644
--- a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-log4j.xml
@@ -107,6 +107,9 @@ log4j.appender.A1.layout.ConversionPattern=%d{ISO8601} [%-8c{2}] %-5p: %m%n
log4j.appender.A1.layout=org.apache.log4j.PatternLayout
</value>
+ <value-attributes>
+ <show-property-name>false</show-property-name>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-site.xml b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-site.xml
index 2a7e083..822c449 100644
--- a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-site.xml
+++ b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-site.xml
@@ -25,6 +25,9 @@
<name>instance.volumes</name>
<value>hdfs://localhost:8020/apps/accumulo/data</value>
<description>Location of Accumulo data files in HDFS.</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
@@ -32,12 +35,18 @@
<value>localhost:2181</value>
<description>Comma-separated list of ZooKeeper server:port
pairs.</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>instance.zookeeper.timeout</name>
<value>30s</value>
<description>Timeout for zookeeper connections.</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
@@ -125,8 +134,12 @@
<property>
<name>trace.user</name>
<value>trace</value>
+ <display-name>Trace user</display-name>
<description>User that the tracer process uses to write
tracing data to Accumulo.</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml
index e84193c..40a3921 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml
@@ -28,21 +28,25 @@
<property>
<name>metrics_collector_log_dir</name>
<value>/var/log/ambari-metrics-collector</value>
+ <display-name>Metrics Collector log dir</display-name>
<description>Collector log directory.</description>
</property>
<property>
<name>metrics_collector_pid_dir</name>
<value>/var/run/ambari-metrics-collector</value>
+ <display-name>Metrics Collector pid dir</display-name>
<description>Collector pid directory.</description>
</property>
<property>
<name>metrics_monitor_pid_dir</name>
<value>/var/run/ambari-metrics-monitor</value>
+ <display-name>Metrics Monitor pid dir</display-name>
<description>Monitor pid directory.</description>
</property>
<property>
<name>metrics_monitor_log_dir</name>
<value>/var/log/ambari-metrics-monitor</value>
+ <display-name>Metrics Monitor log dir</display-name>
<description>Monitor log directory.</description>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-log4j.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-log4j.xml
index 64cc9d3..52ead29 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-log4j.xml
@@ -138,6 +138,9 @@ log4j.logger.org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher=INFO
# log4j.logger.org.apache.hadoop.hbase.client.MetaScanner=INFO
</value>
+ <value-attributes>
+ <show-property-name>false</show-property-name>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-security-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-security-site.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-security-site.xml
index 6f60736..5e7bc51 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-security-site.xml
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-security-site.xml
@@ -23,73 +23,127 @@
<property>
<name>ams.zookeeper.keytab</name>
<value></value>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
</property>
<property>
<name>ams.zookeeper.principal</name>
<value></value>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
</property>
<property>
<name>hadoop.security.authentication</name>
<value></value>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
</property>
<property>
<name>hbase.coprocessor.master.classes</name>
<value></value>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
</property>
<property>
<name>hbase.coprocessor.region.classes</name>
<value></value>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
</property>
<property>
<name>hbase.master.kerberos.principal</name>
<value></value>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
</property>
<property>
<name>hbase.master.keytab.file</name>
<value></value>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
</property>
<property>
<name>hbase.myclient.keytab</name>
<value></value>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
</property>
<property>
<name>hbase.myclient.principal</name>
<value></value>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
</property>
<property>
<name>hbase.regionserver.kerberos.principal</name>
<value></value>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
</property>
<property>
<name>hbase.regionserver.keytab.file</name>
<value></value>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
</property>
<property>
<name>hbase.security.authentication</name>
<value></value>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
</property>
<property>
<name>hbase.security.authorization</name>
<value></value>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
</property>
<property>
<name>hbase.zookeeper.property.authProvider.1</name>
<value></value>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
</property>
<property>
<name>hbase.zookeeper.property.jaasLoginRenew</name>
<value></value>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
</property>
<property>
<name>hbase.zookeeper.property.kerberos.removeHostFromPrincipal</name>
<value></value>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
</property>
<property>
<name>hbase.zookeeper.property.kerberos.removeRealmFromPrincipal</name>
<value></value>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
</property>
<property>
<name>zookeeper.znode.parent</name>
<value></value>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-log4j.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-log4j.xml
index 6d3703e..53e2587 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-log4j.xml
@@ -57,6 +57,9 @@ log4j.appender.file.MaxBackupIndex=60
log4j.appender.file.layout=org.apache.log4j.PatternLayout
log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p [%t] %c{1}:%L - %m%n
</value>
+ <value-attributes>
+ <show-property-name>false</show-property-name>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-site.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-site.xml
index 5c7a39b..f65bea8 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-site.xml
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-site.xml
@@ -24,6 +24,7 @@
<property>
<name>timeline.metrics.service.operation.mode</name>
<value>embedded</value>
+ <display-name>Metrics Service operation mode</display-name>
<description>
Service Operation modes:
1) embedded: Metrics stored on local FS, HBase in Standalone mode
@@ -47,6 +48,7 @@
<property>
<name>timeline.metrics.aggregator.checkpoint.dir</name>
<value>/var/lib/ambari-metrics-collector/checkpoint</value>
+ <display-name>Aggregator checkpoint directory</display-name>
<description>
Directory to store aggregator checkpoints. Change to a permanent
location so that checkpoint ar not lost.
@@ -55,6 +57,7 @@
<property>
<name>timeline.metrics.host.aggregator.minute.interval</name>
<value>120</value>
+ <display-name>Minute host aggregator interval</display-name>
<description>
Time in seconds to sleep for the minute resolution host based
aggregator. Default resolution is 2 minutes.
@@ -63,6 +66,7 @@
<property>
<name>timeline.metrics.host.aggregator.hourly.interval</name>
<value>3600</value>
+ <display-name>Hourly host aggregator interval</display-name>
<description>
Time in seconds to sleep for the hourly resolution host based
aggregator. Default resolution is 1 hour.
@@ -79,6 +83,7 @@
<property>
<name>timeline.metrics.cluster.aggregator.hourly.interval</name>
<value>3600</value>
+ <display-name>Hourly cluster aggregator Interval</display-name>
<description>
Time in seconds to sleep for the hourly resolution cluster wide
aggregator. Default is 1 hour.
@@ -95,6 +100,7 @@
<property>
<name>timeline.metrics.cluster.aggregator.minute.interval</name>
<value>120</value>
+ <display-name>Minute cluster aggregator interval</display-name>
<description>
Time in seconds to sleep for the minute resolution cluster wide
aggregator. Default resolution is 2 minutes.
@@ -112,6 +118,7 @@
<property>
<name>timeline.metrics.host.aggregator.hourly.checkpointCutOffMultiplier</name>
<value>2</value>
+ <display-name>Hourly host aggregator checkpoint cutOff multiplier</display-name>
<description>
Multiplier value * interval = Max allowed checkpoint lag. Effectively
if aggregator checkpoint is greater than max allowed checkpoint delay,
@@ -121,6 +128,7 @@
<property>
<name>timeline.metrics.host.aggregator.minute.checkpointCutOffMultiplier</name>
<value>2</value>
+ <display-name>Minute host aggregator checkpoint cutOff multiplier</display-name>
<description>
Multiplier value * interval = Max allowed checkpoint lag. Effectively
if aggregator checkpoint is greater than max allowed checkpoint delay,
@@ -130,6 +138,7 @@
<property>
<name>timeline.metrics.cluster.aggregator.hourly.checkpointCutOffMultiplier</name>
<value>2</value>
+ <display-name>Hourly cluster aggregator checkpoint cutOff multiplier</display-name>
<description>
Multiplier value * interval = Max allowed checkpoint lag. Effectively
if aggregator checkpoint is greater than max allowed checkpoint delay,
@@ -139,6 +148,7 @@
<property>
<name>timeline.metrics.cluster.aggregator.minute.checkpointCutOffMultiplier</name>
<value>2</value>
+ <display-name>Minute cluster aggregator checkpoint cutOff multiplier</display-name>
<description>
Multiplier value * interval = Max allowed checkpoint lag. Effectively
if aggregator checkpoint is greater than max allowed checkpoint delay,
@@ -164,6 +174,7 @@
<property>
<name>timeline.metrics.host.aggregator.hourly.disabled</name>
<value>false</value>
+ <display-name>Disable Hourly host aggregator</display-name>
<description>
Disable host based hourly aggregations.
</description>
@@ -171,6 +182,7 @@
<property>
<name>timeline.metrics.host.aggregator.minute.disabled</name>
<value>false</value>
+ <display-name>Disable Minute host aggregator</display-name>
<description>
Disable host based minute aggregations.
</description>
@@ -184,6 +196,7 @@
</property>
<property>
<name>timeline.metrics.cluster.aggregator.hourly.disabled</name>
+ <display-name>Disable Hourly cluster aggregator</display-name>
<value>false</value>
<description>
Disable cluster based hourly aggregations.
@@ -192,6 +205,7 @@
<property>
<name>timeline.metrics.cluster.aggregator.minute.disabled</name>
<value>false</value>
+ <display-name>Disable minute cluster aggregator</display-name>
<description>
Disable cluster based minute aggregations.
</description>
@@ -199,6 +213,7 @@
<property>
<name>timeline.metrics.cluster.aggregator.minute.timeslice.interval</name>
<value>30</value>
+ <display-name>Minute cluster aggregator timeslice interval</display-name>
<description>
Lowest resolution of desired data for cluster level minute aggregates.
</description>
@@ -273,6 +288,7 @@
<property>
<name>timeline.metrics.service.default.result.limit</name>
<value>5760</value>
+ <display-name>Metrics service default result limit</display-name>
<description>
Max result limit on number of rows returned. Calculated as follows:
4 aggregate metrics/min * 60 * 24: Retrieve aggregate data for 1 day.
@@ -281,6 +297,7 @@
<property>
<name>timeline.metrics.service.checkpointDelay</name>
<value>60</value>
+ <display-name>Metrics service checkpoint delay</display-name>
<description>
Time in seconds to sleep on the first run or when the checkpoint is
too old.
@@ -288,6 +305,7 @@
</property>
<property>
<name>timeline.metrics.service.resultset.fetchSize</name>
+ <display-name>Metrics service resultset fetchSize</display-name>
<value>2000</value>
<description>
JDBC resultset prefect size for aggregator queries.
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-env.xml b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-env.xml
index 75178d2..f5afd95 100644
--- a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-env.xml
+++ b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-env.xml
@@ -28,26 +28,39 @@
<property>
<name>falcon_port</name>
<value>15000</value>
+ <display-name>Falcon server port</display-name>
<description>Port the Falcon Server listens on.</description>
</property>
<property>
<name>falcon_log_dir</name>
<value>/var/log/falcon</value>
+ <display-name>Falcon Log Dir</display-name>
<description>Falcon log directory.</description>
+ <value-attributes>
+ <editable-only-at-install>true</editable-only-at-install>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>falcon_pid_dir</name>
<value>/var/run/falcon</value>
+ <display-name>Falcon PID Dir</display-name>
<description>Falcon pid-file directory.</description>
+ <value-attributes>
+ <editable-only-at-install>true</editable-only-at-install>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>falcon_local_dir</name>
<value>/hadoop/falcon</value>
+ <display-name>Falcon data directory</display-name>
<description>Directory where Falcon data, such as activemq data, is stored.</description>
</property>
<property>
<name>falcon_store_uri</name>
<value>file:///hadoop/falcon/store</value>
+ <display-name>Falcon store URI</display-name>
<description>Directory where entity definitions are stored.</description>
</property>
<!--embeddedmq properties-->
@@ -55,16 +68,25 @@
<name>falcon.embeddedmq.data</name>
<value>/hadoop/falcon/embeddedmq/data</value>
<description>Directory in which embeddedmq data is stored.</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>falcon.embeddedmq</name>
<value>true</value>
<description>Whether embeddedmq is enabled or not.</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>falcon.emeddedmq.port</name>
<value>61616</value>
<description>Port that embeddedmq will listen on.</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<!-- falcon-env.sh -->
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-startup.properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-startup.properties.xml b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-startup.properties.xml
index 451ebb5..90e67ba 100644
--- a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-startup.properties.xml
+++ b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-startup.properties.xml
@@ -157,6 +157,9 @@ hive-hcatalog-core,hive-jdbc,hive-webhcat-java-client</value>
<name>*.falcon.http.authentication.blacklisted.users</name>
<value></value>
<description>Comma separated list of black listed users</description>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
</property>
<!--authentication properties-->
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/configuration/flume-conf.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/configuration/flume-conf.xml b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/configuration/flume-conf.xml
index 8ff764b..94ae058 100644
--- a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/configuration/flume-conf.xml
+++ b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/configuration/flume-conf.xml
@@ -29,5 +29,9 @@
<value>
# Flume agent config
</value>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ <show-property-name>false</show-property-name>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/configuration/flume-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/configuration/flume-env.xml b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/configuration/flume-env.xml
index e150478..b1283dd 100644
--- a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/configuration/flume-env.xml
+++ b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/configuration/flume-env.xml
@@ -23,13 +23,23 @@
<configuration>
<property>
<name>flume_conf_dir</name>
+ <display-name>Flume Conf Dir</display-name>
<value>/etc/flume/conf</value>
<description>Location to save configuration files</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ <editable-only-at-install>true</editable-only-at-install>
+ </value-attributes>
</property>
<property>
<name>flume_log_dir</name>
+ <display-name>Flume Log Dir</display-name>
<value>/var/log/flume</value>
<description>Location to save log files</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ <editable-only-at-install>true</editable-only-at-install>
+ </value-attributes>
</property>
<property>
<name>flume_run_dir</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml
index 03db5df..242e9a7 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml
@@ -24,12 +24,22 @@
<property>
<name>hbase_log_dir</name>
<value>/var/log/hbase</value>
+ <display-name>HBase Log Dir Prefix</display-name>
<description>Log Directories for HBase.</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ <editable-only-at-install>true</editable-only-at-install>
+ </value-attributes>
</property>
<property>
<name>hbase_pid_dir</name>
<value>/var/run/hbase</value>
+ <display-name>HBase PID Dir</display-name>
<description>Pid Directory for HBase.</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ <editable-only-at-install>true</editable-only-at-install>
+ </value-attributes>
</property>
<property>
<name>hbase_regionserver_heapsize</name>
@@ -52,10 +62,15 @@ Sets the upper bound on HBase RegionServers' young generation size.
This value is used in case the young generation size (-Xmn) calculated based on the max heapsize (hbase_regionserver_heapsize)
and the -Xmn ratio (hbase_regionserver_xmn_ratio) exceeds this value.
</description>
+ <display-name>RegionServers maximum value for -Xmn</display-name>
+ <value-attributes>
+ <unit>MB</unit>
+ </value-attributes>
</property>
<property>
<name>hbase_regionserver_xmn_ratio</name>
<value>0.2</value>
+ <display-name>RegionServers -Xmn in -Xmx ratio</display-name>
<description>Percentage of max heap size (-Xmx) which used for young generation heap (-Xmn).</description>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-log4j.xml b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-log4j.xml
index 64cc9d3..52ead29 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-log4j.xml
@@ -138,6 +138,9 @@ log4j.logger.org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher=INFO
# log4j.logger.org.apache.hadoop.hbase.client.MetaScanner=INFO
</value>
+ <value-attributes>
+ <show-property-name>false</show-property-name>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml
index b224bef..7b5f0c4 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml
@@ -45,11 +45,16 @@
<property>
<name>hbase.master.port</name>
<value>60000</value>
+ <display-name>HBase Master Port</display-name>
<description>The port the HBase Master should bind to.</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>hbase.tmp.dir</name>
<value>/tmp/hbase-${user.name}</value>
+ <display-name>HBase tmp directory</display-name>
<description>Temporary directory on the local filesystem.
Change this setting to point to a location more permanent
than '/tmp' (The '/tmp' directory is often cleared on
@@ -139,6 +144,7 @@
<property>
<name>hbase.hregion.memstore.block.multiplier</name>
<value>4</value>
+ <display-name>HBase Region Block Multiplier</display-name>
<description>
Block updates if a memstore's size spikes this many times above the size that would cause it to be flushed.
Useful to prevent runaway memstores during a sudden spike in update traffic.
@@ -217,6 +223,7 @@
<minimum>100</minimum>
<maximum>10000</maximum>
<increment-step>100</increment-step>
+ <unit>rows</unit>
</value-attributes>
</property>
<property>
@@ -298,6 +305,7 @@
<property>
<name>hbase.hstore.blockingStoreFiles</name>
+ <display-name>hstore blocking storefiles</display-name>
<value>10</value>
<description>
If more than this number of StoreFiles in any one Store
@@ -388,6 +396,9 @@
it in HBase's classpath and add the fully qualified class name here.
A coprocessor can also be loaded on demand by setting HTableDescriptor.
</description>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
<depends-on>
<property>
<type>hbase-site</type>
@@ -410,6 +421,9 @@
implementing your own MasterObserver, just put it in HBase's classpath
and add the fully qualified class name here.
</description>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
<depends-on>
<property>
<type>hbase-site</type>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml
index 4cb2274..8cae26c 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml
@@ -25,21 +25,40 @@
<name>hdfs_log_dir_prefix</name>
<value>/var/log/hadoop</value>
<description>Hadoop Log Dir Prefix</description>
+ <display-name>Hadoop Log Dir Prefix</display-name>
+ <value-attributes>
+ <overridable>false</overridable>
+ <editable-only-at-install>true</editable-only-at-install>
+ </value-attributes>
</property>
<property>
<name>hadoop_pid_dir_prefix</name>
<value>/var/run/hadoop</value>
+ <display-name>Hadoop PID Dir Prefix</display-name>
<description>Hadoop PID Dir Prefix</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ <editable-only-at-install>true</editable-only-at-install>
+ </value-attributes>
</property>
<property>
<name>hadoop_root_logger</name>
<value>INFO,RFA</value>
+ <display-name>Hadoop Root Logger</display-name>
<description>Hadoop Root Logger</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>hadoop_heapsize</name>
<value>1024</value>
<description>Hadoop maximum Java heap size</description>
+ <display-name>Hadoop maximum Java heap size</display-name>
+ <value-attributes>
+ <unit>MB</unit>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>namenode_heapsize</name>
@@ -52,6 +71,7 @@
<maximum>268435456</maximum>
<unit>MB</unit>
<increment-step>256</increment-step>
+ <overridable>false</overridable>
</value-attributes>
<depends-on>
<property>
@@ -77,6 +97,7 @@
<maximum>16384</maximum>
<unit>MB</unit>
<increment-step>256</increment-step>
+ <overridable>false</overridable>
</value-attributes>
</property>
<property>
@@ -96,6 +117,7 @@
<maximum>16384</maximum>
<unit>MB</unit>
<increment-step>256</increment-step>
+ <overridable>false</overridable>
</value-attributes>
</property>
<property>
@@ -109,6 +131,7 @@
<maximum>2096</maximum>
<unit>MB</unit>
<increment-step>128</increment-step>
+ <overridable>false</overridable>
</value-attributes>
</property>
<property>
@@ -122,6 +145,7 @@
<maximum>2096</maximum>
<unit>MB</unit>
<increment-step>128</increment-step>
+ <overridable>false</overridable>
</value-attributes>
</property>
<property>
@@ -152,6 +176,7 @@
<property>
<name>dfs.datanode.data.dir.mount.file</name>
<value>/etc/hadoop/conf/dfs_data_dir_mount.hist</value>
+ <display-name>File that stores mount point for each data dir</display-name>
<description>File path that contains the last known mount point for each data dir. This file is used to avoid creating a DFS data dir on the root drive (and filling it up) if a path was previously mounted on a drive.</description>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hdfs-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hdfs-log4j.xml b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hdfs-log4j.xml
index 08822eb..8360b0e 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hdfs-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hdfs-log4j.xml
@@ -196,6 +196,9 @@ log4j.appender.EventCounter=org.apache.hadoop.log.metrics.EventCounter
# Removes "deprecated" messages
log4j.logger.org.apache.hadoop.conf.Configuration.deprecation=WARN
</value>
+ <value-attributes>
+ <show-property-name>false</show-property-name>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hdfs-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hdfs-site.xml b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hdfs-site.xml
index dc7f661..f0bd6c1 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hdfs-site.xml
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hdfs-site.xml
@@ -28,11 +28,15 @@
<name>dfs.namenode.name.dir</name>
<!-- cluster variant -->
<value>/hadoop/hdfs/namenode</value>
+ <display-name>NameNode directories</display-name>
<description>Determines where on the local filesystem the DFS name node
should store the name table. If this is a comma-delimited list
of directories then the name table is replicated in all of the
directories, for redundancy. </description>
<final>true</final>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
@@ -45,8 +49,12 @@
<property>
<name>dfs.webhdfs.enabled</name>
<value>true</value>
+ <display-name>WebHDFS enabled</display-name>
<description>Whether to enable WebHDFS feature</description>
<final>true</final>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
@@ -72,6 +80,7 @@
<property>
<name>dfs.datanode.data.dir</name>
<value>/hadoop/hdfs/data</value>
+ <display-name>DataNode directories</display-name>
<description>Determines where on the local filesystem an DFS data node
should store its blocks. If this is a comma-delimited
list of directories, then data will be stored in all named
@@ -104,11 +113,15 @@
<property>
<name>dfs.namenode.checkpoint.dir</name>
<value>/hadoop/hdfs/namesecondary</value>
+ <display-name>SecondaryNameNode Checkpoint directories</display-name>
<description>Determines where on the local filesystem the DFS secondary
name node should store the temporary images to merge.
If this is a comma-delimited list of directories then the image is
replicated in all of the directories for redundancy.
</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
@@ -126,8 +139,11 @@
<property>
<name>dfs.namenode.checkpoint.period</name>
<value>21600</value>
- <description>The number of seconds between two periodic checkpoints.
- </description>
+ <display-name>HDFS Maximum Checkpoint Delay</display-name>
+ <description>The number of seconds between two periodic checkpoints.</description>
+ <value-attributes>
+ <unit>seconds</unit>
+ </value-attributes>
</property>
<property>
@@ -149,6 +165,7 @@
<property>
<name>dfs.replication</name>
<value>3</value>
+ <display-name>Block replication</display-name>
<description>Default block replication.
</description>
</property>
@@ -243,8 +260,12 @@
<name>dfs.datanode.du.reserved</name>
<!-- cluster variant -->
<value>1073741824</value>
+ <display-name>Reserved space for HDFS</display-name>
<description>Reserved space in bytes per volume. Always leave this much space free for non dfs use.
</description>
+ <value-attributes>
+ <unit>bytes</unit>
+ </value-attributes>
</property>
<property>
@@ -341,6 +362,7 @@
<property>
<name>dfs.datanode.data.dir.perm</name>
<value>750</value>
+ <display-name>DataNode directories permission</display-name>
<description>The permissions that should be there on dfs.datanode.data.dir
directories. The datanode will not come up if the permissions are
different on existing dfs.datanode.data.dir directories. If the directories
@@ -350,6 +372,7 @@
<property>
<name>dfs.namenode.accesstime.precision</name>
<value>0</value>
+ <display-name>Access time precision</display-name>
<description>The access time for HDFS file is precise upto this value.
The default value is 1 hour. Setting a value of 0 disables
access times for HDFS.
@@ -418,6 +441,7 @@
<property>
<name>dfs.client.read.shortcircuit</name>
<value>true</value>
+ <display-name>HDFS Short-circuit read</display-name>
<description>
This configuration parameter turns on short-circuit local reads.
</description>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
index 2d0a182..c60d076 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
@@ -32,6 +32,7 @@
<maximum>2048</maximum>
<unit>MB</unit>
<increment-step>512</increment-step>
+ <overridable>false</overridable>
</value-attributes>
</property>
@@ -52,14 +53,22 @@
<property>
<name>hive_database_type</name>
<value>mysql</value>
+ <display-name>Hive Database Type</display-name>
<description>Default HIVE DB type.</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>hive_database</name>
<value>New MySQL Database</value>
+ <display-name>Hive Database</display-name>
<description>
Property that determines whether the HIVE DB is managed by Ambari.
</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>hive_ambari_database</name>
@@ -70,16 +79,31 @@
<name>hive_database_name</name>
<value>hive</value>
<description>Database name.</description>
+ <value-attributes>
+ <visible>false</visible>
+ <editable-only-at-install>true</editable-only-at-install>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>hive_log_dir</name>
<value>/var/log/hive</value>
+ <display-name>Hive Log Dir</display-name>
<description>Directory for Hive Log files.</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ <editable-only-at-install>true</editable-only-at-install>
+ </value-attributes>
</property>
<property>
<name>hive_pid_dir</name>
<value>/var/run/hive</value>
+ <display-name>Hive PID Dir</display-name>
<description>Hive PID Dir.</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ <editable-only-at-install>true</editable-only-at-install>
+ </value-attributes>
</property>
<property>
<name>hive_user</name>
@@ -93,12 +117,22 @@
<property>
<name>hcat_log_dir</name>
<value>/var/log/webhcat</value>
+ <display-name>WebHCat Log Dir</display-name>
<description>WebHCat Log Dir.</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ <editable-only-at-install>true</editable-only-at-install>
+ </value-attributes>
</property>
<property>
<name>hcat_pid_dir</name>
<value>/var/run/webhcat</value>
+ <display-name>WebHCat Pid Dir</display-name>
<description>WebHCat Pid Dir.</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ <editable-only-at-install>true</editable-only-at-install>
+ </value-attributes>
</property>
<property>
<name>hcat_user</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-exec-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-exec-log4j.xml b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-exec-log4j.xml
index fb852f7..3181288 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-exec-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-exec-log4j.xml
@@ -106,6 +106,9 @@ log4j.logger.org.apache.zookeeper.server.NIOServerCnxn=WARN,FA
log4j.logger.org.apache.zookeeper.ClientCnxnSocketNIO=WARN,FA
</value>
+ <value-attributes>
+ <show-property-name>false</show-property-name>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-log4j.xml b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-log4j.xml
index a978ef7..acff9e7 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-log4j.xml
@@ -115,6 +115,9 @@ log4j.category.JPOX.Enhancer=ERROR,DRFA
log4j.logger.org.apache.zookeeper.server.NIOServerCnxn=WARN,DRFA
log4j.logger.org.apache.zookeeper.ClientCnxnSocketNIO=WARN,DRFA
</value>
+ <value-attributes>
+ <show-property-name>false</show-property-name>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml
index 2783b78..6803ee8 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml
@@ -22,38 +22,63 @@ limitations under the License.
<property>
<name>hive.heapsize</name>
<value>1024</value>
+ <display-name>HiveServer2 heap size</display-name>
<description>Hive Java heap size</description>
+ <value-attributes>
+ <unit>MB</unit>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>ambari.hive.db.schema.name</name>
<value>hive</value>
+ <display-name>Database Name</display-name>
<description>Database name used as the Hive Metastore</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>javax.jdo.option.ConnectionURL</name>
<value>jdbc:mysql://localhost/hive?createDatabaseIfNotExist=true</value>
+ <display-name>Database URL</display-name>
<description>JDBC connect string for a JDBC metastore</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>javax.jdo.option.ConnectionDriverName</name>
<value>com.mysql.jdbc.Driver</value>
+ <display-name>JDBC Driver Class</display-name>
<description>Driver class name for a JDBC metastore</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>javax.jdo.option.ConnectionUserName</name>
<value>hive</value>
+ <display-name>Database Username</display-name>
<description>username to use against metastore database</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property require-input="true">
<name>javax.jdo.option.ConnectionPassword</name>
<value> </value>
<property-type>PASSWORD</property-type>
+ <display-name>Database Password</display-name>
<description>password to use against metastore database</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
@@ -320,9 +345,13 @@ limitations under the License.
<property>
<name>hive.server2.thrift.port</name>
<value>10000</value>
+ <display-name>HiveServer2 Port</display-name>
<description>
TCP port number to listen on, default 10000.
</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/webhcat-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/webhcat-log4j.xml b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/webhcat-log4j.xml
index 0ded4d4..2cb2533 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/webhcat-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/webhcat-log4j.xml
@@ -73,6 +73,9 @@ log4j.logger.org.apache.zookeeper = WARN
log4j.logger.org.eclipse.jetty = INFO
</value>
+ <value-attributes>
+ <show-property-name>false</show-property-name>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/webhcat-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/webhcat-site.xml b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/webhcat-site.xml
index 33f7f21..980bd32 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/webhcat-site.xml
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/webhcat-site.xml
@@ -63,6 +63,9 @@ limitations under the License.
<name>templeton.pig.archive</name>
<value>hdfs:///apps/webhcat/pig.tar.gz</value>
<description>The path to the Pig archive.</description>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
</property>
<property>
@@ -81,6 +84,9 @@ limitations under the License.
<name>templeton.hive.archive</name>
<value>hdfs:///apps/webhcat/hive.tar.gz</value>
<description>The path to the Hive archive.</description>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-env.xml b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-env.xml
index 94f4975..ecc0782 100644
--- a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-env.xml
+++ b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-env.xml
@@ -35,7 +35,12 @@
<property>
<name>kafka_pid_dir</name>
<value>/var/run/kafka</value>
+ <display-name>Kafka PID dir</display-name>
<description></description>
+ <value-attributes>
+ <editable-only-at-install>true</editable-only-at-install>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<!-- kafka-env.sh -->
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-log4j.xml b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-log4j.xml
index 901859e..e18732d 100644
--- a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-log4j.xml
@@ -111,6 +111,9 @@ log4j.logger.state.change.logger=TRACE, stateChangeAppender
log4j.additivity.state.change.logger=false
</value>
+ <value-attributes>
+ <show-property-name>false</show-property-name>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml
index 60df2e0..b7ee2f4 100644
--- a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml
+++ b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml
@@ -27,6 +27,10 @@
The type of KDC being used. Either mit-kdc or active-directory
</description>
<value>mit-kdc</value>
+ <display-name>KDC type</display-name>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
@@ -36,40 +40,63 @@
should be managed (created, deleted, updated, etc...) by Ambari or managed manually.
</description>
<value>true</value>
+ <display-name>Manage Kerberos Identities</display-name>
+ <value-attributes>
+ <visible>false</visible>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>install_packages</name>
+ <display-name>Install OS-specific Kerberos client package(s)</display-name>
<description>
Indicates whether Ambari should install the Kerberos client package(s) or not. If not, it is
expected that Kerberos utility programs (such as kadmin, kinit, klist, and kdestroy) are
compatible with MIT Kerberos 5 version 1.10.3 in command line options and behaviors.
</description>
<value>true</value>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property require-input="true">
<name>ldap_url</name>
+ <display-name>LDAP url</display-name>
<description>
The URL to the Active Directory LDAP Interface
</description>
<value/>
+ <value-attributes>
+ <visible>false</visible>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property require-input="true">
<name>container_dn</name>
+ <display-name>Container DN</display-name>
<description>
The distinguished name (DN) of the container used store service principals
</description>
+ <value-attributes>
+ <visible>false</visible>
+ <overridable>false</overridable>
+ </value-attributes>
<value/>
</property>
<property require-input="true">
<name>encryption_types</name>
+ <display-name>Encryption Types</display-name>
<description>
The supported list of session key encryption types that should be returned by the KDC.
</description>
<value>aes des3-cbc-sha1 rc4 des-cbc-md5</value>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property require-input="true">
@@ -77,7 +104,12 @@
<description>
The default realm to use when creating service principals
</description>
+ <display-name>Realm name</display-name>
<value/>
+ <value-attributes>
+ <editable-only-at-install>true</editable-only-at-install>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property require-input="true">
@@ -85,91 +117,136 @@
<description>
The IP address or FQDN for the KDC host. Optionally a port number may be included.
</description>
+ <display-name>KDC host</display-name>
<value/>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>admin_server_host</name>
+ <display-name>Kadmin host</display-name>
<description>
The IP address or FQDN for the KDC Kerberos administrative host. Optionally a port number may be included.
</description>
<value/>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>executable_search_paths</name>
+ <display-name>Executable Search Paths</display-name>
<description>
A comma-delimited list of search paths to use to find Kerberos utilities like kadmin and kinit.
</description>
<value>/usr/bin, /usr/kerberos/bin, /usr/sbin, /usr/lib/mit/bin, /usr/lib/mit/sbin</value>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>password_length</name>
+ <display-name>Password Length</display-name>
<description>
The length required length for generated passwords.
</description>
<value>20</value>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>password_min_lowercase_letters</name>
+ <display-name>Password Minimum # Lowercase Letters</display-name>
<description>
The minimum number of lowercase letters (a-z) required in generated passwords
</description>
<value>1</value>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>password_min_uppercase_letters</name>
+ <display-name>Password Minimum # Uppercase Letters</display-name>
<description>
The minimum number of uppercase letters (A-Z) required in generated passwords
</description>
<value>1</value>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>password_min_digits</name>
+ <display-name>Password Minimum # Digits</display-name>
<description>
The minimum number of digits (0-9) required in generated passwords
</description>
<value>1</value>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>password_min_punctuation</name>
+ <display-name>Password Minimum # Punctuation Characters</display-name>
<description>
The minimum number of punctuation characters (?.!$%^*()-_+=~) required in generated passwords
</description>
<value>1</value>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>password_min_whitespace</name>
+ <display-name>Password Minimum # Whitespace Characters</display-name>
<description>
The minimum number of whitespace characters required in generated passwords
</description>
<value>0</value>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>service_check_principal_name</name>
+ <display-name>Test Kerberos Principal</display-name>
<description>
The principal name to use when executing the Kerberos service check
</description>
<value>${cluster_name}-${short_date}</value>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>case_insensitive_username_rules</name>
+ <display-name>Enable case insensitive username rules</display-name>
<description>
Force principal names to resolve to lowercase local usernames in auth-to-local rules
</description>
<value>false</value>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>ad_create_attributes_template</name>
+ <display-name>Account Attribute Template</display-name>
<description>
A Velocity template to use to generate a JSON-formatted document containing the set of
attribute names and values needed to create a new Kerberos identity in the relevant
@@ -191,13 +268,22 @@
"userAccountControl": "66048"
}
</value>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>kdc_create_attributes</name>
+ <display-name>Principal Attributes</display-name>
<description>
The set of attributes to use when creating a new Kerberos identity in the relevant (MIT) KDC.
</description>
<value/>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/krb5-conf.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/krb5-conf.xml b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/krb5-conf.xml
index 5cf0960..8d9262f 100644
--- a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/krb5-conf.xml
+++ b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/krb5-conf.xml
@@ -23,27 +23,41 @@
<configuration>
<property require-input="false">
<name>domains</name>
+ <display-name>Domains</display-name>
<description>
A comma-separated list of domain names used to map server host names to the Realm name (e.g. .example.com,example.com). This is optional
</description>
<value/>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>manage_krb5_conf</name>
+ <display-name>Manage Kerberos client krb5.conf</display-name>
<description>
Indicates whether your krb5.conf file should be managed by the wizard or should you manage it yourself
</description>
<value>true</value>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>conf_dir</name>
+ <display-name>krb5-conf directory path</display-name>
<description>The krb5.conf configuration directory</description>
<value>/etc</value>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>content</name>
+ <display-name>krb5-conf template</display-name>
<description>Customizable krb5.conf template (Jinja template engine)</description>
<value>
[libdefaults]
@@ -76,5 +90,8 @@
{# Append additional realm declarations below #}
</value>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/gateway-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/gateway-log4j.xml b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/gateway-log4j.xml
index 370f786..cb2c0fc 100644
--- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/gateway-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/gateway-log4j.xml
@@ -79,5 +79,8 @@
<description>
content for log4j.properties file for Knox.
</description>
+ <value-attributes>
+ <show-property-name>false</show-property-name>
+ </value-attributes>
</property>
</configuration>