-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/53678/
-----------------------------------------------------------
(Updated Nov. 15, 2016, 4:16 p.m.)
Review request for Ambari, Aravindan Vijayan, Di Li, Jayush Luniya, and Sid
Wagle.
Changes
-------
Fixed problems with TestResourceFilesKeeper.py with
test_update_directory_archive and test_zip_directory
Fixed problem with resourceFilesKeeper.py to avoid creating a zip if the
dashboards directory doesn't exist
Bugs: AMBARI-18846
https://issues.apache.org/jira/browse/AMBARI-18846
Repository: ambari
Description
-------
Currently all dashboards are added directly in under the AMBARI_METRICS package
directory (package/files/grafana-dashboards).
In order for custom services to add dashboards, they need to add the files
directly under that folder. Each time the Ambari server is upgraded, those
files will be lost as the AMBARI_METRICS service definition will be replaced.
This JIRA proposes adding a new directory under the ambari-server/resources.
This will contain both the dashboards and metrics for custom services.
The dashboards here will not be organized by stack. Each service will add a
directory containing their dashboards and will add a metrics file.
resources/dashboards/grafana-dashboards/MY_SERVICE/<dashboards>
resources/dashboards/service-metrics/MY_SERVICE.txt
The resources/dashboards directory will need to get sync'd to the agents.
Diffs (updated)
-----
ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
57416a4
ambari-agent/src/main/python/ambari_agent/FileCache.py b7c5dee
ambari-agent/src/test/python/ambari_agent/TestCustomServiceOrchestrator.py
c9724b7
ambari-agent/src/test/python/ambari_agent/TestFileCache.py 5933daa
ambari-server/src/main/python/ambari_server/resourceFilesKeeper.py f2a3ebd
ambari-server/src/main/python/ambari_server/serverConfiguration.py 04509cf
ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana_util.py
b98dc1d
ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
b052999
ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/split_points.py
aa03d197
ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
c7c3b2b
ambari-server/src/test/python/TestResourceFilesKeeper.py 966d3b1
Diff: https://reviews.apache.org/r/53678/diff/
Testing
-------
mvn clean test -Dtest=HostResourceProviderTest
Manually added custom service dashboard and metrics to
resources/dashboards/grafana-dashboards and
resources/dashboards/service-metrics respectively, verified they were sync'd to
the agents and the dashboards appeared on the grafana UI.
Thanks,
Tim Thorpe
