diff --git a/cluster/addons/fluentd-gcp/fluentd-gcp-configmap-old.yaml b/cluster/addons/fluentd-gcp/fluentd-gcp-configmap-old.yaml index 82ac2b6fdac..bffda046ab6 100644 --- a/cluster/addons/fluentd-gcp/fluentd-gcp-configmap-old.yaml +++ b/cluster/addons/fluentd-gcp/fluentd-gcp-configmap-old.yaml @@ -61,16 +61,18 @@ data: # reform.var.log.containers.__-.log tag reform.* read_from_head true - format multi_format - - format json - time_key time - time_format %Y-%m-%dT%H:%M:%S.%NZ - - - format /^(? + + @type multi_format + + format json + time_key time + time_format %Y-%m-%dT%H:%M:%S.%NZ + + + format /^(? + diff --git a/cluster/addons/fluentd-gcp/fluentd-gcp-configmap.yaml b/cluster/addons/fluentd-gcp/fluentd-gcp-configmap.yaml index 0985b9226ac..549fef75a54 100644 --- a/cluster/addons/fluentd-gcp/fluentd-gcp-configmap.yaml +++ b/cluster/addons/fluentd-gcp/fluentd-gcp-configmap.yaml @@ -64,16 +64,18 @@ data: # reform.var.log.containers.__-.log tag reform.* read_from_head true - format multi_format - - format json - time_key time - time_format %Y-%m-%dT%H:%M:%S.%NZ - - - format /^(? + + @type multi_format + + format json + time_key time + time_format %Y-%m-%dT%H:%M:%S.%NZ + + + format /^(? + diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index 4fd5fec4412..37e81cd53e6 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -409,8 +409,8 @@ fi # Fluentd requirements # YAML exists to trigger a configuration refresh when changes are made. -FLUENTD_GCP_YAML_VERSION="v3.1.0" -FLUENTD_GCP_VERSION="${FLUENTD_GCP_VERSION:-0.5-1.5.36-1-k8s}" +FLUENTD_GCP_YAML_VERSION="v3.2.0" +FLUENTD_GCP_VERSION="${FLUENTD_GCP_VERSION:-0.6-1.6.0-1}" FLUENTD_GCP_MEMORY_LIMIT="${FLUENTD_GCP_MEMORY_LIMIT:-}" FLUENTD_GCP_CPU_REQUEST="${FLUENTD_GCP_CPU_REQUEST:-}" FLUENTD_GCP_MEMORY_REQUEST="${FLUENTD_GCP_MEMORY_REQUEST:-}" diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index ad350582a16..d2a37f3f446 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -425,8 +425,8 @@ fi # Fluentd requirements # YAML exists to trigger a configuration refresh when changes are made. -FLUENTD_GCP_YAML_VERSION="v3.1.0" -FLUENTD_GCP_VERSION="${FLUENTD_GCP_VERSION:-0.5-1.5.36-1-k8s}" +FLUENTD_GCP_YAML_VERSION="v3.2.0" +FLUENTD_GCP_VERSION="${FLUENTD_GCP_VERSION:-0.6-1.6.0-1}" FLUENTD_GCP_MEMORY_LIMIT="${FLUENTD_GCP_MEMORY_LIMIT:-}" FLUENTD_GCP_CPU_REQUEST="${FLUENTD_GCP_CPU_REQUEST:-}" FLUENTD_GCP_MEMORY_REQUEST="${FLUENTD_GCP_MEMORY_REQUEST:-}" diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh index 4003e2b5416..8427fc35e75 100644 --- a/cluster/gce/gci/configure-helper.sh +++ b/cluster/gce/gci/configure-helper.sh @@ -2321,10 +2321,10 @@ function setup-fluentd { fluentd_gcp_configmap_name="fluentd-gcp-config-old" fi sed -i -e "s@{{ fluentd_gcp_configmap_name }}@${fluentd_gcp_configmap_name}@g" "${fluentd_gcp_yaml}" - fluentd_gcp_yaml_version="${FLUENTD_GCP_YAML_VERSION:-v3.1.0}" + fluentd_gcp_yaml_version="${FLUENTD_GCP_YAML_VERSION:-v3.2.0}" sed -i -e "s@{{ fluentd_gcp_yaml_version }}@${fluentd_gcp_yaml_version}@g" "${fluentd_gcp_yaml}" sed -i -e "s@{{ fluentd_gcp_yaml_version }}@${fluentd_gcp_yaml_version}@g" "${fluentd_gcp_scaler_yaml}" - fluentd_gcp_version="${FLUENTD_GCP_VERSION:-0.5-1.5.36-1-k8s}" + fluentd_gcp_version="${FLUENTD_GCP_VERSION:-0.6-1.6.0-1}" sed -i -e "s@{{ fluentd_gcp_version }}@${fluentd_gcp_version}@g" "${fluentd_gcp_yaml}" update-daemon-set-prometheus-to-sd-parameters ${fluentd_gcp_yaml} start-fluentd-resource-update ${fluentd_gcp_yaml}