Skip to content

K
k3s
Unverified Commit f105ae3e authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #63918 from cezarygerard/sd-event-exporter

Automatic merge from submit-queue (batch tested with PRs 63569, 63918, 63980, 63295, 63989). 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>. New event exporter config with support for new stackdriver resources New event exporter, with support for use new and old stackdriver resource model. This should also be cherry-picked to release-1.10 branch, as all fluentd-gcp components support new and stackdriver resource model. ```release-note Update event-exporter to version v0.2.0 that supports old (gke_container/gce_instance) and new (k8s_container/k8s_node/k8s_pod) stackdriver resources. ```
parents 08a094ca d611aeac
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 11 deletions
cluster/addons/fluentd-gcp/event-exporter.yaml
View file @ f105ae3e
...@@ -29,11 +29,11 @@ subjects: ...@@ -29,11 +29,11 @@ subjects:
apiVersion: apps/v1beta1 apiVersion: apps/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: event-exporter-v0.1.9 name: event-exporter-v0.2.1
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: event-exporter k8s-app: event-exporter
version: v0.1.9 version: v0.2.1
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile addonmanager.kubernetes.io/mode: Reconcile
spec: spec:
...@@ -42,15 +42,15 @@ spec: ...@@ -42,15 +42,15 @@ spec:
metadata: metadata:
labels: labels:
k8s-app: event-exporter k8s-app: event-exporter
version: v0.1.9 version: v0.2.1
spec: spec:
serviceAccountName: event-exporter-sa serviceAccountName: event-exporter-sa
containers: containers:
- name: event-exporter - name: event-exporter
image: k8s.gcr.io/event-exporter:v0.1.9 image: k8s.gcr.io/event-exporter:v0.2.1
command: command:
- /event-exporter - /event-exporter
- -sink-opts=-location={{ event_exporter_location }} - -sink-opts=-stackdriver-resource-model={{ exporter_sd_resource_model }}
# 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.4 image: k8s.gcr.io/prometheus-to-sd:v0.2.4
......
cluster/gce/config-default.sh
View file @ f105ae3e
...@@ -404,6 +404,9 @@ HEAPSTER_GCP_MEMORY_PER_NODE="${HEAPSTER_GCP_MEMORY_PER_NODE:-4}" ...@@ -404,6 +404,9 @@ HEAPSTER_GCP_MEMORY_PER_NODE="${HEAPSTER_GCP_MEMORY_PER_NODE:-4}"
HEAPSTER_GCP_BASE_CPU="${HEAPSTER_GCP_BASE_CPU:-80m}" HEAPSTER_GCP_BASE_CPU="${HEAPSTER_GCP_BASE_CPU:-80m}"
HEAPSTER_GCP_CPU_PER_NODE="${HEAPSTER_GCP_CPU_PER_NODE:-0.5}" HEAPSTER_GCP_CPU_PER_NODE="${HEAPSTER_GCP_CPU_PER_NODE:-0.5}"
# Default Stackdriver resources version exported by Fluentd-gcp addon
LOGGING_STACKDRIVER_RESOURCE_TYPES="${LOGGING_STACKDRIVER_RESOURCE_TYPES:-old}"
# Adding to PROVIDER_VARS, since this is GCP-specific. # Adding to PROVIDER_VARS, since this is GCP-specific.
PROVIDER_VARS="${PROVIDER_VARS:-} FLUENTD_GCP_VERSION FLUENTD_GCP_MEMORY_LIMIT FLUENTD_GCP_CPU_REQUEST FLUENTD_GCP_MEMORY_REQUEST HEAPSTER_GCP_BASE_MEMORY HEAPSTER_GCP_MEMORY_PER_NODE HEAPSTER_GCP_BASE_CPU HEAPSTER_GCP_CPU_PER_NODE CUSTOM_KUBE_DASHBOARD_BANNER LOGGING_STACKDRIVER_RESOURCE_TYPES" PROVIDER_VARS="${PROVIDER_VARS:-} FLUENTD_GCP_VERSION FLUENTD_GCP_MEMORY_LIMIT FLUENTD_GCP_CPU_REQUEST FLUENTD_GCP_MEMORY_REQUEST HEAPSTER_GCP_BASE_MEMORY HEAPSTER_GCP_MEMORY_PER_NODE HEAPSTER_GCP_BASE_CPU HEAPSTER_GCP_CPU_PER_NODE CUSTOM_KUBE_DASHBOARD_BANNER LOGGING_STACKDRIVER_RESOURCE_TYPES"
......
cluster/gce/config-test.sh
View file @ f105ae3e
...@@ -420,6 +420,9 @@ HEAPSTER_GCP_MEMORY_PER_NODE="${HEAPSTER_GCP_MEMORY_PER_NODE:-4}" ...@@ -420,6 +420,9 @@ HEAPSTER_GCP_MEMORY_PER_NODE="${HEAPSTER_GCP_MEMORY_PER_NODE:-4}"
HEAPSTER_GCP_BASE_CPU="${HEAPSTER_GCP_BASE_CPU:-80m}" HEAPSTER_GCP_BASE_CPU="${HEAPSTER_GCP_BASE_CPU:-80m}"
HEAPSTER_GCP_CPU_PER_NODE="${HEAPSTER_GCP_CPU_PER_NODE:-0.5}" HEAPSTER_GCP_CPU_PER_NODE="${HEAPSTER_GCP_CPU_PER_NODE:-0.5}"
# Default Stackdriver resources version exported by Fluentd-gcp addon
LOGGING_STACKDRIVER_RESOURCE_TYPES="${LOGGING_STACKDRIVER_RESOURCE_TYPES:-old}"
# Adding to PROVIDER_VARS, since this is GCP-specific. # Adding to PROVIDER_VARS, since this is GCP-specific.
PROVIDER_VARS="${PROVIDER_VARS:-} FLUENTD_GCP_VERSION FLUENTD_GCP_MEMORY_LIMIT FLUENTD_GCP_CPU_REQUEST FLUENTD_GCP_MEMORY_REQUEST HEAPSTER_GCP_BASE_MEMORY HEAPSTER_GCP_MEMORY_PER_NODE HEAPSTER_GCP_BASE_CPU HEAPSTER_GCP_CPU_PER_NODE CUSTOM_KUBE_DASHBOARD_BANNER LOGGING_STACKDRIVER_RESOURCE_TYPES" PROVIDER_VARS="${PROVIDER_VARS:-} FLUENTD_GCP_VERSION FLUENTD_GCP_MEMORY_LIMIT FLUENTD_GCP_CPU_REQUEST FLUENTD_GCP_MEMORY_REQUEST HEAPSTER_GCP_BASE_MEMORY HEAPSTER_GCP_MEMORY_PER_NODE HEAPSTER_GCP_BASE_CPU HEAPSTER_GCP_CPU_PER_NODE CUSTOM_KUBE_DASHBOARD_BANNER LOGGING_STACKDRIVER_RESOURCE_TYPES"
......
cluster/gce/gci/configure-helper.sh
View file @ f105ae3e
...@@ -2155,12 +2155,8 @@ function update-prometheus-to-sd-parameters { ...@@ -2155,12 +2155,8 @@ function update-prometheus-to-sd-parameters {
# Updates parameters in yaml file for event-exporter configuration # Updates parameters in yaml file for event-exporter configuration
function update-event-exporter { function update-event-exporter {
if [[ "${MULTIMASTER:-}" == "true" ]]; then local -r stackdriver_resource_model="${LOGGING_STACKDRIVER_RESOURCE_TYPES:-old}"
local -r location=${REGION:-} sed -i -e "s@{{ exporter_sd_resource_model }}@${stackdriver_resource_model}@g" "$1"
else
local -r location=${ZONE:-}
fi
sed -i -e "s@{{ *event_exporter_location *}}@${location}@g" "$1"
} }
function update-dashboard-controller { function update-dashboard-controller {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment