http://git-wip-us.apache.org/repos/asf/ambari/blob/0aab3803/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/scripts/status_params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/scripts/status_params.py b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/scripts/status_params.py deleted file mode 100755 index d446baa..0000000 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/scripts/status_params.py +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env python -""" -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. - -""" - -from resource_management import * -from ambari_commons import OSCheck - -if OSCheck.is_windows_family(): - from params_windows import * -else: - from params_linux import * - -hbase_pid_dir = config['configurations']['ams-hbase-env']['hbase_pid_dir'] -hbase_user = ams_user -ams_collector_pid_dir = config['configurations']['ams-env']['metrics_collector_pid_dir'] -ams_monitor_pid_dir = config['configurations']['ams-env']['metrics_monitor_pid_dir'] - -security_enabled = config['configurations']['cluster-env']['security_enabled'] -ams_hbase_conf_dir = format("{hbase_conf_dir}") - -kinit_path_local = functions.get_kinit_path(default('/configurations/kerberos-env/executable_search_paths', None)) -hostname = config['hostname'] -tmp_dir = Script.get_tmp_dir()
http://git-wip-us.apache.org/repos/asf/ambari/blob/0aab3803/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/templates/ams.conf.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/templates/ams.conf.j2 b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/templates/ams.conf.j2 deleted file mode 100755 index c5fbc9b..0000000 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/templates/ams.conf.j2 +++ /dev/null @@ -1,35 +0,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. -#} - -# 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. - -{{ams_user}} - nofile {{max_open_files_limit}} -{{ams_user}} - nproc 65536 http://git-wip-us.apache.org/repos/asf/ambari/blob/0aab3803/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/templates/ams_collector_jaas.conf.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/templates/ams_collector_jaas.conf.j2 b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/templates/ams_collector_jaas.conf.j2 deleted file mode 100755 index f7f00eb..0000000 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/templates/ams_collector_jaas.conf.j2 +++ /dev/null @@ -1,26 +0,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. -#} - -Client { -com.sun.security.auth.module.Krb5LoginModule required -useKeyTab=true -storeKey=true -useTicketCache=false -keyTab="{{ams_collector_keytab_path}}" -principal="{{ams_collector_jaas_princ}}"; -}; http://git-wip-us.apache.org/repos/asf/ambari/blob/0aab3803/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/templates/ams_zookeeper_jaas.conf.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/templates/ams_zookeeper_jaas.conf.j2 b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/templates/ams_zookeeper_jaas.conf.j2 deleted file mode 100755 index 1929548..0000000 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/templates/ams_zookeeper_jaas.conf.j2 +++ /dev/null @@ -1,26 +0,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. -#} - -Server { -com.sun.security.auth.module.Krb5LoginModule required -useKeyTab=true -storeKey=true -useTicketCache=false -keyTab="{{ams_zookeeper_keytab}}" -principal="{{ams_zookeeper_principal_name}}"; -}; http://git-wip-us.apache.org/repos/asf/ambari/blob/0aab3803/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/templates/hadoop-metrics2-hbase.properties.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/templates/hadoop-metrics2-hbase.properties.j2 b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/templates/hadoop-metrics2-hbase.properties.j2 deleted file mode 100755 index a65ea88..0000000 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/templates/hadoop-metrics2-hbase.properties.j2 +++ /dev/null @@ -1,63 +0,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. -#} - -# 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. - -# syntax: [prefix].[source|sink|jmx].[instance].[options] -# See package.html for org.apache.hadoop.metrics2 for details - -# HBase-specific configuration to reset long-running stats (e.g. compactions) -# If this variable is left out, then the default is no expiration. -hbase.extendedperiod = 3600 - -hbase.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink -hbase.period=30 -hbase.collector={{metric_collector_host}}:{{metric_collector_port}} - -jvm.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink -jvm.period=30 -jvm.collector={{metric_collector_host}}:{{metric_collector_port}} - -rpc.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink -rpc.period=30 -rpc.collector={{metric_collector_host}}:{{metric_collector_port}} - -*.timeline.plugin.urls=file:///usr/lib/ambari-metrics-hadoop-sink/ambari-metrics-hadoop-sink.jar -*.sink.timeline.slave.host.name={{hostname}} -hbase.sink.timeline.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink -hbase.sink.timeline.period={{metrics_collection_period}} -hbase.sink.timeline.sendInterval={{metrics_report_interval}}000 -hbase.sink.timeline.collector={{metric_collector_host}}:{{metric_collector_port}} -hbase.sink.timeline.serviceName-prefix=ams - -# Switch off metrics generation on a per region basis -*.source.filter.class=org.apache.hadoop.metrics2.filter.GlobFilter -hbase.*.source.filter.exclude=*Regions* http://git-wip-us.apache.org/repos/asf/ambari/blob/0aab3803/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/templates/hbase_client_jaas.conf.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/templates/hbase_client_jaas.conf.j2 b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/templates/hbase_client_jaas.conf.j2 deleted file mode 100755 index 38f9721..0000000 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/templates/hbase_client_jaas.conf.j2 +++ /dev/null @@ -1,23 +0,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. -#} - -Client { -com.sun.security.auth.module.Krb5LoginModule required -useKeyTab=false -useTicketCache=true; -}; http://git-wip-us.apache.org/repos/asf/ambari/blob/0aab3803/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/templates/hbase_grant_permissions.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/templates/hbase_grant_permissions.j2 b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/templates/hbase_grant_permissions.j2 deleted file mode 100755 index c29c674..0000000 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/templates/hbase_grant_permissions.j2 +++ /dev/null @@ -1,39 +0,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. -#} - -# -# 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. -# -# -grant '{{smoke_test_user}}', '{{smokeuser_permissions}}' -exit http://git-wip-us.apache.org/repos/asf/ambari/blob/0aab3803/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/templates/hbase_master_jaas.conf.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/templates/hbase_master_jaas.conf.j2 b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/templates/hbase_master_jaas.conf.j2 deleted file mode 100755 index a93c36c..0000000 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/templates/hbase_master_jaas.conf.j2 +++ /dev/null @@ -1,26 +0,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. -#} - -Client { -com.sun.security.auth.module.Krb5LoginModule required -useKeyTab=true -storeKey=true -useTicketCache=false -keyTab="{{master_keytab_path}}" -principal="{{master_jaas_princ}}"; -}; http://git-wip-us.apache.org/repos/asf/ambari/blob/0aab3803/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/templates/hbase_regionserver_jaas.conf.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/templates/hbase_regionserver_jaas.conf.j2 b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/templates/hbase_regionserver_jaas.conf.j2 deleted file mode 100755 index 7097481..0000000 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/templates/hbase_regionserver_jaas.conf.j2 +++ /dev/null @@ -1,26 +0,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. -#} - -Client { -com.sun.security.auth.module.Krb5LoginModule required -useKeyTab=true -storeKey=true -useTicketCache=false -keyTab="{{regionserver_keytab_path}}" -principal="{{regionserver_jaas_princ}}"; -}; http://git-wip-us.apache.org/repos/asf/ambari/blob/0aab3803/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/templates/metric_groups.conf.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/templates/metric_groups.conf.j2 b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/templates/metric_groups.conf.j2 deleted file mode 100755 index aa03d195..0000000 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/templates/metric_groups.conf.j2 +++ /dev/null @@ -1,37 +0,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. -#} - -{ - "host_metric_groups": { - "all": { - "collect_every": "10", - "metrics": [ - { - "name": "bytes_out", - "value_threshold": "128" - } - ] - } - }, - "process_metric_groups": { - "": { - "collect_every": "15", - "metrics": [] - } - } -} http://git-wip-us.apache.org/repos/asf/ambari/blob/0aab3803/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/templates/metric_monitor.ini.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/templates/metric_monitor.ini.j2 b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/templates/metric_monitor.ini.j2 deleted file mode 100755 index fc86a58..0000000 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/templates/metric_monitor.ini.j2 +++ /dev/null @@ -1,31 +0,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. -#} - -[default] -debug_level = INFO -metrics_server = {{metric_collector_host}}:{{metric_collector_port}} -hostname = {{hostname}} -enable_time_threshold = false -enable_value_threshold = false - -[emitter] -send_interval = {{metrics_report_interval}} - -[collector] -collector_sleep_interval = 5 -max_queue_size = 5000 http://git-wip-us.apache.org/repos/asf/ambari/blob/0aab3803/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/templates/regionservers.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/templates/regionservers.j2 b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/templates/regionservers.j2 deleted file mode 100755 index 81d060b..0000000 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/templates/regionservers.j2 +++ /dev/null @@ -1,20 +0,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. -#} - -{% for host in rs_hosts %}{{host}} -{% endfor %} http://git-wip-us.apache.org/repos/asf/ambari/blob/0aab3803/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/templates/smoketest_metrics.json.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/templates/smoketest_metrics.json.j2 b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/templates/smoketest_metrics.json.j2 deleted file mode 100755 index 2ee0efa..0000000 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/templates/smoketest_metrics.json.j2 +++ /dev/null @@ -1,15 +0,0 @@ -{ - "metrics": [ - { - "metricname": "AMBARI_METRICS.SmokeTest.FakeMetric", - "appid": "amssmoketestfake", - "hostname": "{{hostname}}", - "timestamp": {{current_time}}, - "starttime": {{current_time}}, - "metrics": { - "{{current_time}}": {{random1}}, - "{{current_time + 1000}}": {{current_time}} - } - } - ] -} http://git-wip-us.apache.org/repos/asf/ambari/blob/0aab3803/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/widgets.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/widgets.json b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/widgets.json index 85082d0..d6b1ec4 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/widgets.json +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/widgets.json @@ -12,15 +12,15 @@ "is_visible": true, "metrics": [ { - "name": "jvm.JvmMetrics.GcCount", - "metric_path": "metrics/jvm/gcCount", + "name": "jvm.JvmMetrics.GcCount._rate", + "metric_path": "metrics/jvm/gcCount._rate", "service_name": "HDFS", "component_name": "NAMENODE", "host_component_criteria": "host_components/metrics/dfs/FSNamesystem/HAState=active" }, { - "name": "jvm.JvmMetrics.GcCountConcurrentMarkSweep", - "metric_path": "metrics/jvm/GcCountConcurrentMarkSweep", + "name": "jvm.JvmMetrics.GcCountConcurrentMarkSweep._rate", + "metric_path": "metrics/jvm/GcCountConcurrentMarkSweep._rate", "service_name": "HDFS", "component_name": "NAMENODE", "host_component_criteria": "host_components/metrics/dfs/FSNamesystem/HAState=active" @@ -29,11 +29,11 @@ "values": [ { "name": "GC total count", - "value": "${jvm.JvmMetrics.GcCount}" + "value": "${jvm.JvmMetrics.GcCount._rate}" }, { "name": "GC count of type major collection", - "value": "${jvm.JvmMetrics.GcCountConcurrentMarkSweep}" + "value": "${jvm.JvmMetrics.GcCountConcurrentMarkSweep._rate}" } ], "properties": { @@ -48,8 +48,8 @@ "is_visible": true, "metrics": [ { - "name": "jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep", - "metric_path": "metrics/jvm/GcTimeMillisConcurrentMarkSweep", + "name": "jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep._rate", + "metric_path": "metrics/jvm/GcTimeMillisConcurrentMarkSweep._rate", "service_name": "HDFS", "component_name": "NAMENODE", "host_component_criteria": "host_components/metrics/dfs/FSNamesystem/HAState=active" @@ -58,7 +58,7 @@ "values": [ { "name": "GC time in major collection", - "value": "${jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep}" + "value": "${jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep._rate}" } ], "properties": { @@ -74,8 +74,16 @@ "is_visible": true, "metrics": [ { - "name": "rpc.rpc.NumOpenConnections", - "metric_path": "metrics/rpc/NumOpenConnections", + "name": "rpc.rpc.client.NumOpenConnections", + "metric_path": "metrics/rpc/client/NumOpenConnections", + "category": "", + "service_name": "HDFS", + "component_name": "NAMENODE", + "host_component_criteria": "host_components/metrics/dfs/FSNamesystem/HAState=active" + }, + { + "name": "rpc.rpc.datanode.NumOpenConnections", + "metric_path": "metrics/rpc/datanode/NumOpenConnections", "category": "", "service_name": "HDFS", "component_name": "NAMENODE", @@ -84,8 +92,12 @@ ], "values": [ { - "name": "Open Connections", - "value": "${rpc.rpc.NumOpenConnections}" + "name": "Open Client Connections", + "value": "${rpc.rpc.client.NumOpenConnections}" + }, + { + "name": "Open Datanode Connections", + "value": "${rpc.rpc.datanode.NumOpenConnections}" } ], "properties": { @@ -184,13 +196,6 @@ "service_name": "HDFS", "component_name": "NAMENODE", "host_component_criteria": "host_components/metrics/dfs/FSNamesystem/HAState=active" - }, - { - "name": "mem_cached", - "metric_path": "metrics/memory/mem_cached", - "service_name": "HDFS", - "component_name": "NAMENODE", - "host_component_criteria": "host_components/metrics/dfs/FSNamesystem/HAState=active" } ], "values": [ @@ -200,7 +205,7 @@ }, { "name": "Memory utilization", - "value": "${((mem_total - mem_free - mem_cached)/mem_total) * 100}" + "value": "${((mem_total - mem_free)/mem_total) * 100}" } ], "properties": { @@ -216,15 +221,29 @@ "is_visible": true, "metrics": [ { - "name": "rpc.rpc.RpcQueueTimeAvgTime", - "metric_path": "metrics/rpc/RpcQueueTime_avg_time", + "name": "rpc.rpc.client.RpcQueueTimeAvgTime", + "metric_path": "metrics/rpc/client/RpcQueueTime_avg_time", + "service_name": "HDFS", + "component_name": "NAMENODE", + "host_component_criteria": "host_components/metrics/dfs/FSNamesystem/HAState=active" + }, + { + "name": "rpc.rpc.client.RpcProcessingTimeAvgTime", + "metric_path": "metrics/rpc/client/RpcProcessingTime_avg_time", + "service_name": "HDFS", + "component_name": "NAMENODE", + "host_component_criteria": "host_components/metrics/dfs/FSNamesystem/HAState=active" + }, + { + "name": "rpc.rpc.datanode.RpcQueueTimeAvgTime", + "metric_path": "metrics/rpc/datanode/RpcQueueTime_avg_time", "service_name": "HDFS", "component_name": "NAMENODE", "host_component_criteria": "host_components/metrics/dfs/FSNamesystem/HAState=active" }, { - "name": "rpc.rpc.RpcProcessingTimeAvgTime", - "metric_path": "metrics/rpc/RpcProcessingTime_avg_time", + "name": "rpc.rpc.datanode.RpcProcessingTimeAvgTime", + "metric_path": "metrics/rpc/datanode/RpcProcessingTime_avg_time", "service_name": "HDFS", "component_name": "NAMENODE", "host_component_criteria": "host_components/metrics/dfs/FSNamesystem/HAState=active" @@ -232,12 +251,20 @@ ], "values": [ { - "name": "RPC Queue Wait time", - "value": "${rpc.rpc.RpcQueueTimeAvgTime}" + "name": "Client RPC Queue Wait time", + "value": "${rpc.rpc.client.RpcQueueTimeAvgTime}" + }, + { + "name": "Client RPC Processing time", + "value": "${rpc.rpc.client.RpcProcessingTimeAvgTime}" }, { - "name": "RPC Processing time", - "value": "${rpc.rpc.RpcProcessingTimeAvgTime}" + "name": "Datanode RPC Queue Wait time", + "value": "${rpc.rpc.datanode.RpcQueueTimeAvgTime}" + }, + { + "name": "Datanode RPC Processing time", + "value": "${rpc.rpc.datanode.RpcProcessingTimeAvgTime}" } ], "properties": { @@ -248,13 +275,13 @@ }, { "widget_name": "NameNode Operations", - "description": "Total number of file operation over time.", + "description": "Rate per second of number of file operation over time.", "widget_type": "GRAPH", "is_visible": false, "metrics": [ { - "name": "dfs.namenode.TotalFileOps", - "metric_path": "metrics/dfs/namenode/TotalFileOps", + "name": "dfs.namenode.TotalFileOps._rate", + "metric_path": "metrics/dfs/namenode/TotalFileOps._rate", "service_name": "HDFS", "component_name": "NAMENODE", "host_component_criteria": "host_components/metrics/dfs/FSNamesystem/HAState=active" @@ -263,7 +290,7 @@ "values": [ { "name": "NameNode File Operations", - "value": "${dfs.namenode.TotalFileOps}" + "value": "${dfs.namenode.TotalFileOps._rate}" } ], "properties": { @@ -278,8 +305,8 @@ "is_visible": true, "metrics": [ { - "name": "dfs.datanode.VolumeFailures._sum", - "metric_path": "metrics/dfs/datanode/VolumeFailures._sum", + "name": "FSDatasetState.org.apache.hadoop.hdfs.server.datanode.fsdataset.impl.FsDatasetImpl.NumFailedVolumes._sum", + "metric_path": "metrics/dfs/datanode/NumFailedVolumes", "service_name": "HDFS", "component_name": "DATANODE" } @@ -287,7 +314,7 @@ "values": [ { "name": "Failed disk volumes", - "value": "${dfs.datanode.VolumeFailures._sum}" + "value": "${FSDatasetState.org.apache.hadoop.hdfs.server.datanode.fsdataset.impl.FsDatasetImpl.NumFailedVolumes._sum}" } ], "properties": { @@ -295,8 +322,8 @@ } }, { - "widget_name": "Corrupted Blocks", - "description": "Number represents data blocks that have become corrupted or missing. Its indicative of HDFS bad health.", + "widget_name": "Blocks With Corrupted Replicas", + "description": "Number represents data blocks with at least one corrupted replica (but not all of them). Its indicative of HDFS bad health.", "widget_type": "NUMBER", "is_visible": true, "metrics": [ @@ -304,12 +331,13 @@ "name": "Hadoop:service=NameNode,name=FSNamesystem.CorruptBlocks", "metric_path": "metrics/dfs/FSNamesystem/CorruptBlocks", "service_name": "HDFS", - "component_name": "NAMENODE" + "component_name": "NAMENODE", + "host_component_criteria": "host_components/metrics/dfs/FSNamesystem/HAState=active" } ], "values": [ { - "name": "Corrupted Blocks", + "name": "Blocks With Corrupted Replicas", "value": "${Hadoop:service=NameNode,name=FSNamesystem.CorruptBlocks}" } ], @@ -328,7 +356,8 @@ "name": "Hadoop:service=NameNode,name=FSNamesystem.UnderReplicatedBlocks", "metric_path": "metrics/dfs/FSNamesystem/UnderReplicatedBlocks", "service_name": "HDFS", - "component_name": "NAMENODE" + "component_name": "NAMENODE", + "host_component_criteria": "host_components/metrics/dfs/FSNamesystem/HAState=active" } ], "values": [ @@ -341,36 +370,12 @@ "warning_threshold": "0", "error_threshold": "50" } - }, - { - "widget_name": "DataNode JVM Heap Memory Used", - "description": "DataNode JVM Heap Memory Used", - "widget_type": "NUMBER", - "is_visible": true, - "metrics": [ - { - "name": "Hadoop:service=DataNode,name=JvmMetrics.MemHeapUsedM", - "metric_path": "metrics/jvm/memHeapUsedM", - "service_name": "HDFS", - "component_name": "DATANODE" - } - ], - "values": [ - { - "name": "DataNode JVM Heap Memory Used", - "value": "${Hadoop:service=DataNode,name=JvmMetrics.MemHeapUsedM}" - } - ], - "properties": { - "display_unit": "MB", - "max_limit": "512" - } }, { "widget_name": "HDFS Space Utilization", "description": "Percentage of available space used in the DFS.", "widget_type": "GAUGE", - "is_visible": false, + "is_visible": true, "metrics": [ { "name": "FSDatasetState.org.apache.hadoop.hdfs.server.datanode.fsdataset.impl.FsDatasetImpl.DfsUsed", @@ -395,6 +400,30 @@ "warning_threshold": "0.75", "error_threshold": "0.9" } + }, + { + "widget_name": "DataNode JVM Heap Memory Used", + "description": "DataNode JVM Heap Memory Used", + "widget_type": "NUMBER", + "is_visible": true, + "metrics": [ + { + "name": "Hadoop:service=DataNode,name=JvmMetrics.MemHeapUsedM", + "metric_path": "metrics/jvm/memHeapUsedM", + "service_name": "HDFS", + "component_name": "DATANODE" + } + ], + "values": [ + { + "name": "DataNode JVM Heap Memory Used", + "value": "${Hadoop:service=DataNode,name=JvmMetrics.MemHeapUsedM}" + } + ], + "properties": { + "display_unit": "MB", + "max_limit": "512" + } } ] }, @@ -411,8 +440,8 @@ "is_visible": true, "metrics": [ { - "name": "dfs.datanode.BytesRead", - "metric_path": "metrics/dfs/datanode/bytes_read", + "name": "dfs.datanode.BytesRead._rate", + "metric_path": "metrics/dfs/datanode/bytes_read._rate", "service_name": "HDFS", "component_name": "DATANODE" } @@ -420,7 +449,7 @@ "values": [ { "name": "HDFS Bytes Read", - "value": "${dfs.datanode.BytesRead}" + "value": "${dfs.datanode.BytesRead._rate}" } ], "properties": { @@ -435,8 +464,8 @@ "is_visible": false, "metrics": [ { - "name": "dfs.datanode.BytesWritten", - "metric_path": "metrics/dfs/datanode/bytes_written", + "name": "dfs.datanode.BytesWritten._rate", + "metric_path": "metrics/dfs/datanode/bytes_written._rate", "service_name": "HDFS", "component_name": "DATANODE" } @@ -444,7 +473,7 @@ "values": [ { "name": "HDFS Bytes Written", - "value": "${dfs.datanode.BytesWritten}" + "value": "${dfs.datanode.BytesWritten._rate}" } ], "properties": { @@ -532,26 +561,26 @@ "is_visible": false, "metrics": [ { - "name": "dfs.datanode.BytesRead", - "metric_path": "metrics/dfs/datanode/bytes_read", + "name": "dfs.datanode.BytesRead._rate", + "metric_path": "metrics/dfs/datanode/bytes_read._rate", "service_name": "HDFS", "component_name": "DATANODE" }, { - "name": "dfs.datanode.BytesWritten", - "metric_path": "metrics/dfs/datanode/bytes_written", + "name": "dfs.datanode.BytesWritten._rate", + "metric_path": "metrics/dfs/datanode/bytes_written._rate", "service_name": "HDFS", "component_name": "DATANODE" }, { - "name": "dfs.datanode.TotalReadTime", - "metric_path": "metrics/dfs/datanode/total_read_time", + "name": "dfs.datanode.TotalReadTime._rate", + "metric_path": "metrics/dfs/datanode/TotalReadTime._rate", "service_name": "HDFS", "component_name": "DATANODE" }, { - "name": "dfs.datanode.TotalWriteTime", - "metric_path": "metrics/dfs/datanode/total_write_time", + "name": "dfs.datanode.TotalWriteTime._rate", + "metric_path": "metrics/dfs/datanode/TotalWriteTime._rate", "service_name": "HDFS", "component_name": "DATANODE" } @@ -559,7 +588,7 @@ "values": [ { "name": "DataNode Process Disk I/O Utilization", - "value": "${(((dfs.datanode.BytesRead/dfs.datanode.TotalReadTime)+(dfs.datanode.BytesWritten/dfs.datanode.TotalWriteTime))*50}" + "value": "${((dfs.datanode.BytesRead._rate/dfs.datanode.TotalReadTime._rate)+(dfs.datanode.BytesWritten._rate/dfs.datanode.TotalWriteTime._rate))*50}" } ], "properties": { @@ -574,26 +603,26 @@ "is_visible": false, "metrics": [ { - "name": "dfs.datanode.RemoteBytesRead", - "metric_path": "metrics/dfs/datanode/remote_bytes_read", + "name": "dfs.datanode.RemoteBytesRead._rate", + "metric_path": "metrics/dfs/datanode/RemoteBytesRead._rate", "service_name": "HDFS", "component_name": "DATANODE" }, { - "name": "dfs.datanode.ReadsFromRemoteClient", - "metric_path": "metrics/dfs/datanode/reads_from_remote_client", + "name": "dfs.datanode.ReadsFromRemoteClient._rate", + "metric_path": "metrics/dfs/datanode/reads_from_remote_client._rate", "service_name": "HDFS", "component_name": "DATANODE" }, { - "name": "dfs.datanode.RemoteBytesWritten", - "metric_path": "metrics/dfs/datanode/remote_bytes_written", + "name": "dfs.datanode.RemoteBytesWritten._rate", + "metric_path": "metrics/dfs/datanode/RemoteBytesWritten._rate", "service_name": "HDFS", "component_name": "DATANODE" }, { - "name": "dfs.datanode.WritesFromRemoteClient", - "metric_path": "metrics/dfs/datanode/writes_from_remote_client", + "name": "dfs.datanode.WritesFromRemoteClient._rate", + "metric_path": "metrics/dfs/datanode/writes_from_remote_client._rate", "service_name": "HDFS", "component_name": "DATANODE" } @@ -601,7 +630,7 @@ "values": [ { "name": "DataNode Process Network I/O Utilization", - "value": "${((dfs.datanode.RemoteBytesRead/dfs.datanode.ReadsFromRemoteClient)+(dfs.datanode.RemoteBytesWritten/dfs.datanode.WritesFromRemoteClient))*50}" + "value": "${((dfs.datanode.RemoteBytesRead._rate/dfs.datanode.ReadsFromRemoteClient._rate)+(dfs.datanode.RemoteBytesWritten._rate/dfs.datanode.WritesFromRemoteClient._rate))*50}" } ], "properties": { http://git-wip-us.apache.org/repos/asf/ambari/blob/0aab3803/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py index c2714e2..bd86b50 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py @@ -331,11 +331,17 @@ if dfs_ha_enabled: namenode_rpc = nn_host pass pass +elif 'dfs.namenode.rpc-address' in config['configurations']['hdfs-site']: + namenode_rpc = default('/configurations/hdfs-site/dfs.namenode.rpc-address', None) else: - namenode_rpc = default('/configurations/hdfs-site/dfs.namenode.rpc-address', None) + namenode_rpc = default('/configurations/core-site/fs.defaultFS', None) if namenode_rpc: - nn_rpc_client_port = namenode_rpc.split(':')[1].strip() + port_str = namenode_rpc.split(':')[-1].strip() + try: + nn_rpc_client_port = int(port_str) + except ValueError: + nn_rpc_client_port = None if dfs_ha_enabled: dfs_service_rpc_address = default(format('/configurations/hdfs-site/dfs.namenode.servicerpc-address.{dfs_ha_nameservices}.{namenode_id}'), None)
