From de21305e89afb6099efcc7a3d706cf90478b13dc Mon Sep 17 00:00:00 2001
From: Dawud M <7688823+technowhizz@users.noreply.github.com>
Date: Fri, 30 Dec 2022 19:49:05 +0000
Subject: [PATCH] Fix bug where old metrics wouldn't be overwritten

The mv command wasnt overwriting the textcollector file. mv -f is now
being used

Additionally, serial numbers are now all lowercase
---
 etc/kayobe/ansible/scripts/smartmon.sh | 2 +-
 etc/kayobe/ansible/smartmon-tools.yml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/etc/kayobe/ansible/scripts/smartmon.sh b/etc/kayobe/ansible/scripts/smartmon.sh
index bcac8b8b3..32b3ea81c 100644
--- a/etc/kayobe/ansible/scripts/smartmon.sh
+++ b/etc/kayobe/ansible/scripts/smartmon.sh
@@ -115,7 +115,7 @@ parse_smartctl_info() {
     case "${info_type}" in
     Model_Family) model_family="${info_value}" ;;
     Device_Model) device_model="${info_value}" ;;
-    Serial_Number) serial_number="${info_value}" ;;
+    Serial_Number) serial_number="$(echo ${info_value} | tr '[:upper:]' '[:lower:]')" ;;
     Firmware_Version) fw_version="${info_value}" ;;
     Vendor) vendor="${info_value}" ;;
     Product) product="${info_value}" ;;
diff --git a/etc/kayobe/ansible/smartmon-tools.yml b/etc/kayobe/ansible/smartmon-tools.yml
index 6b275c264..e23e32396 100644
--- a/etc/kayobe/ansible/smartmon-tools.yml
+++ b/etc/kayobe/ansible/smartmon-tools.yml
@@ -36,7 +36,7 @@
         name: "SMART metrics for drive monitoring using {{ item }}"
         user: root
         minute: "*/5"
-        job: "/usr/local/bin/{{ item }}.sh > /var/lib/docker/volumes/textfile/_data/{{ item }}.prom.temp && mv /var/lib/docker/volumes/textfile/_data/{{ item }}.prom.temp /var/lib/docker/volumes/textfile/_data/{{ item }}.prom"
+        job: "/usr/local/bin/{{ item }}.sh > /var/lib/docker/volumes/textfile/_data/{{ item }}.prom.temp && mv -f /var/lib/docker/volumes/textfile/_data/{{ item }}.prom.temp /var/lib/docker/volumes/textfile/_data/{{ item }}.prom"
       loop:
         - smartmon
         - nvmemon