CheckCommand: search for vm object_name too

fixes #109
Icinga · Sep 14, 2020 · 238cf4d · 238cf4d
1 parent 48b56e3
commit 238cf4d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/application/clicommands/CheckCommand.php b/application/clicommands/CheckCommand.php
@@ -3,6 +3,7 @@
 namespace Icinga\Module\Vspheredb\Clicommands;
 
 use Icinga\Date\DateFormatter;
+use Icinga\Exception\NotFoundError;
 use Icinga\Module\Vspheredb\CheckPluginHelper;
 use Icinga\Module\Vspheredb\Db;
 use Icinga\Module\Vspheredb\DbObject\BaseDbObject;
@@ -76,9 +77,15 @@ public function vmAction()
     {
         $this->run(function () {
             $db = Db::newConfiguredInstance();
-            $vm = VirtualMachine::findOneBy([
-                'guest_host_name' => $this->params->getRequired('name')
-            ], $db);
+            try {
+                $vm = VirtualMachine::findOneBy([
+                    'object_name' => $this->params->getRequired('name')
+                ], $db);
+            } catch (NotFoundError $e) {
+                $vm = VirtualMachine::findOneBy([
+                    'guest_host_name' => $this->params->getRequired('name')
+                ], $db);
+            }
             $quickStats = VmQuickStats::load($vm->get('uuid'), $db);
             $this->checkOverallHealth($vm->object())
                 ->checkRuntimePowerState($vm)

diff --git a/doc/84-Changelog.md b/doc/84-Changelog.md
@@ -21,6 +21,9 @@ next (will be 1.2.0)
 * FEATURE: overview tree no longer skips some levels (#181)
 * FEATURE: support 'compact' mode for dashboard use (#134)
 
+### CLI
+* FIX: vm check now also looks for object name (#109)
+
 ### Background Daemon
 * FIX: do not allow ENV proxy settings to override server config (#159)
 * FIX: sync no longer fails on objects with no overallState (#98)