Compare commits
2
Commits
9b02a488bf
...
b6f6da01e0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b6f6da01e0 | ||
|
|
d6d0f37c5a |
No files matched your search
@@ -28,14 +28,14 @@ ETC_DIR="$BASEURL/etc/"
|
||||
|
||||
SERVER_IP=$(ip -4 addr show eth0 | awk '/inet/ {print $2}' | cut -d/ -f1 | head -n1)
|
||||
|
||||
LABEL_DOMAINS=("$UUID.odoo4projects.com")
|
||||
LABEL_DOMAINS=("$UUID.odoo4projects.com" "$UUID.$HOSTNAME.odoo4projects.com")
|
||||
if [ -f "$BASEURL/etc/domain" ]; then
|
||||
while IFS= read -r domain || [[ -n $domain ]]; do
|
||||
[ -z "$domain" ] && continue
|
||||
LABEL_DOMAINS+=("$domain")
|
||||
done < "$BASEURL/etc/domain"
|
||||
else
|
||||
echo "$(date '+%Y-%m-%d %H:%M:%S') No custom domain file at $BASEURL/etc/domain, using default domain $UUID.odoo4projects.com only"
|
||||
echo "$(date '+%Y-%m-%d %H:%M:%S') No custom domain file at $BASEURL/etc/domain, using default domains $UUID.odoo4projects.com and $UUID.$HOSTNAME.odoo4projects.com only"
|
||||
fi
|
||||
|
||||
RULE=""
|
||||
|
||||
@@ -29,14 +29,14 @@ ETC_DIR="$BASEURL/etc/"
|
||||
|
||||
SERVER_IP=$(ip -4 addr show eth0 | awk '/inet/ {print $2}' | cut -d/ -f1 | head -n1)
|
||||
|
||||
LABEL_DOMAINS=("$UUID.odoo4projects.com")
|
||||
LABEL_DOMAINS=("$UUID.odoo4projects.com" "$UUID.$HOSTNAME.odoo4projects.com")
|
||||
if [ -f "$BASEURL/etc/domain" ]; then
|
||||
while IFS= read -r domain || [[ -n $domain ]]; do
|
||||
[ -z "$domain" ] && continue
|
||||
LABEL_DOMAINS+=("$domain")
|
||||
done < "$BASEURL/etc/domain"
|
||||
else
|
||||
echo "$(date '+%Y-%m-%d %H:%M:%S') No custom domain file at $BASEURL/etc/domain, using default domain $UUID.odoo4projects.com only"
|
||||
echo "$(date '+%Y-%m-%d %H:%M:%S') No custom domain file at $BASEURL/etc/domain, using default domains $UUID.odoo4projects.com and $UUID.$HOSTNAME.odoo4projects.com only"
|
||||
fi
|
||||
|
||||
RULE=""
|
||||
|
||||
@@ -29,14 +29,14 @@ ETC_DIR="$BASEURL/etc/"
|
||||
|
||||
SERVER_IP=$(ip -4 addr show eth0 | awk '/inet/ {print $2}' | cut -d/ -f1 | head -n1)
|
||||
|
||||
LABEL_DOMAINS=("$UUID.odoo4projects.com")
|
||||
LABEL_DOMAINS=("$UUID.odoo4projects.com" "$UUID.$HOSTNAME.odoo4projects.com")
|
||||
if [ -f "$BASEURL/etc/domain" ]; then
|
||||
while IFS= read -r domain || [[ -n $domain ]]; do
|
||||
[ -z "$domain" ] && continue
|
||||
LABEL_DOMAINS+=("$domain")
|
||||
done < "$BASEURL/etc/domain"
|
||||
else
|
||||
echo "$(date '+%Y-%m-%d %H:%M:%S') No custom domain file at $BASEURL/etc/domain, using default domain $UUID.odoo4projects.com only"
|
||||
echo "$(date '+%Y-%m-%d %H:%M:%S') No custom domain file at $BASEURL/etc/domain, using default domains $UUID.odoo4projects.com and $UUID.$HOSTNAME.odoo4projects.com only"
|
||||
fi
|
||||
|
||||
RULE=""
|
||||
|
||||
+17
-1
@@ -1,7 +1,8 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Collect server runtime stats (uptime, top, cgroup, mounts) and return as JSON."""
|
||||
"""Collect server runtime stats (uptime, top, cgroup, mounts, hdd) and return as JSON."""
|
||||
|
||||
import json
|
||||
import os
|
||||
import subprocess
|
||||
|
||||
|
||||
@@ -32,6 +33,20 @@ def read_file(path):
|
||||
return None
|
||||
|
||||
|
||||
def disk_usage(path):
|
||||
"""Total/used/available bytes for the filesystem at `path` (same figures as df)."""
|
||||
try:
|
||||
st = os.statvfs(path)
|
||||
return {
|
||||
"path": path,
|
||||
"total_bytes": st.f_blocks * st.f_frsize,
|
||||
"used_bytes": (st.f_blocks - st.f_bfree) * st.f_frsize,
|
||||
"available_bytes": st.f_bavail * st.f_frsize,
|
||||
}
|
||||
except Exception as e:
|
||||
return f"ERROR: {e}"
|
||||
|
||||
|
||||
def main():
|
||||
stats = {}
|
||||
|
||||
@@ -39,6 +54,7 @@ def main():
|
||||
stats["top"] = cmd(["sh", "-c", "top -b -n 1 | head -n 3"], splitlines=True)
|
||||
stats["cgroup"] = read_file("/proc/self/cgroup")
|
||||
stats["mounts"] = cmd(["mount"], splitlines=True)
|
||||
stats["hdd"] = disk_usage("/")
|
||||
|
||||
print(json.dumps(stats, indent=2))
|
||||
|
||||
|
||||
Reference in new issue
Block a user