forked from AliyunContainerService/log-pilot
-
Notifications
You must be signed in to change notification settings - Fork 15
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
fix(starbucks): change logstash host fields #30
Merged
caicloud-bot
merged 1 commit into
caicloud:release-1.2-starbucks
from
moshuipan:release-1.2-starbucks
Jul 25, 2019
Merged
fix(starbucks): change logstash host fields #30
caicloud-bot
merged 1 commit into
caicloud:release-1.2-starbucks
from
moshuipan:release-1.2-starbucks
Jul 25, 2019
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
/lgtm |
[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 |
jianglinjian
pushed a commit
to jianglinjian/log-pilot
that referenced
this pull request
Dec 9, 2019
caicloud-bot
pushed a commit
that referenced
this pull request
Dec 10, 2019
* 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
jianglinjian
pushed a commit
to jianglinjian/log-pilot
that referenced
this pull request
Feb 27, 2020
caicloud-bot
pushed a commit
that referenced
this pull request
Feb 27, 2020
…starbucks (#79) * Revert "fix CreateContainerConfigError (#71)" This reverts commit aa077b2. * Revert "[release-1.1][CPS-4825] feat: support concat multiline log (#70)" This reverts commit 5f92f1f. * 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) * chore(*): cherrypick master and bump filebeat to 6.7.2 (Starbucks OEM) (#39) * higher resource limit (#32) (cherry picked from commit d17d4bb) * feat(metrics): export Filebeat metrics with beat-exporter (#35) * added beat-exporter * revert imagePullPolicy (cherry picked from commit d2dbc2f) * remove 2.9.0 content * bump filebeat version to 6.7.2 * [release-1.2] Update Filebeat version to 6.5.4 for upstream bug fix (#37) * improve Makefile * always drop log field * add missing CM name for OUTPUT_CONFIG env * update filebeat-keeper Co-authored-by: Min Luo <1073598702@qq.com> Co-authored-by: Chuan Li <root@lichuan.guru>
caicloud-bot
pushed a commit
to caicloud-bot/log-pilot
that referenced
this pull request
Mar 26, 2020
caicloud-bot
added a commit
that referenced
this pull request
Mar 26, 2020
) * 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>
caicloud-bot
pushed a commit
to caicloud-bot/log-pilot
that referenced
this pull request
Apr 19, 2020
caicloud-bot
added a commit
that referenced
this pull request
Apr 19, 2020
…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>
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/XS
Denotes a PR that changes 0-9 lines, ignoring generated files.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does / why we need it:
change logstash host fields
Which issue(s) this PR is related to (optional, link to 3rd issue(s)):
Fixes #
Reference to #
Special notes for your reviewer:
/cc @lichuan0620
Release note: