Merge branch 'GHOST-724-error-500-on-health-status-page' into 'master'

GHOST-724: catch exception if NIC status is unavailable

Closes GHOST-724

See merge request claranet/cloudnative/projects/ghost/flask-ui!1

Author: Shr3ps

health.py

@@ -3,6 +3,7 @@
 """Library to easily manage Host Health"""
 
 from __future__ import division
+import logging
 import psutil
 import threading
 import time
@@ -70,10 +71,13 @@ def get_host_health(cpu_percent, cpu_percent_details):
 
     status['boot_time'] = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(psutil.boot_time()))
 
-    status['network_stats'] = psutil.net_if_stats()
-    for (key, item) in status['network_stats'].items():
-        status['network_stats'][key] = status['network_stats'][key]._replace(duplex=duplex_map[item.duplex])
-    status['network_io'] = psutil.net_io_counters(pernic=True)
+    try:
+        status['network_stats'] = psutil.net_if_stats()
+        for (key, item) in status['network_stats'].items():
+            status['network_stats'][key] = status['network_stats'][key]._replace(duplex=duplex_map[item.duplex])
+        status['network_io'] = psutil.net_io_counters(pernic=True)
+    except OSError as err:
+        logging.error("Error while reading NIC status: {}}".format(err))
 
     return status
 

templates/ghost_health_status_content.html

@@ -38,15 +38,19 @@ <h4><i class="fa fa-clock-o"></i> Boot date</h4>
     <br />
     <h4><i class="fa fa-wifi"></i> Network</h4>
     <div class="health-network-wrap">
-    {% for nic in status['network_io'] %}
-        {% if nic != 'lo' %}
-        {% set nic_stats = status.network_stats[nic] %}
-        <p class="health-info">stats: speed={{ nic_stats.speed}}MB, duplex={{ nic_stats.duplex}}, mtu={{ nic_stats.mtu}}, up={{ "yes" if nic_stats.isup else "no" }}</p>
-        {% set nic_io = status.network_io[nic] %}
-        <p class="health-info">incoming: bytes={{ nic_io.bytes_recv }}, pkts={{ nic_io.packets_recv }}, err={{ nic_io.errin }}, drops={{ nic_io.dropin }}</p>
-        <p class="health-info">outgoing: bytes={{ nic_io.bytes_sent }}, pkts={{ nic_io.packets_sent }}, err={{ nic_io.errout }}, drops={{ nic_io.dropout }}</p>
-        {% endif %}
-    {% endfor %}
+    {% if not 'network_io' in status %}
+        <p class="health-info">N/A</p>
+    {% else %}
+        {% for nic in status['network_io'] %}
+            {% if nic != 'lo' %}
+            {% set nic_stats = status.network_stats[nic] %}
+            <p class="health-info">stats: speed={{ nic_stats.speed}}MB, duplex={{ nic_stats.duplex}}, mtu={{ nic_stats.mtu}}, up={{ "yes" if nic_stats.isup else "no" }}</p>
+            {% set nic_io = status.network_io[nic] %}
+            <p class="health-info">incoming: bytes={{ nic_io.bytes_recv }}, pkts={{ nic_io.packets_recv }}, err={{ nic_io.errin }}, drops={{ nic_io.dropin }}</p>
+            <p class="health-info">outgoing: bytes={{ nic_io.bytes_sent }}, pkts={{ nic_io.packets_sent }}, err={{ nic_io.errout }}, drops={{ nic_io.dropout }}</p>
+            {% endif %}
+        {% endfor %}
+    {% endif %}
     </div>
 </div>