Fix cloudwatch agent configuration (#11)

* Removed commas from json document

* Fix the cloudwath agent configuration to send ssm logs too

Author: pmatsinopoulos

terraform/ethereum_ssm_agent_configuration.tf

@@ -1,8 +1,12 @@
-resource "terraform_data" "copy_seelog_to_correct_position" {
+resource "terraform_data" "ssm_agent_log_configuration" {
   depends_on = [
     terraform_data.ethereum_ec2_install_reth
   ]
 
+  triggers_replace = {
+    seelog = sha1(file("${path.module}/../ssm-agent-seelog.xml"))
+  }
+
   connection {
     type        = "ssh"
     user        = var.ethereum_node.user
@@ -21,6 +25,9 @@ resource "terraform_data" "copy_seelog_to_correct_position" {
       "sudo mkdir -p /etc/amazon/ssm",
       "sudo mv /home/${var.ethereum_node.user}/seelog.xml /etc/amazon/ssm/seelog.xml",
       "sudo chown root:root /etc/amazon/ssm/seelog.xml",
+      "sudo chown -R root:adm /var/log/amazon",
+      "sudo chmod 750 /var/log/amazon",
+      "sudo chmod 750 /var/log/amazon/ssm",
       "sudo systemctl restart snap.amazon-ssm-agent.amazon-ssm-agent.service",
     ]
   }

terraform/ssm-agent-seelog.xml

@@ -1,15 +1,15 @@
-<!--amazon-ssm-agent uses seelog logging -->
-<!--Seelog has github wiki pages, which contain detailed how-tos references: https://github.com/cihub/seelog/wiki -->
-<!--Seelog examples can be found here: https://github.com/cihub/seelog-examples -->
 <seelog type="adaptive" mininterval="2000000" maxinterval="100000000" critmsgcount="500" minlevel="debug">
     <exceptions>
         <exception filepattern="test*" minlevel="error"/>
     </exceptions>
-    <outputs formatid="std:json-debug">
-        <console formatid="std:json-debug"/>
+    <outputs formatid="json">
+        <console formatid="json"/>
         <rollingfile type="size" filename="/var/log/amazon/ssm/amazon-ssm-agent.log" maxsize="30000000" maxrolls="5"/>
-        <filter levels="error,critical" formatid="std:json-debug">
+        <filter levels="error,critical" formatid="json">
             <rollingfile type="size" filename="/var/log/amazon/ssm/errors.log" maxsize="10000000" maxrolls="5"/>
         </filter>
     </outputs>
+    <formats>
+        <format id="json" format='{"timestamp":"%Date(2006-01-02T15:04:05.000Z07:00)","level":"%LEVEL","funcShort":"%FuncShort","file":"%File","line":"%Line","message":"%Msg"}%n'/>
+    </formats>
 </seelog>

terraform/templates/ethereum_ec2.amazon-cloudwatch-agent.json.tftpl

@@ -1,7 +1,8 @@
 {
     "agent": {
         "metrics_collection_interval": 60,
-        "run_as_user": "cwagent"
+        "run_as_user": "cwagent",
+        "debug": true
     },
     "metrics": {
         "namespace": "${namespace}",
@@ -115,7 +116,7 @@
                         "log_group_name": "${ssm_agent_log_group_name}"
                     },
                     {
-                        "file_path": "/var/log/amazon/ssm/error.log",
+                        "file_path": "/var/log/amazon/ssm/errors.log",
                         "log_group_name": "${ssm_agent_log_group_name_error}"
                     }
                 ]