Skip to content

Commit 10433f8

Browse files
codeperfectpluscodeperfectplus
committed
Refactor log_system_info.py and influxdb_config.py
1 parent c5b5f02 commit 10433f8

3 files changed

Lines changed: 46 additions & 47 deletions

File tree

‎src/background_task/log_system_info.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,9 @@
77
from src.models import GeneralSettings, SystemInformation
88
from sqlalchemy.exc import SQLAlchemyError
99
from prometheus_client import Counter, Gauge
10-
import os, time
10+
import os
1111

1212
from src.logger import logger
13-
from src.influxdb_config import bucket, write_api
14-
from src.utils import get_system_username
1513
# Flag to track if logging is already scheduled
1614
is_logging_scheduled = False
1715
fetch_system_info_interval = 30
@@ -179,7 +177,7 @@ def monitor_settings():
179177
is_logging_scheduled = False
180178

181179
# Recheck settings every 10 seconds
182-
Timer(10, monitor_settings).start()
180+
Timer(30, monitor_settings).start()
183181

184182
except SQLAlchemyError as db_err:
185183
logger.error(f"Error fetching settings: {db_err}", exc_info=True)

‎src/influxdb_config.py‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
from influxdb_client import InfluxDBClient, Point, WritePrecision
2-
from influxdb_client.client.write_api import SYNCHRONOUS
3-
import os
4-
from src.logger import logger
1+
# from influxdb_client import InfluxDBClient, Point, WritePrecision
2+
# from influxdb_client.client.write_api import SYNCHRONOUS
3+
# import os
4+
# from src.logger import logger
55

66

7-
# influx db configuration
8-
org = "systemguard"
9-
url = "http://localhost:8086"
10-
bucket="system_metrics"
11-
INFLUXDB_TOKEN=os.getenv('INFLUXDB_TOKEN')
12-
print("INFLUXDB_TOKEN: ", INFLUXDB_TOKEN)
7+
# # influx db configuration
8+
# org = "systemguard"
9+
# url = "http://localhost:8086"
10+
# bucket="system_metrics"
11+
# INFLUXDB_TOKEN=os.getenv('INFLUXDB_TOKEN')
12+
# print("INFLUXDB_TOKEN: ", INFLUXDB_TOKEN)
1313

14-
try:
15-
influx_client = InfluxDBClient(url=url, token=INFLUXDB_TOKEN, org=org)
16-
bucket = "system_metrics"
17-
write_api = influx_client.write_api(write_options=SYNCHRONOUS)
18-
query_api = influx_client.query_api()
19-
logger.info("Connected to InfluxDB successfully")
20-
except Exception as e:
21-
logger.error(f"Failed to connect to InfluxDB: {e}")
22-
raiseclient = InfluxDBClient(url=url, token=INFLUXDB_TOKEN, org=org)
14+
# try:
15+
# influx_client = InfluxDBClient(url=url, token=INFLUXDB_TOKEN, org=org)
16+
# bucket = "system_metrics"
17+
# write_api = influx_client.write_api(write_options=SYNCHRONOUS)
18+
# query_api = influx_client.query_api()
19+
# logger.info("Connected to InfluxDB successfully")
20+
# except Exception as e:
21+
# logger.error(f"Failed to connect to InfluxDB: {e}")
22+
# raiseclient = InfluxDBClient(url=url, token=INFLUXDB_TOKEN, org=org)

‎src/templates/graphs/graphs.html‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ <h2><i class="fas fa-clock"></i> Current Server Time & Time Zone</h2>
5555
<div class="row">
5656
<div class="cpu-usage col-md-6">
5757
<div class="section-header d-flex justify-content-between align-items-center">
58-
<h2><i class="fas fa-microchip"></i> CPU Usage Over Time</h2>
58+
<h2><i class="fas fa-microchip"></i> CPU Usage </h2>
5959
<button id="refreshCpuTime" class="btn btn-primary"><i class="fas fa-sync-alt"></i> Refresh CPU
6060
Graph</button>
6161
</div>
@@ -64,18 +64,38 @@ <h2><i class="fas fa-microchip"></i> CPU Usage Over Time</h2>
6464

6565
<div class="memory-usage col-md-6">
6666
<div class="section-header d-flex justify-content-between align-items-center">
67-
<h2><i class="fas fa-memory"></i> Memory Usage Over Time</h2>
67+
<h2><i class="fas fa-memory"></i> Memory Usage </h2>
6868
<button id="refreshMemoryTime" class="btn btn-primary"><i class="fas fa-sync-alt"></i> Refresh Memory
6969
Graph</button>
7070
</div>
7171
<canvas id="memoryTimeChart"></canvas>
7272
</div>
7373
</div>
7474

75+
<div class="row">
76+
<div class="cpu-temperature col-md-6">
77+
<div class="section-header d-flex justify-content-between align-items-center">
78+
<h2><i class="fas fa-thermometer-half"></i> Current Temperature</h2>
79+
<button id="refreshCurrentTempTime" class="btn btn-primary"><i class="fas fa-sync-alt"></i> Refresh
80+
Temperature Graph</button>
81+
</div>
82+
<canvas id="currentTempTimeChart"></canvas>
83+
</div>
84+
85+
<div class="cpu-frequency col-md-6">
86+
<div class="section-header d-flex justify-content-between align-items-center">
87+
<h2><i class="fas fa-microchip"></i> CPU Frequency</h2>
88+
<button id="refreshCpuFrequencyTime" class="btn btn-primary"><i class="fas fa-sync-alt"></i> Refresh CPU
89+
Frequency Graph</button>
90+
</div>
91+
<canvas id="cpuFrequencyTimeChart"></canvas>
92+
</div>
93+
</div>
94+
7595
<div class="row">
7696
<div class="battery-usage col-md-6">
7797
<div class="section-header d-flex justify-content-between align-items-center">
78-
<h2><i class="fas fa-battery-half"></i> Battery Percentage Over Time</h2>
98+
<h2><i class="fas fa-battery-half"></i> Battery Percentage</h2>
7999
<button id="refreshBatteryTime" class="btn btn-primary"><i class="fas fa-sync-alt"></i> Refresh Battery
80100
Graph</button>
81101
</div>
@@ -84,7 +104,7 @@ <h2><i class="fas fa-battery-half"></i> Battery Percentage Over Time</h2>
84104

85105
<div class="network-usage col-md-6">
86106
<div class="section-header d-flex justify-content-between align-items-center">
87-
<h2><i class="fas fa-network-wired"></i> Network Sent & Received Over Time</h2>
107+
<h2><i class="fas fa-network-wired"></i> Network Sent & Received</h2>
88108
<button id="refreshNetworkTime" class="btn btn-primary"><i class="fas fa-sync-alt"></i> Refresh Network
89109
Graph</button>
90110
</div>
@@ -95,32 +115,13 @@ <h2><i class="fas fa-network-wired"></i> Network Sent & Received Over Time</h2>
95115
<div class="row">
96116
<div class="dashboard-memory-usage col-md-6">
97117
<div class="section-header d-flex justify-content-between align-items-center">
98-
<h2><i class="fas fa-memory"></i>Memory Usage Over Time(APP)</h2>
118+
<h2><i class="fas fa-memory"></i>Memory Usage(APP)</h2>
99119
<button id="refreshDashboardMemoryTime" class="btn btn-primary"><i class="fas fa-sync-alt"></i> Refresh
100120
Dashboard Memory Graph</button>
101121
</div>
102122
<canvas id="dashboardMemoryTimeChart"></canvas>
103123
</div>
104124

105-
<div class="cpu-frequency col-md-6">
106-
<div class="section-header d-flex justify-content-between align-items-center">
107-
<h2><i class="fas fa-microchip"></i> CPU Frequency Over Time</h2>
108-
<button id="refreshCpuFrequencyTime" class="btn btn-primary"><i class="fas fa-sync-alt"></i> Refresh CPU
109-
Frequency Graph</button>
110-
</div>
111-
<canvas id="cpuFrequencyTimeChart"></canvas>
112-
</div>
113-
</div>
114-
115-
<div class="row">
116-
<div class="cpu-temperature col-md-6">
117-
<div class="section-header d-flex justify-content-between align-items-center">
118-
<h2><i class="fas fa-thermometer-half"></i> Current Temperature Over Time</h2>
119-
<button id="refreshCurrentTempTime" class="btn btn-primary"><i class="fas fa-sync-alt"></i> Refresh
120-
Temperature Graph</button>
121-
</div>
122-
<canvas id="currentTempTimeChart"></canvas>
123-
</div>
124125
</div>
125126

126127
{% endblock %}

0 commit comments

Comments
 (0)