Переглянути джерело

Se actualiza para utilizar endpoints Simplejson hacia Mongo.

Maxi Schvindt 7 роки тому
батько
коміт
5961a52639

+ 1 - 1
app/config/parameters.yml.dist

@@ -63,7 +63,7 @@ parameters:
     statsd:
       host: %env(HOST_STATSD)%
       port: 8125
-    endpoint.mysql.connection: 'http://%env(HOST_STATSD)%:9004'
+    endpoint.mysql.connection: 'http://jsonep_mongo:8000'
     
     # App Dummy URL
     env(HOST_DUMMY): www.flowdat.com

+ 1 - 1
app/config/parameters.yml.docker

@@ -66,4 +66,4 @@ parameters:
     statsd:
       host: %env(HOST_STATSD)%
       port: 8125
-    endpoint.mysql.connection: 'http://%env(HOST_STATSD)%:9004'
+    endpoint.mysql.connection: 'http://jsonep_mongo:8000'

+ 8 - 8
src/StatsBundle/Controller/CmtsReportController.php

@@ -104,15 +104,15 @@ class CmtsReportController extends Controller
     public function cmtsCommandsAction($cmtsServerId, $cmtsDeviceId, $mark) {
 
         $mark = strtolower($mark);
-        $subName = "d_{$cmtsDeviceId}_s_{$cmtsServerId}_cmd_cmts";
+        $subName = "d_{$cmtsDeviceId}_s_{$cmtsServerId}";
 
         $result = $targets = array();
         $endpoint = $this->get('endpoint.mysql');
 
-        $targets["interface_stats"] = array("target" => "{$subName}_interface_stats");
-        $targets["cmts_octets"] = array("target" => "{$subName}_octets");
-        $targets["interface_scan"] = array("target" => "{$subName}_interface_scan");
-        $targets["cm_scan"] = array("target" => "{$subName}_cm_scan");
+        //$targets["interface_stats"] = array("target" => "{$subName}_interface_stats");
+        $targets["cmts_octets"] = array("target" => "{$subName}_snmp_cmtsOctets");
+        $targets["interface_scan"] = array("target" => "{$subName}_snmp_cmtsIf");
+        $targets["cm_scan"] = array("target" => "{$subName}_snmp_cmMac");
         $errors = array();
 
         foreach($targets as $index => $t) {
@@ -120,7 +120,7 @@ class CmtsReportController extends Controller
             try {
                 $data = $endpoint->get(json_encode($search),'last', true);
             } catch(\Exception $e) {
-                $errors[] = array("msg" => "Falla mysql_json_endpoint({$index}): {$e->getMessage()}");
+                $errors[] = array("msg" => "Falla mongo_json_endpoint({$index}): {$e->getMessage()}");
                 $data = array();
             }
 
@@ -155,7 +155,7 @@ class CmtsReportController extends Controller
             try {
                 $data = $endpoint->get(json_encode($search),'last', true);
             } catch(\Exception $e) {
-                $errors[] = array("msg" => "Falla mysql_json_endpoint({$index}): {$e->getMessage()}");
+                $errors[] = array("msg" => "Falla mongo_json_endpoint({$index}): {$e->getMessage()}");
                 $data = array();
             }
 
@@ -268,7 +268,7 @@ class CmtsReportController extends Controller
             try {
                 $data = $endpoint->get(json_encode($search),'last', true);
             } catch(\Exception $e) {
-                $errors[] = array("msg" => "Falla mysql_json_endpoint({$index}): {$e->getMessage()}");
+                $errors[] = array("msg" => "Falla mongo_json_endpoint({$index}): {$e->getMessage()}");
                 $data = array();
             }
 

+ 4 - 4
src/StatsBundle/Resources/views/Device/Report/cmtsCommands.html.twig

@@ -48,14 +48,14 @@
         {% if draw %}
         <div class="nav-tabs-custom">
             <ul class="nav nav-tabs">
-                <li class="active"><a href="#tab_1" data-toggle="tab">Interface Stats</a></li>
-                <li><a href="#tab_2" data-toggle="tab">CMTS Octets</a></li>
+                {# <li class="active"><a href="#tab_1" data-toggle="tab">Interface Stats</a></li> #}
+                <li class="active"><a href="#tab_2" data-toggle="tab">CMTS Octets</a></li>
                 <li><a href="#tab_3" data-toggle="tab">Interface Scan</a></li>
                 <li><a href="#tab_4" data-toggle="tab">Cm Scan</a></li>
             </ul>
             <div class="tab-content">
-                <div class="tab-pane active" id="tab_1"><canvas id="interface_stats"></canvas></div>
-                <div class="tab-pane" id="tab_2"><canvas id="cmts_octets"></canvas></div>
+                {# <div class="tab-pane active" id="tab_1"><canvas id="interface_stats"></canvas></div> #}
+                <div class="tab-pane active" id="tab_2"><canvas id="cmts_octets"></canvas></div>
                 <div class="tab-pane" id="tab_3"><canvas id="interface_scan"></canvas></div>
                 <div class="tab-pane" id="tab_4"><canvas id="cm_scan"></canvas></div>
             </div>