diff --git a/docs/configuration.asciidoc b/docs/configuration.asciidoc
index 6e80cbb54..06023c4af 100644
--- a/docs/configuration.asciidoc
+++ b/docs/configuration.asciidoc
@@ -638,6 +638,16 @@ as well as the "total system memory" metric, you would set `disable_metrics` to:
 
 NOTE: this setting only disables the *sending* of the given metrics, not collection.
 
+[float]
+[[config-breakdown_metrics]]
+==== `breakdown_metrics`
+|============
+| Environment                       | Django/Flask        | Default
+| `ELASTIC_APM_BREAKDOWN_METRICS`   | `BREAKDOWN_METRICS` | `True`
+|============
+
+Enable/disable the tracking and collection of breakdown metrics.
+By setting this to `False`, tracking this metric is completely disabled, which can reduce the overhead of the agent. 
 
 [float]
 [[config-django-specific]]
diff --git a/docs/metrics.asciidoc b/docs/metrics.asciidoc
index 5fd420cce..bc2eb0fdc 100644
--- a/docs/metrics.asciidoc
+++ b/docs/metrics.asciidoc
@@ -14,14 +14,136 @@ These metrics will be sent regularly to the APM Server and from there to Elastic
 
 This metric set collects various system metrics and metrics of the current process.
 
-|============
-| Metric                              | Type         | Format  | Description
-| `system.cpu.total.norm.pct`         | scaled_float | percent | The percentage of CPU time in states other than Idle and IOWait, normalised by the number of cores.
-| `system.memory.total`               | long         | bytes   | The total memory of the system in bytes
-| `system.memory.actual.free`         | long         | bytes   | Actual free memory in bytes
-| `system.process.cpu.total.norm.pct` | scaled_float | percent | The percentage of CPU time spent by the process since the last event. This value is normalized by the number of CPU cores and it ranges from 0 to 100%.
-| `system.process.memory.size`        | long         | bytes   | The total virtual memory the process has.
-| `system.process.memory.rss.bytes`   | long         | bytes   | The Resident Set Size. The amount of memory the process occupied in main memory (RAM).
-|============
+*`system.cpu.total.norm.pct`*::
++
+--
+type: scaled_float
+
+format: percent
+
+The percentage of CPU time in states other than Idle and IOWait, normalised by the number of cores.
+--
+
+
+*`system.process.cpu.total.norm.pct`*::
++
+--
+type: scaled_float
+
+format: percent
+
+The percentage of CPU time spent by the process since the last event.
+This value is normalized by the number of CPU cores and it ranges from 0 to 100%.
+--
+
+*`system.memory.total`*::
++
+--
+type: long
+
+format: bytes
+
+Total memory.
+--
+
+*`system.memory.actual.free`*::
++
+--
+type: long
+
+format: bytes
+
+Actual free memory in bytes. 
+--
+
+
+*`system.process.memory.size`*::
++
+--
+type: long
+
+format: bytes
+
+The total virtual memory the process has.
+--
+
+
+
+*`system.process.memory.rss.bytes`*::
++
+--
+type: long
+
+format: bytes
+
+he Resident Set Size. The amount of memory the process occupied in main memory (RAM).
+--
 
 NOTE: if you do *not* use Linux, you need to install https://pypi.org/project/psutil/[`psutil`] for this metric set.
+
+[[transactions-metricset]]
+==== Transactions Metric Set
+
+This metric set collects metrics in relation with transactions.
+
+*`transaction.duration`*::
++
+--
+type: simple timer
+
+This timer tracks the duration of transactions and allows for the creation of graphs displaying a weighted average.
+
+Fields:
+
+* `sum`: The sum of all transaction durations in ms since the last report (the delta)
+* `count`: The count of all transactions since the last report (the delta)
+
+You can filter and group by these dimensions:
+
+* `transaction.name`: The name of the transaction
+* `transaction.type`: The type of the transaction, for example `request`
+--
+
+[[breakdown-metricset]]
+==== Breakdown Metric Set
+
+NOTE: tracking and collection of this metric set can be disabled using the `<<config-breakdown_metrics, breakdown_metrics>>` setting.
+
+*`transaction.breakdown.count`*::
++
+--
+type: long
+
+format: count (delta)
+
+The number of transactions for which breakdown metrics (`span.self_time`) have been created.
+As the Java agent tracks the breakdown for both sampled and non-sampled transactions,
+this metric is equivalent to `transaction.duration.count`
+
+You can filter and group by these dimensions:
+
+* `transaction.name`: The name of the transaction
+* `transaction.type`: The type of the transaction, for example `request`
+
+--
+
+*`span.self_time`*::
++
+--
+type: simple timer
+
+This timer tracks the span self-times and is the basis of the transaction breakdown visualization.
+
+Fields:
+
+* `sum`: The sum of all span self-times in ms since the last report (the delta)
+* `count`: The count of all span self-times since the last report (the delta)
+
+You can filter and group by these dimensions:
+
+* `transaction.name`: The name of the transaction
+* `transaction.type`: The type of the transaction, for example `request`
+* `span.type`: The type of the span, for example `app`, `template` or `db`
+* `span.subtype`: The sub-type of the span, for example `mysql` (optional)
+
+--