ObjectStateRuleSet: renamed rule set

fixes #402
Icinga · Sep 28, 2022 · 9e1e552 · 9e1e552
1 parent c749625
commit 9e1e552
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/...toring/Rule/Definition/DefaultRuleSet.php → ...ng/Rule/Definition/ObjectStateRuleSet.php b/...toring/Rule/Definition/DefaultRuleSet.php → ...ng/Rule/Definition/ObjectStateRuleSet.php
@@ -2,7 +2,7 @@
 
 namespace Icinga\Module\Vspheredb\Monitoring\Rule\Definition;
 
-class DefaultRuleSet extends MonitoringRuleSetDefinition
+class ObjectStateRuleSet extends MonitoringRuleSetDefinition
 {
     public const RULE_CLASSES = [
         VMwareObjectStateRuleDefinition::class,
@@ -11,11 +11,11 @@ class DefaultRuleSet extends MonitoringRuleSetDefinition
 
     public function getLabel(): string
     {
-        return $this->translate('Default Rules');
+        return $this->translate('Object State Policy');
     }
 
     public static function getIdentifier(): string
     {
-        return 'Default';
+        return 'ObjectStatePolicy';
     }
 }
diff --git a/library/Vspheredb/Monitoring/Rule/Definition/PowerStateRuleDefinition.php b/library/Vspheredb/Monitoring/Rule/Definition/PowerStateRuleDefinition.php
@@ -111,9 +111,9 @@ protected function getStatusMessageForPowerState($state, $what): string
     public function getInternalDefaults(): array
     {
         return [
-            'trigger_on_poweredOff ' => MonitoringStateTrigger::RAISE_CRITICAL,
-            'trigger_on_suspended'   => MonitoringStateTrigger::RAISE_CRITICAL,
-            'trigger_on_unknown'     => MonitoringStateTrigger::RAISE_UNKNOWN,
+            'trigger_on_poweredOff' => MonitoringStateTrigger::RAISE_CRITICAL,
+            'trigger_on_suspended'  => MonitoringStateTrigger::RAISE_CRITICAL,
+            'trigger_on_unknown'    => MonitoringStateTrigger::RAISE_UNKNOWN,
             'warning_for_uptime_less_than' => 900,
         ];
     }

diff --git a/library/Vspheredb/Monitoring/Rule/Definition/RuleSetRegistry.php b/library/Vspheredb/Monitoring/Rule/Definition/RuleSetRegistry.php
@@ -8,7 +8,7 @@
 class RuleSetRegistry implements JsonSerialization
 {
     protected static $allSets = [
-        DefaultRuleSet::class,
+        ObjectStateRuleSet::class,
         DiskHealthRuleSet::class,
         ConfigurationPolicyRuleSet::class,
     ];

diff --git a/schema/mysql-migrations/upgrade_40.sql b/schema/mysql-migrations/upgrade_40.sql
@@ -0,0 +1,5 @@
+UPDATE monitoring_rule_set SET settings = replace(settings, '"Default/', '"ObjectPolicy/');
+
+INSERT INTO vspheredb_schema_migration
+  (schema_version, migration_time)
+  VALUES (40, NOW());
diff --git a/schema/mysql.sql b/schema/mysql.sql
@@ -948,4 +948,4 @@ CREATE TABLE counter_300x5 (
 
 INSERT INTO vspheredb_schema_migration
   (schema_version, migration_time)
-VALUES (39, NOW());
+VALUES (40, NOW());