From 2ff5b204e592e7b7d5c49c32c5574827e6a8d627 Mon Sep 17 00:00:00 2001 From: Florian N Date: Sun, 16 Feb 2014 16:24:44 -0500 Subject: [PATCH 1/6] Arch linux support --- main/views.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/main/views.py b/main/views.py index b2dddad..cf9ad72 100755 --- a/main/views.py +++ b/main/views.py @@ -142,7 +142,7 @@ def get_traffic(request): data = pipe.read().strip().split(':',1)[-1] pipe.close() - if data == ' 0': + if not data[0].isdigit(): pipe = os.popen("cat /proc/net/dev |" + "grep " + request + "| awk '{print $2, $10}'") data = pipe.read().strip().split(':',1)[-1] pipe.close() @@ -169,6 +169,9 @@ def get_platform(): osname = " ".join(platform.linux_distribution()) uname = platform.uname() + if osname == ' ' + osname = uname[0] + data = {'osname': osname, 'hostname': uname[1], 'kernel': uname[2] } except Exception,err: From 083f8d179f309120a407b5bab382d1a063fc49ac Mon Sep 17 00:00:00 2001 From: Florian N Date: Sun, 16 Feb 2014 16:27:52 -0500 Subject: [PATCH 2/6] small typo --- main/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/views.py b/main/views.py index cf9ad72..ad1d9ef 100755 --- a/main/views.py +++ b/main/views.py @@ -169,7 +169,7 @@ def get_platform(): osname = " ".join(platform.linux_distribution()) uname = platform.uname() - if osname == ' ' + if osname == ' ': osname = uname[0] data = {'osname': osname, 'hostname': uname[1], 'kernel': uname[2] } From cf8795acf86d55f4df411906704a6ee84a1b4412 Mon Sep 17 00:00:00 2001 From: Florian N Date: Sun, 16 Feb 2014 16:29:13 -0500 Subject: [PATCH 3/6] readme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 19430ac..f4e29f4 100644 --- a/README.md +++ b/README.md @@ -48,6 +48,7 @@ pyDash was tested and runs under the following OSs: - Debian - Raspbian - Pidora + - Arch Linux Might work under others, but didn't get to test any other OSs just yet. From 8229e185effa067768d178208e062b3bc343c611 Mon Sep 17 00:00:00 2001 From: Florian N Date: Sun, 16 Feb 2014 16:31:27 -0500 Subject: [PATCH 4/6] readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f4e29f4..ab27182 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ The dashboard is built using only Python libraries available in the main Python Current dependencies: - == Django 1.6.1 - + - >= Python 2.6 __[View Demo](http://pydash.hostechs.com/)__ From 5998517b6b4ecd5a4a053993e933e76573f751f0 Mon Sep 17 00:00:00 2001 From: Florian N Date: Sun, 16 Feb 2014 17:02:10 -0500 Subject: [PATCH 5/6] readme --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index ab27182..060855d 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,10 @@ Current dependencies: - == Django 1.6.1 - >= Python 2.6 + +__Current version: v1.2__ + + __[View Demo](http://pydash.hostechs.com/)__ user: admin From b15bf0982caa9fd2373ca34246da037c9ce33af0 Mon Sep 17 00:00:00 2001 From: Florian N Date: Sun, 16 Feb 2014 17:03:13 -0500 Subject: [PATCH 6/6] readme --- README.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/README.md b/README.md index 060855d..171bbe8 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -pyDash +pyDash - v1.2 ====== A small web monitoring dashboard for your linux pc/server writen in Python and Django + Chart.js. @@ -11,10 +11,6 @@ Current dependencies: - == Django 1.6.1 - >= Python 2.6 - -__Current version: v1.2__ - - __[View Demo](http://pydash.hostechs.com/)__ user: admin