github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Bump version of prometheus-to-sd to 0.2.2.

Browse Source 
Bump version of prometheus-to-sd to improve logging, add pod_name and
pod_namespace flags and remove deprecated flags.
This commit is contained in:
Marian Lobur 2017-10-26 15:25:26 +02:00
parent 2e2062db51
commit 5b62eb29d2
3 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cluster/addons/cluster-monitoring/stackdriver/heapster-controller.yaml
View File

@ -65,7 +65,7 @@ spec:
readOnly: true readOnly: true
# BEGIN_PROMETHEUS_TO_SD # BEGIN_PROMETHEUS_TO_SD
- name: prom-to-sd - name: prom-to-sd
image: gcr.io/google-containers/prometheus-to-sd:v0.2.1 image: gcr.io/google-containers/prometheus-to-sd:v0.2.2
command: command:
- /monitor - /monitor
- --source=heapster:http://localhost:8082?whitelisted=stackdriver_requests_count,stackdriver_timeseries_count - --source=heapster:http://localhost:8082?whitelisted=stackdriver_requests_count,stackdriver_timeseries_count
@ -73,9 +73,6 @@ spec:
- --api-override={{ prometheus_to_sd_endpoint }} - --api-override={{ prometheus_to_sd_endpoint }}
- --pod-id=$(POD_NAME) - --pod-id=$(POD_NAME)
- --namespace-id=$(POD_NAMESPACE) - --namespace-id=$(POD_NAMESPACE)
volumeMounts:
- name: ssl-certs
mountPath: /etc/ssl/certs
env: env:
- name: POD_NAME - name: POD_NAME
valueFrom: valueFrom:

19
cluster/addons/fluentd-gcp/event-exporter.yaml
View File

@ -52,16 +52,23 @@ spec:
- '/event-exporter' - '/event-exporter'
# BEGIN_PROMETHEUS_TO_SD # BEGIN_PROMETHEUS_TO_SD
- name: prometheus-to-sd-exporter - name: prometheus-to-sd-exporter
image: gcr.io/google-containers/prometheus-to-sd:v0.2.1 image: gcr.io/google-containers/prometheus-to-sd:v0.2.2
command: command:
- /monitor - /monitor
- --component=event_exporter
- --stackdriver-prefix={{ prometheus_to_sd_prefix }}/addons - --stackdriver-prefix={{ prometheus_to_sd_prefix }}/addons
- --api-override={{ prometheus_to_sd_endpoint }} - --api-override={{ prometheus_to_sd_endpoint }}
- --whitelisted-metrics=stackdriver_sink_received_entry_count,stackdriver_sink_request_count,stackdriver_sink_successfully_sent_entry_count - --source=event_exported:http://localhost:80?whitelisted=stackdriver_sink_received_entry_count,stackdriver_sink_request_count,stackdriver_sink_successfully_sent_entry_count
volumeMounts: - --pod-id=$(POD_NAME)
- name: ssl-certs - --namespace-id=$(POD_NAMESPACE)
mountPath: /etc/ssl/certs env:
- name: POD_NAME
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: POD_NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.namespace
# END_PROMETHEUS_TO_SD # END_PROMETHEUS_TO_SD
terminationGracePeriodSeconds: 30 terminationGracePeriodSeconds: 30
volumes: volumes:

17
cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
View File

@ -92,14 +92,23 @@ spec:
fi; fi;
# BEGIN_PROMETHEUS_TO_SD # BEGIN_PROMETHEUS_TO_SD
- name: prometheus-to-sd-exporter - name: prometheus-to-sd-exporter
image: gcr.io/google-containers/prometheus-to-sd:v0.1.3 image: gcr.io/google-containers/prometheus-to-sd:v0.2.2
command: command:
- /monitor - /monitor
- --component=fluentd
- --target-port=31337
- --stackdriver-prefix={{ prometheus_to_sd_prefix }}/addons - --stackdriver-prefix={{ prometheus_to_sd_prefix }}/addons
- --api-override={{ prometheus_to_sd_endpoint }} - --api-override={{ prometheus_to_sd_endpoint }}
- --whitelisted-metrics=stackdriver_successful_requests_count,stackdriver_failed_requests_count,stackdriver_ingested_entries_count,stackdriver_dropped_entries_count - --source=fluentd:http://localhost:31337?whitelisted=stackdriver_successful_requests_count,stackdriver_failed_requests_count,stackdriver_ingested_entries_count,stackdriver_dropped_entries_count
- --pod-id=$(POD_NAME)
- --namespace-id=$(POD_NAMESPACE)
env:
- name: POD_NAME
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: POD_NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.namespace
# END_PROMETHEUS_TO_SD # END_PROMETHEUS_TO_SD
nodeSelector: nodeSelector:
beta.kubernetes.io/fluentd-ds-ready: "true" beta.kubernetes.io/fluentd-ds-ready: "true"