diff options
| author | Prashant Sharma <prashant.s@imaginea.com> | 2014-01-03 12:12:04 +0530 |
|---|---|---|
| committer | Prashant Sharma <prashant.s@imaginea.com> | 2014-01-03 12:12:04 +0530 |
| commit | b4bb80002bbf0ac3642c78ae9e5c260b5da4a4cc (patch) | |
| tree | 0987c307777ba5947b43aee59233df6f3568a783 /docs/monitoring.md | |
| parent | 08ec10de1767ca543047b79c40ab50a04ce5df2f (diff) | |
| parent | 498a5f0a1c6e82a33c2ad8c48b68bbdb8da57a95 (diff) | |
| download | spark-b4bb80002bbf0ac3642c78ae9e5c260b5da4a4cc.tar.gz spark-b4bb80002bbf0ac3642c78ae9e5c260b5da4a4cc.tar.bz2 spark-b4bb80002bbf0ac3642c78ae9e5c260b5da4a4cc.zip | |
Merge branch 'master' into spark-1002-remove-jars
Diffstat (limited to 'docs/monitoring.md')
| -rw-r--r-- | docs/monitoring.md | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/monitoring.md b/docs/monitoring.md index 5ed0474477..0d5eb7065e 100644 --- a/docs/monitoring.md +++ b/docs/monitoring.md @@ -32,7 +32,8 @@ Spark has a configurable metrics system based on the This allows users to report Spark metrics to a variety of sinks including HTTP, JMX, and CSV files. The metrics system is configured via a configuration file that Spark expects to be present at `$SPARK_HOME/conf/metrics.conf`. A custom file location can be specified via the -`spark.metrics.conf` Java system property. Spark's metrics are decoupled into different +`spark.metrics.conf` [configuration property](configuration.html#spark-properties). +Spark's metrics are decoupled into different _instances_ corresponding to Spark components. Within each instance, you can configure a set of sinks to which metrics are reported. The following instances are currently supported: |