Skip to content

Merge from Vishwa/promstandardmetrics into ci_feature #220

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

Merged
vishiy merged 5 commits into from
Jun 6, 2019
Merged

Merge from Vishwa/promstandardmetrics into ci_feature #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7c1e463
enable prometheus metrics collection in replica-set
vishiy May 13, 2019
a76a91a
fixing typos
vishiy May 13, 2019
cbe21dd
fix config file path for replicaset
vishiy May 14, 2019
65106d7
fix configuration
vishiy May 15, 2019
22eab58
config changes
vishiy May 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions installer/conf/td-agent-bit-rs.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
[SERVICE]
Flush 30
Log_Level info
Parsers_File /etc/td-agent-bit/parsers.conf
Log_File /var/opt/microsoft/docker-cimprov/log/fluent-bit.log

[INPUT]
Name tail
Tag oms.container.log.telegraf.err.*
Path /var/opt/microsoft/docker-cimprov/log/telegraf.log
DB /var/opt/microsoft/docker-cimprov/state/telegraf-log-state.db
Copy link
Contributor

@r-dilip r-dilip Jun 6, 2019

Choose a reason for hiding this comment

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

Are u also adding the change to do the Exclude_Path for kube-system as part of this PR?

Mem_Buf_Limit 2m
Path_Key filepath
Skip_Long_Lines On
Ignore_Older 5m

[INPUT]
Name tcp
Tag oms.container.perf.telegraf.*
Listen 0.0.0.0
Port 25226
Chunk_Size 32
Buffer_Size 64

[OUTPUT]
Name oms
EnableTelemetry true
TelemetryPushIntervalSeconds 300
Match oms.container.*
5 changes: 0 additions & 5 deletions installer/conf/td-agent-bit.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,6 @@
Chunk_Size 32
Buffer_Size 64

[FILTER]
Name grep
Match oms.container.log.telegraf.err.*
#Regex log /^(?:(?!\[azure_monitor\]: failed to write batch: \[403\] 403 Forbidden).)*$/

[OUTPUT]
Name oms
EnableTelemetry true
Expand Down
Loading