Revert "AMBARI-9034. Add ability to change log and pid dirs for AMS daemons. Log dir fix. (swagle)"

This reverts commit 78efd0483f56026059f858b0eedaa8ba5db24e50.

ambari-metrics/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector

@@ -31,7 +31,7 @@ HBASE_CONF_DIR=/etc/ams-hbase/conf
 
 METRIC_COLLECTOR=ambari-metrics-collector
 
-AMS_LOG_DIR=/var/log/ambari-metrics-collector
+AMS_LOG_DIR=/var/log/ambari-metric-collector
 
 STOP_TIMEOUT=5
 

ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-env.xml

@@ -27,22 +27,22 @@
   </property>
   <property>
     <name>ams_collector_log_dir</name>
-    <value>/var/log/ambari-metrics-collector</value>
+    <value>/var/log/ambari-metric-collector</value>
     <description>Collector log directory.</description>
   </property>
   <property>
     <name>ams_collector_pid_dir</name>
-    <value>/var/run/ambari-metrics-collector</value>
+    <value>/var/run/ambari-metric-collector</value>
     <description>Collector pid directory.</description>
   </property>
   <property>
     <name>ams_monitor_pid_dir</name>
-    <value>/var/run/ambari-metrics-monitor</value>
+    <value>/var/run/ambari-metric-monitor</value>
     <description>Monitor pid directory.</description>
   </property>
   <property>
     <name>ams_monitor_log_dir</name>
-    <value>/var/log/ambari-metrics-monitor</value>
+    <value>/var/log/ambari-metric-monitor</value>
     <description>Monitor log directory.</description>
   </property>