Merge pull request #72 from mdr-engineering/hotfix/ftd_na_SnapshotTags

Fixes Snapshots and Filters out NODATA flowlogs

base/account_standards/ebs_backups.tf

@@ -0,0 +1,36 @@
+# To keep in line with FedRAMP we are setting up a lifecycle on the EBS vol to create "backups"
+# It will target the tag "Snapshot" based on the value depends on what policy is assigned (see comments bellow)
+resource "aws_dlm_lifecycle_policy" "daily" {
+  description        = "daily DLM lifecycle policy"
+  execution_role_arn = aws_iam_role.dlm_lifecycle_role.arn
+  state              = "ENABLED"
+
+  policy_details {
+    resource_types = ["VOLUME"]
+
+    schedule {
+      name = "daily snapshots retain 2"
+
+      create_rule {
+        interval      = 24
+        interval_unit = "HOURS"
+        times         = ["23:45"]
+      }
+
+      retain_rule {
+        count = 2
+      }
+
+      tags_to_add = {
+        SnapshotCreator = "DLM"
+        SnapshotPolicy = "Daily"
+      }
+
+      copy_tags = true
+    }
+
+    target_tags = {
+      Snapshot = "Daily"
+    }
+  }
+}

base/bastion/main.tf

@@ -130,6 +130,7 @@ resource "aws_instance" "instance" {
 
   user_data = data.template_cloudinit_config.cloud-init.rendered
   tags = merge( var.standard_tags, var.tags, { Name = var.instance_name })
+  volume_tags = merge( var.standard_tags, var.tags, { Name = var.instance_name })
 }
 
 module "private_dns_record" {

base/interconnects/main.tf

@@ -62,6 +62,13 @@ resource "aws_instance" "interconnects" {
       Name = "interconnect-${count.index}"
     }
   )
+  volume_tags = merge(
+    var.standard_tags,
+    var.tags,
+    { 
+      Name = "interconnect-${count.index}"
+    }
+  )
 
   root_block_device {
       volume_type = "gp2"

base/salt_master/main.tf

@@ -130,6 +130,7 @@ resource "aws_instance" "instance" {
 
   user_data = data.template_cloudinit_config.salt_master_cloud_init_config.rendered
   tags = merge( var.standard_tags, var.tags, { Name = var.instance_name })
+  volume_tags = merge( var.standard_tags, var.tags, { Name = var.instance_name })
 }
 
 #Uncommnet this when we are ready to make the change. 

thirdparty/terraform-aws-kinesis-firehose-splunk/files/kinesis-firehose-cloudwatch-logs-processor.js

@@ -60,6 +60,9 @@ const AWS = require('aws-sdk');
  * The result must be returned in a Promise.
  */
 function transformLogEvent(logEvent) {
+    if (logEvent.message.includes('NODATA')) {
+        return Promise.resolve(``);
+    }
     return Promise.resolve(`${logEvent.message}\n`);
 }