76 Commits

Author SHA1 Message Date
19c7aaaca1 Merge branch 'staging' of https://git.triggermeelmo.com/watcher/Watcher into staging
All checks were successful
Gitea CI/CD / build-and-test (push) Successful in 45s
Gitea CI/CD / Set Tag Name (push) Successful in 5s
Gitea CI/CD / docker-build-and-push (push) Successful in 6m8s
Gitea CI/CD / Create Tag (push) Successful in 5s
2025-10-04 13:42:49 +02:00
068c67d0d9 Merge branch 'bugix/pipeline' into staging 2025-10-04 13:40:55 +02:00
4c6635f989 fixed misspelling set_tag to set-tag 2025-10-04 13:40:17 +02:00
98080df509 added push listening 2025-10-04 13:36:23 +02:00
286f72eac7 moved watcher-server to watcher 2025-10-04 13:32:28 +02:00
d49977815d Merge pull request 'd' (#28) from bugix/pipeline into staging
Some checks failed
Gitea CI/CD / build-and-test (push) Successful in 45s
Gitea CI/CD / Set Tag Name (push) Successful in 5s
Gitea CI/CD / docker-build-and-push (push) Failing after 11s
Gitea CI/CD / Create Tag (push) Has been skipped
Reviewed-on: #28
2025-10-04 13:29:55 +02:00
b012693c21 f 2025-10-04 13:29:28 +02:00
e385eb94f4 e
Some checks failed
Gitea CI/CD / build-and-test (push) Successful in 55s
Gitea CI/CD / Set Tag Name (push) Successful in 5s
Gitea CI/CD / docker-build-and-push (push) Failing after 15s
Gitea CI/CD / Create Tag (push) Has been skipped
2025-10-04 13:26:08 +02:00
285ff89cb0 d
Some checks failed
Gitea CI/CD / build-and-test (push) Successful in 47s
Gitea CI/CD / Set Tag Name (push) Successful in 4s
Gitea CI/CD / Create Tag (push) Successful in 6s
Gitea CI/CD / docker-build-and-push (push) Failing after 12s
2025-10-04 13:20:58 +02:00
fe45d901e4 Merge pull request 'c' (#27) from bugix/pipeline into staging
Reviewed-on: #27
2025-10-04 13:16:50 +02:00
ba6e201adc c 2025-10-04 13:15:59 +02:00
5867cfc3e1 Merge pull request 'b' (#26) from bugix/pipeline into staging
Reviewed-on: #26
2025-10-04 13:11:47 +02:00
8771e1ee02 b 2025-10-04 13:11:18 +02:00
2be4331a6e Merge pull request 'a' (#25) from bugix/pipeline into staging
Reviewed-on: #25
2025-10-04 13:07:11 +02:00
98754be109 a 2025-10-04 13:06:43 +02:00
9ee2750534 Merge pull request 'changed to pull request only' (#24) from bugix/pipeline into staging
Reviewed-on: #24
2025-10-04 13:05:47 +02:00
9920c94a8b changed to pull request only 2025-10-04 13:04:30 +02:00
b7bc477d2e .gitea/workflows/build.yaml aktualisiert 2025-10-04 13:02:11 +02:00
ab11665665 dani des is men push vorm pennen gehen
Some checks failed
Gitea CI/CD / Set Tag Name (push) Successful in 6s
Gitea CI/CD / build-and-test (push) Successful in 48s
Gitea CI/CD / Create Tag (push) Has been cancelled
Gitea CI/CD / docker-build-and-push (push) Has been cancelled
2025-10-04 02:06:22 +02:00
37468b6785 added version tag output
All checks were successful
Gitea CI/CD / Set Tag Name (push) Successful in 5s
Gitea CI/CD / build-and-test (push) Successful in 45s
Gitea CI/CD / docker-build-and-push (push) Successful in 5m57s
Gitea CI/CD / Create Tag (push) Successful in 5s
2025-10-04 01:51:56 +02:00
471767c4ed added farther checking for existing tags 2025-10-04 01:43:57 +02:00
596baba5ef added permissions for packages and moved token to actions checkout
All checks were successful
Gitea CI/CD / Set Tag Name (push) Successful in 5s
Gitea CI/CD / build-and-test (push) Successful in 44s
Gitea CI/CD / docker-build-and-push (push) Successful in 5m39s
Gitea CI/CD / Create Tag (push) Successful in 5s
2025-10-04 01:41:06 +02:00
12390031f9 added permissions to write
All checks were successful
Gitea CI/CD / Set Tag Name (push) Successful in 5s
Gitea CI/CD / build-and-test (push) Successful in 52s
Gitea CI/CD / docker-build-and-push (push) Successful in 7m29s
Gitea CI/CD / Create Tag (push) Successful in 7s
2025-10-04 01:15:16 +02:00
daed8c1462 .gitea/workflows/build.yaml aktualisiert
Some checks failed
Gitea CI/CD / Set Tag Name (push) Successful in 5s
Gitea CI/CD / docker-build-and-push (push) Has been cancelled
Gitea CI/CD / Create Tag (push) Has been cancelled
Gitea CI/CD / build-and-test (push) Has been cancelled
2025-10-04 00:52:35 +02:00
7e5e295590 .gitea/workflows/build.yaml aktualisiert
Some checks failed
Gitea CI/CD / Set Tag Name (push) Successful in 6s
Gitea CI/CD / build-and-test (push) Successful in 51s
Gitea CI/CD / Create Tag (push) Has been cancelled
Gitea CI/CD / docker-build-and-push (push) Has been cancelled
2025-10-04 00:34:47 +02:00
cb91ca3159 .gitea/workflows/build.yaml aktualisiert
All checks were successful
Gitea CI/CD / build-and-test (push) Successful in 1m5s
Gitea CI/CD / Set Tag Name (push) Successful in 7s
Gitea CI/CD / docker-build-and-push (push) Successful in 5m56s
Gitea CI/CD / Create Tag (push) Successful in 5s
2025-10-04 00:20:55 +02:00
340f92ed04 Merge pull request 'feature/service-detection' (#23) from feature/service-detection into staging
Some checks failed
Gitea CI/CD / Set Tag Name (push) Successful in 6s
Gitea CI/CD / build-and-test (push) Successful in 48s
Gitea CI/CD / Create Tag (push) Has been cancelled
Gitea CI/CD / docker-build-and-push (push) Has been cancelled
Reviewed-on: #23
2025-10-03 23:55:46 +02:00
2169b3d45f Changed Endpoint Names
Some checks failed
Gitea CI/CD / Set Tag Name (pull_request) Successful in 6s
Gitea CI/CD / build-and-test (pull_request) Successful in 1m7s
Gitea CI/CD / docker-build-and-push (pull_request) Successful in 8m59s
Gitea CI/CD / Create Tag (pull_request) Failing after 7s
2025-10-03 23:54:35 +02:00
27792ff7f4 Test und Log 2025-10-03 17:17:28 +02:00
9a59e10b0c Endpoint Definition 2025-10-03 16:45:06 +02:00
7860d7e0f7 Db Update, Endpoint eingerichtet, Ui angepasst 2025-10-03 16:37:00 +02:00
2334287437 Merge pull request 'enhancement/pipeline-upgrade' (#22) from enhancement/pipeline-upgrade into staging
All checks were successful
Gitea CI/CD / Set Tag Name (push) Successful in 5s
Gitea CI/CD / build-and-test (push) Successful in 1m1s
Gitea CI/CD / docker-build-and-push (push) Successful in 9m13s
Gitea CI/CD / Create Tag (push) Successful in 6s
Reviewed-on: #22
2025-10-03 14:49:17 +02:00
d68022d831 staging branch eingeführt
Some checks failed
Gitea CI/CD / Set Tag Name (pull_request) Successful in 6s
Gitea CI/CD / build-and-test (pull_request) Successful in 1m1s
Gitea CI/CD / docker-build-and-push (pull_request) Successful in 9m18s
Gitea CI/CD / Create Tag (pull_request) Failing after 5s
2025-10-03 14:48:50 +02:00
b3b97d4c09 tag erst wenn push fertig 2025-10-03 14:29:02 +02:00
db45872908 test
All checks were successful
Gitea CI/CD / Set Tag Name (push) Successful in 5s
Gitea CI/CD / Create Tag (push) Successful in 6s
Gitea CI/CD / build-and-test (push) Successful in 58s
Gitea CI/CD / docker-build-and-push (push) Successful in 6m2s
2025-10-03 14:26:21 +02:00
8e0dcc34e7 tag on every branch
All checks were successful
Gitea CI/CD / Set Tag Name (push) Successful in 5s
Gitea CI/CD / build-and-test (push) Successful in 56s
Gitea CI/CD / docker-build-and-push (push) Successful in 6m17s
Gitea CI/CD / Create Tag for Gitea (push) Successful in 5s
2025-10-03 14:15:08 +02:00
015cdcb202 syntax error fix
All checks were successful
Gitea CI/CD / Set Tag Name (push) Successful in 5s
Gitea CI/CD / build-and-test (push) Successful in 56s
Gitea CI/CD / docker-build-and-push (push) Successful in 6m10s
Gitea CI/CD / Create Tag for Gitea (push) Has been skipped
2025-10-03 14:03:24 +02:00
2841752870 chatgpt fix 2025-10-03 14:02:33 +02:00
8ffb220634 url changes
Some checks failed
Gitea CI/CD / Set Tag Name (push) Failing after 1s
Gitea CI/CD / build-and-test (push) Successful in 54s
Gitea CI/CD / docker-build-and-push (push) Has been skipped
Gitea CI/CD / Create Tag for Gitea (push) Has been skipped
2025-10-03 14:00:22 +02:00
120374ebe1 url change
Some checks failed
Gitea CI/CD / Set Tag Name (push) Failing after 2s
Gitea CI/CD / build-and-test (push) Successful in 53s
Gitea CI/CD / docker-build-and-push (push) Failing after 11s
Gitea CI/CD / Create Tag for Gitea (push) Has been skipped
2025-10-03 13:57:15 +02:00
55aa9f546a pipeline upgrade
Some checks failed
Gitea CI/CD / Set Tag Name (push) Failing after 1s
Gitea CI/CD / build-and-test (push) Successful in 1m4s
Gitea CI/CD / docker-build-and-push (push) Failing after 17s
Gitea CI/CD / Create Tag for Gitea (push) Has been skipped
2025-10-03 13:51:33 +02:00
0974c1d7dd Merge pull request 'feature/db-check' (#21) from feature/db-check into development
All checks were successful
Development Build / build-and-test (push) Successful in 54s
Development Build / docker-build-and-push (push) Successful in 6m7s
Reviewed-on: #21
2025-10-03 13:11:17 +02:00
0e72287c6b Cache aktiviert 2025-10-03 13:10:56 +02:00
3918425ef9 Merge branch 'development' of https://git.triggermeelmo.com/Watcher/watcher into feature/db-check 2025-10-03 13:04:18 +02:00
ec13a51575 Merge pull request 'feature/network-check' (#20) from feature/network-check into development
All checks were successful
Development Build / build-and-test (push) Successful in 57s
Development Build / docker-build-and-push (push) Successful in 6m7s
Reviewed-on: #20
2025-10-03 13:03:31 +02:00
b8626cb8ea Debug Logs entfernt 2025-10-03 13:02:36 +02:00
281e9c686b Ui Anzeige fixed 2025-10-03 12:48:05 +02:00
69dd73a079 UI Anpassungen 2025-10-03 01:39:15 +02:00
2e9d41fe60 Sqlite Data Source angepasst 2025-10-02 17:55:06 +02:00
7e75f3e49e Background Service erstellt 2025-10-02 17:12:29 +02:00
8e362f7271 Merge branch 'feature/network-check' of https://git.triggermeelmo.com/Watcher/watcher into feature/db-check 2025-10-02 11:24:49 +02:00
df7674f063 Merge pull request 'Metrics Fixed' (#14) from bug/sanitize-metrics into development
All checks were successful
Development Build / build-and-test (push) Successful in 1m3s
Development Build / docker-build-and-push (push) Successful in 6m41s
Reviewed-on: #14
2025-10-01 18:20:58 +02:00
9d0a2e40be Metrics Fixed 2025-10-01 18:20:21 +02:00
c8dc8adb0d Merge pull request 'Fixed RAM_LOAD sanitization' (#13) from bug/sanitize-metrics into development
All checks were successful
Development Build / build-and-test (push) Successful in 58s
Development Build / docker-build-and-push (push) Successful in 6m10s
Reviewed-on: #13
2025-10-01 13:17:25 +02:00
0aacf369d7 Fixed RAM_LOAD sanitization 2025-10-01 13:16:43 +02:00
2d8bf648d9 Merge pull request 'bug/sanitize-metrics' (#12) from bug/sanitize-metrics into development
All checks were successful
Development Build / build-and-test (push) Successful in 1m4s
Development Build / docker-build-and-push (push) Successful in 6m29s
Reviewed-on: #12
2025-10-01 12:58:15 +02:00
85c5a80360 sanitizeDegreeInputs 2025-10-01 12:57:27 +02:00
36e16fbcf9 sanitizemetrics eingeführt 2025-10-01 12:52:45 +02:00
52c4243efc Live Anzeige des Netzwerkstatus funktioniert 2025-10-01 10:15:50 +02:00
6248fad147 Background Service läuft im 60 Sekunden Rythmus. Ergebnis wird noch nciht gespeichert 2025-10-01 08:14:36 +02:00
5e2f9e4c3c sanitizeMetrics Funktion erstellt 2025-09-30 12:21:25 +02:00
32a6c0d108 Merge pull request 'closes feature/ui-rework' (#10) from feature/ui-rework into development
All checks were successful
Development Build / build-and-test (push) Successful in 1m20s
Development Build / docker-build-and-push (push) Successful in 6m57s
Reviewed-on: #10
2025-09-30 09:08:56 +02:00
d1f348a9fa .gitea/workflows/development-build.yaml aktualisiert
All checks were successful
Development Build / build-and-test (push) Successful in 48s
Development Build / docker-build-and-push (push) Successful in 5m58s
2025-09-25 17:02:19 +02:00
cff9a6699c .gitea/workflows/development-build.yaml aktualisiert
Some checks failed
Development Build / build-and-test (push) Successful in 49s
Development Build / docker-build-and-push (push) Failing after 10s
2025-09-25 16:57:13 +02:00
0bb0c09ce3 .gitea/workflows/development-build.yaml aktualisiert
Some checks failed
Development Build / build-and-test (push) Successful in 57s
Development Build / docker-build-and-push (push) Has been cancelled
2025-09-25 16:55:28 +02:00
5c9c9cd165 .gitea/workflows/development-build.yaml aktualisiert
Some checks failed
Development Build / build-and-test (push) Successful in 1m17s
Development Build / docker-build-and-push (push) Failing after 48s
2025-09-25 16:46:33 +02:00
b481cd764e .gitea/workflows/development-build.yaml aktualisiert
Some checks failed
Development Build / build-and-test (push) Successful in 1m21s
Development Build / docker-build-and-push (push) Has been cancelled
2025-09-25 16:42:05 +02:00
f4fa055edf Logo eingefügt 2025-09-12 15:15:51 +02:00
7def038cc9 stuff 2025-09-12 11:50:04 +02:00
6e6d17b134 Dashboard, Services, Server, Settings, Userinfo Page auf Darkmode umgebaut 2025-09-08 15:06:39 +02:00
ab6f99eb6b UI Overhaul 2025-09-07 01:08:06 +02:00
62f384cc7b Merge branch 'development' of https://git.triggermeelmo.com/watcher/Watcher into feature/ui-rework 2025-09-06 22:16:52 +02:00
c8480bb681 docker-compose.yaml aktualisiert 2025-09-02 11:33:15 +02:00
1c0fab71bb new Dashboard 2025-08-26 18:54:17 +02:00
aa35e83f6b Merge branch 'main' of https://git.triggermeelmo.com/watcher/Watcher into development 2025-08-23 00:07:04 +02:00
cd6d2a1825 Merge branch 'main' of https://git.triggermeelmo.com/watcher/Watcher into development 2025-08-22 23:01:00 +02:00
52 changed files with 1672 additions and 630 deletions

143
.gitea/workflows/build.yml Normal file
View File

@@ -0,0 +1,143 @@
name: Gitea CI/CD
on:
workflow_dispatch:
push:
branches: [ "development", "main", "staging" ]
tags: [ "v*.*.*" ]
env:
DOTNET_VERSION: '8.0.x'
DOCKER_IMAGE_NAME: watcher
REGISTRY_URL: git.triggermeelmo.com
DOCKER_PLATFORMS: 'linux/amd64,linux/arm64'
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
jobs:
build-and-test:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Setup .NET SDK
uses: actions/setup-dotnet@v3
with:
dotnet-version: ${{ env.DOTNET_VERSION }}
- name: Restore dependencies
run: dotnet restore
- name: Build
run: dotnet build --configuration Release --no-restore
- name: Test
run: dotnet test --no-build --verbosity normal
continue-on-error: true
- name: Publish
run: dotnet publish -c Release -o out
set-tag:
name: Set Tag Name
needs: [build-and-test]
#if: ${{ !failure() && !cancelled() && github.event_name != 'pull_request' }}
runs-on: ubuntu-latest
outputs:
tag_name: ${{ steps.set_tag.outputs.tag_name }}
should_tag: ${{ steps.set_tag.outputs.should_tag }}
steps:
- uses: actions/checkout@v4
- name: Determine next semantic version tag
id: set_tag
run: |
git fetch --tags
# Find latest tag matching vX.Y.Z
latest_tag=$(git tag --list 'v*.*.*' --sort=-v:refname | head -n 1)
if [[ -z "$latest_tag" ]]; then
major=0
minor=0
patch=0
else
version="${latest_tag#v}"
IFS='.' read -r major minor patch <<< "$version"
fi
if [[ "${GITHUB_REF}" == "refs/heads/main" ]]; then
major=$((major + 1))
minor=0
patch=0
new_tag="v${major}.${minor}.${patch}"
echo "tag_name=${new_tag}" >> $GITHUB_OUTPUT
echo "should_tag=true" >> $GITHUB_OUTPUT
echo "Creating new major version tag: ${new_tag}"
elif [[ "${GITHUB_REF}" == "refs/heads/development" ]]; then
minor=$((minor + 1))
patch=0
new_tag="v${major}.${minor}.${patch}"
echo "tag_name=${new_tag}" >> $GITHUB_OUTPUT
echo "should_tag=true" >> $GITHUB_OUTPUT
echo "Creating new minor version tag: ${new_tag}"
elif [[ "${GITHUB_REF}" == "refs/heads/staging" ]]; then
patch=$((patch + 1))
new_tag="v${major}.${minor}.${patch}"
echo "tag_name=${new_tag}" >> $GITHUB_OUTPUT
echo "should_tag=true" >> $GITHUB_OUTPUT
echo "Creating new patch version tag: ${new_tag}"
fi
docker-build-and-push:
runs-on: ubuntu-latest
needs: [build-and-test, set-tag]
if: |
needs.set-tag.outputs.should_tag == 'true' &&
github.event_name != 'pull_request'
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Setup Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Login to Gitea Container Registry
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY_URL}}
username: ${{ secrets.AUTOMATION_USERNAME }}
password: ${{ secrets.AUTOMATION_PASSWORD }}
- name: Build and Push Multi-Arch Docker Image
run: |
docker buildx build \
--platform ${{ env.DOCKER_PLATFORMS }} \
-t ${{ env.REGISTRY_URL }}/watcher/${{ env.DOCKER_IMAGE_NAME }}:${{ needs.set-tag.outputs.tag_name }} \
--push .
tag:
name: Create Tag
needs: [docker-build-and-push]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up Git user
run: |
git config user.name "GitHub Actions"
git config user.email "actions@github.com"
- name: Create and push tag
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
echo "Creating new tag: ${{ needs.set-tag.outputs.tag_name }}"
git tag ${{ needs.set-tag.outputs.tag_name }}
git push origin ${{ needs.set-tag.outputs.tag_name }}

View File

@@ -1,62 +0,0 @@
name: Development Build and Release
on:
push:
branches:
- development
env:
DOTNET_VERSION: '8.0.x'
DOCKER_IMAGE_NAME: 'watcher-server'
REGISTRY_URL: 'git.triggermeelmo.com/watcher'
DOCKER_PLATFORMS: 'linux/amd64,linux/arm64'
jobs:
build-and-test:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
- name: Setup .NET SDK
uses: actions/setup-dotnet@v3
with:
dotnet-version: ${{ env.DOTNET_VERSION }}
- name: Restore dependencies
run: dotnet restore
- name: Build
run: dotnet build --configuration Release --no-restore
- name: Test
run: dotnet test --no-build --verbosity normal
continue-on-error: true
- name: Publish
run: dotnet publish -c Release -o out
docker-build-and-push:
runs-on: ubuntu-latest
needs: build-and-test
steps:
- name: Checkout code
uses: actions/checkout@v3
- name: Setup Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Login to Gitea Container Registry
uses: docker/login-action@v2
with:
registry: git.triggermeelmo.com
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
- name: Build and Push Multi-Arch Docker Image
run: |
docker buildx build \
--platform ${{ env.DOCKER_PLATFORMS }} \
-t ${{ env.REGISTRY_URL }}/${{ env.DOCKER_IMAGE_NAME }}:development \
-t ${{ env.REGISTRY_URL }}/${{ env.DOCKER_IMAGE_NAME }}:${{ github.sha }} \
--push .

View File

@@ -1,62 +0,0 @@
name: Release Build and Release
on:
push:
branches:
- main
env:
DOTNET_VERSION: '8.0.x'
DOCKER_IMAGE_NAME: 'watcher-server'
REGISTRY_URL: 'git.triggermeelmo.com/watcher'
DOCKER_PLATFORMS: 'linux/amd64,linux/arm64'
jobs:
build-and-test:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
- name: Setup .NET SDK
uses: actions/setup-dotnet@v3
with:
dotnet-version: ${{ env.DOTNET_VERSION }}
- name: Restore dependencies
run: dotnet restore
- name: Build
run: dotnet build --configuration Release --no-restore
- name: Test
run: dotnet test --no-build --verbosity normal
continue-on-error: true
- name: Publish
run: dotnet publish -c Release -o out
docker-build-and-push:
runs-on: ubuntu-latest
needs: build-and-test
steps:
- name: Checkout code
uses: actions/checkout@v3
- name: Setup Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Login to Gitea Container Registry
uses: docker/login-action@v2
with:
registry: git.triggermeelmo.com
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
- name: Build and Push Multi-Arch Docker Image
run: |
docker buildx build \
--platform ${{ env.DOCKER_PLATFORMS }} \
-t ${{ env.REGISTRY_URL }}/${{ env.DOCKER_IMAGE_NAME }}:v0.1.0 \
-t ${{ env.REGISTRY_URL }}/${{ env.DOCKER_IMAGE_NAME }}:${{ github.sha }} \
--push .

View File

@@ -1,23 +0,0 @@
# Read the Docs configuration file
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
# Required
version: 2
# Set the OS, Python version, and other tools you might need
build:
os: ubuntu-24.04
tools:
python: "3.13"
# Build documentation in the "docs/" directory with Sphinx
sphinx:
configuration: docs/conf.py
# Optionally, but recommended,
# declare the Python requirements required to build your documentation
# See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
# python:
# install:
# - requirements: docs/requirements.txt

28
Tests/servicediscovery.py Normal file
View File

@@ -0,0 +1,28 @@
import json
import urllib.request
url = "http://localhost:5000/monitoring/service-discovery"
payload = {
"ServerId": 1,
"ContainerId": "aaaaaaaaaaaa",
"Name": "test-Name",
"Image": "test-Image"
}
data = json.dumps(payload).encode("utf-8")
req = urllib.request.Request(
url,
data=data,
headers={"Content-Type": "application/json"},
method="POST"
)
try:
with urllib.request.urlopen(req) as response:
resp_data = response.read().decode("utf-8")
print("Status Code:", response.status)
print("Response:", resp_data)
except Exception as e:
print("Fehler beim Senden der Request:", e)

View File

@@ -0,0 +1,32 @@
using System.Threading.Tasks;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
using Watcher.Data;
[Route("[controller]/v1")]
public class ApiController : Controller
{
private readonly AppDbContext _context;
private readonly ILogger<ApiController> _logger;
public ApiController(AppDbContext context, ILogger<ApiController> logger)
{
_context = context;
_logger = logger;
}
[HttpGet("reference")]
public IActionResult ApiReference()
{
return View();
}
[HttpGet("servers")]
public async Task<IActionResult> GetAllServers()
{
var Servers = await _context.Servers.OrderBy(s => s.Id).ToListAsync();
return Ok();
}
}

View File

@@ -116,7 +116,7 @@ namespace Watcher.Controllers
TempData["DumpMessage"] = "SQLite-Dump erfolgreich erstellt.";
_logger.LogInformation("SQLite-Dump erfolgreich erstellt.");
return RedirectToAction("UserSettings", "User");
return RedirectToAction("Settings", "System");
}
catch (Exception ex)
{

View File

@@ -5,6 +5,7 @@ using Microsoft.EntityFrameworkCore;
// Local Namespaces
using Watcher.Data;
using Watcher.ViewModels;
using Watcher.Services;
namespace Watcher.Controllers
{
@@ -17,11 +18,16 @@ namespace Watcher.Controllers
// Logging einbinden
private readonly ILogger<HomeController> _logger;
// Daten der Backgroundchecks abrufen
private IDashboardStore _DashboardStore;
// HomeController Constructor
public HomeController(AppDbContext context, ILogger<HomeController> logger)
public HomeController(AppDbContext context, ILogger<HomeController> logger, IDashboardStore dashboardStore)
{
_context = context;
_logger = logger;
_DashboardStore = dashboardStore;
}
// Dashboard unter /home/index
@@ -41,15 +47,27 @@ namespace Watcher.Controllers
OfflineServers = await _context.Servers.CountAsync(s => !s.IsOnline),
RunningContainers = await _context.Containers.CountAsync(c => c.IsRunning),
FailedContainers = await _context.Containers.CountAsync(c => !c.IsRunning),
LastLogin = user?.LastLogin ?? DateTime.MinValue
LastLogin = user?.LastLogin ?? DateTime.MinValue,
Servers = await _context.Servers
.OrderBy(s => s.Name)
.ToListAsync(),
RecentEvents = await _context.LogEvents
.OrderByDescending(e => e.Timestamp)
.Take(20)
.ToListAsync(),
Containers = await _context.Containers
.OrderBy(s => s.Name)
.ToListAsync(),
NetworkStatus = _DashboardStore.NetworkStatus,
DatabaseStatus = _DashboardStore.DatabaseStatus
};
//ViewBag.NetworkConnection = _NetworkCheckStore.NetworkStatus;
return View(viewModel);
}
// Funktion für /Views/Home/Index.cshtml um das DashboardStats-Partial neu zu laden.
// Die Funktion wird nicht direkt aufgerufen, sondern nur der /Home/DashboardStats Endpoint angefragt.
public IActionResult DashboardStats()
public async Task<IActionResult> DashboardStats()
{
var servers = _context.Servers.ToList();
var containers = _context.Containers.ToList();
@@ -58,18 +76,31 @@ namespace Watcher.Controllers
var model = new DashboardViewModel
{
ActiveServers = servers.Count(s => (now - s.LastSeen).TotalSeconds <= 120),
OfflineServers = servers.Count(s => (now - s.LastSeen).TotalSeconds > 120),
//TODO: anwendbar, wenn Container implementiert wurden.
//RunningContainers = containers.Count(c => (now - c.LastSeen).TotalSeconds <= 120),
//FailedContainers = containers.Count(c => (now - c.LastSeen).TotalSeconds > 120),
LastLogin = DateTime.Now
ActiveServers = await _context.Servers.CountAsync(s => s.IsOnline),
OfflineServers = await _context.Servers.CountAsync(s => !s.IsOnline),
RunningContainers = await _context.Containers.CountAsync(c => c.IsRunning),
FailedContainers = await _context.Containers.CountAsync(c => !c.IsRunning),
Servers = await _context.Servers
.OrderBy(s => s.Name)
.ToListAsync(),
RecentEvents = await _context.LogEvents
.OrderByDescending(e => e.Timestamp)
.Take(20)
.ToListAsync(),
Containers = await _context.Containers
.OrderBy(s => s.Name)
.ToListAsync(),
NetworkStatus = _DashboardStore.NetworkStatus,
DatabaseStatus = _DashboardStore.DatabaseStatus
};
return PartialView("_DashboardStats", model);
}
public String ReturnNetworkStatus()
{
return "OK";
}
}
}

View File

@@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.CodeAnalysis;
using Microsoft.Data.Sqlite;
using Microsoft.EntityFrameworkCore;
using Microsoft.IdentityModel.Tokens;
using Watcher.Data;
@@ -11,7 +12,7 @@ using Watcher.ViewModels;
namespace Watcher.Controllers;
public class RegistrationDto
public class HardwareDto
{
// Server Identity
[Required]
@@ -55,28 +56,35 @@ public class MetricDto
public double GPU_Temp { get; set; } // deg C
public double GPU_Vram_Size { get; set; } // GB
public double GPU_Vram_Size { get; set; } // Bytes
public double GPU_Vram_Usage { get; set; } // %
public double GPU_Vram_Load { get; set; } // %
// RAM
public double RAM_Size { get; set; } // GB
public double RAM_Size { get; set; } // Bytes
public double RAM_Load { get; set; } // %
// Disks
public double DISK_Size { get; set; } // GB
public double DISK_Size { get; set; } // Bytes
public double DISK_Usage { get; set; } // %
public double DISK_Usage { get; set; } // Bytes
public double DISK_Temp { get; set; } // deg C
public double DISK_Temp { get; set; } // deg C (if available)
// Network
public double NET_In { get; set; } // Bit
public double NET_In { get; set; } // Bytes/s
public double NET_Out { get; set; } // Bit
public double NET_Out { get; set; } // Bytes/s
}
public class ServiceDto
{
public int ServerId { get; set; } // Vom Watcher-Server zugewiesene ID des Hosts
public String? ContainerId { get; set; }
public String? Image { get; set; }
public String? Name { get; set; }
}
[ApiController]
[Route("[controller]")]
@@ -93,9 +101,9 @@ public class MonitoringController : Controller
}
// Endpoint, an dem sich neue Agents registrieren
[HttpPost("register-agent-by-id")]
public async Task<IActionResult> Register([FromBody] RegistrationDto dto)
// Endpoint, an den der Agent seine Hardwareinformationen schickt
[HttpPost("hardware-info")]
public async Task<IActionResult> Register([FromBody] HardwareDto dto)
{
// Gültigkeit des Payloads prüfen
if (!ModelState.IsValid)
@@ -128,13 +136,12 @@ public class MonitoringController : Controller
_logger.LogInformation("Agent für '{server}' erfolgreich registriert.", server.Name);
return Ok();
}
_logger.LogError("Kein Server für Registrierung gefunden");
return NotFound("No Matching Server found.");
}
[HttpGet("server-id-by-ip")]
// Endpoint, an dem sich ein Agent initial registriert
[HttpGet("register")]
public async Task<IActionResult> GetServerIdByIp([FromQuery] string IpAddress)
{
var server = await _context.Servers
@@ -173,26 +180,28 @@ public class MonitoringController : Controller
if (server != null)
{
// neues Metric-Objekt erstellen
var NewMetric = new Metric
{
Timestamp = DateTime.UtcNow,
ServerId = dto.ServerId,
CPU_Load = dto.CPU_Load,
CPU_Temp = dto.CPU_Temp,
GPU_Load = dto.GPU_Load,
GPU_Temp = dto.GPU_Temp,
GPU_Vram_Size = dto.GPU_Vram_Size,
GPU_Vram_Usage = dto.GPU_Vram_Usage,
RAM_Load = dto.RAM_Load,
RAM_Size = dto.RAM_Size,
DISK_Size = dto.RAM_Size,
DISK_Usage = dto.DISK_Usage,
DISK_Temp = dto.DISK_Temp,
NET_In = dto.NET_In,
NET_Out = dto.NET_Out
CPU_Load = sanitizeInput(dto.CPU_Load),
CPU_Temp = sanitizeInput(dto.CPU_Temp),
GPU_Load = sanitizeInput(dto.GPU_Load),
GPU_Temp = sanitizeInput(dto.GPU_Temp),
GPU_Vram_Size = calculateGigabyte(dto.GPU_Vram_Size),
GPU_Vram_Usage = sanitizeInput(dto.GPU_Vram_Load),
RAM_Load = sanitizeInput(dto.RAM_Load),
RAM_Size = calculateGigabyte(dto.RAM_Size),
DISK_Size = calculateGigabyte(dto.DISK_Size),
DISK_Usage = calculateGigabyte(dto.DISK_Usage),
DISK_Temp = sanitizeInput(dto.DISK_Temp),
NET_In = calculateMegabit(dto.NET_In),
NET_Out = calculateMegabit(dto.NET_Out)
};
try
{
// Metric Objekt in Datenbank einfügen
_context.Metrics.Add(NewMetric);
await _context.SaveChangesAsync();
@@ -213,6 +222,50 @@ public class MonitoringController : Controller
}
// Endpoint, an dem Agents Ihre laufenden Services registrieren
[HttpPost("service-discovery")]
public async Task<IActionResult> ServiceDetection([FromBody] ServiceDto dto)
{
// Gültigkeit des Payloads prüfen
if (!ModelState.IsValid)
{
var errors = ModelState.Values
.SelectMany(v => v.Errors)
.Select(e => e.ErrorMessage)
.ToList();
_logger.LogError("Ungültiger ServiceDetection-Payload.");
return BadRequest(new { error = "Ungültiger Payload", details = errors });
}
// Metrics für Container, die zu ServerId gehören, löschen
// Container, die zu ServerId gehören löschen
// Container neu in Datenbank einlesen
try
{
Container container = new Container
{
ServerId = dto.ServerId,
ContainerId = dto.ContainerId,
Image = dto.Name,
Name = dto.Name
};
_logger.LogInformation(container.Name + " added for Host " + container.ServerId);
_context.Containers.Add(container);
await _context.SaveChangesAsync();
}
catch (SqliteException e)
{
_logger.LogError("ServiceDiscovery failed: " + e.Message);
}
return Ok();
}
// Durchschnittliche Werte Berechnen
[HttpGet("median")]
@@ -281,4 +334,38 @@ public class MonitoringController : Controller
return Ok(data);
}
// Metric Input Byte zu Gigabyte umwandeln
public static double calculateGigabyte(double metric_input)
{
// *10^-9 um auf Gigabyte zu kommen
double calculatedValue = metric_input * Math.Pow(10, -9);
// Auf 2 Nachkommastellen runden
double calculatedValue_s = sanitizeInput(calculatedValue);
return calculatedValue_s;
}
// Metric Input Byte/s zu Megabit/s umrechnen
//TODO
public static double calculateMegabit(double metric_input)
{
// *10^-9 um auf Gigabyte zu kommen
double calculatedValue = metric_input * Math.Pow(10, -9);
// Auf 2 Nachkommastellen runden
double calculatedValue_s = sanitizeInput(calculatedValue);
return calculatedValue_s;
}
// Degree Input auf zwei Nachkommastellen runden
public static double sanitizeInput(double metric_input)
{
Math.Round(metric_input, 2);
return metric_input;
}
}

View File

@@ -0,0 +1,36 @@
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Watcher.Data;
using Watcher.ViewModels;
namespace Watcher.Controllers;
[Authorize]
[Route("[controller]")]
public class SystemController : Controller
{
private readonly AppDbContext _context;
private readonly ILogger<SystemController> _logger;
public SystemController(AppDbContext context, ILogger<SystemController> logger)
{
_context = context;
_logger = logger;
}
// Edit-Form anzeigen
[HttpGet("Settings")]
//public async Task<IActionResult> Settings()
public IActionResult Settings()
{
ViewBag.DbProvider = "Microsoft.EntityFrameworkCore.Sqlite";
ViewBag.mail = "test@mail.com";
ViewBag.IdentityProvider = "Local";
ViewBag.ServerVersion = "v0.1.0";
return View();
}
// HttpPost
// public IActionResult UpdateNotifications(){}
}

View File

@@ -55,6 +55,7 @@ public class UserController : Controller
var user = _context.Users.FirstOrDefault(u => u.Username == username);
if (user == null) return NotFound();
var model = new EditUserViewModel
{
Username = user.Username
@@ -90,31 +91,6 @@ public class UserController : Controller
return RedirectToAction("Index", "Home");
}
// Edit-Form anzeigen
[Authorize]
[HttpGet]
public IActionResult UserSettings()
{
var username = User.Identity?.Name;
Console.WriteLine("gefundener User: " + username);
var claims = User.Claims.Select(c => new { c.Type, c.Value }).ToList();
var user = _context.Users.FirstOrDefault(u => u.Username == username);
if (user == null) return NotFound();
var DbProvider = _context.Database.ProviderName;
var mail = user.Email;
ViewBag.Name = username;
ViewBag.mail = mail;
ViewBag.Claims = claims;
ViewBag.IdentityProvider = user.IdentityProvider;
ViewBag.DbProvider = DbProvider;
return View();
}
// Edit speichern
[Authorize]
[HttpPost]

View File

@@ -0,0 +1,355 @@
// <auto-generated />
using System;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Watcher.Data;
#nullable disable
namespace Watcher.Migrations
{
[DbContext(typeof(AppDbContext))]
[Migration("20251003135555_ContainerUpdate")]
partial class ContainerUpdate
{
/// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder.HasAnnotation("ProductVersion", "8.0.6");
modelBuilder.Entity("Watcher.Models.Container", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
b.Property<string>("ContainerId")
.HasColumnType("TEXT");
b.Property<string>("Image")
.HasColumnType("TEXT");
b.Property<int?>("ImageId")
.HasColumnType("INTEGER");
b.Property<bool>("IsRunning")
.HasColumnType("INTEGER");
b.Property<string>("Name")
.HasColumnType("TEXT");
b.Property<int>("ServerId")
.HasColumnType("INTEGER");
b.Property<int?>("TagId")
.HasColumnType("INTEGER");
b.HasKey("Id");
b.HasIndex("ImageId");
b.HasIndex("TagId");
b.ToTable("Containers");
});
modelBuilder.Entity("Watcher.Models.Image", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
b.Property<string>("Name")
.HasColumnType("TEXT");
b.Property<string>("Tag")
.HasColumnType("TEXT");
b.HasKey("Id");
b.ToTable("Images");
});
modelBuilder.Entity("Watcher.Models.LogEvent", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
b.Property<int?>("ContainerId")
.HasColumnType("INTEGER");
b.Property<string>("Level")
.HasColumnType("TEXT");
b.Property<string>("Message")
.HasColumnType("TEXT");
b.Property<int?>("ServerId")
.HasColumnType("INTEGER");
b.Property<DateTime>("Timestamp")
.HasColumnType("TEXT");
b.HasKey("Id");
b.HasIndex("ContainerId");
b.HasIndex("ServerId");
b.ToTable("LogEvents");
});
modelBuilder.Entity("Watcher.Models.Metric", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
b.Property<double>("CPU_Load")
.HasColumnType("REAL");
b.Property<double>("CPU_Temp")
.HasColumnType("REAL");
b.Property<double>("DISK_Size")
.HasColumnType("REAL");
b.Property<double>("DISK_Temp")
.HasColumnType("REAL");
b.Property<double>("DISK_Usage")
.HasColumnType("REAL");
b.Property<double>("GPU_Load")
.HasColumnType("REAL");
b.Property<double>("GPU_Temp")
.HasColumnType("REAL");
b.Property<double>("GPU_Vram_Size")
.HasColumnType("REAL");
b.Property<double>("GPU_Vram_Usage")
.HasColumnType("REAL");
b.Property<double>("NET_In")
.HasColumnType("REAL");
b.Property<double>("NET_Out")
.HasColumnType("REAL");
b.Property<double>("RAM_Load")
.HasColumnType("REAL");
b.Property<double>("RAM_Size")
.HasColumnType("REAL");
b.Property<int?>("ServerId")
.HasColumnType("INTEGER");
b.Property<DateTime>("Timestamp")
.HasColumnType("TEXT");
b.HasKey("Id");
b.ToTable("Metrics");
});
modelBuilder.Entity("Watcher.Models.Server", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
b.Property<double>("CPU_Load_Critical")
.HasColumnType("REAL");
b.Property<double>("CPU_Load_Warning")
.HasColumnType("REAL");
b.Property<double>("CPU_Temp_Critical")
.HasColumnType("REAL");
b.Property<double>("CPU_Temp_Warning")
.HasColumnType("REAL");
b.Property<int>("CpuCores")
.HasColumnType("INTEGER");
b.Property<string>("CpuType")
.HasColumnType("TEXT");
b.Property<DateTime>("CreatedAt")
.HasColumnType("TEXT");
b.Property<double>("DISK_Temp_Critical")
.HasColumnType("REAL");
b.Property<double>("DISK_Temp_Warning")
.HasColumnType("REAL");
b.Property<string>("Description")
.HasColumnType("TEXT");
b.Property<string>("DiskSpace")
.HasColumnType("TEXT");
b.Property<double>("Disk_Usage_Critical")
.HasColumnType("REAL");
b.Property<double>("Disk_Usage_Warning")
.HasColumnType("REAL");
b.Property<double>("GPU_Load_Critical")
.HasColumnType("REAL");
b.Property<double>("GPU_Load_Warning")
.HasColumnType("REAL");
b.Property<double>("GPU_Temp_Critical")
.HasColumnType("REAL");
b.Property<double>("GPU_Temp_Warning")
.HasColumnType("REAL");
b.Property<string>("GpuType")
.HasColumnType("TEXT");
b.Property<string>("IPAddress")
.IsRequired()
.HasColumnType("TEXT");
b.Property<bool>("IsOnline")
.HasColumnType("INTEGER");
b.Property<bool>("IsVerified")
.HasColumnType("INTEGER");
b.Property<DateTime>("LastSeen")
.HasColumnType("TEXT");
b.Property<string>("Name")
.IsRequired()
.HasColumnType("TEXT");
b.Property<double>("RAM_Load_Critical")
.HasColumnType("REAL");
b.Property<double>("RAM_Load_Warning")
.HasColumnType("REAL");
b.Property<double>("RamSize")
.HasColumnType("REAL");
b.Property<int?>("TagId")
.HasColumnType("INTEGER");
b.Property<string>("Type")
.IsRequired()
.HasColumnType("TEXT");
b.HasKey("Id");
b.HasIndex("TagId");
b.ToTable("Servers");
});
modelBuilder.Entity("Watcher.Models.Tag", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
b.Property<string>("Name")
.HasColumnType("TEXT");
b.HasKey("Id");
b.ToTable("Tags");
});
modelBuilder.Entity("Watcher.Models.User", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
b.Property<string>("Email")
.HasColumnType("TEXT");
b.Property<string>("IdentityProvider")
.IsRequired()
.HasColumnType("TEXT");
b.Property<DateTime>("LastLogin")
.HasColumnType("TEXT");
b.Property<string>("OIDC_Id")
.HasColumnType("TEXT");
b.Property<string>("Password")
.IsRequired()
.HasColumnType("TEXT");
b.Property<string>("Username")
.IsRequired()
.HasColumnType("TEXT");
b.HasKey("Id");
b.ToTable("Users");
});
modelBuilder.Entity("Watcher.Models.Container", b =>
{
b.HasOne("Watcher.Models.Image", null)
.WithMany("Containers")
.HasForeignKey("ImageId");
b.HasOne("Watcher.Models.Tag", null)
.WithMany("Containers")
.HasForeignKey("TagId");
});
modelBuilder.Entity("Watcher.Models.LogEvent", b =>
{
b.HasOne("Watcher.Models.Container", "Container")
.WithMany()
.HasForeignKey("ContainerId");
b.HasOne("Watcher.Models.Server", "Server")
.WithMany()
.HasForeignKey("ServerId");
b.Navigation("Container");
b.Navigation("Server");
});
modelBuilder.Entity("Watcher.Models.Server", b =>
{
b.HasOne("Watcher.Models.Tag", null)
.WithMany("Servers")
.HasForeignKey("TagId");
});
modelBuilder.Entity("Watcher.Models.Image", b =>
{
b.Navigation("Containers");
});
modelBuilder.Entity("Watcher.Models.Tag", b =>
{
b.Navigation("Containers");
b.Navigation("Servers");
});
#pragma warning restore 612, 618
}
}
}

View File

@@ -0,0 +1,113 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Watcher.Migrations
{
/// <inheritdoc />
public partial class ContainerUpdate : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_Containers_Servers_HostServerId",
table: "Containers");
migrationBuilder.DropIndex(
name: "IX_Containers_HostServerId",
table: "Containers");
migrationBuilder.DropColumn(
name: "CreatedAt",
table: "Containers");
migrationBuilder.DropColumn(
name: "ExposedPort",
table: "Containers");
migrationBuilder.DropColumn(
name: "Health",
table: "Containers");
migrationBuilder.DropColumn(
name: "HostServerId",
table: "Containers");
migrationBuilder.DropColumn(
name: "Status",
table: "Containers");
migrationBuilder.RenameColumn(
name: "InternalPort",
table: "Containers",
newName: "ServerId");
migrationBuilder.AddColumn<string>(
name: "ContainerId",
table: "Containers",
type: "TEXT",
nullable: true);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "ContainerId",
table: "Containers");
migrationBuilder.RenameColumn(
name: "ServerId",
table: "Containers",
newName: "InternalPort");
migrationBuilder.AddColumn<DateTime>(
name: "CreatedAt",
table: "Containers",
type: "TEXT",
nullable: false,
defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
migrationBuilder.AddColumn<int>(
name: "ExposedPort",
table: "Containers",
type: "INTEGER",
nullable: false,
defaultValue: 0);
migrationBuilder.AddColumn<string>(
name: "Health",
table: "Containers",
type: "TEXT",
nullable: false,
defaultValue: "");
migrationBuilder.AddColumn<int>(
name: "HostServerId",
table: "Containers",
type: "INTEGER",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "Status",
table: "Containers",
type: "TEXT",
nullable: false,
defaultValue: "");
migrationBuilder.CreateIndex(
name: "IX_Containers_HostServerId",
table: "Containers",
column: "HostServerId");
migrationBuilder.AddForeignKey(
name: "FK_Containers_Servers_HostServerId",
table: "Containers",
column: "HostServerId",
principalTable: "Servers",
principalColumn: "Id");
}
}
}

View File

@@ -23,45 +23,29 @@ namespace Watcher.Migrations
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
b.Property<DateTime>("CreatedAt")
b.Property<string>("ContainerId")
.HasColumnType("TEXT");
b.Property<int>("ExposedPort")
.HasColumnType("INTEGER");
b.Property<string>("Health")
.IsRequired()
.HasColumnType("TEXT");
b.Property<int?>("HostServerId")
.HasColumnType("INTEGER");
b.Property<string>("Image")
.HasColumnType("TEXT");
b.Property<int?>("ImageId")
.HasColumnType("INTEGER");
b.Property<int>("InternalPort")
.HasColumnType("INTEGER");
b.Property<bool>("IsRunning")
.HasColumnType("INTEGER");
b.Property<string>("Name")
.HasColumnType("TEXT");
b.Property<string>("Status")
.IsRequired()
.HasColumnType("TEXT");
b.Property<int>("ServerId")
.HasColumnType("INTEGER");
b.Property<int?>("TagId")
.HasColumnType("INTEGER");
b.HasKey("Id");
b.HasIndex("HostServerId");
b.HasIndex("ImageId");
b.HasIndex("TagId");
@@ -320,10 +304,6 @@ namespace Watcher.Migrations
modelBuilder.Entity("Watcher.Models.Container", b =>
{
b.HasOne("Watcher.Models.Server", "HostServer")
.WithMany()
.HasForeignKey("HostServerId");
b.HasOne("Watcher.Models.Image", null)
.WithMany("Containers")
.HasForeignKey("ImageId");
@@ -331,8 +311,6 @@ namespace Watcher.Migrations
b.HasOne("Watcher.Models.Tag", null)
.WithMany("Containers")
.HasForeignKey("TagId");
b.Navigation("HostServer");
});
modelBuilder.Entity("Watcher.Models.LogEvent", b =>

View File

@@ -4,22 +4,11 @@ public class Container
{
public int Id { get; set; }
// Container Details
public string? Name { get; set; }
public int ServerId { get; set; }
public int ExposedPort { get; set; }
public int InternalPort { get; set; }
public string Status { get; set; } = string.Empty;
public string Health { get; set; } = string.Empty;
public string? Image { get; set; }
public DateTime CreatedAt { get; set; } = DateTime.UtcNow;
public String? ContainerId { get; set; }
public String? Image { get; set; }
public String? Name { get; set; }
public Boolean IsRunning { get; set; } = true;
public Server? HostServer { get; set; }
}

View File

@@ -0,0 +1,16 @@
using System.Collections.Generic;
namespace Watcher.Models
{
public class HealthStatus
{
public DateTime Timestamp { get; set; }
public bool NetworkOk { get; set; }
public bool DatabaseOk { get; set; }
public List<string> Issues { get; set; } = new List<string>();
// Optional weitere Checks
public bool ApiOk { get; set; }
public bool DiskOk { get; set; }
}
}

View File

@@ -1,14 +1,13 @@
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Authentication.Cookies;
using Microsoft.AspNetCore.Authentication.OpenIdConnect;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Sqlite;
using Microsoft.IdentityModel.Tokens;
using Serilog;
using Watcher.Data;
using Watcher.Models;
using Watcher.Services;
//using Watcher.Services;
//using Watcher.Workers;
var builder = WebApplication.CreateBuilder(args);
@@ -17,7 +16,7 @@ var builder = WebApplication.CreateBuilder(args);
// Serilog konfigurieren nur Logs, die nicht von Microsoft stammen
Log.Logger = new LoggerConfiguration()
.MinimumLevel.Information()
.MinimumLevel.Override("Microsoft", Serilog.Events.LogEventLevel.Warning) // <--
.MinimumLevel.Override("Microsoft", Serilog.Events.LogEventLevel.Warning)
.Enrich.FromLogContext()
.WriteTo.File(
"logs/watcher-.log",
@@ -32,10 +31,16 @@ builder.Host.UseSerilog();
// Add services to the container.
builder.Services.AddControllersWithViews();
// HttpContentAccessor
builder.Services.AddHttpContextAccessor();
// Storage Singleton
builder.Services.AddSingleton<IDashboardStore, DashboardStore>();
// Background Services
builder.Services.AddHostedService<NetworkCheck>();
builder.Services.AddHostedService<DatabaseCheck>();
// ---------- Konfiguration ----------
DotNetEnv.Env.Load();
@@ -112,7 +117,11 @@ builder.Services.AddAuthentication()
var db = ctx.HttpContext.RequestServices.GetRequiredService<AppDbContext>();
var principal = ctx.Principal;
#pragma warning disable CS8602 // Dereference of a possibly null reference.
var pocketId = principal.FindFirst("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier")?.Value;
#pragma warning restore CS8602 // Dereference of a possibly null reference.
var preferredUsername = principal.FindFirst("preferred_username")?.Value;
var email = principal.FindFirst("email")?.Value;
@@ -213,4 +222,4 @@ app.MapControllerRoute(
pattern: "{controller=Home}/{action=Index}/{id?}"
);
app.Run();
app.Run();

View File

@@ -0,0 +1,8 @@
namespace Watcher.Services;
public class DashboardStore : IDashboardStore
{
public String? NetworkStatus { get; set; }
public String? DatabaseStatus { get; set; }
}

View File

@@ -0,0 +1,67 @@
using Microsoft.Data.Sqlite;
namespace Watcher.Services;
public class DatabaseCheck : BackgroundService
{
private readonly ILogger<DatabaseCheck> _logger;
private IDashboardStore _dashboardStore;
public DatabaseCheck(ILogger<DatabaseCheck> logger, IDashboardStore dashboardStore)
{
_logger = logger;
_dashboardStore = dashboardStore;
}
protected override async Task ExecuteAsync(CancellationToken stoppingToken)
{
var timer = new PeriodicTimer(TimeSpan.FromSeconds(30));
while (await timer.WaitForNextTickAsync(stoppingToken))
{
// Hintergrundprozess abwarten
await checkDatabaseIntegrity();
// 5 Sekdunden Offset
await Task.Delay(TimeSpan.FromSeconds(5), stoppingToken);
}
}
// String sqliteConnectionString als Argument übergeben
public Task checkDatabaseIntegrity()
{
using var conn = new SqliteConnection("Data Source=./persistence/watcher.db");
_logger.LogInformation("Sqlite Integrity-Check started...");
try
{
conn.Open();
using var command = conn.CreateCommand();
command.CommandText = """
SELECT integrity_check FROM pragma_integrity_check;
""";
using var reader = command.ExecuteReader();
while (reader.Read())
{
string status = reader.GetString(0);
_dashboardStore.DatabaseStatus = status;
_logger.LogInformation("Sqlite DatabaseIntegrity: ${status}", status);
}
conn.Close();
}
catch (SqliteException e)
{
conn.Close();
_logger.LogError(e.Message);
// TODO: LogEvent erstellen
}
_logger.LogInformation("Database Integrity-Check finished.");
return Task.CompletedTask;
}
}

View File

@@ -0,0 +1,7 @@
namespace Watcher.Services;
public interface IDashboardStore
{
String? NetworkStatus { get; set; }
String? DatabaseStatus { get; set; }
}

View File

@@ -0,0 +1,59 @@
using System.Net.NetworkInformation;
namespace Watcher.Services;
public class NetworkCheck : BackgroundService
{
private readonly ILogger<NetworkCheck> _logger;
private IDashboardStore _DashboardStore;
public NetworkCheck(ILogger<NetworkCheck> logger, IDashboardStore DashboardStore)
{
_logger = logger;
_DashboardStore = DashboardStore;
}
protected override async Task ExecuteAsync(CancellationToken stoppingToken)
{
var timer = new PeriodicTimer(TimeSpan.FromSeconds(30));
while (await timer.WaitForNextTickAsync(stoppingToken))
{
// Hintergrundprozess abwarten
await checkConnectionAsync();
// 5 Sekdunden Offset
await Task.Delay(TimeSpan.FromSeconds(5), stoppingToken);
}
}
public Task checkConnectionAsync()
{
_logger.LogInformation("Networkcheck started.");
string host = "8.8.8.8";
Ping p = new Ping();
try
{
PingReply reply = p.Send(host, 3000);
if (reply.Status == IPStatus.Success)
{
_DashboardStore.NetworkStatus = "online";
_logger.LogInformation("Ping successfull. Watcher is online.");
}
}
catch
{
_DashboardStore.NetworkStatus = "offline";
_logger.LogError("Ping failed. Watcher appears to have no network connection.");
// LogEvent erstellen
}
_logger.LogInformation("Networkcheck finished.");
return Task.CompletedTask;
}
}

View File

@@ -1,3 +1,5 @@
using Watcher.Models;
namespace Watcher.ViewModels
{
public class DashboardViewModel
@@ -7,5 +9,13 @@ namespace Watcher.ViewModels
public int RunningContainers { get; set; }
public int FailedContainers { get; set; }
public DateTime LastLogin { get; set; }
public List<Server> Servers { get; set; } = new();
public List<LogEvent> RecentEvents { get; set; } = new();
public List<Container> Containers { get; set; } = new();
public String? NetworkStatus { get; set; } = "?";
public String? DatabaseStatus { get; set; } = "?";
}
}

View File

@@ -0,0 +1 @@
<p>i</p>

View File

@@ -5,55 +5,10 @@
var oidc = ViewBag.oidc;
}
<style>
body {
background-color: #0d1b2a;
}
.login-card {
background-color: #1b263b;
color: #ffffff;
padding: 2rem;
border-radius: 1rem;
box-shadow: 0 0 20px rgba(0, 0, 0, 0.5);
max-width: 400px;
margin: auto;
}
.form-control {
background-color: #415a77;
border: none;
color: white;
}
.form-control::placeholder {
color: #c0c0c0;
}
.btn-primary {
background-color: #0d6efd;
border: none;
}
.btn-pocketid {
background-color: #14a44d;
color: white;
border: none;
}
.btn-pocketid:hover {
background-color: #0f8c3c;
}
label {
margin-top: 1rem;
}
.form-error {
color: #ff6b6b;
font-size: 0.875rem;
}
</style>
<head>
<link rel="stylesheet" href="~/css/main.css" />
<link rel="stylesheet" href="~/css/Login.css" />
</head>
<div class="login-card">
<h2 class="text-center mb-4">Anmelden</h2>

View File

@@ -3,32 +3,32 @@
ViewData["Title"] = "Containerübersicht";
}
<head>
<link rel="stylesheet" href="~/css/main.css" />
<link rel="stylesheet" href="~/css/services-overview.css" />
</head>
<div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-6">
@foreach (var server in Model.Servers)
{
<div class="bg-white shadow-md rounded-xl p-5 border border-gray-200 hover:shadow-lg transition duration-200">
<h2 class="text-xl font-semibold mb-1">@server.Name</h2>
</div>
<div >
<table class="ServiceList">
<tr>
<th>Service</th>
<th>HostServer</th>
<th>Status</th>
<th>Deployment</th>
<th></th>
<div class="bg-white">
@if (Model.Containers.Count > 0)
{
<table>
@foreach (var container in Model.Containers)
{
<tr>test</tr>
if (container.HostServer.Equals(server.Name))
{
</tr>
@foreach (Container container in Model.Containers)
{
<tr class="ServiceRow">
<td>@container.Name</td>
<td><a class="ServiceEntry" href="/Server/Details/${containerId}">@container.ServerId</a></td>
<td>nicht automatisiert</td>
<td>Docker</td>
</tr>
}
</table>
</div>
}
}
</table>
} else
{
<p> keine Container gefunden </p>
}
</div>
}
</div>

View File

@@ -3,6 +3,11 @@
ViewData["Title"] = "Datenbank-Dumps";
}
<head>
<link rel="stylesheet" href="~/css/main.css" />
<link rel="stylesheet" href="~/css/databases.css" />
</head>
<h2 class="mb-4 text-xl font-bold"><i class="bi bi-hdd me-1"></i>Datenbank-Dumps</h2>
@if (TempData["Success"] != null)
@@ -14,7 +19,7 @@
<div class="alert alert-danger">@TempData["Error"]</div>
}
<table class="table table-striped">
<table class="dumptable">
<thead>
<tr>
<th>Dateiname</th>

View File

@@ -3,6 +3,9 @@
ViewData["Title"] = "Dashboard";
}
<head>
<link rel="stylesheet" href="~/css/site.css" />
</head>
<h1 class="mb-4">
<i class="bi bi-speedometer2 me-2"></i>Dashboard
</h1>
@@ -11,25 +14,6 @@
@await Html.PartialAsync("_DashboardStats", Model)
</div>
<div class="row g-4 mt-4">
<div class="col-12">
<div class="card p-3">
<h2 class="h5">
<i class="bi bi-person-circle me-2"></i>Systeminfo
</h2>
<p>
<i class="bi bi-person-badge me-1"></i>
Benutzer: <strong>@User.FindFirst("preferred_username")?.Value</strong>
</p>
<p>
<i class="bi bi-clock me-1"></i>
Letzter Login: <strong>@Model.LastLogin.ToString("g")</strong>
</p>
</div>
</div>
</div>
@section Scripts {
<script>
async function loadDashboardStats() {

View File

@@ -1,25 +1,184 @@
@using Microsoft.IdentityModel.Tokens
@model Watcher.ViewModels.DashboardViewModel
<div class="row g-4">
<div class="col-12 col-md-6">
<div class="bg-white shadow rounded-3 p-4 h-100">
<h2 class="h5 fw-semibold mb-2">Server</h2>
<p>🟢 Online: <strong>@Model.ActiveServers</strong></p>
<p>🔴 Offline: <strong>@Model.OfflineServers</strong></p>
<a href="/Server/Overview" class="text-primary text-decoration-none mt-2 d-inline-block">
→ Zu den Servern
</a>
@{
ViewData["Title"] = "Dashboard";
}
<head>
<link rel="stylesheet" href="~/css/main.css" />
<link rel="stylesheet" href="~/css/dashboardstats.css" />
</head>
<body>
<div class="row g-4 mb-4">
<div class="col-12 col-sm-6 col-lg-3">
<div class="card shadow-sm border-0 rounded-3 text-center h-100">
<div class="card-body">
<i class="bi bi-hdd-network text-success fs-2 mb-2"></i>
<h6 class="text-text">Server Online</h6>
<h3 class="fw-bold">@Model.ActiveServers</h3>
</div>
</div>
</div>
<div class="col-12 col-sm-6 col-lg-3">
<div class="card shadow-sm border-0 rounded-3 text-center h-100">
<div class="card-body">
<i class="bi bi-hdd-network-fill text-danger fs-2 mb-2"></i>
<h6 class="text-text">Server Offline</h6>
<h3 class="fw-bold">@Model.OfflineServers</h3>
</div>
</div>
</div>
<div class="col-12 col-sm-6 col-lg-3">
<div class="card shadow-sm border-0 rounded-3 text-center h-100">
<div class="card-body">
<i class="bi bi-box-seam text-primary fs-2 mb-2"></i>
<h6 class="text-text">Services Running</h6>
<h3 class="fw-bold">@Model.RunningContainers</h3>
</div>
</div>
</div>
<div class="col-12 col-sm-6 col-lg-3">
<div class="card shadow-sm border-0 rounded-3 text-center h-100">
<div class="card-body">
<i class="bi bi-exclamation-triangle text-warning fs-2 mb-2"></i>
<h6 class="text-text">Service Warnungen</h6>
<h3 class="fw-bold">@Model.FailedContainers</h3>
</div>
</div>
</div>
</div>
<div class="col-12 col-md-6">
<div class="bg-white shadow rounded-3 p-4 h-100">
<h2 class="h5 fw-semibold mb-2">Container</h2>
<p>🟢 Laufend: <strong>@Model.RunningContainers</strong></p>
<p>🔴 Fehlerhaft: <strong>@Model.FailedContainers</strong></p>
<a href="/Container/Overview" class="text-primary text-decoration-none mt-2 d-inline-block">
→ Zu den Containern
</a>
<!-- System Overview & Recent Events -->
<div class="row g-4">
<!-- System Health -->
<div class="col-12 col-lg-6">
<div class="card shadow-sm border-0 rounded-3 h-100">
<div class="card-body">
<h5 class="fw-bold mb-3"><i class="bi bi-heart-pulse me-2 text-danger"></i>Systemstatus</h5>
@if (!Model.NetworkStatus.IsNullOrEmpty())
{
@if (Model.NetworkStatus == "online")
{
<div class="d-flex justify-content-between align-items-center mb-2">
<span>Netzwerk</span>
<span class="badge bg-success">@Model.NetworkStatus</span>
</div>
<div class="progress mb-3" style="height: 6px;">
<div class="progress-bar bg-success w-100"></div>
</div>
} else if (Model.NetworkStatus == "offline")
{
<div class="d-flex justify-content-between align-items-center mb-2">
<span>Netzwerk</span>
<span class="badge bg-danger">@Model.NetworkStatus</span>
</div>
<div class="progress mb-3" style="height: 6px;">
<div class="progress-bar bg-danger w-100"></div>
</div>
}
}
@if (!Model.DatabaseStatus.IsNullOrEmpty())
{
@if (Model.DatabaseStatus == "ok")
{
<div class="d-flex justify-content-between align-items-center mb-2">
<span>Datenbank</span>
<span class="badge bg-success">healthy</span>
</div>
} else
{
<div class="d-flex justify-content-between align-items-center mb-2">
<span>Datenbank</span>
<span class="badge bg-danger">unhealthy</span>
</div>
}
} else
{
<div class="d-flex justify-content-between align-items-center mb-2">
<span>Datenbank</span>
<span class="badge bg-primary">Missing Data</span>
</div>
}
<div class="progress mb-3" style="height: 6px;">
<div class="progress-bar bg-success w-100"></div>
</div>
</div>
</div>
</div>
</div>
</div>
<!-- Recent Events -->
<div class="col-12 col-lg-6">
<div class="card shadow-sm border-0 rounded-3 h-100">
<div class="card-body">
<h5 class="fw-bold mb-3"><i class="bi bi-activity me-2 text-primary"></i>Letzte Ereignisse</h5>
<ul class="list-group list-group-flush small">
@foreach (var log in Model.RecentEvents.Take(1))
{
<li class="list-group-item d-flex align-items-center">
<i class="bi bi-dot fs-4 text-muted me-1"></i>
<span class="text-muted me-2">@log.Timestamp.ToString("HH:mm:ss")</span>
<span>@log</span>
</li>
}
</ul>
</div>
</div>
</div>
<!-- Services -->
<!-- TODO
<div class="col-12 col-lg-6">
<div class="card shadow rounded-3 p-4 h-100">
<h2 class="h5 fw-semibold mb-3">Services</h2>
<ul class="list-group list-group-flush serverlist">
@foreach (var container in Model.Containers)
{
<li class="list-group-item d-flex justify-content-between align-items-center">
<span>@container.Name</span>
<span class="badge @(container.Name == "Running" ? "bg-success" : "bg-warning")">
@container.Name
</span>
</li>
}
</ul>
</div>
</div>
-->
<!-- Server Liste -->
<!-- TODO
<div class="col-12 col-lg-6">
<div class="card shadow rounded-3 p-4 h-100">
<h2 class="h5 fw-semibold mb-3">Server</h2>
<ul class="list-group list-group-flush">
@foreach (Server server in Model.Servers)
{
<li class="list-group-item d-flex justify-content-between align-items-center serverlist">
<span>@server.Name</span>
<span class="badge bg-info" )">
CPU:
</span>
<span class="badge bg-info" )">
RAM: 65.09%
</span>
<span class="badge @(server.IsOnline ? "bg-success" : "bg-danger")">
@(server.IsOnline ? "Online" : "Offline")
</span>
</li>
}
</ul>
</div>
-->
</div>
</body>

View File

@@ -3,6 +3,10 @@
ViewData["Title"] = "Neuen Server hinzufügen";
}
<head>
<link rel="stylesheet" href="~/css/main.css" />
</head>
<div class="container mt-5" style="max-width: 700px;">
<div class="card shadow rounded-3 p-4">
<h1 class="mb-4 text-primary-emphasis">

View File

@@ -3,76 +3,82 @@
ViewData["Title"] = "Serverübersicht";
}
<head>
<link rel="stylesheet" href="~/css/main.css" />
<link rel="stylesheet" href="~/css/server-detail.css" />
</head>
<div id="server-cards-container">
<div class="container mt-4"></div>
<div class="card shadow-sm">
<div class="card-header d-flex justify-content-between align-items-center">
<h5 class="mb-0">
<i class="bi bi-hdd-network me-2 text-primary"></i>Serverdetails: @Model.Name
</h5>
<span class="badge @(Model.IsOnline ? "bg-success" : "bg-danger")">
<i class="bi @(Model.IsOnline ? "bi-check-circle" : "bi-x-circle") me-1"></i>
@(Model.IsOnline ? "Online" : "Offline")
</span>
</div>
<div class="card-body">
<dl class="row mb-0">
<dt class="col-sm-3">ID</dt>
<dd class="col-sm-9">@Model.Id</dd>
<div class="container mt-4">
<div class="card shadow-sm">
<div class="card-header d-flex justify-content-between align-items-center">
<h5 class="mb-0">
<i class="bi bi-hdd-network me-2 text-primary"></i>@Model.Name
</h5>
<span class="badge @(Model.IsOnline ? "bg-success" : "bg-danger")">
<i class="bi @(Model.IsOnline ? "bi-check-circle" : "bi-x-circle") me-1"></i>
@(Model.IsOnline ? "Online" : "Offline")
</span>
</div>
<dt class="col-sm-3">IP-Adresse</dt>
<dd class="col-sm-9">@Model.IPAddress</dd>
<div class="infocard row g-4 mb-4">
<div class="info col-6 text-text col-lg-3">
<div><i class="bi bi-globe me-1"></i><strong>IP:</strong> @Model.IPAddress</div>
<div><i class="bi bi-pc-display me-1"></i><strong>Typ:</strong> @Model.Type</div>
<div><i class="bi bi-calendar-check me-1"></i><strong>Erstellt:</strong>
@Model.CreatedAt.ToLocalTime().ToString("dd.MM.yyyy HH:mm")</div>
<div><i class="bi bi-clock me-1"></i><strong>Last-Seen:</strong>
@Model.LastSeen.ToLocalTime().ToString("dd.MM.yyyy HH:mm")</div>
</div>
<div class="hardware col-6 text-text col-lg-3">
<div><i class="bi bi-cpu me-1"></i><strong>CPU:</strong> @(Model.CpuType ?? "not found") </div>
<div><i class="bi bi-cpu me-1"></i><strong>CPU-Kerne: </strong> @Model.CpuCores </div>
<div><i class="bi bi-gpu-card me-1"></i><strong>GPU:</strong> @(Model.GpuType ?? "not found")
</div>
<div><i class="bi bi-memory me-1"></i><strong>RAM:</strong> @(Model.RamSize) </div>
<div><i class="bi bi-hdd me-1"></i><strong>Disk Space:</strong> ... </div>
</div>
<div class="hardware col-6 text-text col-lg-3">
<div class="card-footer text-end">
<a asp-action="EditServer" asp-route-id="@Model.Id" class="btn btn-outline-primary me-2">
<i class="bi bi-pencil"></i> Bearbeiten
</a>
<form asp-action="Delete" asp-route-id="@Model.Id" method="post" class="d-inline"
onsubmit="return confirm('Diesen Server wirklich löschen?');">
<button type="submit" class="btn btn-outline-danger">
<i class="bi bi-trash"></i> Löschen
</button>
</form>
</div>
</div>
<dt class="col-sm-3">Typ</dt>
<dd class="col-sm-9">@Model.Type</dd>
</div>
<dt class="col-sm-3">Erstellt am</dt>
<dd class="col-sm-9">@Model.CreatedAt.ToLocalTime().ToString("dd.MM.yyyy HH:mm")</dd>
<dt class="col-sm-3">Zuletzt gesehen</dt>
<dd class="col-sm-9">@Model.LastSeen.ToLocalTime().ToString("dd.MM.yyyy HH:mm")</dd>
</dl>
</div>
<div class="card-footer text-end">
<a asp-action="EditServer" asp-route-id="@Model.Id" class="btn btn-outline-primary me-2">
<i class="bi bi-pencil"></i> Bearbeiten
</a>
<form asp-action="Delete" asp-route-id="@Model.Id" method="post" class="d-inline"
onsubmit="return confirm('Diesen Server wirklich löschen?');">
<button type="submit" class="btn btn-outline-danger">
<i class="bi bi-trash"></i> Löschen
</button>
</form>
</div>
</div>
<div class="mt-4">
<h6><i class="bi bi-graph-up me-1"></i>CPU Last</h6>
<div class="bg-light border rounded p-4 text-center text-muted" style="height: 500px; width: 100%">
<canvas id="cpuUsageChart" style="width: 800px; height: 400px; border: 1px solid red;"></canvas>
<div class="graphcontainer p-4 text-center text-muted">
<canvas class="graph" id="cpuUsageChart"></canvas>
</div>
</div>
</div>
<div class="mt-4">
<h6><i class="bi bi-graph-up me-1"></i>RAM Last</h6>
<div class="bg-light border rounded p-4 text-center text-muted" style="height: 500px; width: 100%">
<canvas id="ramUsageChart" style="width: 800px; height: 400px; border: 1px solid red;"></canvas>
<div class="graphcontainer p-4 text-center text-muted">
<canvas class="graph" id="ramUsageChart"></canvas>
</div>
</div>
<div class="mt-4"></div>
<div class="mt-4">
<h6><i class="bi bi-graph-up me-1"></i>GPU Last</h6>
<div class="bg-light border rounded p-4 text-center text-muted" style="height: 500px; width: 100%">
<canvas id="gpuUsageChart" style="width: 800px; height: 400px; border: 1px solid red;"></canvas>
<div class="graphcontainer p-4 text-center text-text">
<canvas class="graph" id="gpuUsageChart"></canvas>
</div>
</div>
</div>
</div>
@section Scripts {
<script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
<script>
@@ -88,7 +94,6 @@
datasets: [{
label: 'CPU Last (%)',
data: [],
borderColor: 'rgb(255, 99, 132)',
backgroundColor: 'rgba(255, 99, 132, 0.2)',
fill: true,
tension: 0.3,
@@ -109,7 +114,7 @@
},
x: {
title: {
display: true,
display: false,
text: 'Zeit'
}
}
@@ -124,7 +129,6 @@
datasets: [{
label: 'RAM Last (%)',
data: [],
borderColor: 'rgb(255, 99, 132)',
backgroundColor: 'rgba(255, 99, 132, 0.2)',
fill: true,
tension: 0.3,
@@ -140,12 +144,12 @@
max: 100,
title: {
display: true,
text: 'Prozent'
text: 'Auslastung in %'
}
},
x: {
title: {
display: true,
display: false,
text: 'Zeit'
}
}
@@ -160,7 +164,6 @@
datasets: [{
label: 'GPU Last (%)',
data: [],
borderColor: 'rgb(255, 99, 132)',
backgroundColor: 'rgba(255, 99, 132, 0.2)',
fill: true,
tension: 0.3,
@@ -176,12 +179,12 @@
max: 100,
title: {
display: true,
text: 'Prozent'
text: 'Auslastung in %'
}
},
x: {
title: {
display: true,
display: false,
text: 'Zeit'
}
}

View File

@@ -4,31 +4,36 @@
ViewData["Title"] = "Server bearbeiten";
}
<head>
<link rel="stylesheet" href="~/css/main.css" />
<link rel="stylesheet" href="~/css/server-edit.css" />
</head>
<h2 class="mb-4">Server bearbeiten</h2>
<form asp-action="EditServer" asp-controller="Server" method="post">
@Html.AntiForgeryToken()
<input type="hidden" asp-for="Id" />
<div class="card mb-4">
<div class="card mb-4 g-4">
<div class="card-header">
<h4 class="mb-0">Allgemeine Informationen</h4>
</div>
<div class="card-body">
<div class="mb-3">
<label asp-for="Name" class="form-label"></label>
<label asp-for="Name" class="form-label">Name</label>
<input asp-for="Name" class="form-control" />
<span asp-validation-for="Name" class="text-danger"></span>
</div>
<div class="mb-3">
<label asp-for="IPAddress" class="form-label"></label>
<label asp-for="IPAddress" class="form-label">IP-Adresse</label>
<input asp-for="IPAddress" class="form-control" />
<span asp-validation-for="IPAddress" class="text-danger"></span>
</div>
<div class="mb-4">
<label asp-for="Type" class="form-label"><i class="bi bi-hdd-network me-1"></i>Typ</label>
<label asp-for="Type" class="form-label">Typ</label>
<select asp-for="Type" class="form-select">
<option>VPS</option>
<option>VM</option>
@@ -176,6 +181,6 @@
<div class="d-flex justify-content-end gap-2">
<button type="submit" class="btn btn-primary"><i class="bi bi-save me-1"></i>Speichern</button>
<a asp-action="Overview" class="btn btn-secondary"><i class="bi bi-x-circle me-1"></i>Abbrechen</a>
<a asp-action="Overview" class="btn btn-danger"><i class="bi bi-x-circle me-1"></i>Abbrechen</a>
</div>
</form>

View File

@@ -4,61 +4,45 @@
<div class="row g-4">
@foreach (var s in Model)
{
<div class="col-12 col-sm-6">
<div class="col-12">
<div class="card h-100 border-secondary shadow-sm">
<div class="card-body d-flex flex-column gap-3">
<div class="d-flex justify-content-between align-items-center mb-3">
<h5 class="card-title text-dark mb-0">
<i class="bi bi-pc-display me-2 text-muted"></i>(#@s.Id) @s.Name
<h5 class="card-title text-text mb-0">
<i class="bi bi-pc-display me-2 text-text"></i>(#@s.Id) @s.Name
</h5>
<span class="badge
@(s.IsOnline ? "bg-success text-light" : "bg-danger text-light")">
<div class="col-md-4 text-text small">
<div><i class="bi bi-globe me-1"></i><strong>IP:</strong> @s.IPAddress</div>
<div><i class="bi bi-pc-display me-1"></i><strong>Typ:</strong> @s.Type</div>
</div>
<span class="badge @(s.IsOnline ? "bg-success text-light" : "bg-danger text-light")">
<i class="bi @(s.IsOnline ? "bi-check-circle" : "bi-x-circle") me-1"></i>
@(s.IsOnline ? "Online" : "Offline")
</span>
</div>
<div class="d-flex flex-wrap gap-4">
<a asp-action="EditServer" asp-route-id="@s.Id" class="btn btn-outline-primary">
<i class="bi bi-pencil-square me-1"></i> Bearbeiten
</a>
<a asp-asp-controller="Server" asp-action="Details" asp-route-id="@s.Id"
class="btn btn-outline-primary">
<i class="bi bi-bar-chart-fill me-1"></i> Metrics
</a>
<form asp-action="Delete" asp-controller="Server" asp-route-id="@s.Id" method="post"
onsubmit="return confirm('Diesen Server wirklich löschen?');" class="m-0">
<button type="submit" class="btn btn-outline-danger">
<i class="bi bi-trash me-1"></i> Löschen
</button>
</form>
<div class="row mb-3">
<div class="col-md-5 text-muted small">
<div><i class="bi bi-globe me-1"></i><strong>IP:</strong> @s.IPAddress</div>
<div><i class="bi bi-pc-display me-1"></i><strong>Typ:</strong> @s.Type</div>
<div><i class="bi bi-calendar-check me-1"></i><strong>Erstellt:</strong>
@s.CreatedAt.ToLocalTime().ToString("dd.MM.yyyy HH:mm")</div>
<div><i class="bi bi-clock me-1"></i><strong>Last-Seen:</strong>
@s.LastSeen.ToLocalTime().ToString("dd.MM.yyyy HH:mm")</div>
<div><i class="bi bi-cpu me-1"></i><strong>CPU:</strong> @(s.CpuType ?? "not found") </div>
<div><i class="bi bi-cpu me-1"></i><strong>CPU-Kerne: </strong> @s.CpuCores </div>
<div><i class="bi bi-gpu-card me-1"></i><strong>GPU:</strong> @(s.GpuType ?? "not found")
</div>
<div><i class="bi bi-memory me-1"></i><strong>RAM:</strong> @(s.RamSize) </div>
<div><i class="bi bi-hdd me-1"></i><strong>Disk Space:</strong> ... </div>
</div>
</div>
<div class="d-flex flex-wrap gap-2">
<a asp-action="EditServer" asp-route-id="@s.Id" class="btn btn-outline-primary">
<i class="bi bi-pencil-square me-1"></i> Bearbeiten
</a>
<a asp-asp-controller="Server" asp-action="Details" asp-route-id="@s.Id"
class="btn btn-outline-primary">
<i class="bi bi-bar-chart-fill me-1"></i> Metrics
</a>
<a asp-asp-controller="Container" asp-action="Overview" asp-route-id="@s.Id"
class="btn btn-outline-primary">
<i class="bi bi-box-fill me-1"></i> Container
</a>
<form asp-action="Delete" asp-controller="Server" asp-route-id="@s.Id" method="post"
onsubmit="return confirm('Diesen Server wirklich löschen?');" class="m-0">
<button type="submit" class="btn btn-outline-danger">
<i class="bi bi-trash me-1"></i> Löschen
</button>
</form>
</div>
</div>
</div>
</div>

View File

@@ -3,21 +3,31 @@
ViewData["Title"] = "Serverübersicht";
}
<head>
<link rel="stylesheet" href="~/css/main.css" />
<link rel="stylesheet" href="~/css/server-overview.css" />
</head>
<div class="d-flex align-items-center justify-content-between mb-4">
<h1 class="h2 fw-bold mb-0">
<i class="bi bi-hdd-network me-2 text-primary"></i>Serverübersicht
<h1 class="mb-4"">
<i class="bi bi-hdd-network"></i> Serverübersicht
</h1>
<form asp-action="AddServer" method="get" asp-controller="Server">
<button type="submit" class="btn btn-primary">
<i class="bi"></i> neuen Server erstellen
</button>
</form>
<a class="nav-link" href="/Server/addServer">
<button class="btn btn-primary"> Server hnzufügen </button>
</a>
</div>
<div id="server-cards-container">
@await Html.PartialAsync("_ServerCard", Model.Servers)
</div>
@section Scripts {
<script>
async function loadServerCards() {

View File

@@ -14,7 +14,7 @@
<head>
<meta charset="utf-8" />
<title>@ViewData["Title"] - Watcher</title>
<link rel="stylesheet" href="~/css/site.css" />
<link rel="stylesheet" href="~/css/main.css" />
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" />
<link href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.10.5/font/bootstrap-icons.css" rel="stylesheet">
@@ -24,12 +24,12 @@
}
.sidebar {
width: 240px;
width: 15rem;
height: 100vh;
position: fixed;
background-color: #212121;
left: 0;
top: 0;
background-color: #343a40;
color: white;
display: flex;
flex-direction: column;
@@ -71,16 +71,22 @@
<a class="nav-link" href="/">Dashboard</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Netzwerk</a>
</li>
<li class="nav-item"></li>
<a class="nav-link" href="/Server/Overview">Servers</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/Container/Overview">Container</a>
<a class="nav-link" href="/Container/Overview">Services</a>
</li>
<!-- Noch nicht implementiert
<li class="nav-item"></li>
<a class="nav-link" href="/Uptime/Overview">Uptime</a>
</li>
-->
<li class="nav-item">
<a class="nav-link" href="/System/Settings">Einstellungen</a>
</li>
</ul>
</div>
@@ -92,6 +98,7 @@
<div class="rounded-circle bg-secondary text-white px-2 py-1">
<i class="bi bi-person"></i>
</div>
<div>
<strong>@User.Identity?.Name</strong><br />
<small class="text-muted">Profil ansehen</small>

View File

@@ -1,53 +0,0 @@
/* Please see documentation at https://learn.microsoft.com/aspnet/core/client-side/bundling-and-minification
for details on configuring this project to bundle and minify static web assets. */
html, body {
min-height: 100vh;
overflow-y: auto;
}
a.navbar-brand {
white-space: normal;
text-align: center;
word-break: break-all;
}
a {
color: #0077cc;
}
.btn-primary {
color: #fff;
background-color: #1b6ec2;
border-color: #1861ac;
}
.nav-pills .nav-link.active, .nav-pills .show > .nav-link {
color: #fff;
background-color: #1b6ec2;
border-color: #1861ac;
}
.border-top {
border-top: 1px solid #e5e5e5;
}
.border-bottom {
border-bottom: 1px solid #e5e5e5;
}
.box-shadow {
box-shadow: 0 .25rem .75rem rgba(0, 0, 0, .05);
}
button.accept-policy {
font-size: 1rem;
line-height: inherit;
}
.footer {
position: absolute;
bottom: 0;
width: 100%;
white-space: nowrap;
line-height: 60px;
}

View File

@@ -8,9 +8,11 @@
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>@ViewData["Title"] - Login</title>
<link rel="stylesheet" href="~/css/main.css" />
<link rel="stylesheet" href="~/css/Login.css" />
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" />
</head>
<body class="bg-light d-flex align-items-center justify-content-center" style="min-height: 100vh;">
<body class="d-flex align-items-center justify-content-center" style="min-height: 100vh;">
<div class="container">
<div class="row justify-content-center">
<div class="col-md-6">

View File

@@ -2,87 +2,47 @@
ViewData["Title"] = "Settings";
var pictureUrl = User.Claims.FirstOrDefault(c => c.Type == "picture")?.Value ?? "";
var preferredUsername = User.Claims.FirstOrDefault(c => c.Type == "preferred_username")?.Value ?? "admin";
var isLocalUser = ViewBag.IdentityProvider == "local";
var DbEngine = ViewBag.DbProvider;
var mail = ViewBag.mail;
var ServerVersion = ViewBag.ServerVersion;
}
<style>
.Settingscontainer {
display: flex;
flex-wrap: wrap;
/* Wichtig: erlaubt Umbruch */
gap: 1rem;
/* optionaler Abstand */
}
.Settingscontainer>* {
flex: 1 1 calc(50% - 0.5rem);
/* 2 Elemente pro Zeile, inkl. Gap */
box-sizing: border-box;
}
</style>
<head>
<link rel="stylesheet" href="~/css/site.css" />
<link rel="stylesheet" href="~/css/settings.css" />
</head>
<div class="Settingscontainer">
@if (isLocalUser)
{
<div class="card shadow mt-5 p-4" style="width: 40%; margin: auto;">
<h4><i class="bi bi-pencil-square me-2"></i>Benutzerdaten ändern</h4>
<form asp-action="Edit" method="post" asp-controller="User">
<div class="mb-3">
<label for="Username" class="form-label">Neuer Benutzername</label>
<input type="text" class="form-control" id="Username" name="Username" value="@preferredUsername" />
</div>
<div class="mb-3">
<label for="NewPassword" class="form-label">Neues Passwort</label>
<input type="password" class="form-control" id="NewPassword" name="NewPassword" />
</div>
<div class="mb-3">
<label for="ConfirmPassword" class="form-label">Passwort bestätigen</label>
<input type="password" class="form-control" id="ConfirmPassword" name="ConfirmPassword" />
</div>
<button type="submit" class="btn btn-primary">
<i class="bi bi-save me-1"></i>Speichern
</button>
</form>
</div>
}
else
{
<div class="alert alert-info mt-4 text-center" style="width: 40%; margin: auto;">
<i class="bi bi-info-circle me-1"></i>Benutzerdaten können nur für lokal angemeldete Nutzer geändert werden.
</div>
}
<div class="card shadow mt-5 p-4" style="width: 55%; margin: auto;">
<h4><i class="bi bi-pencil-square me-2"></i>Systemeinformationen</h4>
<br>
<h5>Watcher Version: v0.1.0</h5>
<h5>Watcher Version: @ServerVersion</h5>
<hr class="my-4" />
<h5>Authentifizierungsmethode: </h5>
<p><strong>@(ViewBag.IdentityProvider ?? "nicht gefunden")</strong></p>
<h5>Authentifizierungsmethode: <strong>@(ViewBag.IdentityProvider ?? "nicht gefunden")</strong></h5>
<hr class="my-4" />
<h5>Datenbank-Engine: </h5>
<strong>@(DbEngine ?? "nicht gefunden")</strong>
<h5>Datenbank-Engine: <strong>@(DbEngine ?? "nicht gefunden")</strong></h5>
<!-- Falls Sqlite verwendet wird können Backups erstellt werden -->
@if (DbEngine == "Microsoft.EntityFrameworkCore.Sqlite")
{
<div class="d-flex gap-2">
<form asp-action="CreateSqlDump" method="post" asp-controller="Database">
<button type="submit" class="btn btn-primary">
<button type="submit" class="btn btn-db">
<i class="bi bi-save me-1"></i> Backup erstellen
</button>
</form>
<form asp-action="ManageSqlDumps" method="post" asp-controller="Database">
<button type="submit" class="btn btn-primary">
<button type="submit" class="btn btn-db">
<i class="bi bi-save me-1"></i> Backups verwalten
</button>
</form>
@@ -111,9 +71,8 @@
</div>
<div class="card shadow mt-5 p-4" style="width: 55%; margin: auto;">
<h4><i class="bi bi-pencil-square me-2"></i>Systemeinstellungen</h4>
<h4><i class="bi bi-pencil-square me-2"></i>Benachrichtungen</h4>
<h5>Benachrichtigungen: </h5>
<p>Registrierte E-Mail Adresse: <strong>@(ViewBag.mail ?? "nicht gefunden")</strong></p>
<!-- action="/Notification/UpdateSettings" existiert noch nicht-->
@@ -143,7 +102,7 @@
<label class="form-check-label" for="notifyMaintenance">Wartungsinformationen erhalten</label>
</div>
<button type="submit" class="btn btn-primary mt-3">
<button type="submit" class="btn btn-db mt-3">
<i class="bi bi-save me-1"></i>Speichern
</button>
</div>

View File

@@ -4,14 +4,20 @@
var Id = ViewBag.Id;
var preferredUsername = ViewBag.name;
var IdProvider = ViewBag.IdProvider;
var mail = ViewBag.mail;
}
<head>
<link rel="stylesheet" href="~/css/site.css" />
<link rel="stylesheet" href="~/css/user-info.css" />
</head>
<div class="container mt-5">
<div class="card shadow-lg rounded-3 p-4" style="max-width: 700px; margin: auto;">
<div class="text-center mb-4">
@if (!string.IsNullOrEmpty(pictureUrl))
{
<img src="@pictureUrl" alt="Profilbild" class="rounded-circle shadow" style="width: 120px; height: 120px; object-fit: cover;" />
<img src="@pictureUrl" alt="Profilbild" class="rounded-circle shadow picture" />
}
else
{
@@ -21,12 +27,12 @@
</div>
}
<h3 class="mt-3">
<i class="bi bi-person-circle me-1"></i>@preferredUsername
<i class="bi"></i>@preferredUsername
</h3>
</div>
<table class="table table-hover">
<table class="usertable">
<tbody>
<tr>
<th><i class="bi bi-person-badge me-1"></i>Username</th>
@@ -34,11 +40,11 @@
</tr>
<tr>
<th><i class="bi bi-envelope me-1"></i>E-Mail</th>
<td>@(ViewBag.Mail ?? "Nicht verfügbar")</td>
<td>@(mail ?? "Nicht verfügbar")</td>
</tr>
<tr>
<th><i class="bi bi-fingerprint me-1"></i>Benutzer-ID</th>
<td>@(ViewBag.Id ?? "Nicht verfügbar")</td>
<td>@(Id ?? "Nicht verfügbar")</td>
</tr>
@if(IdProvider != "local")
{
@@ -83,12 +89,30 @@
</tbody>
</table>
<div>
<form method="get" asp-controller="User" asp-action="UserSettings" class="text-center mt-4">
<button type="submit" class="btn btn-info">
<i class="bi bi-gear-wide-connected me-1"></i>Einstellungen
<div class="card shadow mt-5 p-4" style="width: 100%; margin: auto;">
<h4><i class="bi bi-pencil-square me-2"></i>Benutzerdaten ändern</h4>
<form asp-action="Edit" method="post" asp-controller="User">
<div class="mb-3">
<label for="Username" class="form-label">Neuer Benutzername</label>
<input type="text" class="form-control" id="Username" name="Username" value="@preferredUsername" />
</div>
<div class="mb-3">
<label for="NewPassword" class="form-label">Neues Passwort</label>
<input type="password" class="form-control" id="NewPassword" name="NewPassword" />
</div>
<div class="mb-3">
<label for="ConfirmPassword" class="form-label">Passwort bestätigen</label>
<input type="password" class="form-control" id="ConfirmPassword" name="ConfirmPassword" />
</div>
<button type="submit" class="btn btn-db">
<i class="bi bi-save me-1"></i>Speichern
</button>
</form>
</div>
<div>
<form method="post" asp-controller="Auth" asp-action="Logout" class="text-center mt-4">
<button type="submit" class="btn btn-danger">
<i class="bi bi-box-arrow-right me-1"></i>Abmelden

View File

@@ -0,0 +1,24 @@
.login-card {
background-color: var(--color-surface);
color: var(--color-text);
padding: 2rem;
border-radius: 1rem;
box-shadow: 0 0 20px rgba(0, 0, 0, 0.5);
max-width: 500px;
margin: auto;
}
.btn-oidc {
background-color: var(--color-primary);
color: white;
border: none;
}
.btn-oidc:hover {
background-color: var(--color-primary);
}
.form-error {
color: #ff6b6b;
font-size: 0.875rem;
}

View File

@@ -1 +0,0 @@

View File

@@ -0,0 +1,4 @@
.serverlist {
background-color: var(--color-surface);
color: var(--color-text);
}

View File

@@ -0,0 +1,13 @@
.dumptable {
width: 100%;
border: .2rem solid;
margin: 1rem;
padding: 1rem
}
.dumptable thead {
margin: 1rem;
border: .2rem solid;
}

View File

@@ -0,0 +1,67 @@
:root {
--color-bg: #141414;
--color-surface: #212121;
--color-accent: #00e5ff;
--color-primary: #616161;
--color-text: #f9feff;
--color-muted: #c0c0c0;
--color-success: #14a44d;
--color-danger: #ff6b6b;
--color-warning: #CBE013;
}
body {
background-color: var(--color-bg);
color: var(--color-primary);
}
a {
color: var(--color-primary);
}
.card, .navbar, .form-control, .dropdown-menu {
background-color: var(--color-surface);
color: var(--color-text);
border: none;
}
.form-control {
background-color: var(--color-muted);
color: var(--color-text);
}
.form-control:active {
background-color: var(--color-muted);
color: var(--color-text);
}
.form-control::placeholder {
color: var(--color-muted);
}
.navbar .nav-link,
.dropdown-item {
color: var(--color-text);
}
.btn-primary {
background-color: var(--color-accent);
border: none;
}
.btn-primary:hover {
background-color: var(--color-accent);
}
.btn-danger {
background-color: var(--color-danger);
border: none;
}
.table {
color: var(--color-text);
}
hr {
border-top: 1px solid var(--color-accent);
}

View File

@@ -0,0 +1,20 @@
.info {
margin: 2rem;
margin-top: 3rem;
}
.hardware {
margin: 2rem;
margin-top: 3rem;
}
.graphcontainer {
height: 25rem;
width: 100%;
background-color: var(--color-surface);
}
.graph {
width: 100%;
height: 22rem;
}

View File

View File

View File

@@ -0,0 +1,12 @@
.ServiceList {
width: 80%;
}
.ServiceRow {
border-style: solid;
border-color: var(--color-text);
}
.ServiceEntry {
text-decoration: none;
}

View File

@@ -0,0 +1,24 @@
.Settingscontainer {
display: flex;
flex-wrap: wrap;
/* Wichtig: erlaubt Umbruch */
gap: 1rem;
/* optionaler Abstand */
}
.Settingscontainer>* {
flex: 1 1 calc(50% - 0.5rem);
/* 2 Elemente pro Zeile, inkl. Gap */
box-sizing: border-box;
}
.btn-db {
background-color: var(--color-primary);
border: none;
}
.btn-db:hover {
background-color: var(--color-accent);
border: none;
}

View File

@@ -1,9 +1,9 @@
:root {
--color-bg: #0d1b2a;
--color-surface: #1b263b;
--color-bg: #141414;
--color-surface: #212121;
--color-accent: #415a77;
--color-primary: #0d6efd;
--color-text: #ffffff;
--color-primary: white;
--color-text: #f9feff;
--color-muted: #c0c0c0;
--color-success: #14a44d;
--color-danger: #ff6b6b;
@@ -11,7 +11,7 @@
body {
background-color: var(--color-bg);
color: var(--color-text);
color: var(--color-primary);
}
a {
@@ -25,7 +25,7 @@ a {
}
.form-control {
background-color: var(--color-accent);
background-color: var(--color-bg);
color: var(--color-text);
}
@@ -57,10 +57,6 @@ a {
background-color: #0f8c3c;
}
.table {
color: var(--color-text);
}
hr {
border-top: 1px solid var(--color-accent);
}

View File

@@ -0,0 +1,39 @@
.table {
color: red;
}
.picture {
width: 120px;
height: 120px;
object-fit: cover;
}
.usertable {
background-color: var(--color-surface);
color: var(--color-text);
}
.Settingscontainer {
display: flex;
flex-wrap: wrap;
/* Wichtig: erlaubt Umbruch */
gap: 1rem;
/* optionaler Abstand */
}
.Settingscontainer>* {
flex: 1 1 calc(50% - 0.5rem);
/* 2 Elemente pro Zeile, inkl. Gap */
box-sizing: border-box;
}
.btn-db {
background-color: var(--color-primary);
border: none;
}
.btn-db:hover {
background-color: var(--color-accent);
border: none;
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 MiB

View File

@@ -1,18 +1,16 @@
services:
watcher:
image: git.triggermeelmo.com/daniel-hbn/watcher/watcher:development
image: git.triggermeelmo.com/watcher/watcher-server:v0.1.0
container_name: watcher
deploy:
resources:
limits:
memory: 200M
restart: unless-stopped
env_file: .env
ports:
- "5000:5000"
volumes:
- ./data:/app/persistence
- ./dumps:/app/wwwroot/downloads/sqlite
- ./logs:/app/logs
healthcheck:
test: "curl -f http://localhost:5000"
interval: 1m30s
timeout: 30s
retries: 5
start_period: 30s
- ./watcher-volumes/data:/app/persistence
- ./watcher-volumes/dumps:/app/wwwroot/downloads/sqlite
- ./watcher-volumes/logs:/app/logs