chore: SystemInfo added in db, screenshot added

Author: codeperfectplus

README.md

@@ -1,6 +1,6 @@
 # SystemDashboard
 
-System Dashboard is a Flask app designed to monitor server stats such as CPU, Memory, Disk, and Network. It also provides real-time monitoring capabilities.
+System Dashboard is a Flask app designed to monitor server stats such as CPU, Memory, Disk, and Network. It also provides real-time monitoring capabilities which can be useful for system administrators, developers, and DevOps engineers to keep track of their server's performance and troubleshoot issues. The app uses the `psutil` library to retrieve system stats and the `speedtest-cli` library to perform a network speed test.
 
 ## Installation
 
@@ -34,6 +34,28 @@ http://localhost:5000
 - Check the network speed of the server using a speed test.
 - Rate limit the speed test to prevent abuse.
 
+## Product Screenshots
+
+### HomePage
+
+![HomePage](/static/images/dashboard.png)
+
+### CPU Stats
+
+![CPU Stats](/static/images/cpu.png)
+
+### Memory Stats
+
+![Memory Stats](/static/images/memory.png)
+
+### Disk Stats
+
+![Disk Stats](/static/images/disk.png)
+
+### Speed Test
+
+![Speed Test](/static/images/speedtest.png)
+
 ## Why not use a Docker image?
 
 A Docker image has not been created for this project because it requires access to the host machine in order to retrieve server stats. Therefore, it is not possible to obtain server stats from within a Docker container.

app.py

@@ -35,6 +35,27 @@ class DashoardSettings(db.Model):
     def __repr__(self):
         return f'<DashboardSettings {self.speedtest_cooldown}, {self.timezone}, {self.number_of_speedtests}>'
 
+class SystemInfo(db.Model):
+    id = db.Column(db.Integer, primary_key=True)
+    username = db.Column(db.String(50))
+    cpu_percent = db.Column(db.Float)
+    memory_percent = db.Column(db.Float)
+    disk_usage = db.Column(db.Float)
+    battery_percent = db.Column(db.Float)
+    cpu_core = db.Column(db.Integer)
+    boot_time = db.Column(db.String(50))
+    network_sent = db.Column(db.Float)
+    network_received = db.Column(db.Float)
+    process_count = db.Column(db.Integer)
+    swap_memory = db.Column(db.Float)
+    uptime = db.Column(db.String(50))
+    ipv4_connections = db.Column(db.String(50))
+    dashboard_memory_usage = db.Column(db.String(50))
+    timestamp = db.Column(db.DateTime, default=datetime.datetime.now())
+
+    def __repr__(self):
+        return f'<SystemInfo {self.username}, {self.cpu_percent}, {self.memory_percent}, {self.disk_usage}, {self.battery_percent}, {self.cpu_core}, {self.boot_time}, {self.network_sent}, {self.network_received}, {self.process_count}, {self.swap_memory}, {self.uptime}, {self.ipv4_connections}, {self.ipv6_connections}, {self.dashboard_memory_usage}>'
+
 # initialize the database
 with app.app_context():
     db.create_all()
@@ -80,37 +101,16 @@ def run_speedtest():
 def datetimeformat(value, format='%Y-%m-%d %H:%M:%S'):
     return value.strftime(format)
 
-@app.route('/speedtest')
-def speedtest():
-    settings = DashoardSettings.query.first()
-    SPEEDTEST_COOLDOWN_IN_HOURS = settings.speedtest_cooldown
-    NUMBER_OF_SPEEDTESTS = settings.number_of_speedtests
-    n_hour_ago = datetime.datetime.now() - datetime.timedelta(hours=SPEEDTEST_COOLDOWN_IN_HOURS)
-    recent_results = SpeedTestResult.query.filter(SpeedTestResult.timestamp > n_hour_ago).all()
-
-    if len(recent_results) < NUMBER_OF_SPEEDTESTS:
-        speedtest_result = run_speedtest()
-        if speedtest_result['status'] == "Error":
-            return render_template('error/speedtest_error.html', error=speedtest_result['message'])
 
-        if speedtest_result:
-            new_result = SpeedTestResult(
-                download_speed=speedtest_result['download_speed'],
-                upload_speed=speedtest_result['upload_speed'],
-                ping=speedtest_result['ping']
-            )
-            db.session.add(new_result)
-            db.session.commit()
-            return render_template('speedtest_result.html', speedtest_result=speedtest_result, source="Actual Test")
-    else:
-        latest_result = recent_results[-1]
-        next_test_time = latest_result.timestamp + datetime.timedelta(hours=SPEEDTEST_COOLDOWN_IN_HOURS)
-        remaining_time_for_next_test = round((next_test_time - datetime.datetime.now()).total_seconds() / 60)
-        return render_template('speedtest_result.html', 
-                               speedtest_result=latest_result, 
-                               source="Database", 
-                               next_test_time=next_test_time,
-                               remaining_time_for_next_test=remaining_time_for_next_test)
+def get_flask_memory_usage():
+    """
+    Returns the memory usage of the current Flask application in MB.
+    """
+    pid = os.getpid()
+    process = psutil.Process(pid)
+    memory_info = process.memory_info()
+    memory_in_mb = memory_info.rss / (1024 ** 2)
+    return f"{round(memory_in_mb)} MB"
 
 def get_system_info():
     print("Getting system information...")
@@ -129,8 +129,12 @@ def get_system_info():
         'swap_memory': psutil.swap_memory().percent,
         'uptime': change_up_time_format(datetime.datetime.now() - datetime.datetime.fromtimestamp(psutil.boot_time())),
         'ipv4_connections': ipv4_dict,
-        'ipv6_connections': ipv6_dict
+        'dashboard_memory_usage': get_flask_memory_usage(),
+        'timestamp': datetime.datetime.now()
     }
+    with app.app_context():
+        db.session.add(SystemInfo(**info))
+        db.session.commit()
     return info
 
 def get_established_connections():
@@ -150,13 +154,16 @@ def get_established_connections():
 
 @app.route('/')
 def dashboard():
+    results = {}
     settings = DashoardSettings.query.first()
     SPEEDTEST_COOLDOWN_IN_HOURS = settings.speedtest_cooldown
     system_info = get_system_info()
+    
     # Fetch the last speedtest result
     n_hour_ago = datetime.datetime.now() - datetime.timedelta(hours=SPEEDTEST_COOLDOWN_IN_HOURS)
     recent_results = SpeedTestResult.query.filter(SpeedTestResult.timestamp > n_hour_ago).all()
     last_timestamp = datetimeformat(recent_results[-1].timestamp) if recent_results else None
+
     if recent_results:
         # Display the most recent result from the database
         latest_result = recent_results[-1]
@@ -175,20 +182,14 @@ def dashboard():
         source = None
         show_prompt = True
         remaining_time_for_next_test = None
-
+    
     return render_template('dashboard.html', system_info=system_info, 
                            speedtest_result=speedtest_result, 
                            source=source,
                            last_timestamp=last_timestamp,
                            next_test_time=remaining_time_for_next_test, 
                            show_prompt=show_prompt)
 
-@app.route('/cpu_usage')
-def cpu_usage():
-    cpu_usage = psutil.cpu_percent(interval=1, percpu=True)
-    return render_template('cpu_usage.html', cpu_usage=cpu_usage)
-
-
 @app.route('/settings', methods=['GET', 'POST'])
 def settings():
     # Fetch the settings from the database and update them
@@ -202,6 +203,43 @@ def settings():
             flash('Settings updated successfully!', 'success')
         return render_template('settings.html', settings=settings)
 
+@app.route('/speedtest')
+def speedtest():
+    settings = DashoardSettings.query.first()
+    SPEEDTEST_COOLDOWN_IN_HOURS = settings.speedtest_cooldown
+    NUMBER_OF_SPEEDTESTS = settings.number_of_speedtests
+    n_hour_ago = datetime.datetime.now() - datetime.timedelta(hours=SPEEDTEST_COOLDOWN_IN_HOURS)
+    recent_results = SpeedTestResult.query.filter(SpeedTestResult.timestamp > n_hour_ago).all()
+
+    if len(recent_results) < NUMBER_OF_SPEEDTESTS:
+        speedtest_result = run_speedtest()
+        if speedtest_result['status'] == "Error":
+            return render_template('error/speedtest_error.html', error=speedtest_result['message'])
+
+        if speedtest_result:
+            new_result = SpeedTestResult(
+                download_speed=speedtest_result['download_speed'],
+                upload_speed=speedtest_result['upload_speed'],
+                ping=speedtest_result['ping']
+            )
+            db.session.add(new_result)
+            db.session.commit()
+            return render_template('speedtest_result.html', speedtest_result=speedtest_result, source="Actual Test")
+    else:
+        latest_result = recent_results[-1]
+        next_test_time = latest_result.timestamp + datetime.timedelta(hours=SPEEDTEST_COOLDOWN_IN_HOURS)
+        remaining_time_for_next_test = round((next_test_time - datetime.datetime.now()).total_seconds() / 60)
+        return render_template('speedtest_result.html', 
+                               speedtest_result=latest_result, 
+                               source="Database", 
+                               next_test_time=next_test_time,
+                               remaining_time_for_next_test=remaining_time_for_next_test)
+
+@app.route('/cpu_usage')
+def cpu_usage():
+    cpu_usage = psutil.cpu_percent(interval=1, percpu=True)
+    return render_template('cpu_usage.html', cpu_usage=cpu_usage)
+
 @app.route('/memory_usage')
 def memory_usage():
     memory_info = {

static/css/style.css

@@ -19,9 +19,9 @@
     --color-cpu-usage: #ffc107; /* Yellow for CPU usage */
     --color-memory: #6f42c1; /* Purple for memory */
     --color-disk: #6711e9; /* Gray for disk */
-    --color-uptime: #17a2b8; /* Cyan for uptime */
-    --color-network: #11eeee; /* Bright blue for network */
-    --color-speedtest: #c9ef4b; /* Bright blue for speedtest */
+    --color-uptime: #042b31; /* Cyan for uptime */
+    --color-network: #20053d; /* Bright blue for network */
+    --color-speedtest: #253003; /* Bright blue for speedtest */
     --color-battery: #007bff; /* Bright blue for battery */
 
     /* shadow colors */
@@ -37,7 +37,7 @@
 
 /* General Styles */
 body {
-    font-family: 'Arial', sans-serif;
+    font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif; /* Default font stack */
     color: #333;
     background-size: cover; /* Ensure the image covers the entire background */
     background-repeat: no-repeat; /* Prevent the image from repeating */

static/images/background.jpg

@@ -1,4 +1,4 @@
-<div class="col-md-6 mb-4">
+<div class="col-md-6 col-lg-4 mb-4">
     <div class="card bg-boot">
         <div class="card-body">
             <h5 class="card-title">Boot Time <i class="fas fa-clock"></i></h5>