github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-10-30 21:30:16 +00:00
Code Issues Projects Releases Wiki Activity

use prometheus-to-sd 0.2.4 and fluentd-gcp-image 2.0.16

Browse Source
This commit is contained in:
Daniel Kłobuszewski
2018-02-13 15:33:57 +01:00
parent 430c1a68c8
commit a88ddac1e4
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,7 +61,7 @@ spec:
- --sink=stackdriver:?cluster_name={{ cluster_name }}&use_old_resources={{ use_old_resources }}&use_new_resources={{ use_new_resources }}&min_interval_sec=100&batch_export_timeout_sec=110 - --sink=stackdriver:?cluster_name={{ cluster_name }}&use_old_resources={{ use_old_resources }}&use_new_resources={{ use_new_resources }}&min_interval_sec=100&batch_export_timeout_sec=110
# BEGIN_PROMETHEUS_TO_SD # BEGIN_PROMETHEUS_TO_SD
- name: prom-to-sd - name: prom-to-sd
image: k8s.gcr.io/prometheus-to-sd:v0.2.2 image: k8s.gcr.io/prometheus-to-sd:v0.2.4
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

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

@@ -52,7 +52,7 @@ spec:
- '/event-exporter' - '/event-exporter'
# BEGIN_PROMETHEUS_TO_SD # BEGIN_PROMETHEUS_TO_SD
- name: prometheus-to-sd-exporter - name: prometheus-to-sd-exporter
image: k8s.gcr.io/prometheus-to-sd:v0.2.2 image: k8s.gcr.io/prometheus-to-sd:v0.2.4
command: command:
- /monitor - /monitor
- --stackdriver-prefix={{ prometheus_to_sd_prefix }}/addons - --stackdriver-prefix={{ prometheus_to_sd_prefix }}/addons

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

@@ -1,13 +1,13 @@
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: DaemonSet kind: DaemonSet
metadata: metadata:
name: fluentd-gcp-v2.0.14 name: fluentd-gcp-v2.0.16
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: fluentd-gcp k8s-app: fluentd-gcp
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile addonmanager.kubernetes.io/mode: Reconcile
version: v2.0.14 version: v2.0.16
spec: spec:
updateStrategy: updateStrategy:
type: RollingUpdate type: RollingUpdate
@@ -16,7 +16,7 @@ spec:
labels: labels:
k8s-app: fluentd-gcp k8s-app: fluentd-gcp
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
version: v2.0.14 version: v2.0.16
# This annotation ensures that fluentd does not get evicted if the node # This annotation ensures that fluentd does not get evicted if the node
# supports critical pod annotation based priority scheme. # supports critical pod annotation based priority scheme.
# Note that this does not guarantee admission on the nodes (#40573). # Note that this does not guarantee admission on the nodes (#40573).
@@ -28,7 +28,7 @@ spec:
dnsPolicy: Default dnsPolicy: Default
containers: containers:
- name: fluentd-gcp - name: fluentd-gcp
image: k8s.gcr.io/fluentd-gcp:2.0.14 image: k8s.gcr.io/fluentd-gcp:2.0.16
env: env:
- name: FLUENTD_ARGS - name: FLUENTD_ARGS
value: --no-supervisor -q value: --no-supervisor -q
@@ -77,7 +77,7 @@ spec:
fi; fi;
# BEGIN_PROMETHEUS_TO_SD # BEGIN_PROMETHEUS_TO_SD
- name: prometheus-to-sd-exporter - name: prometheus-to-sd-exporter
image: k8s.gcr.io/prometheus-to-sd:v0.2.2 image: k8s.gcr.io/prometheus-to-sd:v0.2.4
command: command:
- /monitor - /monitor
- --stackdriver-prefix={{ prometheus_to_sd_prefix }}/addons - --stackdriver-prefix={{ prometheus_to_sd_prefix }}/addons

2
cluster/addons/fluentd-gcp/scaler-deployment.yaml
View File

@@ -22,7 +22,7 @@ spec:
image: gcr.io/google-containers/fluentd-gcp-scaler:0.1 image: gcr.io/google-containers/fluentd-gcp-scaler:0.1
command: command:
- /scaler.sh - /scaler.sh
- --ds-name=fluentd-gcp-v2.0.14 - --ds-name=fluentd-gcp-v2.0.16
- --scaling-policy=fluentd-gcp-scaling-policy - --scaling-policy=fluentd-gcp-scaling-policy
env: env:
# Defaults, used if no overrides are found in fluentd-gcp-scaling-policy # Defaults, used if no overrides are found in fluentd-gcp-scaling-policy

2
cluster/addons/metadata-proxy/gce/metadata-proxy.yaml
View File

@@ -52,7 +52,7 @@ spec:
cpu: "30m" cpu: "30m"
# BEGIN_PROMETHEUS_TO_SD # BEGIN_PROMETHEUS_TO_SD
- name: prometheus-to-sd-exporter - name: prometheus-to-sd-exporter
image: k8s.gcr.io/prometheus-to-sd:v0.2.2 image: k8s.gcr.io/prometheus-to-sd:v0.2.4
# Request and limit resources to get guaranteed QoS. # Request and limit resources to get guaranteed QoS.
resources: resources:
requests: requests: