From 21f574aa9524f8a5f3ecb9f34723202fcc543505 Mon Sep 17 00:00:00 2001
From: Kristjan Komlosi <kristjan@piskot.si>
Date: Sat, 17 May 2025 22:45:37 +0200
Subject: [PATCH] prvi poskus

---
 __pycache__/main.cpython-313.pyc | Bin 10058 -> 10873 bytes
 compose.yml                      |  25 +++
 main.py                          |  78 +++++----
 wall_messages.db                 | Bin 28672 -> 28672 bytes
 webroot/index.html               | 269 ++++++++++++++++++-------------
 5 files changed, 224 insertions(+), 148 deletions(-)
 create mode 100644 compose.yml

diff --git a/__pycache__/main.cpython-313.pyc b/__pycache__/main.cpython-313.pyc
index 55cae707315b4e92bb53599bf2b77822aa329689..987dcb2cab1093f606da7cab6b9fa53e6df42d33 100644
GIT binary patch
delta 3464
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

delta 3029
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
a5V>ot9SNJ`j~V!)G9H~#3y}|`-~Jzs3RF=5

diff --git a/compose.yml b/compose.yml
new file mode 100644
index 0000000..b597471
--- /dev/null
+++ b/compose.yml
@@ -0,0 +1,25 @@
+version: '3.8'
+
+services:
+    db:
+        image: postgres:16
+        environment:
+            POSTGRES_USER: sysmon
+            POSTGRES_PASSWORD: sysmonpass
+            POSTGRES_DB: sysmondb
+        volumes:
+            - db_data:/var/lib/postgresql/data
+        ports:
+            - "5432:5432"
+
+    nuiks-sysmon:
+        image: nuiks-sysmon:latest
+        environment:
+            DATABASE_URL: postgres://sysmon:sysmonpass@db:5432/sysmondb
+        depends_on:
+            - db
+        ports:
+            - "8080:8080"
+
+volumes:
+    db_data:
\ No newline at end of file
diff --git a/main.py b/main.py
index 51da36d..a0367c1 100644
--- a/main.py
+++ b/main.py
@@ -13,18 +13,19 @@ import threading
 
 if os.environ.get("DATABASE_URL") == None:
     os.environ["DATABASE_URL"] = "sqlite:///./wall_messages.db"
-
+else
+    DATABASE_URL = os.environ["DATABASE_URL"]
+    DATABASE_PASSWORD = os.environ["DATABASE_PASSWORD"]
+    
+    
+    
 app = FastAPI()
 
-cpu_threshold = 80
-ram_threshold = 80
-disk_threshold = 80
-
 cpu_normal = True
 ram_normal = True
 disk_normal = True
 
-DATABASE_URL = "sqlite:///./wall_messages.db"
+
 
 engine = create_engine(DATABASE_URL, connect_args={"check_same_thread": False})
 SessionLocal = sessionmaker(bind=engine)
@@ -79,7 +80,7 @@ def check_and_log_overages():
             cpu_limit = limits.cpu_threshold
             ram_limit = limits.ram_threshold
             disk_limit = limits.disk_threshold
-
+        print("LIMITS: ",cpu_limit, ram_limit, disk_limit)
         cpu = psutil.cpu_percent(interval=0.5)
         ram = psutil.virtual_memory().percent
         disk = psutil.disk_usage('/').percent
@@ -115,9 +116,8 @@ def check_and_log_overages():
 
 threading.Thread(target=check_and_log_overages, daemon=True).start()
 
-
-
 start_time = time.time()
+
 class Info(BaseModel):
     uptime: datetime.datetime
     cpu: float
@@ -136,46 +136,56 @@ class Thresholds(BaseModel):
     disk_threshold: int
 
 
-@app.get("/info", response_class=Info)
+@app.get("/info", response_model=Info)
 def get_info():
-    cpu = psutil.cpu_percent(interval=0.5)
-    ram = psutil.virtual_memory().percent
-    disk = psutil.disk_usage('/').percent
-    uptime = time.time() - start_time
-    info = Info(
-        uptime=uptime,
-        cpu=cpu,
-        ram=ram,
-        disk=disk,
-        cpu_threshold=cpu_threshold,
-        ram_threshold=ram_threshold,
-        disk_threshold=disk_threshold,
-        cpu_normal=cpu <= cpu_threshold,
-        ram_normal=ram <= ram_threshold,
-        disk_normal=disk <= disk_threshold
+    db = SessionLocal()
+    limits = db.query(LimitsModel).first()
+    if not limits:
+        db.close()
+        raise HTTPException(status_code=404, detail="Limits not found")
+    delta_seconds = int(time.time() - start_time)
+    system_information = Info(
+        uptime=datetime.datetime.now() - datetime.timedelta(seconds=delta_seconds),
+        cpu=psutil.cpu_percent(interval=0.5),
+        ram=psutil.virtual_memory().percent,
+        disk=psutil.disk_usage('/').percent,
+        cpu_threshold=limits.cpu_threshold,
+        ram_threshold=limits.ram_threshold,
+        disk_threshold=limits.disk_threshold,
+        cpu_normal=cpu_normal,
+        ram_normal=ram_normal,
+        disk_normal=disk_normal
     )
-    return info
+    print(system_information)
+    return system_information
 
 @app.get("/limits", response_model=Thresholds)
 def get_limits():
+    db = SessionLocal()
+    limits = db.query(LimitsModel).first()
+    if not limits:
+        db.close()
+        raise HTTPException(status_code=404, detail="Limits not found")
     return {
-        "cpu_threshold": cpu_threshold,
-        "ram_threshold": ram_threshold,
-        "disk_threshold": disk_threshold
+        "cpu_threshold": limits.cpu_threshold,
+        "ram_threshold": limits.ram_threshold,
+        "disk_threshold": limits.disk_threshold
     }
 
 @app.post("/limits")
 def set_limits(thresholds: Thresholds):
+    print (thresholds)
     db = SessionLocal()
     limits = db.query(LimitsModel).first()
+    cpu_threshold = thresholds.cpu_threshold
+    ram_threshold = thresholds.ram_threshold
+    disk_threshold = thresholds.disk_threshold
     if limits:
-        limits.cpu_threshold = thresholds.cpu_threshold
-        limits.ram_threshold = thresholds.ram_threshold
-        limits.disk_threshold = thresholds.disk_threshold
+        limits.cpu_threshold = cpu_threshold
+        limits.ram_threshold = ram_threshold
+        limits.disk_threshold = disk_threshold
         db.commit()
-        db.refresh(limits)
     db.close()
-    
     return {
         "cpu": cpu_threshold,
         "ram": ram_threshold,
diff --git a/wall_messages.db b/wall_messages.db
index a86a9ae0e057980c742ab6771a64b168d6730e37..6b74bc45d44b9a250e61c54fa531788202b7ac3d 100644
GIT binary patch
delta 540
zcmZvZEl&eM6h*uAYq#CbYp^t7O6o|5H?uRdGh-+r;U|zfko^g`R-=GA5==EAfub4&
z3PlhoRI>sMstSc*7gXt*qi)W<FK?81qr^Mg@cQSieXoCee6?HL?zQfErDi82g96Oq
z0WRSL4ne{?S&$cUO-{*x9FR^UX(ZEjvqy$BtQ34d*b^vJ7gd+XR0tPYhlYtrN*U35
znh5?UxORdwL}hJEYk3Z?oG?sUWl+-~&w<7b6=&9n$V%$xNicTOFsrT6npP`?U}Y+5
zr!<o)j-;TK+#2mrF(ITxq~+z7;orT8P9f7=q+@9*w+6FoB5jn8X>nPSIk;2SNu4H8
z3rp8lholMPRK$!z&K3239pjIq%}xlj0(`?4EZ`H~)4#pJD?Gy!Ji-j_;RYr!nYQT#
cbjn4~3&V`{dd6BUV-RHY{fyP>c)qjs1Iqwt{r~^~

delta 48
zcmV-00MGw`-~oW(0gxL3C6OFM0VT0uoj(IIGElNW1P}%R58eO|-m?)f)DM&1Una8z
GK>QDV&JY9u

diff --git a/webroot/index.html b/webroot/index.html
index cdbe140..5eda061 100644
--- a/webroot/index.html
+++ b/webroot/index.html
@@ -21,20 +21,19 @@
         <div class="stat"><span class="label">CPU Usage:</span> <span class="value" id="cpu">--</span></div>
         <div class="stat"><span class="label">RAM Usage:</span> <span class="value" id="ram">--</span></div>
         <div class="stat"><span class="label">SSD Usage:</span> <span class="value" id="disk">--</span></div>
-        <div class="stat"><span class="label">Uptime:</span> <span class="value" id="uptime">--</span></div>
+        <div class="stat"><span class="label">Up since:</span> <span class="value" id="uptime">--</span></div>
     </div>
 
     <div class="container" style="margin-top:24px;">
         <h1>Limit overages</h1>
-        <form id="addMessageForm" style="margin-bottom:16px;">
-            <input type="text" id="newMessage" placeholder="Type a message..." style="width:70%;padding:8px;" required>
-            <button type="submit" class="refresh-btn" style="display:inline-block;margin:0;">Add</button>
-        </form>
         <ul id="messages" style="list-style:none;padding:0;"></ul>
     </div>
 
             <div class="container" style="margin-top:24px;">
             <h1>Resource Limits</h1>
+            <script>
+             
+            </script>
             <div class="stat">
                 <span class="label">CPU Limit:</span>
                 <input type="range" id="cpuLimit" min="1" max="100" value="50" style="flex:1;margin:0 12px;">
@@ -53,19 +52,134 @@
         </div>
 
     <script>
+        async function fetchOverages() {
+            try {
+                const res = await fetch('/overages');
+                const data = await res.json();
+                const messages = document.getElementById('messages');
+                // Replace <ul> with a table for better alignment
+                // If table doesn't exist, create it
+                let table = document.getElementById('overagesTable');
+                if (!table) {
+                    table = document.createElement('table');
+                    table.id = 'overagesTable';
+                    table.style.width = '100%';
+                    table.style.borderCollapse = 'collapse';
+                    table.innerHTML = `
+                        <thead>
+                            <tr>
+                                <th style="text-align:left;padding:8px 4px;">ID</th>
+                                <th style="text-align:center;padding:8px 4px;">CPU</th>
+                                <th style="text-align:center;padding:8px 4px;">RAM</th>
+                                <th style="text-align:center;padding:8px 4px;">DISK</th>
+                                <th style="text-align:left;padding:8px 4px;">Timestamp</th>
+                                <th style="text-align:center;padding:8px 4px;">Action</th>
+                            </tr>
+                        </thead>
+                        <tbody></tbody>
+                    `;
+                    messages.innerHTML = '';
+                    messages.appendChild(table);
+                }
+                const tbody = table.querySelector('tbody');
+                tbody.innerHTML = '';
+                data.forEach(item => {
+                    const tr = document.createElement('tr');
+                    tr.style.borderBottom = '1px solid #eee';
+
+                    // ID
+                    const idTd = document.createElement('td');
+                    idTd.textContent = `#${item.id}`;
+                    idTd.style.padding = '8px 4px';
+
+                    // CPU
+                    const cpuTd = document.createElement('td');
+                    cpuTd.style.textAlign = 'center';
+                    cpuTd.style.padding = '8px 4px';
+                    cpuTd.textContent = item.cpu === 1 ? '↑' : '↓';
+                    cpuTd.style.color = item.cpu === 1 ? 'red' : 'green';
+
+                    // RAM
+                    const ramTd = document.createElement('td');
+                    ramTd.style.textAlign = 'center';
+                    ramTd.style.padding = '8px 4px';
+                    ramTd.textContent = item.ram === 1 ? '↑' : '↓';
+                    ramTd.style.color = item.ram === 1 ? 'red' : 'green';
+
+                    // DISK
+                    const diskTd = document.createElement('td');
+                    diskTd.style.textAlign = 'center';
+                    diskTd.style.padding = '8px 4px';
+                    diskTd.textContent = item.disk === 1 ? '↑' : '↓';
+                    diskTd.style.color = item.disk === 1 ? 'red' : 'green';
+
+                    // Timestamp
+                    const tsTd = document.createElement('td');
+                    const date = new Date(item.timestamp);
+                    tsTd.textContent = date.toLocaleString();
+                    tsTd.style.padding = '8px 4px';
+
+                    // Delete button
+                    const delTd = document.createElement('td');
+                    delTd.style.textAlign = 'center';
+                    delTd.style.padding = '8px 4px';
+                    const delBtn = document.createElement('button');
+                    delBtn.textContent = 'Delete';
+                    delBtn.style.background = '#e74c3c';
+                    delBtn.style.color = '#fff';
+                    delBtn.style.border = 'none';
+                    delBtn.style.borderRadius = '4px';
+                    delBtn.style.padding = '4px 12px';
+                    delBtn.style.cursor = 'pointer';
+                    delBtn.onclick = async () => {
+                        await fetch(`/overages/${item.id}`, { method: 'DELETE' });
+                        fetchOverages();
+                    };
+                    delTd.appendChild(delBtn);
+
+                    tr.appendChild(idTd);
+                    tr.appendChild(cpuTd);
+                    tr.appendChild(ramTd);
+                    tr.appendChild(diskTd);
+                    tr.appendChild(tsTd);
+                    tr.appendChild(delTd);
+
+                    tbody.appendChild(tr);
+                });
+                // If no data, show a message
+                if (data.length === 0) {
+                    const tr = document.createElement('tr');
+                    const td = document.createElement('td');
+                    td.colSpan = 6;
+                    td.style.textAlign = 'center';
+                    td.style.padding = '12px';
+                    td.textContent = 'No overages.';
+                    tr.appendChild(td);
+                    tbody.appendChild(tr);
+                }
+            } catch (e) {
+                console.error('Error fetching overages:', e);
+                document.getElementById('messages').innerHTML = '<span style="color:red;">Error loading overages</span>';
+            }
+        }
+
+        setInterval(fetchOverages, 5000);
+        window.addEventListener('load', fetchOverages);
+
+
         async function fetchStats() {
             try {
-                const [cpu, ram, disk, uptime] = await Promise.all([
-                    fetch('/cpu').then(res => res.json()),
-                    fetch('/ram').then(res => res.json()),
-                    fetch('/disk').then(res => res.json()),
-                    fetch('/uptime').then(res => res.json())
-                ]);
-                document.getElementById('cpu').textContent = cpu.cpu_percent + '%';
-                document.getElementById('ram').textContent = ram.percent + '%';
-                document.getElementById('disk').textContent = disk.percent + '%';
-                document.getElementById('uptime').textContent = uptime.uptime_seconds + ' s';
+                const sysInfo = await fetch('/info');
+                const data = await sysInfo.json();
+                // Format timestamps
+                data.uptime = formatTimestamp(data.uptime);
+
+                document.getElementById('cpu').textContent = data.cpu + '%';
+                document.getElementById('ram').textContent = data.ram + '%';
+                document.getElementById('disk').textContent = data.disk + '%';
+                document.getElementById('uptime').textContent = data.uptime + ' s';
             } catch (e) {
+                console.error('Error fetching system stats:', e);
                 document.getElementById('cpu').textContent = 'Error';
                 document.getElementById('ram').textContent = 'Error';
                 document.getElementById('disk').textContent = 'Error';
@@ -81,89 +195,20 @@
             }
             return date.toLocaleString();
         }
-        // Wall Messages CRUD
-        async function fetchMessages() {
-            const res = await fetch('/wall');
-            const messages = await res.json();
-            const ul = document.getElementById('messages');
-            ul.innerHTML = '';
-            messages.forEach(msg => {
-                const li = document.createElement('li');
-                li.style.display = 'flex';
-                li.style.justifyContent = 'space-between';
-                li.style.alignItems = 'center';
-                li.style.padding = '8px 0';
-
-                const span = document.createElement('span');
-                span.textContent = formatTimestamp(msg.timestamp) + " " + msg.text;
-
-                const editBtn = document.createElement('button');
-                editBtn.textContent = 'Edit';
-                editBtn.className = 'refresh-btn';
-                editBtn.style.background = '#ffa500';
-                editBtn.style.marginRight = '8px';
-                editBtn.onclick = () => editMessage(msg);
-
-                const delBtn = document.createElement('button');
-                delBtn.textContent = 'Delete';
-                delBtn.className = 'refresh-btn';
-                delBtn.style.background = '#d40000';
-                delBtn.onclick = () => deleteMessage(msg.id);
-
-                const btns = document.createElement('span');
-                btns.appendChild(editBtn);
-                btns.appendChild(delBtn);
-
-                li.appendChild(span);
-                li.appendChild(btns);
-                ul.appendChild(li);
-            });
-        }
-
-        async function addMessage(text) {
-            await fetch('/wall', {
-                method: 'POST',
-                headers: {'Content-Type': 'application/json'},
-                body: JSON.stringify({text})
-            });
-            fetchMessages();
-        }
-
-        async function deleteMessage(id) {
-            await fetch(`/wall/${id}`, { method: 'DELETE' });
-            fetchMessages();
-        }
-
-        function editMessage(msg) {
-            const newText = prompt('Edit message:', msg.text);
-            if (newText !== null && newText.trim() !== '') {
-                updateMessage(msg.id, newText.trim());
-            }
-        }
-
-        async function updateMessage(id, text) {
-            await fetch(`/wall/${id}`, {
-            method: 'PUT',
-            headers: {'Content-Type': 'application/json'},
-            body: JSON.stringify({text})
-            });
-            fetchMessages();
-        }
-        </script>
-
-        <script>
+       
         // --- Resource Limits Sliders ---
         async function fetchLimits() {
             try {
             const res = await fetch('/limits');
             const limits = await res.json();
-            document.getElementById('cpuLimit').value = limits.cpu;
-            document.getElementById('ramLimit').value = limits.ram;
-            document.getElementById('diskLimit').value = limits.disk;
-            document.getElementById('cpuLimitValue').textContent = limits.cpu + '%';
-            document.getElementById('ramLimitValue').textContent = limits.ram + '%';
-            document.getElementById('diskLimitValue').textContent = limits.disk + '%';
+            document.getElementById('cpuLimit').value = limits.cpu_threshold;
+            document.getElementById('ramLimit').value = limits.ram_threshold;
+            document.getElementById('diskLimit').value = limits.disk_threshold;
+            document.getElementById('cpuLimitValue').textContent = limits.cpu_threshold + '%';
+            document.getElementById('ramLimitValue').textContent = limits.ram_threshold + '%';
+            document.getElementById('diskLimitValue').textContent = limits.disk_threshold + '%';
             } catch (e) {
+            console.error('Error fetching limits:', e);
             // fallback: set to 50 if error
             document.getElementById('cpuLimit').value = 50;
             document.getElementById('ramLimit').value = 50;
@@ -174,17 +219,6 @@
             }
         }
 
-        async function updateLimits() {
-            const cpu = parseInt(document.getElementById('cpuLimit').value, 10);
-            const ram = parseInt(document.getElementById('ramLimit').value, 10);
-            const disk = parseInt(document.getElementById('diskLimit').value, 10);
-            await fetch('/limits', {
-            method: 'POST',
-            headers: {'Content-Type': 'application/json'},
-            body: JSON.stringify({ cpu, ram, disk })
-            });
-        }
-
         function setupLimitSliders() {
             ['cpu', 'ram', 'disk'].forEach(resource => {
             const slider = document.getElementById(resource + 'Limit');
@@ -198,21 +232,28 @@
             });
         }
 
-        document.getElementById('addMessageForm').onsubmit = function(e) {
-            e.preventDefault();
-            const input = document.getElementById('newMessage');
-            const text = input.value.trim();
-            if (text) {
-                addMessage(text);
-                input.value = '';
-            }
-        };
+        async function updateLimits() {
+                const cpu = parseInt(document.getElementById('cpuLimit').value, 10);
+                const ram = parseInt(document.getElementById('ramLimit').value, 10);
+                const disk = parseInt(document.getElementById('diskLimit').value, 10);
+                console.log(cpu, ram, disk);
+                const requestBody = JSON.stringify({
+                    cpu_threshold: cpu,
+                    ram_threshold: ram,
+                    disk_threshold: disk
+                });
+                console.log(requestBody);
+
+                await fetch('/limits', {
+                    method: 'POST',
+                    headers: {'Content-Type': 'application/json'},
+                    body: requestBody
+                });
+            };
 
         window.onload = function() {
             fetchStats();
             setInterval(fetchStats, 5000); // Fetch every 5 seconds
-            fetchMessages();
-            setInterval(fetchMessages, 5000); // Fetch messages every 5 seconds
             fetchLimits();
             setupLimitSliders();
             setInterval(fetchLimits, 5000); // Fetch limits every 5 seconds