From 1de5f2f986ae17ecd4c0cfa6c868252e33b65f2b Mon Sep 17 00:00:00 2001 From: r-dilip Date: Sun, 13 Oct 2019 14:59:34 -0700 Subject: [PATCH 1/4] Bug fixes 1. not writeable, telemetry error --- installer/conf/container.conf | 2 +- installer/datafiles/base_container.data | 3 +++ source/code/plugin/health/health_monitor_telemetry.rb | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/installer/conf/container.conf b/installer/conf/container.conf index 5f08043c7..bd84e4c20 100755 --- a/installer/conf/container.conf +++ b/installer/conf/container.conf @@ -88,7 +88,7 @@ @type file - path /var/opt/microsoft/docker-cimprov/log/fluent_forward_failed.log + path /var/opt/microsoft/docker-cimprov/log diff --git a/installer/datafiles/base_container.data b/installer/datafiles/base_container.data index 4ebc4f338..cb4440b15 100644 --- a/installer/datafiles/base_container.data +++ b/installer/datafiles/base_container.data @@ -258,6 +258,9 @@ touch /var/opt/microsoft/docker-cimprov/log/fluent_forward_failed.log chmod 666 /var/opt/microsoft/docker-cimprov/log/fluent_forward_failed.log chown omsagent:omiusers /var/opt/microsoft/docker-cimprov/log/fluent_forward_failed.log +chmod 666 /var/opt/microsoft/docker-cimprov/log +chown omsagent:omiusers /var/opt/microsoft/docker-cimprov/log + 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 diff --git a/source/code/plugin/health/health_monitor_telemetry.rb b/source/code/plugin/health/health_monitor_telemetry.rb index df4b98ac8..4e80a5145 100644 --- a/source/code/plugin/health/health_monitor_telemetry.rb +++ b/source/code/plugin/health/health_monitor_telemetry.rb @@ -13,6 +13,7 @@ class HealthMonitorTelemetry def initialize @last_sent_time = Time.now + @monitor_records = {} end def send From b515a9a8d9d0310b271aea02c44f46c4fd2cf4a3 Mon Sep 17 00:00:00 2001 From: r-dilip Date: Sun, 13 Oct 2019 16:12:56 -0700 Subject: [PATCH 2/4] change perms to 777 for log dir --- installer/conf/container.conf | 2 +- installer/datafiles/base_container.data | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/installer/conf/container.conf b/installer/conf/container.conf index bd84e4c20..92b42d730 100755 --- a/installer/conf/container.conf +++ b/installer/conf/container.conf @@ -88,7 +88,7 @@ @type file - path /var/opt/microsoft/docker-cimprov/log + path /var/opt/microsoft/docker-cimprov/log/fluent_forward_failed diff --git a/installer/datafiles/base_container.data b/installer/datafiles/base_container.data index cb4440b15..537e0fb23 100644 --- a/installer/datafiles/base_container.data +++ b/installer/datafiles/base_container.data @@ -258,8 +258,7 @@ touch /var/opt/microsoft/docker-cimprov/log/fluent_forward_failed.log chmod 666 /var/opt/microsoft/docker-cimprov/log/fluent_forward_failed.log chown omsagent:omiusers /var/opt/microsoft/docker-cimprov/log/fluent_forward_failed.log -chmod 666 /var/opt/microsoft/docker-cimprov/log -chown omsagent:omiusers /var/opt/microsoft/docker-cimprov/log +chmod 777 /var/opt/microsoft/docker-cimprov/log/ 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 From afed99569503c7ad4be189d93dc649210c388148 Mon Sep 17 00:00:00 2001 From: r-dilip Date: Sun, 13 Oct 2019 17:27:54 -0700 Subject: [PATCH 3/4] revert container.conf change --- installer/conf/container.conf | 2 +- installer/datafiles/base_container.data | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/installer/conf/container.conf b/installer/conf/container.conf index 92b42d730..5f08043c7 100755 --- a/installer/conf/container.conf +++ b/installer/conf/container.conf @@ -88,7 +88,7 @@ @type file - path /var/opt/microsoft/docker-cimprov/log/fluent_forward_failed + path /var/opt/microsoft/docker-cimprov/log/fluent_forward_failed.log diff --git a/installer/datafiles/base_container.data b/installer/datafiles/base_container.data index 537e0fb23..722f56247 100644 --- a/installer/datafiles/base_container.data +++ b/installer/datafiles/base_container.data @@ -191,7 +191,7 @@ MAINTAINER: 'Microsoft Corporation' /var/opt/microsoft/docker-cimprov; 755; root; root /var/opt/microsoft/docker-cimprov/state; 755; root; root /var/opt/microsoft/docker-cimprov/state/ContainerInventory; 755; root; root -/var/opt/microsoft/docker-cimprov/log; 755; root; root +/var/opt/microsoft/docker-cimprov/log; 757; root; root /opt/td-agent-bit; 755; root; root;sysdir /opt/td-agent-bit/bin; 755; root; root;sysdir @@ -258,8 +258,6 @@ touch /var/opt/microsoft/docker-cimprov/log/fluent_forward_failed.log chmod 666 /var/opt/microsoft/docker-cimprov/log/fluent_forward_failed.log chown omsagent:omiusers /var/opt/microsoft/docker-cimprov/log/fluent_forward_failed.log -chmod 777 /var/opt/microsoft/docker-cimprov/log/ - 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 From a1316b6d1084719b1c4e92d142ad1e62d9c3fa2a Mon Sep 17 00:00:00 2001 From: r-dilip Date: Sun, 13 Oct 2019 18:19:54 -0700 Subject: [PATCH 4/4] Change to state_WS_dir --- installer/conf/container.conf | 2 +- installer/datafiles/base_container.data | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/installer/conf/container.conf b/installer/conf/container.conf index 5f08043c7..f9540bde8 100755 --- a/installer/conf/container.conf +++ b/installer/conf/container.conf @@ -88,7 +88,7 @@ @type file - path /var/opt/microsoft/docker-cimprov/log/fluent_forward_failed.log + path %STATE_DIR_WS%/fluent_forward_failed.buffer diff --git a/installer/datafiles/base_container.data b/installer/datafiles/base_container.data index 722f56247..4ebc4f338 100644 --- a/installer/datafiles/base_container.data +++ b/installer/datafiles/base_container.data @@ -191,7 +191,7 @@ MAINTAINER: 'Microsoft Corporation' /var/opt/microsoft/docker-cimprov; 755; root; root /var/opt/microsoft/docker-cimprov/state; 755; root; root /var/opt/microsoft/docker-cimprov/state/ContainerInventory; 755; root; root -/var/opt/microsoft/docker-cimprov/log; 757; root; root +/var/opt/microsoft/docker-cimprov/log; 755; root; root /opt/td-agent-bit; 755; root; root;sysdir /opt/td-agent-bit/bin; 755; root; root;sysdir