Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
99c22b1
changes for win nodes enumeration
Mar 8, 2019
08e5fd1
changes
Mar 8, 2019
a6e92a2
changes
Mar 9, 2019
8510d50
changes
Mar 12, 2019
c144b67
node cpu metric rate changes
Mar 12, 2019
bcdf0c3
container cpu rate
Mar 13, 2019
89f5a00
changes
Mar 13, 2019
96e6eca
changes
Mar 14, 2019
542d0a9
changes
Mar 14, 2019
0d4601a
changes
Mar 14, 2019
fe3d8a0
changes
Mar 14, 2019
9082ce8
Merge branch 'ci_feature' into rashmi/win-nodepool
Mar 14, 2019
a6e29b0
changes to include in_win_cadvisor_perf.rb file
Mar 14, 2019
99a241b
send containerinventoryheartbeatevent
Mar 15, 2019
f3f6fb4
changes
Mar 15, 2019
e46cfc7
cahnges for mdm metrics
Mar 18, 2019
414cb83
changes
Mar 19, 2019
6926d22
cahnges
Mar 19, 2019
7c29219
changes
Mar 19, 2019
416dfee
container states
Mar 19, 2019
f4f7d50
changes
Mar 20, 2019
5d131bb
changes
Mar 20, 2019
f3e6c8e
changes for env variables
Mar 20, 2019
90f2641
changes
Mar 20, 2019
ca80a79
changes
Mar 20, 2019
20346c2
changes
Mar 20, 2019
5b67e56
changes
Mar 20, 2019
85e8b9a
delete comments
Mar 21, 2019
6b0b146
changes
Mar 21, 2019
60ee414
mutex changes
Mar 22, 2019
ca71c97
changes
Mar 22, 2019
4a9c034
changes
Mar 22, 2019
4decfc6
changes
Mar 24, 2019
8fe457d
telemetry fix for docker version
Mar 27, 2019
6e38a78
removing hardcoded values for mdm
Mar 27, 2019
9d07a50
update docker version
Mar 27, 2019
9a0fc1f
telemetry for windows cadvisor timeouts
Mar 28, 2019
7454899
exeception key update to computer
Mar 28, 2019
4f9532c
PR comments
Mar 30, 2019
9037adb
Merge branch 'ci_feature' into rashmi/win-nodepool
Apr 1, 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
47 changes: 47 additions & 0 deletions installer/conf/kube.conf
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,44 @@
log_level debug
</source>

#cadvisor perf- Windows nodes
<source>
type wincadvisorperf
tag oms.api.wincadvisorperf
run_interval 60s
log_level debug
</source>

<filter mdm.kubepodinventory** mdm.kubenodeinventory**>
type filter_inventory2mdm
custom_metrics_azure_regions eastus,southcentralus,westcentralus,westus2,southeastasia,northeurope,westEurope
log_level info
</filter>

#custom_metrics_mdm filter plugin for perf data from windows nodes
<filter mdm.cadvisorperf**>
type filter_cadvisor2mdm
custom_metrics_azure_regions eastus,southcentralus,westcentralus,westus2,southeastasia,northeurope,westEurope
metrics_to_collect cpuUsageNanoCores,memoryWorkingSetBytes
log_level info
</filter>

<match mdm.cadvisorperf**>
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
flush_interval 20s
retry_limit 10
retry_wait 30s
max_retry_wait 9m
retry_mdm_post_wait_minutes 60
</match>

<match oms.containerinsights.KubePodInventory**>
type out_oms
log_level debug
Expand Down Expand Up @@ -168,3 +200,18 @@
max_retry_wait 9m
retry_mdm_post_wait_minutes 60
</match>

<match oms.api.wincadvisorperf**>
type out_oms
log_level debug
num_threads 5
buffer_chunk_limit 20m
buffer_type file
buffer_path %STATE_DIR_WS%/out_oms_api_wincadvisorperf*.buffer
buffer_queue_limit 20
buffer_queue_full_action drop_oldest_chunk
flush_interval 20s
retry_limit 10
retry_wait 30s
max_retry_wait 9m
</match>
1 change: 1 addition & 0 deletions installer/datafiles/base_container.data
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ MAINTAINER: 'Microsoft Corporation'
/opt/microsoft/omsagent/plugin/CAdvisorMetricsAPIClient.rb; source/code/plugin/CAdvisorMetricsAPIClient.rb; 644; root; root
/opt/microsoft/omsagent/plugin/in_kube_perf.rb; source/code/plugin/in_kube_perf.rb; 644; root; root
/opt/microsoft/omsagent/plugin/in_cadvisor_perf.rb; source/code/plugin/in_cadvisor_perf.rb; 644; root; root
/opt/microsoft/omsagent/plugin/in_win_cadvisor_perf.rb; source/code/plugin/in_win_cadvisor_perf.rb; 644; root; root
/opt/microsoft/omsagent/plugin/in_kube_services.rb; source/code/plugin/in_kube_services.rb; 644; root; root
/opt/microsoft/omsagent/plugin/in_kube_nodes.rb; source/code/plugin/in_kube_nodes.rb; 644; root; root
/opt/microsoft/omsagent/plugin/filter_inventory2mdm.rb; source/code/plugin/filter_inventory2mdm.rb; 644; root; root
Expand Down
Loading