Skip to content

Commit

Permalink
updates from review
Browse files Browse the repository at this point in the history
  • Loading branch information
celenechang committed Feb 16, 2022
1 parent 889fe32 commit 4cdaa0e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 14 deletions.
6 changes: 1 addition & 5 deletions kubelet/assets/configuration/spec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,11 @@ files:
URL of the cadvisor metrics prometheus endpoint.
Pass an empty string, or set the cadvisor_port option to disable cadvisor metrics collection.
example: http://10.8.0.1:10255/metrics/cadvisor
display_priority: 1
- name: kubelet_metrics_endpoint
description: |
URL of the kubelet metrics prometheus endpoint
Pass an empty string to disable kubelet metrics collection.
example: http://10.8.0.1:10255/metrics
display_priority: 1
- name: cadvisor_port
description: |
Metric collection for legacy (< 1.7.6) clusters via the kubelet's cadvisor port.
Expand All @@ -30,22 +28,20 @@ files:
Port to connect to, uncomment and set accordingly to enable collection.
example: 4194
display_priority: 1
- name: enabled_rates
description: |
Allow list of rate type metrics to collect from cadvisor.
example:
- cpu.*
- network.*
display_priority: 1
- name: enabled_gauges
description: |
Allow list of gauge type metrics to collect from cadvisor.
example:
- filesystem.*
display_priority: 1
- template: instances/openmetrics_legacy
overrides:
prometheus_url.required: false
prometheus_url.hidden: true
prometheus_metrics_prefix.hidden: true
min_collection_interval.value.example: 20
Expand Down
12 changes: 3 additions & 9 deletions kubernetes_state/assets/configuration/spec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,15 @@ files:
- template: instances
options:
- name: kube_state_url
enabled: true
required: true
description: |
To enable Kube State metrics you must specify the URL exposing the API
value:
type: string
example:
http://example.com:8080/metrics
display_priority: 1
example: http://example.com:8080/metrics
- template: instances/openmetrics_legacy
overrides:
prometheus_url.required: false
prometheus_url.hidden: true
prometheus_metrics_prefix.hidden: true

Expand All @@ -42,12 +40,10 @@ files:
- name: kube_state_url
description: |
To enable Kube State metrics you must specify the URL exposing the API.
enabled: true
required: true
value:
type: string
example:
http://%%host%%:8080/metrics
example: http://%%host%%:8080/metrics
- name: labels_mapper
description: |
Tags are reported as set by kube-state-metrics. If you want to translate
Expand All @@ -73,5 +69,3 @@ files:
overridden by the value of the label, this can be deactivated (all metrics
will be attached to the host running KSM)
example: true


0 comments on commit 4cdaa0e

Please sign in to comment.