Merge branch 'master' of https://bitbucket.org/ikflowdat/stats into FD3-236

Se actualiza branch.

Dockerfile

@@ -22,13 +22,13 @@ RUN cp -r keys /opt/keys/
 RUN chmod 0600 /opt/keys/*
 
 RUN eval $(ssh-agent) ; ssh-add /opt/keys/bitbucket.id_rsa ; composer install --no-scripts --no-interaction 
-
+RUN cp app/config/parameters.yml.docker app/config/parameters.yml ;\
+    cp app/config/bundles/hwi/oauth-bundle/parameters.yml.docker app/config/bundles/hwi/oauth-bundle/parameters.yml ;\
+    cp app/config/bundles/ik/webservice-bundle/parameters.yml.docker app/config/bundles/ik/webservice-bundle/parameters.yml ;\
+    cp app/config/bundles/ik/base-admin-bundle/parameters.yml.dist app/config/bundles/ik/base-admin-bundle/parameters.yml 
+ 
 CMD  eval $(ssh-agent) ; ssh-add /opt/keys/bitbucket.id_rsa ; composer install --no-scripts --no-interaction ;\
      rm var/cache/* -rf ;\
-     cp app/config/parameters.yml.docker app/config/parameters.yml ;\
-     cp app/config/bundles/hwi/oauth-bundle/parameters.yml.docker app/config/bundles/hwi/oauth-bundle/parameters.yml ;\
-     cp app/config/bundles/ik/webservice-bundle/parameters.yml.docker app/config/bundles/ik/webservice-bundle/parameters.yml ;\
-     cp app/config/bundles/ik/base-admin-bundle/parameters.yml.dist app/config/bundles/ik/base-admin-bundle/parameters.yml ;\
      composer dump-autoload ;\
      composer run-script post-install-cmd --no-interaction ;\
      bin/console server:run 0.0.0.0

app/config/config.yml

@@ -2,7 +2,7 @@ imports:
     - { resource: parameters.yml }
     - { resource: security.yml }
     - { resource: services.yml }
-    
+
     - { resource: "bundles/friendsofsymfony/rest-bundle/config.yml" }
     - { resource: "bundles/ik/webservice-bundle/parameters.yml" }
     - { resource: "bundles/ik/base-admin-bundle/parameters.yml" }
@@ -15,7 +15,7 @@ imports:
     - { resource: "@OwnerVoterBundle/Resources/config/services.yml" }
     - { resource: "@RedisBundle/Resources/config/services.yml" }
     - { resource: "@StatsDBundle/Resources/config/services.yml" }
-   
+
     - { resource: "@StatsBundle/Resources/config/services.yml" }
     - { resource: '@BaseAdminBundle/Resources/config/services.yml' }
     - { resource: '@GeoserverBundle/Resources/config/services.yml' }
@@ -107,3 +107,4 @@ sonata_admin:
     templates:
         layout: BaseAdminBundle::standard_layout.html.twig
         user_block: BaseOAuthClientBundle:Core:oauth_user_block.html.twig
+    persist_filters: true

app/config/parameters.yml.dist

@@ -50,6 +50,12 @@ parameters:
     cookie_domain_client: '%env(CLIENT)%'
     cookie_domain: '%cookie_domain_client%.fd3.flowdat.com'
     session_names: [flowdat_base_session, flowdat_ftth_session, flowdat_mapas_session, flowdat_stats_session, flowdat_radius_session, flowdat_cablemodem_session]
-    env(REDIS_HOST): "127.0.0.1"
-    redis.connection : "tcp://%env(REDIS_HOST)%:6379"
+    env(REDIS_HOST): "127.0.0.1" #Hay que borrar y usar HOST_REDIS
+    env(HOST_REDIS): "127.0.0.1"
+    redis.connection : "tcp://%env(HOST_REDIS)%:6379"
 
+    env(HOST_STATSD): '127.0.0.1'
+    statsd:
+      host: %env(HOST_STATSD)%
+      port: 8125
+    endpoint.mysql.connection: 'http://%env(HOST_STATSD)%:9004'

app/config/parameters.yml.docker

@@ -50,5 +50,11 @@ parameters:
     cookie_domain_client: '%env(CLIENT)%'
     cookie_domain: '%cookie_domain_client%.flowdat.com'
     session_names: [flowdat_base_session, flowdat_ftth_session, flowdat_mapas_session, flowdat_stats_session, flowdat_radius_session, flowdat_cablemodem_session]
-    env(REDIS_HOST): "127.0.0.1"
-    redis.connection : "tcp://%env(REDIS_HOST)%:6379" 
+    env(REDIS_HOST): "127.0.0.1" #Hay que borrar y usar HOST_REDIS
+    env(HOST_REDIS): "127.0.0.1"
+    redis.connection : "tcp://%env(HOST_REDIS)%:6379"
+    env(HOST_STATSD): '127.0.0.1'
+    statsd:
+      host: %env(HOST_STATSD)%
+      port: 8125
+    endpoint.mysql.connection: 'http://%env(HOST_STATSD)%:9004'

composer.lock

@@ -1226,7 +1226,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/hwi/HWIOAuthBundle/zipball/50f4bcbe5c217cfdf0f7f40a174b87199b76d1e1",
                 "reference": "50f4bcbe5c217cfdf0f7f40a174b87199b76d1e1",
-                "shasum": ""
+                "shasum": "b6918d1815cc36aff59cf0d12764bb0324ff1549"
             },
             "require": {
                 "kriswallsmith/buzz": "~0.13",
@@ -1386,7 +1386,7 @@
                 "audit",
                 "bundle"
             ],
-            "time": "2017-06-27 13:16:34"
+            "time": "2017-06-27T13:16:34+00:00"
         },
         {
             "name": "ik/auth-bundle",
@@ -1409,7 +1409,7 @@
                 "auth",
                 "bundle"
             ],
-            "time": "2017-09-22 13:27:29"
+            "time": "2017-09-22T13:27:29+00:00"
         },
         {
             "name": "ik/base-admin-bundle",
@@ -1432,7 +1432,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2017-11-10 15:00:33"
+            "time": "2017-11-10T15:00:33+00:00"
         },
         {
             "name": "ik/device-bundle",
@@ -1455,7 +1455,7 @@
                 "bundle",
                 "validators"
             ],
-            "time": "2017-10-27 15:31:53"
+            "time": "2017-10-27T15:31:53+00:00"
         },
         {
             "name": "ik/extra-data-bundle",
@@ -1463,7 +1463,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/ExtraDataBundle.git",
-                "reference": "ee88668fdb817efddc85ea363604ccff41227b36"
+                "reference": "6b761c9b29e7663eeb3a06217ff4d6063002e543"
             },
             "type": "library",
             "autoload": {
@@ -1478,7 +1478,7 @@
                 "bundle",
                 "extra-data"
             ],
-            "time": "2017-09-26 14:16:42"
+            "time": "2017-11-09T12:57:50+00:00"
         },
         {
             "name": "ik/leaflet-bundle",
@@ -1499,7 +1499,7 @@
                 }
             },
             "description": "The Flowdat3 Leaflet Resource",
-            "time": "2017-10-18 17:36:55"
+            "time": "2017-10-18T17:36:55+00:00"
         },
         {
             "name": "ik/migrations-bundle",
@@ -1522,7 +1522,7 @@
                 "bundle",
                 "migrations"
             ],
-            "time": "2017-08-31 11:49:28"
+            "time": "2017-08-31T11:49:28+00:00"
         },
         {
             "name": "ik/oauthclient-bundle",
@@ -1549,7 +1549,7 @@
                 "bundle",
                 "oauth"
             ],
-            "time": "2017-10-11 14:15:38"
+            "time": "2017-10-11T14:15:38+00:00"
         },
         {
             "name": "ik/owner-voter-bundle",
@@ -1572,7 +1572,7 @@
                 "bundle",
                 "owner-voter"
             ],
-            "time": "2017-06-12 15:49:24"
+            "time": "2017-06-12T15:49:24+00:00"
         },
         {
             "name": "ik/redis-bundle",
@@ -1596,7 +1596,7 @@
                 "php-redis-service",
                 "redis"
             ],
-            "time": "2017-10-31 18:49:03"
+            "time": "2017-10-31T18:49:03+00:00"
         },
         {
             "name": "ik/stats/base-stats-bundle",
@@ -1617,7 +1617,7 @@
                 "BaseStatsBundle",
                 "Flowdat 3"
             ],
-            "time": "2017-11-03 16:46:15"
+            "time": "2017-11-03T16:46:15+00:00"
         },
         {
             "name": "ik/stats/fiberhome-bundle",
@@ -1638,7 +1638,7 @@
                 "Fiberhome",
                 "Flowdat 3"
             ],
-            "time": "2017-11-03 12:34:56"
+            "time": "2017-11-03T12:34:56+00:00"
         },
         {
             "name": "ik/stats/fiberlink-bundle",
@@ -1659,7 +1659,7 @@
                 "Fiberlink",
                 "Flowdat 3"
             ],
-            "time": "2017-11-02 17:54:00"
+            "time": "2017-11-02T17:54:00+00:00"
         },
         {
             "name": "ik/stats/geoserver-bundle",
@@ -1680,7 +1680,7 @@
                 "Flowdat 3",
                 "Geoserver"
             ],
-            "time": "2017-08-29 15:11:22"
+            "time": "2017-08-29T15:11:22+00:00"
         },
         {
             "name": "ik/stats/huawei-bundle",
@@ -1701,7 +1701,7 @@
                 "Flowdat 3",
                 "Huawei"
             ],
-            "time": "2017-11-03 13:27:49"
+            "time": "2017-11-03T13:27:49+00:00"
         },
         {
             "name": "ik/statsd-bundle",
@@ -1709,7 +1709,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/StatsDBundle.git",
-                "reference": "6d988fa97216c6572c5f830c97ef42253d41a744"
+                "reference": "565e502b015186fc8fd94e4b6f882720dd78944c"
             },
             "type": "library",
             "autoload": {
@@ -1722,7 +1722,7 @@
                 "stats",
                 "statsd"
             ],
-            "time": "2017-07-25 18:45:31"
+            "time": "2017-11-13T12:27:49+00:00"
         },
         {
             "name": "ik/webservice-bundle",
@@ -1743,7 +1743,7 @@
                 }
             },
             "description": "The Flowdat3 Webservice Rest",
-            "time": "2017-11-01 14:48:55"
+            "time": "2017-11-01T14:48:55+00:00"
         },
         {
             "name": "ik/workflow-bundle",
@@ -1751,7 +1751,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/WorkflowBundle.git",
-                "reference": "87b32b6f42688cf32fa584136b95438459a7413c"
+                "reference": "dc130dd1b6bd8f609ade3b324798c70e20c5a977"
             },
             "require": {
                 "php-amqplib/rabbitmq-bundle": "^1.12"
@@ -1781,7 +1781,7 @@
                 "bundle",
                 "workflow"
             ],
-            "time": "2017-11-06 15:30:43"
+            "time": "2017-11-09T15:34:00+00:00"
         },
         {
             "name": "incenteev/composer-parameter-handler",
@@ -1795,7 +1795,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/Incenteev/ParameterHandler/zipball/d7ce7f06136109e81d1cb9d57066c4d4a99cf1cc",
                 "reference": "d7ce7f06136109e81d1cb9d57066c4d4a99cf1cc",
-                "shasum": ""
+                "shasum": "78accafc69077c94e2b5c40dcac6a23149e62a2d"
             },
             "require": {
                 "php": ">=5.3.3",
@@ -1940,7 +1940,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/schmittjoh/parser-lib/zipball/c509473bc1b4866415627af0e1c6cc8ac97fa51d",
                 "reference": "c509473bc1b4866415627af0e1c6cc8ac97fa51d",
-                "shasum": ""
+                "shasum": "2ea232ddbcd3fb65004c7454244af057fb422817"
             },
             "require": {
                 "phpoption/phpoption": ">=0.9,<2.0-dev"
@@ -2539,7 +2539,7 @@
                 "oss_snmp",
                 "snmp"
             ],
-            "time": "2017-10-31 14:22:45"
+            "time": "2017-10-31T14:22:45+00:00"
         },
         {
             "name": "paragonie/random_compat",
@@ -3431,7 +3431,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2017-10-04 12:16:04"
+            "time": "2017-10-04T12:16:04+00:00"
         },
         {
             "name": "sonata-project/block-bundle",
@@ -3860,7 +3860,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/stof/StofDoctrineExtensionsBundle/zipball/4e7499d25dc5d0862da09fa8e336164948a29a25",
                 "reference": "4e7499d25dc5d0862da09fa8e336164948a29a25",
-                "shasum": ""
+                "shasum": "5f6b05de8625fea312c1ae92066580864eea07d5"
             },
             "require": {
                 "gedmo/doctrine-extensions": "^2.3.1",
@@ -4436,7 +4436,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/symfony/security-acl/zipball/053b49bf4aa333a392c83296855989bcf88ddad1",
                 "reference": "053b49bf4aa333a392c83296855989bcf88ddad1",
-                "shasum": ""
+                "shasum": "9562593da89cd1ab1a2d69962cc0d933cea99714"
             },
             "require": {
                 "php": ">=5.5.9",
@@ -4826,7 +4826,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/voryx/restgeneratorbundle/zipball/72b61d2188662da453d2e2a9cd625a60b6f3233b",
                 "reference": "72b61d2188662da453d2e2a9cd625a60b6f3233b",
-                "shasum": ""
+                "shasum": "5ca3bc614a05b341c7857876407dc54e73dcde0c"
             },
             "require": {
                 "friendsofsymfony/rest-bundle": "~1.7",
@@ -4859,7 +4859,7 @@
                 }
             ],
             "description": "REST API Generator for Symfony 2",
-            "time": "2016-04-18 12:29:38"
+            "time": "2016-04-18T12:29:38+00:00"
         },
         {
             "name": "willdurand/jsonp-callback-validator",
@@ -6185,7 +6185,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
                 "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
-                "shasum": ""
+                "shasum": "248cd12206b575057bf0b19f306d92a2f818dfb1"
             },
             "require": {
                 "php": ">=5.6.0"
@@ -6440,7 +6440,7 @@
         "voryx/restgeneratorbundle": 20
     },
     "prefer-stable": false,
-    "prefer-lowest": false,
+    "prefer-lowest": true,
     "platform": {
         "php": ">=5.5.9"
     },

src/StatsBundle/Command/GenerateCrontabCommand.php

@@ -46,7 +46,7 @@ class GenerateCrontabCommand extends ContainerAwareCommand
         if(is_null($pathApp)) {
             $pathApp = $this->getContainer()->getParameter('app_path');
         }
-        $pathConsole = "root $(wich php) {$pathApp}/bin/console"; 
+        $pathConsole = "root $(which php) {$pathApp}/bin/console"; 
         
         $serverDevices = $doctrine->getRepository('\StatsBundle\Entity\DeviceServer')->findAll();
         

src/StatsBundle/Command/GenerateRemoteCrontabCommand.php

@@ -56,7 +56,7 @@ class GenerateRemoteCrontabCommand extends ContainerAwareCommand
         if (is_null($pathApp)) {
             $pathApp = $this->getContainer()->getParameter('app_path');
         }
-        $pathConsole = "root $(wich php) {$pathApp}/bin/console";
+        $pathConsole = "root $(which php) {$pathApp}/bin/console";
 
         $serverDevices = $doctrine->getRepository('\StatsBundle\Entity\DeviceServer')->findAll();
 

src/StatsBundle/Command/RedisCommand.php

@@ -4,18 +4,22 @@ namespace StatsBundle\Command;
 
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use RedisBundle\Services\RedisService;
 
-class RedisCommand extends ContainerAwareCommand
+class RedisCommand extends BaseCommand
 {
 
     protected function configure()
     {
         $this
-                ->setName('redis:test')
-                ->setDescription('Test Redis')
+                ->setName('redis:read')
+                ->setDescription('Read Redis data')
                 ->setHelp('This command allows test redis')
+                ->setDefinition(array(
+                    new InputOption('key', null, InputOption::VALUE_OPTIONAL, "Key redis", null)
+                ))
         ;
     }
 
@@ -25,17 +29,26 @@ class RedisCommand extends ContainerAwareCommand
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        /* @var $statsDeviceManager DeviceManager */
-        $redis = $this->getContainer()->get('redis');
+        parent::execute($input, $output);
         
-        //$parameters = ['tcp://127.0.0.1:6379'];
+        $key = $input->getOption('key');
 
-        //$redis->setOptions($options);
-        //$redis->setConnection($parameters);
+        if(is_null($key)) {
+            $this->output->writeln("key es nulo.");
+            return true;
+        }
 
-        $value = $redis->getString('clave',true);
-
-        $output->writeln($value);
+        $data = $this->getData($key, true);
+        
+        if(empty($data)) {
+            $this->output->writeln("Se requiere {$key}.");
+            return true;
+        }
+
+        print_r(PHP_EOL."######################".PHP_EOL);
+        print_r($data);
+        print_r(PHP_EOL."######################".PHP_EOL);
+        
         
     }
 

src/StatsBundle/Controller/OltReportController.php

@@ -47,23 +47,49 @@ class OltReportController extends Controller
             ->groupBy('o.status')
             ->getQuery()->getScalarResult();
         
+        $percent_online = $online = $offline = 0;    
         foreach($count as $c) {
-            $status = "Offline";
-            $color = "#F82929";
             if($c['status']) {
                 $status = "Online";
                 $color = "#53D356";
+                $online = $c[1];
+            } else {
+                $status = "Offline";
+                $color = "#F82929";
+                $offline = $c[1];
             }
+            
             $onuStateCount[$status] = array('count' => $c[1], 'color' => $color);
-            //$onuStateCount[$status] = $c[1];
         }
 
-        //print_r($onuStateCount);die;
+        if($offline != 0 || $online != 0) {
+            $percent_online = ($online / ($offline + $online)) * 100;
+        }
 
         return $this->render('StatsBundle:Device:Report/onuStateCount.html.twig', array(
-            'onuStateCount' => $onuStateCount
+            'onuStateCount' => $onuStateCount,
+            'percent_online'=> $percent_online
         ));
+    }
+
+    public function oltInformationAction($oltServerId, $oltDeviceId) {
         
+        $filter = array('deviceId' => $oltDeviceId, 'deviceServer' => $oltServerId, 'deviceType' => 'FTTHBundle\Entity\OLT');
+        $em = $this->get('doctrine')->getManager();
+        $device = $em->getRepository('StatsBundle:Device')->findOneBy($filter);
+
+        $data = $device->jsonExtraData();
+        $load = "75";
+        $ramMax = 1024;
+        $ram = 500;
+
+        return $this->render('StatsBundle:Device:Report/oltInformation.html.twig', array(
+            'data' => $data,
+            'load' => $load,
+            'ramMax' => $ramMax,
+            'ram' => $ram,
+            'device' => $device
+        ));
     }
     
 }

src/StatsBundle/Resources/translations/StatsBundle.es.yml

@@ -128,4 +128,6 @@ action_olt_show_ponport: PonPorts
 onu_count_title: Cantidad de ONUs
 onu_state: Estado
 onu_state_count: Cantidad
-onu_total_count: Total
+onu_total_count: Total
+yes: Si
+no: No

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

@@ -0,0 +1,75 @@
+<div class="box box-widget">
+    <div class="box-header">
+        <h4 class="box-title">{{ data.name }}</h4>
+        <div class="box-tools pull-right">
+            <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
+        </div>
+    </div>
+    <div class="box-body">
+        <table class="table table-hover table-condensed table-striped table-bordered">
+            <tbody>
+                <tr>
+                    <td>{{ 'list.label_ip'|trans({}, 'StatsBundle') }}</td>
+                    <td>{{ device.getIp() }}</td>
+                </tr>
+                <tr>
+                    <td>{{ 'list.label_olt_mark'|trans({}, 'StatsBundle') }}</td>
+                    <td>{{ data.mark }}</td>
+                </tr>
+                <tr>
+                    <td>{{ 'list.label_olt_library'|trans({}, 'StatsBundle') }}</td>
+                    <td>{{ data.library }}</td>
+                </tr>
+                <tr>
+                    <td>{{ 'list.label_olt_executeSnmp'|trans({}, 'StatsBundle') }}</td>
+                    <td>
+                        {% if data.executeSnmp %}
+                          <i class="fa fa-check" style="color:#53D356"></i>
+                            {{ 'yes'|trans({}, 'StatsBundle') }}
+                        {% else %}
+                          <i class="fa fa-times" style="color:#F82929"></i>
+                            {{ 'no'|trans({}, 'StatsBundle') }}
+                        {% endif %}
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+        <br />
+        <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-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>
+                    <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>
+                    <span class="progress-description">memory load 512 / 2048</span>
+                </div>
+            </div>
+        </div>
+        
+    </div>
+</div>

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

@@ -60,6 +60,10 @@
         options: {
             legend: {
                 display: false
+            },
+            title: {
+                display: true,
+                text: '{{ percent_online|number_format(1, '.', '') }}% ONLINE'
             }
         }
     });

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

@@ -9,25 +9,20 @@
 
 {% block content %}
     <div class="box box-primary">
-        <div class="box-header">
+        <br />
+        {# <div class="box-header">
             <h3 class="box-title">{{ data['name'] }}</h3>
-        </div>
+        </div> #}
         <div class="box-body">
             <div class="col-sm-4">
-                {{ render_hinclude(controller("StatsBundle:OltReport:onuStateCount", {'oltServerId': device.getDeviceServer.getId(), 'oltDeviceId': device.getDeviceId()}),
+                {{ render_hinclude(controller("StatsBundle:OltReport:oltInformation", {'oltServerId': device.getDeviceServer.getId(), 'oltDeviceId': device.getDeviceId()}),
                     {'default':  include("@Stats/Device/Report/default.html.twig")})
                 }}
             </div>
             <div class="col-sm-4">
-
-                {# {{ render_hinclude(controller("MapBundle:MapReport:linkObjectsLength", {'mapId': map.id}),
-                    {'default':  include('@Map/Map/Report/default.html.twig')})
+                {{ render_hinclude(controller("StatsBundle:OltReport:onuStateCount", {'oltServerId': device.getDeviceServer.getId(), 'oltDeviceId': device.getDeviceId()}),
+                    {'default':  include("@Stats/Device/Report/default.html.twig")})
                 }}
-
-                {{ render_hinclude(controller("MapBundle:MapReport:spliceClosureObjectsCount", {'mapId': map.id}),
-                    {'default':  include('@Map/Map/Report/default.html.twig')})
-                }} #}
-
             </div>
             <div class="col-sm-4">