Propagate master 1 logs to AWS CloudWatch
Match volume name with the associated log stream.
Bug: Issue 12915
Change-Id: I549c43c6210a0f3b1f5cc8cbc396a329a24551a0
diff --git a/dual-master/Makefile b/dual-master/Makefile
index 88e8ff4..e0032f0 100644
--- a/dual-master/Makefile
+++ b/dual-master/Makefile
@@ -55,7 +55,7 @@
ParameterKey=GerritIndexVolume,ParameterValue=gerrit-index-master-1 \
ParameterKey=GerritCacheVolume,ParameterValue=gerrit-cache-master-1 \
ParameterKey=GerritDbVolume,ParameterValue=gerrit-db-master-1 \
- ParameterKey=GerritLogsVolume,ParameterValue=gerrit-logs-master1 \
+ ParameterKey=GerritLogsVolume,ParameterValue=gerrit-logs-master-1 \
ParameterKey=PeerSubdomain,ParameterValue=$(MASTER2_SUBDOMAIN) \
ParameterKey=LBSubdomain,ParameterValue=$(LB_SUBDOMAIN) \
ParameterKey=SlaveServiceStackName,ParameterValue=$(SERVICE_SLAVE_STACK_NAME)
diff --git a/dual-master/cf-cluster.yml b/dual-master/cf-cluster.yml
index 8ace0a8..93cf481 100644
--- a/dual-master/cf-cluster.yml
+++ b/dual-master/cf-cluster.yml
@@ -202,29 +202,29 @@
\"log_stream_name\": \"${EnvironmentName}/{instance_id}/master-2/audit_log\",
\"timezone\": \"UTC\"
},
- {\"file_path\": \"/var/lib/docker/volumes/gerrit-logs-master/_data/replication_log\",
+ {\"file_path\": \"/var/lib/docker/volumes/gerrit-logs-master-1/_data/replication_log\",
\"log_group_name\": \"${AWS::StackName}\",
- \"log_stream_name\": \"${EnvironmentName}/{instance_id}/master/replication_log\",
+ \"log_stream_name\": \"${EnvironmentName}/{instance_id}/master-1/replication_log\",
\"timezone\": \"UTC\"
},
- {\"file_path\": \"/var/lib/docker/volumes/gerrit-logs-master/_data/httpd_log\",
+ {\"file_path\": \"/var/lib/docker/volumes/gerrit-logs-master-1/_data/httpd_log\",
\"log_group_name\": \"${AWS::StackName}\",
- \"log_stream_name\": \"${EnvironmentName}/{instance_id}/master/httpd_log\",
+ \"log_stream_name\": \"${EnvironmentName}/{instance_id}/master-1/httpd_log\",
\"timezone\": \"UTC\"
},
- {\"file_path\": \"/var/lib/docker/volumes/gerrit-logs-master/_data/sshd_log\",
+ {\"file_path\": \"/var/lib/docker/volumes/gerrit-logs-master-1/_data/sshd_log\",
\"log_group_name\": \"${AWS::StackName}\",
- \"log_stream_name\": \"${EnvironmentName}/{instance_id}/master/sshd_log\",
+ \"log_stream_name\": \"${EnvironmentName}/{instance_id}/master-1/sshd_log\",
\"timezone\": \"UTC\"
},
- {\"file_path\": \"/var/lib/docker/volumes/gerrit-logs-master/_data/gc_log\",
+ {\"file_path\": \"/var/lib/docker/volumes/gerrit-logs-master-1/_data/gc_log\",
\"log_group_name\": \"${AWS::StackName}\",
- \"log_stream_name\": \"${EnvironmentName}/{instance_id}/master/gc_log\",
+ \"log_stream_name\": \"${EnvironmentName}/{instance_id}/master-1/gc_log\",
\"timezone\": \"UTC\"
},
- {\"file_path\": \"/var/lib/docker/volumes/gerrit-logs-master/_data/audit_log\",
+ {\"file_path\": \"/var/lib/docker/volumes/gerrit-logs-master-1/_data/audit_log\",
\"log_group_name\": \"${AWS::StackName}\",
- \"log_stream_name\": \"${EnvironmentName}/{instance_id}/master/audit_log\",
+ \"log_stream_name\": \"${EnvironmentName}/{instance_id}/master-1/audit_log\",
\"timezone\": \"UTC\"
}
]
