From 7e8ab58d9fbc3d10f0cfbbf1fbb2f5df8158cd2c Mon Sep 17 00:00:00 2001
From: Enriqiue Sanchez <esanchezvela@microsoft.com>
Date: Mon, 8 Jan 2024 16:15:14 -0500
Subject: [PATCH] Adding collection of /etc/crypttab on Diag report and a
 report for crash dump analysis

---
 docs/manifest_by_file.md   | 5 ++++-
 docs/manifest_content.md   | 5 ++++-
 manifests/linux/crashdump  | 4 ++++
 manifests/linux/diagnostic | 1 +
 4 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 manifests/linux/crashdump

diff --git a/docs/manifest_by_file.md b/docs/manifest_by_file.md
index ee80f1b..bccf35f 100644
--- a/docs/manifest_by_file.md
+++ b/docs/manifest_by_file.md
@@ -56,6 +56,7 @@ File Path | Manifest
 /etc/cloud/cloud.cfg | diagnostic, diskpool, eg, vmdiagnostic 
 /etc/cloud/cloud.cfg.d/\*.cfg | diagnostic, diskpool, eg, vmdiagnostic 
 /etc/cni/net.d/\*.conflist | aks 
+/etc/crypttab | diagnostic 
 /etc/default/azuremonitoragent | azuremonitoragent 
 /etc/default/grub | linux-bootconfig 
 /etc/default/grub.d/\*.cfg | linux-bootconfig 
@@ -72,6 +73,7 @@ File Path | Manifest
 /etc/hosts.allow | diagnostic 
 /etc/hosts.deny | diagnostic 
 /etc/idmapd.conf | diagnostic, vmdiagnostic 
+/etc/kdump.conf | crashdump 
 /etc/localtime | diagnostic 
 /etc/modprobe.d/\*.conf | diagnostic 
 /etc/netplan/\*.yaml | diagnostic, eg, vmdiagnostic 
@@ -161,6 +163,7 @@ File Path | Manifest
 /tmp/sosreport\*.tar.xz | linux-sos-scc 
 /usr/lib/NetworkManager/\*.conf | diagnostic, eg, vmdiagnostic 
 /usr/lib/NetworkManager/conf.d/\*.conf | diagnostic, eg, vmdiagnostic 
+/var/crash/\* | crashdump 
 /var/lib/.jupyter/jupyter_notebook_config.py | hdinsight 
 /var/lib/GuestConfig/Configuration/\* | monitor-mgmt 
 /var/lib/GuestConfig/gc_agent_logs/\* | monitor-mgmt 
@@ -662,4 +665,4 @@ File Path | Manifest
 /k/kubeclusterconfig.json | aks 
 /unattend.xml | diagnostic, eg, normal, vmdiagnostic, windowsupdate 
 
-*File was created by running [parse_manifest.py](../tools/parse_manifest.py) on `2023-11-01 11:36:24.463055`*
\ No newline at end of file
+*File was created by running [parse_manifest.py](../tools/parse_manifest.py) on `2024-01-08 16:13:52.407698`*
\ No newline at end of file
diff --git a/docs/manifest_content.md b/docs/manifest_content.md
index d7b1527..f246178 100644
--- a/docs/manifest_content.md
+++ b/docs/manifest_content.md
@@ -182,6 +182,8 @@ azuremonitoragent | copy | /var/lib/waagent/Microsoft.Azure.Monitor.AzureMonitor
 azuremonitoragent | copy | /var/lib/waagent/Microsoft.Azure.Monitor.AzureMonitorLinuxAgent-\*/status/\*.status
 azuremonitoragent | copy | /var/log/azure/Microsoft.Azure.Monitor.AzureMonitorLinuxAgent/\*/\*.log
 azuremonitoragent | copy | /var/log/waagent\*.log
+crashdump | copy | /var/crash/\*
+crashdump | copy | /etc/kdump.conf
 diagnostic | list | /boot
 diagnostic | list | /var/log
 diagnostic | list | /var/lib/cloud
@@ -271,6 +273,7 @@ diagnostic | copy | /var/log/azure/custom-script/handler.log
 diagnostic | copy | /var/log/azure/run-command/handler.log
 diagnostic | copy | /var/log/azure/cluster-provision.log
 diagnostic | copy | /etc/fstab
+diagnostic | copy | /etc/crypttab
 diagnostic | copy | /etc/\*-release
 diagnostic | copy | /etc/HOSTNAME
 diagnostic | copy | /etc/hostname
@@ -1827,4 +1830,4 @@ workloadbackup | copy | /WindowsAzure/Logs/Plugins/\*
 workloadbackup | copy | /WindowsAzure/Logs/AggregateStatus/aggregatestatus\*.json
 workloadbackup | copy | /WindowsAzure/Logs/AppAgentRuntime.log
 
-*File was created by running [parse_manifest.py](../tools/parse_manifest.py) on `2023-11-01 11:36:24.463055`*
\ No newline at end of file
+*File was created by running [parse_manifest.py](../tools/parse_manifest.py) on `2024-01-08 16:13:52.407698`*
\ No newline at end of file
diff --git a/manifests/linux/crashdump b/manifests/linux/crashdump
new file mode 100644
index 0000000..dc21048
--- /dev/null
+++ b/manifests/linux/crashdump
@@ -0,0 +1,4 @@
+
+echo,### Gathering crash dump files ###
+copy,/var/crash/*,noscan
+copy,/etc/kdump.conf
diff --git a/manifests/linux/diagnostic b/manifests/linux/diagnostic
index 97b5946..4ceb25b 100644
--- a/manifests/linux/diagnostic
+++ b/manifests/linux/diagnostic
@@ -120,6 +120,7 @@ echo,
 
 echo,### Gathering System Configuration Files ###
 copy,/etc/fstab
+copy,/etc/crypttab
 copy,/etc/*-release,noscan
 copy,/etc/HOSTNAME,noscan
 copy,/etc/hostname,noscan