From d54b7c2cb5c8ea2e0fb8bce7469bbd5800e5fb59 Mon Sep 17 00:00:00 2001
From: Devin Matte <devinmatte@gmail.com>
Date: Sat, 20 Jan 2024 13:44:44 -0500
Subject: [PATCH] Add basic ddog tagging (#98)

* Add basic ddog tagging

* Adding tags to cloudfront
---
 devops/cloudformation.json | 12 +++++++++++-
 devops/deploy.sh           |  4 ++++
 devops/playbook.yml        | 13 ++++++++++++-
 devops/systemd.conf        |  3 +++
 4 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/devops/cloudformation.json b/devops/cloudformation.json
index 8ba2f6a..ac56f8a 100644
--- a/devops/cloudformation.json
+++ b/devops/cloudformation.json
@@ -35,6 +35,10 @@
             "Value": {
               "Fn::Sub": "rre-${RREHostname}"
             }
+          },
+          {
+            "Key": "service",
+            "Value": "regional-rail-explorer"
           }
         ],
         "BlockDeviceMappings": [
@@ -133,7 +137,13 @@
             },
             "SslSupportMethod": "sni-only"
           }
-        }
+        },
+        "Tags": [
+          {
+            "Key": "service",
+            "Value": "regional-rail-explorer"
+          }
+        ]
       }
     }
   },
diff --git a/devops/deploy.sh b/devops/deploy.sh
index b2fca4f..23e146f 100755
--- a/devops/deploy.sh
+++ b/devops/deploy.sh
@@ -25,6 +25,10 @@ $PRODUCTION && CERT_ARN="$TM_RRE_RR_RKS_CERT_ARN" || CERT_ARN="$TM_LABS_WILDCARD
 
 $PRODUCTION && STACK_NAME="rre" || STACK_NAME="rre-beta"
 
+# Identify the version and commit of the current deploy
+export GIT_SHA=`git rev-parse HEAD`
+echo "Deploying version $GIT_SHA"
+
 echo "Deploying Regional Rail Explorer to $HOSTNAME..."
 echo "View stack log here: https://$AWS_REGION.console.aws.amazon.com/cloudformation/home?region=$AWS_REGION"
 
diff --git a/devops/playbook.yml b/devops/playbook.yml
index a2e19ca..e8c9f51 100644
--- a/devops/playbook.yml
+++ b/devops/playbook.yml
@@ -97,7 +97,18 @@
       args:
         chdir: /home/ubuntu/regional-rail-explorer
 
+    - name: Make sure a service unit is running and enabled
+      become: yes
+      become_user: root
+      ansible.builtin.systemd_service:
+        state: started
+        name: regional-rail-explorer
+        enabled: true
+
     - name: restart service
       become: yes
       become_user: root
-      shell: systemctl restart regional-rail-explorer
+      ansible.builtin.systemd_service:
+        state: restarted
+        daemon_reload: true
+        name: regional-rail-explorer
diff --git a/devops/systemd.conf b/devops/systemd.conf
index 5667ada..ddb5e2c 100644
--- a/devops/systemd.conf
+++ b/devops/systemd.conf
@@ -7,6 +7,9 @@ Type=simple
 User=ubuntu
 Group=ubuntu
 WorkingDirectory=/home/ubuntu/regional-rail-explorer
+Environment=DD_SERVICE="regional-rail-explorer"
+Environment=DD_ENV="prod"
+Environment=DD_GIT_REPOSITORY_URL="github.com/transitmatters/regional-rail-explorer"
 ExecStart=npm start
 Restart=on-failure
 RestartSec=5s