#8587 Added sunburst

pandora_console/extras/mr/55.sql

@@ -0,0 +1,5 @@
+START TRANSACTION;
+
+ALTER TABLE `tservice` ADD COLUMN `enable_sunburst` tinyint(1) NOT NULL default 0;
+
+COMMIT;

pandora_console/include/graphs/pandora.d3.js

@@ -965,8 +965,8 @@ function sunburst(recipient, data, width, height) {
   }
 
   function move_tooltip(d) {
-    var x = d3.event.pageX + 10;
+    var x = d3.event.pageX + 10 - $("#menu_full").width();
-    var y = d3.event.pageY + 10;
+    var y = d3.event.pageY - 90;
 
     $("#tooltip").css("left", x + "px");
     $("#tooltip").css("top", y + "px");
@@ -1017,10 +1017,10 @@ function sunburst(recipient, data, width, height) {
         "-moz-box-shadow:    7px 7px 5px rgba(50, 50, 50, 0.75);" +
         "box-shadow:         7px 7px 5px rgba(50, 50, 50, 0.75);" +
         "left: " +
-        x +
+        100 +
         "px;" +
         "top: " +
-        y +
+        100 +
         "px;"
     );
   }

pandora_console/include/lib/Dashboard/Widgets/service_map.php

@@ -235,6 +235,10 @@ class ServiceMapWidget extends Widget
             $values['showLegend'] = $decoder['showLegend'];
         }
 
+        if (isset($decoder['sunburst']) === true) {
+            $values['sunburst'] = $decoder['sunburst'];
+        }
+
         return $values;
     }
 
@@ -296,19 +300,16 @@ class ServiceMapWidget extends Widget
             ],
         ];
 
-        // TODO refactoriced services: Hidden legend.
+        $inputs[] = [
-        /*
+            'label'     => __('Enable sunburst'),
-            // Show legend.
-            $inputs[] = [
-            'label'     => __('Show legend'),
             'arguments' => [
-                'name'  => 'showLegend',
+                'type'   => 'switch',
-                'id'    => 'showLegend',
+                'name'   => 'sunburst',
-                'type'  => 'switch',
+                'class'  => 'event-widget-input',
-                'value' => $values['showLegend'],
+                'value'  => $values['sunburst'],
+                'return' => true,
             ],
-            ];
+        ];
-        */
 
         return $inputs;
     }
@@ -325,7 +326,9 @@ class ServiceMapWidget extends Widget
         $values = parent::getPost();
 
         $values['serviceId'] = \get_parameter('serviceId', 0);
-        // $values['showLegend'] = \get_parameter_switch('showLegend');
+
+        $values['sunburst'] = \get_parameter_switch('sunburst', 0);
+
         return $values;
     }
 
@@ -341,6 +344,7 @@ class ServiceMapWidget extends Widget
 
         $size = parent::getSize();
 
+        $output = '';
         if (check_acl($config['id_user'], 0, 'AR') === 0) {
             $output .= '<div class="container-center">';
             $output .= \ui_print_error_message(
@@ -367,42 +371,6 @@ class ServiceMapWidget extends Widget
         $style = 'position: relative; text-align: center;';
         $output .= "<div id='".$containerId."' style='".$style."'>";
 
-        // TODO refactoriced services: Hidden legend.
-        /*
-            if ($this->values['showLegend'] === 1) {
-            $output .= "<div id='container_servicemap_legend".$this->values['serviceId'].'_'.$this->cellId."'>";
-            $output .= '<table>';
-            $output .= "<tr class='legend_servicemap_title'><td colspan='3' style='padding-bottom: 10px; min-width: 177px;'><b>".__('Legend').'</b></td>';
-            $output .= "<td><img class='legend_servicemap_toggle' style='padding-bottom: 10px;' src='images/darrowup.png'></td></tr>";
-
-            $output .= "<tr class='legend_servicemap_item'><td>";
-            $output .= "<img src='images/service.png'>";
-            $output .= '</td><td>'.__('Services').'</td>';
-
-            // Coulour legend.
-            $output .= "<td rowspan='3'>";
-            $output .= '<table>';
-            $output .= "<tr><td class='legend_square'><div style='background-color: ".COL_CRITICAL.";'></div></td><td>".__('Critical').'</td></tr>';
-            $output .= "<tr><td class='legend_square'><div style='background-color: ".COL_WARNING.";'></div></td><td>".__('Warning').'</td></tr>';
-            $output .= "<tr><td class='legend_square'><div style='background-color: ".COL_NORMAL.";'></div></td><td>".__('Ok').'</td></tr>';
-            $output .= "<tr><td class='legend_square'><div style='background-color: ".COL_UNKNOWN.";'></div></td><td>".__('Unknown').'</td></tr>';
-            $output .= '</table>';
-            $output .= '</td></tr>';
-
-            $output .= "<tr class='legend_servicemap_item'><td>";
-            $output .= "<img src='images/agent.png'>";
-            $output .= '</td><td>'.__('Agents').'</td>';
-            $output .= '</tr>';
-
-            $output .= "<tr class='legend_servicemap_item'><td>";
-            $output .= "<img src='images/module.png'>";
-            $output .= '</td><td>'.__('Modules').'</td>';
-            $output .= '</tr>';
-            $output .= '</table>';
-            $output .= '</div>';
-            }
-        */
-
         // TODO: removed refactoriced services. Only 1 widget Zoom.
         $sql = sprintf(
             'SELECT COUNT(*)
@@ -425,14 +393,21 @@ class ServiceMapWidget extends Widget
         );
         // TODO:XXX fix draw service map.
         ob_start();
-        servicemap_print_servicemap(
+
-            $this->values['serviceId'],
+        if ($this->values['sunburst'] === 0) {
-            false,
+            servicemap_print_servicemap(
-            $size['width'],
+                $this->values['serviceId'],
-            $size['height'],
+                false,
-            $this->cellId,
+                $size['width'],
-            $disableZoom
+                $size['height'],
-        );
+                $this->cellId,
+                $disableZoom
+            );
+        } else {
+            include_once $config['homedir'].'/include/graphs/functions_d3.php';
+            servicemap_print_sunburst($this->values['serviceId'], $size['width'], $size['height']);
+        }
+
         $output .= ob_get_clean();
         $output .= '</div>';
         return $output;

pandora_console/pandoradb.sql

@@ -2817,6 +2817,7 @@ CREATE TABLE IF NOT EXISTS `tservice` (
   `cascade_protection` TINYINT NOT NULL DEFAULT 0,
   `evaluate_sla` INT NOT NULL DEFAULT 0,
   `is_favourite` TINYINT NOT NULL DEFAULT 0,
+  `enable_sunburst` TINYINT NOT NULL DEFAULT 0,
   PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB 
 COMMENT = 'Table to define services to monitor'