This is an automated email from the ASF dual-hosted git repository. dsen pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push: new 17d5bd4 [AMBARI-23998] AMS collector RPM configs are empty (dsen) (#1428) 17d5bd4 is described below commit 17d5bd4e6f31370e38ed614a76a5c878fb20eb56 Author: Dmitry Sen <d...@apache.org> AuthorDate: Thu May 31 18:09:52 2018 +0300 [AMBARI-23998] AMS collector RPM configs are empty (dsen) (#1428) --- ambari-metrics/ambari-metrics-assembly/pom.xml | 4 +- .../src/main/assembly/collector.xml | 1 + .../conf/unix/ams-env.sh | 17 + .../conf/unix/ams-site.xml | 360 +++++++++++++++++++++ .../conf/unix/hbase-site.xml | 280 ++++++++++++++++ .../ambari-metrics-timelineservice/pom.xml | 4 +- 6 files changed, 661 insertions(+), 5 deletions(-) diff --git a/ambari-metrics/ambari-metrics-assembly/pom.xml b/ambari-metrics/ambari-metrics-assembly/pom.xml index 12942bb..5e6b2d6 100644 --- a/ambari-metrics/ambari-metrics-assembly/pom.xml +++ b/ambari-metrics/ambari-metrics-assembly/pom.xml @@ -345,7 +345,7 @@ <location>${collector.dir}/conf/unix/amshbase_metrics_whitelist</location> </source> <source> - <location>${collector.dir}/target/embedded/${hbase.folder}/conf/hbase-site.xml</location> + <location>${collector.dir}/conf/unix/hbase-site.xml</location> </source> </sources> </mapping> @@ -911,7 +911,7 @@ </mapper> </data> <data> - <src>${collector.dir}/target/embedded/${hbase.folder}/conf/hbase-site.xml</src> + <src>${collector.dir}/conf/unix/hbase-site.xml</src> <type>file</type> <mapper> <type>perm</type> diff --git a/ambari-metrics/ambari-metrics-assembly/src/main/assembly/collector.xml b/ambari-metrics/ambari-metrics-assembly/src/main/assembly/collector.xml index aab3618..2b94106 100644 --- a/ambari-metrics/ambari-metrics-assembly/src/main/assembly/collector.xml +++ b/ambari-metrics/ambari-metrics-assembly/src/main/assembly/collector.xml @@ -43,6 +43,7 @@ <includes> <include>ams-env.sh</include> <include>ams-site.xml</include> + <include>hbase-site.xml</include> <include>log4j.properties</include> <include>metrics_whitelist</include> <include>amshbase_metrics_whitelist</include> diff --git a/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ams-env.sh b/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ams-env.sh index 9928093..761cc4b5 100644 --- a/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ams-env.sh +++ b/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ams-env.sh @@ -14,3 +14,20 @@ # limitations under the License. # Set environment variables here. +# Collector Log directory for log4j +export AMS_COLLECTOR_LOG_DIR=/tmp + +# Monitor Log directory for outfile +export AMS_MONITOR_LOG_DIR=/tmp + +# Collector pid directory +export AMS_COLLECTOR_PID_DIR=/tmp + +# Monitor pid directory +export AMS_MONITOR_PID_DIR=/tmp + +# AMS HBase pid directory +export AMS_HBASE_PID_DIR=/tmp + +# AMS Collector heapsize +export AMS_COLLECTOR_HEAPSIZE=512m \ No newline at end of file diff --git a/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ams-site.xml b/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ams-site.xml index 41c3220..d815ad2 100644 --- a/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ams-site.xml +++ b/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ams-site.xml @@ -22,4 +22,364 @@ <!-- Site specific AMBARI_METRICS configuration properties --> + <property> + <name>cluster.zookeeper.property.clientPort</name> + <value>2182</value> + </property> + + <property> + <name>cluster.zookeeper.quorum</name> + <value>localhost</value> + </property> + + <property> + <name>failover.strategy</name> + <value>round-robin</value> + </property> + + <property> + <name>phoenix.query.maxGlobalMemoryPercentage</name> + <value>25</value> + </property> + + <property> + <name>phoenix.spool.directory</name> + <value>/tmp</value> + </property> + + <property> + <name>timeline.metrics.aggregator.checkpoint.dir</name> + <value>/var/lib/ambari-metrics-collector/checkpoint</value> + </property> + + <property> + <name>timeline.metrics.aggregators.skip.blockcache.enabled</name> + <value>false</value> + </property> + + <property> + <name>timeline.metrics.cache.commit.interval</name> + <value>10</value> + </property> + + <property> + <name>timeline.metrics.cache.enabled</name> + <value>true</value> + </property> + + <property> + <name>timeline.metrics.cache.size</name> + <value>100</value> + </property> + + <property> + <name>timeline.metrics.cluster.aggregate.splitpoints</name> + <value>jvm.JvmMetrics.ThreadsRunnable</value> + </property> + + <property> + <name>timeline.metrics.cluster.aggregation.sql.filters</name> + <value>sdisk\_%,boottime</value> + </property> + + <property> + <name>timeline.metrics.cluster.aggregator.daily.checkpointCutOffMultiplier</name> + <value>2</value> + </property> + + <property> + <name>timeline.metrics.cluster.aggregator.daily.disabled</name> + <value>false</value> + </property> + + <property> + <name>timeline.metrics.cluster.aggregator.daily.interval</name> + <value>86400</value> + </property> + + <property> + <name>timeline.metrics.cluster.aggregator.daily.ttl</name> + <value>63072000</value> + </property> + + <property> + <name>timeline.metrics.cluster.aggregator.hourly.checkpointCutOffMultiplier</name> + <value>2</value> + </property> + + <property> + <name>timeline.metrics.cluster.aggregator.hourly.disabled</name> + <value>false</value> + </property> + + <property> + <name>timeline.metrics.cluster.aggregator.hourly.interval</name> + <value>3600</value> + </property> + + <property> + <name>timeline.metrics.cluster.aggregator.hourly.ttl</name> + <value>31536000</value> + </property> + + <property> + <name>timeline.metrics.cluster.aggregator.interpolation.enabled</name> + <value>true</value> + </property> + + <property> + <name>timeline.metrics.cluster.aggregator.minute.checkpointCutOffMultiplier</name> + <value>2</value> + </property> + + <property> + <name>timeline.metrics.cluster.aggregator.minute.disabled</name> + <value>false</value> + </property> + + <property> + <name>timeline.metrics.cluster.aggregator.minute.interval</name> + <value>300</value> + </property> + + <property> + <name>timeline.metrics.cluster.aggregator.minute.ttl</name> + <value>2592000</value> + </property> + + <property> + <name>timeline.metrics.cluster.aggregator.second.checkpointCutOffMultiplier</name> + <value>2</value> + </property> + + <property> + <name>timeline.metrics.cluster.aggregator.second.disabled</name> + <value>false</value> + </property> + + <property> + <name>timeline.metrics.cluster.aggregator.second.interval</name> + <value>120</value> + </property> + + <property> + <name>timeline.metrics.cluster.aggregator.second.timeslice.interval</name> + <value>30</value> + </property> + + <property> + <name>timeline.metrics.cluster.aggregator.second.ttl</name> + <value>259200</value> + </property> + + <property> + <name>timeline.metrics.daily.aggregator.minute.interval</name> + <value>86400</value> + </property> + + <property> + <name>timeline.metrics.downsampler.event.metric.patterns</name> + <value>topology\.%</value> + </property> + + <property> + <name>timeline.metrics.downsampler.topn.function</name> + <value>max</value> + </property> + + <property> + <name>timeline.metrics.downsampler.topn.metric.patterns</name> + <value>dfs.NNTopUserOpCounts.windowMs=60000.op=__%.user=%,dfs.NNTopUserOpCounts.windowMs=300000.op=__%.user=%,dfs.NNTopUserOpCounts.windowMs=1500000.op=__%.user=%</value> + </property> + + <property> + <name>timeline.metrics.downsampler.topn.value</name> + <value>10</value> + </property> + + <property> + <name>timeline.metrics.hbase.compression.scheme</name> + <value>SNAPPY</value> + </property> + + <property> + <name>timeline.metrics.hbase.data.block.encoding</name> + <value>FAST_DIFF</value> + </property> + + <property> + <name>timeline.metrics.hbase.init.check.enabled</name> + <value>true</value> + </property> + + <property> + <name>timeline.metrics.host.aggregate.splitpoints</name> + <value>jvm.JvmMetrics.ThreadsRunnable</value> + </property> + + <property> + <name>timeline.metrics.host.aggregator.daily.checkpointCutOffMultiplier</name> + <value>2</value> + </property> + + <property> + <name>timeline.metrics.host.aggregator.daily.disabled</name> + <value>false</value> + </property> + + <property> + <name>timeline.metrics.host.aggregator.daily.ttl</name> + <value>31536000</value> + </property> + + <property> + <name>timeline.metrics.host.aggregator.hourly.checkpointCutOffMultiplier</name> + <value>2</value> + </property> + + <property> + <name>timeline.metrics.host.aggregator.hourly.disabled</name> + <value>false</value> + </property> + + <property> + <name>timeline.metrics.host.aggregator.hourly.interval</name> + <value>3600</value> + </property> + + <property> + <name>timeline.metrics.host.aggregator.hourly.ttl</name> + <value>2592000</value> + </property> + + <property> + <name>timeline.metrics.host.aggregator.minute.checkpointCutOffMultiplier</name> + <value>2</value> + </property> + + <property> + <name>timeline.metrics.host.aggregator.minute.disabled</name> + <value>false</value> + </property> + + <property> + <name>timeline.metrics.host.aggregator.minute.interval</name> + <value>300</value> + </property> + + <property> + <name>timeline.metrics.host.aggregator.minute.ttl</name> + <value>604800</value> + </property> + + <property> + <name>timeline.metrics.host.aggregator.ttl</name> + <value>86400</value> + </property> + + <property> + <name>timeline.metrics.host.inmemory.aggregation</name> + <value>false</value> + </property> + + <property> + <name>timeline.metrics.host.inmemory.aggregation.http.policy</name> + <value>HTTP_ONLY</value> + </property> + + <property> + <name>timeline.metrics.host.inmemory.aggregation.port</name> + <value>61888</value> + </property> + + <property> + <name>timeline.metrics.service.checkpointDelay</name> + <value>60</value> + </property> + + <property> + <name>timeline.metrics.service.cluster.aggregator.appIds</name> + <value>datanode,nodemanager,hbase</value> + </property> + + <property> + <name>timeline.metrics.service.default.result.limit</name> + <value>5760</value> + </property> + + <property> + <name>timeline.metrics.service.handler.thread.count</name> + <value>20</value> + </property> + + <property> + <name>timeline.metrics.service.http.policy</name> + <value>HTTP_ONLY</value> + </property> + + <property> + <name>timeline.metrics.service.metadata.filters</name> + <value>ContainerResource</value> + </property> + + <property> + <name>timeline.metrics.service.operation.mode</name> + <value>embedded</value> + </property> + + <property> + <name>timeline.metrics.service.resultset.fetchSize</name> + <value>2000</value> + </property> + + <property> + <name>timeline.metrics.service.rpc.address</name> + <value>0.0.0.0:60200</value> + </property> + + <property> + <name>timeline.metrics.service.use.groupBy.aggregators</name> + <value>true</value> + </property> + + <property> + <name>timeline.metrics.service.watcher.delay</name> + <value>30</value> + </property> + + <property> + <name>timeline.metrics.service.watcher.disabled</name> + <value>false</value> + </property> + + <property> + <name>timeline.metrics.service.watcher.initial.delay</name> + <value>600</value> + </property> + + <property> + <name>timeline.metrics.service.watcher.timeout</name> + <value>30</value> + </property> + + <property> + <name>timeline.metrics.service.webapp.address</name> + <value>0.0.0.0:6188</value> + </property> + + <property> + <name>timeline.metrics.sink.report.interval</name> + <value>60</value> + </property> + + <property> + <name>timeline.metrics.transient.metric.patterns</name> + <value>topology\.%</value> + </property> + + <property> + <name>timeline.metrics.whitelisting.enabled</name> + <value>false</value> + </property> + </configuration> diff --git a/ambari-metrics/ambari-metrics-timelineservice/conf/unix/hbase-site.xml b/ambari-metrics/ambari-metrics-timelineservice/conf/unix/hbase-site.xml new file mode 100644 index 0000000..c7281c6 --- /dev/null +++ b/ambari-metrics/ambari-metrics-timelineservice/conf/unix/hbase-site.xml @@ -0,0 +1,280 @@ +<?xml version="1.0"?> + +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you under the Apache License, Version 2.0 (the + ~ "License"); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<configuration> + + <!-- Site specific AMS_Hbase configuration properties --> + <property> + <name>dfs.client.read.shortcircuit</name> + <value>true</value> + </property> + + <property> + <name>hbase.client.scanner.caching</name> + <value>10000</value> + </property> + + <property> + <name>hbase.client.scanner.timeout.period</name> + <value>300000</value> + </property> + + <property> + <name>hbase.cluster.distributed</name> + <value>false</value> + </property> + + <property> + <name>hbase.hregion.majorcompaction</name> + <value>0</value> + </property> + + <property> + <name>hbase.hregion.max.filesize</name> + <value>4294967296</value> + </property> + + <property> + <name>hbase.hregion.memstore.block.multiplier</name> + <value>4</value> + </property> + + <property> + <name>hbase.hregion.memstore.flush.size</name> + <value>134217728</value> + </property> + + <property> + <name>hbase.hstore.blockingStoreFiles</name> + <value>200</value> + </property> + + <property> + <name>hbase.hstore.flusher.count</name> + <value>2</value> + </property> + + <property> + <name>hbase.local.dir</name> + <value>${hbase.tmp.dir}/local</value> + </property> + + <property> + <name>hbase.master.info.bindAddress</name> + <value>0.0.0.0</value> + </property> + + <property> + <name>hbase.master.info.port</name> + <value>61310</value> + </property> + + <property> + <name>hbase.master.normalizer.class</name> + <value>org.apache.hadoop.hbase.master.normalizer.SimpleRegionNormalizer</value> + </property> + + <property> + <name>hbase.master.port</name> + <value>61300</value> + </property> + + <property> + <name>hbase.master.wait.on.regionservers.mintostart</name> + <value>1</value> + </property> + + <property> + <name>hbase.normalizer.enabled</name> + <value>false</value> + </property> + + <property> + <name>hbase.normalizer.period</name> + <value>600000</value> + </property> + + <property> + <name>hbase.regionserver.global.memstore.lowerLimit</name> + <value>0.3</value> + </property> + + <property> + <name>hbase.regionserver.global.memstore.upperLimit</name> + <value>0.35</value> + </property> + + <property> + <name>hbase.regionserver.info.port</name> + <value>61330</value> + </property> + + <property> + <name>hbase.regionserver.port</name> + <value>61320</value> + </property> + + <property> + <name>hbase.regionserver.thread.compaction.large</name> + <value>2</value> + </property> + + <property> + <name>hbase.regionserver.thread.compaction.small</name> + <value>3</value> + </property> + + <property> + <name>hbase.replication</name> + <value>false</value> + </property> + + <property> + <name>hbase.rootdir</name> + <value>file:///var/lib/ambari-metrics-collector/hbase</value> + </property> + + <property> + <name>hbase.rpc.timeout</name> + <value>300000</value> + </property> + + <property> + <name>hbase.snapshot.enabled</name> + <value>false</value> + </property> + + <property> + <name>hbase.tmp.dir</name> + <value>/var/lib/ambari-metrics-collector/hbase-tmp</value> + </property> + + <property> + <name>hbase.unsafe.stream.capability.enforce</name> + <value>false</value> + </property> + + <property> + <name>hbase.zookeeper.leaderport</name> + <value>61388</value> + </property> + + <property> + <name>hbase.zookeeper.peerport</name> + <value>61288</value> + </property> + + <property> + <name>hbase.zookeeper.property.clientPort</name> + <value>61181</value> + </property> + + <property> + <name>hbase.zookeeper.property.dataDir</name> + <value>${hbase.tmp.dir}/zookeeper</value> + </property> + + <property> + <name>hbase.zookeeper.property.tickTime</name> + <value>6000</value> + </property> + + <property> + <name>hbase.zookeeper.quorum</name> + <value>localhost</value> + <final>true</final> + </property> + + <property> + <name>hfile.block.cache.size</name> + <value>0.3</value> + </property> + + <property> + <name>phoenix.coprocessor.maxMetaDataCacheSize</name> + <value>20480000</value> + </property> + + <property> + <name>phoenix.coprocessor.maxServerCacheTimeToLiveMs</name> + <value>60000</value> + </property> + + <property> + <name>phoenix.groupby.maxCacheSize</name> + <value>307200000</value> + </property> + + <property> + <name>phoenix.mutate.batchSize</name> + <value>10000</value> + </property> + + <property> + <name>phoenix.query.keepAliveMs</name> + <value>300000</value> + </property> + + <property> + <name>phoenix.query.maxGlobalMemoryPercentage</name> + <value>25</value> + </property> + + <property> + <name>phoenix.query.rowKeyOrderSaltedTable</name> + <value>true</value> + </property> + + <property> + <name>phoenix.query.spoolThresholdBytes</name> + <value>20971520</value> + </property> + + <property> + <name>phoenix.query.timeoutMs</name> + <value>300000</value> + </property> + + <property> + <name>phoenix.sequence.saltBuckets</name> + <value>2</value> + </property> + + <property> + <name>phoenix.spool.directory</name> + <value>/tmp</value> + </property> + + <property> + <name>zookeeper.session.timeout</name> + <value>120000</value> + </property> + + <property> + <name>zookeeper.session.timeout.localHBaseCluster</name> + <value>120000</value> + </property> + + <property> + <name>zookeeper.znode.parent</name> + <value>/ams-hbase-unsecure</value> + </property> + +</configuration> \ No newline at end of file diff --git a/ambari-metrics/ambari-metrics-timelineservice/pom.xml b/ambari-metrics/ambari-metrics-timelineservice/pom.xml index b7434bc..1de497f 100644 --- a/ambari-metrics/ambari-metrics-timelineservice/pom.xml +++ b/ambari-metrics/ambari-metrics-timelineservice/pom.xml @@ -217,9 +217,7 @@ <location>conf/unix/amshbase_metrics_whitelist</location> </source> <source> - <location> - target/embedded/${hbase.folder}/conf/hbase-site.xml - </location> + <location>conf/unix/hbase-site.xml</location> </source> </sources> </mapping> -- To stop receiving notification emails like this one, please contact d...@apache.org.