diff --git a/main/views.py b/main/views.py
index 9e4c088..b2dddad 100755
--- a/main/views.py
+++ b/main/views.py
@@ -20,7 +20,7 @@
#OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
#SOFTWARE.
-import socket, platform, os, multiprocessing, json
+import platform, os, multiprocessing, json
from datetime import timedelta
@@ -65,18 +65,6 @@ def get_uptime():
return data
-def get_hostname():
- """
- Get the hostname
- """
-
- try:
- data = socket.gethostname()
-
- except Exception,err:
- data = str(err)
-
- return data
def get_ipaddress():
"""
@@ -175,10 +163,13 @@ def get_traffic(request):
def get_platform():
"""
- Get the OS name
+ Get the OS name, hostname and kernel
"""
try:
- data = " ".join(platform.linux_distribution())
+ osname = " ".join(platform.linux_distribution())
+ uname = platform.uname()
+
+ data = {'osname': osname, 'hostname': uname[1], 'kernel': uname[2] }
except Exception,err:
data = str(err)
@@ -302,8 +293,9 @@ def get_load():
@login_required(login_url='/login/')
def getall(request):
- return render_to_response('main.html', {'gethostname': get_hostname(),
- 'getplatform': get_platform(),
+ return render_to_response('main.html', {'gethostname': get_platform()['hostname'],
+ 'getplatform': get_platform()['osname'],
+ 'getkernel': get_platform()['kernel'],
'getcpus': get_cpus(),
'time_refresh': time_refresh,
'time_refresh_long': time_refresh_long,
diff --git a/templates/main.html b/templates/main.html
index 9be9b94..29935e9 100644
--- a/templates/main.html
+++ b/templates/main.html
@@ -74,6 +74,7 @@
OS: {{ getplatform }}
Uptime: Hours
Hostname: {{ gethostname }}
+ Kernel: {{ getkernel }}
CPU(s): {{ getcpus.cpus }} x {{ getcpus.type }}
@@ -175,32 +176,32 @@