Enable specific network interfaces, fix encoding in processes

NIXStats · Jun 6, 2018 · 5a785b8 · 5a785b8
1 parent 884d6a6
commit 5a785b8
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 6 deletions.
diff --git a/nixstatsagent/plugins/network.py b/nixstatsagent/plugins/network.py
@@ -7,8 +7,28 @@
 class Plugin(plugins.BasePlugin):
     __name__ = 'network'
 
-    def run(self, *unused):
-        return psutil.net_io_counters(pernic=True)
+    def run(self, config):
+        '''
+        Network monitoring plugin.
+        To only enable certain interfaces add below [network]:
+        interfaces = eth1,eth3,...
+        '''
+
+        try:
+            enabled_interfaces = config.get('network', 'interfaces').split(',')
+        except:
+            enabled_interfaces = False
+
+        if enabled_interfaces is False:
+            return psutil.net_io_counters(pernic=True)
+        else:
+	    returndata = {}
+	    interfaces = psutil.net_io_counters(pernic=True)
+            for interface in interfaces:
+		if interface in enabled_interfaces:
+		    returndata[interface] = interfaces[interface]
+            return returndata
+        return None
 
 
 if __name__ == '__main__':

diff --git a/nixstatsagent/plugins/process.py b/nixstatsagent/plugins/process.py
@@ -15,14 +15,22 @@ def run(self, *unused):
                     'pid', 'name', 'ppid', 'exe', 'cmdline', 'username',
                     'cpu_percent', 'memory_percent', 'io_counters'
                 ])
-                pinfo['name'].encode('utf-8')
-                if sys.platform != 'win32':
-                    pinfo['username'].encode('utf-8')
-                    pinfo['cmdline'] = ' '.join(pinfo['cmdline']).encode('utf-8').strip()
+
+                try:
+                    pinfo['cmdline'] = ' '.join(pinfo['cmdline']).strip()
+                except:
+                    pass
+                pinfo['cmdline'] = unicode(pinfo['cmdline'], sys.getdefaultencoding(), errors="replace").strip()
+                pinfo['name'] = unicode(pinfo['name'], sys.getdefaultencoding(), errors="replace")
+                pinfo['username'] = unicode(pinfo['username'], sys.getdefaultencoding(), errors="replace")
+                pinfo['exe'] = unicode(pinfo['exe'], sys.getdefaultencoding(), errors="replace")
+
             except psutil.NoSuchProcess:
                 pass
             except psutil.AccessDenied:
                 pass
+            except:
+                pass
             else:
                 process.append(pinfo)
         return process

diff --git a/nixstatsagent/plugins/temp.py b/nixstatsagent/plugins/temp.py
@@ -13,6 +13,20 @@ def run(self, *unused):
         '''
         data = {}
 
+        if sys.platform == "win32":
+            try:
+                import wmi
+            except:
+                return 'wmi module not installed.'
+            try:
+                w = wmi.WMI(namespace="root\OpenHardwareMonitor")
+                temperature_infos = w.Sensor()
+                for sensor in temperature_infos:
+                    if sensor.SensorType==u'Temperature':
+                        data[sensor.Parent.replace('/','-').strip('-')] = sensor.Value
+                return data
+            except:
+                return 'Could not fetch temperature data from OpenHardwareMonitor.'
         if not hasattr(psutil, "sensors_temperatures"):
             return "platform not supported"