Se modifica la vista de reporte de OLT.

src/StatsBundle/Command/GenerateCrontabCommand.php

@@ -90,6 +90,7 @@ class GenerateCrontabCommand extends ContainerAwareCommand
                 $params = "--olt-ip={$deviceIp} --olt-community={$snmpCommunity} --olt-snmp-library={$library} --olt-device-id={$deviceId} --olt-server-id={$serverId}";
                 $commands[] = "*/{$timeScan} * * * * {$pathConsole} {$mark}:pon:scan {$params}";
                 $commands[] = "*/{$timeScan} * * * * {$pathConsole} {$mark}:onu:scan {$params}";
+                $commands[] = "*/{$timeScan} * * * * {$pathConsole} {$mark}:olt:scan {$params}";
                 
                 $params .= " --save-historic={$saveHistoric}";
                 $commands[] = "*/{$timeOnuStats} * * * * {$pathConsole} {$mark}:onu:stats {$params}";

src/StatsBundle/Command/GenerateRemoteCrontabCommand.php

@@ -128,6 +128,7 @@ class GenerateRemoteCrontabCommand extends ContainerAwareCommand
 
                 $commands[] = "*/{$timeScan} * * * * {$pathConsole} {$amqpRemote} {$routing_key} {$mark}:pon:scan {$params}";
                 $commands[] = "*/{$timeScan} * * * * {$pathConsole} {$amqpRemote} {$routing_key} {$mark}:onu:scan {$params}";
+                $commands[] = "*/{$timeScan} * * * * {$pathConsole} {$amqpRemote} {$routing_key} {$mark}:olt:scan {$params}";
                 
                 if ($amqp) {
                     $params .= " --args=--save-historic:{$saveHistoric}";

src/StatsBundle/Controller/OltReportController.php

@@ -78,6 +78,16 @@ class OltReportController extends Controller
         $em = $this->get('doctrine')->getManager();
         $device = $em->getRepository('StatsBundle:Device')->findOneBy($filter);
 
+        $subName = "d_{$oltDeviceId}_s_{$oltServerId}";
+        $redis = $this->get('redis');
+        $key = "olt_scan_card_{$subName}";
+    
+        $dataCached = $redis->get($key);
+
+        $cpu = $memory = array();
+        if(isset($dataCached['cpu'])) {$cpu = $dataCached['cpu'];}
+        if(isset($dataCached['memory'])) {$memory = $dataCached['memory'];}
+
         $data = $device->jsonExtraData();
         $load = "75";
         $ramMax = 1024;
@@ -88,7 +98,9 @@ class OltReportController extends Controller
             'load' => $load,
             'ramMax' => $ramMax,
             'ram' => $ram,
-            'device' => $device
+            'device' => $device,
+            'cpu'  => $cpu,
+            'memory' => $memory
         ));
     }
 

src/StatsBundle/Resources/views/Device/Report/oltInformation.html.twig

@@ -36,37 +36,42 @@
         </table>
         <br />
         <div class="col-md-12 col-sm-12 col-xs-12">
+            <h4 class="box-title">CPU / Memory CARDS (%)</h4>
             <div class="info-box bg-yellow">
-                <span class="info-box-icon">
-                    <img src="{{ asset('bundles/stats/images/Iconsmind-Outline-CPU.ico') }}" style="width: 75%; margin-bottom: 7px;">
-                </span>
-
-                <div class="info-box-content">
-                    <span class="info-box-text">CPU</span>
-                    <span class="info-box-number">60 %</span>
-
-                    <div class="progress"  style="height:3px">
-                        <div class="progress-bar" style="width: 60%"></div>
+                <div class="info-box-content" style="margin-left:0px">
+                    <span class="info-box-text" style="margin-left:2px">CPU</span>
+                    <div style="width:100%">
+                        {% if cpu|length > 0 %}
+                            {% for index, value in cpu %}
+                                {% set percent = value|number_format(2, '.') %}
+                                <div class="cpu_card" style="float:left" title="CARD {{index}} cpu load {{percent}} %">
+                                    {{index}} : {{ percent }}
+                                </div>
+                            {% endfor %}
+                        {% else %}
+                            <span class="progress-description">N/D</span>
+                        {% endif %}
                     </div>
-                    <span class="progress-description">cpu load</span>
                 </div>
             </div>
         </div>
         
         <div class="col-md-12 col-sm-12 col-xs-12">
             <div class="info-box bg-yellow">
-                <span class="info-box-icon">
-                    <img src="{{ asset('bundles/stats/images/Iconsmind-Outline-Ram.ico') }}" style="width: 75%; margin-bottom: 7px;">
-                </span>
-
-                <div class="info-box-content">
-                    <span class="info-box-text">MEMORY</span>
-                    <span class="info-box-number">25 %</span>
-
-                    <div class="progress" style="height:3px">
-                        <div class="progress-bar" style="width: 20%"></div>
+                <div class="info-box-content" style="margin-left:0px">
+                    <span class="info-box-text" style="margin-left:2px">MEMORY</span>
+                    <div style="width:100%">
+                        {% if memory|length > 0 %}
+                            {% for index, value in memory %}
+                                {% set percent = value|number_format(2, '.') %}
+                                <div class="cpu_card" style="float:left" title="CARD {{index}} memory load {{percent}} %">
+                                    {{index}} : {{ percent }}
+                                </div>
+                            {% endfor %}
+                        {% else %}
+                            <span class="progress-description">N/D</span>
+                        {% endif %}
                     </div>
-                    <span class="progress-description">memory load 512 / 2048</span>
                 </div>
             </div>
         </div>

src/StatsBundle/Resources/views/Device/report.html.twig

@@ -3,6 +3,15 @@
 {% block stylesheets %}
 {{ parent() }}
 <link rel="stylesheet" href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css">
+<style>
+
+.cpu_card {
+    border: 1px solid rgba(0,0,0,0.2);
+    float: left;
+    margin: 2px;
+    padding: 2px;
+}
+</style>
 {% endblock %}
 
 {% block javascripts %}