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.

Sign up for GitHub

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

Jump to bottom

[fluentd-gcp addon] Update Stackdriver plugin to version 0.6.7 #52565

Merged
merged 1 commit into from
Sep 20, 2017
Merged

[fluentd-gcp addon] Update Stackdriver plugin to version 0.6.7 #52565

merged 1 commit into from
Sep 20, 2017

Conversation

crassirostris
Copy link

@crassirostris crassirostris commented Sep 15, 2017 •
edited
Loading

A new gem among all fixes Java logging severity parsing and string timestamp parsing

Also sync the buffer size with the gem guidelines, making it 1M instead of 2M.

/cc @igorpeshansky

@crassirostris crassirostris added area/logging area/platform/gce area/provider/gcp Issues or PRs related to gcp provider release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/instrumentation Categorizes an issue or PR as relevant to SIG Instrumentation. labels Sep 15, 2017
@crassirostris crassirostris added this to the v1.8 milestone Sep 15, 2017
@crassirostris crassirostris requested a review from piosz September 15, 2017 19:53
@k8s-ci-robot
Copy link
Contributor

@crassirostris: GitHub didn't allow me to request PR reviews from the following users: igorpeshansky.

Note that only kubernetes members can review this PR, and authors cannot review their own PRs.

In response to this:

Fixes Java logging severity parsing and string timestamp parsing

/cc @igorpeshansky

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 kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Sep 15, 2017
igorpeshansky
igorpeshansky suggested changes Sep 15, 2017
View reviewed changes
cluster/addons/fluentd-gcp/fluentd-gcp-configmap.yaml
@@ -364,6 +364,8 @@ data:
<match kubernetes.**>
@type google_cloud

# Try to detect JSON formatted log entries.
detect_json true
# Collect metrics in Prometheus registry about plugin activity.
enable_monitoring true
monitoring_type prometheus
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this a good time to sync with the official config and make the buffer_chunk_size smaller (we have it at 1M)? Smaller bundles have less latency, allowing for more throughput with fewer threads... Also below.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done, thanks!

@crassirostris crassirostris force-pushed the sd-logging-update-plugin-0.6.7 branch from 6f35b6c to a71d946 Compare September 15, 2017 20:09
igorpeshansky
igorpeshansky suggested changes Sep 15, 2017
View reviewed changes
cluster/addons/fluentd-gcp/fluentd-gcp-configmap.yaml Outdated
@@ -375,7 +377,7 @@ data:
buffer_queue_full_action block
# Set the chunk limit conservatively to avoid exceeding the GCL limit
# of 10MiB per write request.
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Want to sync this comment too?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch, thanks, done

@crassirostris crassirostris force-pushed the sd-logging-update-plugin-0.6.7 branch from a71d946 to fd0e258 Compare September 15, 2017 20:17
igorpeshansky
igorpeshansky suggested changes Sep 15, 2017
View reviewed changes
cluster/addons/fluentd-gcp/fluentd-gcp-configmap.yaml Outdated
# of 10MiB per write request.
buffer_chunk_limit 2M
# Set the chunk limit conservatively to avoid exceeding the Stackdriver
# Logging limit of 5MiB per write request.
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

5MiB is not a limit, it's the recommended size. See the comment I referenced earlier (https://github.com/GoogleCloudPlatform/google-fluentd/blob/master/templates/etc/td-agent/td-agent.conf#L18)...

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, from reading https://cloud.google.com/logging/quotas I had the impressions it is a limit

I'll fix the comment

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@crassirostris crassirostris force-pushed the sd-logging-update-plugin-0.6.7 branch from fd0e258 to ae132a0 Compare September 15, 2017 20:30
igorpeshansky
igorpeshansky approved these changes Sep 15, 2017
View reviewed changes
Copy link

@igorpeshansky igorpeshansky left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM :shipit:

@crassirostris crassirostris mentioned this pull request Sep 16, 2017
Closed
@piosz
Copy link
Member

piosz commented Sep 18, 2017

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 18, 2017
@crassirostris
Copy link
Author

/approve no-issue

@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: crassirostris, piosz

Associated issue requirement bypassed by: crassirostris

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

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@k8s-github-robot k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 18, 2017
@spiffxp
Copy link
Member

spiffxp commented Sep 18, 2017

/retest

@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to @fejta).

Review the full test history for this PR.

@crassirostris
Copy link
Author

/retest

@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 19, 2017
@dims
Copy link
Member

dims commented Sep 20, 2017

/retest

@k8s-github-robot k8s-github-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 20, 2017
@crassirostris
Copy link
Author

/restart

@dims
Copy link
Member

dims commented Sep 20, 2017

/test pull-kubernetes-unit

@k8s-github-robot
Copy link

/test all [submit-queue is verifying that this PR is safe to merge]

@k8s-github-robot
Copy link

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions here..

@k8s-github-robot k8s-github-robot merged commit 74604d1 into kubernetes:master Sep 20, 2017
@crassirostris crassirostris mentioned this pull request Sep 25, 2017
Merged
@wojtek-t wojtek-t added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cherrypick-candidate labels Oct 2, 2017
@wojtek-t wojtek-t modified the milestones: v1.8, v1.7 Oct 2, 2017
k8s-github-robot pushed a commit that referenced this pull request Oct 2, 2017
Merge pull request #52993 from crassirostris/automated-cherry-pick-of…
26a3605 
…-#52565-upstream-release-1.7

Automatic merge from submit-queue.

Automated cherry pick of #52565

Cherry pick of #52565 on release-1.7.

#52565: Update Stackdriver plugin to version 0.6.7

```release-note
[fluentd-gcp addon] Update Stackdriver plugin to version 0.6.7
```
@k8s-cherrypick-bot
Copy link

Commit found in the "release-1.7" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked.

@guoshimin guoshimin mentioned this pull request Nov 4, 2017
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@igorpeshansky igorpeshansky igorpeshansky approved these changes

@piosz piosz Awaiting requested review from piosz

Assignees

@piosz piosz

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/logging area/platform/gce area/provider/gcp Issues or PRs related to gcp provider cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/instrumentation Categorizes an issue or PR as relevant to SIG Instrumentation. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
v1.7
Development

Successfully merging this pull request may close these issues.
10 participants
@crassirostris @k8s-ci-robot @piosz @k8s-github-robot @spiffxp @fejta-bot @dims @k8s-cherrypick-bot @igorpeshansky @wojtek-t