You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sr...@apache.org on 2016/06/02 02:00:44 UTC
[97/98] [abbrv] ambari git commit: Revert "AMBARI-16272. Ambari
Upgrade shouldn't automatically add stack configs (dlysnichenko)" - failing
testcases
http://git-wip-us.apache.org/repos/asf/ambari/blob/0aeaa956/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-env.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-env.xml
index d097730..cea75f5 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-env.xml
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-env.xml
@@ -17,30 +17,25 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
+
<configuration>
<property>
<name>metrics_grafana_log_dir</name>
<value>/var/log/ambari-metrics-grafana</value>
<display-name>Metrics Grafana log dir</display-name>
<description>Metrics Grafana log directory.</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>metrics_grafana_pid_dir</name>
<value>/var/run/ambari-metrics-grafana</value>
<display-name>Metrics Grafana pid dir</display-name>
<description>Metrics Grafana pid directory.</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>metrics_grafana_data_dir</name>
<value>/var/lib/ambari-metrics-grafana</value>
<display-name>Metrics Grafana data dir</display-name>
<description>Metrics Grafana data directory.</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>metrics_grafana_username</name>
@@ -55,12 +50,10 @@
<type>db_user</type>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property require-input="true">
<name>metrics_grafana_password</name>
- <value/>
+ <value></value>
<property-type>PASSWORD</property-type>
<display-name>Grafana Admin Password</display-name>
<description>
@@ -72,8 +65,6 @@
<overridable>false</overridable>
<type>password</type>
</value-attributes>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>content</name>
@@ -93,7 +84,6 @@ export AMS_GRAFANA_LOG_DIR={{ams_grafana_log_dir}}
# AMS UI Server PID Dir
export AMS_GRAFANA_PID_DIR={{ams_grafana_pid_dir}}
</value>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
+
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0aeaa956/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-ini.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-ini.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-ini.xml
index 033b038..40c89a0 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-ini.xml
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-ini.xml
@@ -17,35 +17,29 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
+
<configuration>
<property>
<name>port</name>
<value>3000</value>
<description>The http port to use</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>protocol</name>
<value>http</value>
<description>Protocol (http or https)</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>cert_file</name>
<value>/etc/ambari-metrics-grafana/conf/ams-grafana.crt</value>
<description>Path to grafana certificate (.crt) file.</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>cert_key</name>
<value>/etc/ambari-metrics-grafana/conf/ams-grafana.key</value>
<description>Path to grafana certificate key (.key) file.</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
+
<property>
<name>content</name>
<display-name>ams-grafana-ini template</display-name>
@@ -308,7 +302,6 @@ org_name = Main Org.
;path = /var/lib/grafana/dashboards
path = /usr/lib/ambari-metrics-grafana/public/dashboards
</value>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
+
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0aeaa956/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml
index ec85f02..b6edd8d 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml
@@ -19,6 +19,7 @@
* limitations under the License.
*/
-->
+
<configuration supports_adding_forbidden="true">
<property>
<name>hbase_log_dir</name>
@@ -33,8 +34,6 @@
<value-attributes>
<type>directory</type>
</value-attributes>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase_pid_dir</name>
@@ -43,18 +42,14 @@
<value-attributes>
<type>directory</type>
</value-attributes>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase_classpath_additional</name>
- <value/>
+ <value></value>
<description>Additional directory or jar in classpath for HBase.</description>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase_regionserver_heapsize</name>
@@ -77,8 +72,6 @@
<name>hbase.rootdir</name>
</property>
</depends-on>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>regionserver_xmn_size</name>
@@ -94,8 +87,6 @@
<name>hbase.cluster.distributed</name>
</property>
</depends-on>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase_master_xmn_size</name>
@@ -113,8 +104,6 @@
<name>hbase.cluster.distributed</name>
</property>
</depends-on>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase_master_maxperm_size</name>
@@ -124,15 +113,11 @@
<type>int</type>
<unit>MB</unit>
</value-attributes>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase_regionserver_xmn_ratio</name>
<value>0.2</value>
<description>Percentage of max heap size (-Xmx) which used for young generation heap (-Xmn).</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase_master_heapsize</name>
@@ -155,8 +140,6 @@
<name>hbase.rootdir</name>
</property>
</depends-on>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>max_open_files_limit</name>
@@ -164,9 +147,8 @@
<description>
The maximum number of open file descriptors by process
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
+
<!-- hbase-env.sh -->
<property>
<name>content</name>
@@ -267,7 +249,6 @@ export HBASE_HOME={{ams_hbase_home_dir}}
<value-attributes>
<type>content</type>
</value-attributes>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
+
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0aeaa956/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 55bd8f4..e72edf6 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
@@ -19,7 +19,9 @@
* limitations under the License.
*/
-->
+
<configuration supports_final="false" supports_adding_forbidden="true">
+
<property>
<name>content</name>
<display-name>ams-hbase-log4j template</display-name>
@@ -141,7 +143,6 @@ log4j.logger.org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher=INFO
<type>content</type>
<show-property-name>false</show-property-name>
</value-attributes>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
+
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0aeaa956/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-policy.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-policy.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-policy.xml
index a187ffe..febbd44 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-policy.xml
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-policy.xml
@@ -19,6 +19,7 @@
* limitations under the License.
*/
-->
+
<configuration supports_final="true">
<property>
<name>security.client.protocol.acl</name>
@@ -28,9 +29,8 @@
The ACL is a comma-separated list of user and group names. The user and
group list is separated by a blank. For e.g. "alice,bob users,wheel".
A special value of "*" means all users are allowed.</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
+
<property>
<name>security.admin.protocol.acl</name>
<value>*</value>
@@ -39,9 +39,8 @@
The ACL is a comma-separated list of user and group names. The user and
group list is separated by a blank. For e.g. "alice,bob users,wheel".
A special value of "*" means all users are allowed.</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
+
<property>
<name>security.masterregion.protocol.acl</name>
<value>*</value>
@@ -50,7 +49,5 @@
The ACL is a comma-separated list of user and group names. The user and
group list is separated by a blank. For e.g. "alice,bob users,wheel".
A special value of "*" means all users are allowed.</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0aeaa956/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 2a0acd1..b1f702f 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
@@ -22,155 +22,121 @@
<configuration>
<property>
<name>ams.zookeeper.keytab</name>
- <value/>
+ <value></value>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>ams.zookeeper.principal</name>
- <value/>
+ <value></value>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hadoop.security.authentication</name>
- <value/>
+ <value></value>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase.coprocessor.master.classes</name>
- <value/>
+ <value></value>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase.coprocessor.region.classes</name>
- <value/>
+ <value></value>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase.master.kerberos.principal</name>
- <value/>
+ <value></value>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase.master.keytab.file</name>
- <value/>
+ <value></value>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase.myclient.keytab</name>
- <value/>
+ <value></value>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase.myclient.principal</name>
- <value/>
+ <value></value>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase.regionserver.kerberos.principal</name>
- <value/>
+ <value></value>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase.regionserver.keytab.file</name>
- <value/>
+ <value></value>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase.security.authentication</name>
- <value/>
+ <value></value>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase.security.authorization</name>
- <value/>
+ <value></value>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase.zookeeper.property.authProvider.1</name>
- <value/>
+ <value></value>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase.zookeeper.property.jaasLoginRenew</name>
- <value/>
+ <value></value>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase.zookeeper.property.kerberos.removeHostFromPrincipal</name>
- <value/>
+ <value></value>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase.zookeeper.property.kerberos.removeRealmFromPrincipal</name>
- <value/>
+ <value></value>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0aeaa956/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-site.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-site.xml
index b577e18..61d5b61 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-site.xml
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-site.xml
@@ -39,8 +39,6 @@
<name>timeline.metrics.service.operation.mode</name>
</property>
</depends-on>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase.tmp.dir</name>
@@ -54,16 +52,12 @@
<value-attributes>
<type>directory</type>
</value-attributes>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase.local.dir</name>
<value>${hbase.tmp.dir}/local</value>
<description>Directory on the local filesystem to be used as a local storage
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase.cluster.distributed</name>
@@ -74,13 +68,11 @@
all HBase and ZooKeeper daemons together in the one JVM.
</description>
<depends-on>
- <property>
- <type>ams-site</type>
- <name>timeline.metrics.service.operation.mode</name>
- </property>
+ <property>
+ <type>ams-site</type>
+ <name>timeline.metrics.service.operation.mode</name>
+ </property>
</depends-on>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase.master.wait.on.regionservers.mintostart</name>
@@ -88,8 +80,6 @@
<description>
Ensure that HBase Master waits for # many region server to start.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase.zookeeper.quorum</name>
@@ -102,43 +92,31 @@
this is the list of servers which we will start/stop ZooKeeper on.
</description>
<final>true</final>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase.master.info.bindAddress</name>
<value>0.0.0.0</value>
<description>The bind address for the HBase Master web UI</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase.master.info.port</name>
<value>61310</value>
<description>The port for the HBase Master web UI.</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase.regionserver.info.port</name>
<value>61330</value>
<description>The port for the HBase RegionServer web UI.</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase.master.port</name>
<value>61300</value>
<description>The port for the HBase Master web UI.</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase.regionserver.port</name>
<value>61320</value>
<description>The port for the HBase RegionServer web UI.</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase.hregion.majorcompaction</name>
@@ -148,8 +126,6 @@
HStoreFiles in a region.
0 to disable automated major compactions.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>phoenix.query.spoolThresholdBytes</name>
@@ -158,8 +134,6 @@
Threshold size in bytes after which results from parallelly executed
query results are spooled to disk. Default is 20 mb.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase.zookeeper.property.dataDir</name>
@@ -168,8 +142,6 @@
Property from ZooKeeper's config zoo.cfg.
The directory where the snapshot is stored.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase.client.scanner.caching</name>
@@ -178,23 +150,17 @@
Number of rows that will be fetched when calling next on a scanner
if it is not served from (local, client) memory.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase.normalizer.enabled</name>
<value>true</value>
<description>If set to true, Master will try to keep region size
within each table approximately the same.</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase.normalizer.period</name>
<value>600000</value>
<description>Period in ms at which the region normalizer runs in the Master.</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase.master.normalizer.class</name>
@@ -204,8 +170,6 @@
See the class comment for more on how it works
http://hbase.apache.org/devapidocs/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.html
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hfile.block.cache.size</name>
@@ -214,8 +178,6 @@
Percentage of maximum heap (-Xmx setting) to allocate to block cache
used by a StoreFile. Default of 0.4 means allocate 40%.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase.regionserver.global.memstore.upperLimit</name>
@@ -224,8 +186,6 @@
Maximum size of all memstores in a region server before new
updates are blocked and flushes are forced. Defaults to 40% of heap
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase.regionserver.global.memstore.lowerLimit</name>
@@ -237,8 +197,6 @@
the minimum possible flushing to occur when updates are blocked due to
memstore limiting.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>phoenix.groupby.maxCacheSize</name>
@@ -246,18 +204,14 @@
<description>
Size in bytes of pages cached during GROUP BY spilling. Default is 100Mb.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase.hregion.max.filesize</name>
<value>4294967296</value>
<description>
- Maximum HFile size. If the sum of the sizes of a region’s HFiles has grown
+ Maximum HFile size. If the sum of the sizes of a region\u2019s HFiles has grown
to exceed this value, the region is split in two. Default is 10Gb.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase.hregion.memstore.block.multiplier</name>
@@ -267,8 +221,6 @@
times hbase.hregion.memstore.flush.size bytes. Useful preventing runaway
memstore during spikes in update traffic.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase.hstore.flusher.count</name>
@@ -278,8 +230,6 @@
will be queued. With more threads, the flushes will be executed in parallel,
increasing the load on HDFS, and potentially causing more compactions.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>phoenix.query.timeoutMs</name>
@@ -288,8 +238,6 @@
Number of milliseconds after which a query will timeout on the client.
Default is 5 min.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>phoenix.query.keepAliveMs</name>
@@ -298,8 +246,6 @@
Number of milliseconds after which a query will keep the connection to HBase alive.
Default is 5 min.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase.client.scanner.timeout.period</name>
@@ -307,8 +253,6 @@
<description>
Client scanner lease period in milliseconds.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase.rpc.timeout</name>
@@ -319,8 +263,6 @@
but will eventually throw a TimeoutException.
</description>
<display-name>HBase RPC Timeout</display-name>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase.regionserver.thread.compaction.large</name>
@@ -328,8 +270,6 @@
<description>
Configuration key for the large compaction threads.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase.regionserver.thread.compaction.small</name>
@@ -337,8 +277,6 @@
<description>
Configuration key for the small compaction threads.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase.zookeeper.property.clientPort</name>
@@ -353,20 +291,14 @@
<name>hbase.cluster.distributed</name>
</property>
</depends-on>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase.zookeeper.peerport</name>
<value>61288</value>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase.zookeeper.leaderport</name>
<value>61388</value>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase.hstore.blockingStoreFiles</name>
@@ -377,8 +309,6 @@
this region until a compaction is completed, or until
hbase.hstore.blockingWaitTime has been exceeded.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase.hregion.memstore.flush.size</name>
@@ -388,22 +318,16 @@
number of bytes. Value is checked by a thread that runs every
hbase.server.thread.wakefrequency.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase.snapshot.enabled</name>
<value>false</value>
<description>Enable/Disable HBase snapshots.</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase.replication</name>
<value>false</value>
<description>Enable/Disable HBase replication.</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase.zookeeper.property.tickTime</name>
@@ -413,15 +337,11 @@
ZooKeeper, as measured in milliseconds. This property setting only
affects the ZK server started by AMS in embedded mode. Unit = ms.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>zookeeper.session.timeout</name>
<value>120000</value>
<description>ZooKeeper session timeout in milliseconds.</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>zookeeper.session.timeout.localHBaseCluster</name>
@@ -430,8 +350,6 @@
ZooKeeper session timeout in milliseconds for
pseudo distributed mode.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>phoenix.sequence.saltBuckets</name>
@@ -439,8 +357,6 @@
<description>
Controls the number of pre-allocated regions for SYSTEM.SEQUENCE table.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>phoenix.query.maxGlobalMemoryPercentage</name>
@@ -449,8 +365,6 @@
Percentage of total heap memory (i.e. Runtime.getRuntime().maxMemory())
that all threads may use.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>phoenix.spool.directory</name>
@@ -459,8 +373,6 @@
Set directory for Phoenix spill files. If possible set this to a
different mount point from the one for hbase.rootdir in embedded mode.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>phoenix.mutate.batchSize</name>
@@ -470,8 +382,6 @@
during the execution of an UPSERT SELECT or DELETE statement.
This affects performance of group by aggregators if they are being used.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>phoenix.query.rowKeyOrderSaltedTable</name>
@@ -482,8 +392,6 @@
When this property is turned on, the salted table would behave just like
a normal table and would return items in rowkey order for scans
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>phoenix.coprocessor.maxServerCacheTimeToLiveMs</name>
@@ -492,12 +400,10 @@
Maximum living time (in milliseconds) of server caches. A cache entry
expires after this amount of time has passed since last access. Consider
adjusting this parameter when a server-side IOException(
- “Could not find hash cache for joinId”) happens. Getting warnings like
- “Earlier hash cache(s) might have expired on servers” might also be a
+ \u201cCould not find hash cache for joinId\u201d) happens. Getting warnings like
+ \u201cEarlier hash cache(s) might have expired on servers\u201d might also be a
sign that this number should be increased.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>phoenix.coprocessor.maxMetaDataCacheSize</name>
@@ -507,8 +413,6 @@
evictions will begin to occur based on least recent access time.
Default is 20Mb
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>dfs.client.read.shortcircuit</name>
@@ -527,13 +431,10 @@
<name>hbase.rootdir</name>
</property>
</depends-on>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>zookeeper.znode.parent</name>
<value>/ams-hbase-unsecure</value>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
+
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0aeaa956/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 162dac9..674626b 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
@@ -17,7 +17,9 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
+
<configuration supports_final="false" supports_adding_forbidden="true">
+
<property>
<name>content</name>
<display-name>ams-log4j template</display-name>
@@ -60,7 +62,6 @@ log4j.appender.file.layout.ConversionPattern=%d{ISO8601} %p %c: %m%n
<type>content</type>
<show-property-name>false</show-property-name>
</value-attributes>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
+
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0aeaa956/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 d43584f..353910d 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
@@ -30,8 +30,6 @@
1) embedded: Metrics stored on local FS, HBase in Standalone mode
2) distributed: HBase daemons writing to HDFS
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.service.webapp.address</name>
@@ -39,8 +37,6 @@
<description>
The address of the metrics service web application.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.service.rpc.address</name>
@@ -48,8 +44,6 @@
<description>
The address of the metrics service rpc listeners.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.aggregator.checkpoint.dir</name>
@@ -62,8 +56,6 @@
<value-attributes>
<type>directory</type>
</value-attributes>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.host.aggregator.minute.interval</name>
@@ -76,8 +68,6 @@
<value-attributes>
<type>int</type>
</value-attributes>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.host.aggregator.hourly.interval</name>
@@ -90,8 +80,6 @@
<value-attributes>
<type>int</type>
</value-attributes>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.daily.aggregator.minute.interval</name>
@@ -100,8 +88,6 @@
Time in seconds to sleep for the day resolution host based
aggregator. Default resolution is 24 hours.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.cluster.aggregator.hourly.interval</name>
@@ -114,8 +100,6 @@
<value-attributes>
<type>int</type>
</value-attributes>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.cluster.aggregator.daily.interval</name>
@@ -124,8 +108,6 @@
Time in seconds to sleep for the day resolution cluster wide
aggregator. Default is 24 hours.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.cluster.aggregator.minute.interval</name>
@@ -138,8 +120,6 @@
<value-attributes>
<type>int</type>
</value-attributes>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.cluster.aggregator.second.interval</name>
@@ -152,8 +132,6 @@
<value-attributes>
<type>int</type>
</value-attributes>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.host.aggregator.daily.checkpointCutOffMultiplier</name>
@@ -163,8 +141,6 @@
if aggregator checkpoint is greater than max allowed checkpoint delay,
the checkpoint will be discarded by the aggregator.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.host.aggregator.hourly.checkpointCutOffMultiplier</name>
@@ -178,8 +154,6 @@
<value-attributes>
<type>int</type>
</value-attributes>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.host.aggregator.minute.checkpointCutOffMultiplier</name>
@@ -193,8 +167,6 @@
<value-attributes>
<type>int</type>
</value-attributes>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.cluster.aggregator.hourly.checkpointCutOffMultiplier</name>
@@ -208,8 +180,6 @@
<value-attributes>
<type>int</type>
</value-attributes>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.cluster.aggregator.second.checkpointCutOffMultiplier</name>
@@ -223,8 +193,6 @@
<value-attributes>
<type>int</type>
</value-attributes>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.cluster.aggregator.minute.checkpointCutOffMultiplier</name>
@@ -238,8 +206,6 @@
<value-attributes>
<type>int</type>
</value-attributes>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.cluster.aggregator.daily.checkpointCutOffMultiplier</name>
@@ -249,8 +215,6 @@
if aggregator checkpoint is greater than max allowed checkpoint delay,
the checkpoint will be discarded by the aggregator.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.host.aggregator.daily.disabled</name>
@@ -258,8 +222,6 @@
<description>
Disable host based daily aggregations.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.host.aggregator.hourly.disabled</name>
@@ -268,8 +230,6 @@
<description>
Disable host based hourly aggregations.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.host.aggregator.minute.disabled</name>
@@ -278,8 +238,6 @@
<description>
Disable host based minute aggregations.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.cluster.aggregator.daily.disabled</name>
@@ -287,8 +245,6 @@
<description>
Disable cluster based daily aggregations.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.cluster.aggregator.hourly.disabled</name>
@@ -297,8 +253,6 @@
<description>
Disable cluster based hourly aggregations.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.cluster.aggregator.minute.disabled</name>
@@ -307,8 +261,6 @@
<description>
Disable cluster based minute aggregations.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.cluster.aggregator.second.disabled</name>
@@ -317,8 +269,6 @@
<description>
Disable cluster based second aggregations.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.cluster.aggregator.second.timeslice.interval</name>
@@ -330,8 +280,6 @@
<value-attributes>
<type>int</type>
</value-attributes>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.host.aggregator.daily.ttl</name>
@@ -339,8 +287,6 @@
<description>
Host based daily resolution data purge interval in seconds. Default is 1 year.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.host.aggregator.hourly.ttl</name>
@@ -348,8 +294,6 @@
<description>
Host based hourly resolution data purge interval in seconds. Default is 30 days.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.host.aggregator.minute.ttl</name>
@@ -357,8 +301,6 @@
<description>
Host based minute resolution data purge interval in seconds. Default is 7 days.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.cluster.aggregator.second.ttl</name>
@@ -366,8 +308,6 @@
<description>
Cluster wide second resolution data purge interval in seconds. Default is 7 days.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.cluster.aggregator.minute.ttl</name>
@@ -375,8 +315,6 @@
<description>
Cluster wide minute resolution data purge interval in seconds. Default is 30 days.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.cluster.aggregator.hourly.ttl</name>
@@ -384,8 +322,6 @@
<description>
Cluster wide hourly resolution data purge interval in seconds. Default is 1 year.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.cluster.aggregator.daily.ttl</name>
@@ -393,8 +329,6 @@
<description>
Cluster wide daily resolution data purge interval in seconds. Default is 2 years.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.host.aggregator.ttl</name>
@@ -408,8 +342,6 @@
<name>timeline.metrics.service.operation.mode</name>
</property>
</depends-on>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.hbase.data.block.encoding</name>
@@ -419,8 +351,6 @@
Default encoding is FAST_DIFF. This can be changed only before creating
tables.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.hbase.compression.scheme</name>
@@ -430,8 +360,6 @@
scheme. Default compression is SNAPPY. Disable by setting to None.
This can be changed only before creating tables.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.service.default.result.limit</name>
@@ -444,8 +372,6 @@
<value-attributes>
<type>int</type>
</value-attributes>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.service.checkpointDelay</name>
@@ -458,8 +384,6 @@
<value-attributes>
<type>int</type>
</value-attributes>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.service.resultset.fetchSize</name>
@@ -471,8 +395,6 @@
<value-attributes>
<type>int</type>
</value-attributes>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<!-- Phoenix properties that would manifest in the hbase-site.xml on the client side -->
<property>
@@ -482,8 +404,6 @@
Percentage of total heap memory (i.e. Runtime.getRuntime().maxMemory())
that all threads may use.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>phoenix.spool.directory</name>
@@ -495,8 +415,6 @@
<value-attributes>
<type>directory</type>
</value-attributes>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.service.cluster.aggregator.appIds</name>
@@ -505,8 +423,6 @@
List of application ids to use for aggregating host level metrics for
an application. Example: bytes_read across Yarn Nodemanagers.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.service.use.groupBy.aggregators</name>
@@ -515,8 +431,6 @@
Use a groupBy aggregated query to perform host level aggregations vs
in-memory aggregations.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.host.aggregate.splitpoints</name>
@@ -543,8 +457,6 @@
<name>hbase_regionserver_heapsize</name>
</property>
</depends-on>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.cluster.aggregate.splitpoints</name>
@@ -571,8 +483,6 @@
<name>hbase_regionserver_heapsize</name>
</property>
</depends-on>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.sink.report.interval</name>
@@ -581,8 +491,6 @@
Time in seconds to sleep before report metrics to collector.
Default resolution is 1 minute.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.sink.collection.period</name>
@@ -590,8 +498,6 @@
<description>
The interval between two service metrics data exports.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.service.watcher.disabled</name>
@@ -605,8 +511,6 @@
<name>timeline.metrics.service.operation.mode</name>
</property>
</depends-on>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.service.watcher.initial.delay</name>
@@ -615,8 +519,6 @@
The time to delay first watcher check execution
Default resolution is 10 minutes.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.service.watcher.delay</name>
@@ -626,8 +528,6 @@
watcher check execution and the commencement of the next
Default resolution is 30 seconds.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.service.watcher.timeout</name>
@@ -636,8 +536,6 @@
The maximum time to wait for a single watcher check execution
Default resolution is 30 seconds.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.hbase.fifo.compaction.enabled</name>
@@ -645,8 +543,6 @@
<description>
Enable Compaction policy for lower for Precision and Minute aggregate tables.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.aggregators.skip.blockcache.enabled</name>
@@ -655,8 +551,6 @@
Skip block cache on aggregator queries to allow, HBase block
utilization only for user queries.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.cache.commit.interval</name>
@@ -667,8 +561,6 @@
<value-attributes>
<type>int</type>
</value-attributes>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.cache.size</name>
@@ -676,8 +568,6 @@
<description>
Size of array blocking queue used to cache metrics
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.cache.enabled</name>
@@ -685,8 +575,6 @@
<description>
If set to true PhoenixHBaseAccessor will use cache to store metrics before committing them
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.service.http.policy</name>
@@ -698,8 +586,6 @@
- HTTP_ONLY : Service is provided only on http
- HTTPS_ONLY : Service is provided only on https
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.hbase.init.check.enabled</name>
@@ -707,8 +593,6 @@
<description>
Enable Initialization check for HBase tables during Metrics service startup.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.cluster.aggregator.interpolation.enabled</name>
@@ -716,8 +600,6 @@
<description>
Enable Linear interpolation for missing slices of data, while aggregating.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>timeline.metrics.service.metadata.filters</name>
@@ -726,7 +608,6 @@
Commas separated list of regular expressions that match metric names
which prevents certain metrics from ending up in metadata cache.
</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
+
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0aeaa956/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-ssl-client.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-ssl-client.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-ssl-client.xml
index d808041..31586ee 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-ssl-client.xml
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-ssl-client.xml
@@ -1,5 +1,6 @@
<?xml version="1.0"?>
<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -17,26 +18,20 @@
limitations under the License.
-->
<configuration>
- <property>
- <name>ssl.client.truststore.location</name>
- <value>/etc/security/clientKeys/all.jks</value>
- <description>Location of the trust store file.</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
- </property>
- <property>
- <name>ssl.client.truststore.type</name>
- <value>jks</value>
- <description>Optional. Default value is "jks".</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
- </property>
- <property>
- <name>ssl.client.truststore.password</name>
- <value>bigdata</value>
- <property-type>PASSWORD</property-type>
- <description>Password to open the trust store file.</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
- </property>
+ <property>
+ <name>ssl.client.truststore.location</name>
+ <value>/etc/security/clientKeys/all.jks</value>
+ <description>Location of the trust store file.</description>
+ </property>
+ <property>
+ <name>ssl.client.truststore.type</name>
+ <value>jks</value>
+ <description>Optional. Default value is "jks".</description>
+ </property>
+ <property>
+ <name>ssl.client.truststore.password</name>
+ <value>bigdata</value>
+ <property-type>PASSWORD</property-type>
+ <description>Password to open the trust store file.</description>
+ </property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0aeaa956/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-ssl-server.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-ssl-server.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-ssl-server.xml
index 943e1b4..f95793e 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-ssl-server.xml
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-ssl-server.xml
@@ -1,5 +1,6 @@
<?xml version="1.0"?>
<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -17,63 +18,47 @@
limitations under the License.
-->
<configuration>
- <property>
- <name>ssl.server.truststore.location</name>
- <value>/etc/security/serverKeys/all.jks</value>
- <description>Location of the trust store file.</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
- </property>
- <property>
- <name>ssl.server.truststore.type</name>
- <value>jks</value>
- <description>Optional. Default value is "jks".</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
- </property>
- <property>
- <name>ssl.server.truststore.password</name>
- <value>bigdata</value>
- <property-type>PASSWORD</property-type>
- <description>Password to open the trust store file.</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
- </property>
- <property>
- <name>ssl.server.truststore.reload.interval</name>
- <value>10000</value>
- <description>Truststore reload interval, in milliseconds.</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
- </property>
- <property>
- <name>ssl.server.keystore.type</name>
- <value>jks</value>
- <description>Optional. Default value is "jks".</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
- </property>
- <property>
- <name>ssl.server.keystore.location</name>
- <value>/etc/security/serverKeys/keystore.jks</value>
- <description>Location of the keystore file.</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
- </property>
- <property>
- <name>ssl.server.keystore.password</name>
- <value>bigdata</value>
- <property-type>PASSWORD</property-type>
- <description>Password to open the keystore file.</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
- </property>
- <property>
- <name>ssl.server.keystore.keypassword</name>
- <value>bigdata</value>
- <property-type>PASSWORD</property-type>
- <description>Password for private key in keystore file.</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
- </property>
+ <property>
+ <name>ssl.server.truststore.location</name>
+ <value>/etc/security/serverKeys/all.jks</value>
+ <description>Location of the trust store file.</description>
+ </property>
+ <property>
+ <name>ssl.server.truststore.type</name>
+ <value>jks</value>
+ <description>Optional. Default value is "jks".</description>
+ </property>
+ <property>
+ <name>ssl.server.truststore.password</name>
+ <value>bigdata</value>
+ <property-type>PASSWORD</property-type>
+ <description>Password to open the trust store file.</description>
+ </property>
+ <property>
+ <name>ssl.server.truststore.reload.interval</name>
+ <value>10000</value>
+ <description>Truststore reload interval, in milliseconds.</description>
+ </property>
+ <property>
+ <name>ssl.server.keystore.type</name>
+ <value>jks</value>
+ <description>Optional. Default value is "jks".</description>
+ </property>
+ <property>
+ <name>ssl.server.keystore.location</name>
+ <value>/etc/security/serverKeys/keystore.jks</value>
+ <description>Location of the keystore file.</description>
+ </property>
+ <property>
+ <name>ssl.server.keystore.password</name>
+ <value>bigdata</value>
+ <property-type>PASSWORD</property-type>
+ <description>Password to open the keystore file.</description>
+ </property>
+ <property>
+ <name>ssl.server.keystore.keypassword</name>
+ <value>bigdata</value>
+ <property-type>PASSWORD</property-type>
+ <description>Password for private key in keystore file.</description>
+ </property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0aeaa956/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/storm-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/storm-site.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/storm-site.xml
index 01b9be1..b62d34b 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/storm-site.xml
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/storm-site.xml
@@ -19,12 +19,11 @@
* limitations under the License.
*/
-->
+
<configuration supports_final="true">
<property>
<name>metrics.reporter.register</name>
<value>org.apache.hadoop.metrics2.sink.storm.StormTimelineMetricsReporter</value>
<description>Topology metrics reporter.</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0aeaa956/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/application-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/application-properties.xml b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/application-properties.xml
index e7a1c89..ca8e4c5 100644
--- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/application-properties.xml
+++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/application-properties.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0"?>
<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
<!--
/**
@@ -23,247 +22,177 @@
<property>
<name>atlas.graph.storage.backend</name>
<value>berkeleyje</value>
- <description/>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
+ <description></description>
</property>
<property>
<name>atlas.graph.storage.directory</name>
<value>/var/lib/atlas/data/berkeley</value>
- <description/>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
+ <description></description>
</property>
<property>
<name>atlas.graph.index.search.backend</name>
<value>elasticsearch</value>
- <description/>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
+ <description></description>
</property>
<property>
<name>atlas.graph.index.search.directory</name>
<value>/var/lib/atlas/data/es</value>
- <description/>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
+ <description></description>
</property>
<property>
<name>atlas.graph.index.search.elasticsearch.client-only</name>
<value>false</value>
- <description/>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
+ <description></description>
</property>
<property>
<name>atlas.graph.index.search.elasticsearch.local-mode</name>
<value>true</value>
- <description/>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
+ <description></description>
</property>
<property>
<name>atlas.lineage.hive.table.type.name</name>
<value>DataSet</value>
- <description/>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
+ <description></description>
</property>
<property>
<name>atlas.lineage.hive.table.schema.query.hive_table</name>
<value>hive_table where name='%s'\, columns</value>
- <description/>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
+ <description></description>
</property>
<property>
<name>atlas.lineage.hive.table.schema.query.Table</name>
<value>Table where name='%s'\, columns</value>
- <description/>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
+ <description></description>
</property>
<property>
<name>atlas.lineage.hive.process.type.name</name>
<value>Process</value>
- <description/>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
+ <description></description>
</property>
<property>
<name>atlas.lineage.hive.process.inputs.name</name>
<value>inputs</value>
- <description/>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
+ <description></description>
</property>
<property>
<name>atlas.lineage.hive.process.outputs.name</name>
<value>outputs</value>
- <description/>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
+ <description></description>
</property>
<property>
<name>atlas.enableTLS</name>
<value>false</value>
- <description/>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
+ <description></description>
</property>
<property>
<name>atlas.authentication.method</name>
<value>simple</value>
- <description/>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
+ <description></description>
</property>
<property>
<name>atlas.authentication.principal</name>
<value>atlas</value>
- <description/>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
+ <description></description>
</property>
<property>
<name>atlas.authentication.keytab</name>
<value>/etc/security/keytabs/atlas.service.keytab</value>
- <description/>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
+ <description></description>
</property>
<property>
<name>atlas.server.bind.address</name>
<value>localhost</value>
<property-type>DONT_ADD_ON_UPGRADE</property-type>
- <description/>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
+ <description></description>
</property>
<property>
<name>atlas.http.authentication.enabled</name>
<value>false</value>
- <description/>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
+ <description></description>
</property>
<property>
<name>atlas.http.authentication.type</name>
<value>simple</value>
- <description/>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
+ <description></description>
</property>
<property>
<name>atlas.http.authentication.kerberos.principal</name>
<value>HTTP/_HOST@EXAMPLE.COM</value>
- <description/>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
+ <description></description>
</property>
<property>
<name>atlas.http.authentication.kerberos.keytab</name>
<value>/etc/security/keytabs/spnego.service.keytab</value>
- <description/>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
+ <description></description>
</property>
<property>
<name>atlas.http.authentication.kerberos.name.rules</name>
<value>DEFAULT</value>
- <description/>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
+ <description></description>
</property>
<property>
<name>atlas.notification.embedded</name>
<value>false</value>
<description>Indicates whether or not the notification service should be embedded.</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>atlas.cluster.name</name>
<value>{{cluster_name}}</value>
<description>The cluster name.</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>atlas.server.http.port</name>
<value>21000</value>
- <description/>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
+ <description></description>
</property>
<property>
<name>atlas.server.https.port</name>
<value>21443</value>
- <description/>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
+ <description></description>
</property>
<property>
<name>atlas.http.authentication.type</name>
<value>simple</value>
- <description/>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
+ <description></description>
</property>
<property>
<name>atlas.hook.falcon.synchronous</name>
<value>false</value>
- <description/>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
+ <description></description>
</property>
<property>
<name>atlas.hook.falcon.numRetries</name>
<value>3</value>
- <description/>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
+ <description></description>
</property>
<property>
<name>atlas.hook.falcon.minThreads</name>
<value>5</value>
- <description/>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
+ <description></description>
</property>
<property>
<name>atlas.hook.falcon.maxThreads</name>
<value>5</value>
- <description/>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
+ <description></description>
</property>
<property>
<name>atlas.hook.falcon.keepAliveTime</name>
<value>10</value>
- <description/>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
+ <description></description>
</property>
<property>
<name>atlas.hook.falcon.queueSize</name>
<value>1000</value>
- <description/>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
+ <description></description>
</property>
<property>
<name>atlas.audit.hbase.tablename</name>
<value>ATLAS_ENTITY_AUDIT_EVENTS</value>
- <description/>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
+ <description></description>
</property>
<property>
<name>atlas.audit.zookeeper.session.timeout.ms</name>
<value>1000</value>
- <description/>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
+ <description></description>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0aeaa956/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-env.xml b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-env.xml
index 2443d0b..d52d1a3 100644
--- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-env.xml
+++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-env.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0"?>
<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
<!--
/**
@@ -24,15 +23,11 @@
<name>metadata_log_dir</name>
<value>/var/log/atlas</value>
<description>Atlas log directory.</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property require-input="false">
<name>metadata_pid_dir</name>
<value>/var/run/atlas</value>
<description>Atlas pid-file directory.</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>metadata_user</name>
@@ -44,36 +39,26 @@
<type>user</type>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>metadata_opts</name>
<value>-Xmx1024m -Dlog4j.configuration=atlas-log4j.xml</value>
<description>Metadata Server command line options.</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>metadata_classpath</name>
<value> </value>
<description>Metadata Server additional classpath.</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property require-input="false">
<name>metadata_data_dir</name>
<value>/var/lib/atlas/data</value>
<description>Atlas data directory.</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property require-input="false">
<name>metadata_expanded_war_dir</name>
<value>./server/webapp</value>
<description>Atlas expanded WAR directory.</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>metadata_conf_file</name>
@@ -84,9 +69,8 @@
<overridable>false</overridable>
<visible>false</visible>
</value-attributes>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
+
<!-- metadata-env.sh -->
<property>
<name>content</name>
@@ -127,7 +111,5 @@ export METADATA_EXPANDED_WEBAPP_DIR={{expanded_war_dir}}
<value-attributes>
<type>content</type>
</value-attributes>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0aeaa956/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-log4j.xml b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-log4j.xml
index 53950df..12aebb4 100644
--- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-log4j.xml
@@ -19,21 +19,21 @@
* limitations under the License.
*/
-->
+
<configuration supports_adding_forbidden="true">
+
<property>
<name>atlas_log_level</name>
<value>debug</value>
<description>Log level for atlas logging</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
+
<property>
<name>audit_log_level</name>
<value>OFF</value>
<description>Log level for audit logging</description>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
+
<property>
<name>content</name>
<display-name>atlas-log4j template</display-name>
@@ -122,12 +122,12 @@
</root>
</log4j:configuration>
- ]]></value>
+ ]]>
+ </value>
<value-attributes>
<type>content</type>
<show-property-name>false</show-property-name>
</value-attributes>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
+
</configuration>