mirror of
https://github.com/kiddin9/op-packages.git
synced 2026-11-12 12:37:51 +08:00
✨ Sync 2026-10-20 03:34:23
This commit is contained in:
github-actions[bot] committed
1 parent
d210fa85f8
commit
cbd3ce4959
21 files changed
+2002
-90
No files matched your search
@@ -0,0 +1,21 @@
|
|||||||
|
MIT License
|
||||||
|
|
||||||
|
Copyright (c) 2026 OneNAS.space
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
in the Software without restriction, including without limitation the rights
|
||||||
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
copies of the Software, and to permit persons to whom the Software is
|
||||||
|
furnished to do so, subject to the following conditions:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice shall be included in all
|
||||||
|
copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
SOFTWARE.
|
||||||
+51
-23
@@ -1,49 +1,80 @@
|
|||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=beszel-agent
|
PKG_NAME:=beszel
|
||||||
PKG_VERSION:=0.21.0
|
PKG_VERSION:=0.21.0
|
||||||
PKG_RELEASE:=11
|
PKG_RELEASE:=12
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)_linux_$(or $(BESZEL_GOARCH),arm64).tar.gz
|
PKG_SOURCE:=beszel-$(PKG_VERSION).tar.gz
|
||||||
PKG_SOURCE_URL:=https://github.com/henrygd/beszel/releases/download/v$(PKG_VERSION)/
|
PKG_SOURCE_URL:=https://codeload.github.com/henrygd/beszel/tar.gz/v$(PKG_VERSION)?
|
||||||
PKG_HASH:=skip
|
PKG_HASH:=skip
|
||||||
|
|
||||||
|
PKG_MAINTAINER:=Jackie264 <OneNAS-space>
|
||||||
PKG_LICENSE:=MIT
|
PKG_LICENSE:=MIT
|
||||||
PKG_LICENSE_FILES:=LICENSE
|
PKG_LICENSE_FILES:=LICENSE
|
||||||
|
|
||||||
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
|
PKG_BUILD_DIR:=$(BUILD_DIR)/beszel-$(PKG_VERSION)
|
||||||
|
PKG_BUILD_DEPENDS:=golang/host
|
||||||
|
PKG_BUILD_PARALLEL:=1
|
||||||
|
PKG_USE_MIPS16:=0
|
||||||
|
|
||||||
|
GO_PKG:=github.com/henrygd/beszel
|
||||||
|
GO_PKG_BUILD_PKG:=$(GO_PKG)/internal/cmd/agent
|
||||||
|
GO_PKG_TAGS:=openwrt
|
||||||
|
GO_PKG_ENABLE_CGO:=0
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/package.mk
|
include $(INCLUDE_DIR)/package.mk
|
||||||
|
include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk
|
||||||
|
|
||||||
define Package/beszel-agent
|
define Package/beszel-agent
|
||||||
SECTION:=admin
|
SECTION:=net
|
||||||
CATEGORY:=Administration
|
CATEGORY:=Network
|
||||||
TITLE:=Beszel monitoring agent
|
TITLE:=Beszel monitoring agent
|
||||||
URL:=https://github.com/henrygd/beszel
|
URL:=https://beszel.dev
|
||||||
|
DEPENDS:=$(GO_ARCH_DEPENDS)
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/beszel-agent/description
|
define Package/beszel-agent/description
|
||||||
Lightweight server monitoring agent for Beszel hub
|
Beszel is a lightweight server monitoring hub.
|
||||||
|
This package contains the agent that runs on the monitored system.
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Build/Prepare
|
define Build/Prepare
|
||||||
mkdir -p $(PKG_BUILD_DIR)
|
$(call Build/Prepare/Default)
|
||||||
tar -xzf $(DL_DIR)/$(PKG_SOURCE) -C $(PKG_BUILD_DIR)
|
$(CP) ./files/openwrt_services.go $(PKG_BUILD_DIR)/agent/
|
||||||
|
$(CP) ./files/openwrt_intel_gpu.go $(PKG_BUILD_DIR)/agent/
|
||||||
|
$(SED) 's|//go:build linux|//go:build linux \&\& !openwrt|' $(PKG_BUILD_DIR)/agent/systemd.go
|
||||||
|
rm -f $(PKG_BUILD_DIR)/agent/gpu_intel.go
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Build/Compile
|
define Package/beszel-agent/conffiles
|
||||||
if command -v upx >/dev/null 2>&1; then \
|
/etc/config/beszel-agent
|
||||||
if [ "$(BESZEL_GOARCH)" = "mips" ] || [ "$(BESZEL_GOARCH)" = "mipsle" ]; then \
|
endef
|
||||||
echo "Skipping UPX compression for MIPS architectures (prevents execution hang)..."; \
|
|
||||||
else \
|
define Package/beszel-agent/preinst
|
||||||
upx --best --lzma $(PKG_BUILD_DIR)/beszel-agent || true; \
|
#!/bin/sh
|
||||||
fi; \
|
if [ -z "$${IPKG_INSTROOT}" ]; then
|
||||||
|
if [ -f "/etc/init.d/beszel-agent" ]; then
|
||||||
|
echo "Stopping old Beszel Agent instance before upgrade..."
|
||||||
|
/etc/init.d/beszel-agent stop
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
|
exit 0
|
||||||
|
endef
|
||||||
|
|
||||||
|
define Package/beszel-agent/postinst
|
||||||
|
#!/bin/sh
|
||||||
|
if [ -z "$${IPKG_INSTROOT}" ]; then
|
||||||
|
echo "Beszel Agent updated successfully. Starting service..."
|
||||||
|
/etc/init.d/beszel-agent enable
|
||||||
|
/etc/init.d/beszel-agent start
|
||||||
|
fi
|
||||||
|
exit 0
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/beszel-agent/install
|
define Package/beszel-agent/install
|
||||||
|
$(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR))
|
||||||
$(INSTALL_DIR) $(1)/usr/bin
|
$(INSTALL_DIR) $(1)/usr/bin
|
||||||
$(INSTALL_BIN) $(PKG_BUILD_DIR)/beszel-agent $(1)/usr/bin/
|
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/agent $(1)/usr/bin/beszel-agent
|
||||||
|
|
||||||
$(INSTALL_DIR) $(1)/etc/init.d
|
$(INSTALL_DIR) $(1)/etc/init.d
|
||||||
$(INSTALL_BIN) ./files/beszel-agent.init $(1)/etc/init.d/beszel-agent
|
$(INSTALL_BIN) ./files/beszel-agent.init $(1)/etc/init.d/beszel-agent
|
||||||
@@ -52,8 +83,5 @@ define Package/beszel-agent/install
|
|||||||
$(INSTALL_CONF) ./files/beszel-agent.config $(1)/etc/config/beszel-agent
|
$(INSTALL_CONF) ./files/beszel-agent.config $(1)/etc/config/beszel-agent
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/beszel-agent/conffiles
|
$(eval $(call GoPackage,beszel-agent))
|
||||||
/etc/config/beszel-agent
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(call BuildPackage,beszel-agent))
|
$(eval $(call BuildPackage,beszel-agent))
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
# beszel-agent
|
||||||
|
The lightweight telemetry agent adapted to OpenWrt is used to report system and Docker indicators to your Beszel Hub.
|
||||||
|
|
||||||
|
## luci-app-beszel-agent
|
||||||
|
LuCI UI configuration interface of Beszel Agent
|
||||||
|
- [Right-click on this and then "Open Link in New Tab"](https://github.com/OneNAS-space/luci-app-beszel-agent)
|
||||||
|
|
||||||
|
#### (Based on the official source code)
|
||||||
|
Automatically synchronize and track the latest version of upstream
|
||||||
|
|
||||||
|
- Support OpenWrt's procd so that Service detail can display the status correctly.
|
||||||
|
<img width="1460" height="755" alt="Screenshot 2026-07-10 at 21 54 34" src="https://github.com/user-attachments/assets/09109fd9-4811-412e-9a45-11660054b481" />
|
||||||
|
|
||||||
|
- Support AMD/Intel GPU
|
||||||
|
<img width="1446" height="419" alt="Screenshot 2026-07-17 at 23 36 34" src="https://github.com/user-attachments/assets/cca94b20-489b-4a83-9432-30ed7f9071be" />
|
||||||
|
|
||||||
|
### Attribution
|
||||||
|
#### Reference
|
||||||
|
- [beszel official](https://github.com/henrygd/beszel)
|
||||||
|
|
||||||
|
#### Acknowledgment
|
||||||
|
Inspired by
|
||||||
|
- [@vernette beszel-agent-openwrt](https://github.com/vernette/beszel-agent-openwrt)
|
||||||
|
|
||||||
|
#### Notice
|
||||||
|
If the author of the original code has any objections, please contact me to deal with it.
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
# Security Policy
|
||||||
|
|
||||||
|
## Supported Versions
|
||||||
|
|
||||||
|
Use this section to tell people about which versions of your project are
|
||||||
|
currently being supported with security updates.
|
||||||
|
|
||||||
|
| Version | Supported |
|
||||||
|
| ------- | ------------------ |
|
||||||
|
| 5.1.x | :white_check_mark: |
|
||||||
|
| 5.0.x | :x: |
|
||||||
|
| 4.0.x | :white_check_mark: |
|
||||||
|
| < 4.0 | :x: |
|
||||||
|
|
||||||
|
## Reporting a Vulnerability
|
||||||
|
|
||||||
|
Use this section to tell people how to report a vulnerability.
|
||||||
|
|
||||||
|
Tell them where to go, how often they can expect to get an update on a
|
||||||
|
reported vulnerability, what to expect if the vulnerability is accepted or
|
||||||
|
declined, etc.
|
||||||
@@ -1,9 +1,17 @@
|
|||||||
config agent 'agent'
|
config beszel-agent 'main'
|
||||||
option enabled '0'
|
option boot_delay '15'
|
||||||
option port '45876'
|
option enable '0'
|
||||||
option public_key ''
|
option data_dir '/etc/beszel-agent'
|
||||||
option hub_url '' # optional, for outbound mode (websockets)
|
option docker_host ''
|
||||||
option token '' # optional, for outbound mode (websockets)
|
option hub_url ''
|
||||||
option extra_filesystems '' # optional, comma-separated, e.g. 'sda1__NAS'
|
option intel_gpu_device ''
|
||||||
option fingerprint '' # auto-populated on first start, do not edit
|
option key ''
|
||||||
|
option listen '0.0.0.0:45876'
|
||||||
|
option log_level 'info'
|
||||||
|
option system_name 'openwrt'
|
||||||
|
option token ''
|
||||||
|
|
||||||
|
# Load additional file systems (optional)
|
||||||
|
# Add multiple mount points using 'list' syntax
|
||||||
|
# list extra_filesystems '/mnt/sda1'
|
||||||
|
# list extra_filesystems '/mnt/sdb1'
|
||||||
@@ -1,75 +1,124 @@
|
|||||||
#!/bin/sh /etc/rc.common
|
#!/bin/sh /etc/rc.common
|
||||||
|
|
||||||
START=99
|
START=99
|
||||||
STOP=10
|
|
||||||
|
|
||||||
USE_PROCD=1
|
USE_PROCD=1
|
||||||
|
NAME=beszel-agent
|
||||||
PROG=/usr/bin/beszel-agent
|
PROG=/usr/bin/beszel-agent
|
||||||
DATA_DIR=/var/lib/beszel-agent
|
|
||||||
FP_FILE="$DATA_DIR/fingerprint"
|
append_fs() {
|
||||||
OLD_FP_FILE=/usr/share/beszel-agent/fingerprint
|
local value="$1"
|
||||||
|
if [ -z "$FS_LIST" ]; then
|
||||||
|
FS_LIST="$value"
|
||||||
|
else
|
||||||
|
FS_LIST="$FS_LIST,$value"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
append_nic() {
|
||||||
|
local value="$1"
|
||||||
|
if [ -z "$NIC_LIST" ]; then
|
||||||
|
NIC_LIST="$value"
|
||||||
|
else
|
||||||
|
NIC_LIST="$NIC_LIST,$value"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
boot() {
|
||||||
|
local delay
|
||||||
|
delay="$(uci -q get $NAME.@main.boot_delay)"
|
||||||
|
sleep "${delay:-15}"
|
||||||
|
start "$@"
|
||||||
|
}
|
||||||
|
|
||||||
start_service() {
|
start_service() {
|
||||||
local enabled port key url token extra_fs fp
|
local enable data_dir docker_host gpu_collector hub_url intel_gpu_device key listen log_level port token skip_gpu skip_systemd system_name
|
||||||
|
|
||||||
config_load 'beszel-agent'
|
config_load "$NAME"
|
||||||
config_get_bool enabled 'agent' 'enabled' '0'
|
|
||||||
config_get port 'agent' 'port' '45876'
|
|
||||||
config_get key 'agent' 'public_key' ''
|
|
||||||
config_get url 'agent' 'hub_url' ''
|
|
||||||
config_get token 'agent' 'token' ''
|
|
||||||
config_get extra_fs 'agent' 'extra_filesystems' ''
|
|
||||||
config_get fp 'agent' 'fingerprint' ''
|
|
||||||
|
|
||||||
[ "$enabled" -eq 0 ] && return 0
|
config_get_bool enable "main" "enable" 0
|
||||||
|
[ "$enable" -eq 1 ] || return 0
|
||||||
|
|
||||||
[ -z "$key" ] && {
|
config_get data_dir "main" "data_dir" "/etc/beszel-agent"
|
||||||
logger -t beszel-agent "Public key not set!"
|
config_get docker_host "main" "docker_host" ""
|
||||||
return 1
|
config_get gpu_collector "main" "gpu_collector" ""
|
||||||
}
|
config_get hub_url "main" "hub_url" ""
|
||||||
|
config_get intel_gpu_device "main" "intel_gpu_device" ""
|
||||||
|
config_get key "main" "key" ""
|
||||||
|
config_get listen "main" "listen" ""
|
||||||
|
config_get log_level "main" "log_level" "info"
|
||||||
|
config_get port "main" "port" "45876"
|
||||||
|
config_get skip_gpu "main" "skip_gpu" "false"
|
||||||
|
case "$(uname -m)" in
|
||||||
|
x86_64|i?86)
|
||||||
|
if ! ls /sys/class/drm/card[0-9]* >/dev/null 2>&1; then
|
||||||
|
skip_gpu="true"
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
skip_gpu="true"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
config_get skip_systemd "main" "skip_systemd" "false"
|
||||||
|
config_get system_name "main" "system_name" ""
|
||||||
|
config_get token "main" "token" ""
|
||||||
|
|
||||||
if [ -n "$url" ] || [ -n "$token" ]; then
|
if [ -n "$data_dir" ]; then
|
||||||
if [ -z "$url" ] || [ -z "$token" ]; then
|
mkdir -p "$data_dir"
|
||||||
logger -t beszel-agent "Outbound mode requires both hub_url and token, but only one set!"
|
if [ -f /etc/sysupgrade.conf ]; then
|
||||||
return 1
|
if ! grep -qFx "$data_dir" /etc/sysupgrade.conf; then
|
||||||
|
echo "$data_dir" >> /etc/sysupgrade.conf
|
||||||
|
fi
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
|
||||||
|
|
||||||
mkdir -p "$DATA_DIR"
|
FS_LIST=""
|
||||||
|
config_list_foreach "main" "extra_filesystems" append_fs
|
||||||
|
|
||||||
# migrate from pre-UCI storage on flash
|
NIC_LIST=""
|
||||||
[ -z "$fp" ] && [ -s "$OLD_FP_FILE" ] && fp=$(cat "$OLD_FP_FILE")
|
config_list_foreach "main" "nics" append_nic
|
||||||
|
|
||||||
if [ -z "$fp" ]; then
|
procd_open_instance "beszel-agent"
|
||||||
DATA_DIR="$DATA_DIR" "$PROG" fingerprint > /dev/null 2>&1
|
procd_set_param command "$PROG"
|
||||||
[ -s "$FP_FILE" ] && fp=$(cat "$FP_FILE")
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -n "$fp" ]; then
|
procd_set_param env HOST_PROC="/proc" HOST_SYS="/sys"
|
||||||
printf '%s' "$fp" > "$FP_FILE"
|
|
||||||
[ "$(uci -q get beszel-agent.agent.fingerprint)" = "$fp" ] || {
|
|
||||||
uci set beszel-agent.agent.fingerprint="$fp"
|
|
||||||
uci commit beszel-agent
|
|
||||||
logger -t beszel-agent "Fingerprint saved to UCI: $fp"
|
|
||||||
}
|
|
||||||
else
|
|
||||||
logger -t beszel-agent "Failed to obtain fingerprint, agent will generate one"
|
|
||||||
fi
|
|
||||||
|
|
||||||
procd_open_instance beszel-agent
|
if [ -n "$listen" ]; then
|
||||||
procd_set_param command "$PROG" -listen "$port" -key "$key"
|
procd_append_param env LISTEN="$listen"
|
||||||
[ -n "$url" ] && [ -n "$token" ] && {
|
else
|
||||||
procd_append_param command -url "$url" -token "$token"
|
procd_append_param env PORT="$port"
|
||||||
}
|
fi
|
||||||
|
|
||||||
procd_set_param env DATA_DIR="$DATA_DIR"
|
[ -n "$docker_host" ] && procd_append_param env DOCKER_HOST="$docker_host"
|
||||||
[ -n "$extra_fs" ] && procd_append_param env EXTRA_FILESYSTEMS="$extra_fs"
|
[ -n "$data_dir" ] && procd_append_param env DATA_DIR="$data_dir"
|
||||||
procd_set_param respawn 3600 5 5
|
[ -n "$FS_LIST" ] && procd_append_param env EXTRA_FILESYSTEMS="$FS_LIST"
|
||||||
procd_set_param stdout 1
|
[ -n "$hub_url" ] && procd_append_param env HUB_URL="$hub_url"
|
||||||
procd_set_param stderr 1
|
[ -n "$key" ] && procd_append_param env KEY="$key"
|
||||||
procd_close_instance
|
[ -n "$log_level" ] && procd_append_param env LOG_LEVEL="$log_level"
|
||||||
|
[ -n "$NIC_LIST" ] && procd_append_param env NICS="$NIC_LIST"
|
||||||
|
[ -n "$skip_gpu" ] && procd_append_param env SKIP_GPU="$skip_gpu"
|
||||||
|
[ -n "$skip_systemd" ] && procd_append_param env SKIP_SYSTEMD="$skip_systemd"
|
||||||
|
[ -n "$system_name" ] && procd_append_param env SYSTEM_NAME="$system_name"
|
||||||
|
[ -n "$token" ] && procd_append_param env TOKEN="$token"
|
||||||
|
|
||||||
|
if [ "$skip_gpu" = "false" ]; then
|
||||||
|
[ -n "$gpu_collector" ] && procd_append_param env GPU_COLLECTOR="$gpu_collector"
|
||||||
|
if [ "$gpu_collector" = "intel_gpu_top" ] || [ -z "$gpu_collector" ]; then
|
||||||
|
[ -n "$intel_gpu_device" ] && procd_append_param env INTEL_GPU_DEVICE="$intel_gpu_device"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
procd_set_param stdout 1
|
||||||
|
procd_set_param stderr 1
|
||||||
|
|
||||||
|
procd_set_param respawn
|
||||||
|
procd_close_instance
|
||||||
}
|
}
|
||||||
|
|
||||||
service_triggers() {
|
service_triggers() {
|
||||||
procd_add_reload_trigger 'beszel-agent'
|
procd_add_reload_trigger "beszel-agent"
|
||||||
|
}
|
||||||
|
|
||||||
|
reload_service() {
|
||||||
|
stop
|
||||||
|
start
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,138 @@
|
|||||||
|
//go:build linux && openwrt
|
||||||
|
|
||||||
|
package agent
|
||||||
|
|
||||||
|
import (
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/henrygd/beszel/internal/entities/system"
|
||||||
|
)
|
||||||
|
|
||||||
|
const intelGpuStatsCmd = "sh"
|
||||||
|
|
||||||
|
type intelGpuStats struct {
|
||||||
|
PowerGPU float64
|
||||||
|
PowerPkg float64
|
||||||
|
Engines map[string]float64
|
||||||
|
}
|
||||||
|
|
||||||
|
var (
|
||||||
|
gpuStateMu sync.Mutex
|
||||||
|
lastRc6 uint64
|
||||||
|
lastGpuEnergy uint64
|
||||||
|
lastPkgEnergy uint64
|
||||||
|
lastTime time.Time
|
||||||
|
)
|
||||||
|
|
||||||
|
func getEnergyPaths() (gpuPath string, pkgPath string) {
|
||||||
|
pkgBase := "/sys/class/powercap/intel-rapl/intel-rapl:0"
|
||||||
|
gpuBase := "/sys/class/powercap/intel-rapl/intel-rapl:0/intel-rapl:0:1"
|
||||||
|
|
||||||
|
if _, err := os.Stat(pkgBase + "/energy_uj"); err == nil {
|
||||||
|
pkgPath = pkgBase + "/energy_uj"
|
||||||
|
}
|
||||||
|
if _, err := os.Stat(gpuBase + "/energy_uj"); err == nil {
|
||||||
|
gpuPath = gpuBase + "/energy_uj"
|
||||||
|
}
|
||||||
|
return gpuPath, pkgPath
|
||||||
|
}
|
||||||
|
|
||||||
|
func readUint64(path string) uint64 {
|
||||||
|
if path == "" {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
data, err := os.ReadFile(path)
|
||||||
|
if err != nil {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
val, _ := strconv.ParseUint(strings.TrimSpace(string(data)), 10, 64)
|
||||||
|
return val
|
||||||
|
}
|
||||||
|
|
||||||
|
func (gm *GPUManager) updateIntelFromStats(sample *intelGpuStats) bool {
|
||||||
|
gm.Lock()
|
||||||
|
defer gm.Unlock()
|
||||||
|
|
||||||
|
id := "0"
|
||||||
|
gpuData, ok := gm.GpuDataMap[id]
|
||||||
|
if !ok {
|
||||||
|
gpuData = &system.GPUData{Name: "GPU", Engines: make(map[string]float64)}
|
||||||
|
gm.GpuDataMap[id] = gpuData
|
||||||
|
}
|
||||||
|
|
||||||
|
gpuData.Power += sample.PowerGPU
|
||||||
|
gpuData.PowerPkg += sample.PowerPkg
|
||||||
|
|
||||||
|
if gpuData.Engines == nil {
|
||||||
|
gpuData.Engines = make(map[string]float64, len(sample.Engines))
|
||||||
|
}
|
||||||
|
for name, engine := range sample.Engines {
|
||||||
|
gpuData.Engines[name] += engine
|
||||||
|
}
|
||||||
|
|
||||||
|
gpuData.Count++
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
func (gm *GPUManager) collectIntelStats() (err error) {
|
||||||
|
gpuStateMu.Lock()
|
||||||
|
defer gpuStateMu.Unlock()
|
||||||
|
|
||||||
|
device := os.Getenv("INTEL_GPU_DEVICE")
|
||||||
|
if device == "" {
|
||||||
|
device = "card0"
|
||||||
|
}
|
||||||
|
device = filepath.Base(device)
|
||||||
|
|
||||||
|
rc6Path := "/sys/class/drm/" + device + "/power/rc6_residency_ms"
|
||||||
|
gpuEnergyPath, pkgEnergyPath := getEnergyPaths()
|
||||||
|
|
||||||
|
currRc6 := readUint64(rc6Path)
|
||||||
|
currGpuEnergy := readUint64(gpuEnergyPath)
|
||||||
|
currPkgEnergy := readUint64(pkgEnergyPath)
|
||||||
|
|
||||||
|
now := time.Now()
|
||||||
|
|
||||||
|
if !lastTime.IsZero() {
|
||||||
|
timeDelta := uint64(now.Sub(lastTime).Milliseconds())
|
||||||
|
if timeDelta > 500 {
|
||||||
|
rc6Delta := currRc6 - lastRc6
|
||||||
|
usage := 100.0 - (float64(rc6Delta) / float64(timeDelta) * 100.0)
|
||||||
|
if usage < 0 { usage = 0 }
|
||||||
|
|
||||||
|
var powerGPU float64
|
||||||
|
if currGpuEnergy > 0 && currGpuEnergy >= lastGpuEnergy {
|
||||||
|
energyDelta := currGpuEnergy - lastGpuEnergy
|
||||||
|
powerGPU = float64(energyDelta) / float64(timeDelta) / 1000.0
|
||||||
|
}
|
||||||
|
|
||||||
|
var powerPkg float64
|
||||||
|
if currPkgEnergy > 0 && currPkgEnergy >= lastPkgEnergy {
|
||||||
|
energyDelta := currPkgEnergy - lastPkgEnergy
|
||||||
|
powerPkg = float64(energyDelta) / float64(timeDelta) / 1000.0
|
||||||
|
}
|
||||||
|
|
||||||
|
sample := intelGpuStats{
|
||||||
|
PowerGPU: powerGPU,
|
||||||
|
PowerPkg: powerPkg,
|
||||||
|
Engines: map[string]float64{
|
||||||
|
"Render/3D": usage,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
gm.updateIntelFromStats(&sample)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
lastRc6 = currRc6
|
||||||
|
lastGpuEnergy = currGpuEnergy
|
||||||
|
lastPkgEnergy = currPkgEnergy
|
||||||
|
lastTime = now
|
||||||
|
time.Sleep(2 * time.Second)
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,352 @@
|
|||||||
|
//go:build linux && openwrt
|
||||||
|
|
||||||
|
package agent
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"encoding/json"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"os/exec"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/coreos/go-systemd/v22/dbus"
|
||||||
|
"github.com/henrygd/beszel/agent/utils"
|
||||||
|
"github.com/henrygd/beszel/internal/entities/systemd"
|
||||||
|
)
|
||||||
|
|
||||||
|
var errNoActiveTime = errors.New("no active time")
|
||||||
|
|
||||||
|
type systemdManager struct {
|
||||||
|
sync.Mutex
|
||||||
|
serviceStatsMap map[string]*systemd.Service
|
||||||
|
isRunning bool
|
||||||
|
hasFreshStats bool
|
||||||
|
patterns []string
|
||||||
|
logsEnabled bool
|
||||||
|
}
|
||||||
|
|
||||||
|
func isSystemdAvailable() bool {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
func newSystemdManager() (*systemdManager, error) {
|
||||||
|
if skipSystemd, _ := utils.GetEnv("SKIP_SYSTEMD"); skipSystemd == "true" {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
manager := &systemdManager{
|
||||||
|
serviceStatsMap: make(map[string]*systemd.Service),
|
||||||
|
patterns: getServicePatterns(),
|
||||||
|
}
|
||||||
|
|
||||||
|
manager.startWorker(nil)
|
||||||
|
|
||||||
|
return manager, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (sm *systemdManager) startWorker(conn *dbus.Conn) {
|
||||||
|
if sm.isRunning {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
sm.isRunning = true
|
||||||
|
_ = sm.getServiceStats(nil, true)
|
||||||
|
go func() {
|
||||||
|
for {
|
||||||
|
time.Sleep(time.Minute * 10)
|
||||||
|
_ = sm.getServiceStats(nil, true)
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (sm *systemdManager) getServiceStatsCount() int {
|
||||||
|
return len(sm.serviceStatsMap)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (sm *systemdManager) getFailedServiceCount() uint16 {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
func (sm *systemdManager) getServiceStats(conn *dbus.Conn, refresh bool) []*systemd.Service {
|
||||||
|
var services []*systemd.Service
|
||||||
|
|
||||||
|
if !refresh {
|
||||||
|
sm.Lock()
|
||||||
|
defer sm.Unlock()
|
||||||
|
for _, service := range sm.serviceStatsMap {
|
||||||
|
services = append(services, service)
|
||||||
|
}
|
||||||
|
sm.hasFreshStats = false
|
||||||
|
return services
|
||||||
|
}
|
||||||
|
|
||||||
|
out, err := exec.Command("ubus", "call", "service", "list").Output()
|
||||||
|
if err != nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
type UbusInstance struct {
|
||||||
|
Running bool `json:"running"`
|
||||||
|
Pid int `json:"pid"`
|
||||||
|
}
|
||||||
|
type UbusService struct {
|
||||||
|
Instances map[string]UbusInstance `json:"instances"`
|
||||||
|
}
|
||||||
|
|
||||||
|
var ubusData map[string]UbusService
|
||||||
|
if err := json.Unmarshal(out, &ubusData); err != nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
currentUnits := make(map[string]struct{})
|
||||||
|
pageSize := uint64(os.Getpagesize())
|
||||||
|
if pageSize == 0 {
|
||||||
|
pageSize = 4096
|
||||||
|
}
|
||||||
|
|
||||||
|
sm.Lock()
|
||||||
|
defer sm.Unlock()
|
||||||
|
|
||||||
|
for sName, sData := range ubusData {
|
||||||
|
unitName := sName + ".service"
|
||||||
|
currentUnits[unitName] = struct{}{}
|
||||||
|
|
||||||
|
pid := 0
|
||||||
|
isRunning := false
|
||||||
|
for _, inst := range sData.Instances {
|
||||||
|
if inst.Running && inst.Pid > 0 {
|
||||||
|
pid = inst.Pid
|
||||||
|
isRunning = true
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
service, exists := sm.serviceStatsMap[unitName]
|
||||||
|
if !exists {
|
||||||
|
service = &systemd.Service{Name: sName}
|
||||||
|
sm.serviceStatsMap[unitName] = service
|
||||||
|
}
|
||||||
|
|
||||||
|
if isRunning {
|
||||||
|
service.State = systemd.ParseServiceStatus("active")
|
||||||
|
service.Sub = systemd.ParseServiceSubState("running")
|
||||||
|
|
||||||
|
if data, err := os.ReadFile(fmt.Sprintf("/proc/%d/stat", pid)); err == nil {
|
||||||
|
binEnd := strings.LastIndex(string(data), ")")
|
||||||
|
if binEnd != -1 && len(string(data)) > binEnd+2 {
|
||||||
|
fields := strings.Fields(string(data)[binEnd+2:])
|
||||||
|
if len(fields) > 21 {
|
||||||
|
utime, _ := strconv.ParseUint(fields[11], 10, 64)
|
||||||
|
stime, _ := strconv.ParseUint(fields[12], 10, 64)
|
||||||
|
rss, _ := strconv.ParseUint(fields[21], 10, 64)
|
||||||
|
|
||||||
|
service.Mem = rss * pageSize
|
||||||
|
if service.Mem > service.MemPeak {
|
||||||
|
service.MemPeak = service.Mem
|
||||||
|
}
|
||||||
|
service.UpdateCPUPercent((utime + stime) * 10000000)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
service.State = systemd.ParseServiceStatus("active")
|
||||||
|
service.Sub = systemd.ParseServiceSubState("exited")
|
||||||
|
service.Mem = 0
|
||||||
|
service.UpdateCPUPercent(0)
|
||||||
|
}
|
||||||
|
services = append(services, service)
|
||||||
|
}
|
||||||
|
|
||||||
|
for unitName := range sm.serviceStatsMap {
|
||||||
|
if _, exists := currentUnits[unitName]; !exists {
|
||||||
|
delete(sm.serviceStatsMap, unitName)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
sm.hasFreshStats = true
|
||||||
|
return services
|
||||||
|
}
|
||||||
|
|
||||||
|
func (sm *systemdManager) updateServiceStats(conn *dbus.Conn, unit dbus.UnitStatus) (*systemd.Service, error) {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (sm *systemdManager) getServiceDetails(serviceName string) (systemd.ServiceDetails, error) {
|
||||||
|
details := make(systemd.ServiceDetails)
|
||||||
|
uName := strings.TrimSuffix(serviceName, ".service")
|
||||||
|
initScript := "/etc/init.d/" + uName
|
||||||
|
|
||||||
|
// 1. Get cache data (used to obtain historical memory peaks)
|
||||||
|
sm.Lock()
|
||||||
|
service, exists := sm.serviceStatsMap[serviceName]
|
||||||
|
if !exists {
|
||||||
|
service, exists = sm.serviceStatsMap[uName]
|
||||||
|
}
|
||||||
|
sm.Unlock()
|
||||||
|
|
||||||
|
// Initialize the default value
|
||||||
|
details["ActiveState"] = "inactive"
|
||||||
|
details["SubState"] = "dead"
|
||||||
|
details["Result"] = "success"
|
||||||
|
details["MemoryCurrent"] = uint64(0)
|
||||||
|
details["MemoryPeak"] = uint64(0)
|
||||||
|
details["MainPID"] = uint64(0)
|
||||||
|
details["TasksCurrent"] = uint64(0)
|
||||||
|
|
||||||
|
// 2. Real-time query Ubus to get the status, PID, number of concurrent threads and memory RSS
|
||||||
|
var isLoadedInProcd bool = false
|
||||||
|
var isRunningRealTime bool = false
|
||||||
|
var currentMem uint64 = 0
|
||||||
|
|
||||||
|
out, err := exec.Command("ubus", "call", "service", "list", fmt.Sprintf(`{"name":"%s"}`, uName)).Output()
|
||||||
|
if err == nil {
|
||||||
|
type UbusInstance struct {
|
||||||
|
Running bool `json:"running"`
|
||||||
|
Pid int `json:"pid"`
|
||||||
|
}
|
||||||
|
type UbusService struct {
|
||||||
|
Instances map[string]UbusInstance `json:"instances"`
|
||||||
|
}
|
||||||
|
var ubusData map[string]UbusService
|
||||||
|
if json.Unmarshal(out, &ubusData) == nil {
|
||||||
|
if sData, ok := ubusData[uName]; ok {
|
||||||
|
isLoadedInProcd = true
|
||||||
|
for _, inst := range sData.Instances {
|
||||||
|
if inst.Running {
|
||||||
|
isRunningRealTime = true
|
||||||
|
if inst.Pid > 0 {
|
||||||
|
details["MainPID"] = uint64(inst.Pid)
|
||||||
|
|
||||||
|
// Accurate real-time reading of memory (RSS)
|
||||||
|
if data, err := os.ReadFile(fmt.Sprintf("/proc/%d/stat", inst.Pid)); err == nil {
|
||||||
|
binEnd := strings.LastIndex(string(data), ")")
|
||||||
|
if binEnd != -1 && len(string(data)) > binEnd+2 {
|
||||||
|
fields := strings.Fields(string(data)[binEnd+2:])
|
||||||
|
if len(fields) > 21 {
|
||||||
|
pageSize := uint64(os.Getpagesize())
|
||||||
|
if pageSize == 0 {
|
||||||
|
pageSize = 4096
|
||||||
|
}
|
||||||
|
rss, _ := strconv.ParseUint(fields[21], 10, 64)
|
||||||
|
currentMem = rss * pageSize
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Accurately read the number of threads in real time (Tasks)
|
||||||
|
if data, err := os.ReadFile(fmt.Sprintf("/proc/%d/status", inst.Pid)); err == nil {
|
||||||
|
lines := strings.Split(string(data), "\n")
|
||||||
|
for _, line := range lines {
|
||||||
|
if strings.HasPrefix(line, "Threads:") {
|
||||||
|
fields := strings.Fields(line)
|
||||||
|
if len(fields) >= 2 {
|
||||||
|
tasks, _ := strconv.ParseUint(fields[1], 10, 64)
|
||||||
|
details["TasksCurrent"] = tasks
|
||||||
|
}
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 3. Core indicator status calibration and memory peak calculation
|
||||||
|
if isRunningRealTime {
|
||||||
|
details["ActiveState"] = "active"
|
||||||
|
details["SubState"] = "running"
|
||||||
|
details["MemoryCurrent"] = currentMem
|
||||||
|
|
||||||
|
if exists && service.MemPeak > currentMem {
|
||||||
|
details["MemoryPeak"] = service.MemPeak
|
||||||
|
} else {
|
||||||
|
details["MemoryPeak"] = currentMem
|
||||||
|
}
|
||||||
|
} else if isLoadedInProcd {
|
||||||
|
details["ActiveState"] = "active"
|
||||||
|
details["SubState"] = "exited"
|
||||||
|
details["MemoryCurrent"] = uint64(0)
|
||||||
|
if exists { details["MemoryPeak"] = service.MemPeak }
|
||||||
|
} else {
|
||||||
|
details["ActiveState"] = "inactive"
|
||||||
|
details["SubState"] = "dead"
|
||||||
|
details["MemoryCurrent"] = uint64(0)
|
||||||
|
if exists { details["MemoryPeak"] = service.MemPeak }
|
||||||
|
}
|
||||||
|
|
||||||
|
// 4. Complete Systemd-compatible metadata
|
||||||
|
details["Id"] = serviceName
|
||||||
|
details["Description"] = uName + " (OpenWrt Procd)"
|
||||||
|
details["LoadState"] = "loaded"
|
||||||
|
details["FragmentPath"] = initScript
|
||||||
|
details["NRestarts"] = uint64(0)
|
||||||
|
details["StatusText"] = ""
|
||||||
|
|
||||||
|
// Check the self-starting status of the service
|
||||||
|
unitFileState := "disabled"
|
||||||
|
if info, err := os.Stat(initScript); err == nil && !info.Mode().IsDir() {
|
||||||
|
if err := exec.Command(initScript, "enabled").Run(); err == nil {
|
||||||
|
unitFileState = "enabled"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
details["UnitFileState"] = unitFileState
|
||||||
|
|
||||||
|
// Dynamic detection service control capability (Capabilities)
|
||||||
|
canStart, canStop, canReload := false, false, false
|
||||||
|
if info, err := os.Stat(initScript); err == nil && !info.Mode().IsDir() {
|
||||||
|
ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
|
||||||
|
defer cancel()
|
||||||
|
out, _ := exec.CommandContext(ctx, initScript).CombinedOutput()
|
||||||
|
outputStr := strings.ToLower(string(out))
|
||||||
|
if strings.Contains(outputStr, "start") { canStart = true }
|
||||||
|
if strings.Contains(outputStr, "stop") { canStop = true }
|
||||||
|
if strings.Contains(outputStr, "reload") { canReload = true }
|
||||||
|
}
|
||||||
|
details["CanStart"] = canStart
|
||||||
|
details["CanStop"] = canStop
|
||||||
|
details["CanReload"] = canReload
|
||||||
|
|
||||||
|
return details, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func unescapeServiceName(name string) string {
|
||||||
|
return name
|
||||||
|
}
|
||||||
|
|
||||||
|
func getServicePatterns() []string {
|
||||||
|
patterns := []string{}
|
||||||
|
if envPatterns, _ := utils.GetEnv("SERVICE_PATTERNS"); envPatterns != "" {
|
||||||
|
for pattern := range strings.SplitSeq(envPatterns, ",") {
|
||||||
|
pattern = strings.TrimSpace(pattern)
|
||||||
|
if pattern == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if !strings.HasSuffix(pattern, "timer") && !strings.HasSuffix(pattern, ".service") {
|
||||||
|
pattern += ".service"
|
||||||
|
}
|
||||||
|
patterns = append(patterns, pattern)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(patterns) == 0 {
|
||||||
|
patterns = []string{"*.service"}
|
||||||
|
}
|
||||||
|
return patterns
|
||||||
|
}
|
||||||
|
|
||||||
|
func (sm *systemdManager) getServiceLogs(serviceName string) ([]byte, error) {
|
||||||
|
/*
|
||||||
|
未来进阶提示：如果你想在前端也看到 OpenWrt 的服务日志，
|
||||||
|
可以将 serviceName 去掉后缀，然后通过执行类似以下的命令返回真实的日志字节流：
|
||||||
|
out, err := exec.Command("logread", "-e", strings.TrimSuffix(serviceName, ".service")).Output()
|
||||||
|
return out, err
|
||||||
|
*/
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,143 @@
|
|||||||
|
From 128555126155413ce32b134435c425ad9bb24501 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jackie Han <jackie.han@gmail.com>
|
||||||
|
Date: Wed, 14 Oct 2026 07:40:03 +0800
|
||||||
|
Subject: [PATCH] Refactor collect function to handle wireless devices
|
||||||
|
|
||||||
|
---
|
||||||
|
agent/wifi/wifi_linux.go | 111 ++++++++++++++++++++++++++++++++++++---
|
||||||
|
1 file changed, 105 insertions(+), 6 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/agent/wifi/wifi_linux.go b/agent/wifi/wifi_linux.go
|
||||||
|
index 926d658fe..ea42b1f2b 100644
|
||||||
|
--- a/agent/wifi/wifi_linux.go
|
||||||
|
+++ b/agent/wifi/wifi_linux.go
|
||||||
|
@@ -5,8 +5,12 @@ package wifi
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
+ "math"
|
||||||
|
"net"
|
||||||
|
"os"
|
||||||
|
+ "os/exec"
|
||||||
|
+ "regexp"
|
||||||
|
+ "strconv"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/henrygd/beszel/internal/entities/system"
|
||||||
|
@@ -99,15 +103,110 @@ func hasWirelessDevice(dir string) bool {
|
||||||
|
}
|
||||||
|
|
||||||
|
func collect(ctx context.Context) map[string]system.WiFi {
|
||||||
|
- if !hasWirelessDevice(wiphyClassDir) {
|
||||||
|
- return nil
|
||||||
|
+ results := make(map[string]system.WiFi)
|
||||||
|
+
|
||||||
|
+ if hasWirelessDevice(wiphyClassDir) {
|
||||||
|
+ if client, err := newNL80211Client(); err == nil {
|
||||||
|
+ for k, v := range collectLinux(ctx, client) {
|
||||||
|
+ results[k] = v
|
||||||
|
+ }
|
||||||
|
+ client.Close()
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
- client, err := newNL80211Client()
|
||||||
|
- if err != nil {
|
||||||
|
+
|
||||||
|
+ if _, err := exec.LookPath("iwinfo"); err == nil {
|
||||||
|
+ for k, v := range collectOpenWrtAP(ctx) {
|
||||||
|
+ results[k] = v
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if len(results) == 0 {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
- defer client.Close()
|
||||||
|
- return collectLinux(ctx, client)
|
||||||
|
+ return results
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+var (
|
||||||
|
+ iwinfoIfaceRe = regexp.MustCompile(`(?m)^(\S+)[ \t]+ESSID:`)
|
||||||
|
+ iwinfoModeRe = regexp.MustCompile(`Mode:[ \t]*Master`)
|
||||||
|
+ iwinfoSSIDRe = regexp.MustCompile(`ESSID:\s*"([^"]+)"`)
|
||||||
|
+ iwinfoAssocRe = regexp.MustCompile(`(?m)^(?:[0-9a-fA-F]{2}[:-]){5}[0-9a-fA-F]{2}.*?(-?\d+)\s+dBm`)
|
||||||
|
+)
|
||||||
|
+
|
||||||
|
+type iwinfoBlock struct {
|
||||||
|
+ name string
|
||||||
|
+ text string
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+// splitIwinfoBlocks splits bare `iwinfo` output into one block per interface.
|
||||||
|
+func splitIwinfoBlocks(out string) []iwinfoBlock {
|
||||||
|
+ idx := iwinfoIfaceRe.FindAllStringSubmatchIndex(out, -1)
|
||||||
|
+ blocks := make([]iwinfoBlock, 0, len(idx))
|
||||||
|
+ for i, m := range idx {
|
||||||
|
+ end := len(out)
|
||||||
|
+ if i+1 < len(idx) {
|
||||||
|
+ end = idx[i+1][0]
|
||||||
|
+ }
|
||||||
|
+ blocks = append(blocks, iwinfoBlock{name: out[m[2]:m[3]], text: out[m[0]:end]})
|
||||||
|
+ }
|
||||||
|
+ return blocks
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+// parseIwinfoInfo reports whether a block is a Master (AP) interface and its SSID.
|
||||||
|
+func parseIwinfoInfo(block string) (ssid string, isAP bool) {
|
||||||
|
+ if !iwinfoModeRe.MatchString(block) {
|
||||||
|
+ return "", false
|
||||||
|
+ }
|
||||||
|
+ if m := iwinfoSSIDRe.FindStringSubmatch(block); len(m) > 1 {
|
||||||
|
+ ssid = m[1]
|
||||||
|
+ }
|
||||||
|
+ return ssid, true
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+// parseAssocRSSI returns the rounded average RSSI of associated clients.
|
||||||
|
+// ok is false when no valid RSSI value was found.
|
||||||
|
+func parseAssocRSSI(out string) (avg float64, ok bool) {
|
||||||
|
+ sum, count := 0, 0
|
||||||
|
+ for _, m := range iwinfoAssocRe.FindAllStringSubmatch(out, -1) {
|
||||||
|
+ rssi, err := strconv.Atoi(m[1])
|
||||||
|
+ if err != nil || rssi >= 0 || rssi < -150 {
|
||||||
|
+ continue
|
||||||
|
+ }
|
||||||
|
+ sum += rssi
|
||||||
|
+ count++
|
||||||
|
+ }
|
||||||
|
+ if count == 0 {
|
||||||
|
+ return 0, false
|
||||||
|
+ }
|
||||||
|
+ return math.Round(float64(sum) / float64(count)), true
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+func collectOpenWrtAP(ctx context.Context) map[string]system.WiFi {
|
||||||
|
+ results := make(map[string]system.WiFi)
|
||||||
|
+
|
||||||
|
+ out, err := exec.CommandContext(ctx, "iwinfo").Output()
|
||||||
|
+ if err != nil && len(out) == 0 {
|
||||||
|
+ return results
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ for _, b := range splitIwinfoBlocks(string(out)) {
|
||||||
|
+ if ctx.Err() != nil {
|
||||||
|
+ return results
|
||||||
|
+ }
|
||||||
|
+ ssid, isAP := parseIwinfoInfo(b.text)
|
||||||
|
+ if !isAP {
|
||||||
|
+ continue
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ reading := system.WiFi{SSID: validSSID(ssid)}
|
||||||
|
+ if assocOut, err := exec.CommandContext(ctx, "iwinfo", b.name, "assoclist").Output(); err == nil {
|
||||||
|
+ if avg, ok := parseAssocRSSI(string(assocOut)); ok {
|
||||||
|
+ reading.Signal = &avg
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ results[b.name] = reading
|
||||||
|
+ }
|
||||||
|
+ return results
|
||||||
|
}
|
||||||
|
|
||||||
|
func collectLinux(ctx context.Context, client linuxClient) map[string]system.WiFi {
|
||||||
@@ -1 +0,0 @@
|
|||||||
snapshot
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
26.288.56989~75a306d
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
26.291.67080~0a601b6
|
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
PKG_NAME="$1"
|
||||||
|
CURDIR="$2"
|
||||||
|
PKG_BUILD_DIR="$3"
|
||||||
|
|
||||||
|
if [ -d "$CURDIR/.git" ]; then
|
||||||
|
config="$CURDIR/.git/config"
|
||||||
|
else
|
||||||
|
config="$(sed "s|^gitdir:\s*|$CURDIR/|;s|$|/config|" "$CURDIR/.git")"
|
||||||
|
fi
|
||||||
|
if grep -q -E "url.*gitcode\.(com|net)" "$config"; then
|
||||||
|
for d in htdocs patches po root; do
|
||||||
|
rm -rf "$PKG_BUILD_DIR"/$d
|
||||||
|
done
|
||||||
|
mkdir -p "$PKG_BUILD_DIR"/htdocs/luci-static/resources/view
|
||||||
|
touch "$PKG_BUILD_DIR"/htdocs/luci-static/resources/view/$PKG_NAME.js
|
||||||
|
mkdir -p "$PKG_BUILD_DIR"/root/usr/share/luci/menu.d
|
||||||
|
touch "$PKG_BUILD_DIR"/root/usr/share/luci/menu.d/$PKG_NAME.json
|
||||||
|
fi
|
||||||
|
exit 0
|
||||||
@@ -0,0 +1,661 @@
|
|||||||
|
GNU AFFERO GENERAL PUBLIC LICENSE
|
||||||
|
Version 3, 19 November 2007
|
||||||
|
|
||||||
|
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
||||||
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
|
of this license document, but changing it is not allowed.
|
||||||
|
|
||||||
|
Preamble
|
||||||
|
|
||||||
|
The GNU Affero General Public License is a free, copyleft license for
|
||||||
|
software and other kinds of works, specifically designed to ensure
|
||||||
|
cooperation with the community in the case of network server software.
|
||||||
|
|
||||||
|
The licenses for most software and other practical works are designed
|
||||||
|
to take away your freedom to share and change the works. By contrast,
|
||||||
|
our General Public Licenses are intended to guarantee your freedom to
|
||||||
|
share and change all versions of a program--to make sure it remains free
|
||||||
|
software for all its users.
|
||||||
|
|
||||||
|
When we speak of free software, we are referring to freedom, not
|
||||||
|
price. Our General Public Licenses are designed to make sure that you
|
||||||
|
have the freedom to distribute copies of free software (and charge for
|
||||||
|
them if you wish), that you receive source code or can get it if you
|
||||||
|
want it, that you can change the software or use pieces of it in new
|
||||||
|
free programs, and that you know you can do these things.
|
||||||
|
|
||||||
|
Developers that use our General Public Licenses protect your rights
|
||||||
|
with two steps: (1) assert copyright on the software, and (2) offer
|
||||||
|
you this License which gives you legal permission to copy, distribute
|
||||||
|
and/or modify the software.
|
||||||
|
|
||||||
|
A secondary benefit of defending all users' freedom is that
|
||||||
|
improvements made in alternate versions of the program, if they
|
||||||
|
receive widespread use, become available for other developers to
|
||||||
|
incorporate. Many developers of free software are heartened and
|
||||||
|
encouraged by the resulting cooperation. However, in the case of
|
||||||
|
software used on network servers, this result may fail to come about.
|
||||||
|
The GNU General Public License permits making a modified version and
|
||||||
|
letting the public access it on a server without ever releasing its
|
||||||
|
source code to the public.
|
||||||
|
|
||||||
|
The GNU Affero General Public License is designed specifically to
|
||||||
|
ensure that, in such cases, the modified source code becomes available
|
||||||
|
to the community. It requires the operator of a network server to
|
||||||
|
provide the source code of the modified version running there to the
|
||||||
|
users of that server. Therefore, public use of a modified version, on
|
||||||
|
a publicly accessible server, gives the public access to the source
|
||||||
|
code of the modified version.
|
||||||
|
|
||||||
|
An older license, called the Affero General Public License and
|
||||||
|
published by Affero, was designed to accomplish similar goals. This is
|
||||||
|
a different license, not a version of the Affero GPL, but Affero has
|
||||||
|
released a new version of the Affero GPL which permits relicensing under
|
||||||
|
this license.
|
||||||
|
|
||||||
|
The precise terms and conditions for copying, distribution and
|
||||||
|
modification follow.
|
||||||
|
|
||||||
|
TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
0. Definitions.
|
||||||
|
|
||||||
|
"This License" refers to version 3 of the GNU Affero General Public License.
|
||||||
|
|
||||||
|
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||||
|
works, such as semiconductor masks.
|
||||||
|
|
||||||
|
"The Program" refers to any copyrightable work licensed under this
|
||||||
|
License. Each licensee is addressed as "you". "Licensees" and
|
||||||
|
"recipients" may be individuals or organizations.
|
||||||
|
|
||||||
|
To "modify" a work means to copy from or adapt all or part of the work
|
||||||
|
in a fashion requiring copyright permission, other than the making of an
|
||||||
|
exact copy. The resulting work is called a "modified version" of the
|
||||||
|
earlier work or a work "based on" the earlier work.
|
||||||
|
|
||||||
|
A "covered work" means either the unmodified Program or a work based
|
||||||
|
on the Program.
|
||||||
|
|
||||||
|
To "propagate" a work means to do anything with it that, without
|
||||||
|
permission, would make you directly or secondarily liable for
|
||||||
|
infringement under applicable copyright law, except executing it on a
|
||||||
|
computer or modifying a private copy. Propagation includes copying,
|
||||||
|
distribution (with or without modification), making available to the
|
||||||
|
public, and in some countries other activities as well.
|
||||||
|
|
||||||
|
To "convey" a work means any kind of propagation that enables other
|
||||||
|
parties to make or receive copies. Mere interaction with a user through
|
||||||
|
a computer network, with no transfer of a copy, is not conveying.
|
||||||
|
|
||||||
|
An interactive user interface displays "Appropriate Legal Notices"
|
||||||
|
to the extent that it includes a convenient and prominently visible
|
||||||
|
feature that (1) displays an appropriate copyright notice, and (2)
|
||||||
|
tells the user that there is no warranty for the work (except to the
|
||||||
|
extent that warranties are provided), that licensees may convey the
|
||||||
|
work under this License, and how to view a copy of this License. If
|
||||||
|
the interface presents a list of user commands or options, such as a
|
||||||
|
menu, a prominent item in the list meets this criterion.
|
||||||
|
|
||||||
|
1. Source Code.
|
||||||
|
|
||||||
|
The "source code" for a work means the preferred form of the work
|
||||||
|
for making modifications to it. "Object code" means any non-source
|
||||||
|
form of a work.
|
||||||
|
|
||||||
|
A "Standard Interface" means an interface that either is an official
|
||||||
|
standard defined by a recognized standards body, or, in the case of
|
||||||
|
interfaces specified for a particular programming language, one that
|
||||||
|
is widely used among developers working in that language.
|
||||||
|
|
||||||
|
The "System Libraries" of an executable work include anything, other
|
||||||
|
than the work as a whole, that (a) is included in the normal form of
|
||||||
|
packaging a Major Component, but which is not part of that Major
|
||||||
|
Component, and (b) serves only to enable use of the work with that
|
||||||
|
Major Component, or to implement a Standard Interface for which an
|
||||||
|
implementation is available to the public in source code form. A
|
||||||
|
"Major Component", in this context, means a major essential component
|
||||||
|
(kernel, window system, and so on) of the specific operating system
|
||||||
|
(if any) on which the executable work runs, or a compiler used to
|
||||||
|
produce the work, or an object code interpreter used to run it.
|
||||||
|
|
||||||
|
The "Corresponding Source" for a work in object code form means all
|
||||||
|
the source code needed to generate, install, and (for an executable
|
||||||
|
work) run the object code and to modify the work, including scripts to
|
||||||
|
control those activities. However, it does not include the work's
|
||||||
|
System Libraries, or general-purpose tools or generally available free
|
||||||
|
programs which are used unmodified in performing those activities but
|
||||||
|
which are not part of the work. For example, Corresponding Source
|
||||||
|
includes interface definition files associated with source files for
|
||||||
|
the work, and the source code for shared libraries and dynamically
|
||||||
|
linked subprograms that the work is specifically designed to require,
|
||||||
|
such as by intimate data communication or control flow between those
|
||||||
|
subprograms and other parts of the work.
|
||||||
|
|
||||||
|
The Corresponding Source need not include anything that users
|
||||||
|
can regenerate automatically from other parts of the Corresponding
|
||||||
|
Source.
|
||||||
|
|
||||||
|
The Corresponding Source for a work in source code form is that
|
||||||
|
same work.
|
||||||
|
|
||||||
|
2. Basic Permissions.
|
||||||
|
|
||||||
|
All rights granted under this License are granted for the term of
|
||||||
|
copyright on the Program, and are irrevocable provided the stated
|
||||||
|
conditions are met. This License explicitly affirms your unlimited
|
||||||
|
permission to run the unmodified Program. The output from running a
|
||||||
|
covered work is covered by this License only if the output, given its
|
||||||
|
content, constitutes a covered work. This License acknowledges your
|
||||||
|
rights of fair use or other equivalent, as provided by copyright law.
|
||||||
|
|
||||||
|
You may make, run and propagate covered works that you do not
|
||||||
|
convey, without conditions so long as your license otherwise remains
|
||||||
|
in force. You may convey covered works to others for the sole purpose
|
||||||
|
of having them make modifications exclusively for you, or provide you
|
||||||
|
with facilities for running those works, provided that you comply with
|
||||||
|
the terms of this License in conveying all material for which you do
|
||||||
|
not control copyright. Those thus making or running the covered works
|
||||||
|
for you must do so exclusively on your behalf, under your direction
|
||||||
|
and control, on terms that prohibit them from making any copies of
|
||||||
|
your copyrighted material outside their relationship with you.
|
||||||
|
|
||||||
|
Conveying under any other circumstances is permitted solely under
|
||||||
|
the conditions stated below. Sublicensing is not allowed; section 10
|
||||||
|
makes it unnecessary.
|
||||||
|
|
||||||
|
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||||
|
|
||||||
|
No covered work shall be deemed part of an effective technological
|
||||||
|
measure under any applicable law fulfilling obligations under article
|
||||||
|
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||||
|
similar laws prohibiting or restricting circumvention of such
|
||||||
|
measures.
|
||||||
|
|
||||||
|
When you convey a covered work, you waive any legal power to forbid
|
||||||
|
circumvention of technological measures to the extent such circumvention
|
||||||
|
is effected by exercising rights under this License with respect to
|
||||||
|
the covered work, and you disclaim any intention to limit operation or
|
||||||
|
modification of the work as a means of enforcing, against the work's
|
||||||
|
users, your or third parties' legal rights to forbid circumvention of
|
||||||
|
technological measures.
|
||||||
|
|
||||||
|
4. Conveying Verbatim Copies.
|
||||||
|
|
||||||
|
You may convey verbatim copies of the Program's source code as you
|
||||||
|
receive it, in any medium, provided that you conspicuously and
|
||||||
|
appropriately publish on each copy an appropriate copyright notice;
|
||||||
|
keep intact all notices stating that this License and any
|
||||||
|
non-permissive terms added in accord with section 7 apply to the code;
|
||||||
|
keep intact all notices of the absence of any warranty; and give all
|
||||||
|
recipients a copy of this License along with the Program.
|
||||||
|
|
||||||
|
You may charge any price or no price for each copy that you convey,
|
||||||
|
and you may offer support or warranty protection for a fee.
|
||||||
|
|
||||||
|
5. Conveying Modified Source Versions.
|
||||||
|
|
||||||
|
You may convey a work based on the Program, or the modifications to
|
||||||
|
produce it from the Program, in the form of source code under the
|
||||||
|
terms of section 4, provided that you also meet all of these conditions:
|
||||||
|
|
||||||
|
a) The work must carry prominent notices stating that you modified
|
||||||
|
it, and giving a relevant date.
|
||||||
|
|
||||||
|
b) The work must carry prominent notices stating that it is
|
||||||
|
released under this License and any conditions added under section
|
||||||
|
7. This requirement modifies the requirement in section 4 to
|
||||||
|
"keep intact all notices".
|
||||||
|
|
||||||
|
c) You must license the entire work, as a whole, under this
|
||||||
|
License to anyone who comes into possession of a copy. This
|
||||||
|
License will therefore apply, along with any applicable section 7
|
||||||
|
additional terms, to the whole of the work, and all its parts,
|
||||||
|
regardless of how they are packaged. This License gives no
|
||||||
|
permission to license the work in any other way, but it does not
|
||||||
|
invalidate such permission if you have separately received it.
|
||||||
|
|
||||||
|
d) If the work has interactive user interfaces, each must display
|
||||||
|
Appropriate Legal Notices; however, if the Program has interactive
|
||||||
|
interfaces that do not display Appropriate Legal Notices, your
|
||||||
|
work need not make them do so.
|
||||||
|
|
||||||
|
A compilation of a covered work with other separate and independent
|
||||||
|
works, which are not by their nature extensions of the covered work,
|
||||||
|
and which are not combined with it such as to form a larger program,
|
||||||
|
in or on a volume of a storage or distribution medium, is called an
|
||||||
|
"aggregate" if the compilation and its resulting copyright are not
|
||||||
|
used to limit the access or legal rights of the compilation's users
|
||||||
|
beyond what the individual works permit. Inclusion of a covered work
|
||||||
|
in an aggregate does not cause this License to apply to the other
|
||||||
|
parts of the aggregate.
|
||||||
|
|
||||||
|
6. Conveying Non-Source Forms.
|
||||||
|
|
||||||
|
You may convey a covered work in object code form under the terms
|
||||||
|
of sections 4 and 5, provided that you also convey the
|
||||||
|
machine-readable Corresponding Source under the terms of this License,
|
||||||
|
in one of these ways:
|
||||||
|
|
||||||
|
a) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by the
|
||||||
|
Corresponding Source fixed on a durable physical medium
|
||||||
|
customarily used for software interchange.
|
||||||
|
|
||||||
|
b) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by a
|
||||||
|
written offer, valid for at least three years and valid for as
|
||||||
|
long as you offer spare parts or customer support for that product
|
||||||
|
model, to give anyone who possesses the object code either (1) a
|
||||||
|
copy of the Corresponding Source for all the software in the
|
||||||
|
product that is covered by this License, on a durable physical
|
||||||
|
medium customarily used for software interchange, for a price no
|
||||||
|
more than your reasonable cost of physically performing this
|
||||||
|
conveying of source, or (2) access to copy the
|
||||||
|
Corresponding Source from a network server at no charge.
|
||||||
|
|
||||||
|
c) Convey individual copies of the object code with a copy of the
|
||||||
|
written offer to provide the Corresponding Source. This
|
||||||
|
alternative is allowed only occasionally and noncommercially, and
|
||||||
|
only if you received the object code with such an offer, in accord
|
||||||
|
with subsection 6b.
|
||||||
|
|
||||||
|
d) Convey the object code by offering access from a designated
|
||||||
|
place (gratis or for a charge), and offer equivalent access to the
|
||||||
|
Corresponding Source in the same way through the same place at no
|
||||||
|
further charge. You need not require recipients to copy the
|
||||||
|
Corresponding Source along with the object code. If the place to
|
||||||
|
copy the object code is a network server, the Corresponding Source
|
||||||
|
may be on a different server (operated by you or a third party)
|
||||||
|
that supports equivalent copying facilities, provided you maintain
|
||||||
|
clear directions next to the object code saying where to find the
|
||||||
|
Corresponding Source. Regardless of what server hosts the
|
||||||
|
Corresponding Source, you remain obligated to ensure that it is
|
||||||
|
available for as long as needed to satisfy these requirements.
|
||||||
|
|
||||||
|
e) Convey the object code using peer-to-peer transmission, provided
|
||||||
|
you inform other peers where the object code and Corresponding
|
||||||
|
Source of the work are being offered to the general public at no
|
||||||
|
charge under subsection 6d.
|
||||||
|
|
||||||
|
A separable portion of the object code, whose source code is excluded
|
||||||
|
from the Corresponding Source as a System Library, need not be
|
||||||
|
included in conveying the object code work.
|
||||||
|
|
||||||
|
A "User Product" is either (1) a "consumer product", which means any
|
||||||
|
tangible personal property which is normally used for personal, family,
|
||||||
|
or household purposes, or (2) anything designed or sold for incorporation
|
||||||
|
into a dwelling. In determining whether a product is a consumer product,
|
||||||
|
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||||
|
product received by a particular user, "normally used" refers to a
|
||||||
|
typical or common use of that class of product, regardless of the status
|
||||||
|
of the particular user or of the way in which the particular user
|
||||||
|
actually uses, or expects or is expected to use, the product. A product
|
||||||
|
is a consumer product regardless of whether the product has substantial
|
||||||
|
commercial, industrial or non-consumer uses, unless such uses represent
|
||||||
|
the only significant mode of use of the product.
|
||||||
|
|
||||||
|
"Installation Information" for a User Product means any methods,
|
||||||
|
procedures, authorization keys, or other information required to install
|
||||||
|
and execute modified versions of a covered work in that User Product from
|
||||||
|
a modified version of its Corresponding Source. The information must
|
||||||
|
suffice to ensure that the continued functioning of the modified object
|
||||||
|
code is in no case prevented or interfered with solely because
|
||||||
|
modification has been made.
|
||||||
|
|
||||||
|
If you convey an object code work under this section in, or with, or
|
||||||
|
specifically for use in, a User Product, and the conveying occurs as
|
||||||
|
part of a transaction in which the right of possession and use of the
|
||||||
|
User Product is transferred to the recipient in perpetuity or for a
|
||||||
|
fixed term (regardless of how the transaction is characterized), the
|
||||||
|
Corresponding Source conveyed under this section must be accompanied
|
||||||
|
by the Installation Information. But this requirement does not apply
|
||||||
|
if neither you nor any third party retains the ability to install
|
||||||
|
modified object code on the User Product (for example, the work has
|
||||||
|
been installed in ROM).
|
||||||
|
|
||||||
|
The requirement to provide Installation Information does not include a
|
||||||
|
requirement to continue to provide support service, warranty, or updates
|
||||||
|
for a work that has been modified or installed by the recipient, or for
|
||||||
|
the User Product in which it has been modified or installed. Access to a
|
||||||
|
network may be denied when the modification itself materially and
|
||||||
|
adversely affects the operation of the network or violates the rules and
|
||||||
|
protocols for communication across the network.
|
||||||
|
|
||||||
|
Corresponding Source conveyed, and Installation Information provided,
|
||||||
|
in accord with this section must be in a format that is publicly
|
||||||
|
documented (and with an implementation available to the public in
|
||||||
|
source code form), and must require no special password or key for
|
||||||
|
unpacking, reading or copying.
|
||||||
|
|
||||||
|
7. Additional Terms.
|
||||||
|
|
||||||
|
"Additional permissions" are terms that supplement the terms of this
|
||||||
|
License by making exceptions from one or more of its conditions.
|
||||||
|
Additional permissions that are applicable to the entire Program shall
|
||||||
|
be treated as though they were included in this License, to the extent
|
||||||
|
that they are valid under applicable law. If additional permissions
|
||||||
|
apply only to part of the Program, that part may be used separately
|
||||||
|
under those permissions, but the entire Program remains governed by
|
||||||
|
this License without regard to the additional permissions.
|
||||||
|
|
||||||
|
When you convey a copy of a covered work, you may at your option
|
||||||
|
remove any additional permissions from that copy, or from any part of
|
||||||
|
it. (Additional permissions may be written to require their own
|
||||||
|
removal in certain cases when you modify the work.) You may place
|
||||||
|
additional permissions on material, added by you to a covered work,
|
||||||
|
for which you have or can give appropriate copyright permission.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, for material you
|
||||||
|
add to a covered work, you may (if authorized by the copyright holders of
|
||||||
|
that material) supplement the terms of this License with terms:
|
||||||
|
|
||||||
|
a) Disclaiming warranty or limiting liability differently from the
|
||||||
|
terms of sections 15 and 16 of this License; or
|
||||||
|
|
||||||
|
b) Requiring preservation of specified reasonable legal notices or
|
||||||
|
author attributions in that material or in the Appropriate Legal
|
||||||
|
Notices displayed by works containing it; or
|
||||||
|
|
||||||
|
c) Prohibiting misrepresentation of the origin of that material, or
|
||||||
|
requiring that modified versions of such material be marked in
|
||||||
|
reasonable ways as different from the original version; or
|
||||||
|
|
||||||
|
d) Limiting the use for publicity purposes of names of licensors or
|
||||||
|
authors of the material; or
|
||||||
|
|
||||||
|
e) Declining to grant rights under trademark law for use of some
|
||||||
|
trade names, trademarks, or service marks; or
|
||||||
|
|
||||||
|
f) Requiring indemnification of licensors and authors of that
|
||||||
|
material by anyone who conveys the material (or modified versions of
|
||||||
|
it) with contractual assumptions of liability to the recipient, for
|
||||||
|
any liability that these contractual assumptions directly impose on
|
||||||
|
those licensors and authors.
|
||||||
|
|
||||||
|
All other non-permissive additional terms are considered "further
|
||||||
|
restrictions" within the meaning of section 10. If the Program as you
|
||||||
|
received it, or any part of it, contains a notice stating that it is
|
||||||
|
governed by this License along with a term that is a further
|
||||||
|
restriction, you may remove that term. If a license document contains
|
||||||
|
a further restriction but permits relicensing or conveying under this
|
||||||
|
License, you may add to a covered work material governed by the terms
|
||||||
|
of that license document, provided that the further restriction does
|
||||||
|
not survive such relicensing or conveying.
|
||||||
|
|
||||||
|
If you add terms to a covered work in accord with this section, you
|
||||||
|
must place, in the relevant source files, a statement of the
|
||||||
|
additional terms that apply to those files, or a notice indicating
|
||||||
|
where to find the applicable terms.
|
||||||
|
|
||||||
|
Additional terms, permissive or non-permissive, may be stated in the
|
||||||
|
form of a separately written license, or stated as exceptions;
|
||||||
|
the above requirements apply either way.
|
||||||
|
|
||||||
|
8. Termination.
|
||||||
|
|
||||||
|
You may not propagate or modify a covered work except as expressly
|
||||||
|
provided under this License. Any attempt otherwise to propagate or
|
||||||
|
modify it is void, and will automatically terminate your rights under
|
||||||
|
this License (including any patent licenses granted under the third
|
||||||
|
paragraph of section 11).
|
||||||
|
|
||||||
|
However, if you cease all violation of this License, then your
|
||||||
|
license from a particular copyright holder is reinstated (a)
|
||||||
|
provisionally, unless and until the copyright holder explicitly and
|
||||||
|
finally terminates your license, and (b) permanently, if the copyright
|
||||||
|
holder fails to notify you of the violation by some reasonable means
|
||||||
|
prior to 60 days after the cessation.
|
||||||
|
|
||||||
|
Moreover, your license from a particular copyright holder is
|
||||||
|
reinstated permanently if the copyright holder notifies you of the
|
||||||
|
violation by some reasonable means, this is the first time you have
|
||||||
|
received notice of violation of this License (for any work) from that
|
||||||
|
copyright holder, and you cure the violation prior to 30 days after
|
||||||
|
your receipt of the notice.
|
||||||
|
|
||||||
|
Termination of your rights under this section does not terminate the
|
||||||
|
licenses of parties who have received copies or rights from you under
|
||||||
|
this License. If your rights have been terminated and not permanently
|
||||||
|
reinstated, you do not qualify to receive new licenses for the same
|
||||||
|
material under section 10.
|
||||||
|
|
||||||
|
9. Acceptance Not Required for Having Copies.
|
||||||
|
|
||||||
|
You are not required to accept this License in order to receive or
|
||||||
|
run a copy of the Program. Ancillary propagation of a covered work
|
||||||
|
occurring solely as a consequence of using peer-to-peer transmission
|
||||||
|
to receive a copy likewise does not require acceptance. However,
|
||||||
|
nothing other than this License grants you permission to propagate or
|
||||||
|
modify any covered work. These actions infringe copyright if you do
|
||||||
|
not accept this License. Therefore, by modifying or propagating a
|
||||||
|
covered work, you indicate your acceptance of this License to do so.
|
||||||
|
|
||||||
|
10. Automatic Licensing of Downstream Recipients.
|
||||||
|
|
||||||
|
Each time you convey a covered work, the recipient automatically
|
||||||
|
receives a license from the original licensors, to run, modify and
|
||||||
|
propagate that work, subject to this License. You are not responsible
|
||||||
|
for enforcing compliance by third parties with this License.
|
||||||
|
|
||||||
|
An "entity transaction" is a transaction transferring control of an
|
||||||
|
organization, or substantially all assets of one, or subdividing an
|
||||||
|
organization, or merging organizations. If propagation of a covered
|
||||||
|
work results from an entity transaction, each party to that
|
||||||
|
transaction who receives a copy of the work also receives whatever
|
||||||
|
licenses to the work the party's predecessor in interest had or could
|
||||||
|
give under the previous paragraph, plus a right to possession of the
|
||||||
|
Corresponding Source of the work from the predecessor in interest, if
|
||||||
|
the predecessor has it or can get it with reasonable efforts.
|
||||||
|
|
||||||
|
You may not impose any further restrictions on the exercise of the
|
||||||
|
rights granted or affirmed under this License. For example, you may
|
||||||
|
not impose a license fee, royalty, or other charge for exercise of
|
||||||
|
rights granted under this License, and you may not initiate litigation
|
||||||
|
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||||
|
any patent claim is infringed by making, using, selling, offering for
|
||||||
|
sale, or importing the Program or any portion of it.
|
||||||
|
|
||||||
|
11. Patents.
|
||||||
|
|
||||||
|
A "contributor" is a copyright holder who authorizes use under this
|
||||||
|
License of the Program or a work on which the Program is based. The
|
||||||
|
work thus licensed is called the contributor's "contributor version".
|
||||||
|
|
||||||
|
A contributor's "essential patent claims" are all patent claims
|
||||||
|
owned or controlled by the contributor, whether already acquired or
|
||||||
|
hereafter acquired, that would be infringed by some manner, permitted
|
||||||
|
by this License, of making, using, or selling its contributor version,
|
||||||
|
but do not include claims that would be infringed only as a
|
||||||
|
consequence of further modification of the contributor version. For
|
||||||
|
purposes of this definition, "control" includes the right to grant
|
||||||
|
patent sublicenses in a manner consistent with the requirements of
|
||||||
|
this License.
|
||||||
|
|
||||||
|
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||||
|
patent license under the contributor's essential patent claims, to
|
||||||
|
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||||
|
propagate the contents of its contributor version.
|
||||||
|
|
||||||
|
In the following three paragraphs, a "patent license" is any express
|
||||||
|
agreement or commitment, however denominated, not to enforce a patent
|
||||||
|
(such as an express permission to practice a patent or covenant not to
|
||||||
|
sue for patent infringement). To "grant" such a patent license to a
|
||||||
|
party means to make such an agreement or commitment not to enforce a
|
||||||
|
patent against the party.
|
||||||
|
|
||||||
|
If you convey a covered work, knowingly relying on a patent license,
|
||||||
|
and the Corresponding Source of the work is not available for anyone
|
||||||
|
to copy, free of charge and under the terms of this License, through a
|
||||||
|
publicly available network server or other readily accessible means,
|
||||||
|
then you must either (1) cause the Corresponding Source to be so
|
||||||
|
available, or (2) arrange to deprive yourself of the benefit of the
|
||||||
|
patent license for this particular work, or (3) arrange, in a manner
|
||||||
|
consistent with the requirements of this License, to extend the patent
|
||||||
|
license to downstream recipients. "Knowingly relying" means you have
|
||||||
|
actual knowledge that, but for the patent license, your conveying the
|
||||||
|
covered work in a country, or your recipient's use of the covered work
|
||||||
|
in a country, would infringe one or more identifiable patents in that
|
||||||
|
country that you have reason to believe are valid.
|
||||||
|
|
||||||
|
If, pursuant to or in connection with a single transaction or
|
||||||
|
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||||
|
covered work, and grant a patent license to some of the parties
|
||||||
|
receiving the covered work authorizing them to use, propagate, modify
|
||||||
|
or convey a specific copy of the covered work, then the patent license
|
||||||
|
you grant is automatically extended to all recipients of the covered
|
||||||
|
work and works based on it.
|
||||||
|
|
||||||
|
A patent license is "discriminatory" if it does not include within
|
||||||
|
the scope of its coverage, prohibits the exercise of, or is
|
||||||
|
conditioned on the non-exercise of one or more of the rights that are
|
||||||
|
specifically granted under this License. You may not convey a covered
|
||||||
|
work if you are a party to an arrangement with a third party that is
|
||||||
|
in the business of distributing software, under which you make payment
|
||||||
|
to the third party based on the extent of your activity of conveying
|
||||||
|
the work, and under which the third party grants, to any of the
|
||||||
|
parties who would receive the covered work from you, a discriminatory
|
||||||
|
patent license (a) in connection with copies of the covered work
|
||||||
|
conveyed by you (or copies made from those copies), or (b) primarily
|
||||||
|
for and in connection with specific products or compilations that
|
||||||
|
contain the covered work, unless you entered into that arrangement,
|
||||||
|
or that patent license was granted, prior to 28 March 2007.
|
||||||
|
|
||||||
|
Nothing in this License shall be construed as excluding or limiting
|
||||||
|
any implied license or other defenses to infringement that may
|
||||||
|
otherwise be available to you under applicable patent law.
|
||||||
|
|
||||||
|
12. No Surrender of Others' Freedom.
|
||||||
|
|
||||||
|
If conditions are imposed on you (whether by court order, agreement or
|
||||||
|
otherwise) that contradict the conditions of this License, they do not
|
||||||
|
excuse you from the conditions of this License. If you cannot convey a
|
||||||
|
covered work so as to satisfy simultaneously your obligations under this
|
||||||
|
License and any other pertinent obligations, then as a consequence you may
|
||||||
|
not convey it at all. For example, if you agree to terms that obligate you
|
||||||
|
to collect a royalty for further conveying from those to whom you convey
|
||||||
|
the Program, the only way you could satisfy both those terms and this
|
||||||
|
License would be to refrain entirely from conveying the Program.
|
||||||
|
|
||||||
|
13. Remote Network Interaction; Use with the GNU General Public License.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, if you modify the
|
||||||
|
Program, your modified version must prominently offer all users
|
||||||
|
interacting with it remotely through a computer network (if your version
|
||||||
|
supports such interaction) an opportunity to receive the Corresponding
|
||||||
|
Source of your version by providing access to the Corresponding Source
|
||||||
|
from a network server at no charge, through some standard or customary
|
||||||
|
means of facilitating copying of software. This Corresponding Source
|
||||||
|
shall include the Corresponding Source for any work covered by version 3
|
||||||
|
of the GNU General Public License that is incorporated pursuant to the
|
||||||
|
following paragraph.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, you have
|
||||||
|
permission to link or combine any covered work with a work licensed
|
||||||
|
under version 3 of the GNU General Public License into a single
|
||||||
|
combined work, and to convey the resulting work. The terms of this
|
||||||
|
License will continue to apply to the part which is the covered work,
|
||||||
|
but the work with which it is combined will remain governed by version
|
||||||
|
3 of the GNU General Public License.
|
||||||
|
|
||||||
|
14. Revised Versions of this License.
|
||||||
|
|
||||||
|
The Free Software Foundation may publish revised and/or new versions of
|
||||||
|
the GNU Affero General Public License from time to time. Such new versions
|
||||||
|
will be similar in spirit to the present version, but may differ in detail to
|
||||||
|
address new problems or concerns.
|
||||||
|
|
||||||
|
Each version is given a distinguishing version number. If the
|
||||||
|
Program specifies that a certain numbered version of the GNU Affero General
|
||||||
|
Public License "or any later version" applies to it, you have the
|
||||||
|
option of following the terms and conditions either of that numbered
|
||||||
|
version or of any later version published by the Free Software
|
||||||
|
Foundation. If the Program does not specify a version number of the
|
||||||
|
GNU Affero General Public License, you may choose any version ever published
|
||||||
|
by the Free Software Foundation.
|
||||||
|
|
||||||
|
If the Program specifies that a proxy can decide which future
|
||||||
|
versions of the GNU Affero General Public License can be used, that proxy's
|
||||||
|
public statement of acceptance of a version permanently authorizes you
|
||||||
|
to choose that version for the Program.
|
||||||
|
|
||||||
|
Later license versions may give you additional or different
|
||||||
|
permissions. However, no additional obligations are imposed on any
|
||||||
|
author or copyright holder as a result of your choosing to follow a
|
||||||
|
later version.
|
||||||
|
|
||||||
|
15. Disclaimer of Warranty.
|
||||||
|
|
||||||
|
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||||
|
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||||
|
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||||
|
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||||
|
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||||
|
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||||
|
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||||
|
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||||
|
|
||||||
|
16. Limitation of Liability.
|
||||||
|
|
||||||
|
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||||
|
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||||
|
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||||
|
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||||
|
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||||
|
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||||
|
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||||
|
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||||
|
SUCH DAMAGES.
|
||||||
|
|
||||||
|
17. Interpretation of Sections 15 and 16.
|
||||||
|
|
||||||
|
If the disclaimer of warranty and limitation of liability provided
|
||||||
|
above cannot be given local legal effect according to their terms,
|
||||||
|
reviewing courts shall apply local law that most closely approximates
|
||||||
|
an absolute waiver of all civil liability in connection with the
|
||||||
|
Program, unless a warranty or assumption of liability accompanies a
|
||||||
|
copy of the Program in return for a fee.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
How to Apply These Terms to Your New Programs
|
||||||
|
|
||||||
|
If you develop a new program, and you want it to be of the greatest
|
||||||
|
possible use to the public, the best way to achieve this is to make it
|
||||||
|
free software which everyone can redistribute and change under these terms.
|
||||||
|
|
||||||
|
To do so, attach the following notices to the program. It is safest
|
||||||
|
to attach them to the start of each source file to most effectively
|
||||||
|
state the exclusion of warranty; and each file should have at least
|
||||||
|
the "copyright" line and a pointer to where the full notice is found.
|
||||||
|
|
||||||
|
<one line to give the program's name and a brief idea of what it does.>
|
||||||
|
Copyright (C) <year> <name of author>
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU Affero General Public License as published
|
||||||
|
by the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU Affero General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Affero General Public License
|
||||||
|
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
Also add information on how to contact you by electronic and paper mail.
|
||||||
|
|
||||||
|
If your software can interact with users remotely through a computer
|
||||||
|
network, you should also make sure that it provides a way for users to
|
||||||
|
get its source. For example, if your program is a web application, its
|
||||||
|
interface could display a "Source" link that leads users to an archive
|
||||||
|
of the code. There are many ways you could offer source, and different
|
||||||
|
solutions will be better for different programs; see section 13 for the
|
||||||
|
specific requirements.
|
||||||
|
|
||||||
|
You should also get your employer (if you work as a programmer) or school,
|
||||||
|
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||||
|
For more information on this, and how to apply and follow the GNU AGPL, see
|
||||||
|
<https://www.gnu.org/licenses/>.
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
|
# Copyright 2026 OneNAS/RouteONE, Jackie264 (jackie@onenas.space).
|
||||||
|
|
||||||
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
|
PKG_NAME:=luci-app-beszel-agent
|
||||||
|
PKG_LICENSE:=AGPL-3.0-or-later
|
||||||
|
PKG_CPE_ID:=cpe:/a:Jackie264:luci-app-beszel-agent
|
||||||
|
PKG_MAINTAINER:=Jackie264 <OneNAS-space>
|
||||||
|
|
||||||
|
LUCI_TITLE:=LuCI support for Beszel Agent
|
||||||
|
LUCI_URL:=https://github.com/OneNAS-space/luci-app-beszel-agent/
|
||||||
|
LUCI_DESCRIPTION:=Provides Web UI (found under Services/Beszel Agent) to config Beszel Agent
|
||||||
|
LUCI_DEPENDS:=+beszel-agent
|
||||||
|
LUCI_PKGARCH:=all
|
||||||
|
|
||||||
|
PKG_UNPACK:=/bin/sh $(CURDIR)/.prepare.sh $(PKG_NAME) $(CURDIR) $(PKG_BUILD_DIR)
|
||||||
|
|
||||||
|
define Package/$(PKG_NAME)/config
|
||||||
|
# shown in make menuconfig <Help>
|
||||||
|
help
|
||||||
|
$(LUCI_TITLE)
|
||||||
|
.
|
||||||
|
Version: $(PKG_VERSION)-$(PKG_RELEASE)
|
||||||
|
endef
|
||||||
|
|
||||||
|
define Package/luci-app-beszel-agent/prerm
|
||||||
|
#!/bin/sh
|
||||||
|
[ -n "$${IPKG_INSTROOT}" ] || {
|
||||||
|
rm -f /tmp/luci-indexcache.*
|
||||||
|
rm -rf /tmp/luci-modulecache/
|
||||||
|
/etc/init.d/rpcd reload 2>/dev/null
|
||||||
|
}
|
||||||
|
exit 0
|
||||||
|
endef
|
||||||
|
|
||||||
|
include $(TOPDIR)/feeds/luci/luci.mk
|
||||||
|
|
||||||
|
# call BuildPackage - OpenWrt buildroot signature
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
# luci-app-beszel-agent
|
||||||
|
- Provides Web UI (found under Services/Beszel Agent) to config Beszel Agent
|
||||||
|
|
||||||
|
<img width="737" height="579" alt="Screenshot 2026-07-17 at 23 34 09" src="https://github.com/user-attachments/assets/f786673e-7b53-43e6-8c97-b7a374464c3b" />
|
||||||
|
<img width="701" height="513" alt="Screenshot 2026-07-17 at 23 34 31" src="https://github.com/user-attachments/assets/fa379c89-d6cd-44c8-8217-c2819ebf9eb6" />
|
||||||
|
|
||||||
|
<img width="583" height="214" alt="Screenshot 2026-07-15 at 18 28 37" src="https://github.com/user-attachments/assets/54c57280-908e-4853-85d1-d9f1bd87206d" />
|
||||||
|
<img width="603" height="187" alt="Screenshot 2026-07-15 at 18 28 58" src="https://github.com/user-attachments/assets/5d948ee6-8946-47a1-a808-22d8659dcf28" />
|
||||||
|
|
||||||
|
|
||||||
|
- You can see almost all the system information of OpenWRT in your Beszel Hub.
|
||||||
|
- If Docker is installed, the information content of Containers will also be displayed.
|
||||||
|
<img width="1430" height="828" alt="Screenshot 2026-07-04 at 16 25 08" src="https://github.com/user-attachments/assets/988cfa23-643c-43c7-b1b2-f9573954b002" />
|
||||||
|
<img width="1450" height="390" alt="Screenshot 2026-07-04 at 16 25 32" src="https://github.com/user-attachments/assets/44ab98a5-1e5b-494c-878e-7914474907c4" />
|
||||||
|
<img width="1413" height="724" alt="Screenshot 2026-07-04 at 16 26 17" src="https://github.com/user-attachments/assets/8302176d-98d4-4f4c-a6d7-9294db2745d6" />
|
||||||
|
<img width="1446" height="419" alt="Screenshot 2026-07-17 at 23 36 34" src="https://github.com/user-attachments/assets/cca94b20-489b-4a83-9432-30ed7f9071be" />
|
||||||
|
|
||||||
|
<img width="1460" height="755" alt="Screenshot 2026-07-10 at 21 54 34" src="https://github.com/user-attachments/assets/09109fd9-4811-412e-9a45-11660054b481" />
|
||||||
|
|
||||||
|
|
||||||
|
## Dependent package
|
||||||
|
The lightweight telemetry agent adapted to OpenWrt is used to report system and Docker indicators to your Beszel Hub.
|
||||||
|
|
||||||
|
[Beszel-Agent](https://github.com/OneNAS-space/beszel-agent)
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
# Security Policy
|
||||||
|
|
||||||
|
## Supported Versions
|
||||||
|
|
||||||
|
Use this section to tell people about which versions of your project are
|
||||||
|
currently being supported with security updates.
|
||||||
|
|
||||||
|
| Version | Supported |
|
||||||
|
| ------- | ------------------ |
|
||||||
|
| 5.1.x | :white_check_mark: |
|
||||||
|
| 5.0.x | :x: |
|
||||||
|
| 4.0.x | :white_check_mark: |
|
||||||
|
| < 4.0 | :x: |
|
||||||
|
|
||||||
|
## Reporting a Vulnerability
|
||||||
|
|
||||||
|
Use this section to tell people how to report a vulnerability.
|
||||||
|
|
||||||
|
Tell them where to go, how often they can expect to get an update on a
|
||||||
|
reported vulnerability, what to expect if the vulnerability is accepted or
|
||||||
|
declined, etc.
|
||||||
@@ -0,0 +1,333 @@
|
|||||||
|
'use strict';
|
||||||
|
|
||||||
|
'require dom';
|
||||||
|
'require fs';
|
||||||
|
'require form';
|
||||||
|
'require poll';
|
||||||
|
'require rpc';
|
||||||
|
'require view';
|
||||||
|
|
||||||
|
const POLL_INTERVAL = 5;
|
||||||
|
|
||||||
|
function getServiceInfo(name) {
|
||||||
|
const fn = rpc.declare({
|
||||||
|
object: 'service',
|
||||||
|
method: 'list',
|
||||||
|
params: ['name'],
|
||||||
|
expect: { [name]: {} },
|
||||||
|
});
|
||||||
|
return () => fn(name);
|
||||||
|
}
|
||||||
|
|
||||||
|
const getBoardInfo = rpc.declare({
|
||||||
|
object: 'system',
|
||||||
|
method: 'board',
|
||||||
|
});
|
||||||
|
|
||||||
|
const getBeszelAgentInfo = getServiceInfo('beszel-agent');
|
||||||
|
|
||||||
|
async function getStatus() {
|
||||||
|
try {
|
||||||
|
const res = await getBeszelAgentInfo();
|
||||||
|
const isRunning = res?.instances?.['beszel-agent']?.running;
|
||||||
|
return isRunning ?? false;
|
||||||
|
} catch (e) {
|
||||||
|
console.error(e);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function getVersion() {
|
||||||
|
try {
|
||||||
|
const res = await fs.exec('/usr/bin/beszel-agent', ['-v']);
|
||||||
|
if (res && res.code === 0 && res.stdout) {
|
||||||
|
const match = res.stdout.match(/(\d+\.\d+\.\d+)/);
|
||||||
|
return match ? match[0] : res.stdout.trim();
|
||||||
|
}
|
||||||
|
return _('Unknown');
|
||||||
|
} catch (e) {
|
||||||
|
console.error(e);
|
||||||
|
return _('Unknown');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function getStatusValue(isRunning) {
|
||||||
|
const runningSpan = `<span style="color: green; font-weight: bold">${_('Running')}</span>`;
|
||||||
|
const notRunningSpan = `<span style="color: red; font-weight: bold">${_('Not running')}</span>`;
|
||||||
|
return isRunning ? runningSpan : notRunningSpan;
|
||||||
|
}
|
||||||
|
|
||||||
|
function updateStatus(node) {
|
||||||
|
const output = node?.querySelector('output');
|
||||||
|
return output
|
||||||
|
? async () => {
|
||||||
|
const isRunning = await getStatus();
|
||||||
|
dom.content(output, getStatusValue(isRunning));
|
||||||
|
}
|
||||||
|
: () => {};
|
||||||
|
}
|
||||||
|
|
||||||
|
return view.extend({
|
||||||
|
load() {
|
||||||
|
return Promise.all([
|
||||||
|
getStatus(),
|
||||||
|
getVersion(),
|
||||||
|
getBoardInfo().catch(() => ({})),
|
||||||
|
fs.list('/sys/class/drm').catch(() => []),
|
||||||
|
]);
|
||||||
|
},
|
||||||
|
|
||||||
|
async render([isRunning, versionText, boardInfo, drmList]) {
|
||||||
|
const target = boardInfo?.release?.target || '';
|
||||||
|
const isX86 = target.startsWith('x86');
|
||||||
|
const hasCardNode = drmList && drmList.some(item => /^card\d+$/.test(item.name));
|
||||||
|
const showGpuOptions = isX86 && hasCardNode;
|
||||||
|
|
||||||
|
const map = new form.Map('beszel-agent', _('Beszel Agent'),
|
||||||
|
_('Lightweight telemetry agent for reporting system and Docker metrics to your Beszel Hub.'));
|
||||||
|
|
||||||
|
const statusSect = map.section(form.TypedSection, 'status');
|
||||||
|
statusSect.anonymous = true;
|
||||||
|
statusSect.cfgsections = () => ['status_section'];
|
||||||
|
|
||||||
|
const versionOpt = statusSect.option(form.DummyValue, '_version', _('Version'));
|
||||||
|
versionOpt.cfgvalue = () => versionText;
|
||||||
|
|
||||||
|
const statusOpt = statusSect.option(form.DummyValue, '_status', _('Service Status'));
|
||||||
|
statusOpt.rawhtml = true;
|
||||||
|
statusOpt.cfgvalue = () => getStatusValue(isRunning);
|
||||||
|
|
||||||
|
const mainSect = map.section(form.TypedSection, 'beszel-agent');
|
||||||
|
mainSect.anonymous = true;
|
||||||
|
mainSect.addremove = false;
|
||||||
|
|
||||||
|
mainSect.tab('general', _('General Settings'));
|
||||||
|
mainSect.tab('network', _('Network Settings'), _('Configure network interface monitoring rules.'));
|
||||||
|
mainSect.tab('mounts', _('Extra Disks'), _('Configure extra disks for Beszel Agent to monitor.'));
|
||||||
|
mainSect.tab('other', _('Other Settings'), _('Advanced and others configurations.'));
|
||||||
|
|
||||||
|
const enableOpt = mainSect.taboption('general', form.Flag, 'enable', _('Enable'));
|
||||||
|
enableOpt.default = '0';
|
||||||
|
enableOpt.rmempty = false;
|
||||||
|
|
||||||
|
const sysNameOpt = mainSect.taboption('general', form.Value, 'system_name', _('System Name'),
|
||||||
|
_('Override system name on universal token registration.<br>Defaults to hostname if unset.'));
|
||||||
|
sysNameOpt.placeholder = 'OpenWrt';
|
||||||
|
sysNameOpt.rmempty = true;
|
||||||
|
|
||||||
|
const listenOpt = mainSect.taboption('general', form.Value, 'listen', _('Listen'),
|
||||||
|
_('IP address, port, or unix socket<br>(e.g., 0.0.0.0:45876 or [::]:45876). Replaces Port.'));
|
||||||
|
listenOpt.placeholder = '0.0.0.0:45876';
|
||||||
|
listenOpt.rmempty = true;
|
||||||
|
|
||||||
|
const portOpt = mainSect.taboption('general', form.Value, 'port', _('Port (Deprecated)'),
|
||||||
|
_('Maintained for backward compatibility.<br>Will be cleared if Listen is configured.'));
|
||||||
|
portOpt.datatype = 'port';
|
||||||
|
portOpt.default = '45876';
|
||||||
|
portOpt.placeholder = '45876';
|
||||||
|
portOpt.rmempty = true;
|
||||||
|
portOpt.write = function(section_id, formvalue) {
|
||||||
|
const listenVal = this.section.formvalue(section_id, 'listen');
|
||||||
|
if (listenVal && listenVal.trim() !== '') {
|
||||||
|
return this.super('remove', [section_id]);
|
||||||
|
}
|
||||||
|
return this.super('write', [section_id, formvalue]);
|
||||||
|
};
|
||||||
|
|
||||||
|
const hubOpt = mainSect.taboption('general', form.Value, 'hub_url', _('Hub URL'), _('The URL of your Beszel Hub.'));
|
||||||
|
hubOpt.placeholder = 'http://hub.example.com:8090';
|
||||||
|
hubOpt.attrs = { autocomplete: 'off' };
|
||||||
|
hubOpt.rmempty = false;
|
||||||
|
hubOpt.validate = (section_id, value) => {
|
||||||
|
if (!value)
|
||||||
|
return true;
|
||||||
|
|
||||||
|
// scheme (required) + host (IPv4 / IPv6 / hostname) + optional port + optional path
|
||||||
|
const urlPattern = /^https?:\/\/(\[[0-9a-fA-F:]+\]|[a-zA-Z0-9.-]+)(:\d{1,5})?(\/[^\s]*)?$/;
|
||||||
|
return urlPattern.test(value)
|
||||||
|
? true
|
||||||
|
: _('Must be a valid URL, e.g. http://hub.example.com:8090');
|
||||||
|
};
|
||||||
|
|
||||||
|
const keyOpt = mainSect.taboption('general', form.Value, 'key', _('Public Key'), _('Public SSH key (if using SSH-based auth).'));
|
||||||
|
keyOpt.placeholder = 'ssh-ed25519 ...';
|
||||||
|
keyOpt.rmempty = false;
|
||||||
|
|
||||||
|
const tokenOpt = mainSect.taboption('general', form.Value, 'token', _('Token'), _('Authentication token (if using token-based auth).'));
|
||||||
|
tokenOpt.password = true;
|
||||||
|
tokenOpt.rmempty = false;
|
||||||
|
|
||||||
|
// --- Network Settings ---
|
||||||
|
const nicsOpt = mainSect.taboption('network', form.DynamicList, 'nics', _('Interface Filters (NICS)'),
|
||||||
|
_('Specify network interfaces to monitor or exclude.<br>Prefix with "-" to blacklist (e.g., "-phy*", "-*ap*").<br>Leave empty to use default filtering.'));
|
||||||
|
nicsOpt.placeholder = '-phy*';
|
||||||
|
|
||||||
|
// --- Extra Disks ---
|
||||||
|
const extraFsOpt = mainSect.taboption('mounts', form.DynamicList, 'extra_filesystems', _('Extra Filesystems'),
|
||||||
|
_('Specify additional mount points to monitor (e.g., /mnt/sda1).'));
|
||||||
|
extraFsOpt.placeholder = '/mnt/sda1';
|
||||||
|
extraFsOpt.validate = (section_id, value) => (!value || value.startsWith('/')) ? true : _('Path must be absolute (must start with /).');
|
||||||
|
|
||||||
|
// --- Other Settings ---
|
||||||
|
const bootDelayOpt = mainSect.taboption('other', form.Value, 'boot_delay', _('Boot Delay'),
|
||||||
|
_('Delay in seconds before starting the agent on system boot to allow network and DNS to settle. Defaults to 15 if unset.'));
|
||||||
|
bootDelayOpt.datatype = 'uinteger';
|
||||||
|
bootDelayOpt.default = '15';
|
||||||
|
bootDelayOpt.placeholder = '15';
|
||||||
|
bootDelayOpt.rmempty = true;
|
||||||
|
|
||||||
|
const dataDirOpt = mainSect.taboption('other', form.Value, 'data_dir', _('Data Directory'),
|
||||||
|
_('Directory to store system fingerprint and local data. Defaults to /etc/beszel-agent if unset.'));
|
||||||
|
dataDirOpt.placeholder = '/etc/beszel-agent';
|
||||||
|
dataDirOpt.default = '/etc/beszel-agent';
|
||||||
|
dataDirOpt.rmempty = true;
|
||||||
|
|
||||||
|
const logLevelOpt = mainSect.taboption('other', form.ListValue, 'log_level', _('Log Level'));
|
||||||
|
logLevelOpt.default = 'info';
|
||||||
|
logLevelOpt.value('debug', _('Debug'));
|
||||||
|
logLevelOpt.value('info', _('Info'));
|
||||||
|
logLevelOpt.value('warn', _('Warn'));
|
||||||
|
logLevelOpt.value('error', _('Error'));
|
||||||
|
|
||||||
|
if (showGpuOptions) {
|
||||||
|
const skipGpuOpt = mainSect.taboption('other', form.ListValue, 'skip_gpu', _('Skip GPU'),
|
||||||
|
_('(True) to Disable GPU monitoring.'));
|
||||||
|
skipGpuOpt.default = 'false';
|
||||||
|
skipGpuOpt.value('true', _('True'));
|
||||||
|
skipGpuOpt.value('false', _('False'));
|
||||||
|
|
||||||
|
const gpuCollOpt = mainSect.taboption('other', form.ListValue, 'gpu_collector', _('GPU Collector'),
|
||||||
|
_('If Agent fails automatically detect it, please choose one according to your GPU.'));
|
||||||
|
gpuCollOpt.value('', _('Auto Detect (Default)'));
|
||||||
|
gpuCollOpt.value('intel_gpu_top', _('Intel GPUs'));
|
||||||
|
gpuCollOpt.value('amd_sysfs', _('AMD GPUs'));
|
||||||
|
gpuCollOpt.depends('skip_gpu', 'false');
|
||||||
|
|
||||||
|
const gpuDevOpt = mainSect.taboption('other', form.Value, 'intel_gpu_device', _('Intel GPU Device'),
|
||||||
|
_('Specify the device name (e.g., card0). Defaults to card0 if unset.'));
|
||||||
|
gpuDevOpt.placeholder = 'card0';
|
||||||
|
gpuDevOpt.rmempty = true;
|
||||||
|
gpuDevOpt.depends({ skip_gpu: 'false', gpu_collector: 'intel_gpu_top' });
|
||||||
|
}
|
||||||
|
|
||||||
|
const skipSystemdOpt = mainSect.taboption('other', form.ListValue, 'skip_systemd', _('Skip Systemd'),
|
||||||
|
_('(True) to Disable Systemd service monitoring.'));
|
||||||
|
skipSystemdOpt.default = 'false';
|
||||||
|
skipSystemdOpt.value('true', _('True'));
|
||||||
|
skipSystemdOpt.value('false', _('False'));
|
||||||
|
|
||||||
|
const dockerHostOpt = mainSect.taboption('other', form.Value, 'docker_host', _('Docker HOST'),
|
||||||
|
_('Overrides the Docker host (docker.sock).<br>Leave empty to completely disable Docker monitoring.'));
|
||||||
|
dockerHostOpt.rmempty = true;
|
||||||
|
|
||||||
|
const rendered = await map.render();
|
||||||
|
|
||||||
|
const style = document.createElement('style');
|
||||||
|
style.innerHTML = '.hide-agent-ui { display: none !important; }';
|
||||||
|
rendered.appendChild(style);
|
||||||
|
|
||||||
|
const enableRow = rendered.querySelector('.cbi-value[id$="-enable"]');
|
||||||
|
const listenRow = rendered.querySelector('.cbi-value[id$="-listen"]');
|
||||||
|
const portRow = rendered.querySelector('.cbi-value[id$="-port"]');
|
||||||
|
const hubRow = rendered.querySelector('.cbi-value[id$="-hub_url"]');
|
||||||
|
const tokenRow = rendered.querySelector('.cbi-value[id$="-token"]');
|
||||||
|
const keyRow = rendered.querySelector('.cbi-value[id$="-key"]');
|
||||||
|
|
||||||
|
if (enableRow && hubRow && tokenRow && keyRow && (listenRow || portRow)) {
|
||||||
|
const fieldContainer = enableRow.querySelector('.cbi-value-field');
|
||||||
|
const listenInput = listenRow ? listenRow.querySelector('input') : null;
|
||||||
|
const portInput = portRow ? portRow.querySelector('input') : null;
|
||||||
|
const hubInput = hubRow.querySelector('input');
|
||||||
|
const tokenInput = tokenRow.querySelector('input');
|
||||||
|
const keyInput = keyRow.querySelector('input');
|
||||||
|
|
||||||
|
if (listenInput && portInput && portRow) {
|
||||||
|
function handleListenVisibility() {
|
||||||
|
const hasListen = listenInput.value.trim() !== '';
|
||||||
|
if (hasListen) {
|
||||||
|
if (portInput.value !== '') {
|
||||||
|
portInput.value = '';
|
||||||
|
portInput.dispatchEvent(new Event('input', { bubbles: true }));
|
||||||
|
}
|
||||||
|
portRow.style.display = 'none';
|
||||||
|
} else {
|
||||||
|
portRow.style.display = '';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
listenInput.addEventListener('input', handleListenVisibility);
|
||||||
|
handleListenVisibility();
|
||||||
|
portInput.addEventListener('input', () => {
|
||||||
|
if (portInput.value.trim() !== '' && listenInput.value !== '') {
|
||||||
|
listenInput.value = '';
|
||||||
|
listenInput.dispatchEvent(new Event('input', { bubbles: true }));
|
||||||
|
handleListenVisibility();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
if (fieldContainer && portInput && hubInput && tokenInput && keyInput) {
|
||||||
|
const warningNode = document.createElement('div');
|
||||||
|
warningNode.style.color = '#ff9800';
|
||||||
|
warningNode.style.fontWeight = 'bold';
|
||||||
|
warningNode.style.paddingTop = '6px';
|
||||||
|
warningNode.innerHTML = '💡 ' + _('Please configure Port, Hub URL, Token, and Public Key to enable.');
|
||||||
|
fieldContainer.prepend(warningNode);
|
||||||
|
|
||||||
|
function updateEnableUI() {
|
||||||
|
const hasListen = listenInput && listenInput.value.trim().length > 0;
|
||||||
|
const hasPort = portInput && portInput.value.trim().length > 0;
|
||||||
|
const hasHub = hubInput.value.trim().length > 0;
|
||||||
|
const hasToken = tokenInput.value.trim().length > 0;
|
||||||
|
const hasKey = keyInput.value.trim().length > 0;
|
||||||
|
|
||||||
|
const missing = [];
|
||||||
|
if (!hasListen && !hasPort) missing.push(_('Listen (or Port)'));
|
||||||
|
if (!hasHub) missing.push(_('Hub URL'));
|
||||||
|
if (!hasToken) missing.push(_('Token'));
|
||||||
|
if (!hasKey) missing.push(_('Public Key'));
|
||||||
|
|
||||||
|
const isValid = missing.length === 0;
|
||||||
|
|
||||||
|
if (!isValid) {
|
||||||
|
let missingText = '';
|
||||||
|
if (missing.length === 1) {
|
||||||
|
missingText = missing[0];
|
||||||
|
} else {
|
||||||
|
const last = missing.pop();
|
||||||
|
missingText = missing.join(', ') + ' ' + _('and') + ' ' + last;
|
||||||
|
}
|
||||||
|
warningNode.innerHTML = '💡 ' + _('Please configure %s to enable.').replace('%s', missingText);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!isValid) {
|
||||||
|
const cb = fieldContainer.querySelector('input[type="checkbox"]');
|
||||||
|
if (cb && cb.checked) {
|
||||||
|
cb.checked = false;
|
||||||
|
cb.dispatchEvent(new Event('change', { bubbles: true }));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Array.from(fieldContainer.children).forEach(child => {
|
||||||
|
if (child === warningNode) {
|
||||||
|
child.style.display = isValid ? 'none' : 'block';
|
||||||
|
} else {
|
||||||
|
if (isValid) child.classList.remove('hide-agent-ui');
|
||||||
|
else child.classList.add('hide-agent-ui');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
const inputs = [listenInput, portInput, hubInput, tokenInput, keyInput].filter(Boolean);
|
||||||
|
inputs.forEach(inp => {
|
||||||
|
inp.addEventListener('input', updateEnableUI);
|
||||||
|
inp.addEventListener('change', updateEnableUI);
|
||||||
|
});
|
||||||
|
updateEnableUI();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const statusNode = map.findElement('data-field', statusOpt.cbid('status_section'));
|
||||||
|
if (statusNode) poll.add(updateStatus(statusNode), POLL_INTERVAL);
|
||||||
|
|
||||||
|
return rendered;
|
||||||
|
},
|
||||||
|
});
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
{
|
||||||
|
"admin/services/beszel-agent": {
|
||||||
|
"title": "Beszel Agent",
|
||||||
|
"action": {
|
||||||
|
"type": "view",
|
||||||
|
"path": "beszel-agent"
|
||||||
|
},
|
||||||
|
"depends": {
|
||||||
|
"acl": [ "luci-app-beszel-agent" ],
|
||||||
|
"uci": {
|
||||||
|
"beszel-agent": true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
{
|
||||||
|
"luci-app-beszel-agent": {
|
||||||
|
"description": "Grant access to Beszel Agent configuration and service",
|
||||||
|
"read": {
|
||||||
|
"file": {
|
||||||
|
"/usr/bin/beszel-agent -v": [ "exec" ]
|
||||||
|
},
|
||||||
|
"ubus": {
|
||||||
|
"service": [ "list" ]
|
||||||
|
},
|
||||||
|
"uci": [ "beszel-agent" ]
|
||||||
|
},
|
||||||
|
"write": {
|
||||||
|
"uci": [ "beszel-agent" ]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+3
-3
@@ -50,12 +50,12 @@
|
|||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=wwand
|
PKG_NAME:=wwand
|
||||||
PKG_VERSION:=1.8.0_pre3
|
PKG_VERSION:=1.8.0_pre6
|
||||||
PKG_RELEASE:=80
|
PKG_RELEASE:=81
|
||||||
|
|
||||||
PKG_SOURCE_PROTO:=git
|
PKG_SOURCE_PROTO:=git
|
||||||
PKG_SOURCE_URL:=https://github.com/ddimension/wwand.git
|
PKG_SOURCE_URL:=https://github.com/ddimension/wwand.git
|
||||||
PKG_SOURCE_VERSION:=8a170a136d1e1340ef54da2006edc8b622a87e43
|
PKG_SOURCE_VERSION:=7988768d58da5f0f86100b1a2d63db25bdfe87c9
|
||||||
PKG_MIRROR_HASH:=skip
|
PKG_MIRROR_HASH:=skip
|
||||||
|
|
||||||
PKG_LICENSE:=GPL-2.0-only
|
PKG_LICENSE:=GPL-2.0-only
|
||||||
|
|||||||
Reference in new issue
Block a user