Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DEV: Modify the monitoring setting in yaml #27

Merged
merged 1 commit into from
Jun 22, 2018
Merged

DEV: Modify the monitoring setting in yaml #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions deploy/kubernetes/apps/monitoring/cadvisor/cadvisor-svc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,11 @@ metadata:
annotations:
prometheus.io/scrape: 'true'
spec:
type: NodePort
ports:
- name: http-metrics
port: 8080
nodePort: 31194
targetPort: http-metrics
protocol: TCP
selector:
name: cadvisor

2 changes: 0 additions & 2 deletions deploy/kubernetes/apps/monitoring/cadvisor/cadvisor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ spec:
metadata:
labels:
name: cadvisor
annotations:
prometheus.io.scrape: "true"
spec:
containers:
- name: cadvisor
Expand Down
2 changes: 0 additions & 2 deletions deploy/kubernetes/apps/monitoring/kube-state-metrics/kube-state-metrics-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ spec:
metadata:
labels:
k8s-app: kube-state-metrics
annotations:
prometheus.io.scrape: "true"
spec:
serviceAccountName: default
containers:
Expand Down
50 changes: 0 additions & 50 deletions deploy/kubernetes/apps/monitoring/prometheus/prometheus-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,56 +11,6 @@ data:
scrape_timeout: 15s
scrape_configs:


- job_name: 'kubernetes-apiservers'
kubernetes_sd_configs:
- role: endpoints
scheme: https
tls_config:
ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
relabel_configs:
- source_labels: [__meta_kubernetes_namespace, __meta_kubernetes_service_name, __meta_kubernetes_endpoint_port_name]
action: keep
regex: default;kubernetes;https


- job_name: 'kubernetes-nodes'
scheme: https
tls_config:
ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
kubernetes_sd_configs:
- role: node
relabel_configs:
- action: labelmap
regex: __meta_kubernetes_node_label_(.+)
- target_label: __address__
replacement: kubernetes.default.svc:443
- source_labels: [__meta_kubernetes_node_name]
regex: (.+)
target_label: __metrics_path__
replacement: /api/v1/nodes/${1}/proxy/metrics


- job_name: 'kubernetes-cadvisor'
scheme: https
tls_config:
ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
kubernetes_sd_configs:
- role: node
relabel_configs:
- action: labelmap
regex: __meta_kubernetes_node_label_(.+)
- target_label: __address__
replacement: kubernetes.default.svc:443
- source_labels: [__meta_kubernetes_node_name]
regex: (.+)
target_label: __metrics_path__
replacement: /api/v1/nodes/${1}/proxy/metrics/cadvisor


- job_name: 'kubernetes-service-endpoints'
kubernetes_sd_configs:
- role: endpoints
Expand Down