[fix]MON-13067-install-remove-default-value-for-colors-in-options-tab…

…le-for-develop (#11479) * update insertBaseConf , remove colors * disable database colors import in serviceDetail file * remove unused line in serviceDatail.php * relpace generalOpt color importing with hard coded value * restore deleted lines in sql script * color values deleted from database in upgrade script to 22.10.0-beta.1 * Update www/install/php/Update-22.10.0-beta.1.php Co-authored-by: Kevin Duret <kduret@centreon.com> * Update www/install/php/Update-22.10.0-beta.1.php Co-authored-by: Kevin Duret <kduret@centreon.com> Co-authored-by: Kevin Duret <kduret@centreon.com>
centreon · Sep 5, 2022 · 81d11cb · 81d11cb
1 parent 0784363
commit 81d11cb
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 23 deletions.
diff --git a/www/class/centreonGraph.class.php b/www/class/centreonGraph.class.php
@@ -665,8 +665,7 @@ public function initCurveList()
                         ) {
                             $this->metrics[$metric["metric_id"]]["warn"] = $metric["warn"];
                             if (!isset($ds_data["ds_color_area_warn"]) || empty($ds_data["ds_color_area_warn"])) {
-                                $this->metrics[$metric["metric_id"]]["ds_color_area_warn"] =
-                                    $this->generalOpt["color_warning"];
+                                $this->metrics[$metric["metric_id"]]["ds_color_area_warn"] = "#ff9a13";
                             }
                         }
                         if (
@@ -677,8 +676,7 @@ public function initCurveList()
                         ) {
                             $this->metrics[$metric["metric_id"]]["crit"] = $metric["crit"];
                             if (!isset($ds_data["ds_color_area_crit"]) || empty($ds_data["ds_color_area_crit"])) {
-                                $this->metrics[$metric["metric_id"]]["ds_color_area_crit"] =
-                                    $this->generalOpt["color_critical"];
+                                $this->metrics[$metric["metric_id"]]["ds_color_area_crit"] = "#e00b3d";
                             }
                         }
                     }

diff --git a/www/class/centreonGraphNg.class.php b/www/class/centreonGraphNg.class.php
@@ -508,10 +508,10 @@ private function addRealMetric($metric, $hidden = null)
         $this->metrics[$metric["metric_id"]]["crit"] = $metric["crit"];
         $this->metrics[$metric["metric_id"]]["crit_low"] = $metric["crit_low"];
         if (!isset($dsData["ds_color_area_warn"]) || empty($dsData["ds_color_area_warn"])) {
-            $this->metrics[$metric["metric_id"]]["ds_color_area_warn"] = $this->generalOpt["color_warning"]['value'];
+            $this->metrics[$metric["metric_id"]]["ds_color_area_warn"] = "#ff9a13";
         }
         if (!isset($dsData["ds_color_area_crit"]) || empty($dsData["ds_color_area_crit"])) {
-            $this->metrics[$metric["metric_id"]]["ds_color_area_crit"] = $this->generalOpt["color_critical"]['value'];
+            $this->metrics[$metric["metric_id"]]["ds_color_area_crit"] = "#e00b3d";
         }
 
         $this->metrics[$metric["metric_id"]]["ds_order"] =

diff --git a/www/include/monitoring/objectDetails/serviceDetails.php b/www/include/monitoring/objectDetails/serviceDetails.php
@@ -420,8 +420,6 @@
             str_replace(' \'', "\n'", $service_status['performance_data'])
         );
         if ($service_status['current_state'] !== "") {
-            $service_status["status_color"] =
-                $centreon->optGen["color_" . strtolower($service_status["current_state"])];
             $service_status["status_class"] = $tab_class_service[strtolower($service_status["current_state"])];
         }
         !$service_status["check_latency"]

diff --git a/www/install/insertBaseConf.sql b/www/install/insertBaseConf.sql
@@ -88,19 +88,6 @@ INSERT INTO `options` (`key`, `value`) VALUES
 ('maxViewConfiguration','30'),
 ('AjaxTimeReloadMonitoring','15'),
 ('AjaxTimeReloadStatistic','15'),
-('color_up','#88b917'),
-('color_down','#e00b3d'),
-('color_unreachable','#818285'),
-('color_ok','#88b917'),
-('color_warning','#ff9a13'),
-('color_critical','#e00b3d'),
-('color_pending','#2AD1D4'),
-('color_unknown','#bcbdc0'),
-('color_ack','#FAED60'),
-('color_host_down','#'),
-('color_host_unreachable','#9CD9F1'),
-('color_line_critical','#F96461'),
-('color_downtime','#FBC5E8'),
 ('global_sort_type','host_name'),
 ('global_sort_order','ASC'),
 ('problem_sort_type','last_state_change'),

diff --git a/www/install/php/Update-22.10.0-beta.1.php b/www/install/php/Update-22.10.0-beta.1.php
@@ -32,8 +32,8 @@
 
     $pearDB->beginTransaction();
 
-    $errorMessage = "Unable to delete 'oreon_web_path' option from database";
-    $pearDB->query("DELETE FROM `options` WHERE `key` = 'oreon_web_path'");
+    $errorMessage = "Unable to delete 'oreon_web_path' and color options from database";
+    $pearDB->query("DELETE FROM `options` WHERE `key` = 'oreon_web_path' OR `key` LIKE 'color_%'");
 
     $errorMessage = "Unable to delete 'appKey' information from database";
     $pearDB->query("DELETE FROM `informations` WHERE `key` = 'appKey'");