Update Device MAC Statistics

ChristianV1977 · Aug 8, 2018 · 4bac035 · 4bac035
1 parent 8b09755
commit 4bac035
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 6 deletions.
diff --git a/public/templates/dhcp_device_statistics_page.html b/public/templates/dhcp_device_statistics_page.html
@@ -81,7 +81,7 @@ <h2>MAC Address OUI Count by Vendor</h2>
 </div>
 
 <script type="text/javascript">
-    'use strict';
+
     $('.hide_me').hide();
 
     var chart_data = [];
@@ -98,7 +98,7 @@ <h2>MAC Address OUI Count by Vendor</h2>
         Morris.Donut({
             element: "device_chart",
             data: chart_data,
-            colors: ['rgb(233, 30, 99)', 'rgb(0, 188, 212)', 'rgb(255, 152, 0)', 'rgb(0, 150, 136)'],
+            colors: ['rgb(153, 0, 0)', 'rgb(253, 128, 0)', 'rgb(0, 51, 25)', 'rgb(0, 0, 51)'],
             formatter: function (y) {
                 return y.toLocaleString('en')
             }
@@ -139,7 +139,6 @@ <h2>MAC Address OUI Count by Vendor</h2>
         $('.hide_me').show();
     });
 
-
     $.getJSON("/api/get_dhcp_requests", function (data) {
         $.each(data, function (k, v) {
             $('#excessive_requests  > tbody:last-child').append('<tr>' +

diff --git a/routes/get_dhcp_requests.js b/routes/get_dhcp_requests.js
@@ -0,0 +1,18 @@
+var express = require('express');
+var router = express.Router();
+var fs = require('fs');
+
+router.get('/', function(req, res, next) {
+
+    var stat_data = global.dhcp_requests;
+
+    for (var key in stat_data) {
+        if(stat_data[key].request_count <= 10)
+            delete stat_data[key];
+    }
+
+    res.setHeader('Content-Type', 'application/json');
+    res.send(JSON.stringify(stat_data));
+});
+
+module.exports = router;
diff --git a/routes/get_mac_device_stats.js b/routes/get_mac_device_stats.js
@@ -13,7 +13,7 @@ router.get('/', function (req, res, next) {
 
     /* Fetch lease data for network*/
     var response_data = api_agent.fire_kea_api(lease_get_req_data, global.anterius_config.server_addr, global.anterius_config.server_port).then(function (api_data) {
-        // console.log(api_data);
+        console.log(api_data);
         return api_data;
     });
 
@@ -25,22 +25,24 @@ router.get('/', function (req, res, next) {
         }
         else {
             leases_data = data.arguments.leases;
-            // console.log(leases_data);
+            console.log(leases_data);
             var vendor_stats = {}, device_stats = {};
             var count = 0;
+            // console.log(global.oui_data);
 
             /* Leases Data parser - retrieve mac oui data */
             for (var i = 0; i < leases_data.length; i++) {
 
                 /* Mac OUI Lookup */
                 var mac_oui = leases_data[i]['hw-address'].split(":").join("").toUpperCase().slice(0, 6);
 
+                // console.log(mac_oui, global.oui_data[mac_oui]);
+
                 /* Vendor List and Device Count block*/
                 leases_data[i].mac_oui_vendor = '';
                 if (typeof global.oui_data[mac_oui] !== "undefined") {
                     leases_data[i].mac_oui_vendor = global.oui_data[mac_oui];
                 }
-
                 if ((typeof leases_data[i].mac_oui_vendor !== "undefined" ? leases_data[i].mac_oui_vendor : 'Misc') == "")
                     continue;
 
@@ -73,6 +75,7 @@ router.get('/', function (req, res, next) {
                 }
             }
 
+            // console.log(vendor_stats, device_stats);
             res.setHeader('Content-Type', 'application/json');
             res.send(JSON.stringify({ 'vendor_stats': vendor_stats, 'device_stats': device_stats }));
         }