Treat hard states more severe than soft states

fixes #6571
2014-08-15 12:40:56 +02:00 · 2014-08-15 12:40:56 +02:00 · 54461f9319
parent f2ed813c9a
commit 54461f9319
2 changed files with 15 additions and 0 deletions
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
@ -76,6 +76,11 @@ class HoststatusQuery extends IdoQuery
                            ELSE 4
                        END
                END
+            END
+            +
+            CASE WHEN hs.state_type = 1
+                THEN 8
+                ELSE 0
            END'
        ),
        'hostgroups' => array(
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
@ -130,6 +130,11 @@ class StatusQuery extends IdoQuery
                            ELSE 4
                        END
                END
+            END
+            +
+            CASE WHEN hs.state_type = 1
+                THEN 8
+                ELSE 0
            END'
        ),
        'hostgroups' => array(
@ -266,6 +271,11 @@ class StatusQuery extends IdoQuery
                                     END
                             END
                         END
+                END
+                +
+                CASE WHEN ss.state_type = 1
+                    THEN 8
+                    ELSE 0
                END'
        ),
        'serviceproblemsummary' => array(