Skip to content

Cherry-pick hotfix 09092019 to ci_feature #265

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
r-dilip merged 1 commit into from
Sep 12, 2019
Merged

Cherry-pick hotfix 09092019 to ci_feature #265

Show file tree
Hide file tree
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
103 changes: 103 additions & 0 deletions installer/conf/container-health.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
# Fluentd config file for OMS Docker - container components (non kubeAPI)

# Forward port 25225 for container logs
<source>
type forward
port 25225
bind 127.0.0.1
</source>

# Container inventory
<source>
type containerinventory
tag oms.containerinsights.containerinventory
run_interval 60s
log_level debug
</source>

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

<filter oms.api.KubeHealth.DaemonSet.Node**>
type filter_cadvisor_health_node
log_level debug
</filter>


#custom_metrics_mdm filter plugin
<filter mdm.cadvisorperf**>
type filter_cadvisor2mdm
custom_metrics_azure_regions eastus,southcentralus,westcentralus,westus2,southeastasia,northeurope,westeurope,southafricanorth,centralus,northcentralus,eastus2,koreacentral,eastasia,centralindia,uksouth,canadacentral
metrics_to_collect cpuUsageNanoCores,memoryWorkingSetBytes,memoryRssBytes
log_level info
</filter>

<match oms.containerinsights.containerinventory**>
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
flush_interval 20s
retry_limit 10
retry_wait 30s
max_retry_wait 9m
</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
flush_interval 20s
retry_limit 10
retry_wait 30s
max_retry_wait 9m
</match>


<match oms.api.KubeHealth.DaemonSet**>
@type forward
send_timeout 60s
recover_wait 10s
hard_timeout 60s
heartbeat_type tcp

<server>
host healthmodel-replicaset-service.kube-system
port 25227
</server>

<secondary>
@type file
path /var/opt/microsoft/docker-cimprov/log/fluent_forward_failed.log
</secondary>
</match>

<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>
25 changes: 0 additions & 25 deletions installer/conf/container.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,6 @@
log_level debug
</source>

<filter oms.api.KubeHealth.DaemonSet.Node**>
type filter_cadvisor_health_node
log_level debug
</filter>


#custom_metrics_mdm filter plugin
<filter mdm.cadvisorperf**>
type filter_cadvisor2mdm
Expand Down Expand Up @@ -67,25 +61,6 @@
max_retry_wait 9m
</match>


<match oms.api.KubeHealth.DaemonSet**>
@type forward
send_timeout 60s
recover_wait 10s
hard_timeout 60s
heartbeat_type tcp

<server>
host "#{ENV['HEALTHMODEL_REPLICASET_SERVICE_ENDPOINT']}"
port 25227
</server>

<secondary>
@type file
path /var/opt/microsoft/docker-cimprov/log/fluent_forward_failed.log
</secondary>
</match>

<match mdm.cadvisorperf**>
type out_mdm
log_level debug
Expand Down
5 changes: 5 additions & 0 deletions installer/datafiles/base_container.data
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ MAINTAINER: 'Microsoft Corporation'
/opt/microsoft/omsagent/plugin/KubernetesApiClient.rb; source/code/plugin/KubernetesApiClient.rb; 644; root; root

/etc/opt/microsoft/docker-cimprov/container.conf; installer/conf/container.conf; 644; root; root
/etc/opt/microsoft/docker-cimprov/container-health.conf; installer/conf/container-health.conf; 644; root; root

/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
Expand Down Expand Up @@ -257,6 +258,9 @@ chown omsagent:omiusers /var/opt/microsoft/docker-cimprov/log/fluent_forward_fai
mv /etc/opt/microsoft/docker-cimprov/container.conf /etc/opt/microsoft/omsagent/sysconf/omsagent.d/container.conf
chown omsagent:omsagent /etc/opt/microsoft/omsagent/sysconf/omsagent.d/container.conf

mv /etc/opt/microsoft/docker-cimprov/container-health.conf /etc/opt/microsoft/omsagent/sysconf/omsagent.d/container-health.conf
chown omsagent:omsagent /etc/opt/microsoft/omsagent/sysconf/omsagent.d/container-health.conf

%Postuninstall_10
# If we're an upgrade, skip all of this cleanup
if ${{PERFORMING_UPGRADE_NOT}}; then
Expand All @@ -268,6 +272,7 @@ if ${{PERFORMING_UPGRADE_NOT}}; then
rm -f /var/opt/microsoft/docker-cimprov/log/kubernetes_client_log.txt
rm -f /var/opt/microsoft/docker-cimprov/log/kubernetes_perf_log.txt
rm -f /etc/opt/microsoft/omsagent/conf/omsagent.d/container.conf
rm -f /etc/opt/microsoft/omsagent/conf/omsagent.d/container-health.conf
rmdir /var/opt/microsoft/docker-cimprov/log 2> /dev/null
rmdir /var/opt/microsoft/docker-cimprov/state/ContainerInventory 2> /dev/null
rmdir /var/opt/microsoft/docker-cimprov/state/ImageInventory 2> /dev/null
Expand Down