Skip to content

D
docs
Commit 9b167942 authored by Steve Durrheimer's avatar Steve Durrheimer Committed by GitHub
Browse files
Options

Merge pull request #493 from prometheus/grobie/fix-k8s-docs-formatting 

Remove merge conflict leftover from k8s docs
parents 34bb811d b8b04a5e
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 1 deletion
content/docs/operating/configuration.md
View file @ 9b167942
...@@ -462,7 +462,6 @@ create multiple target groups: ...@@ -462,7 +462,6 @@ create multiple target groups:
The following meta labels are available on targets during relabeling: The following meta labels are available on targets during relabeling:
<<<<<<< HEAD
* All roles: * All roles:
* `__meta_kubernetes_role`: the role of the target: one of `endpoint`, `service`, `pod`, `container`, `node`, or `apiserver` * `__meta_kubernetes_role`: the role of the target: one of `endpoint`, `service`, `pod`, `container`, `node`, or `apiserver`
* Nodes: * Nodes:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023