Merge branch 'development' of https://github.com/it-novum/openITCOCKPIT…

… into development
Skywalker-11 · Nov 16, 2020 · 0013920 · 0013920
2 parents f9569fc + 09cc30f
commit 0013920
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/config/version.php b/config/version.php
@@ -1,7 +1,7 @@
 <?php
 
 if (!defined('OPENITCOCKPIT_VERSION')) {
-    define('OPENITCOCKPIT_VERSION', '4.1.1');
+    define('OPENITCOCKPIT_VERSION', '4.1.2');
 }
 
 return [];
diff --git a/src/itnovum/openITCOCKPIT/Core/MonitoringEngine/NagiosConfigGenerator.php b/src/itnovum/openITCOCKPIT/Core/MonitoringEngine/NagiosConfigGenerator.php
@@ -2515,6 +2515,7 @@ public function returnAfterExportCommand() {
     }
 
     public function deleteHostPerfdata() {
+        return true; // @todo fix me
         $basePath = Configure::read('rrd.path');
 
         /** @var $DeletedHostsTable DeletedHostsTable */
@@ -2551,6 +2552,7 @@ public function deleteHostPerfdata() {
     }
 
     public function deleteServicePerfdata() {
+        return true; // @todo fix me
         $basePath = Configure::read('rrd.path');
 
         /** @var $DeletedServicesTable DeletedServicesTable */