Merge pull request #561 from Icinga/check-redis-availability-first

ApplicationState: Check the availability of `IcingaRedis` first
Icinga · Jun 30, 2022 · 37324f3 · 37324f3
2 parents 8864d9d + 1267e18
commit 37324f3
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 50 deletions.
diff --git a/library/Icingadb/ProvidedHook/ApplicationState.php b/library/Icingadb/ProvidedHook/ApplicationState.php
@@ -18,6 +18,25 @@ class ApplicationState extends ApplicationStateHook
 
     public function collectMessages()
     {
+        try {
+            $lastIcingaHeartbeat = IcingaRedis::getLastIcingaHeartbeat();
+        } catch (Exception $e) {
+            $downSince = Session::getSession()->getNamespace('icingadb')->get('redis.down-since');
+
+            if ($downSince === null) {
+                $downSince = time();
+                Session::getSession()->getNamespace('icingadb')->set('redis.down-since', $downSince);
+            }
+
+            $this->addError(
+                'icingadb/redis-down',
+                $downSince,
+                sprintf(t("Can't connect to Icinga Redis: %s"), $e->getMessage())
+            );
+
+            return;
+        }
+
         $instance = Instance::on($this->getDb())
             ->with(['endpoint'])
             ->filter(Filter::equal('responsible', true))
@@ -50,59 +69,43 @@ public function collectMessages()
 
         $outdatedDbHeartbeat = $instance->heartbeat < time() - 60;
 
-        try {
-            $lastIcingaHeartbeat = IcingaRedis::getLastIcingaHeartbeat();
-            if ($lastIcingaHeartbeat === null) {
-                $missingSince = Session::getSession()
-                    ->getNamespace('icingadb')->get('redis.heartbeat-missing-since');
-
-                if ($missingSince === null) {
-                    $missingSince = time();
-                    Session::getSession()
-                        ->getNamespace('icingadb')->set('redis.heartbeat-missing-since', $missingSince);
-                }
-
-                $lastIcingaHeartbeat = $missingSince;
-            } else {
-                Session::getSession()->getNamespace('icingadb')->delete('redis.heartbeat-missing-since');
-            }
+        if ($lastIcingaHeartbeat === null) {
+            $missingSince = Session::getSession()
+                ->getNamespace('icingadb')->get('redis.heartbeat-missing-since');
 
-            switch (true) {
-                case $outdatedDbHeartbeat && $instance->heartbeat > $lastIcingaHeartbeat:
-                    $this->addError(
-                        'icingadb/redis-outdated',
-                        $lastIcingaHeartbeat,
-                        t('Icinga Redis is outdated. Make sure Icinga 2 is running and connected to Redis.')
-                    );
-
-                    break;
-                case $outdatedDbHeartbeat:
-                    $this->addError(
-                        'icingadb/icingadb-down',
-                        $instance->heartbeat,
-                        t(
-                            'It seems that Icinga DB is not running.'
-                            . ' Make sure Icinga DB is running and writing into the database.'
-                        )
-                    );
-
-                    break;
+            if ($missingSince === null) {
+                $missingSince = time();
+                Session::getSession()
+                    ->getNamespace('icingadb')->set('redis.heartbeat-missing-since', $missingSince);
             }
 
-            Session::getSession()->getNamespace('icingadb')->delete('redis.down-since');
-        } catch (Exception $e) {
-            $downSince = Session::getSession()->getNamespace('icingadb')->get('redis.down-since');
-
-            if ($downSince === null) {
-                $downSince = time();
-                Session::getSession()->getNamespace('icingadb')->set('redis.down-since', $downSince);
-            }
+            $lastIcingaHeartbeat = $missingSince;
+        } else {
+            Session::getSession()->getNamespace('icingadb')->delete('redis.heartbeat-missing-since');
+        }
 
-            $this->addError(
-                'icingadb/redis-down',
-                $downSince,
-                sprintf(t("Can't connect to Icinga Redis: %s"), $e->getMessage())
-            );
+        switch (true) {
+            case $outdatedDbHeartbeat && $instance->heartbeat > $lastIcingaHeartbeat:
+                $this->addError(
+                    'icingadb/redis-outdated',
+                    $lastIcingaHeartbeat,
+                    t('Icinga Redis is outdated. Make sure Icinga 2 is running and connected to Redis.')
+                );
+
+                break;
+            case $outdatedDbHeartbeat:
+                $this->addError(
+                    'icingadb/icingadb-down',
+                    $instance->heartbeat,
+                    t(
+                        'It seems that Icinga DB is not running.'
+                        . ' Make sure Icinga DB is running and writing into the database.'
+                    )
+                );
+
+                break;
         }
+
+        Session::getSession()->getNamespace('icingadb')->delete('redis.down-since');
     }
 }
diff --git a/library/Icingadb/ProvidedHook/RedisHealth.php b/library/Icingadb/ProvidedHook/RedisHealth.php
@@ -48,7 +48,7 @@ public function checkHealth()
                 $this->setMessage(t('Icinga Redis outdated. Make sure Icinga 2 is running and connected to Redis.'));
             }
         } catch (Exception $e) {
-            $this->setState(self::STATE_UNKNOWN);
+            $this->setState(self::STATE_CRITICAL);
             $this->setMessage(sprintf(t("Can't connect to Icinga Redis: %s"), $e->getMessage()));
         }
     }