Repository: ambari Updated Branches: refs/heads/trunk 3ff0ddc66 -> 7cb58ff2b
AMBARI-17181 : Add some of value-attributes to property files in AMBARI_METRICS (Masahiro Tanaka via avijayan) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7cb58ff2 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7cb58ff2 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7cb58ff2 Branch: refs/heads/trunk Commit: 7cb58ff2b18a628c2b4f5f24bdc558f3b5f60a20 Parents: 3ff0ddc Author: Aravindan Vijayan <[email protected]> Authored: Thu Jun 30 11:36:14 2016 -0700 Committer: Aravindan Vijayan <[email protected]> Committed: Thu Jun 30 11:36:14 2016 -0700 ---------------------------------------------------------------------- .../0.1.0/configuration/ams-grafana-env.xml | 9 ++ .../0.1.0/configuration/ams-grafana-ini.xml | 3 + .../0.1.0/configuration/ams-hbase-env.xml | 9 +- .../0.1.0/configuration/ams-hbase-site.xml | 117 ++++++++++++++++++- .../0.1.0/configuration/ams-site.xml | 67 +++++++++++ .../0.1.0/configuration/ams-ssl-server.xml | 4 + 6 files changed, 204 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/7cb58ff2/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 eaafc6b..b05d73b 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 @@ -23,6 +23,9 @@ <value>/var/log/ambari-metrics-grafana</value> <display-name>Metrics Grafana log dir</display-name> <description>Metrics Grafana log directory.</description> + <value-attributes> + <type>directory</type> + </value-attributes> <on-ambari-upgrade add="true"/> </property> <property> @@ -30,6 +33,9 @@ <value>/var/run/ambari-metrics-grafana</value> <display-name>Metrics Grafana pid dir</display-name> <description>Metrics Grafana pid directory.</description> + <value-attributes> + <type>directory</type> + </value-attributes> <on-ambari-upgrade add="true"/> </property> <property> @@ -37,6 +43,9 @@ <value>/var/lib/ambari-metrics-grafana</value> <display-name>Metrics Grafana data dir</display-name> <description>Metrics Grafana data directory.</description> + <value-attributes> + <type>directory</type> + </value-attributes> <on-ambari-upgrade add="true"/> </property> <property> http://git-wip-us.apache.org/repos/asf/ambari/blob/7cb58ff2/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 da4599e..acbdf12 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 @@ -22,6 +22,9 @@ <name>port</name> <value>3000</value> <description>The http port to use</description> + <value-attributes> + <type>int</type> + </value-attributes> <on-ambari-upgrade add="true"/> </property> <property> http://git-wip-us.apache.org/repos/asf/ambari/blob/7cb58ff2/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 3ce1af2..b4eecec 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 @@ -24,15 +24,15 @@ <name>hbase_log_dir</name> <value>/var/log/ambari-metrics-collector</value> <description>Log Directories for HBase.</description> + <value-attributes> + <type>directory</type> + </value-attributes> <depends-on> <property> <type>ams-env</type> <name>metrics_collector_log_dir</name> </property> </depends-on> - <value-attributes> - <type>directory</type> - </value-attributes> <on-ambari-upgrade add="true"/> </property> <property> @@ -155,6 +155,9 @@ <description> The maximum number of open file descriptors by process </description> + <value-attributes> + <type>int</type> + </value-attributes> <on-ambari-upgrade add="true"/> </property> <property> http://git-wip-us.apache.org/repos/asf/ambari/blob/7cb58ff2/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 a7d8228..f5b0cc9 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 @@ -84,6 +84,9 @@ <description> Ensure that HBase Master waits for # many region server to start. </description> + <value-attributes> + <type>int</type> + </value-attributes> <on-ambari-upgrade add="true"/> </property> <property> @@ -109,24 +112,36 @@ <name>hbase.master.info.port</name> <value>61310</value> <description>The port for the HBase Master web UI.</description> + <value-attributes> + <type>int</type> + </value-attributes> <on-ambari-upgrade add="true"/> </property> <property> <name>hbase.regionserver.info.port</name> <value>61330</value> <description>The port for the HBase RegionServer web UI.</description> + <value-attributes> + <type>int</type> + </value-attributes> <on-ambari-upgrade add="true"/> </property> <property> <name>hbase.master.port</name> <value>61300</value> <description>The port for the HBase Master web UI.</description> + <value-attributes> + <type>int</type> + </value-attributes> <on-ambari-upgrade add="true"/> </property> <property> <name>hbase.regionserver.port</name> <value>61320</value> <description>The port for the HBase RegionServer web UI.</description> + <value-attributes> + <type>int</type> + </value-attributes> <on-ambari-upgrade add="true"/> </property> <property> @@ -137,6 +152,10 @@ HStoreFiles in a region. 0 to disable automated major compactions. </description> + <value-attributes> + <type>int</type> + <unit>ms</unit> + </value-attributes> <on-ambari-upgrade add="true"/> </property> <property> @@ -146,6 +165,10 @@ Threshold size in bytes after which results from parallelly executed query results are spooled to disk. Default is 20 mb. </description> + <value-attributes> + <type>int</type> + <unit>Bytes</unit> + </value-attributes> <on-ambari-upgrade add="true"/> </property> <property> @@ -164,6 +187,10 @@ Number of rows that will be fetched when calling next on a scanner if it is not served from (local, client) memory. </description> + <value-attributes> + <type>int</type> + <unit>rows</unit> + </value-attributes> <on-ambari-upgrade add="true"/> </property> <property> @@ -177,6 +204,10 @@ <name>hbase.normalizer.period</name> <value>600000</value> <description>Period in ms at which the region normalizer runs in the Master.</description> + <value-attributes> + <type>int</type> + <unit>ms</unit> + </value-attributes> <on-ambari-upgrade add="true"/> </property> <property> @@ -223,8 +254,12 @@ <name>phoenix.groupby.maxCacheSize</name> <value>307200000</value> <description> - Size in bytes of pages cached during GROUP BY spilling. Default is 100Mb. + Size in bytes of pages cached during GROUP BY spilling. Default is 300Mb. </description> + <value-attributes> + <type>int</type> + <unit>Bytes</unit> + </value-attributes> <on-ambari-upgrade add="true"/> </property> <property> @@ -232,8 +267,12 @@ <value>4294967296</value> <description> Maximum HFile size. If the sum of the sizes of a region’s HFiles has grown - to exceed this value, the region is split in two. Default is 10Gb. + to exceed this value, the region is split in two. Default is 40Gb. </description> + <value-attributes> + <type>int</type> + <unit>Bytes</unit> + </value-attributes> <on-ambari-upgrade add="true"/> </property> <property> @@ -244,6 +283,9 @@ times hbase.hregion.memstore.flush.size bytes. Useful preventing runaway memstore during spikes in update traffic. </description> + <value-attributes> + <type>int</type> + </value-attributes> <on-ambari-upgrade add="true"/> </property> <property> @@ -254,6 +296,9 @@ will be queued. With more threads, the flushes will be executed in parallel, increasing the load on HDFS, and potentially causing more compactions. </description> + <value-attributes> + <type>int</type> + </value-attributes> <on-ambari-upgrade add="true"/> </property> <property> @@ -263,6 +308,10 @@ Number of milliseconds after which a query will timeout on the client. Default is 5 min. </description> + <value-attributes> + <type>int</type> + <unit>ms</unit> + </value-attributes> <on-ambari-upgrade add="true"/> </property> <property> @@ -272,6 +321,10 @@ Number of milliseconds after which a query will keep the connection to HBase alive. Default is 5 min. </description> + <value-attributes> + <type>int</type> + <unit>ms</unit> + </value-attributes> <on-ambari-upgrade add="true"/> </property> <property> @@ -280,6 +333,10 @@ <description> Client scanner lease period in milliseconds. </description> + <value-attributes> + <type>int</type> + <unit>ms</unit> + </value-attributes> <on-ambari-upgrade add="true"/> </property> <property> @@ -290,6 +347,10 @@ take for a remote call to time out. It uses pings to check connections but will eventually throw a TimeoutException. </description> + <value-attributes> + <type>int</type> + <unit>ms</unit> + </value-attributes> <display-name>HBase RPC Timeout</display-name> <on-ambari-upgrade add="true"/> </property> @@ -299,6 +360,9 @@ <description> Configuration key for the large compaction threads. </description> + <value-attributes> + <type>int</type> + </value-attributes> <on-ambari-upgrade add="true"/> </property> <property> @@ -307,11 +371,17 @@ <description> Configuration key for the small compaction threads. </description> + <value-attributes> + <type>int</type> + </value-attributes> <on-ambari-upgrade add="true"/> </property> <property> <name>hbase.zookeeper.property.clientPort</name> <value>{{zookeeper_clientPort}}</value> + <value-attributes> + <type>int</type> + </value-attributes> <depends-on> <property> <type>zoo.cfg</type> @@ -327,11 +397,17 @@ <property> <name>hbase.zookeeper.peerport</name> <value>61288</value> + <value-attributes> + <type>int</type> + </value-attributes> <on-ambari-upgrade add="true"/> </property> <property> <name>hbase.zookeeper.leaderport</name> <value>61388</value> + <value-attributes> + <type>int</type> + </value-attributes> <on-ambari-upgrade add="true"/> </property> <property> @@ -343,6 +419,9 @@ this region until a compaction is completed, or until hbase.hstore.blockingWaitTime has been exceeded. </description> + <value-attributes> + <type>int</type> + </value-attributes> <on-ambari-upgrade add="true"/> </property> <property> @@ -353,6 +432,10 @@ number of bytes. Value is checked by a thread that runs every hbase.server.thread.wakefrequency. </description> + <value-attributes> + <type>int</type> + <unit>Bytes</unit> + </value-attributes> <on-ambari-upgrade add="true"/> </property> <property> @@ -375,12 +458,20 @@ ZooKeeper, as measured in milliseconds. This property setting only affects the ZK server started by AMS in embedded mode. Unit = ms. </description> + <value-attributes> + <type>int</type> + <unit>ms</unit> + </value-attributes> <on-ambari-upgrade add="true"/> </property> <property> <name>zookeeper.session.timeout</name> <value>120000</value> <description>ZooKeeper session timeout in milliseconds.</description> + <value-attributes> + <type>int</type> + <unit>ms</unit> + </value-attributes> <on-ambari-upgrade add="true"/> </property> <property> @@ -390,6 +481,10 @@ ZooKeeper session timeout in milliseconds for pseudo distributed mode. </description> + <value-attributes> + <type>int</type> + <unit>ms</unit> + </value-attributes> <on-ambari-upgrade add="true"/> </property> <property> @@ -398,6 +493,9 @@ <description> Controls the number of pre-allocated regions for SYSTEM.SEQUENCE table. </description> + <value-attributes> + <type>int</type> + </value-attributes> <on-ambari-upgrade add="true"/> </property> <property> @@ -426,6 +524,10 @@ during the execution of an UPSERT SELECT or DELETE statement. This affects performance of group by aggregators if they are being used. </description> + <value-attributes> + <type>int</type> + <unit>rows</unit> + </value-attributes> <on-ambari-upgrade add="true"/> </property> <property> @@ -450,6 +552,10 @@ “Earlier hash cache(s) might have expired on servers” might also be a sign that this number should be increased. </description> + <value-attributes> + <type>int</type> + <unit>ms</unit> + </value-attributes> <on-ambari-upgrade add="true"/> </property> <property> @@ -460,6 +566,10 @@ evictions will begin to occur based on least recent access time. Default is 20Mb </description> + <value-attributes> + <type>int</type> + <unit>Bytes</unit> + </value-attributes> <on-ambari-upgrade add="true"/> </property> <property> @@ -484,6 +594,9 @@ <property> <name>zookeeper.znode.parent</name> <value>/ams-hbase-unsecure</value> + <value-attributes> + <type>directory</type> + </value-attributes> <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/7cb58ff2/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 6484285..871e571 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 @@ -71,6 +71,7 @@ </description> <value-attributes> <type>int</type> + <unit>s</unit> </value-attributes> <on-ambari-upgrade add="true"/> </property> @@ -84,6 +85,7 @@ </description> <value-attributes> <type>int</type> + <unit>s</unit> </value-attributes> <on-ambari-upgrade add="true"/> </property> @@ -94,6 +96,10 @@ Time in seconds to sleep for the day resolution host based aggregator. Default resolution is 24 hours. </description> + <value-attributes> + <type>int</type> + <unit>s</unit> + </value-attributes> <on-ambari-upgrade add="true"/> </property> <property> @@ -106,6 +112,7 @@ </description> <value-attributes> <type>int</type> + <unit>s</unit> </value-attributes> <on-ambari-upgrade add="true"/> </property> @@ -116,6 +123,10 @@ Time in seconds to sleep for the day resolution cluster wide aggregator. Default is 24 hours. </description> + <value-attributes> + <type>int</type> + <unit>s</unit> + </value-attributes> <on-ambari-upgrade add="true"/> </property> <property> @@ -128,6 +139,7 @@ </description> <value-attributes> <type>int</type> + <unit>s</unit> </value-attributes> <on-ambari-upgrade add="true"/> </property> @@ -141,6 +153,7 @@ </description> <value-attributes> <type>int</type> + <unit>s</unit> </value-attributes> <on-ambari-upgrade add="true"/> </property> @@ -304,6 +317,7 @@ </description> <value-attributes> <type>int</type> + <unit>s</unit> </value-attributes> <on-ambari-upgrade add="true"/> </property> @@ -313,6 +327,10 @@ <description> Host based daily resolution data purge interval in seconds. Default is 1 year. </description> + <value-attributes> + <type>int</type> + <unit>s</unit> + </value-attributes> <on-ambari-upgrade add="true"/> </property> <property> @@ -321,6 +339,10 @@ <description> Host based hourly resolution data purge interval in seconds. Default is 30 days. </description> + <value-attributes> + <type>int</type> + <unit>s</unit> + </value-attributes> <on-ambari-upgrade add="true"/> </property> <property> @@ -329,6 +351,10 @@ <description> Host based minute resolution data purge interval in seconds. Default is 7 days. </description> + <value-attributes> + <type>int</type> + <unit>s</unit> + </value-attributes> <on-ambari-upgrade add="true"/> </property> <property> @@ -337,6 +363,10 @@ <description> Cluster wide second resolution data purge interval in seconds. Default is 7 days. </description> + <value-attributes> + <type>int</type> + <unit>s</unit> + </value-attributes> <on-ambari-upgrade add="true"/> </property> <property> @@ -345,6 +375,10 @@ <description> Cluster wide minute resolution data purge interval in seconds. Default is 30 days. </description> + <value-attributes> + <type>int</type> + <unit>s</unit> + </value-attributes> <on-ambari-upgrade add="true"/> </property> <property> @@ -353,6 +387,10 @@ <description> Cluster wide hourly resolution data purge interval in seconds. Default is 1 year. </description> + <value-attributes> + <type>int</type> + <unit>s</unit> + </value-attributes> <on-ambari-upgrade add="true"/> </property> <property> @@ -369,6 +407,10 @@ <description> 1 minute resolution data purge interval in seconds. Default is 1 day for embedded mode and 3 days for Distributed mode. </description> + <value-attributes> + <type>int</type> + <unit>s</unit> + </value-attributes> <depends-on> <property> <type>ams-site</type> @@ -420,6 +462,7 @@ </description> <value-attributes> <type>int</type> + <unit>s</unit> </value-attributes> <on-ambari-upgrade add="true"/> </property> @@ -443,6 +486,9 @@ Percentage of total heap memory (i.e. Runtime.getRuntime().maxMemory()) that all threads may use. </description> + <value-attributes> + <type>int</type> + </value-attributes> <on-ambari-upgrade add="true"/> </property> <property> @@ -536,6 +582,10 @@ Time in seconds to sleep before report metrics to collector. Default resolution is 1 minute. </description> + <value-attributes> + <type>int</type> + <unit>s</unit> + </value-attributes> <on-ambari-upgrade add="true"/> </property> <property> @@ -567,6 +617,10 @@ The time to delay first watcher check execution Default resolution is 10 minutes. </description> + <value-attributes> + <type>int</type> + <unit>s</unit> + </value-attributes> <on-ambari-upgrade add="true"/> </property> <property> @@ -577,6 +631,10 @@ watcher check execution and the commencement of the next Default resolution is 30 seconds. </description> + <value-attributes> + <type>int</type> + <unit>s</unit> + </value-attributes> <on-ambari-upgrade add="true"/> </property> <property> @@ -586,6 +644,10 @@ The maximum time to wait for a single watcher check execution Default resolution is 30 seconds. </description> + <value-attributes> + <type>int</type> + <unit>s</unit> + </value-attributes> <on-ambari-upgrade add="true"/> </property> <property> @@ -613,6 +675,7 @@ </description> <value-attributes> <type>int</type> + <unit>s</unit> </value-attributes> <on-ambari-upgrade add="true"/> </property> @@ -622,6 +685,10 @@ <description> Size of array blocking queue used to cache metrics </description> + <value-attributes> + <type>int</type> + <unit>Bytes</unit> + </value-attributes> <on-ambari-upgrade add="true"/> </property> <property> http://git-wip-us.apache.org/repos/asf/ambari/blob/7cb58ff2/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 6f9c6dc..9805619 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 @@ -39,6 +39,10 @@ <property> <name>ssl.server.truststore.reload.interval</name> <value>10000</value> + <value-attributes> + <type>int</type> + <unit>ms</unit> + </value-attributes> <description>Truststore reload interval, in milliseconds.</description> <on-ambari-upgrade add="true"/> </property>
