This is an automated email from the ASF dual-hosted git repository.
houyu pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 803d5196f7 AMBARI-25913: Align version of Ambari Metrics (#3673)
803d5196f7 is described below
commit 803d5196f7ad9c3940221d2de1954328285d09e7
Author: Zhiguo Wu <wuzhi...@apache.org>
AuthorDate: Tue Mar 28 20:44:15 2023 +0800
AMBARI-25913: Align version of Ambari Metrics (#3673)
* AMBARI-25913: Align version of Ambari Metrics
* revert unexpected changes
* Fix import error
* Update property: min_ambari_metrics_hadoop_sink_version
---
.../common-services/AMBARI_METRICS/{2.0.0 => 3.0.0}/alerts.json | 2 +-
.../AMBARI_METRICS/{2.0.0 => 3.0.0}/configuration/ams-env.xml | 2 +-
.../AMBARI_METRICS/{2.0.0 => 3.0.0}/configuration/ams-grafana-env.xml | 0
.../AMBARI_METRICS/{2.0.0 => 3.0.0}/configuration/ams-grafana-ini.xml | 0
.../AMBARI_METRICS/{2.0.0 => 3.0.0}/configuration/ams-hbase-env.xml | 0
.../AMBARI_METRICS/{2.0.0 => 3.0.0}/configuration/ams-hbase-log4j.xml | 0
.../AMBARI_METRICS/{2.0.0 => 3.0.0}/configuration/ams-hbase-policy.xml | 0
.../{2.0.0 => 3.0.0}/configuration/ams-hbase-security-site.xml | 0
.../AMBARI_METRICS/{2.0.0 => 3.0.0}/configuration/ams-hbase-site.xml | 0
.../AMBARI_METRICS/{2.0.0 => 3.0.0}/configuration/ams-log4j.xml | 0
.../AMBARI_METRICS/{2.0.0 => 3.0.0}/configuration/ams-site.xml | 0
.../AMBARI_METRICS/{2.0.0 => 3.0.0}/configuration/ams-ssl-client.xml | 0
.../AMBARI_METRICS/{2.0.0 => 3.0.0}/configuration/ams-ssl-server.xml | 0
.../common-services/AMBARI_METRICS/{2.0.0 => 3.0.0}/kerberos.json | 0
.../common-services/AMBARI_METRICS/{2.0.0 => 3.0.0}/metainfo.xml | 2 +-
.../common-services/AMBARI_METRICS/{2.0.0 => 3.0.0}/metrics.json | 0
.../{2.0.0 => 3.0.0}/package/alerts/alert_ambari_metrics_monitor.py | 0
.../grafana-dashboards/default/grafana-ambari-server-database.json | 0
.../files/grafana-dashboards/default/grafana-ambari-server-topn.json | 0
.../package/files/grafana-dashboards/default/grafana-ambari-server.json | 0
.../files/grafana-dashboards/default/grafana-ams-hbase-home.json | 0
.../files/grafana-dashboards/default/grafana-ams-hbase-misc.json | 0
.../grafana-dashboards/default/grafana-ams-hbase-regionservers.json | 0
.../package/files/grafana-dashboards/default/grafana-system-home.json | 0
.../files/grafana-dashboards/default/grafana-system-servers.json | 0
.../AMBARI_METRICS/{2.0.0 => 3.0.0}/package/files/hbaseSmokeVerify.sh | 0
.../{2.0.0 => 3.0.0}/package/files/service-metrics/AMBARI_METRICS.txt | 0
.../{2.0.0 => 3.0.0}/package/files/service-metrics/HBASE.txt | 0
.../{2.0.0 => 3.0.0}/package/files/service-metrics/HDFS.txt | 0
.../{2.0.0 => 3.0.0}/package/files/service-metrics/HIVE.txt | 0
.../{2.0.0 => 3.0.0}/package/files/service-metrics/HOST.txt | 0
.../{2.0.0 => 3.0.0}/package/files/service-metrics/KAFKA.txt | 0
.../{2.0.0 => 3.0.0}/package/files/service-metrics/YARN.txt | 0
.../AMBARI_METRICS/{2.0.0 => 3.0.0}/package/scripts/__init__.py | 0
.../AMBARI_METRICS/{2.0.0 => 3.0.0}/package/scripts/ams.py | 0
.../AMBARI_METRICS/{2.0.0 => 3.0.0}/package/scripts/ams_service.py | 0
.../AMBARI_METRICS/{2.0.0 => 3.0.0}/package/scripts/functions.py | 0
.../AMBARI_METRICS/{2.0.0 => 3.0.0}/package/scripts/hbase.py | 0
.../AMBARI_METRICS/{2.0.0 => 3.0.0}/package/scripts/hbase_master.py | 0
.../{2.0.0 => 3.0.0}/package/scripts/hbase_regionserver.py | 0
.../AMBARI_METRICS/{2.0.0 => 3.0.0}/package/scripts/hbase_service.py | 0
.../{2.0.0 => 3.0.0}/package/scripts/metrics_collector.py | 0
.../AMBARI_METRICS/{2.0.0 => 3.0.0}/package/scripts/metrics_grafana.py | 0
.../{2.0.0 => 3.0.0}/package/scripts/metrics_grafana_util.py | 0
.../AMBARI_METRICS/{2.0.0 => 3.0.0}/package/scripts/metrics_monitor.py | 0
.../AMBARI_METRICS/{2.0.0 => 3.0.0}/package/scripts/params.py | 0
.../AMBARI_METRICS/{2.0.0 => 3.0.0}/package/scripts/params_linux.py | 0
.../AMBARI_METRICS/{2.0.0 => 3.0.0}/package/scripts/params_windows.py | 0
.../AMBARI_METRICS/{2.0.0 => 3.0.0}/package/scripts/service_check.py | 0
.../AMBARI_METRICS/{2.0.0 => 3.0.0}/package/scripts/service_mapping.py | 0
.../AMBARI_METRICS/{2.0.0 => 3.0.0}/package/scripts/split_points.py | 0
.../AMBARI_METRICS/{2.0.0 => 3.0.0}/package/scripts/status.py | 0
.../AMBARI_METRICS/{2.0.0 => 3.0.0}/package/scripts/status_params.py | 0
.../AMBARI_METRICS/{2.0.0 => 3.0.0}/package/templates/ams.conf.j2 | 0
.../{2.0.0 => 3.0.0}/package/templates/ams_collector_jaas.conf.j2 | 0
.../{2.0.0 => 3.0.0}/package/templates/ams_zookeeper_jaas.conf.j2 | 0
.../package/templates/hadoop-metrics2-hbase.properties.j2 | 0
.../{2.0.0 => 3.0.0}/package/templates/hbase_client_jaas.conf.j2 | 0
.../{2.0.0 => 3.0.0}/package/templates/hbase_grant_permissions.j2 | 0
.../{2.0.0 => 3.0.0}/package/templates/hbase_master_jaas.conf.j2 | 0
.../{2.0.0 => 3.0.0}/package/templates/hbase_regionserver_jaas.conf.j2 | 0
.../{2.0.0 => 3.0.0}/package/templates/metric_groups.conf.j2 | 0
.../{2.0.0 => 3.0.0}/package/templates/metric_monitor.ini.j2 | 0
.../package/templates/metrics_grafana_datasource.json.j2 | 0
.../AMBARI_METRICS/{2.0.0 => 3.0.0}/package/templates/regionservers.j2 | 0
.../{2.0.0 => 3.0.0}/package/templates/smoketest_metrics.json.j2 | 0
.../AMBARI_METRICS/{2.0.0 => 3.0.0}/quicklinks/quicklinks.json | 0
.../AMBARI_METRICS/{2.0.0 => 3.0.0}/role_command_order.json | 0
.../common-services/AMBARI_METRICS/{2.0.0 => 3.0.0}/service_advisor.py | 0
.../AMBARI_METRICS/{2.0.0 => 3.0.0}/themes/credentials.json | 0
.../AMBARI_METRICS/{2.0.0 => 3.0.0}/themes/directories.json | 0
.../common-services/AMBARI_METRICS/{2.0.0 => 3.0.0}/themes/theme.json | 0
.../resources/stacks/BIGTOP/3.2.0/services/AMBARI-METRICS/metainfo.xml | 2 +-
.../src/main/resources/stacks/BIGTOP/3.2.0/services/stack_advisor.py | 2 +-
74 files changed, 5 insertions(+), 5 deletions(-)
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/alerts.json
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/alerts.json
similarity index 99%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/alerts.json
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/alerts.json
index ab98528aec..016f13608d 100644
---
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/alerts.json
+++
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/alerts.json
@@ -153,7 +153,7 @@
"scope": "ANY",
"source": {
"type": "SCRIPT",
- "path":
"AMBARI_METRICS/2.0.0/package/alerts/alert_ambari_metrics_monitor.py"
+ "path":
"AMBARI_METRICS/3.0.0/package/alerts/alert_ambari_metrics_monitor.py"
}
}
],
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/configuration/ams-env.xml
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/configuration/ams-env.xml
similarity index 99%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/configuration/ams-env.xml
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/configuration/ams-env.xml
index a04344d0b1..d291288416 100644
---
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/configuration/ams-env.xml
+++
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/configuration/ams-env.xml
@@ -145,7 +145,7 @@
</property>
<property>
<name>min_ambari_metrics_hadoop_sink_version</name>
- <value>2.0.0.0</value>
+ <value>3.0.0</value>
<description>
Minimum version of ambari metrics hadoop sink that is compatible with
this version of AMS.
</description>
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/configuration/ams-grafana-env.xml
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/configuration/ams-grafana-env.xml
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/configuration/ams-grafana-env.xml
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/configuration/ams-grafana-env.xml
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/configuration/ams-grafana-ini.xml
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/configuration/ams-grafana-ini.xml
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/configuration/ams-grafana-ini.xml
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/configuration/ams-grafana-ini.xml
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/configuration/ams-hbase-env.xml
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/configuration/ams-hbase-env.xml
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/configuration/ams-hbase-env.xml
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/configuration/ams-hbase-env.xml
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/configuration/ams-hbase-log4j.xml
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/configuration/ams-hbase-log4j.xml
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/configuration/ams-hbase-log4j.xml
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/configuration/ams-hbase-log4j.xml
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/configuration/ams-hbase-policy.xml
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/configuration/ams-hbase-policy.xml
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/configuration/ams-hbase-policy.xml
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/configuration/ams-hbase-policy.xml
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/configuration/ams-hbase-security-site.xml
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/configuration/ams-hbase-security-site.xml
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/configuration/ams-hbase-security-site.xml
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/configuration/ams-hbase-security-site.xml
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/configuration/ams-hbase-site.xml
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/configuration/ams-hbase-site.xml
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/configuration/ams-hbase-site.xml
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/configuration/ams-hbase-site.xml
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/configuration/ams-log4j.xml
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/configuration/ams-log4j.xml
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/configuration/ams-log4j.xml
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/configuration/ams-log4j.xml
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/configuration/ams-site.xml
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/configuration/ams-site.xml
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/configuration/ams-site.xml
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/configuration/ams-site.xml
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/configuration/ams-ssl-client.xml
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/configuration/ams-ssl-client.xml
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/configuration/ams-ssl-client.xml
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/configuration/ams-ssl-client.xml
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/configuration/ams-ssl-server.xml
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/configuration/ams-ssl-server.xml
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/configuration/ams-ssl-server.xml
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/configuration/ams-ssl-server.xml
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/kerberos.json
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/kerberos.json
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/kerberos.json
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/kerberos.json
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/metainfo.xml
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/metainfo.xml
similarity index 99%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/metainfo.xml
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/metainfo.xml
index d01ef18826..6890e433fd 100644
---
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/metainfo.xml
+++
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/metainfo.xml
@@ -21,7 +21,7 @@
<service>
<name>AMBARI_METRICS</name>
<displayName>Ambari Metrics</displayName>
- <version>2.0.0</version>
+ <version>3.0.0</version>
<comment>A system for metrics collection that provides storage and
retrieval capability for metrics collected from the cluster
</comment>
<components>
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/metrics.json
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/metrics.json
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/metrics.json
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/metrics.json
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/alerts/alert_ambari_metrics_monitor.py
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/alerts/alert_ambari_metrics_monitor.py
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/alerts/alert_ambari_metrics_monitor.py
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/alerts/alert_ambari_metrics_monitor.py
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/files/grafana-dashboards/default/grafana-ambari-server-database.json
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/grafana-dashboards/default/grafana-ambari-server-database.json
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/files/grafana-dashboards/default/grafana-ambari-server-database.json
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/grafana-dashboards/default/grafana-ambari-server-database.json
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/files/grafana-dashboards/default/grafana-ambari-server-topn.json
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/grafana-dashboards/default/grafana-ambari-server-topn.json
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/files/grafana-dashboards/default/grafana-ambari-server-topn.json
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/grafana-dashboards/default/grafana-ambari-server-topn.json
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/files/grafana-dashboards/default/grafana-ambari-server.json
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/grafana-dashboards/default/grafana-ambari-server.json
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/files/grafana-dashboards/default/grafana-ambari-server.json
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/grafana-dashboards/default/grafana-ambari-server.json
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/files/grafana-dashboards/default/grafana-ams-hbase-home.json
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/grafana-dashboards/default/grafana-ams-hbase-home.json
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/files/grafana-dashboards/default/grafana-ams-hbase-home.json
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/grafana-dashboards/default/grafana-ams-hbase-home.json
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/files/grafana-dashboards/default/grafana-ams-hbase-misc.json
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/grafana-dashboards/default/grafana-ams-hbase-misc.json
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/files/grafana-dashboards/default/grafana-ams-hbase-misc.json
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/grafana-dashboards/default/grafana-ams-hbase-misc.json
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/files/grafana-dashboards/default/grafana-ams-hbase-regionservers.json
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/grafana-dashboards/default/grafana-ams-hbase-regionservers.json
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/files/grafana-dashboards/default/grafana-ams-hbase-regionservers.json
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/grafana-dashboards/default/grafana-ams-hbase-regionservers.json
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/files/grafana-dashboards/default/grafana-system-home.json
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/grafana-dashboards/default/grafana-system-home.json
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/files/grafana-dashboards/default/grafana-system-home.json
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/grafana-dashboards/default/grafana-system-home.json
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/files/grafana-dashboards/default/grafana-system-servers.json
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/grafana-dashboards/default/grafana-system-servers.json
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/files/grafana-dashboards/default/grafana-system-servers.json
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/grafana-dashboards/default/grafana-system-servers.json
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/files/hbaseSmokeVerify.sh
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/hbaseSmokeVerify.sh
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/files/hbaseSmokeVerify.sh
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/hbaseSmokeVerify.sh
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/files/service-metrics/AMBARI_METRICS.txt
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/service-metrics/AMBARI_METRICS.txt
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/files/service-metrics/AMBARI_METRICS.txt
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/service-metrics/AMBARI_METRICS.txt
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/files/service-metrics/HBASE.txt
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/service-metrics/HBASE.txt
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/files/service-metrics/HBASE.txt
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/service-metrics/HBASE.txt
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/files/service-metrics/HDFS.txt
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/service-metrics/HDFS.txt
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/files/service-metrics/HDFS.txt
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/service-metrics/HDFS.txt
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/files/service-metrics/HIVE.txt
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/service-metrics/HIVE.txt
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/files/service-metrics/HIVE.txt
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/service-metrics/HIVE.txt
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/files/service-metrics/HOST.txt
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/service-metrics/HOST.txt
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/files/service-metrics/HOST.txt
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/service-metrics/HOST.txt
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/files/service-metrics/KAFKA.txt
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/service-metrics/KAFKA.txt
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/files/service-metrics/KAFKA.txt
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/service-metrics/KAFKA.txt
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/files/service-metrics/YARN.txt
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/service-metrics/YARN.txt
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/files/service-metrics/YARN.txt
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/service-metrics/YARN.txt
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/scripts/__init__.py
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/scripts/__init__.py
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/scripts/__init__.py
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/scripts/__init__.py
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/scripts/ams.py
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/scripts/ams.py
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/scripts/ams.py
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/scripts/ams.py
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/scripts/ams_service.py
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/scripts/ams_service.py
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/scripts/ams_service.py
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/scripts/ams_service.py
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/scripts/functions.py
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/scripts/functions.py
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/scripts/functions.py
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/scripts/functions.py
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/scripts/hbase.py
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/scripts/hbase.py
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/scripts/hbase.py
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/scripts/hbase.py
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/scripts/hbase_master.py
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/scripts/hbase_master.py
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/scripts/hbase_master.py
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/scripts/hbase_master.py
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/scripts/hbase_regionserver.py
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/scripts/hbase_regionserver.py
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/scripts/hbase_regionserver.py
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/scripts/hbase_regionserver.py
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/scripts/hbase_service.py
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/scripts/hbase_service.py
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/scripts/hbase_service.py
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/scripts/hbase_service.py
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/scripts/metrics_collector.py
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/scripts/metrics_collector.py
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/scripts/metrics_collector.py
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/scripts/metrics_collector.py
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/scripts/metrics_grafana.py
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/scripts/metrics_grafana.py
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/scripts/metrics_grafana.py
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/scripts/metrics_grafana.py
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/scripts/metrics_grafana_util.py
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/scripts/metrics_grafana_util.py
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/scripts/metrics_grafana_util.py
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/scripts/metrics_grafana_util.py
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/scripts/metrics_monitor.py
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/scripts/metrics_monitor.py
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/scripts/metrics_monitor.py
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/scripts/metrics_monitor.py
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/scripts/params.py
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/scripts/params.py
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/scripts/params.py
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/scripts/params.py
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/scripts/params_linux.py
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/scripts/params_linux.py
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/scripts/params_linux.py
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/scripts/params_linux.py
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/scripts/params_windows.py
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/scripts/params_windows.py
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/scripts/params_windows.py
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/scripts/params_windows.py
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/scripts/service_check.py
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/scripts/service_check.py
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/scripts/service_check.py
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/scripts/service_check.py
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/scripts/service_mapping.py
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/scripts/service_mapping.py
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/scripts/service_mapping.py
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/scripts/service_mapping.py
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/scripts/split_points.py
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/scripts/split_points.py
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/scripts/split_points.py
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/scripts/split_points.py
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/scripts/status.py
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/scripts/status.py
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/scripts/status.py
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/scripts/status.py
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/scripts/status_params.py
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/scripts/status_params.py
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/scripts/status_params.py
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/scripts/status_params.py
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/templates/ams.conf.j2
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/templates/ams.conf.j2
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/templates/ams.conf.j2
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/templates/ams.conf.j2
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/templates/ams_collector_jaas.conf.j2
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/templates/ams_collector_jaas.conf.j2
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/templates/ams_collector_jaas.conf.j2
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/templates/ams_collector_jaas.conf.j2
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/templates/ams_zookeeper_jaas.conf.j2
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/templates/ams_zookeeper_jaas.conf.j2
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/templates/ams_zookeeper_jaas.conf.j2
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/templates/ams_zookeeper_jaas.conf.j2
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/templates/hadoop-metrics2-hbase.properties.j2
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/templates/hadoop-metrics2-hbase.properties.j2
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/templates/hadoop-metrics2-hbase.properties.j2
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/templates/hadoop-metrics2-hbase.properties.j2
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/templates/hbase_client_jaas.conf.j2
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/templates/hbase_client_jaas.conf.j2
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/templates/hbase_client_jaas.conf.j2
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/templates/hbase_client_jaas.conf.j2
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/templates/hbase_grant_permissions.j2
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/templates/hbase_grant_permissions.j2
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/templates/hbase_grant_permissions.j2
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/templates/hbase_grant_permissions.j2
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/templates/hbase_master_jaas.conf.j2
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/templates/hbase_master_jaas.conf.j2
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/templates/hbase_master_jaas.conf.j2
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/templates/hbase_master_jaas.conf.j2
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/templates/hbase_regionserver_jaas.conf.j2
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/templates/hbase_regionserver_jaas.conf.j2
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/templates/hbase_regionserver_jaas.conf.j2
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/templates/hbase_regionserver_jaas.conf.j2
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/templates/metric_groups.conf.j2
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/templates/metric_groups.conf.j2
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/templates/metric_groups.conf.j2
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/templates/metric_groups.conf.j2
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/templates/metric_monitor.ini.j2
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/templates/metric_monitor.ini.j2
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/templates/metric_monitor.ini.j2
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/templates/metric_monitor.ini.j2
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/templates/metrics_grafana_datasource.json.j2
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/templates/metrics_grafana_datasource.json.j2
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/templates/metrics_grafana_datasource.json.j2
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/templates/metrics_grafana_datasource.json.j2
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/templates/regionservers.j2
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/templates/regionservers.j2
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/templates/regionservers.j2
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/templates/regionservers.j2
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/templates/smoketest_metrics.json.j2
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/templates/smoketest_metrics.json.j2
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/package/templates/smoketest_metrics.json.j2
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/templates/smoketest_metrics.json.j2
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/quicklinks/quicklinks.json
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/quicklinks/quicklinks.json
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/quicklinks/quicklinks.json
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/quicklinks/quicklinks.json
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/role_command_order.json
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/role_command_order.json
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/role_command_order.json
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/role_command_order.json
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/service_advisor.py
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/service_advisor.py
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/service_advisor.py
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/service_advisor.py
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/themes/credentials.json
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/themes/credentials.json
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/themes/credentials.json
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/themes/credentials.json
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/themes/directories.json
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/themes/directories.json
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/themes/directories.json
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/themes/directories.json
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/themes/theme.json
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/themes/theme.json
similarity index 100%
rename from
ambari-server/src/main/resources/common-services/AMBARI_METRICS/2.0.0/themes/theme.json
rename to
ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/themes/theme.json
diff --git
a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/AMBARI-METRICS/metainfo.xml
b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/AMBARI-METRICS/metainfo.xml
index f1bf836e13..38dbe88871 100644
---
a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/AMBARI-METRICS/metainfo.xml
+++
b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/AMBARI-METRICS/metainfo.xml
@@ -20,7 +20,7 @@
<services>
<service>
<name>AMBARI_METRICS</name>
- <extends>common-services/AMBARI_METRICS/2.0.0</extends>
+ <extends>common-services/AMBARI_METRICS/3.0.0</extends>
</service>
</services>
</metainfo>
\ No newline at end of file
diff --git
a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/stack_advisor.py
b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/stack_advisor.py
index 9146eedf41..02c3ad4775 100644
---
a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/stack_advisor.py
+++
b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/stack_advisor.py
@@ -594,7 +594,7 @@ class BIGTOP320StackAdvisor(DefaultStackAdvisor):
#split points
scriptDir = os.path.dirname(os.path.abspath(__file__))
- metricsDir = os.path.join(scriptDir,
'../../../../common-services/AMBARI_METRICS/2.0.0/package')
+ metricsDir = os.path.join(scriptDir,
'../../../../common-services/AMBARI_METRICS/3.0.0/package')
serviceMetricsDir = os.path.join(metricsDir, 'files', 'service-metrics')
sys.path.append(os.path.join(metricsDir, 'scripts'))
servicesList = [service["StackServices"]["service_name"] for service in
services["services"]]
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@ambari.apache.org
For additional commands, e-mail: commits-h...@ambari.apache.org
