Merge pull request docker-archive#477 from docker/azure-log

Updated Azure logs to match AWS format

Author: FrenchBen

azure/release/files/custom-data_manager.sh

@@ -15,7 +15,7 @@ export MANAGER_IP=$(ifconfig eth0 | grep "inet addr:" | cut -d: -f2 | cut -d" "
 export VMSS_MGR="dockerswarm-managervmss"
 export VMSS_WRK="dockerswarm-worker-vmss"
 # create daemon config with custom tag
-echo "{\"log-driver\": \"syslog\",\"log-opts\": {\"syslog-address\": \"udp://localhost:514\", \"tag\": \"{{.Name}}/{{.ID}}\" }}" > /etc/docker/daemon.json
+echo "{\"log-driver\": \"syslog\",\"log-opts\": {\"syslog-address\": \"udp://localhost:514\", \"tag\": \"{{.Name}}-{{.ID}}\" }}" > /etc/docker/daemon.json
 service docker restart
 sleep 5
 

azure/release/files/custom-data_manager_cloud.sh

@@ -20,7 +20,7 @@ export CLOUD_USER="variables('dockerCloudUsername')"
 export CLOUD_KEY="variables('dockerCloudAPIKey')"
 
 # create daemon config with custom tag
-echo "{\"log-driver\": \"syslog\",\"log-opts\": {\"syslog-address\": \"udp://localhost:514\", \"tag\": \"{{.Name}}/{{.ID}}\" }}" > /etc/docker/daemon.json
+echo "{\"log-driver\": \"syslog\",\"log-opts\": {\"syslog-address\": \"udp://localhost:514\", \"tag\": \"{{.Name}}-{{.ID}}\" }}" > /etc/docker/daemon.json
 service docker restart
 sleep 5
 

azure/release/files/custom-data_manager_ddc.sh

@@ -19,7 +19,7 @@ export DDC_USER="variables('ddcUser')"
 export DDC_PASS="variables('ddcPass')"
 
 # create daemon config with custom tag
-echo "{\"log-driver\": \"syslog\",\"log-opts\": {\"syslog-address\": \"udp://localhost:514\", \"tag\": \"{{.Name}}/{{.ID}}\" }}" > /etc/docker/daemon.json
+echo "{\"log-driver\": \"syslog\",\"log-opts\": {\"syslog-address\": \"udp://localhost:514\", \"tag\": \"{{.Name}}-{{.ID}}\" }}" > /etc/docker/daemon.json
 service docker restart
 sleep 5
 

azure/release/files/custom-data_worker.sh

@@ -15,7 +15,7 @@ export SWARM_LOGS_STORAGE_ACCOUNT="variables('swarmLogsStorageAccount')"
 export MANAGER_IP=$(ifconfig eth0 | grep "inet addr:" | cut -d: -f2 | cut -d" " -f1)
 
 # create daemon config with custom tag
-echo "{\"log-driver\": \"syslog\",\"log-opts\": {\"syslog-address\": \"udp://localhost:514\", \"tag\": \"{{.Name}}/{{.ID}}\" }}" > /etc/docker/daemon.json
+echo "{\"log-driver\": \"syslog\",\"log-opts\": {\"syslog-address\": \"udp://localhost:514\", \"tag\": \"{{.Name}}-{{.ID}}\" }}" > /etc/docker/daemon.json
 service docker restart
 sleep 5
 

azure/release/files/custom-data_worker_ddc.sh

@@ -15,7 +15,7 @@ export SWARM_LOGS_STORAGE_ACCOUNT="variables('swarmLogsStorageAccount')"
 export MANAGER_IP=$(ifconfig eth0 | grep "inet addr:" | cut -d: -f2 | cut -d" " -f1)
 
 # create daemon config with custom tag
-echo "{\"log-driver\": \"syslog\",\"log-opts\": {\"syslog-address\": \"udp://localhost:514\", \"tag\": \"{{.Name}}/{{.ID}}\" }}" > /etc/docker/daemon.json
+echo "{\"log-driver\": \"syslog\",\"log-opts\": {\"syslog-address\": \"udp://localhost:514\", \"tag\": \"{{.Name}}-{{.ID}}\" }}" > /etc/docker/daemon.json
 service docker restart
 sleep 5