mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-27 13:37:30 +00:00
Merge pull request #70954 from qingling128/master
Upgrade Stackdriver Logging Agent addon image to 0.6-1.6.0-1 to use Fluentd v1.2.
This commit is contained in:
commit
396271cf52
@ -61,16 +61,18 @@ data:
|
|||||||
# reform.var.log.containers.<POD_NAME>_<NAMESPACE_NAME>_<CONTAINER_NAME>-<CONTAINER_ID>.log
|
# reform.var.log.containers.<POD_NAME>_<NAMESPACE_NAME>_<CONTAINER_NAME>-<CONTAINER_ID>.log
|
||||||
tag reform.*
|
tag reform.*
|
||||||
read_from_head true
|
read_from_head true
|
||||||
format multi_format
|
<parse>
|
||||||
<pattern>
|
@type multi_format
|
||||||
format json
|
<pattern>
|
||||||
time_key time
|
format json
|
||||||
time_format %Y-%m-%dT%H:%M:%S.%NZ
|
time_key time
|
||||||
</pattern>
|
time_format %Y-%m-%dT%H:%M:%S.%NZ
|
||||||
<pattern>
|
</pattern>
|
||||||
format /^(?<time>.+) (?<stream>stdout|stderr) [^ ]* (?<log>.*)$/
|
<pattern>
|
||||||
time_format %Y-%m-%dT%H:%M:%S.%N%:z
|
format /^(?<time>.+) (?<stream>stdout|stderr) [^ ]* (?<log>.*)$/
|
||||||
</pattern>
|
time_format %Y-%m-%dT%H:%M:%S.%N%:z
|
||||||
|
</pattern>
|
||||||
|
</parse>
|
||||||
</source>
|
</source>
|
||||||
|
|
||||||
<filter reform.**>
|
<filter reform.**>
|
||||||
|
@ -64,16 +64,18 @@ data:
|
|||||||
# reform.var.log.containers.<POD_NAME>_<NAMESPACE_NAME>_<CONTAINER_NAME>-<CONTAINER_ID>.log
|
# reform.var.log.containers.<POD_NAME>_<NAMESPACE_NAME>_<CONTAINER_NAME>-<CONTAINER_ID>.log
|
||||||
tag reform.*
|
tag reform.*
|
||||||
read_from_head true
|
read_from_head true
|
||||||
format multi_format
|
<parse>
|
||||||
<pattern>
|
@type multi_format
|
||||||
format json
|
<pattern>
|
||||||
time_key time
|
format json
|
||||||
time_format %Y-%m-%dT%H:%M:%S.%NZ
|
time_key time
|
||||||
</pattern>
|
time_format %Y-%m-%dT%H:%M:%S.%NZ
|
||||||
<pattern>
|
</pattern>
|
||||||
format /^(?<time>.+) (?<stream>stdout|stderr) [^ ]* (?<log>.*)$/
|
<pattern>
|
||||||
time_format %Y-%m-%dT%H:%M:%S.%N%:z
|
format /^(?<time>.+) (?<stream>stdout|stderr) [^ ]* (?<log>.*)$/
|
||||||
</pattern>
|
time_format %Y-%m-%dT%H:%M:%S.%N%:z
|
||||||
|
</pattern>
|
||||||
|
</parse>
|
||||||
</source>
|
</source>
|
||||||
|
|
||||||
<filter reform.**>
|
<filter reform.**>
|
||||||
|
@ -409,8 +409,8 @@ fi
|
|||||||
|
|
||||||
# Fluentd requirements
|
# Fluentd requirements
|
||||||
# YAML exists to trigger a configuration refresh when changes are made.
|
# YAML exists to trigger a configuration refresh when changes are made.
|
||||||
FLUENTD_GCP_YAML_VERSION="v3.1.0"
|
FLUENTD_GCP_YAML_VERSION="v3.2.0"
|
||||||
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}"
|
||||||
FLUENTD_GCP_MEMORY_LIMIT="${FLUENTD_GCP_MEMORY_LIMIT:-}"
|
FLUENTD_GCP_MEMORY_LIMIT="${FLUENTD_GCP_MEMORY_LIMIT:-}"
|
||||||
FLUENTD_GCP_CPU_REQUEST="${FLUENTD_GCP_CPU_REQUEST:-}"
|
FLUENTD_GCP_CPU_REQUEST="${FLUENTD_GCP_CPU_REQUEST:-}"
|
||||||
FLUENTD_GCP_MEMORY_REQUEST="${FLUENTD_GCP_MEMORY_REQUEST:-}"
|
FLUENTD_GCP_MEMORY_REQUEST="${FLUENTD_GCP_MEMORY_REQUEST:-}"
|
||||||
|
@ -425,8 +425,8 @@ fi
|
|||||||
|
|
||||||
# Fluentd requirements
|
# Fluentd requirements
|
||||||
# YAML exists to trigger a configuration refresh when changes are made.
|
# YAML exists to trigger a configuration refresh when changes are made.
|
||||||
FLUENTD_GCP_YAML_VERSION="v3.1.0"
|
FLUENTD_GCP_YAML_VERSION="v3.2.0"
|
||||||
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}"
|
||||||
FLUENTD_GCP_MEMORY_LIMIT="${FLUENTD_GCP_MEMORY_LIMIT:-}"
|
FLUENTD_GCP_MEMORY_LIMIT="${FLUENTD_GCP_MEMORY_LIMIT:-}"
|
||||||
FLUENTD_GCP_CPU_REQUEST="${FLUENTD_GCP_CPU_REQUEST:-}"
|
FLUENTD_GCP_CPU_REQUEST="${FLUENTD_GCP_CPU_REQUEST:-}"
|
||||||
FLUENTD_GCP_MEMORY_REQUEST="${FLUENTD_GCP_MEMORY_REQUEST:-}"
|
FLUENTD_GCP_MEMORY_REQUEST="${FLUENTD_GCP_MEMORY_REQUEST:-}"
|
||||||
|
@ -2321,10 +2321,10 @@ function setup-fluentd {
|
|||||||
fluentd_gcp_configmap_name="fluentd-gcp-config-old"
|
fluentd_gcp_configmap_name="fluentd-gcp-config-old"
|
||||||
fi
|
fi
|
||||||
sed -i -e "s@{{ fluentd_gcp_configmap_name }}@${fluentd_gcp_configmap_name}@g" "${fluentd_gcp_yaml}"
|
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_yaml}"
|
||||||
sed -i -e "s@{{ fluentd_gcp_yaml_version }}@${fluentd_gcp_yaml_version}@g" "${fluentd_gcp_scaler_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}"
|
sed -i -e "s@{{ fluentd_gcp_version }}@${fluentd_gcp_version}@g" "${fluentd_gcp_yaml}"
|
||||||
update-daemon-set-prometheus-to-sd-parameters ${fluentd_gcp_yaml}
|
update-daemon-set-prometheus-to-sd-parameters ${fluentd_gcp_yaml}
|
||||||
start-fluentd-resource-update ${fluentd_gcp_yaml}
|
start-fluentd-resource-update ${fluentd_gcp_yaml}
|
||||||
|
Loading…
Reference in New Issue
Block a user