Merge pull request #9 from supriyopaul/master

upated cpu info
deep-compute · Feb 7, 2019 · e84a600 · e84a600
2 parents b8f9767 + 0fc218c
commit e84a600
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 17 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,8 +10,8 @@ deploy:
   skip_cleanup: true
   api_key:
     secure: EAZzz4nCgY6+XM4Jfhchr9Z6pkQBFRbWUlWN81nMWyo7PqMfsrJ/PKY7m5nn2oVjiCc5bRpVnrncgZ9CCtQDNTaLowHgp7WJEwWzKl0JvX/aI2oucT5+Q7ETFPcYT1Pkgg+XFxU899HvFhDAI7aW43FKCKproCkIJoICZnYOviOocnYtkb1wpaSJQ+aOM9wq3JWbU83Tz5vhj/fQTJYYpiCiqbnpwdde3ki+V9YJYvZu4pNNj0/TZYNlfQTEF9Czdib3AlMWjSWGA6UxpegW1ZTLsTVbtU1xX+5k5QhunevGvvpFrZYFdrA8173Qb5ibU2yHKV1uaXA9jfPsjdAUjNMAgvpoJz+rXGZPfN8IGCHYHG86ar+CeRrW/PIRqFA9ABdQm3tJ7Xk4xj9+L7AKRn88rjVfMSBwv9rAPmLWhh77spwXAnjxC0f8n/W5wb4q1l7aAxFuK9alzC4N0rvuyNGCgUpCDsfHKP2kmi1GwjU11OZoEnFVFSO0zQv1auF11a1LdzN7vLIETW9xylxNafm+TndoKrzBl7HnxiIVRcnGh52nSlaWk5Cq8aFN8PkevpoFj9MQtD+fLs/9NkDqqwiYZ71sZ7USpE5UD5IWIA7B0ztMS+usa4CGI+QtFfpzWK//gd/Gt1j+XkFcshaY279EozZ/vop5FESSw+ibpi8=
-  name: serverstats-0.1.6
-  tag_name: 0.1.6
+  name: serverstats-0.2.0
+  tag_name: 0.2.0
   on:
     branch: master
     repo: deep-compute/serverstats

diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ $ sudo pip install serverstats
 ### docker
 > Prerequisites: Docker >= 17.05
 ```
-$ docker pull deepcompute/serverstats:1.0
+$ docker pull deepcompute/serverstats
 ```
 
 ## Usage
@@ -72,10 +72,10 @@ $ serverstats run --interval <int value>
 
 ### Docker run
 ```
-$ docker run deepcompute/serverstats:1.0
+$ docker run deepcompute/serverstats
 ```
 ```
-$ docker run deepcompute/serverstats:1.0 serverstats run --interval 2
+$ docker run deepcompute/serverstats serverstats run --interval 2
 ```
 ![docker_demo](https://user-images.githubusercontent.com/33823698/36727142-31ac6aca-1be2-11e8-89af-30d199d6d79b.gif)
 
diff --git a/docker_demo.gif → gifs/docker_demo.gif b/docker_demo.gif → gifs/docker_demo.gif
diff --git a/serverstats/serverstats.py b/serverstats/serverstats.py
@@ -40,15 +40,14 @@ def get_system_metrics():
 
     '''
     load1, load5, load15 = psutil.os.getloadavg()
-    cpu_count = psutil.cpu_count()
-    load_avg_15_min = (load15 / cpu_count * 100)
-    load_avg_5_min = (load5 / cpu_count * 100)
-    load_avg_1_min = (load1 / cpu_count * 100)
+    cpu_percent = psutil.cpu_percent()
+    cpu_stats = psutil.cpu_times()
 
     network_traffic_info = psutil.net_io_counters(pernic=True)
-    cpu_stats = psutil.cpu_times()
+
     memory = psutil.virtual_memory()
     swap_mem = psutil.swap_memory()
+
     disk = psutil.disk_usage('/')
 
     if swap_mem.total == 0.0:
@@ -66,12 +65,12 @@ def get_system_metrics():
     return dict(
         #load_avg info
         cpu=dict(
-            usage_percent=float(load_avg_15_min),
-            idle_percent=float(100.00 - load_avg_15_min),
+            usage_percent=float(cpu_percent),
+            idle_percent=float(100.00 - cpu_percent),
             iowait=float(cpu_stats.iowait),
             avg_load_15_min=float(load15),
-            avg_load_5_min=float(load_avg_5_min),
-            avg_load_1_min=float(load_avg_1_min),
+            avg_load_5_min=float(load5),
+            avg_load_1_min=float(load15),
             ),
 
         #ram info
@@ -115,15 +114,15 @@ def __init__(self):
         self.interval = self.args.interval
 
     def _log_exception(self, exp):
-        self.log.exception('Error during run ', exp=exp)
+        self.log.exception('error_during_run ', exp=exp)
 
     @keeprunning(on_error=_log_exception)
     def _log_system_metrics(self):
         self.log.info('system_metrics', type='metric', **get_system_metrics())
         sleep(self.interval)
 
     def define_args(self, parser):
-        parser.add_argument('-n', '--interval', type=int, default=5,
+        parser.add_argument('-i', '--interval', type=int, default=5,
                             help='Seconds to wait after collection of stats')
 
     def run(self):

diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 
 setup(
     name="serverstats",
-    version="0.1.6",
+    version="0.2.0",
     description="Collect important system metrics from a server and log them",
     keywords="serverstats",
     author="Deep Compute, LLC",