You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sw...@apache.org on 2015/01/08 03:48:59 UTC
[1/3] ambari git commit: Revert "AMBARI-9034. Add ability to change
log and pid dirs for AMS daemons. Log dir fix. (swagle)"
Repository: ambari
Updated Branches:
refs/heads/trunk 78efd0483 -> 789b6544d
Revert "AMBARI-9034. Add ability to change log and pid dirs for AMS daemons. Log dir fix. (swagle)"
This reverts commit 78efd0483f56026059f858b0eedaa8ba5db24e50.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fc7394bf
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fc7394bf
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fc7394bf
Branch: refs/heads/trunk
Commit: fc7394bf99fa963e5a1e3a205d4db1fe7e80374b
Parents: 78efd04
Author: Siddharth Wagle <sw...@hortonworks.com>
Authored: Wed Jan 7 18:42:26 2015 -0800
Committer: Siddharth Wagle <sw...@hortonworks.com>
Committed: Wed Jan 7 18:42:26 2015 -0800
----------------------------------------------------------------------
.../conf/unix/ambari-metrics-collector | 2 +-
.../common-services/AMS/0.1.0/configuration/ams-env.xml | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/fc7394bf/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector b/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector
index 714fa94..aabbde8 100644
--- a/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector
+++ b/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
http://git-wip-us.apache.org/repos/asf/ambari/blob/fc7394bf/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-env.xml b/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-env.xml
index 18c4b61..c2f3d49 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-env.xml
+++ b/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>
[3/3] ambari git commit: Revert "AMBARI-9034. Add ability to change
log and pid dirs for AMS daemons. Issues with monitor start. (swagle)"
Posted by sw...@apache.org.
Revert "AMBARI-9034. Add ability to change log and pid dirs for AMS daemons. Issues with monitor start. (swagle)"
This reverts commit d111c8ee157e295cffcf63ba07736f827dfcb007.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/789b6544
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/789b6544
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/789b6544
Branch: refs/heads/trunk
Commit: 789b6544d91d1344142c88fa709a67b214aa3d3a
Parents: af38b56
Author: Siddharth Wagle <sw...@hortonworks.com>
Authored: Wed Jan 7 18:48:37 2015 -0800
Committer: Siddharth Wagle <sw...@hortonworks.com>
Committed: Wed Jan 7 18:48:37 2015 -0800
----------------------------------------------------------------------
.../conf/unix/ambari-metrics-monitor | 13 --
.../conf/unix/ambari-metrics-collector | 4 +-
.../AMS/0.1.0/configuration/ams-env.xml | 26 +---
.../AMS/0.1.0/configuration/ams-hbase-env.xml | 4 +-
.../AMS/0.1.0/configuration/ams-log4j.xml | 5 +-
.../AMS/0.1.0/package/scripts/ams.py | 5 -
.../AMS/0.1.0/package/scripts/params.py | 2 -
.../AMS/0.1.0/package/scripts/status_params.py | 4 +-
ambari-web/app/data/HDP2/site_properties.js | 140 +++++--------------
ambari-web/app/models/stack_service.js | 4 +-
10 files changed, 46 insertions(+), 161 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/789b6544/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/ambari-metrics-monitor
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/ambari-metrics-monitor b/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/ambari-metrics-monitor
index 319aa36..5779b5b 100644
--- a/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/ambari-metrics-monitor
+++ b/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/ambari-metrics-monitor
@@ -102,19 +102,6 @@ while [[ -z "${_ams_configs_done}" ]]; do
esac
done
-#execute ams-env.sh
-if [[ -f "${MONITOR_CONF_DIR}/ams-env.sh" ]]; then
- . "${MONITOR_CONF_DIR}/ams-env.sh"
-else
- echo "ERROR: Cannot execute ${MONITOR_CONF_DIR}/ams-env.sh." 2>&1
- exit 1
-fi
-
-# Set log directory path
-if [[ -n "${AMS_MONITOR_LOG_DIR}" ]]; then
- OUTFILE=${AMS_MONITOR_LOG_DIR}/ambari-metrics-monitor.out
-fi
-
case "$1" in
start)
http://git-wip-us.apache.org/repos/asf/ambari/blob/789b6544/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector b/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector
index aabbde8..9aabbdc 100644
--- a/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector
+++ b/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector
@@ -31,8 +31,6 @@ HBASE_CONF_DIR=/etc/ams-hbase/conf
METRIC_COLLECTOR=ambari-metrics-collector
-AMS_LOG_DIR=/var/log/ambari-metric-collector
-
STOP_TIMEOUT=5
function hbase_daemon
@@ -202,7 +200,7 @@ case "$1" in
rm -f "${PIDFILE}" >/dev/null 2>&1
fi
- nohup "${JAVA}" "-cp" "/usr/lib/ambari-metrics-collector/*:${COLLECTOR_CONF_DIR}" "-Djava.net.preferIPv4Stack=true" "-Dams.log.dir=${AMS_COLLECTOR_LOG_DIR}" "-Dproc_${DAEMON_NAME}" "${CLASS}" "$@" > $OUTFILE 2>&1 &
+ nohup "${JAVA}" "-cp" "/usr/lib/ambari-metrics-collector/*:${COLLECTOR_CONF_DIR}" "-Djava.net.preferIPv4Stack=true" "-Dproc_${DAEMON_NAME}" "${CLASS}" "$@" > $OUTFILE 2>&1 &
PID=$!
write_pidfile "${PIDFILE}"
sleep 2
http://git-wip-us.apache.org/repos/asf/ambari/blob/789b6544/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-env.xml b/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-env.xml
index c2f3d49..fda1df0 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-env.xml
+++ b/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-env.xml
@@ -25,26 +25,6 @@
<property-type>USER</property-type>
<description>AMS User Name.</description>
</property>
- <property>
- <name>ams_collector_log_dir</name>
- <value>/var/log/ambari-metric-collector</value>
- <description>Collector log directory.</description>
- </property>
- <property>
- <name>ams_collector_pid_dir</name>
- <value>/var/run/ambari-metric-collector</value>
- <description>Collector pid directory.</description>
- </property>
- <property>
- <name>ams_monitor_pid_dir</name>
- <value>/var/run/ambari-metric-monitor</value>
- <description>Monitor pid directory.</description>
- </property>
- <property>
- <name>ams_monitor_log_dir</name>
- <value>/var/log/ambari-metric-monitor</value>
- <description>Monitor log directory.</description>
- </property>
<property>
<name>content</name>
@@ -54,11 +34,7 @@
# 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}}
+ #TODO
</value>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/789b6544/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-hbase-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-hbase-env.xml b/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-hbase-env.xml
index bc3f516..1cf80c8 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-hbase-env.xml
+++ b/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-hbase-env.xml
@@ -23,12 +23,12 @@
<configuration>
<property>
<name>hbase_log_dir</name>
- <value>/var/log/ambari-metrics-collector</value>
+ <value>/var/log/ams-hbase/</value>
<description>Log Directories for HBase.</description>
</property>
<property>
<name>hbase_pid_dir</name>
- <value>/var/run/ambari-metrics-collector/</value>
+ <value>/var/run/ams-hbase/</value>
<description>Pid Directory for HBase.</description>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/789b6544/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-log4j.xml b/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-log4j.xml
index 72ca967..3f2e148 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-log4j.xml
@@ -43,15 +43,12 @@
#
# 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.File=/var/log/ambari-metrics-collector/ambari-metrics-collector.log
log4j.appender.file.MaxFileSize=80MB
log4j.appender.file.MaxBackupIndex=60
log4j.appender.file.layout=org.apache.log4j.PatternLayout
http://git-wip-us.apache.org/repos/asf/ambari/blob/789b6544/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/ams.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/ams.py b/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/ams.py
index aba5371..4a3a3f1 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/ams.py
+++ b/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/ams.py
@@ -89,11 +89,6 @@ def ams(name=None):
template_tag=None
)
- File(format("{ams_monitor_conf_dir}/ams-env.sh"),
- owner=params.ams_user,
- content=InlineTemplate(params.ams_env_sh_template)
- )
-
# TODO
pass
http://git-wip-us.apache.org/repos/asf/ambari/blob/789b6544/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/params.py
index 8368110..0932f3a 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/params.py
@@ -40,8 +40,6 @@ if metric_collector_port and metric_collector_port.find(':') != -1:
metric_collector_port = metric_collector_port.split(':')[1]
pass
-ams_collector_log_dir = config['configurations']['ams-env']['ams_collector_log_dir']
-ams_monitor_log_dir = config['configurations']['ams-env']['ams_monitor_log_dir']
ams_monitor_conf_dir = "/etc/ambari-metrics-monitor/conf/"
ams_monitor_dir = "/usr/lib/python2.6/site-packages/resource_monitoring"
http://git-wip-us.apache.org/repos/asf/ambari/blob/789b6544/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/status_params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/status_params.py b/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/status_params.py
index 2eb09ec..0e949eb 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/status_params.py
+++ b/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/status_params.py
@@ -25,6 +25,6 @@ config = Script.get_config()
hbase_pid_dir = config['configurations']['ams-hbase-env']['hbase_pid_dir']
hbase_user = config['configurations']['ams-hbase-env']['hbase_user']
ams_user = config['configurations']['ams-env']['ams_user']
-ams_collector_pid_dir = config['configurations']['ams-env']['ams_collector_log_dir']
-ams_monitor_pid_dir = config['configurations']['ams-env']['ams_monitor_log_dir']
+ams_monitor_pid_dir = "/var/run/ambari-metrics-monitor"
+ams_collector_pid_dir = "/var/run/ambari-metrics-collector"
http://git-wip-us.apache.org/repos/asf/ambari/blob/789b6544/ambari-web/app/data/HDP2/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/site_properties.js b/ambari-web/app/data/HDP2/site_properties.js
index b6cb946..acb0bed 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -4397,266 +4397,200 @@ module.exports =
{
"id": "site property",
"name": "timeline.metrics.service.operation.mode",
- "displayName": "Metrics Service operation mode",
+ "displayName": "timeline.metrics.service.operation.mode",
"description": "\n Service Operation modes:\n 1) embedded: Metrics stored on local FS, HBase in Standalone mode\n 2) distributed: HBase daemons writing to HDFS\n 3) external: External HBase storage backend\n ",
"defaultValue": "embedded",
"displayType": "string",
"serviceName": "AMS",
"filename": "ams-site.xml",
- "category": "General",
- "index" : 1
- },
- {
- "id": "site property",
- "name": "ams_collector_log_dir",
- "displayName": "Metrics Collector log dir",
- "description": "\n Log location for collector logs.\n ",
- "defaultValue": "embedded",
- "displayType": "string",
- "serviceName": "AMS",
- "filename": "ams-env.xml",
- "category": "General",
- "index" : 2
- },
- {
- "id": "site property",
- "name": "ams_collector_pid_dir",
- "displayName": "Metrics Collector pid dir",
- "description": "\n pid location for collector.\n ",
- "defaultValue": "embedded",
- "displayType": "string",
- "serviceName": "AMS",
- "filename": "ams-env.xml",
- "category": "General",
- "index" : 3
- },
- {
- "id": "site property",
- "name": "ams_monitor_log_dir",
- "displayName": "Metrics Monitor log dir",
- "description": "\n Log location for monitor logs.\n ",
- "defaultValue": "embedded",
- "displayType": "string",
- "serviceName": "AMS",
- "filename": "ams-env.xml",
- "category": "General",
- "index" : 4
- },
- {
- "id": "site property",
- "name": "ams_monitor_pid_dir",
- "displayName": "Metrics Monitor pid dir",
- "description": "\n pid location for monitor.\n ",
- "defaultValue": "embedded",
- "displayType": "string",
- "serviceName": "AMS",
- "filename": "ams-env.xml",
- "category": "General",
- "index" : 5
+ "category": "General"
},
{
"id": "site property",
"name" : "timeline.metrics.aggregator.checkpoint.dir",
- "displayName": "Aggregator checkpoint directory",
- "description": "\n Directory to store aggregator checkpoints.\n ",
+ "displayName": "timeline.metrics.aggregator.checkpoint.dir",
+ "description": "\n Directory to store aggregator checkpoints. Change to a permanent\n location so that checkpoint ar not lost.\n ",
"defaultValue": "/tmp",
"displayType": "directory",
"serviceName": "AMS",
"filename": "ams-site.xml",
- "category": "MetricCollector",
- "index" : 17
+ "category": "MetricCollector"
},
{
"id": "site property",
"name": "timeline.metrics.cluster.aggregator.hourly.checkpointCutOffMultiplier",
- "displayName": "Hourly cluster aggregator checkpoint cutOff multiplier",
+ "displayName": "timeline.metrics.cluster.aggregator.hourly.checkpointCutOffMultiplier",
"description": "\n Multiplier value * interval = Max allowed checkpoint lag. Effectively\n if aggregator checkpoint is greater than max allowed checkpoint delay,\n the checkpoint will be discarded by the aggregator.\n ",
"defaultValue": "2",
"displayType": "int",
"serviceName": "AMS",
"filename": "ams-site.xml",
- "category": "MetricCollector",
- "index" : 16
+ "category": "MetricCollector"
},
{
"id": "site property",
"name": "timeline.metrics.cluster.aggregator.hourly.disabled",
- "displayName": "Disable Hourly cluster aggregator",
+ "displayName": "timeline.metrics.cluster.aggregator.hourly.disabled",
"description": "\n Disable cluster based hourly aggregations.\n ",
"defaultValue": "false",
"displayType": "string",
"serviceName": "AMS",
"filename": "ams-site.xml",
- "category": "MetricCollector",
- "index" : 14
+ "category": "MetricCollector"
},
{
"id": "site property",
"name": "timeline.metrics.cluster.aggregator.hourly.interval",
- "displayName": "Hourly cluster aggregator Interval",
+ "displayName": "timeline.metrics.cluster.aggregator.hourly.interval",
"description": "\n Time in seconds to sleep for the hourly resolution cluster wide\n aggregator. Default is 1 hour.\n ",
"defaultValue": "3600",
"displayType": "int",
"serviceName": "AMS",
"filename": "ams-site.xml",
- "category": "MetricCollector",
- "index" : 15
+ "category": "MetricCollector"
},
{
"id": "site property",
"name": "timeline.metrics.cluster.aggregator.minute.checkpointCutOffMultiplier",
- "displayName": "Minute cluster aggregator checkpoint cutOff multiplier",
+ "displayName": "timeline.metrics.cluster.aggregator.minute.checkpointCutOffMultiplier",
"description": "\n Multiplier value * interval = Max allowed checkpoint lag. Effectively\n if aggregator checkpoint is greater than max allowed checkpoint delay,\n the checkpoint will be discarded by the aggregator.\n ",
"defaultValue": "2",
"displayType": "int",
"serviceName": "AMS",
"filename": "ams-site.xml",
- "category": "MetricCollector",
- "index" : 13
+ "category": "MetricCollector"
},
{
"id": "site property",
"name": "timeline.metrics.cluster.aggregator.minute.disabled",
- "displayName": "Disable minute cluster aggregator",
+ "displayName": "timeline.metrics.cluster.aggregator.minute.disabled",
"description": "\n Disable cluster based minute aggregations.\n ",
"defaultValue": "false",
"displayType": "string",
"serviceName": "AMS",
"filename": "ams-site.xml",
- "category": "MetricCollector",
- "index" : 10
+ "category": "MetricCollector"
},
{
"id": "site property",
"name": "timeline.metrics.cluster.aggregator.minute.interval",
- "displayName": "Minute cluster aggregator interval",
+ "displayName": "timeline.metrics.cluster.aggregator.minute.interval",
"description": "\n Time in seconds to sleep for the minute resolution cluster wide\n aggregator. Default resolution is 2 minutes.\n ",
"defaultValue": "120",
"displayType": "int",
"serviceName": "AMS",
"filename": "ams-site.xml",
- "category": "MetricCollector",
- "index" : 11
+ "category": "MetricCollector"
},
{
"id": "site property",
"name": "timeline.metrics.cluster.aggregator.minute.timeslice.interval",
- "displayName": "Minute cluster aggregator timeslice interval",
+ "displayName": "timeline.metrics.cluster.aggregator.minute.timeslice.interval",
"description": "\n Lowest resolution of desired data for cluster level minute aggregates.\n ",
"defaultValue": "15",
"displayType": "int",
"serviceName": "AMS",
"filename": "ams-site.xml",
- "category": "MetricCollector",
- "index" : 12
+ "category": "MetricCollector"
},
{
"id": "site property",
"name": "timeline.metrics.host.aggregator.hourly.checkpointCutOffMultiplier",
- "displayName": "Hourly host aggregator checkpoint cutOff multiplier",
+ "displayName": "timeline.metrics.host.aggregator.hourly.checkpointCutOffMultiplier",
"description": "\n Multiplier value * interval = Max allowed checkpoint lag. Effectively\n if aggregator checkpoint is greater than max allowed checkpoint delay,\n the checkpoint will be discarded by the aggregator.\n ",
"defaultValue": "2",
"displayType": "int",
"serviceName": "AMS",
"filename": "ams-site.xml",
- "category": "MetricCollector",
- "index" : 9
+ "category": "MetricCollector"
},
{
"id": "site property",
"name": "timeline.metrics.host.aggregator.hourly.disabled",
- "displayName": "Disable Hourly host aggregator",
+ "displayName": "timeline.metrics.host.aggregator.hourly.disabled",
"description": "\n Disable host based hourly aggregations.\n ",
"defaultValue": "false",
"displayType": "string",
"serviceName": "AMS",
"filename": "ams-site.xml",
- "category": "MetricCollector",
- "index" : 7
+ "category": "MetricCollector"
},
{
"id": "site property",
"name": "timeline.metrics.host.aggregator.hourly.interval",
- "displayName": "Hourly host aggregator interval",
+ "displayName": "timeline.metrics.host.aggregator.hourly.interval",
"description": "\n Time in seconds to sleep for the hourly resolution host based\n aggregator. Default resolution is 1 hour.\n ",
"defaultValue": "3600",
"displayType": "int",
"serviceName": "AMS",
"filename": "ams-site.xml",
- "category": "MetricCollector",
- "index" : 8
+ "category": "MetricCollector"
},
{
"id": "site property",
"name": "timeline.metrics.host.aggregator.minute.checkpointCutOffMultiplier",
- "displayName": "Minute host aggregator checkpoint cutOff multiplier",
+ "displayName": "timeline.metrics.host.aggregator.minute.checkpointCutOffMultiplier",
"description": "\n Multiplier value * interval = Max allowed checkpoint lag. Effectively\n if aggregator checkpoint is greater than max allowed checkpoint delay,\n the checkpoint will be discarded by the aggregator.\n ",
"defaultValue": "2",
"displayType": "int",
"serviceName": "AMS",
"filename": "ams-site.xml",
- "category": "MetricCollector",
- "index" : 6
+ "category": "MetricCollector"
},
{
"id": "site property",
"name": "timeline.metrics.host.aggregator.minute.disabled",
- "displayName": "Disable Minute host aggregator",
+ "displayName": "timeline.metrics.host.aggregator.minute.disabled",
"description": "\n Disable host based minute aggregations.\n ",
"defaultValue": "false",
"displayType": "string",
"serviceName": "AMS",
"filename": "ams-site.xml",
- "category": "MetricCollector",
- "index" : 4
+ "category": "MetricCollector"
},
{
"id": "site property",
"name": "timeline.metrics.host.aggregator.minute.interval",
- "displayName": "Minute host aggregator interval",
+ "displayName": "timeline.metrics.host.aggregator.minute.interval",
"description": "\n Time in seconds to sleep for the minute resolution host based\n aggregator. Default resolution is 5 minutes.\n ",
"defaultValue": "300",
"displayType": "int",
"serviceName": "AMS",
"filename": "ams-site.xml",
- "category": "MetricCollector",
- "index" : 5
+ "category": "MetricCollector"
},
{
"id": "site property",
"name": "timeline.metrics.service.checkpointDelay",
- "displayName": "Metrics service checkpoint delay",
+ "displayName": "timeline.metrics.service.checkpointDelay",
"description": "\n Time in seconds to sleep on the first run or when the checkpoint is\n too old.\n ",
"defaultValue": "120",
"displayType": "int",
"serviceName": "AMS",
"filename": "ams-site.xml",
- "category": "MetricCollector",
- "index" : 1
+ "category": "MetricCollector"
},
{
"id": "site property",
"name": "timeline.metrics.service.default.result.limit",
- "displayName": "Metrics service default result limit",
+ "displayName": "timeline.metrics.service.default.result.limit",
"description": "\n Max result limit on number of rows returned. Calculated as follows:\n 4 aggregate metrics/min * 60 * 24: Retrieve aggregate data for 1 day.\n ",
"defaultValue": "5760",
"displayType": "int",
"serviceName": "AMS",
"filename": "ams-site.xml",
- "category": "MetricCollector",
- "index" : 2
+ "category": "MetricCollector"
},
{
"id": "site property",
"name": "timeline.metrics.service.resultset.fetchSize",
- "displayName": "Metrics service resultset fetchSize",
+ "displayName": "timeline.metrics.service.resultset.fetchSize",
"description": "\n JDBC resultset prefect size for aggregator queries.\n ",
"defaultValue": "2000",
"displayType": "int",
"serviceName": "AMS",
"filename": "ams-site.xml",
- "category": "MetricCollector",
- "index" : 3
+ "category": "MetricCollector"
}
]
};
http://git-wip-us.apache.org/repos/asf/ambari/blob/789b6544/ambari-web/app/models/stack_service.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/stack_service.js b/ambari-web/app/models/stack_service.js
index a33cad3..f211119 100644
--- a/ambari-web/app/models/stack_service.js
+++ b/ambari-web/app/models/stack_service.js
@@ -334,8 +334,8 @@ App.StackService.configCategories = function () {
break;
case 'AMS':
serviceConfigCategories.pushObjects([
- App.ServiceConfigCategory.create({ name: 'General', displayName: 'General'}),
- App.ServiceConfigCategory.create({ name: 'MetricCollector', displayName: 'Metric Collector'})
+ App.ServiceConfigCategory.create({ name: 'MetricCollector', displayName: 'Metric Collector'}),
+ App.ServiceConfigCategory.create({ name: 'General', displayName: 'General'})
]);
break;
case 'PIG':
[2/3] ambari git commit: Revert "AMBARI-9034. Add ability to change
log and pid dirs for AMS daemons. Edit descriptions. (swagle)"
Posted by sw...@apache.org.
Revert "AMBARI-9034. Add ability to change log and pid dirs for AMS daemons. Edit descriptions. (swagle)"
This reverts commit 07a3078cc46fd31bdb58aee22a91f2c2ff3007d8.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/af38b560
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/af38b560
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/af38b560
Branch: refs/heads/trunk
Commit: af38b560f569d4260d13a4e5a89ac05c4dd12ca8
Parents: fc7394b
Author: Siddharth Wagle <sw...@hortonworks.com>
Authored: Wed Jan 7 18:42:51 2015 -0800
Committer: Siddharth Wagle <sw...@hortonworks.com>
Committed: Wed Jan 7 18:42:51 2015 -0800
----------------------------------------------------------------------
ambari-web/app/data/HDP2/site_properties.js | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/af38b560/ambari-web/app/data/HDP2/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/site_properties.js b/ambari-web/app/data/HDP2/site_properties.js
index 99797cc..b6cb946 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -4410,7 +4410,7 @@ module.exports =
"id": "site property",
"name": "ams_collector_log_dir",
"displayName": "Metrics Collector log dir",
- "description": "\n Log location for collector logs\n ",
+ "description": "\n Log location for collector logs.\n ",
"defaultValue": "embedded",
"displayType": "string",
"serviceName": "AMS",
@@ -4422,7 +4422,7 @@ module.exports =
"id": "site property",
"name": "ams_collector_pid_dir",
"displayName": "Metrics Collector pid dir",
- "description": "\n pid location for collector\n ",
+ "description": "\n pid location for collector.\n ",
"defaultValue": "embedded",
"displayType": "string",
"serviceName": "AMS",
@@ -4434,7 +4434,7 @@ module.exports =
"id": "site property",
"name": "ams_monitor_log_dir",
"displayName": "Metrics Monitor log dir",
- "description": "\n Log location for monitor logs\n ",
+ "description": "\n Log location for monitor logs.\n ",
"defaultValue": "embedded",
"displayType": "string",
"serviceName": "AMS",
@@ -4446,7 +4446,7 @@ module.exports =
"id": "site property",
"name": "ams_monitor_pid_dir",
"displayName": "Metrics Monitor pid dir",
- "description": "\n pid location for monitor\n ",
+ "description": "\n pid location for monitor.\n ",
"defaultValue": "embedded",
"displayType": "string",
"serviceName": "AMS",
@@ -4458,7 +4458,7 @@ module.exports =
"id": "site property",
"name" : "timeline.metrics.aggregator.checkpoint.dir",
"displayName": "Aggregator checkpoint directory",
- "description": "\n Directory to store aggregator checkpoints\n ",
+ "description": "\n Directory to store aggregator checkpoints.\n ",
"defaultValue": "/tmp",
"displayType": "directory",
"serviceName": "AMS",
@@ -4566,7 +4566,7 @@ module.exports =
"id": "site property",
"name": "timeline.metrics.host.aggregator.hourly.disabled",
"displayName": "Disable Hourly host aggregator",
- "description": "\n Disable host based hourly aggregations\n ",
+ "description": "\n Disable host based hourly aggregations.\n ",
"defaultValue": "false",
"displayType": "string",
"serviceName": "AMS",