Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[master] [HAIER-80][release-1.1]fix(keeper): stop filebeat when config is empty #74

Merged
merged 1 commit into from
Dec 26, 2019

Conversation

caicloud-bot
Copy link

This is an automated cherry-pick of #72

/assign jianglinjian

@caicloud-bot
Copy link
Author

@caicloud-bot: Adding the "do-not-merge/release-note-label-needed" label because no release-note block was detected, please follow our release note process to remove it.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the caicloud/tools repository.

@caicloud-bot caicloud-bot added do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. caicloud-cla: yes Indicates the PR's author has not signed the Caicloud CLA. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Dec 26, 2019
@jianglinjian
Copy link

/release-note-none

@caicloud-bot caicloud-bot added release-note-none Denotes a PR that doesn't merit a release note. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Dec 26, 2019
@lichuan0620
Copy link

/lgtm

@caicloud-bot caicloud-bot added the lgtm Indicates that a PR is ready to be merged. label Dec 26, 2019
@caicloud-bot
Copy link
Author

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lichuan0620

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@caicloud-bot caicloud-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 26, 2019
@caicloud-bot caicloud-bot merged commit 588b1b4 into caicloud:master Dec 26, 2019
lichuan0620 pushed a commit that referenced this pull request Jan 13, 2020
caicloud-bot added a commit that referenced this pull request Nov 24, 2020
* chore: update docs (#17)

* update owner (#19)

* update filebeat to 6.5.3 (#18)

* feat(*): enable filebeat statistic API (#26)

* feat(*): add priority class (#31)

* higher resource limit (#32)

* Update Filebeat version to 6.5.4 for upstream bug fix (#36)

* bump filebeat verson to 6.5.4

* improve Makefile

* �feat(metrics): export Filebeat metrics with beat-exporter (#35)

* added beat-exporter

* revert imagePullPolicy

* feat(release): add standalone etcd node toleration (#40)

* fix(*): monitor subprocess status (#43)

* refactor subprocess start and stop

* refactor watch /config/filebeat-output.yml

* fix bug

* fix bug

* chore(*): add mount propagation (#45)

* fix(release): mount only the containers directory inside /var/lib/docker (#52)

* feat(release): add toleration for all taint (#56)

* chore(*): update Makefile, release, OWNERS, and Dockerfiles (#57)

* refactor Makefile, release file, and Dockerfile

* update Makefile

* add jianglinjian as a reviewer

* disable lint

* disable problematic tests

* refactor gitignore

* dep init

* adjust resource quota and remove pod priority (#58)

* [master] chore(*): added Dockerfile for filebeat for compatibility (#63)

* chore(*): added Dockerfile for filebeat for compatibility

* readme

* chore(golang): upgrade golang to 1.12.12 & golangci-lint to 1.20.1

* added jianglinjian as an approver (#65)

* fix looped "Cannot index event" error message (#67)

* stop filebeat when config is empty (#74)

(cherry picked from commit 588b1b4)

* [release-1.3] [release-1.1][CPS-4825] feat: support concat multiline log (#89)

* fix(logstash): add logstash config (#22)

* fix(logstash): add logstash config

* feat(*): add custom fields and multiline pattern config

* fix(starbucks): modify filebeat template

* feat(starbucks): set ignore_older confg (#23)

* fix(logstash): add logstash config

* feat(starbucks): set ignore_older confg

* feat(starbucks): drop log field when handle multiline message (#27)

* fix(starbucks): change logstash host fields (#30)

* support more multiline options

* fix review

Co-authored-by: Min Luo <1073598702@qq.com>
Co-authored-by: Linjian Jiang <jianglinjian@caicloud.io>

* fix CreateContainerConfigError (#90)

Co-authored-by: Linjian Jiang <jianglinjian@caicloud.io>

* update filebeat to v6.8.6 (#91)

Co-authored-by: Linjian Jiang <jianglinjian@caicloud.io>

* remove unuseful step in dockerfile (#92)

Co-authored-by: Linjian Jiang <jianglinjian@caicloud.io>

* block logs from default/kube-system namespaces (#95)

* adjust resource quota (#99)

* feat(*): upgrade golang image to 1.12-security (#108)

* Revert "block logs from default/kube-system namespaces (#101)"

This reverts commit 2661d2b.

* Revert "feat(*): support using BasicAuth for Elasticsearch (#100)"

This reverts commit 5a1aa42.

* Revert "update filebeat to v6.8.6 (#76)"

This reverts commit 0d29f06.

* Revert "[release-1.1]chore(arm64): support building arm64 images (#80)"

This reverts commit d20ac1c.

* Revert "[release-1.1] chore(*): update Makefile, release, OWNERS, and Dockerfiles  (#75)"

This reverts commit 5d0748c.

* Revert "stop filebeat when config is empty (#72)"

This reverts commit 88d575a.

* Revert "fix CreateContainerConfigError (#71)"

This reverts commit aa077b2.

* Revert "[release-1.1][CPS-4825] feat: support concat multiline log (#70)"

This reverts commit 5f92f1f.

* Revert "fix looped "Cannot index event" error message (#69)"

This reverts commit 41bd4b1.

* Revert "[release-1.1] cherrypick beat-exporter (#66)"

This reverts commit 091d499.

* Revert "fix(release-1.1): mount only the containers directory inside /var/lib/docker (#53)"

This reverts commit c63dacc.

* Revert "[CPS-3664]chore(*): cherrypick release-1.2 optimization and bug fixes to release-1.1 (#47)"

This reverts commit 9539d3f.

* Revert "update filebeat to 6.5.3"

This reverts commit 07401dd.

Co-authored-by: Tong Cai <caitong93@gmail.com>
Co-authored-by: Chuan Li <root@lichuan.guru>
Co-authored-by: caicloud-bot <register@caicloud.io>
Co-authored-by: Mengjiang Bao <baomengjiang@gmail.com>
Co-authored-by: Chuan Li <lichuan@caicloud.io>
Co-authored-by: Songlin Yang <yangsonglin@caicloud.io>
Co-authored-by: Min Luo <1073598702@qq.com>
Co-authored-by: Xianmeng Tang <tangxianmeng@caicloud.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. caicloud-cla: yes Indicates the PR's author has not signed the Caicloud CLA. lgtm Indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
3 participants