Skip to content

Commit 22f1f6b

Browse files
committed
Fix merge conflict
Signed-off-by: Lynette Miles <[email protected]>
1 parent 5d1c105 commit 22f1f6b

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

pipeline/inputs/node-exporter-metrics.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ In the following configuration file, the input plugin `node_exporter_metrics` co
100100
# Node Exporter Metrics + Prometheus Exporter
101101
# -------------------------------------------
102102
# The following example collect host metrics on Linux and expose
103-
# them through a Prometheus HTTP end-point.
103+
# them through a Prometheus HTTP endpoint.
104104
#
105105
# After starting the service try it with:
106106
#

pipeline/inputs/process-exporter-metrics.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ The Process Exporter Metrics plugin implements collecting of the various metrics
1414
{% hint style="info" %}
1515

1616
All metrics including those collected with this plugin flow through a separate pipeline from logs and current filters don't operate on top of metrics. This plugin is only supported on Linux based operating systems as it uses the `proc` filesystem to access the relevant metrics. MacOS doesn't have the `proc` filesystem so this plugin won't work for it.
17-
1817
{% endhint %}
1918

2019
## Configuration
@@ -58,7 +57,7 @@ In the following configuration file, the input plugin `process_exporter_metrics`
5857
# Process Exporter Metrics + Prometheus Exporter
5958
# -------------------------------------------
6059
# The following example collect host metrics on Linux and expose
61-
# them through a Prometheus HTTP end-point.
60+
# them through a Prometheus HTTP endpoint.
6261
#
6362
# After starting the service try it with:
6463
#
@@ -88,7 +87,7 @@ pipeline:
8887
# Process Exporter Metrics + Prometheus Exporter
8988
# -------------------------------------------
9089
# The following example collect host metrics on Linux and expose
91-
# them through a Prometheus HTTP end-point.
90+
# them through a Prometheus HTTP endpoint.
9291
#
9392
# After starting the service try it with:
9493
#

0 commit comments

Comments
 (0)