mirror of https://github.com/k3s-io/k3s
Merge pull request #62789 from serathius/prometheus-secure
Automatic merge from submit-queue (batch tested with PRs 62632, 62789, 62512, 62848). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. [prometheus addon] Use secure kubelet port This PR changes port used by prometheus server to kubelet secure port. To access endpoints for metrics it adds "nodes/metrics" resource to rbac. Previously it was not possible to authorize to kubelet in GCP, because Token Auth was disabled. PR that enabled Token Auth in GCP https://github.com/kubernetes/kubernetes/pull/58178 ```release-note NONE ``` /cc @brancz @kawychpull/8/head
commit
ee941c4e77
|
@ -37,11 +37,11 @@ data:
|
|||
relabel_configs:
|
||||
- action: labelmap
|
||||
regex: __meta_kubernetes_node_label_(.+)
|
||||
- source_labels: [__address__]
|
||||
action: replace
|
||||
target_label: __address__
|
||||
regex: ([^:;]+):(\d+)
|
||||
replacement: ${1}:10255
|
||||
scheme: https
|
||||
tls_config:
|
||||
ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
|
||||
insecure_skip_verify: true
|
||||
bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
|
||||
|
||||
- job_name: kubernetes-nodes-cadvisor
|
||||
kubernetes_sd_configs:
|
||||
|
@ -49,11 +49,13 @@ data:
|
|||
relabel_configs:
|
||||
- action: labelmap
|
||||
regex: __meta_kubernetes_node_label_(.+)
|
||||
- source_labels: [__address__]
|
||||
action: replace
|
||||
target_label: __address__
|
||||
regex: ([^:;]+):(\d+)
|
||||
replacement: ${1}:4194
|
||||
- target_label: __metrics_path__
|
||||
replacement: /metrics/cadvisor
|
||||
scheme: https
|
||||
tls_config:
|
||||
ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
|
||||
insecure_skip_verify: true
|
||||
bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
|
||||
|
||||
- job_name: kubernetes-service-endpoints
|
||||
kubernetes_sd_configs:
|
||||
|
|
|
@ -19,6 +19,7 @@ rules:
|
|||
- ""
|
||||
resources:
|
||||
- nodes
|
||||
- nodes/metrics
|
||||
- services
|
||||
- endpoints
|
||||
- pods
|
||||
|
|
Loading…
Reference in New Issue