From a9e089fc444e2800912d147e68b0b1b880762177 Mon Sep 17 00:00:00 2001
From: Lord Hepipud <contact@lordhepipud.de>
Date: Wed, 25 Nov 2020 12:29:52 +0100
Subject: [PATCH] Small fix for Icinga .conf generation

---
 lib/core/tools/Get-IcingaCheckCommandConfig.psm1 | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/core/tools/Get-IcingaCheckCommandConfig.psm1 b/lib/core/tools/Get-IcingaCheckCommandConfig.psm1
index d155542..3f7e4b4 100644
--- a/lib/core/tools/Get-IcingaCheckCommandConfig.psm1
+++ b/lib/core/tools/Get-IcingaCheckCommandConfig.psm1
@@ -466,7 +466,11 @@ function Write-IcingaPlainConfigurationFiles()
                                 if ([string]::IsNullOrEmpty($DataField.description)) {
                                     break;
                                 }
-                                $IcingaConfig += [string]::Format('            description = "{0}"{1}', $DataField.description.Replace("`r`n", ''), (New-IcingaNewLine));
+                                $Description = $DataField.description.Replace("`r`n", ' ');
+                                $Description = $Description.Replace("`n", ' ');
+                                $Description = $Description.Replace("`r", ' ');
+                                $Description = $Description.Replace('"', "'");
+                                $IcingaConfig += [string]::Format('            description = "{0}"{1}', $Description, (New-IcingaNewLine));
                                 break;
                             }
                         }
@@ -481,6 +485,8 @@ function Write-IcingaPlainConfigurationFiles()
                 $IcingaConfig += New-IcingaNewLine;
             }
 
+            $IcingaConfig = $IcingaConfig.Substring(0, $IcingaConfig.Length - 2);
+
             # Close all arguments content
             $IcingaConfig += New-IcingaNewLine;
             $IcingaConfig += '    }'
@@ -494,6 +500,8 @@ function Write-IcingaPlainConfigurationFiles()
                 $Value = $CheckCommand.vars[$var];
                 $IcingaConfig += [string]::Format('    vars.{0} = {1}{2}', $var, $Value, (New-IcingaNewLine));
             }
+        } else {
+            $IcingaConfig += New-IcingaNewLine;
         }
 
         # Close the CheckCommand object