Merge pull request #14 from Azure/1.12.7-0

Bump up to 1.12.15-0

README.md

@@ -18,10 +18,10 @@ To use this bosh release, first upload it to your BOSH Director:
 
 ```
 # BOSH CLI v1
-bosh upload release https://github.com/Azure/oms-agent-for-linux-boshrelease/releases/download/v1.9.0-0/oms-agent-for-linux-boshrelease-1.9.0-0.tar.gz
+bosh upload release https://github.com/Azure/oms-agent-for-linux-boshrelease/releases/download/v1.12.15-0/oms-agent-for-linux-boshrelease-1.12.15-0.build7.tar.gz
 
 # BOSH CLI v2
-bosh2 upload-release https://github.com/Azure/oms-agent-for-linux-boshrelease/releases/download/v1.9.0-0/oms-agent-for-linux-boshrelease-1.9.0-0.tar.gz
+bosh upload-release https://github.com/Azure/oms-agent-for-linux-boshrelease/releases/download/v1.12.15-0/oms-agent-for-linux-boshrelease-1.12.15-0.build7.tar.gz
 ```
 
 ### 2. Deploy as a BOSH addon
@@ -35,7 +35,7 @@ First, create a new file `runtime.yml` and paste all the following content into
 ---
 releases:
 - name: oms-agent-for-linux
-  version: 1.9.0-0
+  version: 1.12.7-0
 addons:
 - name: omsagent
   jobs:
@@ -52,6 +52,7 @@ addons:
     oms:
       workspace_id: CHANGE_ME
       workspace_key: CHANGE_ME
+      top_level_domain: opinsights.azure.com # opinsights.azure.us for Azure US Government
     # Set the rsyslog config as needed, optional
     rsyslog:
       selector_list:

config/blobs.yml

@@ -1,24 +1,24 @@
-omsagent/omi-1.6.0-0.ulinux.x64.deb:
-  size: 1841460
-  sha: 7aac5a77d2c443e9b8e4915a67c603ddbaa1b612
-omsagent/omi-1.6.0-0.ulinux.x64.rpm:
-  size: 1909556
-  sha: 6bdd0aae8684914c91606876cd937f0d4c5882c9
-omsagent/omsagent-1.9.0-0.universal.x64.deb:
-  size: 19425008
-  sha: d3f08a62ef6a3c9541cb4d9ca7ddf8ee2508e947
-omsagent/omsagent-1.9.0-0.universal.x64.rpm:
-  size: 20355592
-  sha: c4df201cdeafa180a6e2006d71426e5aa77c7363
-omsagent/omsconfig-1.1.1-918.x64.deb:
-  size: 3801634
-  sha: 9bcd814e325510afd71de327a2fa28223385dc93
-omsagent/omsconfig-1.1.1-918.x64.rpm:
-  size: 3829206
-  sha: ad616b1b433b2fb1f28cc488fb8d2cc16ee03f25
-omsagent/scx-1.6.3-659.universal.x64.deb:
-  size: 2043724
-  sha: 1b0deb843eb92c5e14f75362bb50a9a882d7a7fd
-omsagent/scx-1.6.3-659.universal.x64.rpm:
-  size: 2078016
-  sha: 8729add0a4f58b3e261cbb12e3ed6cc4a93702b6
+omsagent/omi-1.6.3-0.ulinux.x64.deb:
+  size: 1843922
+  sha: 5d6f87f33ed27f9edc421d2b680835537c52d258
+omsagent/omi-1.6.3-0.ulinux.x64.rpm:
+  size: 1910145
+  sha: 142e52fab8abea1e27aaf2321661ee6909e65d7a
+omsagent/omsagent-1.12.15-0.universal.x64.deb:
+  size: 23123258
+  sha: fe486665d7424623357b248069a0764ab3814ad9
+omsagent/omsagent-1.12.15-0.universal.x64.rpm:
+  size: 24245811
+  sha: 766ee5239cfcacc71c41300ba74f50e94f41b6c0
+omsagent/omsconfig-1.1.1-927.x64.deb:
+  size: 6007750
+  sha: b53d655afbc27730ffe00fbf38e34138e7d1ac1d
+omsagent/omsconfig-1.1.1-927.x64.rpm:
+  size: 6063132
+  sha: e0ceec522f2b843bfba1219b8309bd7870367bda
+omsagent/scx-1.6.3-1079.universal.x64.deb:
+  size: 2053122
+  sha: 8cfb9489db5072d155a590af6329b5034d3dd2ad
+omsagent/scx-1.6.3-1079.universal.x64.rpm:
+  size: 2091795
+  sha: 2a05c89e1ae89532e6e84211f39da55a6e2d5465

jobs/omsagent/spec

@@ -13,6 +13,8 @@ properties:
     description: OMS workspace ID
   oms.workspace_key:
     description: OMS workspace key
+  oms.top_level_domain:
+    description: OMS top level domain, opinsights.azure.com for Azure public cloud, opinsights.azure.us for Azure Government, default is opinsights.azure.com
   rsyslog.selector_list:
     description: optional, list of syslog selectors, syntax is FACILITY.PRIORITY
   rsyslog.port:

jobs/omsagent/templates/install.erb

@@ -32,6 +32,7 @@ retry_create_symlinks()
 
 workspace_id=<%= p('oms.workspace_id') %>
 workspace_key=<%= p('oms.workspace_key') %>
+oms_top_level_domain=<%= p('oms.top_level_domain', "opinsights.azure.com") %>
 rsyslog_port=<%= p('rsyslog.port', 25224) %>
 
 # Detect dpkg
@@ -93,30 +94,58 @@ retry_create_symlinks /var/vcap/sys/log/omi /var/opt/omi/log
 retry_create_symlinks /var/vcap/sys/log/scx /var/opt/microsoft/scx/log
 retry_create_symlinks /var/vcap/sys/log/omsconfig /var/opt/microsoft/omsconfig
 
-chown -h omsagent:omsagent /var/opt/microsoft/omsconfig
-
 cp -f /var/vcap/packages/omsagent/logrotate.scx.conf /etc/logrotate.d/scx
 
 # Write the onboard config
 cat <<EOF > /etc/omsagent-onboard.conf
 WORKSPACE_ID=$workspace_id
 SHARED_KEY=$workspace_key
-URL_TLD=opinsights.azure.com
+URL_TLD=$oms_top_level_domain
 EOF
 
+# Setup user account and permission
+echo "Using identity $(id)"
+
+count=$(grep -c '^omsagent:' /etc/group)
+if [ "$count" == 0 ]; then
+    # Create new user group omsagent
+    groupadd -f "omsagent"
+fi
+
+count=$(grep -c '^omiusers:' /etc/group)
+if [ "$count" == 0 ]; then
+    # Create new user group omiusers
+    groupadd -f "omiusers"
+fi
+
+count=$(grep -c '^omsagent:' /etc/passwd)
+if [ "$count" == 0 ]; then
+    # Create new user account omsagent
+    useradd -M -N -s /bin/bash "omsagent"
+fi
+
+usermod -aG omsagent omsagent
+usermod -aG omiusers omsagent
+
+chown -h omsagent:omsagent /var/opt/microsoft/omsconfig
+chown -h omsagent:omiusers /var/opt/microsoft/omsconfig
+chown -h omsagent:omsagent /var/vcap/sys/log/omsconfig
+
+# Add oms users to vcap group for file system access
+usermod -aG vcap omsagent
+usermod -aG vcap nxautomation
+
 # Install packages
 if [ ${DPKG_FOUND} -eq 0 ]; then
     (
     flock -x 200
-    dpkg -i --force-confold --force-confdef /var/vcap/packages/omsagent/omi*.deb /var/vcap/packages/omsagent/scx*.deb /var/vcap/packages/omsagent/omsagent*.deb /var/vcap/packages/omsagent/omsconfig*.deb
+    dpkg -i --force-confold --force-confdef /var/vcap/packages/omsagent/omi*.deb /var/vcap/packages/omsagent/scx*.deb /var/vcap/packages/omsagent/omsagent*.deb /var/vcap/packages/omsagent/omsconfig*.deb || true
     ) 200>/var/vcap/data/dpkg.lock
 else
-    rpm -Uvh --force /var/vcap/packages/omsagent/omi-*.rpm /var/vcap/packages/omsagent/scx*.rpm /var/vcap/packages/omsagent/omsagent*.rpm /var/vcap/packages/omsagent/omsconfig*.rpm
+    rpm -Uvh --force /var/vcap/packages/omsagent/omi-*.rpm /var/vcap/packages/omsagent/scx*.rpm /var/vcap/packages/omsagent/omsagent*.rpm /var/vcap/packages/omsagent/omsconfig*.rpm || true
 fi
 
-# Add oms users to vcap group for file system access
-usermod -aG vcap omsagent
-usermod -aG vcap nxautomation
+chown -h omsagent:omiusers /var/opt/microsoft/omsconfig
 
 # Backup the default configuration, at every deployment the rsyslog config will be first restored from default and then changed according to job properties
 if [ ! -e /etc/opt/microsoft/omsagent/sysconf/95-omsagent.conf.bk ]; then
@@ -126,9 +155,15 @@ fi
 # Disable the default service
 service omsagent-${workspace_id} stop
 rm -f /etc/init.d/omsagent*
+systemctl stop omsagent-${workspace_id}
+systemctl disable omsagent-${workspace_id}
+rm -f /lib/systemd/system/omsagent*
 
 service omid stop
 rm -f /etc/init.d/omid
+systemctl stop omid
+systemctl disable omid
+rm -f /lib/systemd/system/omid.service
 
 # Add the config for collecting uaa.log
 if [ -f /var/vcap/sys/log/uaa/uaa.log ]; then

manifests/example-runtime-config.yml

@@ -1,6 +1,6 @@
 releases:
 - name: oms-agent-for-linux
-  version: 1.9.0-0
+  version: 1.12.7-0
   url: https://github.com/Azure/oms-agent-for-linux-boshrelease/releases/download/v1.4.2-125/oms-agent-for-linux-1.4.2-125.tgz
 addons:
 - name: omsagent
@@ -18,6 +18,7 @@ addons:
     oms:
       workspace_id: CHANGE_ME
       workspace_key: CHANGE_ME
+      top_level_domain: opinsights.azure.com # opinsights.azure.us for Azure US Government
     # Modify the config as needed, if no rsyslog config is specifed, the default rsyslog config of omsagent will be used
     rsyslog:
       selector_list:

packages/omsagent/spec

@@ -3,14 +3,14 @@ name: omsagent
 
 files:
 - utils/utils.sh
-- omsagent/omi-1.6.0-0.ulinux.x64.deb
-- omsagent/omsagent-1.9.0-0.universal.x64.deb
-- omsagent/omsconfig-1.1.1-918.x64.deb
-- omsagent/scx-1.6.3-659.universal.x64.deb
-- omsagent/omi-1.6.0-0.ulinux.x64.rpm
-- omsagent/omsagent-1.9.0-0.universal.x64.rpm
-- omsagent/omsconfig-1.1.1-918.x64.rpm
-- omsagent/scx-1.6.3-659.universal.x64.rpm
+- omsagent/omi-1.6.3-0.ulinux.x64.deb
+- omsagent/omsagent-1.12.15-0.universal.x64.deb
+- omsagent/omsconfig-1.1.1-927.x64.deb
+- omsagent/scx-1.6.3-1079.universal.x64.deb
+- omsagent/omi-1.6.3-0.ulinux.x64.rpm
+- omsagent/omsagent-1.12.15-0.universal.x64.rpm
+- omsagent/omsconfig-1.1.1-927.x64.rpm
+- omsagent/scx-1.6.3-1079.universal.x64.rpm
 - conf/logrotate.scx.conf
 - conf/oms.uaa.conf