From 02dd6510efcc9ec9f0936c44b8a453962a1a9177 Mon Sep 17 00:00:00 2001
From: MF Softworks <mfappsandweb@gmail.com>
Date: Fri, 15 Mar 2019 10:54:39 +0800
Subject: [PATCH] [script] implemented network interface cards info

---
 .vs/Server-Monitoring-Script/v15/.suo | Bin 0 -> 13824 bytes
 .vs/VSWorkspaceState.json             |   6 +++
 .vs/slnx.sqlite                       | Bin 0 -> 77824 bytes
 README.md                             |  19 +++++++-
 monitor.py                            |  61 +++++++++++++++++++-------
 5 files changed, 69 insertions(+), 17 deletions(-)
 create mode 100644 .vs/Server-Monitoring-Script/v15/.suo
 create mode 100644 .vs/VSWorkspaceState.json
 create mode 100644 .vs/slnx.sqlite

diff --git a/.vs/Server-Monitoring-Script/v15/.suo b/.vs/Server-Monitoring-Script/v15/.suo
new file mode 100644
index 0000000000000000000000000000000000000000..4e5fe3b5661a47e277d9be59a7471efc1e47352d
GIT binary patch
literal 13824
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
MUC(CU+TH*E3jmrSwEzGB

literal 0
HcmV?d00001

diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json
new file mode 100644
index 0000000..6b61141
--- /dev/null
+++ b/.vs/VSWorkspaceState.json
@@ -0,0 +1,6 @@
+{
+  "ExpandedNodes": [
+    ""
+  ],
+  "PreviewInSolutionExplorer": false
+}
\ No newline at end of file
diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite
new file mode 100644
index 0000000000000000000000000000000000000000..66b39f3d9f65fd044c0d3f916c2194eb9b1fe557
GIT binary patch
literal 77824
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

literal 0
HcmV?d00001

diff --git a/README.md b/README.md
index b015aca..bff2aaa 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,8 @@ The script will gather information:
 - Hostname
 - CPU
 - Memory
-- Network
+- Network Usage
+- Network Cards
 - Hard Drives
 - System OS
 - System Uptime
@@ -54,6 +55,22 @@ Example:
     ],
     "network_up": 54,
     "network_down": 4150,
+    "network_cards": [
+        {
+            "address": "127.0.0.1",
+            "address6": "::1",
+            "mac": "",
+            "name": "Loopback Pseudo-Interface 1",
+            "netmask": "255.0.0.0"
+        },
+        {
+            "address": "10.15.62.112",
+            "address6": "fe80::844d:a87:54ea:2100",
+            "mac": "1C-39-47-A6-4C-5E",
+            "name": "Ethernet",
+            "netmask": "255.255.0.0"
+        }
+    ],
     "timestamp" : "2018-10-10T01:41:21+00:00",
     "uuid" : 180331603484325
 }
diff --git a/monitor.py b/monitor.py
index 33def75..8caa394 100644
--- a/monitor.py
+++ b/monitor.py
@@ -22,23 +22,51 @@ def main():
     print("Disks:")
     disks = []
     for x in disk_info:
-        disk = {
-            "name" : x.device, 
-            "mount_point" : x.mountpoint, 
-            "type" : x.fstype, 
-            "total_size" : psutil.disk_usage(x.mountpoint).total, 
-            "used_size" : psutil.disk_usage(x.mountpoint).used, 
-            "percent_used" : psutil.disk_usage(x.mountpoint).percent
-        }
-
-        disks.append(disk)
-
-        print("\tDisk name",disk["name"], "\tMount Point:", disk["mount_point"], "\tType",disk["type"], "\tSize:", disk["total_size"] / 1e+9,"\tUsage:", disk["used_size"] / 1e+9, "\tPercent Used:", disk["percent_used"])
-
-    # Network Info 
+        # Try fixes issues with connected 'disk' such as CD-ROMS, Phones, etc.
+        try:
+            disk = {
+                "name" : x.device, 
+                "mount_point" : x.mountpoint, 
+                "type" : x.fstype, 
+                "total_size" : psutil.disk_usage(x.mountpoint).total, 
+                "used_size" : psutil.disk_usage(x.mountpoint).used, 
+                "percent_used" : psutil.disk_usage(x.mountpoint).percent
+            }
+
+            disks.append(disk)
+
+            print("\tDisk name",disk["name"], "\tMount Point:", disk["mount_point"], "\tType",disk["type"], "\tSize:", disk["total_size"] / 1e+9,"\tUsage:", disk["used_size"] / 1e+9, "\tPercent Used:", disk["percent_used"])
+        except:
+            print("")
+
+    # Bandwidth Info 
     network_stats = get_bandwidth()
     print("Network:\n\tTraffic in:",network_stats["traffic_in"] / 1e+6,"\n\tTraffic out:",network_stats["traffic_out"] / 1e+6)
 
+    # Network Info
+    nics = []
+    print("NICs:")
+    for name, snic_array in psutil.net_if_addrs().items():
+        # Create NIC object
+        nic = {
+            "name": name,
+            "mac": "",
+            "address": "",
+            "address6": "",
+            "netmask": ""
+        }
+        # Get NiC values
+        for snic in snic_array:
+            if snic.family == -1:
+                nic["mac"] = snic.address
+            elif snic.family == 2:
+                nic["address"] = snic.address
+                nic["netmask"] = snic.netmask
+            elif snic.family == 23:
+                nic["address6"] = snic.address
+        nics.append(nic)
+        print("\tNIC:",nic["name"], "\tMAC:", nic["mac"], "\tIPv4 Address:",nic["address"], "\tIPv4 Subnet:", nic["netmask"], "\tIPv6 Address:", nic["address6"])
+    
     # Platform Info
     system = {
         "name" : platform.system(),
@@ -68,6 +96,7 @@ def main():
     	"drives" : disks,
     	"network_up" : network_stats["traffic_out"],
     	"network_down" : network_stats["traffic_in"],
+        "network_cards": nics,
         "timestamp" : timestamp
     }
 
@@ -108,7 +137,7 @@ def send_data(data):
         try:
             # endpoint = monitoring server
             endpoint = "http://monitor.localhost.local/api/"
-            response = requests.post(url = endpoint, params = {"data" : data})
+            response = requests.post(url = endpoint, data = data)
             print("\nPOST:")
             print("Response:", response.status_code)
             print("Headers:")
@@ -122,7 +151,7 @@ def send_data(data):
                 print("No JSON content")
             break
         except requests.exceptions.RequestException as e:
-            print("\POST Error:\n",e)
+            print("\nPOST Error:\n",e)
             # Sleep 1 minute before retrying
             time.sleep(60)
     else: