From 05cc72eb0f6ce7eb025520bfdec455e08ab54b90 Mon Sep 17 00:00:00 2001
From: Daniel Cebrian <daniel.cebrian@pandorafms.com>
Date: Fri, 12 May 2023 14:16:04 +0200
Subject: [PATCH 1/6] #10696 new widget for netflow

---
 .../include/lib/Dashboard/Widget.php          |   4 +
 .../include/lib/Dashboard/Widgets/netflow.php | 458 ++++++++++++++++++
 2 files changed, 462 insertions(+)
 create mode 100644 pandora_console/include/lib/Dashboard/Widgets/netflow.php

diff --git a/pandora_console/include/lib/Dashboard/Widget.php b/pandora_console/include/lib/Dashboard/Widget.php
index 245c9f0481..76b87f0b01 100644
--- a/pandora_console/include/lib/Dashboard/Widget.php
+++ b/pandora_console/include/lib/Dashboard/Widget.php
@@ -416,6 +416,10 @@ class Widget
                     $className .= '\OsQuickReportWidget';
                 break;
 
+                case 'netflow':
+                    $className .= '\Netflow';
+                break;
+
                 case 'GroupedMeterGraphs':
                 case 'ColorModuleTabs':
                 case 'BlockHistogram':
diff --git a/pandora_console/include/lib/Dashboard/Widgets/netflow.php b/pandora_console/include/lib/Dashboard/Widgets/netflow.php
new file mode 100644
index 0000000000..d4e6410247
--- /dev/null
+++ b/pandora_console/include/lib/Dashboard/Widgets/netflow.php
@@ -0,0 +1,458 @@
+<?php
+/**
+ * Widget Netflow Pandora FMS Console
+ *
+ * @category   Console Class
+ * @package    Pandora FMS
+ * @subpackage Widget Netflow
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
+ * Please see http://pandorafms.org for full contribution list
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation for version 2.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * ============================================================================
+ */
+namespace PandoraFMS\Dashboard;
+
+/**
+ * Netflow.
+ */
+class Netflow extends Widget
+{
+
+    /**
+     * Name widget.
+     *
+     * @var string
+     */
+    protected $name;
+
+    /**
+     * Title widget.
+     *
+     * @var string
+     */
+    protected $title;
+
+    /**
+     * Page widget;
+     *
+     * @var string
+     */
+    protected $page;
+
+    /**
+     * Class name widget.
+     *
+     * @var [type]
+     */
+    protected $className;
+
+    /**
+     * Values options for each widget.
+     *
+     * @var [type]
+     */
+    protected $values;
+
+    /**
+     * Configuration required.
+     *
+     * @var boolean
+     */
+    protected $configurationRequired;
+
+    /**
+     * Error load widget.
+     *
+     * @var boolean
+     */
+    protected $loadError;
+
+    /**
+     * Width.
+     *
+     * @var integer
+     */
+    protected $width;
+
+    /**
+     * Heigth.
+     *
+     * @var integer
+     */
+    protected $height;
+
+    /**
+     * Grid Width.
+     *
+     * @var integer
+     */
+    protected $gridWidth;
+
+
+    /**
+     * Construct.
+     *
+     * @param integer      $cellId      Cell ID.
+     * @param integer      $dashboardId Dashboard ID.
+     * @param integer      $widgetId    Widget ID.
+     * @param integer|null $width       New width.
+     * @param integer|null $height      New height.
+     * @param integer|null $gridWidth   Grid width.
+     */
+    public function __construct(
+        int $cellId,
+        int $dashboardId=0,
+        int $widgetId=0,
+        ?int $width=0,
+        ?int $height=0,
+        ?int $gridWidth=0
+    ) {
+        global $config;
+
+        // Includes.
+        include_once $config['homedir'].'/include/functions_graph.php';
+        include_once $config['homedir'].'/include/class/NetworkMap.class.php';
+        // WARNING: Do not edit. This chunk must be in the constructor.
+        parent::__construct(
+            $cellId,
+            $dashboardId,
+            $widgetId
+        );
+
+        // Width.
+        $this->width = $width;
+
+        // Height.
+        $this->height = $height;
+
+        // Grid Width.
+        $this->gridWidth = $gridWidth;
+
+        // Options.
+        $this->values = $this->getOptionsWidget();
+
+        // Positions.
+        $this->position = $this->getPositionWidget();
+
+        // Page.
+        $this->page = basename(__FILE__);
+
+        // ClassName.
+        $class = new \ReflectionClass($this);
+        $this->className = $class->getShortName();
+
+        // Title.
+        $this->title = __('Netflow');
+
+        // Name.
+        if (empty($this->name) === true) {
+            $this->name = 'netflow';
+        }
+    }
+
+
+    /**
+     * Generates inputs for form (specific).
+     *
+     * @return array Of inputs.
+     *
+     * @throws Exception On error.
+     */
+    public function getFormInputs(): array
+    {
+        $values = $this->values;
+
+        // Retrieve global - common inputs.
+        $inputs = parent::getFormInputs();
+
+        // Default values.
+        if (isset($values['quantity']) === false) {
+            $values['quantity'] = 5;
+        }
+
+        // Default values.
+        if (isset($values['period']) === false) {
+            $values['period'] = SECONDS_1WEEK;
+        }
+
+        // Default values.
+        if (isset($values['max_values']) === false) {
+            $values['max_values'] = 10;
+        }
+
+        // Period.
+        $inputs[] = [
+            'label'     => __('Interval'),
+            'arguments' => [
+                'name'          => 'period',
+                'type'          => 'interval',
+                'value'         => $values['period'],
+                'nothing'       => __('None'),
+                'nothing_value' => 0,
+                'style_icon'    => 'flex-grow: 0',
+            ],
+        ];
+        $chart_types = netflow_get_chart_types();
+        $chart_types['usage_map'] = __('Usage map');
+        $inputs[] = [
+            'label'     => __('Type graph'),
+            'arguments' => [
+                'name'     => 'chart_type',
+                'type'     => 'select',
+                'fields'   => $chart_types,
+                'selected' => $values['chart_type'],
+            ],
+        ];
+
+        $aggregate_list = [
+            'srcip'   => __('Src Ip Address'),
+            'dstip'   => __('Dst Ip Address'),
+            'srcport' => __('Src Port'),
+            'dstport' => __('Dst Port'),
+        ];
+        $inputs[] = [
+            'label'     => __('Aggregated by'),
+            'id'        => 'aggregated',
+            'arguments' => [
+                'name'     => 'aggregate',
+                'type'     => 'select',
+                'fields'   => $aggregate_list,
+                'selected' => $values['aggregate'],
+            ],
+        ];
+
+        $inputs[] = [
+            'label'     => __('Data to show'),
+            'id'        => 'data_to_show',
+            'arguments' => [
+                'name'     => 'action',
+                'type'     => 'select',
+                'fields'   => network_get_report_actions(),
+                'selected' => $values['action'],
+            ],
+        ];
+
+        $max_values = [
+            '2'  => '2',
+            '5'  => '5',
+            '10' => '10',
+            '15' => '15',
+            '20' => '20',
+            '25' => '25',
+            '50' => '50',
+        ];
+
+        $inputs[] = [
+            'label'     => __('Max values'),
+            'arguments' => [
+                'name'     => 'max_values',
+                'type'     => 'select',
+                'fields'   => $max_values,
+                'selected' => $values['max_values'],
+            ],
+        ];
+
+        return $inputs;
+    }
+
+
+    /**
+     * Get Post for widget.
+     *
+     * @return array
+     */
+    public function getPost():array
+    {
+        // Retrieve global - common inputs.
+        $values = parent::getPost();
+
+        $values['period'] = \get_parameter('period', 0);
+        $values['chart_type'] = \get_parameter('chart_type', '');
+        $values['aggregate'] = \get_parameter('aggregate');
+        $values['max_values'] = \get_parameter('max_values', 10);
+        $values['action'] = \get_parameter('action', 'srcip');
+
+        return $values;
+    }
+
+
+    /**
+     * Draw widget.
+     *
+     * @return string
+     */
+    public function load()
+    {
+        global $config;
+
+        $output = '';
+
+        $size = parent::getSize();
+
+        $start_date = (time() - $this->values['period']);
+        $end_date = time();
+        if ($this->values['chart_type'] === 'usage_map') {
+            $map_data = netflow_build_map_data(
+                $start_date,
+                $end_date,
+                $this->values['max_values'],
+                ($this->values['action'] === 'talkers') ? 'srcip' : 'dstip'
+            );
+            $has_data = !empty($map_data['nodes']);
+
+            if ($has_data === true) {
+                $map_manager = new \NetworkMap($map_data);
+                $map_manager->printMap();
+            } else {
+                ui_print_info_message(__('No data to show'));
+            }
+        } else {
+            $netflowContainerClass = ($this->values['chart_type'] === 'netflow_data' || $this->values['chart_type'] === 'netflow_summary' || $this->values['chart_type'] === 'netflow_top_N') ? '' : 'white_box';
+            $filter = [
+                'aggregate'                   => $this->values['aggregate'],
+                'netflow_monitoring_interval' => 300,
+            ];
+
+            $output .= html_print_input_hidden(
+                'selected_style_theme',
+                $config['style'],
+                true
+            );
+            $style = 'height: 100%; border: none;';
+            if ($this->values['chart_type'] !== 'netflow_area') {
+                $style .= ' width: 95%;';
+            }
+
+            // Draw the netflow chart.
+            $output .= html_print_div(
+                [
+                    'class'   => $netflowContainerClass,
+                    'style'   => $style,
+                    'content' => netflow_draw_item(
+                        $start_date,
+                        $end_date,
+                        12,
+                        $this->values['chart_type'],
+                        $filter,
+                        $this->values['max_values'],
+                        '',
+                        'HTML',
+                        0
+                    ),
+                ],
+                true
+            );
+        }
+
+        return $output;
+
+    }
+
+
+    /**
+     * Return aux javascript code for forms.
+     *
+     * @return string
+     */
+    public function getFormJS()
+    {
+        return '
+            $(document).ready(function(){
+                //Limit 1 week
+                $("#period_select option").each(function(key, element){
+                    if(element.value > 604800){
+                        $(element).remove();
+                    }
+                })
+                $("#period_manual option").each(function(key, element){
+                    if(element.value > 604800){
+                        $(element).remove();
+                    }
+                });
+                $("#period_manual input").on("change", function(e){
+                    if($("#hidden-period").val() > 604800) {
+                        $(this).val(1);
+                        $("#hidden-period").val(604800);
+                        $("#period_manual select option").removeAttr("selected");
+                        setTimeout(() => {
+                            $("#period_default select option[value=\'604800\']").attr("selected", "selected");
+                            $("#period_manual select option[value=\'604800\']").attr("selected", "selected");
+                            $("#period_manual select").val(604800);
+                        }, 500);
+                    }
+                });
+                if(this.value === "usage_map") {
+                    $("#data_to_show").show();
+                    $("#aggregated").hide();
+                } else {
+                    $("#data_to_show").hide();
+                    $("#aggregated").show();
+                }
+                $("#chart_type").on("change", function(e){
+                    if(this.value === "usage_map") {
+                        $("#data_to_show").show();
+                        $("#aggregated").hide();
+                    } else {
+                        $("#data_to_show").hide();
+                        $("#aggregated").show();
+                    }
+                });
+            });
+        ';
+    }
+
+
+    /**
+     * Get description.
+     *
+     * @return string.
+     */
+    public static function getDescription()
+    {
+        return __('Netflow');
+    }
+
+
+    /**
+     * Get Name.
+     *
+     * @return string.
+     */
+    public static function getName()
+    {
+        return 'netflow';
+    }
+
+
+    /**
+     * Get size Modal Configuration.
+     *
+     * @return array
+     */
+    public function getSizeModalConfiguration(): array
+    {
+        $size = [
+            'width'  => 400,
+            'height' => 530,
+        ];
+
+        return $size;
+    }
+
+
+}

From 5adcdb1cae17071f2e242d4eb92832642885d4ca Mon Sep 17 00:00:00 2001
From: Daniel Cebrian <daniel.cebrian@pandorafms.com>
Date: Tue, 16 May 2023 09:34:59 +0200
Subject: [PATCH 2/6] #10696 fixed select Usage map

---
 pandora_console/include/lib/Dashboard/Widgets/netflow.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/include/lib/Dashboard/Widgets/netflow.php b/pandora_console/include/lib/Dashboard/Widgets/netflow.php
index d4e6410247..1451ccd9d9 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/netflow.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/netflow.php
@@ -396,7 +396,7 @@ class Netflow extends Widget
                         }, 500);
                     }
                 });
-                if(this.value === "usage_map") {
+                if($("#chart_type").val() === "usage_map") {
                     $("#data_to_show").show();
                     $("#aggregated").hide();
                 } else {

From e737cb4f014dd63cbf38a67f15d0b2fa9a2a6434 Mon Sep 17 00:00:00 2001
From: Daniel Cebrian <daniel.cebrian@pandorafms.com>
Date: Tue, 16 May 2023 13:36:32 +0200
Subject: [PATCH 3/6] #10696 added image netflow widget

---
 pandora_console/images/widgets/netflow.png | Bin 0 -> 7588 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 pandora_console/images/widgets/netflow.png

diff --git a/pandora_console/images/widgets/netflow.png b/pandora_console/images/widgets/netflow.png
new file mode 100644
index 0000000000000000000000000000000000000000..1b2b216824e0a5a4c67d39d20a28cd5805aa90a5
GIT binary patch
literal 7588
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
GLSTYGl(T{W

literal 0
HcmV?d00001


From fb297c88919084f83f9ba1d5f2e99abdb4b1c3c6 Mon Sep 17 00:00:00 2001
From: Daniel Cebrian <daniel.cebrian@pandorafms.com>
Date: Thu, 8 Jun 2023 15:56:13 +0200
Subject: [PATCH 4/6] #10696 delete switches from graphs in netflow widget

---
 .../include/lib/Dashboard/Widgets/netflow.php            | 3 ++-
 pandora_console/include/styles/netflow_widget.css        | 9 +++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 pandora_console/include/styles/netflow_widget.css

diff --git a/pandora_console/include/lib/Dashboard/Widgets/netflow.php b/pandora_console/include/lib/Dashboard/Widgets/netflow.php
index 1451ccd9d9..6af2e78bab 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/netflow.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/netflow.php
@@ -298,6 +298,7 @@ class Netflow extends Widget
      */
     public function load()
     {
+        ui_require_css_file('netflow_widget', 'include/styles/', true);
         global $config;
 
         $output = '';
@@ -333,7 +334,7 @@ class Netflow extends Widget
                 $config['style'],
                 true
             );
-            $style = 'height: 100%; border: none;';
+            $style = 'width:100%; height: 100%; border: none;';
             if ($this->values['chart_type'] !== 'netflow_area') {
                 $style .= ' width: 95%;';
             }
diff --git a/pandora_console/include/styles/netflow_widget.css b/pandora_console/include/styles/netflow_widget.css
new file mode 100644
index 0000000000..04b093c989
--- /dev/null
+++ b/pandora_console/include/styles/netflow_widget.css
@@ -0,0 +1,9 @@
+.menu_graph {
+  display: none;
+}
+.parent_graph {
+  width: 97% !important;
+}
+#image_hide_show_labels {
+  display: none !important;
+}

From 81991cc4fe2381182db989f093ec08f9e1bb7bf1 Mon Sep 17 00:00:00 2001
From: Daniel Cebrian <daniel.cebrian@pandorafms.com>
Date: Mon, 12 Jun 2023 10:48:10 +0200
Subject: [PATCH 5/6] #10696 new icon netflow

---
 pandora_console/images/widgets/netflow.png | Bin 7588 -> 10896 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/pandora_console/images/widgets/netflow.png b/pandora_console/images/widgets/netflow.png
index 1b2b216824e0a5a4c67d39d20a28cd5805aa90a5..5a34c1635f0ebbb840f2c400ab1adc16b28bdfed 100644
GIT binary patch
delta 10868
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
KMNUMnLSTYcusjO@

delta 7534
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
Ef<!#SLI3~&


From 018bfe12887de38a81c18961f0245a32955847ce Mon Sep 17 00:00:00 2001
From: Daniel Cebrian <daniel.cebrian@pandorafms.com>
Date: Wed, 19 Jul 2023 10:36:30 +0200
Subject: [PATCH 6/6] #10696 fixed resize circular mesh

---
 pandora_console/include/functions_graph.php         |  5 ++++-
 pandora_console/include/functions_netflow.php       |  7 ++++++-
 pandora_console/include/graphs/functions_d3.php     |  4 ++--
 pandora_console/include/graphs/pandora.d3.js        | 13 ++++++++-----
 .../include/lib/Dashboard/Widgets/netflow.php       |  8 +++++++-
 pandora_console/include/styles/netflow_widget.css   |  4 ++++
 6 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index d1702ef9d6..5be8dc1233 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -4618,7 +4618,10 @@ function graph_netflow_circular_mesh($data)
 
     include_once $config['homedir'].'/include/graphs/functions_d3.php';
 
-    return d3_relationship_graph($data['elements'], $data['matrix'], 900, true);
+    $width = (empty($data['width']) === false) ? $data['width'] : 900;
+    $height = (empty($data['height']) === false) ? $data['height'] : 900;
+
+    return d3_relationship_graph($data['elements'], $data['matrix'], $width, true, $height);
 }
 
 
diff --git a/pandora_console/include/functions_netflow.php b/pandora_console/include/functions_netflow.php
index 66e1ad1a9f..9d0c492971 100644
--- a/pandora_console/include/functions_netflow.php
+++ b/pandora_console/include/functions_netflow.php
@@ -1233,7 +1233,9 @@ function netflow_draw_item(
     $max_aggregates,
     $connection_name='',
     $output='HTML',
-    $address_resolution=false
+    $address_resolution=false,
+    $width_content=false,
+    $height_content=false
 ) {
     $aggregate = $filter['aggregate'];
     $interval = ($end_date - $start_date);
@@ -1432,6 +1434,9 @@ function netflow_draw_item(
                 netflow_aggregate_is_ip($aggregate)
             );
 
+            $data_circular['width'] = $width_content;
+            $data_circular['height'] = $height_content;
+
             $html = '<div class="center">';
             $html .= graph_netflow_circular_mesh($data_circular);
             $html .= '</div>';
diff --git a/pandora_console/include/graphs/functions_d3.php b/pandora_console/include/graphs/functions_d3.php
index acb675423a..baa957acc9 100644
--- a/pandora_console/include/graphs/functions_d3.php
+++ b/pandora_console/include/graphs/functions_d3.php
@@ -57,7 +57,7 @@ function include_javascript_d3($return=false)
 }
 
 
-function d3_relationship_graph($elements, $matrix, $width=700, $return=false)
+function d3_relationship_graph($elements, $matrix, $width=700, $return=false, $height=700)
 {
     global $config;
 
@@ -72,7 +72,7 @@ function d3_relationship_graph($elements, $matrix, $width=700, $return=false)
     $output = '<div id="chord_diagram"></div>';
     $output .= include_javascript_d3(true);
     $output .= "<script language=\"javascript\" type=\"text/javascript\">
-					chordDiagram('#chord_diagram', $elements, $matrix, $width);
+					chordDiagram('#chord_diagram', $elements, $matrix, $width, $height);
 				</script>";
 
     if (!$return) {
diff --git a/pandora_console/include/graphs/pandora.d3.js b/pandora_console/include/graphs/pandora.d3.js
index 5c8b59013b..64313904bc 100644
--- a/pandora_console/include/graphs/pandora.d3.js
+++ b/pandora_console/include/graphs/pandora.d3.js
@@ -22,7 +22,7 @@
 // matrix = [[0, 0, 2],     // a[a => a, a => b, a => c]
 //           [5, 0, 1],     // b[b => a, b => b, b => c]
 //           [2, 3, 0]];    // c[c => a, c => b, c => c]
-function chordDiagram(recipient, elements, matrix, width) {
+function chordDiagram(recipient, elements, matrix, width, height) {
   d3.chart = d3.chart || {};
   d3.chart.chordWheel = function(options) {
     // Default values
@@ -59,10 +59,13 @@ function chordDiagram(recipient, elements, matrix, width) {
           .enter()
           .append("svg:svg")
           .attr("width", width)
-          .attr("height", width)
+          .attr("height", height)
           .attr("class", "dependencyWheel")
           .append("g")
-          .attr("transform", "translate(" + width / 2 + "," + width / 2 + ")");
+          .attr(
+            "transform",
+            "translate(" + width / 2 + "," + height / 2 + ") scale(1.2)"
+          );
 
         var arc = d3.svg
           .arc()
@@ -206,8 +209,8 @@ function chordDiagram(recipient, elements, matrix, width) {
           .on("mousemove", move_tooltip);
 
         function move_tooltip(d) {
-          x = d3.event.pageX + 10;
-          y = d3.event.pageY + 10;
+          x = d3.event.layerX + 10;
+          y = d3.event.layerY + 10;
 
           $("#tooltip").css("left", x + "px");
           $("#tooltip").css("top", y + "px");
diff --git a/pandora_console/include/lib/Dashboard/Widgets/netflow.php b/pandora_console/include/lib/Dashboard/Widgets/netflow.php
index 6af2e78bab..be603e452b 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/netflow.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/netflow.php
@@ -339,6 +339,10 @@ class Netflow extends Widget
                 $style .= ' width: 95%;';
             }
 
+            if ($size['width'] > $size['height']) {
+                $size['width'] = $size['height'];
+            }
+
             // Draw the netflow chart.
             $output .= html_print_div(
                 [
@@ -353,7 +357,9 @@ class Netflow extends Widget
                         $this->values['max_values'],
                         '',
                         'HTML',
-                        0
+                        0,
+                        ($size['width'] - 50),
+                        ($size['height'] - 20),
                     ),
                 ],
                 true
diff --git a/pandora_console/include/styles/netflow_widget.css b/pandora_console/include/styles/netflow_widget.css
index 04b093c989..c7be7fe90d 100644
--- a/pandora_console/include/styles/netflow_widget.css
+++ b/pandora_console/include/styles/netflow_widget.css
@@ -7,3 +7,7 @@
 #image_hide_show_labels {
   display: none !important;
 }
+
+.select2-search--dropdown .select2-search__field {
+  padding: 0px !important;
+}