Compare commits
16 Commits
alpha-1.23
...
beta-1.5
| Author | SHA1 | Date | |
|---|---|---|---|
| 8ede0f0a3c | |||
| 8040973227 | |||
| 3cdc82f919 | |||
| 40595fc381 | |||
| 9ace554427 | |||
| f48c851ef0 | |||
| 7d694c62bd | |||
| d1bb6a633e | |||
| b39a502257 | |||
| dee07d7b8e | |||
| 351caec893 | |||
| dd04408dc2 | |||
| 6373722c2b | |||
| 27c8e4889c | |||
| 848ead0b2c | |||
| 2713e67259 |
207
README.md
207
README.md
@@ -38,11 +38,20 @@ A management solution for running isolated NetBird instances for your MSP busine
|
|||||||
- **Docker-Based** — Everything runs in containers for easy deployment
|
- **Docker-Based** — Everything runs in containers for easy deployment
|
||||||
|
|
||||||
### Dashboard
|
### Dashboard
|
||||||
- **Modern Web UI** — Responsive Bootstrap 5 interface
|
- **Modern Web UI** — Responsive Bootstrap 5 interface with dark/light mode toggle
|
||||||
- **Real-Time Monitoring** — Container status, health checks, resource usage
|
- **Real-Time Monitoring** — Container status, health checks, resource usage
|
||||||
- **Container Logs** — View logs per container directly in the browser
|
- **Container Logs** — View logs per container directly in the browser
|
||||||
- **Start / Stop / Restart** — Control customer instances from the dashboard
|
- **Start / Stop / Restart** — Control customer instances from the dashboard
|
||||||
- **Customer Status Tracking** — Automatic status sync (active / inactive / error)
|
- **Customer Status Tracking** — Automatic status sync (active / inactive / error)
|
||||||
|
- **Update Indicators** — Per-customer badges when container images are outdated
|
||||||
|
|
||||||
|
### NetBird Container Updates
|
||||||
|
- **Docker Hub Digest Check** — Compare locally pulled image digests against Docker Hub without pulling
|
||||||
|
- **One-Click Pull** — Pull all NetBird images from Docker Hub via Settings
|
||||||
|
- **Bulk Update** — Update all outdated customer containers at once from the Monitoring page
|
||||||
|
- **Per-Customer Update** — Update a single customer's containers from the customer detail view
|
||||||
|
- **Zero Data Loss** — Container recreation preserves all bind-mounted volumes
|
||||||
|
- **Sequential Updates** — Customers are updated one at a time to minimize risk
|
||||||
|
|
||||||
### Multi-Language (i18n)
|
### Multi-Language (i18n)
|
||||||
- **English and German** — Full UI translation
|
- **English and German** — Full UI translation
|
||||||
@@ -55,13 +64,18 @@ A management solution for running isolated NetBird instances for your MSP busine
|
|||||||
- **Login Page** — Branding is applied to the login page automatically
|
- **Login Page** — Branding is applied to the login page automatically
|
||||||
- **Configurable Docker Images** — Use custom or specific NetBird image versions
|
- **Configurable Docker Images** — Use custom or specific NetBird image versions
|
||||||
|
|
||||||
### Security
|
### Authentication & User Management
|
||||||
- **JWT Authentication** — Token-based API authentication
|
- **JWT Authentication** — Token-based API authentication
|
||||||
- **Multi-Factor Authentication (MFA)** — Optional TOTP-based MFA for all local users, activatable in Security settings
|
- **Multi-Factor Authentication (MFA)** — Optional TOTP-based MFA for all local users, activatable in Security settings
|
||||||
- **Azure AD / OIDC** — Optional single sign-on via Microsoft Entra ID (exempt from MFA)
|
- **Azure AD / OIDC** — Optional single sign-on via Microsoft Entra ID (exempt from MFA)
|
||||||
- **Encrypted Credentials** — NPM passwords, relay secrets, and TOTP secrets are Fernet-encrypted at rest
|
- **LDAP / Active Directory** — Allow AD users to authenticate; local admin accounts always work as fallback
|
||||||
|
- **Encrypted Credentials** — NPM passwords, relay secrets, TOTP secrets, and LDAP bind passwords are Fernet-encrypted at rest
|
||||||
- **User Management** — Create, edit, delete admin users, reset passwords and MFA
|
- **User Management** — Create, edit, delete admin users, reset passwords and MFA
|
||||||
|
|
||||||
|
### Integrations
|
||||||
|
- **Windows DNS** — Automatically create and delete DNS A-records when deploying or removing customers
|
||||||
|
- **MSP Updates** — In-UI appliance update check with configurable release branch
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## Architecture
|
## Architecture
|
||||||
@@ -178,6 +192,18 @@ The following tools and services must be available **before** running the instal
|
|||||||
|
|
||||||
### Install Prerequisites (Ubuntu/Debian)
|
### Install Prerequisites (Ubuntu/Debian)
|
||||||
|
|
||||||
|
> **Note:** On a fresh Debian minimal install, `sudo` is not pre-installed. Install it as root first:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# As root — only needed on fresh Debian minimal (sudo not pre-installed):
|
||||||
|
apt update && apt install -y sudo
|
||||||
|
|
||||||
|
# Install remaining prerequisites:
|
||||||
|
sudo apt install -y curl git openssl
|
||||||
|
```
|
||||||
|
|
||||||
|
If `sudo` is already available (Ubuntu, most standard installs):
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
sudo apt update
|
sudo apt update
|
||||||
sudo apt install -y curl git openssl
|
sudo apt install -y curl git openssl
|
||||||
@@ -266,17 +292,32 @@ HOST_IP=<your-server-ip>
|
|||||||
|
|
||||||
### Web UI Settings
|
### Web UI Settings
|
||||||
|
|
||||||
Available under **Settings** in the web interface:
|
Available under **Settings** in the web interface, organized into tabs:
|
||||||
|
|
||||||
|
#### User Management
|
||||||
|
|
||||||
| Tab | Settings |
|
| Tab | Settings |
|
||||||
|-----|----------|
|
|-----|----------|
|
||||||
| **System** | Base domain, admin email, Docker images, port ranges, data directory |
|
| **Azure AD** | Azure AD / Entra ID SSO configuration (tenant ID, client ID/secret, optional group restriction) |
|
||||||
| **NPM Integration** | NPM API URL, login credentials, SSL certificate mode (Let's Encrypt / Wildcard), wildcard certificate selection |
|
|
||||||
| **Branding** | Platform name, subtitle, logo upload, default language |
|
|
||||||
| **Users** | Create/edit/delete admin users, per-user language preference, MFA reset |
|
| **Users** | Create/edit/delete admin users, per-user language preference, MFA reset |
|
||||||
| **Azure AD** | Azure AD / Entra ID SSO configuration |
|
| **LDAP / AD** | LDAP/Active Directory authentication (server, base DN, bind credentials, group restriction), enable/disable |
|
||||||
| **Security** | Change admin password, enable/disable MFA globally, manage own TOTP |
|
| **Security** | Change admin password, enable/disable MFA globally, manage own TOTP |
|
||||||
| **Monitoring** | System resources, Docker stats |
|
|
||||||
|
#### System
|
||||||
|
|
||||||
|
| Tab | Settings |
|
||||||
|
|-----|----------|
|
||||||
|
| **Branding** | Platform name, subtitle, logo upload, default language |
|
||||||
|
| **NetBird Docker Images** | Configured NetBird image tags (management, signal, relay, dashboard), pull images from Docker Hub |
|
||||||
|
| **NetBird MSP System** | Base domain, admin email, port ranges, data directory |
|
||||||
|
| **NetBird MSP Updates** | Appliance version info, check for updates, switch release branch |
|
||||||
|
|
||||||
|
#### External Systems
|
||||||
|
|
||||||
|
| Tab | Settings |
|
||||||
|
|-----|----------|
|
||||||
|
| **NPM Proxy** | NPM API URL, login credentials, SSL certificate mode (Let's Encrypt / Wildcard), wildcard certificate selection |
|
||||||
|
| **Windows DNS** | Windows DNS server integration for automatic DNS A-record creation/deletion on customer deploy/delete |
|
||||||
|
|
||||||
Changes are applied immediately without restart.
|
Changes are applied immediately without restart.
|
||||||
|
|
||||||
@@ -308,11 +349,42 @@ Changes are applied immediately without restart.
|
|||||||
|
|
||||||
### Monitoring
|
### Monitoring
|
||||||
|
|
||||||
The dashboard shows:
|
The **Monitoring** page shows:
|
||||||
- **System Overview** — Total customers, active/inactive, errors
|
- **System Overview** — Total customers, active/inactive, errors
|
||||||
- **Resource Usage** — RAM, CPU per container
|
- **Host Resources** — CPU, RAM, disk usage of the host machine
|
||||||
- **Container Health** — Running/stopped per container with color-coded status
|
- **Customer Status** — Container health per customer (running/stopped)
|
||||||
- **Deployment Logs** — Action history per customer
|
- **NetBird Container Updates** — Compare local image digests against Docker Hub, pull new images, and update all outdated customer containers
|
||||||
|
|
||||||
|
### NetBird Container Updates
|
||||||
|
|
||||||
|
#### Workflow
|
||||||
|
|
||||||
|
1. **Check for updates** — Go to **Monitoring > NetBird Container Updates**, click **"Check Updates"**
|
||||||
|
- Compares local image digests against Docker Hub
|
||||||
|
- Shows which images have a new version available
|
||||||
|
- Shows which customer containers are running outdated images
|
||||||
|
- An orange badge appears next to customers in the dashboard list that need updating
|
||||||
|
|
||||||
|
2. **Pull new images** — Go to **Settings > NetBird Docker Images**, click **"Pull from Docker Hub"**
|
||||||
|
- Pulls all 4 NetBird images (`management`, `signal`, `relay`, `dashboard`) in the background
|
||||||
|
- Wait for the pull to complete before updating customers
|
||||||
|
|
||||||
|
3. **Update customers** — Return to **Monitoring > NetBird Container Updates**, click **"Update All Customers"**
|
||||||
|
- Recreates containers for all customers whose running image is outdated
|
||||||
|
- Customers are updated **sequentially** — one at a time
|
||||||
|
- All bind-mounted volumes (database, keys, config) are preserved — **no data loss**
|
||||||
|
- A per-customer results table is shown after completion
|
||||||
|
|
||||||
|
#### Per-Customer Update
|
||||||
|
|
||||||
|
To update a single customer:
|
||||||
|
1. Open the customer detail view
|
||||||
|
2. Go to the **Deployment** tab
|
||||||
|
3. Click **"Update Images"**
|
||||||
|
|
||||||
|
#### Update Badges
|
||||||
|
|
||||||
|
The dashboard customer list shows an orange **"Update"** badge next to any customer whose running containers are using an outdated local image. This check is fast (local-only, no network call) and runs automatically when the dashboard loads.
|
||||||
|
|
||||||
### Language Settings
|
### Language Settings
|
||||||
|
|
||||||
@@ -320,9 +392,13 @@ The dashboard shows:
|
|||||||
- **Per-user default** — Set in Settings > Users during user creation
|
- **Per-user default** — Set in Settings > Users during user creation
|
||||||
- **System default** — Set in Settings > Branding
|
- **System default** — Set in Settings > Branding
|
||||||
|
|
||||||
|
### Dark Mode
|
||||||
|
|
||||||
|
Toggle dark/light mode using the moon/sun icon in the top navigation bar. The preference is saved in the browser.
|
||||||
|
|
||||||
### Multi-Factor Authentication (MFA)
|
### Multi-Factor Authentication (MFA)
|
||||||
|
|
||||||
TOTP-based MFA can be enabled globally for all local users. Azure AD users are not affected (they use their own MFA).
|
TOTP-based MFA can be enabled globally for all local users. Azure AD and LDAP users are not affected (they use their own authentication systems).
|
||||||
|
|
||||||
#### Enable MFA
|
#### Enable MFA
|
||||||
1. Go to **Settings > Security**
|
1. Go to **Settings > Security**
|
||||||
@@ -344,9 +420,30 @@ When MFA is enabled and a user logs in for the first time:
|
|||||||
- **Disable own TOTP** — In Settings > Security, click "Disable my TOTP" to remove your own MFA setup
|
- **Disable own TOTP** — In Settings > Security, click "Disable my TOTP" to remove your own MFA setup
|
||||||
- **Disable MFA globally** — Uncheck the toggle in Settings > Security to allow login without MFA
|
- **Disable MFA globally** — Uncheck the toggle in Settings > Security to allow login without MFA
|
||||||
|
|
||||||
|
### LDAP / Active Directory Authentication
|
||||||
|
|
||||||
|
Active Directory users can log in to the appliance using their AD credentials. Local admin accounts always work as a fallback regardless of LDAP status.
|
||||||
|
|
||||||
|
#### Setup
|
||||||
|
1. Go to **Settings > LDAP / AD**
|
||||||
|
2. Enable **"LDAP / AD Authentication"**
|
||||||
|
3. Enter LDAP server, port, bind DN (service account), bind password, and base DN
|
||||||
|
4. Optionally restrict access to members of a specific AD group
|
||||||
|
5. Click **Save LDAP Settings**
|
||||||
|
|
||||||
|
### Windows DNS Integration
|
||||||
|
|
||||||
|
Automatically create and delete DNS A-records in a Windows DNS server when customers are deployed or deleted.
|
||||||
|
|
||||||
|
#### Setup
|
||||||
|
1. Go to **Settings > Windows DNS**
|
||||||
|
2. Enable **"Windows DNS Integration"**
|
||||||
|
3. Enter the DNS server details
|
||||||
|
4. Click **Save DNS Settings**
|
||||||
|
|
||||||
### SSL Certificate Mode
|
### SSL Certificate Mode
|
||||||
|
|
||||||
The appliance supports two SSL certificate modes for customer proxy hosts, configurable under **Settings > NPM Integration**:
|
The appliance supports two SSL certificate modes for customer proxy hosts, configurable under **Settings > NPM Proxy**:
|
||||||
|
|
||||||
#### Let's Encrypt (default)
|
#### Let's Encrypt (default)
|
||||||
Each customer gets an individual Let's Encrypt certificate via HTTP-01 validation. This is the default behavior and requires no additional setup beyond a valid admin email.
|
Each customer gets an individual Let's Encrypt certificate via HTTP-01 validation. This is the default behavior and requires no additional setup beyond a valid admin email.
|
||||||
@@ -356,7 +453,7 @@ Use a pre-existing wildcard certificate (e.g. `*.yourdomain.com`) already upload
|
|||||||
|
|
||||||
**Setup:**
|
**Setup:**
|
||||||
1. Upload a wildcard certificate in Nginx Proxy Manager (e.g. via DNS challenge)
|
1. Upload a wildcard certificate in Nginx Proxy Manager (e.g. via DNS challenge)
|
||||||
2. Go to **Settings > NPM Integration**
|
2. Go to **Settings > NPM Proxy**
|
||||||
3. Set **SSL Mode** to "Wildcard Certificate"
|
3. Set **SSL Mode** to "Wildcard Certificate"
|
||||||
4. Click the refresh button to load certificates from NPM
|
4. Click the refresh button to load certificates from NPM
|
||||||
5. Select your wildcard certificate from the dropdown
|
5. Select your wildcard certificate from the dropdown
|
||||||
@@ -385,30 +482,37 @@ http://your-server:8000/api/docs
|
|||||||
|
|
||||||
**Common Endpoints:**
|
**Common Endpoints:**
|
||||||
```
|
```
|
||||||
POST /api/customers # Create customer + deploy
|
POST /api/customers # Create customer + deploy
|
||||||
GET /api/customers # List all customers
|
GET /api/customers # List all customers
|
||||||
GET /api/customers/{id} # Get customer details
|
GET /api/customers/{id} # Get customer details
|
||||||
PUT /api/customers/{id} # Update customer
|
PUT /api/customers/{id} # Update customer
|
||||||
DELETE /api/customers/{id} # Delete customer
|
DELETE /api/customers/{id} # Delete customer
|
||||||
|
|
||||||
POST /api/customers/{id}/start # Start containers
|
POST /api/customers/{id}/start # Start containers
|
||||||
POST /api/customers/{id}/stop # Stop containers
|
POST /api/customers/{id}/stop # Stop containers
|
||||||
POST /api/customers/{id}/restart # Restart containers
|
POST /api/customers/{id}/restart # Restart containers
|
||||||
GET /api/customers/{id}/logs # Get container logs
|
GET /api/customers/{id}/logs # Get container logs
|
||||||
GET /api/customers/{id}/health # Health check
|
GET /api/customers/{id}/health # Health check
|
||||||
|
POST /api/customers/{id}/update-images # Recreate containers with new images
|
||||||
|
|
||||||
GET /api/settings/branding # Get branding (public, no auth)
|
GET /api/settings/branding # Get branding (public, no auth)
|
||||||
GET /api/settings/npm-certificates # List NPM SSL certificates
|
GET /api/settings/npm-certificates # List NPM SSL certificates
|
||||||
PUT /api/settings # Update system settings
|
PUT /api/settings # Update system settings
|
||||||
GET /api/users # List users
|
|
||||||
POST /api/users # Create user
|
|
||||||
POST /api/users/{id}/reset-mfa # Reset user's MFA
|
|
||||||
|
|
||||||
POST /api/auth/mfa/setup # Generate TOTP secret + QR code
|
GET /api/users # List users
|
||||||
POST /api/auth/mfa/setup/complete # Verify first TOTP code
|
POST /api/users # Create user
|
||||||
POST /api/auth/mfa/verify # Verify TOTP code on login
|
POST /api/users/{id}/reset-mfa # Reset user's MFA
|
||||||
GET /api/auth/mfa/status # Get MFA status
|
|
||||||
POST /api/auth/mfa/disable # Disable own TOTP
|
POST /api/auth/mfa/setup # Generate TOTP secret + QR code
|
||||||
|
POST /api/auth/mfa/setup/complete # Verify first TOTP code
|
||||||
|
POST /api/auth/mfa/verify # Verify TOTP code on login
|
||||||
|
GET /api/auth/mfa/status # Get MFA status
|
||||||
|
POST /api/auth/mfa/disable # Disable own TOTP
|
||||||
|
|
||||||
|
GET /api/monitoring/images/check # Check Hub vs local digests for all images
|
||||||
|
POST /api/monitoring/images/pull # Pull all NetBird images from Docker Hub (background)
|
||||||
|
GET /api/monitoring/customers/local-update-status # Fast local-only update check (no network)
|
||||||
|
POST /api/monitoring/customers/update-all # Recreate outdated containers for all customers
|
||||||
```
|
```
|
||||||
|
|
||||||
### Example: Create Customer via API
|
### Example: Create Customer via API
|
||||||
@@ -488,11 +592,28 @@ The database migrations run automatically on startup.
|
|||||||
|
|
||||||
### Updating NetBird Images
|
### Updating NetBird Images
|
||||||
|
|
||||||
Via the Web UI:
|
NetBird image updates are managed entirely through the Web UI — no manual config changes required.
|
||||||
1. Settings > System Configuration
|
|
||||||
2. Change image tags (e.g., `netbirdio/management:0.35.0`)
|
#### Step 1 — Pull new images
|
||||||
3. Click "Save"
|
|
||||||
4. Re-deploy individual customers to apply the new images
|
1. Go to **Settings > NetBird Docker Images**
|
||||||
|
2. Click **"Pull from Docker Hub"**
|
||||||
|
3. Wait for the pull to complete (progress shown inline)
|
||||||
|
|
||||||
|
#### Step 2 — Check which customers need updating
|
||||||
|
|
||||||
|
1. Go to **Monitoring > NetBird Container Updates**
|
||||||
|
2. Click **"Check Updates"**
|
||||||
|
3. The table shows per-image Hub vs. local digest comparison and which customers are running outdated containers
|
||||||
|
|
||||||
|
#### Step 3 — Update customer containers
|
||||||
|
|
||||||
|
- **All customers**: Click **"Update All Customers"** in the Monitoring page
|
||||||
|
- Customers are updated sequentially, one at a time
|
||||||
|
- A results table is shown after completion
|
||||||
|
- **Single customer**: Open the customer detail view > **Deployment** tab > **"Update Images"**
|
||||||
|
|
||||||
|
> All bind-mounted volumes (database, keys, config files) are preserved. Container recreation does not cause data loss.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -546,7 +667,7 @@ MIT License — see [LICENSE](LICENSE) file for details.
|
|||||||
|
|
||||||
## Built With AI
|
## Built With AI
|
||||||
|
|
||||||
This software was developed with [Claude Code](https://claude.ai/claude-code) (Anthropic Claude Opus 4.6) — from architecture and backend logic to frontend UI and deployment scripts.
|
This software was developed with [Claude Code](https://claude.ai/claude-code) (Anthropic Claude Sonnet 4.6) — from architecture and backend logic to frontend UI and deployment scripts.
|
||||||
|
|
||||||
## Acknowledgments
|
## Acknowledgments
|
||||||
|
|
||||||
|
|||||||
32
app/main.py
32
app/main.py
@@ -90,16 +90,36 @@ STATIC_DIR = os.path.join(os.path.dirname(os.path.dirname(__file__)), "static")
|
|||||||
if os.path.isdir(STATIC_DIR):
|
if os.path.isdir(STATIC_DIR):
|
||||||
app.mount("/static", StaticFiles(directory=STATIC_DIR), name="static")
|
app.mount("/static", StaticFiles(directory=STATIC_DIR), name="static")
|
||||||
|
|
||||||
# Serve index.html at root
|
# Serve index.html at root — inject cache-busting version into static asset URLs
|
||||||
from fastapi.responses import FileResponse
|
# so the browser always loads fresh JS/CSS after a container update.
|
||||||
|
from fastapi.responses import FileResponse, HTMLResponse
|
||||||
|
from app.services import update_service
|
||||||
|
|
||||||
|
_STATIC_ASSETS = (
|
||||||
|
'"/static/js/app.js"',
|
||||||
|
'"/static/js/i18n.js"',
|
||||||
|
'"/static/css/styles.css"',
|
||||||
|
)
|
||||||
|
|
||||||
|
def _cache_bust_index(html: str, version: str) -> str:
|
||||||
|
# Inject version as a global JS variable so i18n.js can bust lang file caches too
|
||||||
|
html = html.replace("</head>", f'<script>window.STATIC_VERSION="{version}";</script>\n</head>', 1)
|
||||||
|
for asset in _STATIC_ASSETS:
|
||||||
|
busted = asset.rstrip('"') + f'?v={version}"'
|
||||||
|
html = html.replace(asset, busted)
|
||||||
|
return html
|
||||||
|
|
||||||
|
|
||||||
@app.get("/", include_in_schema=False)
|
@app.get("/", include_in_schema=False)
|
||||||
async def serve_index():
|
async def serve_index():
|
||||||
"""Serve the main dashboard."""
|
"""Serve the main dashboard with cache-busted static asset URLs."""
|
||||||
index_path = os.path.join(STATIC_DIR, "index.html")
|
index_path = os.path.join(STATIC_DIR, "index.html")
|
||||||
if os.path.isfile(index_path):
|
if not os.path.isfile(index_path):
|
||||||
return FileResponse(index_path)
|
return JSONResponse({"message": "NetBird MSP Appliance API is running."})
|
||||||
return JSONResponse({"message": "NetBird MSP Appliance API is running."})
|
version = update_service.get_current_version().get("commit", "unknown")
|
||||||
|
html = open(index_path, encoding="utf-8").read()
|
||||||
|
html = _cache_bust_index(html, version)
|
||||||
|
return HTMLResponse(content=html, headers={"Cache-Control": "no-cache"})
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -2,13 +2,13 @@
|
|||||||
|
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
from fastapi import APIRouter, BackgroundTasks, Depends, HTTPException, status
|
from fastapi import APIRouter, BackgroundTasks, Depends, HTTPException, Query, status
|
||||||
from sqlalchemy.orm import Session
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
from app.database import SessionLocal, get_db
|
from app.database import SessionLocal, get_db
|
||||||
from app.dependencies import get_current_user
|
from app.dependencies import get_current_user
|
||||||
from app.models import Customer, Deployment, User
|
from app.models import Customer, Deployment, SystemConfig, User
|
||||||
from app.services import docker_service, netbird_service
|
from app.services import docker_service, image_service, netbird_service
|
||||||
from app.utils.security import decrypt_value
|
from app.utils.security import decrypt_value
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
@@ -19,6 +19,14 @@ router = APIRouter()
|
|||||||
async def manual_deploy(
|
async def manual_deploy(
|
||||||
customer_id: int,
|
customer_id: int,
|
||||||
background_tasks: BackgroundTasks,
|
background_tasks: BackgroundTasks,
|
||||||
|
keep_data: bool = Query(
|
||||||
|
False,
|
||||||
|
description=(
|
||||||
|
"If True, preserve existing NetBird data (database, keys, peers). "
|
||||||
|
"Containers are recreated without wiping the instance directory. "
|
||||||
|
"If False (default), the instance is fully removed and redeployed from scratch."
|
||||||
|
),
|
||||||
|
),
|
||||||
current_user: User = Depends(get_current_user),
|
current_user: User = Depends(get_current_user),
|
||||||
db: Session = Depends(get_db),
|
db: Session = Depends(get_db),
|
||||||
):
|
):
|
||||||
@@ -29,6 +37,7 @@ async def manual_deploy(
|
|||||||
|
|
||||||
Args:
|
Args:
|
||||||
customer_id: Customer ID.
|
customer_id: Customer ID.
|
||||||
|
keep_data: Whether to preserve existing NetBird data.
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
Acknowledgement dict.
|
Acknowledgement dict.
|
||||||
@@ -40,12 +49,12 @@ async def manual_deploy(
|
|||||||
customer.status = "deploying"
|
customer.status = "deploying"
|
||||||
db.commit()
|
db.commit()
|
||||||
|
|
||||||
async def _deploy_bg(cid: int) -> None:
|
async def _deploy_bg(cid: int, keep: bool) -> None:
|
||||||
bg_db = SessionLocal()
|
bg_db = SessionLocal()
|
||||||
try:
|
try:
|
||||||
# Remove existing deployment if present
|
|
||||||
existing = bg_db.query(Deployment).filter(Deployment.customer_id == cid).first()
|
existing = bg_db.query(Deployment).filter(Deployment.customer_id == cid).first()
|
||||||
if existing:
|
if existing and not keep:
|
||||||
|
# Full redeploy: remove everything first
|
||||||
await netbird_service.undeploy_customer(bg_db, cid)
|
await netbird_service.undeploy_customer(bg_db, cid)
|
||||||
await netbird_service.deploy_customer(bg_db, cid)
|
await netbird_service.deploy_customer(bg_db, cid)
|
||||||
except Exception:
|
except Exception:
|
||||||
@@ -53,7 +62,7 @@ async def manual_deploy(
|
|||||||
finally:
|
finally:
|
||||||
bg_db.close()
|
bg_db.close()
|
||||||
|
|
||||||
background_tasks.add_task(_deploy_bg, customer_id)
|
background_tasks.add_task(_deploy_bg, customer_id, keep_data)
|
||||||
return {"message": "Deployment started in background.", "status": "deploying"}
|
return {"message": "Deployment started in background.", "status": "deploying"}
|
||||||
|
|
||||||
|
|
||||||
@@ -207,6 +216,50 @@ async def get_customer_credentials(
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/{customer_id}/update-images")
|
||||||
|
async def update_customer_images(
|
||||||
|
customer_id: int,
|
||||||
|
current_user: User = Depends(get_current_user),
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
):
|
||||||
|
"""Recreate a customer's containers to pick up newly pulled images.
|
||||||
|
|
||||||
|
Images must already be pulled via POST /monitoring/images/pull.
|
||||||
|
Bind-mounted data is preserved — no data loss.
|
||||||
|
"""
|
||||||
|
if current_user.role != "admin":
|
||||||
|
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Admin only.")
|
||||||
|
|
||||||
|
customer = _require_customer(db, customer_id)
|
||||||
|
deployment = db.query(Deployment).filter(Deployment.customer_id == customer_id).first()
|
||||||
|
if not deployment:
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=status.HTTP_404_NOT_FOUND,
|
||||||
|
detail="No deployment found for this customer.",
|
||||||
|
)
|
||||||
|
|
||||||
|
config = db.query(SystemConfig).filter(SystemConfig.id == 1).first()
|
||||||
|
if not config:
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=status.HTTP_503_SERVICE_UNAVAILABLE, detail="System not configured."
|
||||||
|
)
|
||||||
|
|
||||||
|
instance_dir = f"{config.data_dir}/{customer.subdomain}"
|
||||||
|
result = await image_service.update_customer_containers(instance_dir, deployment.container_prefix)
|
||||||
|
|
||||||
|
if not result["success"]:
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
|
||||||
|
detail=result.get("error", "Failed to update containers."),
|
||||||
|
)
|
||||||
|
|
||||||
|
logger.info(
|
||||||
|
"Containers updated for customer '%s' (prefix: %s) by '%s'.",
|
||||||
|
customer.name, deployment.container_prefix, current_user.username,
|
||||||
|
)
|
||||||
|
return {"message": f"Containers updated for '{customer.name}'."}
|
||||||
|
|
||||||
|
|
||||||
def _require_customer(db: Session, customer_id: int) -> Customer:
|
def _require_customer(db: Session, customer_id: int) -> Customer:
|
||||||
"""Helper to fetch a customer or raise 404.
|
"""Helper to fetch a customer or raise 404.
|
||||||
|
|
||||||
|
|||||||
@@ -5,13 +5,13 @@ import platform
|
|||||||
from typing import Any
|
from typing import Any
|
||||||
|
|
||||||
import psutil
|
import psutil
|
||||||
from fastapi import APIRouter, Depends
|
from fastapi import APIRouter, BackgroundTasks, Depends, HTTPException, status
|
||||||
from sqlalchemy.orm import Session
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
from app.database import get_db
|
from app.database import SessionLocal, get_db
|
||||||
from app.dependencies import get_current_user
|
from app.dependencies import get_current_user
|
||||||
from app.models import Customer, Deployment, User
|
from app.models import Customer, Deployment, SystemConfig, User
|
||||||
from app.services import docker_service
|
from app.services import docker_service, image_service
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
router = APIRouter()
|
router = APIRouter()
|
||||||
@@ -115,3 +115,160 @@ async def host_resources(
|
|||||||
"percent": disk.percent,
|
"percent": disk.percent,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/images/check")
|
||||||
|
async def check_image_updates(
|
||||||
|
current_user: User = Depends(get_current_user),
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
) -> dict[str, Any]:
|
||||||
|
"""Check all configured NetBird images for available updates on Docker Hub.
|
||||||
|
|
||||||
|
Compares local image digests against Docker Hub — no image is pulled.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
images: dict mapping image name to update status
|
||||||
|
any_update_available: bool
|
||||||
|
customer_status: list of per-customer container image status
|
||||||
|
"""
|
||||||
|
config = db.query(SystemConfig).filter(SystemConfig.id == 1).first()
|
||||||
|
if not config:
|
||||||
|
raise HTTPException(status_code=status.HTTP_503_SERVICE_UNAVAILABLE, detail="System not configured.")
|
||||||
|
|
||||||
|
hub_status = await image_service.check_all_images(config)
|
||||||
|
|
||||||
|
# Per-customer local check (no network)
|
||||||
|
deployments = db.query(Deployment).all()
|
||||||
|
customer_status = []
|
||||||
|
for dep in deployments:
|
||||||
|
customer = dep.customer
|
||||||
|
cs = image_service.get_customer_container_image_status(dep.container_prefix, config)
|
||||||
|
customer_status.append({
|
||||||
|
"customer_id": customer.id,
|
||||||
|
"customer_name": customer.name,
|
||||||
|
"subdomain": customer.subdomain,
|
||||||
|
"container_prefix": dep.container_prefix,
|
||||||
|
"needs_update": cs["needs_update"],
|
||||||
|
"services": cs["services"],
|
||||||
|
})
|
||||||
|
|
||||||
|
return {**hub_status, "customer_status": customer_status}
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/images/pull")
|
||||||
|
async def pull_all_netbird_images(
|
||||||
|
background_tasks: BackgroundTasks,
|
||||||
|
current_user: User = Depends(get_current_user),
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
) -> dict[str, Any]:
|
||||||
|
"""Pull all configured NetBird images from Docker Hub.
|
||||||
|
|
||||||
|
Runs in the background — returns immediately. After pulling, re-check
|
||||||
|
customer status via GET /images/check to see which customers need updating.
|
||||||
|
"""
|
||||||
|
if current_user.role != "admin":
|
||||||
|
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Admin only.")
|
||||||
|
|
||||||
|
config = db.query(SystemConfig).filter(SystemConfig.id == 1).first()
|
||||||
|
if not config:
|
||||||
|
raise HTTPException(status_code=status.HTTP_503_SERVICE_UNAVAILABLE, detail="System not configured.")
|
||||||
|
|
||||||
|
# Snapshot image list before background task starts
|
||||||
|
images = [
|
||||||
|
config.netbird_management_image,
|
||||||
|
config.netbird_signal_image,
|
||||||
|
config.netbird_relay_image,
|
||||||
|
config.netbird_dashboard_image,
|
||||||
|
]
|
||||||
|
|
||||||
|
async def _pull_bg() -> None:
|
||||||
|
bg_db = SessionLocal()
|
||||||
|
try:
|
||||||
|
cfg = bg_db.query(SystemConfig).filter(SystemConfig.id == 1).first()
|
||||||
|
if cfg:
|
||||||
|
await image_service.pull_all_images(cfg)
|
||||||
|
except Exception:
|
||||||
|
logger.exception("Background image pull failed")
|
||||||
|
finally:
|
||||||
|
bg_db.close()
|
||||||
|
|
||||||
|
background_tasks.add_task(_pull_bg)
|
||||||
|
return {"message": "Image pull started in background.", "images": images}
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/customers/local-update-status")
|
||||||
|
async def customers_local_update_status(
|
||||||
|
current_user: User = Depends(get_current_user),
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
) -> list[dict[str, Any]]:
|
||||||
|
"""Fast local-only check for outdated customer containers.
|
||||||
|
|
||||||
|
Compares running container image IDs against locally stored images.
|
||||||
|
No network call — safe to call on every dashboard load.
|
||||||
|
"""
|
||||||
|
config = db.query(SystemConfig).filter(SystemConfig.id == 1).first()
|
||||||
|
if not config:
|
||||||
|
return []
|
||||||
|
deployments = db.query(Deployment).all()
|
||||||
|
results = []
|
||||||
|
for dep in deployments:
|
||||||
|
cs = image_service.get_customer_container_image_status(dep.container_prefix, config)
|
||||||
|
results.append({"customer_id": dep.customer_id, "needs_update": cs["needs_update"]})
|
||||||
|
return results
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/customers/update-all")
|
||||||
|
async def update_all_customers(
|
||||||
|
current_user: User = Depends(get_current_user),
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
) -> dict[str, Any]:
|
||||||
|
"""Recreate containers for all customers with outdated images — sequential, synchronous.
|
||||||
|
|
||||||
|
Updates customers one at a time so a failing customer does not block others.
|
||||||
|
Images must already be pulled. Data is preserved (bind mounts).
|
||||||
|
Returns detailed per-customer results.
|
||||||
|
"""
|
||||||
|
if current_user.role != "admin":
|
||||||
|
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Admin only.")
|
||||||
|
|
||||||
|
config = db.query(SystemConfig).filter(SystemConfig.id == 1).first()
|
||||||
|
if not config:
|
||||||
|
raise HTTPException(status_code=status.HTTP_503_SERVICE_UNAVAILABLE, detail="System not configured.")
|
||||||
|
|
||||||
|
deployments = db.query(Deployment).all()
|
||||||
|
to_update = []
|
||||||
|
for dep in deployments:
|
||||||
|
cs = image_service.get_customer_container_image_status(dep.container_prefix, config)
|
||||||
|
if cs["needs_update"]:
|
||||||
|
customer = dep.customer
|
||||||
|
to_update.append({
|
||||||
|
"instance_dir": f"{config.data_dir}/{customer.subdomain}",
|
||||||
|
"project_name": dep.container_prefix,
|
||||||
|
"customer_name": customer.name,
|
||||||
|
"customer_id": customer.id,
|
||||||
|
})
|
||||||
|
|
||||||
|
if not to_update:
|
||||||
|
return {"message": "All customers are already up to date.", "updated": 0, "results": []}
|
||||||
|
|
||||||
|
# Update customers sequentially — one at a time
|
||||||
|
update_results = []
|
||||||
|
for entry in to_update:
|
||||||
|
res = await image_service.update_customer_containers(
|
||||||
|
entry["instance_dir"], entry["project_name"]
|
||||||
|
)
|
||||||
|
ok = res["success"]
|
||||||
|
logger.info("Updated %s: %s", entry["project_name"], "OK" if ok else res.get("error"))
|
||||||
|
update_results.append({
|
||||||
|
"customer_name": entry["customer_name"],
|
||||||
|
"customer_id": entry["customer_id"],
|
||||||
|
"success": ok,
|
||||||
|
"error": res.get("error"),
|
||||||
|
})
|
||||||
|
|
||||||
|
success_count = sum(1 for r in update_results if r["success"])
|
||||||
|
return {
|
||||||
|
"message": f"Updated {success_count} of {len(update_results)} customer(s).",
|
||||||
|
"updated": success_count,
|
||||||
|
"results": update_results,
|
||||||
|
}
|
||||||
|
|||||||
267
app/services/image_service.py
Normal file
267
app/services/image_service.py
Normal file
@@ -0,0 +1,267 @@
|
|||||||
|
"""NetBird Docker image update service.
|
||||||
|
|
||||||
|
Compares locally pulled images against Docker Hub to detect available updates.
|
||||||
|
Provides pull and per-customer container recreation functions without data loss.
|
||||||
|
"""
|
||||||
|
|
||||||
|
import asyncio
|
||||||
|
import json
|
||||||
|
import logging
|
||||||
|
import os
|
||||||
|
import subprocess
|
||||||
|
from typing import Any
|
||||||
|
|
||||||
|
import httpx
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
# Services that make up a customer's NetBird deployment
|
||||||
|
NETBIRD_SERVICES = ["management", "signal", "relay", "dashboard"]
|
||||||
|
|
||||||
|
|
||||||
|
async def _run_cmd(cmd: list[str], timeout: int = 300) -> subprocess.CompletedProcess:
|
||||||
|
"""Run a subprocess command without blocking the event loop."""
|
||||||
|
loop = asyncio.get_event_loop()
|
||||||
|
return await loop.run_in_executor(
|
||||||
|
None,
|
||||||
|
lambda: subprocess.run(cmd, capture_output=True, text=True, timeout=timeout),
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def _parse_image_name(image: str) -> tuple[str, str]:
|
||||||
|
"""Split 'repo/name:tag' into ('repo/name', 'tag'). Defaults tag to 'latest'."""
|
||||||
|
if ":" in image:
|
||||||
|
name, tag = image.rsplit(":", 1)
|
||||||
|
else:
|
||||||
|
name, tag = image, "latest"
|
||||||
|
return name, tag
|
||||||
|
|
||||||
|
|
||||||
|
async def get_hub_digest(image: str) -> str | None:
|
||||||
|
"""Fetch the manifest-list digest from the Docker Registry v2 API.
|
||||||
|
|
||||||
|
Uses anonymous auth against registry-1.docker.io — does NOT pull the image.
|
||||||
|
Returns the Docker-Content-Digest header value (sha256:...) which is identical
|
||||||
|
to the digest stored in local RepoDigests after a pull, enabling correct comparison.
|
||||||
|
"""
|
||||||
|
name, tag = _parse_image_name(image)
|
||||||
|
try:
|
||||||
|
async with httpx.AsyncClient(timeout=15) as client:
|
||||||
|
# Step 1: obtain anonymous pull token
|
||||||
|
token_resp = await client.get(
|
||||||
|
"https://auth.docker.io/token",
|
||||||
|
params={"service": "registry.docker.io", "scope": f"repository:{name}:pull"},
|
||||||
|
)
|
||||||
|
if token_resp.status_code != 200:
|
||||||
|
logger.warning("Failed to get registry token for %s", image)
|
||||||
|
return None
|
||||||
|
token = token_resp.json().get("token")
|
||||||
|
|
||||||
|
# Step 2: fetch manifest — prefer manifest list (multi-arch) so the digest
|
||||||
|
# matches what `docker pull` stores in RepoDigests.
|
||||||
|
manifest_resp = await client.get(
|
||||||
|
f"https://registry-1.docker.io/v2/{name}/manifests/{tag}",
|
||||||
|
headers={
|
||||||
|
"Authorization": f"Bearer {token}",
|
||||||
|
"Accept": (
|
||||||
|
"application/vnd.docker.distribution.manifest.list.v2+json, "
|
||||||
|
"application/vnd.oci.image.index.v1+json, "
|
||||||
|
"application/vnd.docker.distribution.manifest.v2+json"
|
||||||
|
),
|
||||||
|
},
|
||||||
|
)
|
||||||
|
if manifest_resp.status_code != 200:
|
||||||
|
logger.warning("Registry API returned %d for %s", manifest_resp.status_code, image)
|
||||||
|
return None
|
||||||
|
|
||||||
|
# The Docker-Content-Digest header is the canonical digest
|
||||||
|
digest = manifest_resp.headers.get("docker-content-digest")
|
||||||
|
if digest:
|
||||||
|
return digest
|
||||||
|
return None
|
||||||
|
except Exception as exc:
|
||||||
|
logger.warning("Failed to fetch registry digest for %s: %s", image, exc)
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
def get_local_digest(image: str) -> str | None:
|
||||||
|
"""Get the RepoDigest for a locally pulled image.
|
||||||
|
|
||||||
|
Returns the digest (sha256:...) or None if image not found locally.
|
||||||
|
"""
|
||||||
|
try:
|
||||||
|
result = subprocess.run(
|
||||||
|
["docker", "image", "inspect", image, "--format", "{{json .RepoDigests}}"],
|
||||||
|
capture_output=True, text=True, timeout=10,
|
||||||
|
)
|
||||||
|
if result.returncode != 0:
|
||||||
|
return None
|
||||||
|
digests = json.loads(result.stdout.strip())
|
||||||
|
if not digests:
|
||||||
|
return None
|
||||||
|
# RepoDigests look like "netbirdio/management@sha256:abc..."
|
||||||
|
for d in digests:
|
||||||
|
if "@" in d:
|
||||||
|
return d.split("@", 1)[1]
|
||||||
|
return None
|
||||||
|
except Exception as exc:
|
||||||
|
logger.warning("Failed to inspect local image %s: %s", image, exc)
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
def get_container_image_id(container_name: str) -> str | None:
|
||||||
|
"""Get the full image ID (sha256:...) of a running or stopped container."""
|
||||||
|
try:
|
||||||
|
result = subprocess.run(
|
||||||
|
["docker", "inspect", container_name, "--format", "{{.Image}}"],
|
||||||
|
capture_output=True, text=True, timeout=10,
|
||||||
|
)
|
||||||
|
if result.returncode != 0:
|
||||||
|
return None
|
||||||
|
return result.stdout.strip() or None
|
||||||
|
except Exception:
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
def get_local_image_id(image: str) -> str | None:
|
||||||
|
"""Get the full image ID (sha256:...) of a locally stored image."""
|
||||||
|
try:
|
||||||
|
result = subprocess.run(
|
||||||
|
["docker", "image", "inspect", image, "--format", "{{.Id}}"],
|
||||||
|
capture_output=True, text=True, timeout=10,
|
||||||
|
)
|
||||||
|
if result.returncode != 0:
|
||||||
|
return None
|
||||||
|
return result.stdout.strip() or None
|
||||||
|
except Exception:
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
async def check_image_status(image: str) -> dict[str, Any]:
|
||||||
|
"""Check whether a configured image has an update available on Docker Hub.
|
||||||
|
|
||||||
|
Returns a dict with:
|
||||||
|
image: the image name:tag
|
||||||
|
local_digest: digest of locally cached image (or None)
|
||||||
|
hub_digest: latest digest from Docker Hub (or None)
|
||||||
|
update_available: True if hub_digest differs from local_digest
|
||||||
|
"""
|
||||||
|
hub_digest, local_digest = await asyncio.gather(
|
||||||
|
get_hub_digest(image),
|
||||||
|
asyncio.get_event_loop().run_in_executor(None, get_local_digest, image),
|
||||||
|
)
|
||||||
|
|
||||||
|
if hub_digest and local_digest:
|
||||||
|
update_available = hub_digest != local_digest
|
||||||
|
elif hub_digest and not local_digest:
|
||||||
|
# Image not pulled locally yet — needs pull
|
||||||
|
update_available = True
|
||||||
|
else:
|
||||||
|
update_available = False
|
||||||
|
|
||||||
|
return {
|
||||||
|
"image": image,
|
||||||
|
"local_digest": local_digest,
|
||||||
|
"hub_digest": hub_digest,
|
||||||
|
"update_available": update_available,
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
async def check_all_images(config) -> dict[str, Any]:
|
||||||
|
"""Check all 4 configured NetBird images for available updates.
|
||||||
|
|
||||||
|
Returns a dict with:
|
||||||
|
images: dict mapping image name -> status dict
|
||||||
|
any_update_available: bool
|
||||||
|
"""
|
||||||
|
images = [
|
||||||
|
config.netbird_management_image,
|
||||||
|
config.netbird_signal_image,
|
||||||
|
config.netbird_relay_image,
|
||||||
|
config.netbird_dashboard_image,
|
||||||
|
]
|
||||||
|
results = await asyncio.gather(*[check_image_status(img) for img in images])
|
||||||
|
by_image = {r["image"]: r for r in results}
|
||||||
|
any_update = any(r["update_available"] for r in results)
|
||||||
|
return {"images": by_image, "any_update_available": any_update}
|
||||||
|
|
||||||
|
|
||||||
|
async def pull_image(image: str) -> dict[str, Any]:
|
||||||
|
"""Pull a Docker image. Returns success/error dict."""
|
||||||
|
logger.info("Pulling image: %s", image)
|
||||||
|
result = await _run_cmd(["docker", "pull", image], timeout=600)
|
||||||
|
if result.returncode != 0:
|
||||||
|
logger.error("Failed to pull %s: %s", image, result.stderr)
|
||||||
|
return {"image": image, "success": False, "error": result.stderr[:500]}
|
||||||
|
return {"image": image, "success": True}
|
||||||
|
|
||||||
|
|
||||||
|
async def pull_all_images(config) -> dict[str, Any]:
|
||||||
|
"""Pull all 4 configured NetBird images. Returns results per image."""
|
||||||
|
images = [
|
||||||
|
config.netbird_management_image,
|
||||||
|
config.netbird_signal_image,
|
||||||
|
config.netbird_relay_image,
|
||||||
|
config.netbird_dashboard_image,
|
||||||
|
]
|
||||||
|
results = await asyncio.gather(*[pull_image(img) for img in images])
|
||||||
|
return {
|
||||||
|
"results": {r["image"]: r for r in results},
|
||||||
|
"all_success": all(r["success"] for r in results),
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def get_customer_container_image_status(container_prefix: str, config) -> dict[str, Any]:
|
||||||
|
"""Check which service containers are running outdated local images.
|
||||||
|
|
||||||
|
Compares each running container's image ID against the locally stored image ID
|
||||||
|
for the configured image tag. This is a local check — no network call.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
services: dict mapping service name to status info
|
||||||
|
needs_update: True if any service has a different image ID than locally stored
|
||||||
|
"""
|
||||||
|
service_images = {
|
||||||
|
"management": config.netbird_management_image,
|
||||||
|
"signal": config.netbird_signal_image,
|
||||||
|
"relay": config.netbird_relay_image,
|
||||||
|
"dashboard": config.netbird_dashboard_image,
|
||||||
|
}
|
||||||
|
services: dict[str, Any] = {}
|
||||||
|
for svc, image in service_images.items():
|
||||||
|
container_name = f"{container_prefix}-{svc}"
|
||||||
|
container_id = get_container_image_id(container_name)
|
||||||
|
local_id = get_local_image_id(image)
|
||||||
|
if container_id and local_id:
|
||||||
|
up_to_date = container_id == local_id
|
||||||
|
else:
|
||||||
|
up_to_date = None # container not running or image not pulled
|
||||||
|
services[svc] = {
|
||||||
|
"container": container_name,
|
||||||
|
"image": image,
|
||||||
|
"up_to_date": up_to_date,
|
||||||
|
}
|
||||||
|
needs_update = any(s["up_to_date"] is False for s in services.values())
|
||||||
|
return {"services": services, "needs_update": needs_update}
|
||||||
|
|
||||||
|
|
||||||
|
async def update_customer_containers(instance_dir: str, project_name: str) -> dict[str, Any]:
|
||||||
|
"""Recreate customer containers to pick up newly pulled images.
|
||||||
|
|
||||||
|
Runs `docker compose up -d` in the customer's instance directory.
|
||||||
|
Images must already be pulled. Bind-mounted data is preserved — no data loss.
|
||||||
|
"""
|
||||||
|
compose_file = os.path.join(instance_dir, "docker-compose.yml")
|
||||||
|
if not os.path.isfile(compose_file):
|
||||||
|
return {"success": False, "error": f"docker-compose.yml not found at {compose_file}"}
|
||||||
|
cmd = [
|
||||||
|
"docker", "compose",
|
||||||
|
"-f", compose_file,
|
||||||
|
"-p", project_name,
|
||||||
|
"up", "-d", "--remove-orphans",
|
||||||
|
]
|
||||||
|
logger.info("Updating containers for %s", project_name)
|
||||||
|
result = await _run_cmd(cmd, timeout=300)
|
||||||
|
if result.returncode != 0:
|
||||||
|
return {"success": False, "error": result.stderr[:1000]}
|
||||||
|
return {"success": True}
|
||||||
@@ -264,10 +264,12 @@ async def deploy_customer(db: Session, customer_id: int) -> dict[str, Any]:
|
|||||||
_log_action(db, customer_id, "deploy", "info",
|
_log_action(db, customer_id, "deploy", "info",
|
||||||
"Auto-setup failed — admin must complete setup manually.")
|
"Auto-setup failed — admin must complete setup manually.")
|
||||||
|
|
||||||
# Step 9: Create NPM proxy host (production only)
|
# Step 9: Create NPM proxy host (production only).
|
||||||
npm_proxy_id = None
|
# If an existing deployment already has an NPM proxy, reuse it — this happens
|
||||||
npm_stream_id = None
|
# when keep_data=True was passed and undeploy_customer was NOT called beforehand.
|
||||||
if not local_mode:
|
npm_proxy_id = existing_deployment.npm_proxy_id if existing_deployment else None
|
||||||
|
npm_stream_id = existing_deployment.npm_stream_id if existing_deployment else None
|
||||||
|
if not local_mode and not npm_proxy_id:
|
||||||
forward_host = npm_service._get_forward_host()
|
forward_host = npm_service._get_forward_host()
|
||||||
npm_result = await npm_service.create_proxy_host(
|
npm_result = await npm_service.create_proxy_host(
|
||||||
api_url=config.npm_api_url,
|
api_url=config.npm_api_url,
|
||||||
@@ -304,9 +306,14 @@ async def deploy_customer(db: Session, customer_id: int) -> dict[str, Any]:
|
|||||||
"SSL certificate not created automatically. "
|
"SSL certificate not created automatically. "
|
||||||
"Please create it manually in NPM or ensure DNS resolves and port 80 is reachable, then re-deploy.",
|
"Please create it manually in NPM or ensure DNS resolves and port 80 is reachable, then re-deploy.",
|
||||||
)
|
)
|
||||||
|
elif npm_proxy_id and not local_mode:
|
||||||
|
_log_action(db, customer_id, "deploy", "info",
|
||||||
|
f"Reusing existing NPM proxy (ID {npm_proxy_id}) — data preserved.")
|
||||||
|
|
||||||
# Step 10: Create Windows DNS A-record (non-fatal — failure does not abort deployment)
|
# Step 10: Create Windows DNS A-record (non-fatal — failure does not abort deployment).
|
||||||
if config.dns_enabled and config.dns_server and config.dns_zone and config.dns_record_ip:
|
# Skip if an existing deployment is being kept (DNS record already exists).
|
||||||
|
if config.dns_enabled and config.dns_server and config.dns_zone and config.dns_record_ip \
|
||||||
|
and not existing_deployment:
|
||||||
try:
|
try:
|
||||||
dns_result = await dns_service.create_dns_record(customer.subdomain, config)
|
dns_result = await dns_service.create_dns_record(customer.subdomain, config)
|
||||||
if dns_result["ok"]:
|
if dns_result["ok"]:
|
||||||
|
|||||||
@@ -634,6 +634,13 @@
|
|||||||
Settings</span></button>
|
Settings</span></button>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
|
<hr>
|
||||||
|
<h6 data-i18n="settings.pullImagesTitle">Pull Latest Images from Docker Hub</h6>
|
||||||
|
<p class="text-muted small" data-i18n="settings.pullImagesHint">Downloads the latest versions of all configured NetBird images. After pulling, use Monitoring to update customer containers.</p>
|
||||||
|
<button class="btn btn-outline-primary" onclick="pullAllImagesSettings()" id="btn-pull-images-settings">
|
||||||
|
<i class="bi bi-cloud-download me-1"></i><span data-i18n="settings.pullImages">Pull from Docker Hub</span>
|
||||||
|
</button>
|
||||||
|
<span id="pull-images-settings-status" class="ms-2 text-muted small"></span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -1152,7 +1159,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Customer Statuses -->
|
<!-- Customer Statuses -->
|
||||||
<div class="card shadow-sm">
|
<div class="card shadow-sm mb-4">
|
||||||
<div class="card-header" data-i18n="monitoring.allCustomerDeployments">All Customer Deployments
|
<div class="card-header" data-i18n="monitoring.allCustomerDeployments">All Customer Deployments
|
||||||
</div>
|
</div>
|
||||||
<div class="table-responsive">
|
<div class="table-responsive">
|
||||||
@@ -1178,6 +1185,27 @@
|
|||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- NetBird Container Updates -->
|
||||||
|
<div class="card shadow-sm">
|
||||||
|
<div class="card-header d-flex justify-content-between align-items-center">
|
||||||
|
<span><i class="bi bi-arrow-repeat me-2"></i><span data-i18n="monitoring.imageUpdates">NetBird Container Updates</span></span>
|
||||||
|
<div class="d-flex gap-2">
|
||||||
|
<button class="btn btn-outline-secondary btn-sm" onclick="checkImageUpdates()" id="btn-check-updates">
|
||||||
|
<i class="bi bi-search me-1"></i><span data-i18n="monitoring.checkUpdates">Check for Updates</span>
|
||||||
|
</button>
|
||||||
|
<button class="btn btn-outline-primary btn-sm" onclick="pullAllImages()" id="btn-pull-images">
|
||||||
|
<i class="bi bi-cloud-download me-1"></i><span data-i18n="monitoring.pullImages">Pull Latest Images</span>
|
||||||
|
</button>
|
||||||
|
<button class="btn btn-warning btn-sm d-none" onclick="updateAllCustomers()" id="btn-update-all">
|
||||||
|
<i class="bi bi-lightning-charge-fill me-1"></i><span data-i18n="monitoring.updateAll">Update All</span>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="card-body" id="image-updates-body">
|
||||||
|
<p class="text-muted mb-0" data-i18n="monitoring.clickCheckUpdates">Click "Check for Updates" to compare local images with Docker Hub.</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -1239,6 +1267,49 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- Modal: Redeploy Confirmation -->
|
||||||
|
<div class="modal fade" id="redeploy-modal" tabindex="-1">
|
||||||
|
<div class="modal-dialog modal-lg">
|
||||||
|
<div class="modal-content">
|
||||||
|
<div class="modal-header bg-primary text-white">
|
||||||
|
<h5 class="modal-title" data-i18n="redeployModal.title">Redeploy Customer</h5>
|
||||||
|
<button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
|
||||||
|
</div>
|
||||||
|
<div class="modal-body">
|
||||||
|
<p><span data-i18n="redeployModal.intro">How should</span> <strong id="redeploy-customer-name"></strong> <span data-i18n="redeployModal.intro2">be redeployed?</span></p>
|
||||||
|
<input type="hidden" id="redeploy-customer-id">
|
||||||
|
<div class="row g-3 mt-1">
|
||||||
|
<div class="col-md-6">
|
||||||
|
<div class="card h-100 border-success" style="cursor:pointer" onclick="confirmRedeploy(true)" id="redeploy-card-keep">
|
||||||
|
<div class="card-body">
|
||||||
|
<h6 class="card-title text-success"><i class="bi bi-shield-check me-2"></i><span data-i18n="redeployModal.keepTitle">Keep Data</span></h6>
|
||||||
|
<p class="card-text small" data-i18n="redeployModal.keepDesc">Containers are stopped and restarted. The NetBird database, peer configurations, and encryption keys are preserved. Use this after a config change or image update.</p>
|
||||||
|
</div>
|
||||||
|
<div class="card-footer bg-success bg-opacity-10 text-success small" data-i18n="redeployModal.keepNote">
|
||||||
|
Peers stay connected after restart.
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="col-md-6">
|
||||||
|
<div class="card h-100 border-danger" style="cursor:pointer" onclick="confirmRedeploy(false)" id="redeploy-card-fresh">
|
||||||
|
<div class="card-body">
|
||||||
|
<h6 class="card-title text-danger"><i class="bi bi-trash me-2"></i><span data-i18n="redeployModal.freshTitle">Fresh Deploy</span></h6>
|
||||||
|
<p class="card-text small" data-i18n="redeployModal.freshDesc">All existing data is deleted — containers, volumes, config files, and the NetBird database. A completely new instance is created. All peers must re-enroll.</p>
|
||||||
|
</div>
|
||||||
|
<div class="card-footer bg-danger bg-opacity-10 text-danger small" data-i18n="redeployModal.freshNote">
|
||||||
|
All peer data is lost. Cannot be undone.
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="modal-footer">
|
||||||
|
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" data-i18n="common.cancel">Cancel</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<!-- Modal: Delete Confirmation -->
|
<!-- Modal: Delete Confirmation -->
|
||||||
<div class="modal fade" id="delete-modal" tabindex="-1">
|
<div class="modal fade" id="delete-modal" tabindex="-1">
|
||||||
<div class="modal-dialog">
|
<div class="modal-dialog">
|
||||||
|
|||||||
277
static/js/app.js
277
static/js/app.js
@@ -485,11 +485,11 @@ function renderCustomersTable(data) {
|
|||||||
const dashLink = dPort
|
const dashLink = dPort
|
||||||
? `<a href="${esc(dashUrl || 'http://localhost:' + dPort)}" target="_blank" class="text-decoration-none" title="${t('customer.openDashboard')}">:${dPort} <i class="bi bi-box-arrow-up-right"></i></a>`
|
? `<a href="${esc(dashUrl || 'http://localhost:' + dPort)}" target="_blank" class="text-decoration-none" title="${t('customer.openDashboard')}">:${dPort} <i class="bi bi-box-arrow-up-right"></i></a>`
|
||||||
: '-';
|
: '-';
|
||||||
return `<tr>
|
return `<tr data-customer-id="${c.id}">
|
||||||
<td>${c.id}</td>
|
<td>${c.id}</td>
|
||||||
<td><a href="#" onclick="viewCustomer(${c.id})" class="text-decoration-none fw-semibold">${esc(c.name)}</a></td>
|
<td><a href="#" onclick="viewCustomer(${c.id})" class="text-decoration-none fw-semibold">${esc(c.name)}</a></td>
|
||||||
<td><code>${esc(c.subdomain)}</code></td>
|
<td><code>${esc(c.subdomain)}</code></td>
|
||||||
<td>${statusBadge(c.status)}</td>
|
<td><span class="customer-status-cell">${statusBadge(c.status)}</span></td>
|
||||||
<td>${dashLink}</td>
|
<td>${dashLink}</td>
|
||||||
<td>${c.max_devices}</td>
|
<td>${c.max_devices}</td>
|
||||||
<td>${formatDate(c.created_at)}</td>
|
<td>${formatDate(c.created_at)}</td>
|
||||||
@@ -517,6 +517,26 @@ function renderCustomersTable(data) {
|
|||||||
paginationHtml += `<li class="page-item ${i === data.page ? 'active' : ''}"><a class="page-link" href="#" onclick="goToPage(${i})">${i}</a></li>`;
|
paginationHtml += `<li class="page-item ${i === data.page ? 'active' : ''}"><a class="page-link" href="#" onclick="goToPage(${i})">${i}</a></li>`;
|
||||||
}
|
}
|
||||||
document.getElementById('pagination-controls').innerHTML = paginationHtml;
|
document.getElementById('pagination-controls').innerHTML = paginationHtml;
|
||||||
|
|
||||||
|
// Lazy-load update badges after table renders (best-effort, silent fail)
|
||||||
|
loadCustomerUpdateBadges().catch(() => {});
|
||||||
|
}
|
||||||
|
|
||||||
|
async function loadCustomerUpdateBadges() {
|
||||||
|
const data = await api('GET', '/monitoring/customers/local-update-status');
|
||||||
|
data.forEach(s => {
|
||||||
|
if (!s.needs_update) return;
|
||||||
|
const tr = document.querySelector(`tr[data-customer-id="${s.customer_id}"]`);
|
||||||
|
if (!tr) return;
|
||||||
|
const cell = tr.querySelector('.customer-status-cell');
|
||||||
|
if (cell && !cell.querySelector('.update-badge')) {
|
||||||
|
const badge = document.createElement('span');
|
||||||
|
badge.className = 'badge bg-warning text-dark update-badge ms-1';
|
||||||
|
badge.title = t('monitoring.updateAvailable');
|
||||||
|
badge.innerHTML = '<i class="bi bi-arrow-repeat"></i> Update';
|
||||||
|
cell.appendChild(badge);
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function goToPage(page) {
|
function goToPage(page) {
|
||||||
@@ -647,9 +667,13 @@ async function confirmDeleteCustomer() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
// Customer Actions (start/stop/restart)
|
// Customer Actions (start/stop/restart/deploy)
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
async function customerAction(id, action) {
|
async function customerAction(id, action, name) {
|
||||||
|
if (action === 'deploy') {
|
||||||
|
showRedeployModal(id, name);
|
||||||
|
return;
|
||||||
|
}
|
||||||
try {
|
try {
|
||||||
await api('POST', `/customers/${id}/${action}`);
|
await api('POST', `/customers/${id}/${action}`);
|
||||||
if (currentPage === 'dashboard') loadCustomers();
|
if (currentPage === 'dashboard') loadCustomers();
|
||||||
@@ -659,6 +683,29 @@ async function customerAction(id, action) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function showRedeployModal(id, name) {
|
||||||
|
// Prefer passed name, fallback to dashboard table row, then ID
|
||||||
|
if (!name) {
|
||||||
|
const row = document.querySelector(`tr[data-customer-id="${id}"]`);
|
||||||
|
name = row ? row.querySelector('td')?.textContent?.trim() : `#${id}`;
|
||||||
|
}
|
||||||
|
document.getElementById('redeploy-customer-id').value = id;
|
||||||
|
document.getElementById('redeploy-customer-name').textContent = name;
|
||||||
|
new bootstrap.Modal(document.getElementById('redeploy-modal')).show();
|
||||||
|
}
|
||||||
|
|
||||||
|
async function confirmRedeploy(keepData) {
|
||||||
|
const id = document.getElementById('redeploy-customer-id').value;
|
||||||
|
bootstrap.Modal.getInstance(document.getElementById('redeploy-modal'))?.hide();
|
||||||
|
try {
|
||||||
|
await api('POST', `/customers/${id}/deploy?keep_data=${keepData}`);
|
||||||
|
if (currentPage === 'dashboard') loadCustomers();
|
||||||
|
if (currentCustomerId == id) viewCustomer(id);
|
||||||
|
} catch (err) {
|
||||||
|
alert(t('errors.actionFailed', { action: 'deploy', error: err.message }));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
// Customer Detail
|
// Customer Detail
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
@@ -742,8 +789,13 @@ async function viewCustomer(id) {
|
|||||||
<button class="btn btn-success btn-sm me-1" onclick="customerAction(${id},'start')"><i class="bi bi-play-circle me-1"></i>${t('customer.start')}</button>
|
<button class="btn btn-success btn-sm me-1" onclick="customerAction(${id},'start')"><i class="bi bi-play-circle me-1"></i>${t('customer.start')}</button>
|
||||||
<button class="btn btn-warning btn-sm me-1" onclick="customerAction(${id},'stop')"><i class="bi bi-stop-circle me-1"></i>${t('customer.stop')}</button>
|
<button class="btn btn-warning btn-sm me-1" onclick="customerAction(${id},'stop')"><i class="bi bi-stop-circle me-1"></i>${t('customer.stop')}</button>
|
||||||
<button class="btn btn-info btn-sm me-1" onclick="customerAction(${id},'restart')"><i class="bi bi-arrow-repeat me-1"></i>${t('customer.restart')}</button>
|
<button class="btn btn-info btn-sm me-1" onclick="customerAction(${id},'restart')"><i class="bi bi-arrow-repeat me-1"></i>${t('customer.restart')}</button>
|
||||||
<button class="btn btn-outline-primary btn-sm" onclick="customerAction(${id},'deploy')"><i class="bi bi-rocket me-1"></i>${t('customer.reDeploy')}</button>
|
<button class="btn btn-outline-primary btn-sm me-1" data-customer-name="${esc(data.name)}" onclick="customerAction(${id},'deploy',this.dataset.customerName)"><i class="bi bi-rocket me-1"></i>${t('customer.reDeploy')}</button>
|
||||||
|
<button class="btn btn-outline-warning btn-sm" id="btn-update-images-detail" onclick="updateCustomerImagesFromDetail(${id})">
|
||||||
|
<span id="update-detail-spinner" class="spinner-border spinner-border-sm d-none me-1"></span>
|
||||||
|
<i class="bi bi-arrow-repeat me-1"></i>${t('customer.updateImages')}
|
||||||
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
<div id="detail-update-result"></div>
|
||||||
`;
|
`;
|
||||||
} else {
|
} else {
|
||||||
document.getElementById('detail-deployment-content').innerHTML = `
|
document.getElementById('detail-deployment-content').innerHTML = `
|
||||||
@@ -1633,6 +1685,221 @@ async function loadAllCustomerStatuses() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Image Updates
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
async function checkImageUpdates() {
|
||||||
|
const btn = document.getElementById('btn-check-updates');
|
||||||
|
const body = document.getElementById('image-updates-body');
|
||||||
|
btn.disabled = true;
|
||||||
|
body.innerHTML = `<div class="text-muted"><span class="spinner-border spinner-border-sm me-2"></span>${t('common.loading')}</div>`;
|
||||||
|
|
||||||
|
try {
|
||||||
|
const data = await api('GET', '/monitoring/images/check');
|
||||||
|
|
||||||
|
// Image status table
|
||||||
|
const imageRows = Object.values(data.images).map(img => {
|
||||||
|
const badge = img.update_available
|
||||||
|
? `<span class="badge bg-warning text-dark">${t('monitoring.updateAvailable')}</span>`
|
||||||
|
: `<span class="badge bg-success">${t('monitoring.upToDate')}</span>`;
|
||||||
|
const shortDigest = d => d ? d.substring(7, 19) + '…' : '-';
|
||||||
|
return `<tr>
|
||||||
|
<td><code class="small">${esc(img.image)}</code></td>
|
||||||
|
<td class="small text-muted">${shortDigest(img.local_digest)}</td>
|
||||||
|
<td class="small text-muted">${shortDigest(img.hub_digest)}</td>
|
||||||
|
<td>${badge}</td>
|
||||||
|
</tr>`;
|
||||||
|
}).join('');
|
||||||
|
|
||||||
|
// Customer status table
|
||||||
|
const customerRows = data.customer_status.length === 0
|
||||||
|
? `<tr><td colspan="3" class="text-center text-muted py-3">${t('monitoring.noCustomers')}</td></tr>`
|
||||||
|
: data.customer_status.map(c => {
|
||||||
|
const badge = c.needs_update
|
||||||
|
? `<span class="badge bg-warning text-dark">${t('monitoring.needsUpdate')}</span>`
|
||||||
|
: `<span class="badge bg-success">${t('monitoring.upToDate')}</span>`;
|
||||||
|
const updateBtn = c.needs_update
|
||||||
|
? `<button class="btn btn-sm btn-outline-warning ms-2 btn-update-customer" onclick="updateCustomerImages(${c.customer_id})"
|
||||||
|
title="${t('monitoring.updateCustomer')}"><i class="bi bi-arrow-repeat"></i></button>`
|
||||||
|
: '';
|
||||||
|
return `<tr>
|
||||||
|
<td>${c.customer_id}</td>
|
||||||
|
<td>${esc(c.customer_name)} <code class="small text-muted">${esc(c.subdomain)}</code></td>
|
||||||
|
<td>${badge}${updateBtn}</td>
|
||||||
|
</tr>`;
|
||||||
|
}).join('');
|
||||||
|
|
||||||
|
// Show "Update All" button if any customer needs update
|
||||||
|
const updateAllBtn = document.getElementById('btn-update-all');
|
||||||
|
if (data.customer_status.some(c => c.needs_update)) {
|
||||||
|
updateAllBtn.classList.remove('d-none');
|
||||||
|
} else {
|
||||||
|
updateAllBtn.classList.add('d-none');
|
||||||
|
}
|
||||||
|
|
||||||
|
body.innerHTML = `
|
||||||
|
<h6 class="mb-2">${t('monitoring.imageStatusTitle')}</h6>
|
||||||
|
<div class="table-responsive mb-4">
|
||||||
|
<table class="table table-sm mb-0">
|
||||||
|
<thead class="table-light">
|
||||||
|
<tr>
|
||||||
|
<th>${t('monitoring.thImage')}</th>
|
||||||
|
<th>${t('monitoring.thLocalDigest')}</th>
|
||||||
|
<th>${t('monitoring.thHubDigest')}</th>
|
||||||
|
<th>${t('monitoring.thStatus')}</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>${imageRows}</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
<h6 class="mb-2">${t('monitoring.customerImageTitle')}</h6>
|
||||||
|
<div class="table-responsive">
|
||||||
|
<table class="table table-sm mb-0">
|
||||||
|
<thead class="table-light">
|
||||||
|
<tr>
|
||||||
|
<th>${t('monitoring.thId')}</th>
|
||||||
|
<th>${t('monitoring.thName')}</th>
|
||||||
|
<th>${t('monitoring.thStatus')}</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>${customerRows}</tbody>
|
||||||
|
</table>
|
||||||
|
</div>`;
|
||||||
|
} catch (err) {
|
||||||
|
body.innerHTML = `<div class="alert alert-danger">${err.message}</div>`;
|
||||||
|
} finally {
|
||||||
|
btn.disabled = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function pullAllImages() {
|
||||||
|
if (!confirm(t('monitoring.confirmPull'))) return;
|
||||||
|
const btn = document.getElementById('btn-pull-images');
|
||||||
|
btn.disabled = true;
|
||||||
|
try {
|
||||||
|
await api('POST', '/monitoring/images/pull');
|
||||||
|
showToast(t('monitoring.pullStarted'));
|
||||||
|
// Re-check after a few seconds to let pull finish
|
||||||
|
setTimeout(() => checkImageUpdates(), 5000);
|
||||||
|
} catch (err) {
|
||||||
|
showMonitoringAlert('danger', err.message);
|
||||||
|
} finally {
|
||||||
|
btn.disabled = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function updateCustomerImagesFromDetail(id) {
|
||||||
|
const btn = document.getElementById('btn-update-images-detail');
|
||||||
|
const spinner = document.getElementById('update-detail-spinner');
|
||||||
|
const resultDiv = document.getElementById('detail-update-result');
|
||||||
|
btn.disabled = true;
|
||||||
|
spinner.classList.remove('d-none');
|
||||||
|
resultDiv.innerHTML = `<div class="alert alert-info py-2 mt-2"><span class="spinner-border spinner-border-sm me-2"></span>${t('customer.updateInProgress')}</div>`;
|
||||||
|
try {
|
||||||
|
const data = await api('POST', `/customers/${id}/update-images`);
|
||||||
|
resultDiv.innerHTML = `<div class="alert alert-success py-2 mt-2"><i class="bi bi-check-circle me-1"></i>${esc(data.message)}</div>`;
|
||||||
|
setTimeout(() => { resultDiv.innerHTML = ''; }, 6000);
|
||||||
|
} catch (err) {
|
||||||
|
resultDiv.innerHTML = `<div class="alert alert-danger py-2 mt-2"><i class="bi bi-exclamation-circle me-1"></i>${esc(err.message)}</div>`;
|
||||||
|
} finally {
|
||||||
|
btn.disabled = false;
|
||||||
|
spinner.classList.add('d-none');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function updateCustomerImages(customerId) {
|
||||||
|
// Find the update button for this customer row and show a spinner
|
||||||
|
const btn = document.querySelector(`tr[data-customer-id="${customerId}"] .btn-update-customer`);
|
||||||
|
if (btn) {
|
||||||
|
btn.disabled = true;
|
||||||
|
btn.innerHTML = '<span class="spinner-border spinner-border-sm"></span>';
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
await api('POST', `/customers/${customerId}/update-images`);
|
||||||
|
showToast(t('monitoring.updateDone'));
|
||||||
|
setTimeout(() => checkImageUpdates(), 2000);
|
||||||
|
} catch (err) {
|
||||||
|
showMonitoringAlert('danger', err.message);
|
||||||
|
if (btn) {
|
||||||
|
btn.disabled = false;
|
||||||
|
btn.innerHTML = '<i class="bi bi-arrow-repeat"></i>';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function updateAllCustomers() {
|
||||||
|
if (!confirm(t('monitoring.confirmUpdateAll'))) return;
|
||||||
|
const btn = document.getElementById('btn-update-all');
|
||||||
|
const body = document.getElementById('image-updates-body');
|
||||||
|
btn.disabled = true;
|
||||||
|
btn.innerHTML = `<span class="spinner-border spinner-border-sm me-1"></span>${t('monitoring.updating')}`;
|
||||||
|
|
||||||
|
const progressDiv = document.createElement('div');
|
||||||
|
progressDiv.className = 'alert alert-info mt-3';
|
||||||
|
progressDiv.innerHTML = `<span class="spinner-border spinner-border-sm me-2"></span>${t('monitoring.updateAllProgress')}`;
|
||||||
|
body.appendChild(progressDiv);
|
||||||
|
|
||||||
|
try {
|
||||||
|
const data = await api('POST', '/monitoring/customers/update-all');
|
||||||
|
progressDiv.remove();
|
||||||
|
|
||||||
|
if (data.results && data.results.length > 0) {
|
||||||
|
const allOk = data.updated === data.results.length;
|
||||||
|
const rows = data.results.map(r => `<tr>
|
||||||
|
<td>${esc(r.customer_name)}</td>
|
||||||
|
<td>${r.success
|
||||||
|
? '<span class="badge bg-success"><i class="bi bi-check-lg"></i> OK</span>'
|
||||||
|
: '<span class="badge bg-danger"><i class="bi bi-x-lg"></i> Error</span>'}</td>
|
||||||
|
<td class="small text-muted">${esc(r.error || '')}</td>
|
||||||
|
</tr>`).join('');
|
||||||
|
const resultHtml = `<div class="alert alert-${allOk ? 'success' : 'warning'} mt-3">
|
||||||
|
<strong>${esc(data.message)}</strong>
|
||||||
|
<table class="table table-sm mb-0 mt-2">
|
||||||
|
<thead><tr><th>${t('monitoring.thName')}</th><th>${t('monitoring.thStatus')}</th><th></th></tr></thead>
|
||||||
|
<tbody>${rows}</tbody>
|
||||||
|
</table>
|
||||||
|
</div>`;
|
||||||
|
body.insertAdjacentHTML('beforeend', resultHtml);
|
||||||
|
} else {
|
||||||
|
showToast(data.message);
|
||||||
|
}
|
||||||
|
setTimeout(() => checkImageUpdates(), 2000);
|
||||||
|
} catch (err) {
|
||||||
|
progressDiv.remove();
|
||||||
|
showMonitoringAlert('danger', err.message);
|
||||||
|
} finally {
|
||||||
|
btn.disabled = false;
|
||||||
|
btn.innerHTML = `<i class="bi bi-lightning-charge-fill me-1"></i>${t('monitoring.updateAll')}`;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function pullAllImagesSettings() {
|
||||||
|
if (!confirm(t('monitoring.confirmPull'))) return;
|
||||||
|
const btn = document.getElementById('btn-pull-images-settings');
|
||||||
|
const statusEl = document.getElementById('pull-images-settings-status');
|
||||||
|
btn.disabled = true;
|
||||||
|
statusEl.innerHTML = `<span class="spinner-border spinner-border-sm me-1"></span>${t('monitoring.pulling')}`;
|
||||||
|
try {
|
||||||
|
await api('POST', '/monitoring/images/pull');
|
||||||
|
statusEl.innerHTML = `<i class="bi bi-check-circle text-success me-1"></i>${t('monitoring.pullStartedShort')}`;
|
||||||
|
setTimeout(() => { statusEl.innerHTML = ''; }, 8000);
|
||||||
|
} catch (err) {
|
||||||
|
statusEl.innerHTML = `<span class="text-danger"><i class="bi bi-exclamation-circle me-1"></i>${esc(err.message)}</span>`;
|
||||||
|
} finally {
|
||||||
|
btn.disabled = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function showMonitoringAlert(type, msg) {
|
||||||
|
const body = document.getElementById('image-updates-body');
|
||||||
|
const existing = body.querySelector('.alert');
|
||||||
|
if (existing) existing.remove();
|
||||||
|
const div = document.createElement('div');
|
||||||
|
div.className = `alert alert-${type} mt-2`;
|
||||||
|
div.textContent = msg;
|
||||||
|
body.prepend(div);
|
||||||
|
}
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
// Helpers
|
// Helpers
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -27,7 +27,8 @@ function detectLanguage() {
|
|||||||
async function loadLanguage(lang) {
|
async function loadLanguage(lang) {
|
||||||
if (translations[lang]) return;
|
if (translations[lang]) return;
|
||||||
try {
|
try {
|
||||||
const resp = await fetch(`/static/lang/${lang}.json`);
|
const v = window.STATIC_VERSION ? `?v=${window.STATIC_VERSION}` : '';
|
||||||
|
const resp = await fetch(`/static/lang/${lang}.json${v}`);
|
||||||
if (!resp.ok) throw new Error(`HTTP ${resp.status}`);
|
if (!resp.ok) throw new Error(`HTTP ${resp.status}`);
|
||||||
translations[lang] = await resp.json();
|
translations[lang] = await resp.json();
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
|
|||||||
@@ -89,7 +89,9 @@
|
|||||||
"thHealth": "Zustand",
|
"thHealth": "Zustand",
|
||||||
"thImage": "Image",
|
"thImage": "Image",
|
||||||
"lastCheck": "Letzte Prüfung: {time}",
|
"lastCheck": "Letzte Prüfung: {time}",
|
||||||
"openDashboard": "Dashboard öffnen"
|
"openDashboard": "Dashboard öffnen",
|
||||||
|
"updateImages": "Images aktualisieren",
|
||||||
|
"updateInProgress": "Container werden aktualisiert — bitte warten…"
|
||||||
},
|
},
|
||||||
"settings": {
|
"settings": {
|
||||||
"title": "Systemeinstellungen",
|
"title": "Systemeinstellungen",
|
||||||
@@ -152,6 +154,9 @@
|
|||||||
"dashboardImage": "Dashboard Image",
|
"dashboardImage": "Dashboard Image",
|
||||||
"dashboardImagePlaceholder": "netbirdio/dashboard:latest",
|
"dashboardImagePlaceholder": "netbirdio/dashboard:latest",
|
||||||
"saveImageSettings": "Image-Einstellungen speichern",
|
"saveImageSettings": "Image-Einstellungen speichern",
|
||||||
|
"pullImagesTitle": "Neueste Images von Docker Hub laden",
|
||||||
|
"pullImagesHint": "Lädt die neuesten Versionen aller konfigurierten NetBird Images. Danach können Kunden-Container über das Monitoring aktualisiert werden.",
|
||||||
|
"pullImages": "Von Docker Hub laden",
|
||||||
"brandingTitle": "Branding-Einstellungen",
|
"brandingTitle": "Branding-Einstellungen",
|
||||||
"companyName": "Firmen- / Anwendungsname",
|
"companyName": "Firmen- / Anwendungsname",
|
||||||
"companyNamePlaceholder": "NetBird MSP Appliance",
|
"companyNamePlaceholder": "NetBird MSP Appliance",
|
||||||
@@ -349,6 +354,17 @@
|
|||||||
"saveAndDeploy": "Speichern & Bereitstellen",
|
"saveAndDeploy": "Speichern & Bereitstellen",
|
||||||
"saveChanges": "Änderungen speichern"
|
"saveChanges": "Änderungen speichern"
|
||||||
},
|
},
|
||||||
|
"redeployModal": {
|
||||||
|
"title": "Kunde neu bereitstellen",
|
||||||
|
"intro": "Wie soll",
|
||||||
|
"intro2": "neu bereitgestellt werden?",
|
||||||
|
"keepTitle": "Daten behalten",
|
||||||
|
"keepDesc": "Container werden gestoppt und neu gestartet. Die NetBird-Datenbank, Peer-Konfigurationen und Verschlüsselungsschlüssel bleiben erhalten. Verwenden Sie dies nach einer Konfigurationsänderung oder einem Image-Update.",
|
||||||
|
"keepNote": "Peers bleiben nach dem Neustart verbunden.",
|
||||||
|
"freshTitle": "Neu aufsetzen",
|
||||||
|
"freshDesc": "Alle bestehenden Daten werden gelöscht — Container, Volumes, Konfigurationsdateien und die NetBird-Datenbank. Eine komplett neue Instanz wird erstellt. Alle Peers müssen sich neu registrieren.",
|
||||||
|
"freshNote": "Alle Peer-Daten gehen verloren. Kann nicht rückgängig gemacht werden."
|
||||||
|
},
|
||||||
"deleteModal": {
|
"deleteModal": {
|
||||||
"title": "Löschen bestätigen",
|
"title": "Löschen bestätigen",
|
||||||
"confirmText": "Möchten Sie den Kunden wirklich löschen:",
|
"confirmText": "Möchten Sie den Kunden wirklich löschen:",
|
||||||
@@ -373,6 +389,29 @@
|
|||||||
"thDashboard": "Dashboard",
|
"thDashboard": "Dashboard",
|
||||||
"thRelayPort": "Relay-Port",
|
"thRelayPort": "Relay-Port",
|
||||||
"thContainers": "Container",
|
"thContainers": "Container",
|
||||||
"noCustomers": "Keine Kunden."
|
"noCustomers": "Keine Kunden.",
|
||||||
|
"imageUpdates": "NetBird Container Updates",
|
||||||
|
"checkUpdates": "Auf Updates prüfen",
|
||||||
|
"pullImages": "Neueste Images laden",
|
||||||
|
"updateAll": "Alle aktualisieren",
|
||||||
|
"clickCheckUpdates": "Klicken Sie auf \"Auf Updates prüfen\" um lokale Images mit Docker Hub zu vergleichen.",
|
||||||
|
"updateAvailable": "Update verfügbar",
|
||||||
|
"upToDate": "Aktuell",
|
||||||
|
"needsUpdate": "Update erforderlich",
|
||||||
|
"updateCustomer": "Diesen Kunden aktualisieren",
|
||||||
|
"imageStatusTitle": "Image-Status (vs. Docker Hub)",
|
||||||
|
"customerImageTitle": "Kunden-Container Status",
|
||||||
|
"thImage": "Image",
|
||||||
|
"thLocalDigest": "Lokaler Digest",
|
||||||
|
"thHubDigest": "Hub Digest",
|
||||||
|
"confirmPull": "Neueste NetBird Images von Docker Hub laden? Dies kann einige Minuten dauern.",
|
||||||
|
"pullStarted": "Image-Download im Hintergrund gestartet. Prüfung in 5 Sekunden…",
|
||||||
|
"confirmUpdateAll": "Container aller Kunden mit veralteten Images neu erstellen? Laufende Dienste werden kurz neu gestartet.",
|
||||||
|
"updateAllStarted": "Aktualisierung im Hintergrund gestartet.",
|
||||||
|
"updateDone": "Kunden-Container aktualisiert.",
|
||||||
|
"updating": "Wird aktualisiert…",
|
||||||
|
"updateAllProgress": "Kunden-Container werden nacheinander aktualisiert — bitte warten…",
|
||||||
|
"pulling": "Wird geladen…",
|
||||||
|
"pullStartedShort": "Download im Hintergrund gestartet."
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -89,7 +89,9 @@
|
|||||||
"thHealth": "Health",
|
"thHealth": "Health",
|
||||||
"thImage": "Image",
|
"thImage": "Image",
|
||||||
"lastCheck": "Last check: {time}",
|
"lastCheck": "Last check: {time}",
|
||||||
"openDashboard": "Open Dashboard"
|
"openDashboard": "Open Dashboard",
|
||||||
|
"updateImages": "Update Images",
|
||||||
|
"updateInProgress": "Updating containers — please wait…"
|
||||||
},
|
},
|
||||||
"customerModal": {
|
"customerModal": {
|
||||||
"newCustomer": "New Customer",
|
"newCustomer": "New Customer",
|
||||||
@@ -105,6 +107,17 @@
|
|||||||
"saveAndDeploy": "Save & Deploy",
|
"saveAndDeploy": "Save & Deploy",
|
||||||
"saveChanges": "Save Changes"
|
"saveChanges": "Save Changes"
|
||||||
},
|
},
|
||||||
|
"redeployModal": {
|
||||||
|
"title": "Redeploy Customer",
|
||||||
|
"intro": "How should",
|
||||||
|
"intro2": "be redeployed?",
|
||||||
|
"keepTitle": "Keep Data",
|
||||||
|
"keepDesc": "Containers are stopped and restarted. The NetBird database, peer configurations, and encryption keys are preserved. Use this after a config change or image update.",
|
||||||
|
"keepNote": "Peers stay connected after restart.",
|
||||||
|
"freshTitle": "Fresh Deploy",
|
||||||
|
"freshDesc": "All existing data is deleted — containers, volumes, config files, and the NetBird database. A completely new instance is created. All peers must re-enroll.",
|
||||||
|
"freshNote": "All peer data is lost. Cannot be undone."
|
||||||
|
},
|
||||||
"deleteModal": {
|
"deleteModal": {
|
||||||
"title": "Confirm Deletion",
|
"title": "Confirm Deletion",
|
||||||
"confirmText": "Are you sure you want to delete customer",
|
"confirmText": "Are you sure you want to delete customer",
|
||||||
@@ -173,6 +186,9 @@
|
|||||||
"dashboardImage": "Dashboard Image",
|
"dashboardImage": "Dashboard Image",
|
||||||
"dashboardImagePlaceholder": "netbirdio/dashboard:latest",
|
"dashboardImagePlaceholder": "netbirdio/dashboard:latest",
|
||||||
"saveImageSettings": "Save Image Settings",
|
"saveImageSettings": "Save Image Settings",
|
||||||
|
"pullImagesTitle": "Pull Latest Images from Docker Hub",
|
||||||
|
"pullImagesHint": "Downloads the latest versions of all configured NetBird images. After pulling, use Monitoring to update customer containers.",
|
||||||
|
"pullImages": "Pull from Docker Hub",
|
||||||
"brandingTitle": "Branding Settings",
|
"brandingTitle": "Branding Settings",
|
||||||
"companyName": "Company / Application Name",
|
"companyName": "Company / Application Name",
|
||||||
"companyNamePlaceholder": "NetBird MSP Appliance",
|
"companyNamePlaceholder": "NetBird MSP Appliance",
|
||||||
@@ -280,7 +296,30 @@
|
|||||||
"thDashboard": "Dashboard",
|
"thDashboard": "Dashboard",
|
||||||
"thRelayPort": "Relay Port",
|
"thRelayPort": "Relay Port",
|
||||||
"thContainers": "Containers",
|
"thContainers": "Containers",
|
||||||
"noCustomers": "No customers."
|
"noCustomers": "No customers.",
|
||||||
|
"imageUpdates": "NetBird Container Updates",
|
||||||
|
"checkUpdates": "Check for Updates",
|
||||||
|
"pullImages": "Pull Latest Images",
|
||||||
|
"updateAll": "Update All",
|
||||||
|
"clickCheckUpdates": "Click \"Check for Updates\" to compare local images with Docker Hub.",
|
||||||
|
"updateAvailable": "Update available",
|
||||||
|
"upToDate": "Up to date",
|
||||||
|
"needsUpdate": "Needs update",
|
||||||
|
"updateCustomer": "Update this customer",
|
||||||
|
"imageStatusTitle": "Image Status (vs. Docker Hub)",
|
||||||
|
"customerImageTitle": "Customer Container Status",
|
||||||
|
"thImage": "Image",
|
||||||
|
"thLocalDigest": "Local Digest",
|
||||||
|
"thHubDigest": "Hub Digest",
|
||||||
|
"confirmPull": "Pull the latest NetBird images from Docker Hub? This may take a few minutes.",
|
||||||
|
"pullStarted": "Image pull started in background. Re-checking in 5 seconds…",
|
||||||
|
"confirmUpdateAll": "Recreate containers for all customers that have outdated images? Running services will briefly restart.",
|
||||||
|
"updateAllStarted": "Update started in background.",
|
||||||
|
"updateDone": "Customer containers updated.",
|
||||||
|
"updating": "Updating…",
|
||||||
|
"updateAllProgress": "Updating customer containers one by one — please wait…",
|
||||||
|
"pulling": "Pulling…",
|
||||||
|
"pullStartedShort": "Pull started in background."
|
||||||
},
|
},
|
||||||
"userModal": {
|
"userModal": {
|
||||||
"title": "New User",
|
"title": "New User",
|
||||||
|
|||||||
Reference in New Issue
Block a user