diff --git a/hbd/server/notify.py b/hbd/server/notify.py index 15287ca..be5bf61 100644 --- a/hbd/server/notify.py +++ b/hbd/server/notify.py @@ -140,7 +140,9 @@ def _send_pushover(channel_cfg: dict, notif: Notification) -> bool: if not token or not user: logger.warning("pushover: missing token or user") return False - params: dict = {"token": token, "user": user, "title": notif.title, "message": notif.body} + body = "%s: %s" % (notif.title, notif.body) + title = "" + params: dict = {"token": token, "user": user, "title": title, "message": body} if channel_cfg.get("sound"): params["sound"] = channel_cfg["sound"] if notif.url: diff --git a/scripts/c/hbc_mini.c b/scripts/c/hbc_mini.c index 23b9eb6..155f650 100644 --- a/scripts/c/hbc_mini.c +++ b/scripts/c/hbc_mini.c @@ -789,7 +789,7 @@ static void plugin_cpu_monitor(conn_t *c, const config_t *cfg) { * Plugin: memory_monitor * Linux: /proc/meminfo * FreeBSD: sysctl vm.stats.vm.* - * NetBSD: sysctl vm.uvmexp (struct uvmexp) + * NetBSD: sysctl vm.uvmexp (struct uvmexp_sysctl) * ============================================================ */ /* emit the common kvdict fields and send */ @@ -896,9 +896,9 @@ static void plugin_memory_monitor(conn_t *c, const config_t *cfg) { static void plugin_memory_monitor(conn_t *c, const config_t *cfg) { (void)cfg; - struct uvmexp uvm; + struct uvmexp_sysctl uvm; size_t len = sizeof(uvm); - int mib[2] = {CTL_VM, VM_UVMEXP}; + int mib[2] = {CTL_VM, VM_UVMEXP2}; if (sysctl(mib, 2, &uvm, &len, NULL, 0) != 0) return; long long ps = uvm.pagesize;