diff --git a/cluster/addons/cluster-monitoring/stackdriver/heapster-controller.yaml b/cluster/addons/cluster-monitoring/stackdriver/heapster-controller.yaml index bc10aedbab..4a938cbe84 100644 --- a/cluster/addons/cluster-monitoring/stackdriver/heapster-controller.yaml +++ b/cluster/addons/cluster-monitoring/stackdriver/heapster-controller.yaml @@ -63,12 +63,14 @@ spec: - name: usr-ca-certs mountPath: /usr/share/ca-certificates readOnly: true + # BEGIN_PROMETHEUS_TO_SD - name: prom-to-sd image: gcr.io/google-containers/prometheus-to-sd:v0.2.1 command: - /monitor - --source=heapster:http://localhost:8082?whitelisted=stackdriver_requests_count,stackdriver_timeseries_count - - --stackdriver-prefix=container.googleapis.com/internal/addons + - --stackdriver-prefix={{ prometheus_to_sd_prefix }}/addons + - --api-override={{ prometheus_to_sd_endpoint }} - --pod-id=$(POD_NAME) - --namespace-id=$(POD_NAMESPACE) volumeMounts: @@ -83,6 +85,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace + # END_PROMETHEUS_TO_SD - image: gcr.io/google_containers/addon-resizer:2.0 name: heapster-nanny resources: diff --git a/cluster/addons/fluentd-gcp/event-exporter.yaml b/cluster/addons/fluentd-gcp/event-exporter.yaml index c3fff97484..7ec5e3eff4 100644 --- a/cluster/addons/fluentd-gcp/event-exporter.yaml +++ b/cluster/addons/fluentd-gcp/event-exporter.yaml @@ -51,16 +51,19 @@ spec: image: gcr.io/google-containers/event-exporter:v0.1.5 command: - '/event-exporter' + # BEGIN_PROMETHEUS_TO_SD - name: prometheus-to-sd-exporter image: gcr.io/google-containers/prometheus-to-sd:v0.2.1 command: - /monitor - --component=event_exporter - - --stackdriver-prefix=container.googleapis.com/internal/addons + - --stackdriver-prefix={{ prometheus_to_sd_prefix }}/addons + - --api-override={{ prometheus_to_sd_endpoint }} - --whitelisted-metrics=stackdriver_sink_received_entry_count,stackdriver_sink_request_count,stackdriver_sink_successfully_sent_entry_count volumeMounts: - name: ssl-certs mountPath: /etc/ssl/certs + # END_PROMETHEUS_TO_SD terminationGracePeriodSeconds: 30 volumes: - name: ssl-certs diff --git a/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml b/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml index 069ecc4001..51fbc81c06 100644 --- a/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml +++ b/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml @@ -80,17 +80,20 @@ spec: then exit 1; fi; + # BEGIN_PROMETHEUS_TO_SD - name: prometheus-to-sd-exporter image: gcr.io/google-containers/prometheus-to-sd:v0.1.3 command: - /monitor - --component=fluentd - --target-port=31337 - - --stackdriver-prefix=container.googleapis.com/internal/addons + - --stackdriver-prefix={{ prometheus_to_sd_prefix }}/addons + - --api-override={{ prometheus_to_sd_endpoint }} - --whitelisted-metrics=stackdriver_successful_requests_count,stackdriver_failed_requests_count,stackdriver_ingested_entries_count,stackdriver_dropped_entries_count volumeMounts: - name: ssl-certs mountPath: /etc/ssl/certs + # END_PROMETHEUS_TO_SD nodeSelector: beta.kubernetes.io/fluentd-ds-ready: "true" tolerations: diff --git a/cluster/common.sh b/cluster/common.sh index 403eddedf0..28701049d3 100755 --- a/cluster/common.sh +++ b/cluster/common.sh @@ -668,6 +668,9 @@ ENABLE_CACHE_MUTATION_DETECTOR: $(yaml-quote ${ENABLE_CACHE_MUTATION_DETECTOR:-f ENABLE_PATCH_CONVERSION_DETECTOR: $(yaml-quote ${ENABLE_PATCH_CONVERSION_DETECTOR:-false}) ADVANCED_AUDIT_BACKEND: $(yaml-quote ${ADVANCED_AUDIT_BACKEND:-log}) GCE_API_ENDPOINT: $(yaml-quote ${GCE_API_ENDPOINT:-}) +PROMETHEUS_TO_SD_ENDPOINT: $(yaml-quote ${PROMETHEUS_TO_SD_ENDPOINT:-}) +PROMETHEUS_TO_SD_PREFIX: $(yaml-quote ${PROMETHEUS_TO_SD_PREFIX:-}) +ENABLE_PROMETHEUS_TO_SD: $(yaml-quote ${ENABLE_PROMETHEUS_TO_SD:-false}) EOF if [ -n "${KUBELET_PORT:-}" ]; then cat >>$file <