AMBARI-21664. HDFS namenode rpc and connection load metrics are not showing. 
(swagle)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0aab3803
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0aab3803
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0aab3803

Branch: refs/heads/branch-2.6
Commit: 0aab38034f66153adacf2d3627d36caf18cfc1a0
Parents: 2533644
Author: Siddharth Wagle <swa...@hortonworks.com>
Authored: Mon Aug 7 15:46:11 2017 -0700
Committer: Siddharth Wagle <swa...@hortonworks.com>
Committed: Mon Aug 7 15:46:11 2017 -0700

----------------------------------------------------------------------
 .../4.2/services/AMBARI_METRICS/alerts.json     |  158 --
 .../AMBARI_METRICS/configuration/ams-env.xml    |  114 -
 .../configuration/ams-grafana-env.xml           |   93 -
 .../configuration/ams-grafana-ini.xml           |  320 ---
 .../configuration/ams-hbase-env.xml             |  245 --
 .../configuration/ams-hbase-log4j.xml           |  147 --
 .../configuration/ams-hbase-policy.xml          |   56 -
 .../configuration/ams-hbase-security-site.xml   |  167 --
 .../configuration/ams-hbase-site.xml            |  489 ----
 .../AMBARI_METRICS/configuration/ams-log4j.xml  |   66 -
 .../configuration/ams-logsearch-conf.xml        |  201 --
 .../AMBARI_METRICS/configuration/ams-site.xml   |  723 -----
 .../configuration/ams-ssl-client.xml            |   51 -
 .../configuration/ams-ssl-server.xml            |   80 -
 .../4.2/services/AMBARI_METRICS/kerberos.json   |  122 -
 .../4.2/services/AMBARI_METRICS/metainfo.xml    |  156 +-
 .../4.2/services/AMBARI_METRICS/metrics.json    | 2472 ------------------
 .../alerts/alert_ambari_metrics_monitor.py      |  104 -
 .../package/files/hbaseSmokeVerify.sh           |   34 -
 .../files/service-metrics/AMBARI_METRICS.txt    |  245 --
 .../package/files/service-metrics/FLUME.txt     |   17 -
 .../package/files/service-metrics/HBASE.txt     |  588 -----
 .../package/files/service-metrics/HDFS.txt      |  277 --
 .../package/files/service-metrics/HOST.txt      |   37 -
 .../package/files/service-metrics/KAFKA.txt     |  190 --
 .../package/files/service-metrics/STORM.txt     |    7 -
 .../package/files/service-metrics/YARN.txt      |  178 --
 .../AMBARI_METRICS/package/scripts/__init__.py  |   19 -
 .../AMBARI_METRICS/package/scripts/ams.py       |  388 ---
 .../package/scripts/ams_service.py              |  103 -
 .../AMBARI_METRICS/package/scripts/functions.py |   51 -
 .../AMBARI_METRICS/package/scripts/hbase.py     |  267 --
 .../package/scripts/hbase_master.py             |   70 -
 .../package/scripts/hbase_regionserver.py       |   66 -
 .../package/scripts/hbase_service.py            |   53 -
 .../package/scripts/metrics_collector.py        |  133 -
 .../package/scripts/metrics_monitor.py          |   59 -
 .../AMBARI_METRICS/package/scripts/params.py    |  257 --
 .../package/scripts/params_linux.py             |   50 -
 .../package/scripts/params_windows.py           |   53 -
 .../package/scripts/service_check.py            |  166 --
 .../package/scripts/service_mapping.py          |   22 -
 .../package/scripts/split_points.py             |  236 --
 .../AMBARI_METRICS/package/scripts/status.py    |   46 -
 .../package/scripts/status_params.py            |   39 -
 .../package/templates/ams.conf.j2               |   35 -
 .../templates/ams_collector_jaas.conf.j2        |   26 -
 .../templates/ams_zookeeper_jaas.conf.j2        |   26 -
 .../hadoop-metrics2-hbase.properties.j2         |   63 -
 .../package/templates/hbase_client_jaas.conf.j2 |   23 -
 .../templates/hbase_grant_permissions.j2        |   39 -
 .../package/templates/hbase_master_jaas.conf.j2 |   26 -
 .../templates/hbase_regionserver_jaas.conf.j2   |   26 -
 .../package/templates/metric_groups.conf.j2     |   37 -
 .../package/templates/metric_monitor.ini.j2     |   31 -
 .../package/templates/regionservers.j2          |   20 -
 .../package/templates/smoketest_metrics.json.j2 |   15 -
 .../BigInsights/4.2/services/HDFS/widgets.json  |  209 +-
 .../2.0.6/hooks/before-START/scripts/params.py  |   10 +-
 59 files changed, 145 insertions(+), 9856 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/0aab3803/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/alerts.json
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/alerts.json
 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/alerts.json
deleted file mode 100755
index 90401e6..0000000
--- 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/alerts.json
+++ /dev/null
@@ -1,158 +0,0 @@
-{
-  "AMBARI_METRICS": {
-    "service": [
-      {
-        "name": "metrics_monitor_process_percent",
-        "label": "Percent Metrics Monitors Available",
-        "description": "This alert is triggered if a percentage of Metrics 
Monitor processes are not up and listening on the network for the configured 
warning and critical thresholds.",
-        "interval": 1,
-        "scope": "SERVICE",
-        "enabled": true,
-        "source": {
-          "type": "AGGREGATE",
-          "alert_name": "ams_metrics_monitor_process",
-          "reporting": {
-            "ok": {
-              "text": "affected: [{1}], total: [{0}]"
-            },
-            "warning": {
-              "text": "affected: [{1}], total: [{0}]",
-              "value": 0.1
-            },
-            "critical": {
-              "text": "affected: [{1}], total: [{0}]",
-              "value": 0.3
-            }
-          }
-        }
-      }
-    ],
-    "METRICS_COLLECTOR": [
-      {
-        "name": "ams_metrics_collector_autostart",
-        "label": "Metrics Collector - Auto-Restart Status",
-        "description": "This alert is triggered if the Metrics Collector has 
been restarted automatically too frequently in last one hour. By default, a 
Warning alert is triggered if restarted twice in one hour and a Critical alert 
is triggered if restarted 4 or more times in one hour.",
-        "interval": 1,
-        "scope": "ANY",
-        "enabled": true,
-        "source": {
-          "type": "RECOVERY",
-          "reporting": {
-            "ok": {
-              "text": "Metrics Collector has not been auto-started and is 
running normally{0}."
-            },
-            "warning": {
-              "text": "Metrics Collector has been auto-started {1} times{0}.",
-              "count": 2
-            },
-            "critical": {
-              "text": "Metrics Collector has been auto-started {1} times{0}.",
-              "count": 4
-            }
-          }
-        }
-      },
-      {
-        "name": "ams_metrics_collector_process",
-        "label": "Metrics Collector Process",
-        "description": "This alert is triggered if the Metrics Collector 
cannot be confirmed to be up and listening on the configured port for number of 
seconds equal to threshold.",
-        "interval": 1,
-        "scope": "ANY",
-        "enabled": true,
-        "source": {
-          "type": "PORT",
-          "uri": "{{ams-site/timeline.metrics.service.webapp.address}}",
-          "default_port": 6188,
-          "reporting": {
-            "ok": {
-              "text": "TCP OK - {0:.3f}s response on port {1}"
-            },
-            "warning": {
-              "text": "TCP OK - {0:.3f}s response on port {1}",
-              "value": 1.5
-            },
-            "critical": {
-              "text": "Connection failed: {0} to {1}:{2}",
-              "value": 5.0
-            }
-          }
-        }
-      },
-      {
-        "name": "ams_metrics_collector_hbase_master_process",
-        "label": "Metrics Collector - HBase Master Process",
-        "description": "This alert is triggered if the Metrics Collector's 
HBase master processes cannot be confirmed to be up and listening on the 
network for the configured critical threshold, given in seconds.",
-        "interval": 1,
-        "scope": "ANY",
-        "source": {
-          "type": "PORT",
-          "uri": "{{ams-hbase-site/hbase.master.info.port}}",
-          "default_port": 61310,
-          "reporting": {
-            "ok": {
-              "text": "TCP OK - {0:.3f}s response on port {1}"
-            },
-            "warning": {
-              "text": "TCP OK - {0:.3f}s response on port {1}",
-              "value": 1.5
-            },
-            "critical": {
-              "text": "Connection failed: {0} to {1}:{2}",
-              "value": 5.0
-            }
-          }
-        }
-      },
-      {
-        "name": "ams_metrics_collector_hbase_master_cpu",
-        "label": "Metrics Collector - HBase Master CPU Utilization",
-        "description": "This host-level alert is triggered if CPU utilization 
of the Metrics Collector's HBase Master exceeds certain warning and critical 
thresholds. It checks the HBase Master JMX Servlet for the SystemCPULoad 
property. The threshold values are in percent.",
-        "interval": 5,
-        "scope": "ANY",
-        "enabled": true,
-        "source": {
-          "type": "METRIC",
-          "uri": {
-            "http": "{{ams-hbase-site/hbase.master.info.port}}",
-            "default_port": 61310,
-            "connection_timeout": 5.0
-          },
-          "reporting": {
-            "ok": {
-              "text": "{1} CPU, load {0:.1%}"
-            },
-            "warning": {
-              "text": "{1} CPU, load {0:.1%}",
-              "value": 200
-            },
-            "critical": {
-              "text": "{1} CPU, load {0:.1%}",
-              "value": 250
-            },
-            "units" : "%"
-          },
-          "jmx": {
-            "property_list": [
-              "java.lang:type=OperatingSystem/SystemCpuLoad",
-              "java.lang:type=OperatingSystem/AvailableProcessors"
-            ],
-            "value": "{0} * 100"
-          }
-        }
-      }
-    ],
-    "METRICS_MONITOR": [
-      {
-        "name": "ams_metrics_monitor_process",
-        "label": "Metrics Monitor Status",
-        "description": "This alert indicates the status of the Metrics Monitor 
process as determined by the monitor status script.",
-        "interval": 1,
-        "scope": "ANY",
-        "source": {
-          "type": "SCRIPT",
-          "path": 
"BigInsights/4.2/services/AMBARI_METRICS/package/alerts/alert_ambari_metrics_monitor.py"
-        }
-      }
-    ]
-  }
-}

http://git-wip-us.apache.org/repos/asf/ambari/blob/0aab3803/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-env.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-env.xml
 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-env.xml
deleted file mode 100755
index 45f9880..0000000
--- 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-env.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?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 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 supports_do_not_extend="true">
-  <property>
-    <name>ambari_metrics_user</name>
-    <display-name>Ambari Metrics User</display-name>
-    <value>ams</value>
-    <on-ambari-upgrade add="true"/>
-    <property-type>USER</property-type>
-    <description>Ambari Metrics User Name.</description>
-  </property>
-  <property>
-    <name>metrics_collector_log_dir</name>
-    <value>/var/log/ambari-metrics-collector</value>
-    <display-name>Metrics Collector log dir</display-name>
-    <description>Collector log directory.</description>
-    <on-ambari-upgrade add="true"/>
-  </property>
-  <property>
-    <name>metrics_collector_pid_dir</name>
-    <value>/var/run/ambari-metrics-collector</value>
-    <display-name>Metrics Collector pid dir</display-name>
-    <description>Collector pid directory.</description>
-    <on-ambari-upgrade add="true"/>
-  </property>
-  <property>
-    <name>metrics_monitor_pid_dir</name>
-    <value>/var/run/ambari-metrics-monitor</value>
-    <display-name>Metrics Monitor pid dir</display-name>
-    <description>Monitor pid directory.</description>
-    <on-ambari-upgrade add="true"/>
-  </property>
-  <property>
-    <name>metrics_monitor_log_dir</name>
-    <value>/var/log/ambari-metrics-monitor</value>
-    <display-name>Metrics Monitor log dir</display-name>
-    <description>Monitor log directory.</description>
-    <on-ambari-upgrade add="true"/>
-  </property>
-  <property>
-    <name>metrics_collector_heapsize</name>
-    <value>512</value>
-    <description>Metrics Collector Heap Size</description>
-    <on-ambari-upgrade add="true"/>
-    <value-attributes>
-      <type>int</type>
-      <unit>MB</unit>
-    </value-attributes>
-  </property>
-  <property>
-    <name>content</name>
-    <value>
-# Set environment variables here.
-
-# The java implementation to use. Java 1.6 required.
-export JAVA_HOME={{java64_home}}
-
-# Collector Log directory for log4j
-export AMS_COLLECTOR_LOG_DIR={{ams_collector_log_dir}}
-
-# Monitor Log directory for outfile
-export AMS_MONITOR_LOG_DIR={{ams_monitor_log_dir}}
-
-# Collector pid directory
-export AMS_COLLECTOR_PID_DIR={{ams_collector_pid_dir}}
-
-# Monitor pid directory
-export AMS_MONITOR_PID_DIR={{ams_monitor_pid_dir}}
-
-# AMS HBase pid directory
-export AMS_HBASE_PID_DIR={{hbase_pid_dir}}
-
-# AMS Collector heapsize
-export AMS_COLLECTOR_HEAPSIZE={{metrics_collector_heapsize}}
-
-# HBase normalizer enabled
-export AMS_HBASE_NORMALIZER_ENABLED={{ams_hbase_normalizer_enabled}}
-
-# HBase compaction policy enabled
-export AMS_HBASE_FIFO_COMPACTION_ENABLED={{ams_hbase_fifo_compaction_enabled}}
-
-# AMS Collector options
-export 
AMS_COLLECTOR_OPTS="-Djava.library.path=/usr/lib/ams-hbase/lib/hadoop-native"
-{% if security_enabled %}
-export AMS_COLLECTOR_OPTS="$AMS_COLLECTOR_OPTS 
-Djava.security.auth.login.config={{ams_collector_jaas_config_file}} 
-Dzookeeper.sasl.client.username={{zk_servicename}}"
-{% endif %}
-
-# AMS Collector GC options
-export AMS_COLLECTOR_GC_OPTS="-XX:+UseConcMarkSweepGC -verbose:gc 
-XX:+PrintGCDetails -XX:+PrintGCDateStamps 
-Xloggc:{{ams_collector_log_dir}}/collector-gc.log-`date +'%Y%m%d%H%M'`"
-export AMS_COLLECTOR_OPTS="$AMS_COLLECTOR_OPTS $AMS_COLLECTOR_GC_OPTS"
-
-    </value>
-    <on-ambari-upgrade add="true"/>
-  </property>
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0aab3803/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-grafana-env.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-grafana-env.xml
 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-grafana-env.xml
deleted file mode 100644
index eaafc6b..0000000
--- 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-grafana-env.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?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 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>
-  <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"/>
-  </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"/>
-  </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"/>
-  </property>
-  <property>
-    <name>metrics_grafana_username</name>
-    <value>admin</value>
-    <display-name>Grafana Admin Username</display-name>
-    <description>
-      Metrics Grafana Username. This value cannot be modified by Ambari
-      except on initial install. Please make sure the username change in
-      Grafana is reflected in Ambari.
-    </description>
-    <value-attributes>
-      <type>db_user</type>
-      <overridable>false</overridable>
-    </value-attributes>
-    <on-ambari-upgrade add="true"/>
-  </property>
-  <property require-input="true">
-    <name>metrics_grafana_password</name>
-    <value/>
-    <property-type>PASSWORD</property-type>
-    <display-name>Grafana Admin Password</display-name>
-    <description>
-      Metrics Grafana password. This value cannot be modified by Ambari
-      except on initial install. Please make sure the password change in
-      Grafana is reflected back in Ambari.
-    </description>
-    <value-attributes>
-      <overridable>false</overridable>
-      <type>password</type>
-    </value-attributes>
-    <on-ambari-upgrade add="true"/>
-  </property>
-  <property>
-    <name>content</name>
-    <display-name>ams-grafana-env template</display-name>
-    <value>
-# Set environment variables here.
-
-# AMS UI Server Home Dir
-export AMS_GRAFANA_HOME_DIR={{ams_grafana_home_dir}}
-
-# AMS UI Server Data Dir
-export AMS_GRAFANA_DATA_DIR={{ams_grafana_data_dir}}
-
-# AMS UI Server Log Dir
-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"/>
-  </property>
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0aab3803/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-grafana-ini.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-grafana-ini.xml
 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-grafana-ini.xml
deleted file mode 100644
index 3c87ab1..0000000
--- 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-grafana-ini.xml
+++ /dev/null
@@ -1,320 +0,0 @@
-<?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 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>
-  <property>
-    <name>port</name>
-    <value>3000</value>
-    <description>The http port to use</description>
-    <on-ambari-upgrade add="true"/>
-  </property>
-  <property>
-    <name>protocol</name>
-    <value>http</value>
-    <description>Protocol (http or https)</description>
-    <on-ambari-upgrade add="true"/>
-  </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"/>
-  </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"/>
-  </property>
-  <property>
-    <name>ca_cert</name>
-    <value></value>
-    <description>Path to CA root certificate or bundle to be used to validate 
the Grafana certificate against.
-      For self signed certificates, this value can be the same as the value 
for 'cert_file'.
-      (If a path is not specified, the certificate validation is 
skipped)</description>
-    <value-attributes>
-      <empty-value-valid>true</empty-value-valid>
-    </value-attributes>
-    <on-ambari-upgrade add="true"/>
-  </property>
-  <property>
-    <name>content</name>
-    <display-name>ams-grafana-ini template</display-name>
-    <value>
-##################### Grafana Configuration Example #####################
-#
-# Everything has defaults so you only need to uncomment things you want to
-# change
-
-# possible values : production, development
-; app_mode = production
-
-#################################### Paths ####################################
-[paths]
-# Path to where grafana can store temp files, sessions, and the sqlite3 db (if 
that is used)
-#
-;data = /var/lib/grafana
-data = {{ams_grafana_data_dir}}
-#
-# Directory where grafana can store logs
-#
-;logs = /var/log/grafana
-logs = {{ams_grafana_log_dir}}
-
-
-#################################### Server 
####################################
-[server]
-# Protocol (http or https)
-;protocol = http
-protocol = {{ams_grafana_protocol}}
-# The ip address to bind to, empty will bind to all interfaces
-;http_addr =
-
-# The http port  to use
-;http_port = 3000
-http_port = {{ams_grafana_port}}
-
-# The public facing domain name used to access grafana from a browser
-;domain = localhost
-
-# Redirect to correct domain if host header does not match domain
-# Prevents DNS rebinding attacks
-;enforce_domain = false
-
-# The full public facing url
-;root_url = %(protocol)s://%(domain)s:%(http_port)s/
-
-# Log web requests
-;router_logging = false
-
-# the path relative working path
-;static_root_path = public
-static_root_path = /usr/lib/ambari-metrics-grafana/public
-
-# enable gzip
-;enable_gzip = false
-
-# https certs &amp; key file
-;cert_file =
-;cert_key =
-cert_file = {{ams_grafana_cert_file}}
-cert_key = {{ams_grafana_cert_key}}
-
-#################################### Database 
####################################
-[database]
-# Either "mysql", "postgres" or "sqlite3", it's your choice
-;type = sqlite3
-;host = 127.0.0.1:3306
-;name = grafana
-;user = root
-;password =
-
-# For "postgres" only, either "disable", "require" or "verify-full"
-;ssl_mode = disable
-
-# For "sqlite3" only, path relative to data_path setting
-;path = grafana.db
-
-#################################### Session 
####################################
-[session]
-# Either "memory", "file", "redis", "mysql", "postgres", default is "file"
-;provider = file
-
-# Provider config options
-# memory: not have any config yet
-# file: session dir path, is relative to grafana data_path
-# redis: config like redis server e.g. 
`addr=127.0.0.1:6379,pool_size=100,db=grafana`
-# mysql: go-sql-driver/mysql dsn config string, e.g. 
`user:password@tcp(127.0.0.1:3306)/database_name`
-# postgres: user=a password=b host=localhost port=5432 dbname=c sslmode=disable
-;provider_config = sessions
-
-# Session cookie name
-;cookie_name = grafana_sess
-
-# If you use session in https only, default is false
-;cookie_secure = false
-
-# Session life time, default is 86400
-;session_life_time = 86400
-
-#################################### Analytics 
####################################
-[analytics]
-# Server reporting, sends usage counters to stats.grafana.org every 24 hours.
-# No ip addresses are being tracked, only simple counters to track
-# running instances, dashboard and error counts. It is very helpful to us.
-# Change this option to false to disable reporting.
-;reporting_enabled = true
-
-# Google Analytics universal tracking code, only enabled if you specify an id 
here
-;google_analytics_ua_id =
-
-#################################### Security 
####################################
-[security]
-# default admin user, created on startup
-admin_user = {{ams_grafana_admin_user}}
-
-# default admin password, can be changed before first start of grafana,  or in 
profile settings
-;admin_password =
-
-# used for signing
-;secret_key = SW2YcwTIb9zpOOhoPsMm
-
-# Auto-login remember days
-;login_remember_days = 7
-;cookie_username = grafana_user
-;cookie_remember_name = grafana_remember
-
-# disable gravatar profile images
-;disable_gravatar = false
-
-# data source proxy whitelist (ip_or_domain:port seperated by spaces)
-;data_source_proxy_whitelist =
-
-#################################### Users ####################################
-[users]
-# disable user signup / registration
-;allow_sign_up = true
-
-# Allow non admin users to create organizations
-;allow_org_create = true
-
-# Set to true to automatically assign new users to the default organization 
(id 1)
-;auto_assign_org = true
-
-# Default role new users will be automatically assigned (if disabled above is 
set to true)
-;auto_assign_org_role = Viewer
-
-# Background text for the user field on the login page
-;login_hint = email or username
-
-#################################### Anonymous Auth ##########################
-[auth.anonymous]
-# enable anonymous access
-enabled = true
-
-# specify organization name that should be used for unauthenticated users
-org_name = Main Org.
-
-# specify role for unauthenticated users
-;org_role = Admin
-
-#################################### Github Auth ##########################
-[auth.github]
-;enabled = false
-;allow_sign_up = false
-;client_id = some_id
-;client_secret = some_secret
-;scopes = user:email,read:org
-;auth_url = https://github.com/login/oauth/authorize
-;token_url = https://github.com/login/oauth/access_token
-;api_url = https://api.github.com/user
-;team_ids =
-;allowed_organizations =
-
-#################################### Google Auth ##########################
-[auth.google]
-;enabled = false
-;allow_sign_up = false
-;client_id = some_client_id
-;client_secret = some_client_secret
-;scopes = https://www.googleapis.com/auth/userinfo.profile 
https://www.googleapis.com/auth/userinfo.email
-;auth_url = https://accounts.google.com/o/oauth2/auth
-;token_url = https://accounts.google.com/o/oauth2/token
-;api_url = https://www.googleapis.com/oauth2/v1/userinfo
-;allowed_domains =
-
-#################################### Auth Proxy ##########################
-[auth.proxy]
-;enabled = false
-;header_name = X-WEBAUTH-USER
-;header_property = username
-;auto_sign_up = true
-
-#################################### Basic Auth ##########################
-[auth.basic]
-;enabled = true
-
-#################################### Auth LDAP ##########################
-[auth.ldap]
-;enabled = false
-;config_file = /etc/grafana/ldap.toml
-
-#################################### SMTP / Emailing ##########################
-[smtp]
-;enabled = false
-;host = localhost:25
-;user =
-;password =
-;cert_file =
-;key_file =
-;skip_verify = false
-;from_address = admin@grafana.localhost
-
-[emails]
-;welcome_email_on_sign_up = false
-
-#################################### Logging ##########################
-[log]
-# Either "console", "file", default is "console"
-# Use comma to separate multiple modes, e.g. "console, file"
-;mode = console, file
-
-# Buffer length of channel, keep it as it is if you don't know what it is.
-;buffer_len = 10000
-
-# Either "Trace", "Debug", "Info", "Warn", "Error", "Critical", default is 
"Trace"
-;level = Info
-
-# For "console" mode only
-[log.console]
-;level =
-
-# For "file" mode only
-[log.file]
-;level =
-# This enables automated log rotate(switch of following options), default is 
true
-;log_rotate = true
-
-# Max line number of single file, default is 1000000
-;max_lines = 1000000
-
-# Max size shift of single file, default is 28 means 1 &lt;&lt; 28, 256MB
-;max_lines_shift = 28
-
-# Segment log daily, default is true
-;daily_rotate = true
-
-# Expired days of log file(delete after max days), default is 7
-;max_days = 7
-
-#################################### AMPQ Event Publisher 
##########################
-[event_publisher]
-;enabled = false
-;rabbitmq_url = amqp://localhost/
-;exchange = grafana_events
-
-;#################################### Dashboard JSON files 
##########################
-[dashboards.json]
-;enabled = false
-;path = /var/lib/grafana/dashboards
-path = /usr/lib/ambari-metrics-grafana/public/dashboards
-    </value>
-    <on-ambari-upgrade add="true"/>
-  </property>
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0aab3803/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-env.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-env.xml
 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-env.xml
deleted file mode 100755
index 00d396c..0000000
--- 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-env.xml
+++ /dev/null
@@ -1,245 +0,0 @@
-<?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 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 supports_do_not_extend="true">
-  <property>
-    <name>hbase_log_dir</name>
-    <value>/var/log/ambari-metrics-collector</value>
-    <description>Log Directories for HBase.</description>
-    <on-ambari-upgrade add="true"/>
-  </property>
-  <property>
-    <name>hbase_pid_dir</name>
-    <value>/var/run/ambari-metrics-collector/</value>
-    <description>Pid Directory for HBase.</description>
-    <on-ambari-upgrade add="true"/>
-  </property>
-  <property>
-    <name>hbase_classpath_additional</name>
-    <value></value>
-    <description>Additional directory or jar in classpath for 
HBase.</description>
-    <on-ambari-upgrade add="true"/>
-    <value-attributes>
-      <empty-value-valid>true</empty-value-valid>
-    </value-attributes>
-  </property>
-  <property>
-    <name>hbase_regionserver_heapsize</name>
-    <value>1024</value>
-    <description>
-        HBase RegionServer Heap Size. In embedded mode, total heap size is
-        sum of master and regionserver heap sizes.
-    </description>
-    <on-ambari-upgrade add="true"/>
-    <value-attributes>
-      <type>int</type>
-      <unit>MB</unit>
-    </value-attributes>
-    <depends-on>
-      <property>
-        <type>ams-hbase-site</type>
-        <name>hbase.cluster.distributed</name>
-      </property>
-      <property>
-        <type>ams-hbase-site</type>
-        <name>hbase.rootdir</name>
-      </property>
-    </depends-on>
-  </property>
-  <property>
-    <name>regionserver_xmn_size</name>
-    <value>256</value>
-    <description>HBase RegionServer maximum value for young generation heap 
size.</description>
-    <on-ambari-upgrade add="true"/>
-    <value-attributes>
-      <type>int</type>
-      <unit>MB</unit>
-    </value-attributes>
-    <depends-on>
-      <property>
-        <type>ams-hbase-site</type>
-        <name>hbase.cluster.distributed</name>
-      </property>
-    </depends-on>
-  </property>
-  <property>
-    <name>hbase_master_xmn_size</name>
-    <value>256</value>
-    <description>
-      HBase Master maximum value for young generation heap size.
-    </description>
-    <on-ambari-upgrade add="true"/>
-    <value-attributes>
-      <type>int</type>
-      <unit>MB</unit>
-    </value-attributes>
-    <depends-on>
-      <property>
-        <type>ams-hbase-site</type>
-        <name>hbase.cluster.distributed</name>
-      </property>
-    </depends-on>
-  </property>
-  <property>
-    <name>hbase_master_maxperm_size</name>
-    <value>128</value>
-    <description>HBase RegionServer maximum value for perm heap 
size.</description>
-    <on-ambari-upgrade add="true"/>
-    <value-attributes>
-      <type>int</type>
-      <unit>MB</unit>
-    </value-attributes>
-  </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"/>
-  </property>
-  <property>
-    <name>hbase_master_heapsize</name>
-    <value>1024</value>
-    <description>
-        HBase Master Heap Size. In embedded mode, total heap size is
-        sum of master and regionserver heap sizes.
-    </description>
-    <on-ambari-upgrade add="true"/>
-    <value-attributes>
-      <type>int</type>
-      <unit>MB</unit>
-    </value-attributes>
-    <depends-on>
-      <property>
-        <type>ams-hbase-site</type>
-        <name>hbase.cluster.distributed</name>
-      </property>
-      <property>
-        <type>ams-hbase-site</type>
-        <name>hbase.rootdir</name>
-      </property>
-    </depends-on>
-  </property>
-  <property>
-    <name>max_open_files_limit</name>
-    <value>32768</value>
-    <description>
-        The maximum number of open file descriptors by process
-    </description>
-    <on-ambari-upgrade add="true"/>
-  </property>
-
-  <!-- hbase-env.sh -->
-  <property>
-    <name>content</name>
-    <description>This is the jinja template for hbase-env.sh file</description>
-    <value>
-# Set environment variables here.
-
-# The java implementation to use. Java 1.6+ required.
-export JAVA_HOME={{java64_home}}
-
-# HBase Configuration directory
-export HBASE_CONF_DIR=${HBASE_CONF_DIR:-{{hbase_conf_dir}}}
-
-# Extra Java CLASSPATH elements. Optional.
-additional_cp={{hbase_classpath_additional}}
-if [  -n "$additional_cp" ];
-then
-  export HBASE_CLASSPATH=${HBASE_CLASSPATH}:$additional_cp
-else
-  export HBASE_CLASSPATH=${HBASE_CLASSPATH}
-fi
-
-# The maximum amount of heap to use for hbase shell.
-export HBASE_SHELL_OPTS="-Xmx256m"
-
-# Extra Java runtime options.
-# Below are what we set by default. May only work with SUN JVM.
-# For more on why as well as other possible settings,
-# see http://wiki.apache.org/hadoop/PerformanceTuning
-export HBASE_OPTS="-XX:+UseConcMarkSweepGC 
-XX:ErrorFile={{hbase_log_dir}}/hs_err_pid%p.log 
-Djava.io.tmpdir={{hbase_tmp_dir}}"
-export SERVER_GC_OPTS="-verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps 
-Xloggc:{{hbase_log_dir}}/gc.log-`date +'%Y%m%d%H%M'`"
-# Uncomment below to enable java garbage collection logging.
-# export HBASE_OPTS="$HBASE_OPTS -verbose:gc -XX:+PrintGCDetails 
-XX:+PrintGCDateStamps -Xloggc:$HBASE_HOME/logs/gc-hbase.log"
-
-# Uncomment and adjust to enable JMX exporting
-# See jmxremote.password and jmxremote.access in $JRE_HOME/lib/management to 
configure remote password access.
-# More details at: 
http://java.sun.com/javase/6/docs/technotes/guides/management/agent.html
-#
-# export HBASE_JMX_BASE="-Dcom.sun.management.jmxremote.ssl=false 
-Dcom.sun.management.jmxremote.authenticate=false"
-
-{% if java_version &lt; 8 %}
-export HBASE_MASTER_OPTS=" -XX:PermSize=64m 
-XX:MaxPermSize={{hbase_master_maxperm_size}} -Xms{{hbase_heapsize}} 
-Xmx{{hbase_heapsize}} -Xmn{{hbase_master_xmn_size}} 
-XX:CMSInitiatingOccupancyFraction=70 -XX:+UseCMSInitiatingOccupancyOnly"
-export HBASE_REGIONSERVER_OPTS="-XX:MaxPermSize=128m 
-Xmn{{regionserver_xmn_size}} -XX:CMSInitiatingOccupancyFraction=70 
-XX:+UseCMSInitiatingOccupancyOnly -Xms{{regionserver_heapsize}} 
-Xmx{{regionserver_heapsize}}"
-{% else %}
-export HBASE_MASTER_OPTS=" -Xms{{hbase_heapsize}} -Xmx{{hbase_heapsize}} 
-Xmn{{hbase_master_xmn_size}} -XX:CMSInitiatingOccupancyFraction=70 
-XX:+UseCMSInitiatingOccupancyOnly"
-export HBASE_REGIONSERVER_OPTS=" -Xmn{{regionserver_xmn_size}} 
-XX:CMSInitiatingOccupancyFraction=70 -XX:+UseCMSInitiatingOccupancyOnly 
-Xms{{regionserver_heapsize}} -Xmx{{regionserver_heapsize}}"
-{% endif %}
-
-
-# export HBASE_THRIFT_OPTS="$HBASE_JMX_BASE 
-Dcom.sun.management.jmxremote.port=10103"
-# export HBASE_ZOOKEEPER_OPTS="$HBASE_JMX_BASE 
-Dcom.sun.management.jmxremote.port=10104"
-
-# File naming hosts on which HRegionServers will run. 
$HBASE_HOME/conf/regionservers by default.
-export HBASE_REGIONSERVERS=${HBASE_CONF_DIR}/regionservers
-
-# Extra ssh options. Empty by default.
-# export HBASE_SSH_OPTS="-o ConnectTimeout=1 -o SendEnv=HBASE_CONF_DIR"
-
-# Where log files are stored. $HBASE_HOME/logs by default.
-export HBASE_LOG_DIR={{hbase_log_dir}}
-
-# A string representing this instance of hbase. $USER by default.
-# export HBASE_IDENT_STRING=$USER
-
-# The scheduling priority for daemon processes. See 'man nice'.
-# export HBASE_NICENESS=10
-
-# The directory where pid files are stored. /tmp by default.
-export HBASE_PID_DIR={{hbase_pid_dir}}
-
-# Seconds to sleep between slave commands. Unset by default. This
-# can be useful in large clusters, where, e.g., slave rsyncs can
-# otherwise arrive faster than the master can service them.
-# export HBASE_SLAVE_SLEEP=0.1
-
-# Tell HBase whether it should manage it's own instance of Zookeeper or not.
-export HBASE_MANAGES_ZK=false
-
-{% if security_enabled %}
-export HBASE_OPTS="$HBASE_OPTS 
-Djava.security.auth.login.config={{client_jaas_config_file}} 
-Dzookeeper.sasl.client.username={{zk_servicename}}"
-export HBASE_MASTER_OPTS="$HBASE_MASTER_OPTS 
-Djava.security.auth.login.config={{master_jaas_config_file}} 
-Dzookeeper.sasl.client.username={{zk_servicename}}"
-export HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_OPTS 
-Djava.security.auth.login.config={{regionserver_jaas_config_file}} 
-Dzookeeper.sasl.client.username={{zk_servicename}}"
-export HBASE_ZOOKEEPER_OPTS="$HBASE_ZOOKEEPER_OPTS 
-Djava.security.auth.login.config={{ams_zookeeper_jaas_config_file}} 
-Dzookeeper.sasl.client.username={{zk_servicename}}"
-{% endif %}
-
-# use embedded native libs
-_HADOOP_NATIVE_LIB="/usr/lib/ams-hbase/lib/hadoop-native/"
-export HBASE_OPTS="$HBASE_OPTS -Djava.library.path=${_HADOOP_NATIVE_LIB}"
-
-# Unset HADOOP_HOME to avoid importing HADOOP installed cluster related configs
-export HADOOP_HOME={{ams_hbase_home_dir}}
-    </value>
-    <on-ambari-upgrade add="true"/>
-  </property>
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0aab3803/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-log4j.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-log4j.xml
 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-log4j.xml
deleted file mode 100755
index 4eea14f..0000000
--- 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-log4j.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?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 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 supports_final="false" supports_do_not_extend="true">
-
-  <property>
-    <name>content</name>
-    <description>Custom log4j.properties</description>
-    <value>
-# 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.
-
-
-# Define some default values that can be overridden by system properties
-hbase.root.logger=INFO,console
-hbase.security.logger=INFO,console
-hbase.log.dir=.
-hbase.log.file=hbase.log
-
-# Define the root logger to the system property "hbase.root.logger".
-log4j.rootLogger=${hbase.root.logger}
-
-# Logging Threshold
-log4j.threshold=ALL
-
-#
-# Daily Rolling File Appender
-#
-log4j.appender.DRFA=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.DRFA.File=${hbase.log.dir}/${hbase.log.file}
-
-# Rollver at midnight
-log4j.appender.DRFA.DatePattern=.yyyy-MM-dd
-
-# 30-day backup
-#log4j.appender.DRFA.MaxBackupIndex=30
-log4j.appender.DRFA.layout=org.apache.log4j.PatternLayout
-
-# Pattern format: Date LogLevel LoggerName LogMessage
-log4j.appender.DRFA.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c{2}: %m%n
-
-# Rolling File Appender properties
-hbase.log.maxfilesize=256MB
-hbase.log.maxbackupindex=20
-
-# Rolling File Appender
-log4j.appender.RFA=org.apache.log4j.RollingFileAppender
-log4j.appender.RFA.File=${hbase.log.dir}/${hbase.log.file}
-
-log4j.appender.RFA.MaxFileSize=${hbase.log.maxfilesize}
-log4j.appender.RFA.MaxBackupIndex=${hbase.log.maxbackupindex}
-
-log4j.appender.RFA.layout=org.apache.log4j.PatternLayout
-log4j.appender.RFA.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c{2}: %m%n
-
-#
-# Security audit appender
-#
-hbase.security.log.file=SecurityAuth.audit
-hbase.security.log.maxfilesize=256MB
-hbase.security.log.maxbackupindex=20
-log4j.appender.RFAS=org.apache.log4j.RollingFileAppender
-log4j.appender.RFAS.File=${hbase.log.dir}/${hbase.security.log.file}
-log4j.appender.RFAS.MaxFileSize=${hbase.security.log.maxfilesize}
-log4j.appender.RFAS.MaxBackupIndex=${hbase.security.log.maxbackupindex}
-log4j.appender.RFAS.layout=org.apache.log4j.PatternLayout
-log4j.appender.RFAS.layout.ConversionPattern=%d{ISO8601} %p %c: %m%n
-log4j.category.SecurityLogger=${hbase.security.logger}
-log4j.additivity.SecurityLogger=false
-#log4j.logger.SecurityLogger.org.apache.hadoop.hbase.security.access.AccessController=TRACE
-
-#
-# Null Appender
-#
-log4j.appender.NullAppender=org.apache.log4j.varia.NullAppender
-
-#
-# console
-# Add "console" to rootlogger above if you want to use this
-#
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.target=System.err
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c{2}: 
%m%n
-
-# Custom Logging levels
-
-log4j.logger.org.apache.zookeeper=INFO
-#log4j.logger.org.apache.hadoop.fs.FSNamesystem=DEBUG
-log4j.logger.org.apache.hadoop.hbase=INFO
-# Make these two classes INFO-level. Make them DEBUG to see more zk debug.
-log4j.logger.org.apache.hadoop.hbase.zookeeper.ZKUtil=INFO
-log4j.logger.org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher=INFO
-#log4j.logger.org.apache.hadoop.dfs=DEBUG
-# Set this class to log INFO only otherwise its OTT
-# Enable this to get detailed connection error/retry logging.
-# 
log4j.logger.org.apache.hadoop.hbase.client.HConnectionManager$HConnectionImplementation=TRACE
-
-
-# Uncomment this line to enable tracing on _every_ RPC call (this can be a lot 
of output)
-#log4j.logger.org.apache.hadoop.ipc.HBaseServer.trace=DEBUG
-
-# Uncomment the below if you want to remove logging of client region caching'
-# and scan of .META. messages
-# 
log4j.logger.org.apache.hadoop.hbase.client.HConnectionManager$HConnectionImplementation=INFO
-# log4j.logger.org.apache.hadoop.hbase.client.MetaScanner=INFO
-
-    </value>
-    <on-ambari-upgrade add="true"/>
-    <value-attributes>
-      <show-property-name>false</show-property-name>
-    </value-attributes>
-  </property>
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0aab3803/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-policy.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-policy.xml
 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-policy.xml
deleted file mode 100755
index 13726a2..0000000
--- 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-policy.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?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 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 supports_final="true" supports_do_not_extend="true">
-  <property>
-    <name>security.client.protocol.acl</name>
-    <value>*</value>
-    <description>ACL for HRegionInterface protocol implementations (ie.
-      clients talking to HRegionServers)
-      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"/>
-  </property>
-
-  <property>
-    <name>security.admin.protocol.acl</name>
-    <value>*</value>
-    <description>ACL for HMasterInterface protocol implementation (ie.
-      clients talking to HMaster for admin operations).
-      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"/>
-  </property>
-
-  <property>
-    <name>security.masterregion.protocol.acl</name>
-    <value>*</value>
-    <description>ACL for HMasterRegionInterface protocol implementations
-      (for HRegionServers communicating with HMaster)
-      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"/>
-  </property>
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0aab3803/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-security-site.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-security-site.xml
 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-security-site.xml
deleted file mode 100755
index 64799c1..0000000
--- 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-security-site.xml
+++ /dev/null
@@ -1,167 +0,0 @@
-<?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 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 supports_do_not_extend="true">
-  <property>
-    <name>ams.zookeeper.keytab</name>
-    <value></value>
-    <on-ambari-upgrade add="true"/>
-    <value-attributes>
-      <empty-value-valid>true</empty-value-valid>
-    </value-attributes>
-  </property>
-  <property>
-    <name>ams.zookeeper.principal</name>
-    <value></value>
-    <on-ambari-upgrade add="true"/>
-    <value-attributes>
-      <empty-value-valid>true</empty-value-valid>
-    </value-attributes>
-  </property>
-  <property>
-    <name>hadoop.security.authentication</name>
-    <value></value>
-    <on-ambari-upgrade add="true"/>
-    <value-attributes>
-      <empty-value-valid>true</empty-value-valid>
-    </value-attributes>
-  </property>
-  <property>
-    <name>hbase.coprocessor.master.classes</name>
-    <value></value>
-    <on-ambari-upgrade add="true"/>
-    <value-attributes>
-      <empty-value-valid>true</empty-value-valid>
-    </value-attributes>
-  </property>
-  <property>
-    <name>hbase.coprocessor.region.classes</name>
-    <value></value>
-    <on-ambari-upgrade add="true"/>
-    <value-attributes>
-      <empty-value-valid>true</empty-value-valid>
-    </value-attributes>
-  </property>
-  <property>
-    <name>hbase.master.kerberos.principal</name>
-    <value></value>
-    <on-ambari-upgrade add="true"/>
-    <value-attributes>
-      <empty-value-valid>true</empty-value-valid>
-    </value-attributes>
-  </property>
-  <property>
-    <name>hbase.master.keytab.file</name>
-    <value></value>
-    <on-ambari-upgrade add="true"/>
-    <value-attributes>
-      <empty-value-valid>true</empty-value-valid>
-    </value-attributes>
-  </property>
-  <property>
-    <name>hbase.myclient.keytab</name>
-    <value></value>
-    <on-ambari-upgrade add="true"/>
-    <value-attributes>
-      <empty-value-valid>true</empty-value-valid>
-    </value-attributes>
-  </property>
-  <property>
-    <name>hbase.myclient.principal</name>
-    <value></value>
-    <on-ambari-upgrade add="true"/>
-    <value-attributes>
-      <empty-value-valid>true</empty-value-valid>
-    </value-attributes>
-  </property>
-  <property>
-    <name>hbase.regionserver.kerberos.principal</name>
-    <value></value>
-    <on-ambari-upgrade add="true"/>
-    <value-attributes>
-      <empty-value-valid>true</empty-value-valid>
-    </value-attributes>
-  </property>
-  <property>
-    <name>hbase.regionserver.keytab.file</name>
-    <value></value>
-    <on-ambari-upgrade add="true"/>
-    <value-attributes>
-      <empty-value-valid>true</empty-value-valid>
-    </value-attributes>
-  </property>
-  <property>
-    <name>hbase.security.authentication</name>
-    <value></value>
-    <on-ambari-upgrade add="true"/>
-    <value-attributes>
-      <empty-value-valid>true</empty-value-valid>
-    </value-attributes>
-  </property>
-  <property>
-    <name>hbase.security.authorization</name>
-    <value></value>
-    <on-ambari-upgrade add="true"/>
-    <value-attributes>
-      <empty-value-valid>true</empty-value-valid>
-    </value-attributes>
-  </property>
-  <property>
-    <name>hbase.zookeeper.property.authProvider.1</name>
-    <value></value>
-    <on-ambari-upgrade add="true"/>
-    <value-attributes>
-      <empty-value-valid>true</empty-value-valid>
-    </value-attributes>
-  </property>
-  <property>
-    <name>hbase.zookeeper.property.jaasLoginRenew</name>
-    <value></value>
-    <on-ambari-upgrade add="true"/>
-    <value-attributes>
-      <empty-value-valid>true</empty-value-valid>
-    </value-attributes>
-  </property>
-  <property>
-    <name>hbase.zookeeper.property.kerberos.removeHostFromPrincipal</name>
-    <value></value>
-    <on-ambari-upgrade add="true"/>
-    <value-attributes>
-      <empty-value-valid>true</empty-value-valid>
-    </value-attributes>
-  </property>
-  <property>
-    <name>hbase.zookeeper.property.kerberos.removeRealmFromPrincipal</name>
-    <value></value>
-    <on-ambari-upgrade add="true"/>
-    <value-attributes>
-      <empty-value-valid>true</empty-value-valid>
-    </value-attributes>
-  </property>
-  <property>
-    <name>zookeeper.znode.parent</name>
-    <value></value>
-    <on-ambari-upgrade add="true"/>
-    <value-attributes>
-      <empty-value-valid>true</empty-value-valid>
-    </value-attributes>
-  </property>
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0aab3803/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-site.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-site.xml
 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-site.xml
deleted file mode 100755
index bf62b8e..0000000
--- 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-site.xml
+++ /dev/null
@@ -1,489 +0,0 @@
-<?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 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>
-  <property>
-    <name>hbase.rootdir</name>
-    <value>file:///var/lib/ambari-metrics-collector/hbase</value>
-    <description>
-      Ambari Metrics service uses HBase as default storage backend. Set the 
rootdir for
-      HBase to either local filesystem path if using Ambari Metrics in 
embedded mode or
-      to a HDFS dir, example: hdfs://namenode.example.org:8020/amshbase.
-    </description>
-    <depends-on>
-      <property>
-        <type>core-site</type>
-        <name>fs.defaultFS</name>
-      </property>
-      <property>
-        <type>ams-site</type>
-        <name>timeline.metrics.service.operation.mode</name>
-      </property>
-    </depends-on>
-    <on-ambari-upgrade add="true"/>
-  </property>
-  <property>
-    <name>hbase.tmp.dir</name>
-    <value>/var/lib/ambari-metrics-collector/hbase-tmp</value>
-    <description>
-      Temporary directory on the local filesystem.
-      Change this setting to point to a location more permanent
-      than '/tmp' (The '/tmp' directory is often cleared on
-      machine restart).
-    </description>
-    <value-attributes>
-      <type>directory</type>
-    </value-attributes>
-    <on-ambari-upgrade add="true"/>
-  </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"/>
-  </property>
-  <property>
-    <name>hbase.cluster.distributed</name>
-    <value>false</value>
-    <description>
-      The mode the cluster will be in. Possible values are false for
-      standalone mode and true for distributed mode. If false, startup will run
-      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>
-    </depends-on>
-    <on-ambari-upgrade add="true"/>
-  </property>
-  <property>
-    <name>hbase.master.wait.on.regionservers.mintostart</name>
-    <value>1</value>
-    <description>
-      Ensure that HBase Master waits for # many region server to start.
-    </description>
-    <on-ambari-upgrade add="true"/>
-  </property>
-  <property>
-    <name>hbase.zookeeper.quorum</name>
-    <value>{{zookeeper_quorum_hosts}}</value>
-    <description>Comma separated list of servers in the ZooKeeper Quorum.
-      For example, "host1.mydomain.com,host2.mydomain.com,host3.mydomain.com".
-      By default this is set to localhost for local and pseudo-distributed 
modes
-      of operation. For a fully-distributed setup, this should be set to a full
-      list of ZooKeeper quorum servers. If HBASE_MANAGES_ZK is set in 
hbase-env.sh
-      this is the list of servers which we will start/stop ZooKeeper on.
-    </description>
-    <final>true</final>
-    <on-ambari-upgrade add="true"/>
-  </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"/>
-  </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"/>
-  </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"/>
-  </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"/>
-  </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"/>
-  </property>
-  <property>
-    <name>hbase.hregion.majorcompaction</name>
-    <value>0</value>
-    <description>
-      The time (in milliseconds) between 'major' compactions of all
-      HStoreFiles in a region.
-      0 to disable automated major compactions.
-    </description>
-    <on-ambari-upgrade add="true"/>
-  </property>
-  <property>
-    <name>phoenix.query.spoolThresholdBytes</name>
-    <value>20971520</value>
-    <description>
-      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"/>
-  </property>
-  <property>
-    <name>hbase.zookeeper.property.dataDir</name>
-    <value>${hbase.tmp.dir}/zookeeper</value>
-    <description>
-      Property from ZooKeeper's config zoo.cfg.
-      The directory where the snapshot is stored.
-    </description>
-    <on-ambari-upgrade add="true"/>
-  </property>
-  <property>
-    <name>hbase.client.scanner.caching</name>
-    <value>10000</value>
-    <description>
-      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"/>
-  </property>
-  <property>
-    <name>hbase.normalizer.enabled</name>
-    <value>false</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"/>
-  </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"/>
-  </property>
-  <property>
-    <name>hbase.master.normalizer.class</name>
-    
<value>org.apache.hadoop.hbase.master.normalizer.SimpleRegionNormalizer</value>
-    <description>
-      Class used to execute the region normalization when the period occurs.
-      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"/>
-  </property>
-  <property>
-    <name>hfile.block.cache.size</name>
-    <value>0.3</value>
-    <description>
-      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"/>
-  </property>
-  <property>
-    <name>hbase.regionserver.global.memstore.upperLimit</name>
-    <value>0.5</value>
-    <description>
-      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"/>
-  </property>
-  <property>
-    <name>hbase.regionserver.global.memstore.lowerLimit</name>
-    <value>0.4</value>
-    <description>
-      When memstores are being forced to flush to make room in
-      memory, keep flushing until we hit this mark. Defaults to 35% of heap.
-      This value equal to hbase.regionserver.global.memstore.upperLimit causes
-      the minimum possible flushing to occur when updates are blocked due to
-      memstore limiting.
-    </description>
-    <on-ambari-upgrade add="true"/>
-  </property>
-  <property>
-    <name>phoenix.groupby.maxCacheSize</name>
-    <value>307200000</value>
-    <description>
-      Size in bytes of pages cached during GROUP BY spilling. Default is 100Mb.
-    </description>
-    <on-ambari-upgrade add="true"/>
-  </property>
-  <property>
-    <name>hbase.hregion.max.filesize</name>
-    <value>4294967296</value>
-    <description>
-      Maximum HFile size. If the sum of the sizes of a region&#x2019;s HFiles 
has grown
-      to exceed this value, the region is split in two. Default is 10Gb.
-    </description>
-    <on-ambari-upgrade add="true"/>
-  </property>
-  <property>
-    <name>hbase.hregion.memstore.block.multiplier</name>
-    <value>4</value>
-    <description>
-      Block updates if memstore has hbase.hregion.memstore.block.multiplier
-      times hbase.hregion.memstore.flush.size bytes. Useful preventing runaway
-      memstore during spikes in update traffic.
-    </description>
-    <on-ambari-upgrade add="true"/>
-  </property>
-  <property>
-    <name>hbase.hstore.flusher.count</name>
-    <value>2</value>
-    <description>
-      The number of flush threads. With fewer threads, the MemStore flushes
-      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"/>
-  </property>
-  <property>
-    <name>phoenix.query.timeoutMs</name>
-    <value>300000</value>
-    <description>
-      Number of milliseconds after which a query will timeout on the client.
-      Default is 5 min.
-    </description>
-    <on-ambari-upgrade add="true"/>
-  </property>
-  <property>
-    <name>phoenix.query.keepAliveMs</name>
-    <value>300000</value>
-    <description>
-      Number of milliseconds after which a query will keep the connection to 
HBase alive.
-      Default is 5 min.
-    </description>
-    <on-ambari-upgrade add="true"/>
-  </property>
-  <property>
-    <name>hbase.client.scanner.timeout.period</name>
-    <value>300000</value>
-    <description>
-      Client scanner lease period in milliseconds.
-    </description>
-    <on-ambari-upgrade add="true"/>
-  </property>
-  <property>
-    <name>hbase.rpc.timeout</name>
-    <value>300000</value>
-    <description>
-      This is for the RPC layer to define how long HBase client applications
-      take for a remote call to time out. It uses pings to check connections
-      but will eventually throw a TimeoutException.
-    </description>
-    <display-name>HBase RPC Timeout</display-name>
-    <on-ambari-upgrade add="true"/>
-  </property>
-  <property>
-    <name>hbase.regionserver.thread.compaction.large</name>
-    <value>2</value>
-    <description>
-      Configuration key for the large compaction threads.
-    </description>
-    <on-ambari-upgrade add="true"/>
-  </property>
-  <property>
-    <name>hbase.regionserver.thread.compaction.small</name>
-    <value>3</value>
-    <description>
-      Configuration key for the small compaction threads.
-    </description>
-    <on-ambari-upgrade add="true"/>
-  </property>
-  <property>
-    <name>hbase.zookeeper.property.clientPort</name>
-    <value>{{zookeeper_clientPort}}</value>
-    <depends-on>
-      <property>
-        <type>zoo.cfg</type>
-        <name>clientPort</name>
-      </property>
-      <property>
-        <type>ams-hbase-site</type>
-        <name>hbase.cluster.distributed</name>
-      </property>
-    </depends-on>
-    <on-ambari-upgrade add="true"/>
-  </property>
-  <property>
-    <name>hbase.zookeeper.peerport</name>
-    <value>61288</value>
-    <on-ambari-upgrade add="true"/>
-  </property>
-  <property>
-    <name>hbase.zookeeper.leaderport</name>
-    <value>61388</value>
-    <on-ambari-upgrade add="true"/>
-  </property>
-  <property>
-    <name>hbase.hstore.blockingStoreFiles</name>
-    <value>200</value>
-    <description>
-      If more than this number of StoreFiles exist in any one Store
-      (one StoreFile is written per flush of MemStore), updates are blocked for
-      this region until a compaction is completed, or until
-      hbase.hstore.blockingWaitTime has been exceeded.
-    </description>
-    <on-ambari-upgrade add="true"/>
-  </property>
-  <property>
-    <name>hbase.hregion.memstore.flush.size</name>
-    <value>134217728</value>
-    <description>
-      Memstore will be flushed to disk if size of the memstore exceeds this
-      number of bytes. Value is checked by a thread that runs every
-      hbase.server.thread.wakefrequency.
-    </description>
-    <on-ambari-upgrade add="true"/>
-  </property>
-  <property>
-    <name>hbase.snapshot.enabled</name>
-    <value>false</value>
-    <description>Enable/Disable HBase snapshots.</description>
-    <on-ambari-upgrade add="true"/>
-  </property>
-  <property>
-    <name>hbase.replication</name>
-    <value>false</value>
-    <description>Enable/Disable HBase replication.</description>
-    <on-ambari-upgrade add="true"/>
-  </property>
-  <property>
-    <name>hbase.zookeeper.property.tickTime</name>
-    <value>6000</value>
-    <description>
-      The length of a single tick, which is the basic time unit used by
-      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"/>
-  </property>
-  <property>
-    <name>zookeeper.session.timeout</name>
-    <value>120000</value>
-    <description>ZooKeeper session timeout in milliseconds.</description>
-    <on-ambari-upgrade add="true"/>
-  </property>
-  <property>
-    <name>zookeeper.session.timeout.localHBaseCluster</name>
-    <value>120000</value>
-    <description>
-      ZooKeeper session timeout in milliseconds for
-      pseudo distributed mode.
-    </description>
-    <on-ambari-upgrade add="true"/>
-  </property>
-  <property>
-    <name>phoenix.sequence.saltBuckets</name>
-    <value>2</value>
-    <description>
-      Controls the number of pre-allocated regions for SYSTEM.SEQUENCE table.
-    </description>
-    <on-ambari-upgrade add="true"/>
-  </property>
-  <property>
-    <name>phoenix.query.maxGlobalMemoryPercentage</name>
-    <value>15</value>
-    <description>
-      Percentage of total heap memory (i.e. Runtime.getRuntime().maxMemory())
-      that all threads may use.
-    </description>
-    <on-ambari-upgrade add="true"/>
-  </property>
-  <property>
-    <name>phoenix.spool.directory</name>
-    <value>${hbase.tmp.dir}/phoenix-spool</value>
-    <description>
-      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"/>
-  </property>
-  <property>
-    <name>phoenix.mutate.batchSize</name>
-    <value>10000</value>
-    <description>
-      The number of rows that are batched together and automatically committed
-      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"/>
-  </property>
-  <property>
-    <name>phoenix.query.rowKeyOrderSaltedTable</name>
-    <value>true</value>
-    <description>
-      When set, we disallow user specified split points on salted table to 
ensure
-      that each bucket will only contains entries with the same salt byte.
-      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"/>
-  </property>
-  <property>
-    <name>phoenix.coprocessor.maxServerCacheTimeToLiveMs</name>
-    <value>60000</value>
-    <description>
-      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(
-      &#x201C;Could not find hash cache for joinId&#x201D;) happens. Getting 
warnings like
-      &#x201C;Earlier hash cache(s) might have expired on servers&#x201D; 
might also be a
-      sign that this number should be increased.
-    </description>
-    <on-ambari-upgrade add="true"/>
-  </property>
-  <property>
-    <name>phoenix.coprocessor.maxMetaDataCacheSize</name>
-    <value>20480000</value>
-    <description>
-      Max size in bytes of total server-side metadata cache after which
-      evictions will begin to occur based on least recent access time.
-      Default is 20Mb
-    </description>
-    <on-ambari-upgrade add="true"/>
-  </property>
-  <property>
-    <name>dfs.client.read.shortcircuit</name>
-    <value>true</value>
-    <description>Enable/Disable short circuit read for your client.
-      Hadoop servers should be configured to allow short circuit read
-      for the hbase user for this to take effect
-    </description>
-    <depends-on>
-      <property>
-        <type>ams-hbase-site</type>
-        <name>hbase.cluster.distributed</name>
-      </property>
-      <property>
-        <type>ams-hbase-site</type>
-        <name>hbase.rootdir</name>
-      </property>
-    </depends-on>
-    <on-ambari-upgrade add="true"/>
-  </property>
-  <property>
-    <name>zookeeper.znode.parent</name>
-    <value>/ams-hbase-unsecure</value>
-    <on-ambari-upgrade add="true"/>
-  </property>
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0aab3803/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-log4j.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-log4j.xml
 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-log4j.xml
deleted file mode 100755
index 3735e6c..0000000
--- 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-log4j.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?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 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 supports_final="false" supports_do_not_extend="true">
-
-  <property>
-    <name>content</name>
-    <description>Custom log4j.properties</description>
-    <value>
-#
-# 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.
-#
-
-# Define some default values that can be overridden by system properties
-ams.log.dir=.
-ams.log.file=ambari-metrics-collector.log
-
-# Root logger option
-log4j.rootLogger=INFO,file
-
-# Direct log messages to a log file
-log4j.appender.file=org.apache.log4j.RollingFileAppender
-log4j.appender.file.File=${ams.log.dir}/${ams.log.file}
-log4j.appender.file.MaxFileSize=80MB
-log4j.appender.file.MaxBackupIndex=60
-log4j.appender.file.layout=org.apache.log4j.PatternLayout
-log4j.appender.file.layout.ConversionPattern=%d{ISO8601} %p %c: %m%n
-    </value>
-    <on-ambari-upgrade add="true"/>
-    <value-attributes>
-      <show-property-name>false</show-property-name>
-    </value-attributes>
-  </property>
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0aab3803/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-logsearch-conf.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-logsearch-conf.xml
 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-logsearch-conf.xml
deleted file mode 100644
index 72d44db..0000000
--- 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-logsearch-conf.xml
+++ /dev/null
@@ -1,201 +0,0 @@
-<?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 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 supports_final="false" supports_adding_forbidden="true">
-  <property>
-    <name>service_name</name>
-    <display-name>Service name</display-name>
-    <description>Service name for Logsearch Portal (label)</description>
-    <value>AMS</value>
-    <on-ambari-upgrade add="true"/>
-  </property>
-  <property>
-    <name>component_mappings</name>
-    <display-name>Component mapping</display-name>
-    <description>Logsearch component logid mapping list (e.g.: 
COMPONENT1:logid1,logid2;COMPONENT2:logid3)</description>
-    
<value>METRICS_COLLECTOR:ams_collector,ams_hbase_master,ams_hbase_regionserver;METRICS_MONITOR:ams_monitor;METRICS_GRAFANA:ams_grafana</value>
-    <on-ambari-upgrade add="true"/>
-  </property>
-  <property>
-    <name>content</name>
-    <display-name>Logfeeder config</display-name>
-    <description>Metadata jinja template for Logfeeder which contains grok 
patterns for reading service specific logs.</description>
-    <value>
-{
-  "input":[
-    {
-      "type":"ams_hbase_master",
-      "rowtype":"service",
-      "path":"{{default('/configurations/ams-env/metrics_collector_log_dir', 
'/var/log/ambari-metrics-collector')}}/hbase-ams-master-*.log"
-    },
-    {
-      "type":"ams_hbase_regionserver",
-      "rowtype":"service",
-      "path":"{{default('/configurations/ams-env/metrics_collector_log_dir', 
'/var/log/ambari-metrics-collector')}}/hbase-ams-regionserver-*.log"
-    },
-    {
-      "type":"ams_collector",
-      "rowtype":"service",
-      "path":"{{default('/configurations/ams-env/metrics_collector_log_dir', 
'/var/log/ambari-metrics-collector')}}/ambari-metrics-collector.log"
-    },
-    {
-      "type":"ams_monitor",
-      "rowtype":"service",
-      "path":"{{default('/configurations/ams-env/metrics_monitor_log_dir', 
'/var/log/ambari-metrics-monitor')}}/ambari-metrics-monitor.out"
-    },
-    {
-      "type":"ams_grafana",
-      "rowtype":"service",
-      
"path":"{{default('/configurations/ams-grafana-env/metrics_grafana_log_dir', 
'/var/log/ambari-metrics-grafana')}}/grafana.log"
-    }
-  ],
-  "filter":[
-    {
-      "filter":"grok",
-      "conditions":{
-        "fields":{
-          "type":[
-            "ams_collector"
-          ]
-         }
-       },
-      "log4j_format":"%d{ISO8601} %p %c: %m%n",
-      "multiline_pattern":"^(%{TIMESTAMP_ISO8601:logtime})",
-      
"message_pattern":"(?m)^%{TIMESTAMP_ISO8601:logtime}%{SPACE}%{LOGLEVEL:level}%{SPACE}%{JAVACLASS:logger_name}:%{SPACE}%{GREEDYDATA:log_message}",
-      "post_map_values":{
-        "logtime":{
-          "map_date":{
-            "target_date_pattern":"yyyy-MM-dd HH:mm:ss,SSS"
-          }
-         }
-       }
-     },
-    {
-      "filter":"grok",
-      "conditions":{
-        "fields":{
-          "type":[
-            "ams_hbase_master",
-            "ams_hbase_regionserver"
-          ]
-         }
-       },
-      "log4j_format":"%d{ISO8601} %-5p [%t] %c{2}: %m%n",
-      "multiline_pattern":"^(%{TIMESTAMP_ISO8601:logtime})",
-      
"message_pattern":"(?m)^%{TIMESTAMP_ISO8601:logtime}%{SPACE}%{LOGLEVEL:level}%{SPACE}\\[%{DATA:thread_name}\\]%{SPACE}%{JAVACLASS:logger_name}:%{SPACE}%{GREEDYDATA:log_message}",
-      "post_map_values":{
-        "logtime":{
-          "map_date":{
-            "target_date_pattern":"yyyy-MM-dd HH:mm:ss,SSS"
-          }
-         }
-       }
-     },
-    {
-      "filter":"grok",
-      "conditions":{
-        "fields":{
-          "type":[
-            "ams_grafana"
-          ]
-         }
-       },
-      "log4j_format":"%d{ISO8601} %-5p [%t] %c{2}: %m%n",
-      "multiline_pattern":"^(%{DATESTAMP:logtime})",
-      
"message_pattern":"(?m)^%{DATESTAMP:logtime}%{SPACE}\\[%{WORD:level}\\]%{SPACE}%{GREEDYDATA:log_message}",
-      "post_map_values":{
-        "logtime":{
-          "map_date":{
-            "target_date_pattern":"yyyy/MM/dd HH:mm:ss"
-          }
-         },
-        "level":[
-          {
-            "map_fieldvalue":{
-              "pre_value":"I",
-              "post_value":"INFO"
-            }
-          },
-          {
-            "map_fieldvalue":{
-              "pre_value":"W",
-              "post_value":"WARN"
-            }
-          },
-          {
-            "map_fieldvalue":{
-              "pre_value":"D",
-              "post_value":"DEBUG"
-             }
-           },
-           {
-             "map_fieldvalue":{
-               "pre_value":"E",
-               "post_value":"ERROR"
-             }
-           },
-           {
-             "map_fieldvalue":{
-               "pre_value":"F",
-               "post_value":"FATAL"
-             }
-           }
-         ]
-       }
-     },
-    {
-      "filter":"grok",
-      "conditions":{
-        "fields":{
-          "type":[
-            "ams_monitor"
-          ]
-        }
-      },
-      "log4j_format":"",
-      "multiline_pattern":"^(%{TIMESTAMP_ISO8601:logtime})",
-      
"message_pattern":"(?m)^%{TIMESTAMP_ISO8601:logtime}%{SPACE}\\[%{LOGLEVEL:level}\\]%{SPACE}%{JAVAFILE:file}:%{INT:line_number}%{SPACE}-%{SPACE}%{GREEDYDATA:log_message}",
-      "post_map_values":{
-        "logtime":{
-          "map_date":{
-            "target_date_pattern":"yyyy-MM-dd HH:mm:ss,SSS"
-          }
-         }
-       },
-      "level":[
-        {
-          "map_fieldvalue":{
-            "pre_value":"WARNING",
-            "post_value":"WARN"
-          }
-        }
-      ]
-     }
-   ]
- }
-    </value>
-    <value-attributes>
-      <type>content</type>
-      <show-property-name>false</show-property-name>
-    </value-attributes>
-    <on-ambari-upgrade add="true"/>
-  </property>
-</configuration>

Reply via email to