collect mosquitto config when collecting diag info

reubenmiller · reubenmiller · commit e3104afe75f4 · 2025-08-22T14:54:32.000+02:00
Signed-off-by: reubenmiller &lt;reuben.d.miller@gmail.com&gt;
diff --git a/configuration/contrib/diag-plugins/07_mosquitto.sh b/configuration/contrib/diag-plugins/07_mosquitto.sh
@@ -3,6 +3,7 @@ set -e
 
 OUTPUT_DIR=""
 COMMAND=""
+TEDGE_CONFIG_DIR=${TEDGE_CONFIG_DIR:-/etc/tedge}
 
 # Parse arguments
 while [ $# -gt 0 ]; do
@@ -39,12 +40,33 @@ mosquitto_log() {
     fi
 }
 
+mosquitto_config() {
+    if command -V tree >/dev/null >&2; then
+        tree /etc/mosquitto > "$OUTPUT_DIR/etc_mosquitto.tree.txt" ||:
+    fi
+
+    mkdir -p "$OUTPUT_DIR/mosquitto"
+    if [ -f /etc/mosquitto/mosquitto.conf ]; then
+        cp -aR /etc/mosquitto/mosquitto.conf "$OUTPUT_DIR/mosquitto" ||:
+    fi
+    if [ -d /etc/mosquitto/conf.d ]; then
+        cp -aR /etc/mosquitto/conf.d "$OUTPUT_DIR/mosquitto/" ||:
+    fi
+
+    mkdir -p "$OUTPUT_DIR/tedge"
+    cp -aR "$TEDGE_CONFIG_DIR/mosquitto-conf" "$OUTPUT_DIR/tedge/" ||:
+
+    # sanitize password fields
+    find "$OUTPUT_DIR" -name "*.conf" -exec sed -i 's/password\s*.*/password <redacted>/g' {} \; ||:
+}
+
 collect() {
     if command -V mosquitto > /dev/null 2>&1; then
         if command -V journalctl >/dev/null 2>&1; then
             mosquitto_journal
         fi
         mosquitto_log
+        mosquitto_config
     else
         echo "mosquitto not found" >&2
         # this plugin is not applicable when mosquitto doesn't exist
diff --git a/tests/RobotFramework/tests/tedge/diag/predefined_plugins.robot b/tests/RobotFramework/tests/tedge/diag/predefined_plugins.robot
@@ -65,7 +65,11 @@ Test Tags           theme:troubleshooting    theme:cli    theme:plugins
     ${log_names}=    Create List
     ...    output.log
     ...    mosquitto.log
+    ...    mosquitto/mosquitto.conf
+    ...    mosquitto/conf.d/mosquitto.conf
     ...    mosquitto-journal.log
+    ...    tedge/mosquitto-conf/tedge-mosquitto.conf
+    ...    tedge/mosquitto-conf/c8y-bridge.conf
     FOR    ${log_name}    IN    @{log_names}
         File Size Is Not Zero    ${log_name}
     END
