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

Automated cherry pick of #45031 #45083

Merged
merged 1 commit into from
May 8, 2017
Merged

Automated cherry pick of #45031 #45083

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 2 additions & 7 deletions cluster/addons/fluentd-gcp/fluentd-gcp-configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,6 @@ data:
type counter
name logging_line_count
desc Total number of lines generated by application containers
<labels>
tag ${tag}
</labels>
</metric>
</store>
<store>
Expand Down Expand Up @@ -342,9 +339,8 @@ data:
<metric>
type counter
name logging_entry_count
desc Total number of log entries generated by either an application container or a system component
desc Total number of log entries generated by either application containers or system components
<labels>
tag ${tag}
component container
</labels>
</metric>
Expand Down Expand Up @@ -376,9 +372,8 @@ data:
<metric>
type counter
name logging_entry_count
desc Total number of log entries generated by either an application container or a system component
desc Total number of log entries generated by either application containers or system components
<labels>
tag ${tag}
component system
</labels>
</metric>
Expand Down