Skip to content

Merge Branch morgan into ci_feature #308

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 29 commits into from
Dec 4, 2019
Merged

Merge Branch morgan into ci_feature #308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
a10ff10
Fixes :
vishiy Nov 5, 2019
5012d9e
fix setting issue for the new enrichcontainerlog setting
vishiy Nov 5, 2019
e198ebb
fix compilation issue
vishiy Nov 5, 2019
5576404
fix another compilation issue
vishiy Nov 5, 2019
b22c695
fix emit issues
vishiy Nov 5, 2019
881cd1b
fix a nil issue
vishiy Nov 5, 2019
a537b85
fix mising tag
vishiy Nov 5, 2019
5b9e581
* Fix all input plugins for scheduling issue
vishiy Nov 13, 2019
19bcac4
merge from ci_feature into morgan
vishiy Nov 13, 2019
c6a1b08
fix removed files
vishiy Nov 13, 2019
4ee4222
fix timeofcommand and remove a duplicate entry for a health file.
vishiy Nov 13, 2019
e5aabf0
Rashmi/http leak fixes (#301)
rashmichandrashekar Nov 14, 2019
11849ad
Rashmi/http leak fixes (#303)
rashmichandrashekar Nov 14, 2019
02ee6eb
use yajl for events & nodes parsing.
vishiy Nov 16, 2019
1220dd0
Rashmi/http leak fixes (#304)
rashmichandrashekar Nov 16, 2019
5dc523f
use polltime for metrics and disable out_forward for health
vishiy Nov 18, 2019
1d1695b
enable mdm & health
vishiy Nov 19, 2019
5cad553
few optimizations
vishiy Nov 22, 2019
8a21918
do not remove time of command
vishiy Nov 22, 2019
bb4a013
remove comments from container.conf
vishiy Nov 22, 2019
0c5e685
remove flush comment for ai telemetry
vishiy Nov 22, 2019
5462ad5
remove commented code lines
vishiy Nov 22, 2019
aad7daf
Merge branch 'ci_feature' into morgan
vishiy Nov 23, 2019
d8c3a02
fix config
vishiy Nov 26, 2019
e86c111
remove timeofcommand when enrichment==false
vishiy Nov 26, 2019
318ad10
fix config
vishiy Nov 26, 2019
0283b2e
enable mdm filter
vishiy Dec 3, 2019
d4983c8
Rashmi/api chunk (#307)
rashmichandrashekar Dec 3, 2019
386ba9a
Merge branch 'ci_feature' into morgan
vishiy Dec 3, 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
33 changes: 19 additions & 14 deletions installer/conf/container.conf
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
<source>
type containerinventory
tag oms.containerinsights.containerinventory
run_interval 60s
run_interval 60
log_level debug
</source>

#cadvisor perf
<source>
type cadvisorperf
tag oms.api.cadvisorperf
run_interval 60s
run_interval 60
log_level debug
</source>

Expand All @@ -45,30 +45,28 @@
type out_oms
log_level debug
num_threads 5
buffer_chunk_limit 20m
buffer_type file
buffer_path %STATE_DIR_WS%/out_oms_containerinventory*.buffer
buffer_queue_limit 20
buffer_queue_full_action drop_oldest_chunk
buffer_chunk_limit 4m
flush_interval 20s
retry_limit 10
retry_wait 30s
max_retry_wait 9m
retry_wait 5s
max_retry_wait 5m
</match>

<match oms.api.cadvisorperf**>
type out_oms
log_level debug
num_threads 5
buffer_chunk_limit 20m
buffer_type file
buffer_path %STATE_DIR_WS%/out_oms_cadvisorperf*.buffer
buffer_queue_limit 20
buffer_queue_full_action drop_oldest_chunk
buffer_chunk_limit 4m
flush_interval 20s
retry_limit 10
retry_wait 30s
max_retry_wait 9m
retry_wait 5s
max_retry_wait 5m
</match>


Expand All @@ -80,6 +78,14 @@
heartbeat_type tcp
skip_network_error_at_init true
expire_dns_cache 600s
buffer_queue_full_action drop_oldest_chunk
buffer_type file
buffer_path %STATE_DIR_WS%/out_health_forward*.buffer
buffer_chunk_limit 3m
flush_interval 20s
retry_limit 10
retry_wait 5s
max_retry_wait 5m

<server>
host "#{ENV['HEALTHMODEL_REPLICASET_SERVICE_SERVICE_HOST']}"
Expand All @@ -96,14 +102,13 @@
type out_mdm
log_level debug
num_threads 5
buffer_chunk_limit 20m
buffer_type file
buffer_path %STATE_DIR_WS%/out_mdm_cdvisorperf*.buffer
buffer_queue_limit 20
buffer_queue_full_action drop_oldest_chunk
buffer_chunk_limit 4m
flush_interval 20s
retry_limit 10
retry_wait 30s
max_retry_wait 9m
retry_wait 5s
max_retry_wait 5m
retry_mdm_post_wait_minutes 60
</match>
Loading