diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/TimelineServer.apt.vm b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/TimelineServer.apt.vm index 6c8203c..06f123e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/TimelineServer.apt.vm +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/TimelineServer.apt.vm @@ -143,13 +143,26 @@ YARN Timeline Server * Generic-data related Configuration - Users can specify whether the generic data collection is enabled or not, and - also choose the storage-implementation class for the generic data. There are - more configurations related to generic data collection, and users can refer - to <<>> for all of them. + Users can specify whether the timeline server should collect generic data + for applications by specifying the following configuration properties. +---+ + Indicate to clients whether Timeline service is enabled or not. + If enabled, the TimelineClient library used by end-users will post entities + and events to the Timeline server. + yarn.timeline-service.enabled + true + + + + The setting that controls whether yarn system metrics is + published on the timeline server or not by RM. + yarn.resourcemanager.system-metrics-publisher.enabled + true + + + Indicate to ResourceManager as well as clients whether history-service is enabled or not. If enabled, ResourceManager starts recording historical data that Timelien service can consume. Similarly, @@ -158,13 +171,6 @@ YARN Timeline Server yarn.timeline-service.generic-application-history.enabled false - - - Store class name for history store, defaulting to file system - store - yarn.timeline-service.generic-application-history.store-class - org.apache.hadoop.yarn.server.applicationhistoryservice.FileSystemApplicationHistoryStore - +---+ * Per-framework-date related Configuration -- 1.9.2.msysgit.0