github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
k3s/cluster
History
Kubernetes Submit Queue a2f4f585af
Merge pull request #67947 from saravanan30erd/fluentd-elasticsearch 
Automatic merge from submit-queue (batch tested with PRs 67067, 67947). 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>.

fixes fluentd configuration params in fluentd-elasticsearch addon

**What this PR does / why we need it**:
- fixes the errors/warnings in fluentd configuration.

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
```
2018-08-28 11:40:50 +0000 [warn]: 'filters' parameter is deprecated: filters has been renamed as matches
2018-08-28 11:40:50 +0000 [warn]: 'filters' parameter is deprecated: filters has been renamed as matches
2018-08-28 11:40:50 +0000 [warn]: 'filters' parameter is deprecated: filters has been renamed as matches
2018-08-28 11:40:50 +0000 [warn]: 'filters' parameter is deprecated: filters has been renamed as matches
2018-08-28 11:40:50 +0000 [warn]: 'filters' parameter is deprecated: filters has been renamed as matches
2018-08-28 11:40:50 +0000 [warn]: parameter 'time_format' in <source>
  @id fluentd-containers.log
  @type tail
  path "/var/log/containers/*.log"
  pos_file "/var/log/es-containers.log.pos"
  time_format %Y-%m-%dT%H:%M:%S.%NZ
  tag "raw.kubernetes.*"
  read_from_head true
  <parse>
    @type "multi_format"
    <pattern>
      format json
      time_key "time"
      time_format "%Y-%m-%dT%H:%M:%S.%NZ"
      time_type string
    </pattern>
    <pattern>
      format /^(?<time>.+) (?<stream>stdout|stderr) [^ ]* (?<log>.*)$/
      time_format "%Y-%m-%dT%H:%M:%S.%N%:z"
      expression ^(?<time>.+) (?<stream>stdout|stderr) [^ ]* (?<log>.*)$
      ignorecase false
      multiline false
    </pattern>
  </parse>
</source> is not used.
```

**Release note**:

```release-note
fixes the errors/warnings in fluentd configuration
```
 		2018-08-28 15:08:04 -07:00
..
addons fix the fluentd config params 2018-08-28 17:26:27 +04:00
centos Supplementary information for common flags and add restart second config 2018-08-21 11:06:44 +08:00
gce K8s SCTP support implementation for the first pull request 2018-08-27 05:56:27 +00:00
images Add Labels to various OWNERS files 2018-08-21 13:59:08 -04:00
juju Fix missed cloud-request-sent flags 2018-08-27 12:56:25 +00:00
kubemark Adding IKS functionality to kubemark 2018-07-23 11:42:22 -04:00
kubernetes-anywhere Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
local Remove duplicated detect-master for local 2018-08-15 19:04:40 +00:00
log-dump Merge pull request #67687 from Lion-Wei/remote-reschrduler 2018-08-23 12:32:17 -07:00
pre-existing Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
skeleton Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
BUILD Add unit test for configure-helper. 2018-04-23 12:18:57 -07:00
OWNERS Add Labels to various OWNERS files 2018-08-21 13:59:08 -04:00
README.md
…
clientbin.sh enable e2e test on Arm64 2018-08-13 16:34:25 +08:00
common.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
get-kube-binaries.sh
…
get-kube-local.sh fix create-kubelet-kubeconfig. 2018-08-10 16:07:49 +08:00
get-kube.sh Remove salt support for providers that no longer exist. 2018-01-12 15:51:23 -08:00
kube-down.sh Exit gce kube-up.sh early if openssl is LibreSSL 2018-07-26 14:48:51 -07:00
kube-up.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
kube-util.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
kubeadm.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
kubectl.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
restore-from-backup.sh Remove references to the Debian-based Container-VM image 2018-07-03 17:05:31 -07:00
test-e2e.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
test-network.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
test-smoke.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
update-storage-objects.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
validate-cluster.sh Fix validate-cluster.sh for clusters with more than 500 nodes. 2018-08-21 15:19:41 +02:00

README.md

Cluster Configuration

Deprecation Notice: This directory has entered maintenance mode and will not be accepting new providers. Please submit new automation deployments to kube-deploy. Deployments in this directory will continue to be maintained and supported at their current level of support.

The scripts and data in this directory automate creation and configuration of a Kubernetes cluster, including networking, DNS, nodes, and master components.

See the getting-started guides for examples of how to use the scripts.

cloudprovider/config-default.sh contains a set of tweakable definitions/parameters for the cluster.

The heavy lifting of configuring the VMs is done by SaltStack.

Analytics