diff options
Diffstat (limited to 'net-mgmt')
93 files changed, 744 insertions, 651 deletions
diff --git a/net-mgmt/Makefile b/net-mgmt/Makefile index e7fe4dcc4565..a9abaed72644 100644 --- a/net-mgmt/Makefile +++ b/net-mgmt/Makefile @@ -389,6 +389,7 @@ SUBDIR += seafile-server SUBDIR += semaphore SUBDIR += sendip + SUBDIR += simplomon SUBDIR += sipcalc SUBDIR += sjitter SUBDIR += smartctl_exporter diff --git a/net-mgmt/adguard-exporter/Makefile b/net-mgmt/adguard-exporter/Makefile index 96d33eb08aed..1bd1a255e1a2 100644 --- a/net-mgmt/adguard-exporter/Makefile +++ b/net-mgmt/adguard-exporter/Makefile @@ -1,7 +1,7 @@ PORTNAME= adguard-exporter DISTVERSIONPREFIX= v DISTVERSION= 1.14 -PORTREVISION= 31 +PORTREVISION= 32 CATEGORIES= net-mgmt MAINTAINER= christer.edwards@gmail.com diff --git a/net-mgmt/alertmanager/Makefile b/net-mgmt/alertmanager/Makefile index c48e4bade1a3..877ac6483aa5 100644 --- a/net-mgmt/alertmanager/Makefile +++ b/net-mgmt/alertmanager/Makefile @@ -1,10 +1,9 @@ PORTNAME= alertmanager -PORTVERSION= 0.26.0 +PORTVERSION= 0.29.0 DISTVERSIONPREFIX= v -PORTREVISION= 16 CATEGORIES= net-mgmt -MAINTAINER= michal@hanu.la +MAINTAINER= dutra@FreeBSD.org COMMENT= Alert routing for Prometheus WWW= https://prometheus.io/docs/alerting/alertmanager/ @@ -21,6 +20,18 @@ GO_TARGET= ./cmd/alertmanager ./cmd/amtool USERS= alertmanager GROUPS= alertmanager +GO_BUILDFLAGS= -v -ldflags "${LD_FLAG_STRING}" + +_BUILD_USER?= ${USER} +_BUILD_DATE= $$(date +%Y-%m-%d) +LD_FLAG_STRING= -s \ + ${LD_FLAG_X_PREFIX}.Version=${PORTVERSION} \ + ${LD_FLAG_X_PREFIX}.Revision=${PORTREVISION} \ + ${LD_FLAG_X_PREFIX}.Branch=release-${PORTVERSION:R} \ + ${LD_FLAG_X_PREFIX}.BuildUser=${_BUILD_USER} \ + ${LD_FLAG_X_PREFIX}.BuildDate=${_BUILD_DATE} +LD_FLAG_X_PREFIX= -X github.com/prometheus/common/version + post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/alertmanager ${INSTALL_DATA} \ diff --git a/net-mgmt/alertmanager/distinfo b/net-mgmt/alertmanager/distinfo index a8a995031e4a..33a74a49133b 100644 --- a/net-mgmt/alertmanager/distinfo +++ b/net-mgmt/alertmanager/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1699953119 -SHA256 (go/net-mgmt_alertmanager/alertmanager-v0.26.0/v0.26.0.mod) = 35fe6445ebd86b668b9daa74130bd598493d5c55e081c01ddbbc0d195534c221 -SIZE (go/net-mgmt_alertmanager/alertmanager-v0.26.0/v0.26.0.mod) = 3798 -SHA256 (go/net-mgmt_alertmanager/alertmanager-v0.26.0/v0.26.0.zip) = 7666007c7ccec339fd09aaeec1d15c5b8c26cb01d387c9a9f7273f904db825b0 -SIZE (go/net-mgmt_alertmanager/alertmanager-v0.26.0/v0.26.0.zip) = 2422183 +TIMESTAMP = 1762584597 +SHA256 (go/net-mgmt_alertmanager/alertmanager-v0.29.0/v0.29.0.mod) = 60c6ffa33fb66b8fdef81ef30a0c953df1c0776bf59a3376ec4d8fa8f250405a +SIZE (go/net-mgmt_alertmanager/alertmanager-v0.29.0/v0.29.0.mod) = 5779 +SHA256 (go/net-mgmt_alertmanager/alertmanager-v0.29.0/v0.29.0.zip) = 3fa76af529268a74b5dd8e9651fdf0d16484b25539f2af3e07a0a196d4097793 +SIZE (go/net-mgmt_alertmanager/alertmanager-v0.29.0/v0.29.0.zip) = 3193645 diff --git a/net-mgmt/bandwhich/Makefile b/net-mgmt/bandwhich/Makefile index 8e035b6f3af0..e1c3e32040b1 100644 --- a/net-mgmt/bandwhich/Makefile +++ b/net-mgmt/bandwhich/Makefile @@ -1,7 +1,7 @@ PORTNAME= bandwhich DISTVERSIONPREFIX= v DISTVERSION= 0.23.1 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= net-mgmt MAINTAINER= petteri.valkonen@iki.fi diff --git a/net-mgmt/blackbox_exporter/Makefile b/net-mgmt/blackbox_exporter/Makefile index 9ed9b2ee020e..363e56656e1f 100644 --- a/net-mgmt/blackbox_exporter/Makefile +++ b/net-mgmt/blackbox_exporter/Makefile @@ -1,7 +1,7 @@ PORTNAME= blackbox_exporter DISTVERSIONPREFIX= v DISTVERSION= 0.27.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net-mgmt MAINTAINER= eduardo@FreeBSD.org diff --git a/net-mgmt/bosun/Makefile b/net-mgmt/bosun/Makefile index a0af0ee84fdc..1091279b933c 100644 --- a/net-mgmt/bosun/Makefile +++ b/net-mgmt/bosun/Makefile @@ -1,7 +1,7 @@ PORTNAME= bosun DISTVERSION= 0.9.0 DISTVERSIONSUFFIX= -preview -PORTREVISION= 32 +PORTREVISION= 33 CATEGORIES= net-mgmt MAINTAINER= langer.markus@gmail.com diff --git a/net-mgmt/carbon-relay-ng/Makefile b/net-mgmt/carbon-relay-ng/Makefile index 25711dba7243..b792d460d1b5 100644 --- a/net-mgmt/carbon-relay-ng/Makefile +++ b/net-mgmt/carbon-relay-ng/Makefile @@ -1,6 +1,6 @@ PORTNAME= carbon-relay-ng DISTVERSION= 0.10.0 -PORTREVISION= 17 +PORTREVISION= 18 CATEGORIES= net-mgmt MAINTAINER= a.andersson.thn@gmail.com diff --git a/net-mgmt/carbonzipper/Makefile b/net-mgmt/carbonzipper/Makefile index 31a791bfc44f..4f376f790dfc 100644 --- a/net-mgmt/carbonzipper/Makefile +++ b/net-mgmt/carbonzipper/Makefile @@ -1,6 +1,6 @@ PORTNAME= carbonzipper DISTVERSION= 0.74 -PORTREVISION= 31 +PORTREVISION= 32 CATEGORIES= net-mgmt MAINTAINER= a.andersson.thn@gmail.com diff --git a/net-mgmt/check_ssl_cert/Makefile b/net-mgmt/check_ssl_cert/Makefile index 8df15ec48850..7bb58f671ee1 100644 --- a/net-mgmt/check_ssl_cert/Makefile +++ b/net-mgmt/check_ssl_cert/Makefile @@ -1,5 +1,5 @@ PORTNAME= check_ssl_cert -DISTVERSION= 2.94.0 +DISTVERSION= 2.95.0 CATEGORIES= net-mgmt MASTER_SITES= https://github.com/matteocorti/${PORTNAME}/releases/download/v${DISTVERSION}/ diff --git a/net-mgmt/check_ssl_cert/distinfo b/net-mgmt/check_ssl_cert/distinfo index cde1fcf8f724..9dedd862b011 100644 --- a/net-mgmt/check_ssl_cert/distinfo +++ b/net-mgmt/check_ssl_cert/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1753881396 -SHA256 (check_ssl_cert-2.94.0.tar.bz2) = be5dc6f801eec4be99ee34f08fbf95d36a71b25f42de7b73a89b608e57cfc37a -SIZE (check_ssl_cert-2.94.0.tar.bz2) = 89743 +TIMESTAMP = 1762800975 +SHA256 (check_ssl_cert-2.95.0.tar.bz2) = df41a9e48059c64c6c0d6abe91eaee8ea7c1e925a5441504f972496089d1bea6 +SIZE (check_ssl_cert-2.95.0.tar.bz2) = 90188 diff --git a/net-mgmt/check_wg/Makefile b/net-mgmt/check_wg/Makefile index 60c688f0dac3..6901c4dfe023 100644 --- a/net-mgmt/check_wg/Makefile +++ b/net-mgmt/check_wg/Makefile @@ -1,7 +1,7 @@ PORTNAME= check_wg DISTVERSIONPREFIX= v DISTVERSION= 0.0.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-mgmt MAINTAINER= dsh@bamus.cz diff --git a/net-mgmt/fli/Makefile b/net-mgmt/fli/Makefile index ce0b44943b7c..e4aafff8c621 100644 --- a/net-mgmt/fli/Makefile +++ b/net-mgmt/fli/Makefile @@ -1,7 +1,7 @@ PORTNAME= fli DISTVERSIONPREFIX= v DISTVERSION= 0.1.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net-mgmt MAINTAINER= olgeni@FreeBSD.org diff --git a/net-mgmt/geom-exporter/Makefile b/net-mgmt/geom-exporter/Makefile index f0788740cd4c..323ed7572645 100644 --- a/net-mgmt/geom-exporter/Makefile +++ b/net-mgmt/geom-exporter/Makefile @@ -1,5 +1,6 @@ PORTNAME= geom-exporter DISTVERSION= 0.1.2 +PORTREVISION= 1 CATEGORIES= net-mgmt MASTER_SITES= CRATESIO MASTER_SITE_SUBDIR= freebsd-${PORTNAME}/${DISTVERSION} diff --git a/net-mgmt/gping/Makefile b/net-mgmt/gping/Makefile index 14d91f305403..9cc8b3095bbe 100644 --- a/net-mgmt/gping/Makefile +++ b/net-mgmt/gping/Makefile @@ -1,7 +1,7 @@ PORTNAME= gping DISTVERSIONPREFIX= gping-v DISTVERSION= 1.20.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-mgmt MAINTAINER= ehaupt@FreeBSD.org diff --git a/net-mgmt/grok_exporter/Makefile b/net-mgmt/grok_exporter/Makefile index 2e544f6955c5..efc15a91791b 100644 --- a/net-mgmt/grok_exporter/Makefile +++ b/net-mgmt/grok_exporter/Makefile @@ -1,7 +1,7 @@ PORTNAME= grok_exporter DISTVERSIONPREFIX=v DISTVERSION= 1.0.0.RC4 -PORTREVISION= 31 +PORTREVISION= 32 CATEGORIES= net-mgmt MAINTAINER= gasol.wu@gmail.com diff --git a/net-mgmt/hastmon/Makefile b/net-mgmt/hastmon/Makefile index 4dcfbe4b7570..f04164e01ae3 100644 --- a/net-mgmt/hastmon/Makefile +++ b/net-mgmt/hastmon/Makefile @@ -9,6 +9,10 @@ WWW= http://hastmon.googlecode.com/ LICENSE= BSD2CLAUSE +BROKEN= cc: error: no such file or directory: *.o +DEPRECATED= broken, dead upstream +EXPIRATION_DATE= 2025-12-31 + BUILD_DEPENDS= mk-configure>=0.20:devel/mk-configure USE_GITHUB= yes diff --git a/net-mgmt/icingadb/Makefile b/net-mgmt/icingadb/Makefile index 2cd3c464daef..f09839ebe2e4 100644 --- a/net-mgmt/icingadb/Makefile +++ b/net-mgmt/icingadb/Makefile @@ -1,7 +1,7 @@ PORTNAME= icingadb DISTVERSIONPREFIX= v DISTVERSION= 1.4.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net-mgmt MAINTAINER= dvl@FreeBSD.org diff --git a/net-mgmt/icingaweb2-module-icingadb/Makefile b/net-mgmt/icingaweb2-module-icingadb/Makefile index 2616a6cabdbf..9e69cbe0461a 100644 --- a/net-mgmt/icingaweb2-module-icingadb/Makefile +++ b/net-mgmt/icingaweb2-module-icingadb/Makefile @@ -1,6 +1,7 @@ PORTNAME= icingaweb2-module-icingadb DISTVERSIONPREFIX= v DISTVERSION= 1.2.3 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= net-mgmt www PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} diff --git a/net-mgmt/icingaweb2-module-icingadb/pkg-plist b/net-mgmt/icingaweb2-module-icingadb/pkg-plist index 0e76f80886e2..288b9ff98f52 100644 --- a/net-mgmt/icingaweb2-module-icingadb/pkg-plist +++ b/net-mgmt/icingaweb2-module-icingadb/pkg-plist @@ -129,6 +129,7 @@ %%WWWDIR%%/library/Icingadb/Common/Links.php %%WWWDIR%%/library/Icingadb/Common/LoadMore.php %%WWWDIR%%/library/Icingadb/Common/Macros.php +%%WWWDIR%%/library/Icingadb/Common/Model.php %%WWWDIR%%/library/Icingadb/Common/ObjectInspectionDetail.php %%WWWDIR%%/library/Icingadb/Common/SearchControls.php %%WWWDIR%%/library/Icingadb/Common/ServiceLink.php diff --git a/net-mgmt/intel-snap/Makefile b/net-mgmt/intel-snap/Makefile index eaf835f5b646..8b1486d93210 100644 --- a/net-mgmt/intel-snap/Makefile +++ b/net-mgmt/intel-snap/Makefile @@ -1,6 +1,6 @@ PORTNAME= intel-snap PORTVERSION= 0.0.1 -PORTREVISION= 32 +PORTREVISION= 33 CATEGORIES= net-mgmt MAINTAINER= ports@FreeBSD.org diff --git a/net-mgmt/kapacitor/Makefile b/net-mgmt/kapacitor/Makefile index 24f1672b2ab1..857a3b28562b 100644 --- a/net-mgmt/kapacitor/Makefile +++ b/net-mgmt/kapacitor/Makefile @@ -1,7 +1,7 @@ PORTNAME= kapacitor DISTVERSIONPREFIX= v DISTVERSION= 1.5.1 -PORTREVISION= 31 +PORTREVISION= 32 CATEGORIES= net-mgmt MAINTAINER= cheffo@freebsd-bg.org diff --git a/net-mgmt/kf6-networkmanager-qt/distinfo b/net-mgmt/kf6-networkmanager-qt/distinfo index 9e4d6f2310ae..d22d959ffe9f 100644 --- a/net-mgmt/kf6-networkmanager-qt/distinfo +++ b/net-mgmt/kf6-networkmanager-qt/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1759784980 -SHA256 (KDE/frameworks/6.19/networkmanager-qt-6.19.0.tar.xz) = 83ba1060080dc193c62837421e1cb796500abb3931b505ae8275c440674affc4 -SIZE (KDE/frameworks/6.19/networkmanager-qt-6.19.0.tar.xz) = 184052 +TIMESTAMP = 1762892876 +SHA256 (KDE/frameworks/6.20/networkmanager-qt-6.20.0.tar.xz) = 6856fecb2933abcdad0a789a179e4054cf24901dc29f943f0036a3e15cf43e86 +SIZE (KDE/frameworks/6.20/networkmanager-qt-6.20.0.tar.xz) = 187592 diff --git a/net-mgmt/kf6-networkmanager-qt/pkg-plist b/net-mgmt/kf6-networkmanager-qt/pkg-plist index 67abf46d723f..d790edba75d4 100644 --- a/net-mgmt/kf6-networkmanager-qt/pkg-plist +++ b/net-mgmt/kf6-networkmanager-qt/pkg-plist @@ -55,6 +55,9 @@ include/KF6/NetworkManagerQt/NetworkManagerQt/VlanSetting include/KF6/NetworkManagerQt/NetworkManagerQt/VpnConnection include/KF6/NetworkManagerQt/NetworkManagerQt/VpnPlugin include/KF6/NetworkManagerQt/NetworkManagerQt/VpnSetting +include/KF6/NetworkManagerQt/NetworkManagerQt/WifiP2PDevice +include/KF6/NetworkManagerQt/NetworkManagerQt/WifiP2PPeer +include/KF6/NetworkManagerQt/NetworkManagerQt/WifiP2PSetting include/KF6/NetworkManagerQt/NetworkManagerQt/WimaxDevice include/KF6/NetworkManagerQt/NetworkManagerQt/WimaxNsp include/KF6/NetworkManagerQt/NetworkManagerQt/WimaxSetting @@ -124,6 +127,9 @@ include/KF6/NetworkManagerQt/networkmanagerqt/vlansetting.h include/KF6/NetworkManagerQt/networkmanagerqt/vpnconnection.h include/KF6/NetworkManagerQt/networkmanagerqt/vpnplugin.h include/KF6/NetworkManagerQt/networkmanagerqt/vpnsetting.h +include/KF6/NetworkManagerQt/networkmanagerqt/wifip2pdevice.h +include/KF6/NetworkManagerQt/networkmanagerqt/wifip2ppeer.h +include/KF6/NetworkManagerQt/networkmanagerqt/wifip2psetting.h include/KF6/NetworkManagerQt/networkmanagerqt/wimaxdevice.h include/KF6/NetworkManagerQt/networkmanagerqt/wimaxnsp.h include/KF6/NetworkManagerQt/networkmanagerqt/wimaxsetting.h diff --git a/net-mgmt/librenms/Makefile b/net-mgmt/librenms/Makefile index d9081ca6f307..e7cc68df35cf 100644 --- a/net-mgmt/librenms/Makefile +++ b/net-mgmt/librenms/Makefile @@ -1,5 +1,5 @@ PORTNAME= librenms -PORTVERSION= 25.10.0 +PORTVERSION= 25.11.0 PORTEPOCH= 1 CATEGORIES= net-mgmt MASTER_SITES= LOCAL/dvl:vendor @@ -20,12 +20,12 @@ RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \ rrdtool:databases/rrdtool \ snmpget:net-mgmt/net-snmp -USES= cpe php python shebangfix +USES= cpe php python shebangfix sudo USE_GITHUB= yes # php hash/json/openssl extension is required but it's statically linked in default php USE_PHP= ctype curl dom fileinfo filter gd iconv ldap mbstring mysqli \ - pdo pdo_mysql phar posix session simplexml snmp sockets \ - tokenizer xml xmlwriter zip zlib + pdo pdo_mysql phar posix readline session simplexml snmp \ + sockets tokenizer xml xmlwriter zip zlib USE_RC_SUBR= librenms SHEBANG_FILES= ../${PORTNAME}-vendor-${PORTVERSION}/paragonie/random_compat/build-phar.sh \ @@ -93,20 +93,12 @@ DBDIR= /var/db/${PORTNAME} OPTIONS_DEFINE= DOCS EXAMPLES FPING IPMITOOL LIBVIRT MYSQLD NAGPLUGINS \ NMAP WMIC X11 -OPTIONS_DEFAULT= FPING IPMITOOL LIBVIRT NAGPLUGINS NMAP PYPOLLER SUDO \ - WMIC -OPTIONS_RADIO= SUDO -OPTIONS_RADIO_SUDO= SUDO SUDO_SSSD - -SUDO_RUN_DEPENDS= sudo:security/sudo -SUDO_SSSD_RUN_DEPENDS= sudo:security/sudo@sssd +OPTIONS_DEFAULT= FPING IPMITOOL LIBVIRT NAGPLUGINS NMAP PYPOLLER WMIC FPING_DESC= Enable fping support ping monitoring IPMITOOL_DESC= Enable support for monitoring hardware IPMI MYSQLD_DESC= Use local MySQL server WMIC_DESC= Enable support for WMI polling -SUDO_DESC= use security/sudo -SUDO_SSSD_DESC= use security/sudo@sssd FPING_RUN_DEPENDS= fping:net/fping IPMITOOL_RUN_DEPENDS= ipmitool:sysutils/ipmitool @@ -133,7 +125,7 @@ _SCRIPT_FILES= daily.sh lnms # _RELEASE_TIMESTAMP is used for a patch inside the vendor code # it represents the release date via: git show --pretty='%H|%ct' -s 1.42.01 # It sits here so you remember to update it with each release -_RELEASE_TIMESTAMP= 1760517127 +_RELEASE_TIMESTAMP= 1763386152 _ROOT_DIRS= LibreNMS app bootstrap config database doc html \ includes lang licenses mibs misc resources routes \ scripts tests diff --git a/net-mgmt/librenms/distinfo b/net-mgmt/librenms/distinfo index 5e6c6879a7e8..f2dde64552ed 100644 --- a/net-mgmt/librenms/distinfo +++ b/net-mgmt/librenms/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1760530638 -SHA256 (librenms-vendor-25.10.0.tar.gz) = 71ac45d3f718616b592e435d95858e3b31f226a812d0db8574009c2b09850026 -SIZE (librenms-vendor-25.10.0.tar.gz) = 27583825 -SHA256 (librenms-librenms-25.10.0_GH0.tar.gz) = 90c4d516a8b376bf0c41558a24941200c73a887ea2aeff4369f73e9e5f24184e -SIZE (librenms-librenms-25.10.0_GH0.tar.gz) = 72309944 +TIMESTAMP = 1763404572 +SHA256 (librenms-vendor-25.11.0.tar.gz) = cc5883b8dad1c479b019e37ecb8e695d3009fd26671a0f4e4a58bef29a4f121f +SIZE (librenms-vendor-25.11.0.tar.gz) = 27759793 +SHA256 (librenms-librenms-25.11.0_GH0.tar.gz) = 0bfad0c850308e69d42ec09f7f9cb45400fdb8a0ee96742651d33402e16860c6 +SIZE (librenms-librenms-25.11.0_GH0.tar.gz) = 72339168 diff --git a/net-mgmt/librenms/files/patch-18372 b/net-mgmt/librenms/files/patch-18372 deleted file mode 100644 index 4062191d420c..000000000000 --- a/net-mgmt/librenms/files/patch-18372 +++ /dev/null @@ -1,128 +0,0 @@ -From 4f5320469a927e9dcf7c46948026824a91b4838c Mon Sep 17 00:00:00 2001 -From: Tony Murray <murraytony@gmail.com> -Date: Wed, 15 Oct 2025 12:31:34 -0500 -Subject: [PATCH] More accurate running user check Previously we did not have - access to config, so we had to infer the librenms user from the owner of the - executable. Because we are running later in the boot now, we can just use - config. Improve feedback text a bit. - ---- - app/Checks.php | 44 ------------------- - .../RunningAsIncorrectUserException.php | 10 +++++ - app/Listeners/CommandStartingListener.php | 20 ++++++++- - 3 files changed, 29 insertions(+), 45 deletions(-) - create mode 100644 app/Exceptions/RunningAsIncorrectUserException.php - -diff --git a/app/Checks.php b/app/Checks.php -index 5aa22f67cdbd..6f5caba39404 100644 ---- app/Checks.php -+++ app/Checks.php -@@ -84,48 +84,4 @@ public static function postAuth() - } - } - } -- -- /** -- * Check the script is running as the right user (works before config is available) -- */ -- public static function runningUser() -- { -- if (function_exists('posix_getpwuid') && posix_getpwuid(posix_geteuid())['name'] !== get_current_user()) { -- if (get_current_user() == 'root') { -- self::printMessage( -- 'Error: lnms file is owned by root, it should be owned and ran by a non-privileged user.', -- null, -- true -- ); -- } -- -- self::printMessage( -- 'Error: You must run lnms as the user ' . get_current_user(), -- null, -- true -- ); -- } -- } -- -- private static function printMessage($title, $content, $exit = false) -- { -- $content = (array) $content; -- -- if (PHP_SAPI == 'cli') { -- $format = "%s\n\n%s\n\n"; -- $message = implode(PHP_EOL, $content); -- } else { -- $format = "<h3 style='color: firebrick;'>%s</h3><p>%s</p>"; -- $message = ''; -- foreach ($content as $line) { -- $message .= "<p style='margin:0.5em'>$line</p>\n"; -- } -- } -- -- printf($format, $title, $message); -- -- if ($exit) { -- exit(1); -- } -- } - } -diff --git a/app/Exceptions/RunningAsIncorrectUserException.php b/app/Exceptions/RunningAsIncorrectUserException.php -new file mode 100644 -index 000000000000..6d1aca825d72 ---- /dev/null -+++ app/Exceptions/RunningAsIncorrectUserException.php -@@ -0,0 +1,10 @@ -+<?php -+ -+namespace App\Exceptions; -+ -+use Symfony\Component\Console\Exception\ExceptionInterface; -+ -+class RunningAsIncorrectUserException extends \Exception implements ExceptionInterface -+{ -+ // -+} -diff --git a/app/Listeners/CommandStartingListener.php b/app/Listeners/CommandStartingListener.php -index bb435fa52ab2..8432b25d4bab 100644 ---- app/Listeners/CommandStartingListener.php -+++ app/Listeners/CommandStartingListener.php -@@ -26,6 +26,7 @@ - - namespace App\Listeners; - -+use App\Exceptions\RunningAsIncorrectUserException; - use Illuminate\Console\Events\CommandStarting; - - class CommandStartingListener -@@ -34,6 +35,9 @@ class CommandStartingListener - 'list:bash-completion', - ]; - -+ /** -+ * @throws RunningAsIncorrectUserException -+ */ - public function handle(CommandStarting $event): void - { - // Check that we don't run this as the wrong user and break the install -@@ -41,6 +45,20 @@ public function handle(CommandStarting $event): void - return; - } - -- \App\Checks::runningUser(); -+ if (! function_exists('posix_getpwuid') || ! function_exists('posix_geteuid')) { -+ return; -+ } -+ -+ $current_user = posix_getpwuid(posix_geteuid())['name']; -+ $executable = basename($_SERVER['argv'][0] ?? $_SERVER['SCRIPT_FILENAME'] ?? 'this'); -+ -+ if ($current_user == 'root') { -+ throw new RunningAsIncorrectUserException("Error: $executable must not run as root."); -+ } -+ -+ $librenms_user = config('librenms.user'); -+ if ($librenms_user !== $current_user) { -+ throw new RunningAsIncorrectUserException("Error: $executable must be run as the user $librenms_user."); -+ } - } - } diff --git a/net-mgmt/librenms/files/patch-LibreNMS_Validations_Database_CheckDatabaseSchemaVersion.php b/net-mgmt/librenms/files/patch-LibreNMS_Validations_Database_CheckDatabaseSchemaVersion.php index 84f8e087e1a9..7bc1ed2953a0 100644 --- a/net-mgmt/librenms/files/patch-LibreNMS_Validations_Database_CheckDatabaseSchemaVersion.php +++ b/net-mgmt/librenms/files/patch-LibreNMS_Validations_Database_CheckDatabaseSchemaVersion.php @@ -1,11 +1,11 @@ ---- LibreNMS/Validations/Database/CheckDatabaseSchemaVersion.php.orig 2023-10-27 13:54:39 UTC +--- LibreNMS/Validations/Database/CheckDatabaseSchemaVersion.php.orig 2025-11-17 19:20:29 UTC +++ LibreNMS/Validations/Database/CheckDatabaseSchemaVersion.php -@@ -44,7 +44,7 @@ class CheckDatabaseSchemaVersion implements Validation +@@ -45,7 +45,7 @@ class CheckDatabaseSchemaVersion implements Validation self::$current = false; if (! Schema::isCurrent()) { - return ValidationResult::fail(trans('validation.validations.database.CheckSchemaVersion.fail_outdated'), './lnms migrate') + return ValidationResult::fail(trans('validation.validations.database.CheckSchemaVersion.fail_outdated'), 'sudo lnms migrate') - ->setFixer(__CLASS__); + ->setFixer(self::class); } diff --git a/net-mgmt/librenms/files/patch-LibreNMS_Validations_System.php b/net-mgmt/librenms/files/patch-LibreNMS_Validations_System.php index 961ebfbeaaac..3609e63926ca 100644 --- a/net-mgmt/librenms/files/patch-LibreNMS_Validations_System.php +++ b/net-mgmt/librenms/files/patch-LibreNMS_Validations_System.php @@ -1,12 +1,12 @@ ---- LibreNMS/Validations/System.php.orig 2023-08-21 20:59:01 UTC +--- LibreNMS/Validations/System.php.orig 2025-11-17 19:04:56 UTC +++ LibreNMS/Validations/System.php -@@ -40,19 +40,12 @@ class System extends BaseValidation +@@ -41,19 +41,12 @@ class System extends BaseValidation { $install_dir = $validator->getBaseDir(); -- $lnms = str_replace('lnms:', '', rtrim(`whereis -b lnms 2>/dev/null`)); +- $lnms = str_replace('lnms:', '', rtrim((string) `whereis -b lnms 2>/dev/null`)); + $lnms = rtrim(`/usr/bin/find %%LOCALBASE%%/bin -name lnms`); - $path = rtrim(`echo "\$PATH"`); + $path = rtrim((string) `echo "\$PATH"`); // if couldn't find lnms and we have PATH if (empty($lnms) && ! empty($path)) { diff --git a/net-mgmt/monitoring-plugins/Makefile b/net-mgmt/monitoring-plugins/Makefile index 194c8ae74d74..ed4ace79f907 100644 --- a/net-mgmt/monitoring-plugins/Makefile +++ b/net-mgmt/monitoring-plugins/Makefile @@ -1,6 +1,6 @@ PORTNAME= monitoring-plugins -PORTVERSION= 2.3.3 -PORTREVISION= 1 +PORTVERSION= 2.4.0 +PORTREVISION= 0 CATEGORIES= net-mgmt MASTER_SITES= https://www.monitoring-plugins.org/download/ \ LOCAL/mat/${PORTNAME} diff --git a/net-mgmt/monitoring-plugins/distinfo b/net-mgmt/monitoring-plugins/distinfo index 19d7a8cb2807..027b58d41c98 100644 --- a/net-mgmt/monitoring-plugins/distinfo +++ b/net-mgmt/monitoring-plugins/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1676806291 -SHA256 (monitoring-plugins-2.3.3.tar.gz) = 7023b1dc17626c5115b061e7ce02e06f006e35af92abf473334dffe7ff3c2d6d -SIZE (monitoring-plugins-2.3.3.tar.gz) = 2620192 +TIMESTAMP = 1762615052 +SHA256 (monitoring-plugins-2.4.0.tar.gz) = e5dfd4ad8fde0a40da50aab3aff6d9a27020b8f283e332bc4da6ef9914f4028c +SIZE (monitoring-plugins-2.4.0.tar.gz) = 2746382 diff --git a/net-mgmt/monitoring-plugins/files/patch-plugins-scripts_check__ircd.pl b/net-mgmt/monitoring-plugins/files/patch-plugins-scripts_check__ircd.pl index 0cd1a4951128..04fc37d4920a 100644 --- a/net-mgmt/monitoring-plugins/files/patch-plugins-scripts_check__ircd.pl +++ b/net-mgmt/monitoring-plugins/files/patch-plugins-scripts_check__ircd.pl @@ -1,6 +1,6 @@ ---- plugins-scripts/check_ircd.pl.orig 2016-11-29 08:45:08 UTC -+++ plugins-scripts/check_ircd.pl -@@ -65,6 +65,7 @@ sub bindRemote ($$); +--- plugins-scripts/check_ircd.pl.orig 2025-11-08 16:25:06.105511000 +0100 ++++ plugins-scripts/check_ircd.pl 2025-11-08 16:27:22.763542000 +0100 +@@ -65,6 +65,7 @@ $ENV{'ENV'}=''; $ENV{'PATH'}='@TRUSTED_PATH@'; $ENV{'BASH_ENV'}=''; $ENV{'ENV'}=''; @@ -8,12 +8,3 @@ # -----------------------------------------------------------------[ Global ]-- -@@ -152,7 +153,7 @@ sub bindRemote ($$) - print "IRCD UNKNOWN: Could not start socket ($!)\n"; - exit $ERRORS{"UNKNOWN"}; - } -- $sockaddr = 'S n a4 x8'; -+ $sockaddr = 'x C n a4 x8'; - $that = pack($sockaddr, AF_INET, $in_remoteport, $thataddr); - if (!connect(ClientSocket, $that)) { - print "IRCD UNKNOWN: Could not connect socket ($!)\n"; diff --git a/net-mgmt/monitoring-plugins/files/patch-plugins-scripts_check__mailq.pl b/net-mgmt/monitoring-plugins/files/patch-plugins-scripts_check__mailq.pl index 4274663ddb21..fc244ca94d41 100644 --- a/net-mgmt/monitoring-plugins/files/patch-plugins-scripts_check__mailq.pl +++ b/net-mgmt/monitoring-plugins/files/patch-plugins-scripts_check__mailq.pl @@ -1,56 +1,51 @@ -From 94acff9f2616fbca8fd31292d374d9ce8a45263a Mon Sep 17 00:00:00 2001 -From: Filias Heidt <fh@netzkommune.de> -Date: Fri, 9 Jun 2017 14:46:00 +0200 -Subject: [PATCH] add support for opensmtpd - ---- plugins-scripts/check_mailq.pl.orig 2020-12-09 21:38:01 UTC -+++ plugins-scripts/check_mailq.pl -@@ -550,6 +550,39 @@ elsif ( $mailq eq "nullmailer" ) { - } +--- plugins-scripts/check_mailq.pl.orig 2025-11-08 16:31:19.283295000 +0100 ++++ plugins-scripts/check_mailq.pl 2025-11-08 16:39:40.042634000 +0100 +@@ -571,7 +571,39 @@ elsif ( $mailq eq "nullmailer" ) { + $state = $ERRORS{'CRITICAL'}; + } } # end of ($mailq eq "nullmailer") - -+elsif ( $mailq eq "opensmtp" ) { -+ ## open mailq -+ if ( defined $utils::PATH_TO_MAILQ && -x $utils::PATH_TO_MAILQ ) { -+ if (! open (MAILQ, "$sudo $utils::PATH_TO_MAILQ | " ) ) { -+ print "ERROR: could not open $utils::PATH_TO_MAILQ \n"; -+ exit $ERRORS{'UNKNOWN'}; -+ } -+ }elsif( defined $utils::PATH_TO_MAILQ){ -+ unless (-x $utils::PATH_TO_MAILQ) { -+ print "ERROR: $utils::PATH_TO_MAILQ is not executable by (uid $>:gid($)))\n"; -+ exit $ERRORS{'UNKNOWN'}; -+ } -+ } else { -+ print "ERROR: \$utils::PATH_TO_MAILQ is not defined\n"; -+ exit $ERRORS{'UNKNOWN'}; -+ } + -+ $msg_q++ while (<MAILQ>); ++elsif ( $mailq eq "opensmtp" ) { ++ ## open mailq ++ if ( defined $utils::PATH_TO_MAILQ && -x $utils::PATH_TO_MAILQ ) { ++ if (! open (MAILQ, "$sudo $utils::PATH_TO_MAILQ | " ) ) { ++ print "ERROR: could not open $utils::PATH_TO_MAILQ \n"; ++ exit $ERRORS{'UNKNOWN'}; ++ } ++ }elsif( defined $utils::PATH_TO_MAILQ){ ++ unless (-x $utils::PATH_TO_MAILQ) { ++ print "ERROR: $utils::PATH_TO_MAILQ is not executable by (uid $>:gid($)))\n"; ++ exit $ERRORS{'UNKNOWN'}; ++ } ++ } else { ++ print "ERROR: \$utils::PATH_TO_MAILQ is not defined\n"; ++ exit $ERRORS{'UNKNOWN'}; ++ } + -+ close(MAILQ) ; -+ if ($msg_q < $opt_w) { -+ $msg = "OK: $mailq mailq ($msg_q) is below threshold ($opt_w/$opt_c)"; -+ $state = $ERRORS{'OK'}; -+ }elsif ($msg_q >= $opt_w && $msg_q < $opt_c) { -+ $msg = "WARNING: $mailq mailq is $msg_q (threshold w = $opt_w)"; -+ $state = $ERRORS{'WARNING'}; -+ }else { -+ $msg = "CRITICAL: $mailq mailq is $msg_q (threshold c = $opt_c)"; -+ $state = $ERRORS{'CRITICAL'}; -+ } ++ $msg_q++ while (<MAILQ>); + ++ close(MAILQ) ; ++ if ($msg_q < $opt_w) { ++ $msg = "OK: $mailq mailq ($msg_q) is below threshold ($opt_w/$opt_c)"; ++ $state = $ERRORS{'OK'}; ++ }elsif ($msg_q >= $opt_w && $msg_q < $opt_c) { ++ $msg = "WARNING: $mailq mailq is $msg_q (threshold w = $opt_w)"; ++ $state = $ERRORS{'WARNING'}; ++ }else { ++ $msg = "CRITICAL: $mailq mailq is $msg_q (threshold c = $opt_c)"; ++ $state = $ERRORS{'CRITICAL'}; ++ } +} # end of ($mailq eq "opensmtp") + -+ # Perfdata support print "$msg|unsent=$msg_q;$opt_w;$opt_c;0\n"; exit $state; -@@ -612,7 +645,7 @@ sub process_arguments(){ - } +@@ -635,7 +667,7 @@ sub process_arguments(){ + } - if (defined $opt_M) { -- if ($opt_M =~ /^(sendmail|qmail|postfix|exim|nullmailer)$/) { -+ if ($opt_M =~ /^(sendmail|qmail|postfix|exim|nullmailer|opensmtp)$/) { - $mailq = $opt_M ; - }elsif( $opt_M eq ''){ - $mailq = 'sendmail'; + if (defined $opt_M) { +- if ($opt_M =~ /^(sendmail|qmail|postfix|exim|nullmailer)$/) { ++ if ($opt_M =~ /^(sendmail|qmail|postfix|exim|nullmailer|opensmtp)$/) { + $mailq = $opt_M ; + }elsif( $opt_M eq ''){ + $mailq = 'sendmail'; diff --git a/net-mgmt/monitoring-plugins/files/patch-plugins_check__http.c b/net-mgmt/monitoring-plugins/files/patch-plugins_check__http.c index ce072578398b..a96b08af9a54 100644 --- a/net-mgmt/monitoring-plugins/files/patch-plugins_check__http.c +++ b/net-mgmt/monitoring-plugins/files/patch-plugins_check__http.c @@ -1,17 +1,17 @@ -diff --git a/plugins/check_http.c b/plugins/check_http.c ---- plugins/check_http.c.old -+++ plugins/check_http.c -@@ -1462,7 +1462,13 @@ char *unchunk_content(const char *content) { - memcpy(result + (overall_size - size_of_chunk), start_of_chunk, size_of_chunk); - } - -- result[overall_size] = '\0'; -+ if (overall_size == 0 && result == NULL) { +--- plugins/check_http.c.orig 2025-11-08 16:43:35.500239000 +0100 ++++ plugins/check_http.c 2025-11-08 17:09:19.591784000 +0100 +@@ -1476,7 +1476,13 @@ char *unchunk_content(const char *content) { + result = calloc(1, sizeof(char)); + // No error handling here, we can only return NULL anyway + } else { +- result[overall_size] = '\0'; ++ if (overall_size == 0 && result == NULL) { + // We might just have received the end chunk without previous content, so result is never allocated + result = calloc(1, sizeof(char)); + // No error handling here, we can only return NULL anyway + } else { -+ result[overall_size] = '\0'; -+ } ++ result[overall_size] = '\0'; ++ } + } return result; } diff --git a/net-mgmt/monitoring-plugins/files/patch-plugins_check__procs.c b/net-mgmt/monitoring-plugins/files/patch-plugins_check__procs.c deleted file mode 100644 index c74d61575410..000000000000 --- a/net-mgmt/monitoring-plugins/files/patch-plugins_check__procs.c +++ /dev/null @@ -1,107 +0,0 @@ ---- plugins/check_procs.c.orig 2022-10-19 12:50:27 UTC -+++ plugins/check_procs.c -@@ -70,6 +70,7 @@ int options = 0; /* bitmask of filter criteria to test - #define PCPU 256 - #define ELAPSED 512 - #define EREG_ARGS 1024 -+#define JID 2048 - - #define KTHREAD_PARENT "kthreadd" /* the parent process of kernel threads: - ppid of procs are compared to pid of this proc*/ -@@ -101,6 +102,7 @@ int usepid = 0; /* whether to test for pid or /proc/pi - char tmp[MAX_INPUT_BUFFER]; - int kthread_filter = 0; - int usepid = 0; /* whether to test for pid or /proc/pid/exe */ -+int jid; - - FILE *ps_input = NULL; - -@@ -130,6 +132,7 @@ main (int argc, char **argv) - int procuid = 0; - pid_t procpid = 0; - pid_t procppid = 0; -+ int procjid = 0; - pid_t kthread_ppid = 0; - int procvsz = 0; - int procrss = 0; -@@ -230,9 +233,9 @@ main (int argc, char **argv) - procseconds = convert_to_seconds(procetime); - - if (verbose >= 3) -- printf ("proc#=%d uid=%d vsz=%d rss=%d pid=%d ppid=%d pcpu=%.2f stat=%s etime=%s prog=%s args=%s\n", -+ printf ("proc#=%d uid=%d vsz=%d rss=%d pid=%d ppid=%d jid=%d pcpu=%.2f stat=%s etime=%s prog=%s args=%s\n", - procs, procuid, procvsz, procrss, -- procpid, procppid, procpcpu, procstat, -+ procpid, procppid, procjid, procpcpu, procstat, - procetime, procprog, procargs); - - /* Ignore self */ -@@ -275,6 +278,8 @@ main (int argc, char **argv) - resultsum |= PROG; - if ((options & PPID) && (procppid == ppid)) - resultsum |= PPID; -+ if ((options & JID) && (procjid == jid)) -+ resultsum |= JID; - if ((options & USER) && (procuid == uid)) - resultsum |= USER; - if ((options & VSZ) && (procvsz >= vsz)) -@@ -292,9 +297,9 @@ main (int argc, char **argv) - - procs++; - if (verbose >= 2) { -- printf ("Matched: uid=%d vsz=%d rss=%d pid=%d ppid=%d pcpu=%.2f stat=%s etime=%s prog=%s args=%s\n", -+ printf ("Matched: uid=%d vsz=%d rss=%d pid=%d ppid=%d jid=%d pcpu=%.2f stat=%s etime=%s prog=%s args=%s\n", - procuid, procvsz, procrss, -- procpid, procppid, procpcpu, procstat, -+ procpid, procppid, procjid, procpcpu, procstat, - procetime, procprog, procargs); - } - -@@ -409,6 +414,7 @@ process_arguments (int argc, char **argv) - {"input-file", required_argument, 0, CHAR_MAX+2}, - {"no-kthreads", required_argument, 0, 'k'}, - {"traditional-filter", no_argument, 0, 'T'}, -+ {"jid", required_argument, 0, 'j'}, - {0, 0, 0, 0} - }; - -@@ -417,7 +423,7 @@ process_arguments (int argc, char **argv) - strcpy (argv[c], "-t"); - - while (1) { -- c = getopt_long (argc, argv, "Vvhkt:c:w:p:s:u:C:a:z:r:m:P:T", -+ c = getopt_long (argc, argv, "Vvhkt:c:w:p:s:u:C:a:z:r:m:P:Tj:", - longopts, &option); - - if (c == -1 || c == EOF) -@@ -451,6 +457,12 @@ process_arguments (int argc, char **argv) - break; - } - usage4 (_("Parent Process ID must be an integer!")); -+ case 'j': /* jail id */ -+ if (sscanf (optarg, "%d%[^0-9]", &jid, tmp) == 1) { -+ asprintf (&fmt, "%s%sJID = %d", (fmt ? fmt : "") , (options ? ", " : ""), jid); -+ options |= JID; -+ break; -+ } - case 's': /* status */ - if (statopts) - break; -@@ -731,6 +743,8 @@ print_help (void) - printf (" %s\n", _("RSZDT, plus others based on the output of your 'ps' command).")); - printf (" %s\n", "-p, --ppid=PPID"); - printf (" %s\n", _("Only scan for children of the parent process ID indicated.")); -+ printf (" %s\n", "-j, --jid=JID"); -+ printf (" %s\n", _("Only scan for process running in jail which ID is JID.")); - printf (" %s\n", "-z, --vsz=VSZ"); - printf (" %s\n", _("Only scan for processes with VSZ higher than indicated.")); - printf (" %s\n", "-r, --rss=RSS"); -@@ -784,7 +798,7 @@ print_usage (void) - print_usage (void) - { - printf ("%s\n", _("Usage:")); -- printf ("%s -w <range> -c <range> [-m metric] [-s state] [-p ppid]\n", progname); -+ printf ("%s -w <range> -c <range> [-m metric] [-s state] [-p ppid] [-j jid]\n", progname); - printf (" [-u user] [-r rss] [-z vsz] [-P %%cpu] [-a argument-array]\n"); - printf (" [-C command] [-k] [-t timeout] [-v]\n"); - } diff --git a/net-mgmt/monitoring-plugins/files/patch-plugins_check__ssh.c b/net-mgmt/monitoring-plugins/files/patch-plugins_check__ssh.c deleted file mode 100644 index 14b1ae8ab9ae..000000000000 --- a/net-mgmt/monitoring-plugins/files/patch-plugins_check__ssh.c +++ /dev/null @@ -1,18 +0,0 @@ ---- plugins/check_ssh.c.orig 2016-11-29 08:45:08 UTC -+++ plugins/check_ssh.c -@@ -255,6 +255,7 @@ ssh_connect (char *haddr, int hport, cha - printf - (_("SSH CRITICAL - %s (protocol %s) version mismatch, expected '%s'\n"), - ssh_server, ssh_proto, remote_version); -+ recv (sd, output, BUFF_SZ, 0); - close(sd); - exit (STATE_CRITICAL); - } -@@ -273,6 +274,7 @@ ssh_connect (char *haddr, int hport, cha - (_("SSH OK - %s (protocol %s) | %s\n"), - ssh_server, ssh_proto, fperfdata("time", elapsed_time, "s", - FALSE, 0, FALSE, 0, TRUE, 0, TRUE, (int)socket_timeout)); -+ recv (sd, output, BUFF_SZ, 0); - close(sd); - exit (STATE_OK); - } diff --git a/net-mgmt/monitoring-plugins/files/patch-plugins_check__swap.c b/net-mgmt/monitoring-plugins/files/patch-plugins_check__swap.c deleted file mode 100644 index 4c534bcdbed1..000000000000 --- a/net-mgmt/monitoring-plugins/files/patch-plugins_check__swap.c +++ /dev/null @@ -1,12 +0,0 @@ ---- plugins/check_swap.c.orig 2023-03-19 09:10:16.525073000 +0100 -+++ plugins/check_swap.c 2023-03-19 09:10:31.862180000 +0100 -@@ -34,9 +34,6 @@ const char *email = "devel@monitoring-plugins.org"; - #include "common.h" - #include "popen.h" - #include "utils.h" --#include <string.h> --#include <math.h> --#include <libintl.h> - - #ifdef HAVE_DECL_SWAPCTL - # ifdef HAVE_SYS_PARAM_H diff --git a/net-mgmt/monitoring-plugins/pkg-plist b/net-mgmt/monitoring-plugins/pkg-plist index fe7a1f9ba74e..bd61d3c4a132 100644 --- a/net-mgmt/monitoring-plugins/pkg-plist +++ b/net-mgmt/monitoring-plugins/pkg-plist @@ -1,5 +1,6 @@ libexec/nagios/check_apt libexec/nagios/check_breeze +libexec/nagios/check_mssql %%SSH%%libexec/nagios/check_by_ssh libexec/nagios/check_clamd libexec/nagios/check_cluster @@ -68,5 +69,3 @@ libexec/nagios/negate libexec/nagios/urlize libexec/nagios/utils.pm libexec/nagios/utils.sh -%%NLS%%share/locale/de/LC_MESSAGES/monitoring-plugins.mo -%%NLS%%share/locale/fr/LC_MESSAGES/monitoring-plugins.mo diff --git a/net-mgmt/mqtt2prometheus/Makefile b/net-mgmt/mqtt2prometheus/Makefile index ffdcac1df4f0..d93af5c2a63b 100644 --- a/net-mgmt/mqtt2prometheus/Makefile +++ b/net-mgmt/mqtt2prometheus/Makefile @@ -1,7 +1,7 @@ PORTNAME= mqtt2prometheus DISTVERSIONPREFIX= v DISTVERSION= 0.1.7 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= net-mgmt MAINTAINER= manu@FreeBSD.org diff --git a/net-mgmt/netbox/Makefile b/net-mgmt/netbox/Makefile index 986bcbe574e7..1dd39c1628bd 100644 --- a/net-mgmt/netbox/Makefile +++ b/net-mgmt/netbox/Makefile @@ -1,6 +1,6 @@ PORTNAME= netbox DISTVERSIONPREFIX= v -DISTVERSION= 4.4.5 +DISTVERSION= 4.4.7 CATEGORIES= net-mgmt python MAINTAINER= kai@FreeBSD.org @@ -23,45 +23,45 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt # - www/py-dj52-django-tables2 # - www/py-dj52-djangorestframework # -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django52>=5.2.7<5.3:www/py-django52@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django52>=5.2.8<5.3:www/py-django52@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj52-django-cors-headers>=4.9.0<5:www/py-dj52-django-cors-headers@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dj52-django-debug-toolbar>=6.0.0<7:www/py-dj52-django-debug-toolbar@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dj52-django-debug-toolbar>=6.1.0<7:www/py-dj52-django-debug-toolbar@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj52-django-filter>=25.2<26:www/py-dj52-django-filter@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj52-django-htmx>=1.26.0<2:www/py-dj52-django-htmx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj52-django-mptt>=0.17.0<0.18:www/py-dj52-django-mptt@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj52-django-prometheus>=2.4.1<2.5:www/py-dj52-django-prometheus@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj52-django-redis>=6.0.0<7:www/py-dj52-django-redis@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj52-django-rich>=2.2.0<3:www/py-dj52-django-rich@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dj52-django-rq>=3.0.1<3.2:devel/py-dj52-django-rq@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dj52-django-rq>=3.0.1<3.3:devel/py-dj52-django-rq@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj52-django-storages>=1.14.6<2:www/py-dj52-django-storages@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dj52-django-tables2>=2.7.5<2.8:www/py-dj52-django-tables2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dj52-django-tables2>=2.8.0<2.9:www/py-dj52-django-tables2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj52-django-taggit>=6.1.0<7:www/py-dj52-django-taggit@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj52-django-timezone-field>=7.1<8:www/py-dj52-django-timezone-field@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj52-djangorestframework>=3.16.1<3.17.0:www/py-dj52-djangorestframework@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dj52-drf-spectacular>=0.28.0<1:www/py-dj52-drf-spectacular@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dj52-drf-spectacular>=0.29.0<1:www/py-dj52-drf-spectacular@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj52-drf-spectacular-sidecar>=2025.10.1:www/py-dj52-drf-spectacular-sidecar@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj52-social-auth-app-django>=5.6.0<6:www/py-dj52-social-auth-app-django@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj52-sorl-thumbnail>=12.11.0<13:graphics/py-dj52-sorl-thumbnail@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dj52-strawberry-graphql>=0.284.1<0.300:devel/py-dj52-strawberry-graphql@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dj52-strawberry-graphql-django>=0.67.0<1:www/py-dj52-strawberry-graphql-django@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dj52-strawberry-graphql>=0.287.0<0.300:devel/py-dj52-strawberry-graphql@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dj52-strawberry-graphql-django>=0.67.2<1:www/py-dj52-strawberry-graphql-django@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django-pglocks>=1.0.4<1.1:www/py-django-pglocks@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}colorama>=0.4.6<1:devel/py-colorama@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}feedparser>=6.0.12<7:textproc/py-feedparser@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=3.1.6<4:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jsonschema>=4.25.1<5:devel/py-jsonschema@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}markdown>=3.9<3.10:textproc/py-markdown@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mkdocs-material>=9.6.22<10:textproc/py-mkdocs-material@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}markdown>=3.9<3.11:textproc/py-markdown@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mkdocs-material>=9.7.0<10:textproc/py-mkdocs-material@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mkdocstrings>=0.30.1<1:textproc/py-mkdocstrings@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mkdocstrings-python>=1.18.2:textproc/py-mkdocstrings-python@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mkdocstrings-python>=1.19.0:textproc/py-mkdocstrings-python@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}netaddr>=1.3.0<2:net/py-netaddr@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}nh3>=0.3.1<1:www/py-nh3@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}nh3>=0.3.2<1:www/py-nh3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pillow>=11.3.0:graphics/py-pillow@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}psycopg>=3.2.10<4:databases/py-psycopg@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}psycopg-c>=3.2.10<4:databases/py-psycopg-c@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}psycopg-pool>=3.2.6<4:databases/py-psycopg-pool@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}psycopg>=3.2.12<4:databases/py-psycopg@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}psycopg-c>=3.2.12<4:databases/py-psycopg-c@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}psycopg-pool>=3.2.7<4:databases/py-psycopg-pool@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.32.5<3:www/py-requests@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}rq>=2.6.0<3:devel/py-rq@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}social-auth-core>=4.7.0<5:security/py-social-auth-core@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}rq>=2.6.1<3:devel/py-rq@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}social-auth-core>=4.8.1<5:security/py-social-auth-core@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}svgwrite>=1.4.3<2:graphics/py-svgwrite@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tablib>=3.9.0<4:textproc/py-tablib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tzdata>=2025.2:devel/py-tzdata@${PY_FLAVOR} \ diff --git a/net-mgmt/netbox/distinfo b/net-mgmt/netbox/distinfo index 35861bec3246..28585b3d66e6 100644 --- a/net-mgmt/netbox/distinfo +++ b/net-mgmt/netbox/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1761682792 -SHA256 (netbox-community-netbox-v4.4.5_GH0.tar.gz) = fdf3fa08fabe441d0b6febc7acf769ed0ff927997a4e39fc2c5a742a707c318f -SIZE (netbox-community-netbox-v4.4.5_GH0.tar.gz) = 19249564 +TIMESTAMP = 1764101130 +SHA256 (netbox-community-netbox-v4.4.7_GH0.tar.gz) = 8eeb59a7026da78f56c92beea8e39c70590fe22c9235d70f52b142bd76312d25 +SIZE (netbox-community-netbox-v4.4.7_GH0.tar.gz) = 19261559 diff --git a/net-mgmt/netbox/pkg-plist b/net-mgmt/netbox/pkg-plist index 084ca6921c76..1735c18d6750 100644 --- a/net-mgmt/netbox/pkg-plist +++ b/net-mgmt/netbox/pkg-plist @@ -152,6 +152,7 @@ %%DATADIR%%/core/tests/test_changelog.py %%DATADIR%%/core/tests/test_filtersets.py %%DATADIR%%/core/tests/test_models.py +%%DATADIR%%/core/tests/test_openapi_schema.py %%DATADIR%%/core/tests/test_views.py %%DATADIR%%/core/urls.py %%DATADIR%%/core/utils.py @@ -250,6 +251,7 @@ %%DATADIR%%/dcim/migrations/0213_platform_parent.py %%DATADIR%%/dcim/migrations/0214_platform_rebuild.py %%DATADIR%%/dcim/migrations/0215_rackreservation_status.py +%%DATADIR%%/dcim/migrations/0216_latitude_longitude_validators.py %%DATADIR%%/dcim/migrations/__init__.py %%DATADIR%%/dcim/migrations/initial_data/module_type_profiles/cpu.json %%DATADIR%%/dcim/migrations/initial_data/module_type_profiles/expansion_card.json @@ -923,6 +925,7 @@ %%DATADIR%%/netbox/tests/test_api.py %%DATADIR%%/netbox/tests/test_authentication.py %%DATADIR%%/netbox/tests/test_config.py +%%DATADIR%%/netbox/tests/test_forms.py %%DATADIR%%/netbox/tests/test_graphql.py %%DATADIR%%/netbox/tests/test_import.py %%DATADIR%%/netbox/tests/test_jobs.py diff --git a/net-mgmt/netdata/Makefile b/net-mgmt/netdata/Makefile index 699a77f0321e..d698ac5d990c 100644 --- a/net-mgmt/netdata/Makefile +++ b/net-mgmt/netdata/Makefile @@ -1,6 +1,6 @@ PORTNAME= netdata DISTVERSIONPREFIX= v -DISTVERSION= 2.7.3 +DISTVERSION= 2.8.1 CATEGORIES= net-mgmt MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/:netdata \ https://raw.githubusercontent.com/netdata/netdata/refs/tags/v${DISTVERSION}/src/go/:goplugin \ @@ -75,7 +75,7 @@ NETDATA_CACHE= /var/cache/${PORTNAME} NETDATA_LOG= /var/log/${PORTNAME} NETDATA_PERST= /var/db/${PORTNAME} NETDATA_RUN= /var/run/${PORTNAME} -NETDATA_DASHBOARD_VERSION= 20251029 +NETDATA_DASHBOARD_VERSION= 20251122 PLIST_SUB= NETDATA_CACHE=${NETDATA_CACHE} \ NETDATA_LOG=${NETDATA_LOG} \ diff --git a/net-mgmt/netdata/distinfo b/net-mgmt/netdata/distinfo index b99a55687e7e..87b481c0f715 100644 --- a/net-mgmt/netdata/distinfo +++ b/net-mgmt/netdata/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1761758486 -SHA256 (netdata/netdata-v2.7.3.tar.gz) = f940fb0978c09f2353343cc4480dd3abfdba025f6690c90747fbc9a143e6bb9b -SIZE (netdata/netdata-v2.7.3.tar.gz) = 15063715 -SHA256 (netdata/agent_20251029.tar.gz) = 817abbee389376892d7f147f95a09a50dc6a90fa292cc13a0dde1f99779e33b2 -SIZE (netdata/agent_20251029.tar.gz) = 13553775 -SHA256 (netdata/go.mod) = 24188f9204fb71fd170abd399fc72fdc47d59d1f5519810bbe9919834adf0e86 -SIZE (netdata/go.mod) = 8236 +TIMESTAMP = 1763851420 +SHA256 (netdata/netdata-v2.8.1.tar.gz) = 373b61241d5cc80addeb0cc6c9f434abf363333081056a7d7ba6ea1f46ba6f06 +SIZE (netdata/netdata-v2.8.1.tar.gz) = 16478236 +SHA256 (netdata/agent_20251122.tar.gz) = e739127f33bb8065d6baef09f8f9cbd55a16b9e99be11afafd58da76ff8496ef +SIZE (netdata/agent_20251122.tar.gz) = 13569484 +SHA256 (netdata/go.mod) = ff9e904bc031b267f3a1ace6ef1970f052873e27ac257976af76075649b98677 +SIZE (netdata/go.mod) = 8469 diff --git a/net-mgmt/netdata/files/patch-CMakeLists.txt b/net-mgmt/netdata/files/patch-CMakeLists.txt index 9b29c5bcc787..b673368669a9 100644 --- a/net-mgmt/netdata/files/patch-CMakeLists.txt +++ b/net-mgmt/netdata/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2025-10-01 17:58:58 UTC -+++ CMakeLists.txt -@@ -40,7 +40,7 @@ set(CMAKE_C_STANDARD 11) +--- CMakeLists.txt.orig 2025-11-22 17:07:34.556416000 -0600 ++++ CMakeLists.txt 2025-11-22 17:08:01.866346000 -0600 +@@ -38,7 +38,7 @@ set(CMAKE_INSTALL_MESSAGE LAZY) set(CMAKE_C_STANDARD 11) @@ -9,16 +9,35 @@ set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME "netdata") option(USE_CXX_11 "Use C++11 instead of C++14 (should only be used on legacy systems that cannot support C++14, may disable some features)" False) -@@ -95,7 +95,7 @@ set(NETDATA_RUNTIME_PREFIX "${CMAKE_INSTALL_PREFIX}") - set(OS_WINDOWS False) +@@ -80,7 +80,7 @@ + endif() + endif() - set(NETDATA_RUNTIME_PREFIX "${CMAKE_INSTALL_PREFIX}") -set(BINDIR usr/sbin) +set(BINDIR sbin) + set(NETDATA_RUNTIME_PREFIX "${CMAKE_INSTALL_PREFIX}") + # This can be changed depending on the platform with the include below + include(NetdataPlatform) +@@ -93,12 +93,13 @@ + string(REGEX REPLACE "/$" "" NETDATA_RUNTIME_PREFIX "${NETDATA_RUNTIME_PREFIX}") + endif() - if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin") - set(OS_MACOS True) -@@ -230,6 +230,7 @@ if(ENABLE_NETDATA_JOURNAL_FILE_READER OR ENABLE_PLUGIN +-set(CACHE_DIR "${NETDATA_RUNTIME_PREFIX}/var/cache/netdata") +-set(CONFIG_DIR "${NETDATA_RUNTIME_PREFIX}/etc/netdata") +-set(LIBCONFIG_DIR "${NETDATA_RUNTIME_PREFIX}/lib/netdata/conf.d") +-set(LOG_DIR "${NETDATA_RUNTIME_PREFIX}/var/log/netdata") +-set(PLUGINS_DIR "${NETDATA_RUNTIME_PREFIX}/libexec/netdata/plugins.d") ++set(CACHE_DIR "%%NETDATA_CACHE%%") ++set(CONFIG_DIR "%%ETCDIR%%") ++set(LIBCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/lib/netdata/conf.d") ++set(LOG_DIR "%%NETDATA_LOG%%") ++set(PLUGINS_DIR "${CMAKE_INSTALL_PREFIX}/libexec/netdata/plugins.d") + set(VARLIB_DIR "${NETDATA_RUNTIME_PREFIX}/var/lib/netdata") ++set(VARLIB_DIR "%%NETDATA_PERST%%") + set(NETDATA_BIN_DIR "${NETDATA_RUNTIME_PREFIX}/${BINDIR}") + + # A non-default value is only used when building Debian packages (/var/lib/netdata/www) +@@ -187,6 +188,7 @@ # Setup Rust/Corrosion for plugins that need it if(ENABLE_NETDATA_JOURNAL_FILE_READER OR ENABLE_PLUGIN_OTEL) @@ -26,7 +45,7 @@ include(FetchContent) FetchContent_Declare( Corrosion -@@ -237,6 +238,8 @@ if(ENABLE_NETDATA_JOURNAL_FILE_READER OR ENABLE_PLUGIN +@@ -194,6 +196,8 @@ GIT_TAG f3b91559efca32c6b54837866ef35ba98ff5b2ca # stable/v0.5 ) FetchContent_MakeAvailable(Corrosion) @@ -35,7 +54,7 @@ corrosion_import_crate(MANIFEST_PATH src/crates/jf/Cargo.toml CRATES journal_reader_ffi otel-plugin) endif() -@@ -413,7 +416,7 @@ include(NetdataBacktrace) +@@ -370,7 +374,7 @@ include(NetdataJSONC) include(NetdataYAML) include(NetdataBacktrace) @@ -44,7 +63,7 @@ if(ENABLE_LEGACY_EBPF_PROGRAMS) include(NetdataEBPFLegacy) -@@ -438,9 +441,9 @@ endif() +@@ -395,9 +399,9 @@ netdata_bundle_sentry() endif() @@ -57,7 +76,7 @@ # # check include files -@@ -3031,9 +3034,9 @@ add_executable(netdata +@@ -3016,9 +3020,9 @@ "$<$<BOOL:${OS_WINDOWS}>:${NETDATA_RES_FILES}>" ) @@ -70,15 +89,15 @@ if(OS_WINDOWS) add_executable(NetdataClaim ${CLAIM_WINDOWS_FILES} ${NETDATA_CLAIM_RES_FILES}) -@@ -3156,6 +3159,7 @@ if(ENABLE_PLUGIN_GO) - COMPONENT plugin-go +@@ -3177,6 +3181,7 @@ DESTINATION libexec/netdata/plugins.d) -+#[[ # Build and install nd-mcp (stdio-golang bridge) exactly like go.d.plugin ++#[[ if (OS_WINDOWS) set(ND_MCP_NAME nd-mcp.exe) -@@ -3168,6 +3172,7 @@ if(ENABLE_PLUGIN_GO) + else() +@@ -3188,6 +3193,7 @@ ${CMAKE_BINARY_DIR}/${ND_MCP_NAME} COMPONENT plugin-go DESTINATION "${BINDIR}") @@ -86,26 +105,7 @@ endif() # -@@ -3197,12 +3202,12 @@ endif() - string(REGEX REPLACE "/$" "" NETDATA_RUNTIME_PREFIX "${NETDATA_RUNTIME_PREFIX}") - endif() - --set(CACHE_DIR "${NETDATA_RUNTIME_PREFIX}/var/cache/netdata") --set(CONFIG_DIR "${NETDATA_RUNTIME_PREFIX}/etc/netdata") --set(LIBCONFIG_DIR "${NETDATA_RUNTIME_PREFIX}/lib/netdata/conf.d") --set(LOG_DIR "${NETDATA_RUNTIME_PREFIX}/var/log/netdata") --set(PLUGINS_DIR "${NETDATA_RUNTIME_PREFIX}/libexec/netdata/plugins.d") --set(VARLIB_DIR "${NETDATA_RUNTIME_PREFIX}/var/lib/netdata") -+set(CACHE_DIR "%%NETDATA_CACHE%%") -+set(CONFIG_DIR "%%ETCDIR%%") -+set(LIBCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/lib/netdata/conf.d") -+set(LOG_DIR "%%NETDATA_LOG%%") -+set(PLUGINS_DIR "${CMAKE_INSTALL_PREFIX}/libexec/netdata/plugins.d") -+set(VARLIB_DIR "%%NETDATA_PERST%%") - - # A non-default value is only used when building Debian packages (/var/lib/netdata/www) - if(NOT DEFINED WEB_DIR) -@@ -3255,11 +3260,12 @@ install(TARGETS netdata COMPONENT netdata DESTINATION +@@ -3289,11 +3295,11 @@ install(TARGETS netdata COMPONENT netdata DESTINATION "${BINDIR}") @@ -114,7 +114,6 @@ -install(DIRECTORY COMPONENT netdata DESTINATION var/lib/netdata/registry) -install(DIRECTORY COMPONENT netdata DESTINATION var/lib/netdata/cloud.d) -install(DIRECTORY COMPONENT netdata DESTINATION var/run/netdata) -+ +install(DIRECTORY COMPONENT netdata DESTINATION %%NETDATA_CACHE%%) +install(DIRECTORY COMPONENT netdata DESTINATION %%NETDATA_LOG%%) +install(DIRECTORY COMPONENT netdata DESTINATION %%NETDATA_PERST%%/registery) @@ -123,24 +122,7 @@ install(DIRECTORY COMPONENT netdata DESTINATION etc/netdata) install(DIRECTORY COMPONENT netdata DESTINATION etc/netdata/custom-plugins.d) install(DIRECTORY COMPONENT netdata DESTINATION etc/netdata/health.d) -@@ -3274,11 +3280,11 @@ set(sbindir_POST "${NETDATA_RUNTIME_PREFIX}/${BINDIR}" - set(pkglibexecdir_POST "${NETDATA_RUNTIME_PREFIX}/libexec/netdata") - set(localstatedir_POST "${NETDATA_RUNTIME_PREFIX}/var") - set(sbindir_POST "${NETDATA_RUNTIME_PREFIX}/${BINDIR}") --set(configdir_POST "${NETDATA_RUNTIME_PREFIX}/etc/netdata") --set(libconfigdir_POST "${NETDATA_RUNTIME_PREFIX}/lib/netdata/conf.d") --set(cachedir_POST "${NETDATA_RUNTIME_PREFIX}/var/cache/netdata") --set(registrydir_POST "${NETDATA_RUNTIME_PREFIX}/var/lib/netdata/registry") --set(varlibdir_POST "${NETDATA_RUNTIME_PREFIX}/var/lib/netdata") -+set(configdir_POST "%%ETCDIR%%") -+set(libconfigdir_POST "${CMAKE_INSTALL_PREFIX}/lib/netdata/conf.d") -+set(cachedir_POST "%%NETDATA_CACHE%%") -+set(registrydir_POST "%%NETDATA_PERST%%/registery") -+set(varlibdir_POST "%%NETDATA_PERST%%") - set(netdata_user_POST "${NETDATA_USER}") - set(netdata_group_POST "${NETDATA_USER}") - -@@ -3804,8 +3810,8 @@ if(ENABLE_DASHBOARD) +@@ -3847,8 +3853,8 @@ # if(ENABLE_DASHBOARD) diff --git a/net-mgmt/netdata/pkg-plist b/net-mgmt/netdata/pkg-plist index 39bfce496c14..6c811bbb687a 100644 --- a/net-mgmt/netdata/pkg-plist +++ b/net-mgmt/netdata/pkg-plist @@ -408,6 +408,7 @@ etc/logrotate.d/netdata %%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/zookeeper.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/adaptec_raid.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/apcupsd.conf.sample +@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/as400.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/bcache.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/beanstalkd.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/boinc.conf.sample @@ -418,6 +419,7 @@ etc/logrotate.d/netdata @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/cockroachdb.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/consul.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/cpu.conf.sample +@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/db2.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/dbengine.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/disks.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/dns_query.conf.sample @@ -447,6 +449,7 @@ etc/logrotate.d/netdata @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/memcached.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/memory.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/ml.conf.sample +@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/mq.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/mysql.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/net.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/netfilter.conf.sample @@ -486,6 +489,9 @@ etc/logrotate.d/netdata @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/vernemq.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/vsphere.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/web_log.conf.sample +@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/websphere_jmx.conf.sample +@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/websphere_mp.conf.sample +@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/websphere_pmi.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/whoisquery.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/x509check.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/zfs.conf.sample @@ -555,6 +561,7 @@ libexec/netdata/python.d/python_modules/third_party/monotonic.py libexec/netdata/python.d/python_modules/third_party/ordereddict.py libexec/netdata/python.d/traefik.chart.py sbin/log2journal +sbin/nd-run sbin/netdata sbin/netdata-claim.sh sbin/netdatacli @@ -568,141 +575,143 @@ sbin/systemd-cat-native %%DASHBOARD%%%%DATADIR%%/web/registry-hello.html %%DASHBOARD%%%%DATADIR%%/web/static/splash.css %%DASHBOARD%%%%DATADIR%%/web/v3/.well-known/assetlinks.json -%%DASHBOARD%%%%DATADIR%%/web/v3/1220.540ca3785608fc5c0aef.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/1454.bb3c9a2334e2a299b85e.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/1454.bb3c9a2334e2a299b85e.chunk.js.LICENSE.txt -%%DASHBOARD%%%%DATADIR%%/web/v3/1526.2bbe70e3b756e5795f35.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/1608.661a1532f5071032b910.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/1658.245d41dd58a0674061f5.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/1736.00d2a7c217456cf2618a.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/180.c7e688391492949637cb.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/1861.cd7dede9055e55504199.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/1878.a868fd385bd95c073e4f.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/1910.fbb5da8c8f57af7c7c15.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/1975.3d714442670a08c3bc55.js -%%DASHBOARD%%%%DATADIR%%/web/v3/1975.3d714442670a08c3bc55.js.LICENSE.txt -%%DASHBOARD%%%%DATADIR%%/web/v3/2003.e802c4f7061c29df8441.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/2117.a0b2ef507fe0a4a12fa4.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/2143.256ca3a7ac2b9434624a.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/2177.592995b60098f1190a6b.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/2201.31a710436bfad5142613.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/2248.fc065905438e5e0f487a.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/2436.d64fcbbc9a90cd3b6c9c.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/2439.f933c2ce9b190caae3c3.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/2558.52351e1d8eb67a8185b7.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/2573.137c159d782a65991b4c.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/2576.42ce622377542d09ca34.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/1220.0c035c26a6ba7680115b.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/1368.19c1bff2c401faaa738c.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/1608.63365f1b0cb024d69e67.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/1658.bf72c4c052144d61a66b.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/1688.79b083d3cd0d3c26cf16.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/1736.04dc032fb0edf1016b2c.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/180.8c8d951273b3504af9f0.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/1861.e9b1462ff49ae587c199.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/1910.1d344b2c015534876f6f.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/1975.ab65e7c5f1b2c6a6aa9b.js +%%DASHBOARD%%%%DATADIR%%/web/v3/1975.ab65e7c5f1b2c6a6aa9b.js.LICENSE.txt +%%DASHBOARD%%%%DATADIR%%/web/v3/2003.8c22a882463ac7bc7efe.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/2108.bedba8e4ed2986aa5d96.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/2117.018285cf616da5e909c2.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/2143.630d9e70533287c91922.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/2177.46bc7dfa408eae510818.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/2201.e0a00df722bee40783b8.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/2248.9b795f4f0a3a41b76758.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/2420.793639ada312f51d09e4.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/2436.e3a7244e896337301c59.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/2439.41110167280a0c0da0e2.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/2558.b9b4dfc9743e40090a4e.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/2573.7525c33fb3d0ca8a28d5.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/2576.8fb2f6ce8cc77fd56801.chunk.js %%DASHBOARD%%%%DATADIR%%/web/v3/2576.eaad527ad5b2c56e97a0.css -%%DASHBOARD%%%%DATADIR%%/web/v3/2599.d5315aa8dde550917e02.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/2599.d5315aa8dde550917e02.chunk.js.LICENSE.txt -%%DASHBOARD%%%%DATADIR%%/web/v3/2634.04167e4573e1e103ebc5.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/271.a3377db5221db4f338f4.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/2904.3841f50c58f899b80cf7.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/2948.d5f63bac6943e8436a5e.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/3185.3fef0dad12d4b008336f.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/3427.791ba25845e5c12d6dec.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/3427.791ba25845e5c12d6dec.chunk.js.LICENSE.txt -%%DASHBOARD%%%%DATADIR%%/web/v3/3439.81f9f81814330df40c0b.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/3457.eed006c31da2643bb947.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/35.a2c49346fcd2fc872e72.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/3545.b4465065f60a5ec501c0.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/3600.bb0b2cee60ebe7b932a1.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/363.fa2b7eb749447a3ae8da.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/3677.81e6feff24be83d03e94.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/3718.85e5a11572eb828dfcde.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/3808.550f744f860aa9e4c032.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/3864.43cd657c39c23de7a8c2.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/3961.7c296a1e194864a3007b.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/3961.7c296a1e194864a3007b.chunk.js.LICENSE.txt -%%DASHBOARD%%%%DATADIR%%/web/v3/399.c26a086a34edf5094c7d.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/2599.78d590551d5a0a98fed0.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/2599.78d590551d5a0a98fed0.chunk.js.LICENSE.txt +%%DASHBOARD%%%%DATADIR%%/web/v3/2603.77f7c19e6480c47bc740.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/2634.ea00483b1dff8321e543.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/271.e7aefcc74837998c0484.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/2904.57f6519b0c503b96c0ea.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/2948.c4e34cab49a3602d9c61.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/3083.983abf4bb8b2f8707262.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/3185.eebe271edd583b2b95d5.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/3427.36b16bb36c3ec9ef50ea.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/3427.36b16bb36c3ec9ef50ea.chunk.js.LICENSE.txt +%%DASHBOARD%%%%DATADIR%%/web/v3/3439.a1a5bc8c115b8089c0c1.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/3457.3e3406b02f5f4284cbf4.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/35.05706012502a97d1b8f3.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/3545.03398fd9061f762de49c.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/3600.c630e33afa7e97d9c9f3.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/363.0d6b9dadfe9fea76f0b1.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/3677.c756a188963a5b5c48d5.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/3718.348fd49027ac26055d9a.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/3808.268f52b93602c8e9aa15.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/3864.db78bcb2aa320d51fd17.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/3961.41c7a0551e7cdb95ce77.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/3961.41c7a0551e7cdb95ce77.chunk.js.LICENSE.txt +%%DASHBOARD%%%%DATADIR%%/web/v3/399.52016e3f953a256adf90.chunk.js %%DASHBOARD%%%%DATADIR%%/web/v3/3D_PARTY_LICENSES.txt -%%DASHBOARD%%%%DATADIR%%/web/v3/4142.bb4ac80ad9af39127ab2.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/4211.96959e0998eeb690c36e.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/4265.504a9be6699e6d8d1fd7.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/4277.8df81e715756139c2330.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/4424.e6613392b3a77299f0c8.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/4484.50388a50717cf0868ae0.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/4651.b129a50096d3596d9747.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/4652.a041a094965d81e2e4ae.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/4652.a041a094965d81e2e4ae.chunk.js.LICENSE.txt -%%DASHBOARD%%%%DATADIR%%/web/v3/4808.8507439a6e440d5c9540.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/4837.565ad9d71bb5c09177b3.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/4913.a5078e1aa5afdbaaf1af.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/5178.a0ed0e0f767e4920afa2.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/5187.b7b78da5b0369181868d.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/5295.5096182e5317b3459742.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/5297.067a3685e409c666a11a.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/5302.ff072db875719471b9d6.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/5476.efc120d3cbca4c5df582.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/5566.1d0cf78a10db4cff6ce4.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/5612.a028932e3f444f1ab96d.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/5883.1adbf4ffdbe4486cacd7.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/6003.28347a4993f426559770.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/6025.b95398bf2dd55d736a7e.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/6141.82efda724b733e4d452f.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/6238.6d975731713a2779b799.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/6238.6d975731713a2779b799.chunk.js.LICENSE.txt -%%DASHBOARD%%%%DATADIR%%/web/v3/6333.a3e01e7b2d05c253dc26.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/6394.6c533153ec2ced8a6612.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/6403.aa4d23d2b77e1844cef8.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/6497.af4525ab3bf05fe466ab.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/6506.50e39662086550266a3a.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/6601.8a2ab0619947cbf415c2.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/7044.ec3190aead00801475f3.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/7214.d4c9b999bc36793c8cbb.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/7281.9a397c13294c68b0c504.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/7530.4c08bf7384c0bbfd0d67.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/7543.606307f4f75710d22b6b.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/7799.69f99b0cd42a6dbcbac1.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/7877.e215f0f005bf857a39fe.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/7931.aa65882ec5599a3c1050.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/8072.41e5878161608af4d1c8.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/8399.4af2a62224d2005bdc4d.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/8496.54ee18b387ceafef8f35.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/8496.54ee18b387ceafef8f35.chunk.js.LICENSE.txt -%%DASHBOARD%%%%DATADIR%%/web/v3/8554.f0d5402cbc11a07dbe0b.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/8643.77ea78945adf8c19cba4.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/8761.e036e7cc953187e2d282.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/8791.8d416aa457d404e7bd78.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/8800.ebadd63583621e2e5252.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/884.bfa50959987bb67e5a86.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/8850.de3d3f5459a476e7d69e.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/8904.5a2edaa87be80589b41e.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/8904.5a2edaa87be80589b41e.chunk.js.LICENSE.txt +%%DASHBOARD%%%%DATADIR%%/web/v3/4142.b43408302308e4cc9161.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/4211.145a6b08de2209389029.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/4265.769fca7317076254e3b0.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/4277.6386bd6ed205d389d99e.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/4301.426cf2dcfd3d782ec140.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/4424.e63815e61709c2309923.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/4480.bcdf770bac321a6bb68f.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/4484.9ee2bb133287af98b097.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/4582.3c40ac0d6c412f3e8c24.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/4606.5bb2601edf74d552957f.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/4606.5bb2601edf74d552957f.chunk.js.LICENSE.txt +%%DASHBOARD%%%%DATADIR%%/web/v3/4651.1192ce6ff893d5e9dd5f.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/4837.b2be2afd45fdb2d9de63.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/5030.33fdeacac57b4b7fcf99.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/5178.90192ec0ab5a89cc3e76.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/5187.f821f5efbf95905bdf79.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/5295.1a8ae445c7f52e5c0e6e.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/5297.e875be9b1960e69d4454.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/5302.5f6b4df89e1c7bc5f906.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/5476.599c67ed3f70b017a1a9.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/5566.2496928f0951dbc77290.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/5883.76e297c0fa82ef3745ba.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/6003.257010f19e5b84883157.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/6025.d914dd2442a2d5be864e.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/6141.a9cdac98dd190ca7a168.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/6238.4602c7dba1dd728461e2.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/6238.4602c7dba1dd728461e2.chunk.js.LICENSE.txt +%%DASHBOARD%%%%DATADIR%%/web/v3/6333.22588757a1136170b3e9.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/6394.47a2932093529561ed6f.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/6403.e1dd935a1737ded72546.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/6497.f9e9840bff52f64203c5.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/6554.a9a8464c7f8e3b5da30f.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/6554.a9a8464c7f8e3b5da30f.chunk.js.LICENSE.txt +%%DASHBOARD%%%%DATADIR%%/web/v3/6601.7bbab22fa640bfa9a7ba.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/6839.5f19a0d4f1947422cd25.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/7044.3879ee39be07550307bb.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/7214.cc010f777c6d04ab408a.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/7281.457cc958a9b72ce8eafd.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/7493.79e49ac98a2fe652d26c.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/7530.dfd93c86935a155f2c94.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/7543.50384535fb0ffd4f8299.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/7799.2558d538a4e71e72cbcc.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/7877.82954f935d21fe1df769.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/7931.34606f555192d6613828.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/8103.da64458cdbc5f9a1f133.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/8399.45009c8ea7952f413fc3.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/8496.857f0f2a9d4c4e8c92aa.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/8496.857f0f2a9d4c4e8c92aa.chunk.js.LICENSE.txt +%%DASHBOARD%%%%DATADIR%%/web/v3/8643.2a4a46892be5e91704e2.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/8761.ca5b76fe5755145eacae.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/8791.131d81e398d9028b7967.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/8800.54ae1fb08eb2876929df.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/884.1741c2d28bea048333e2.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/8904.1840f5188112e612af65.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/8904.1840f5188112e612af65.chunk.js.LICENSE.txt %%DASHBOARD%%%%DATADIR%%/web/v3/8904.d489f3f6dbbebd1b75d7.css -%%DASHBOARD%%%%DATADIR%%/web/v3/8938.a426c82a06d251428cd5.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/9088.72644caafbeb82826022.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/9244.73df2d956f91ba456c7b.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/9418.13313a2fd85169ef88df.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/9418.13313a2fd85169ef88df.chunk.js.LICENSE.txt -%%DASHBOARD%%%%DATADIR%%/web/v3/953.79d1a3d6bca65ef64ba4.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/9707.c5a35a1bbae8c45dd0c7.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/9822.02a7eafc2f33db7becf8.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/9856.448fb64ad13fba1da929.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/9883.dabce998b4a54248766c.chunk.js -%%DASHBOARD%%%%DATADIR%%/web/v3/9961.190af3adeeaa565446ab.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/9244.fc1bb71a3842b2f32943.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/9341.dca06fd8d7902c399ab7.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/9418.0d41b54c58c14ff035d3.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/9418.0d41b54c58c14ff035d3.chunk.js.LICENSE.txt +%%DASHBOARD%%%%DATADIR%%/web/v3/953.5dc8bd6e343ba97c013e.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/9822.f928222a1d8030a1210a.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/9856.82d776cf34c83bd5b315.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/9883.06d3d57e8db8f2f64b61.chunk.js +%%DASHBOARD%%%%DATADIR%%/web/v3/9961.131d7beae1fbe7d0a46e.chunk.js %%DASHBOARD%%%%DATADIR%%/web/v3/LICENSE.md %%DASHBOARD%%%%DATADIR%%/web/v3/LICENSE.txt %%DASHBOARD%%%%DATADIR%%/web/v3/agent.html -%%DASHBOARD%%%%DATADIR%%/web/v3/allFiles.7.71.0.json +%%DASHBOARD%%%%DATADIR%%/web/v3/allFiles.7.75.1.json %%DASHBOARD%%%%DATADIR%%/web/v3/allFiles.7.json -%%DASHBOARD%%%%DATADIR%%/web/v3/app.3c03cb006ba91b09944f.js +%%DASHBOARD%%%%DATADIR%%/web/v3/app.37ca67c54659741a06f5.js %%DASHBOARD%%%%DATADIR%%/web/v3/app.4da0883c6ce016bf3d81.css %%DASHBOARD%%%%DATADIR%%/web/v3/apple-app-site-association %%DASHBOARD%%%%DATADIR%%/web/v3/bundlesManifest.7.json %%DASHBOARD%%%%DATADIR%%/web/v3/favicon.ico %%DASHBOARD%%%%DATADIR%%/web/v3/index.html %%DASHBOARD%%%%DATADIR%%/web/v3/local-agent.html -%%DASHBOARD%%%%DATADIR%%/web/v3/netdata.charts.c7546ca817ffc8744522.js -%%DASHBOARD%%%%DATADIR%%/web/v3/netdata.charts.c7546ca817ffc8744522.js.LICENSE.txt -%%DASHBOARD%%%%DATADIR%%/web/v3/netdata.ui.fff53a90cb87802664e0.js -%%DASHBOARD%%%%DATADIR%%/web/v3/netdata.ui.fff53a90cb87802664e0.js.LICENSE.txt -%%DASHBOARD%%%%DATADIR%%/web/v3/npm.react.dom.a50346141b4b28c87254.js -%%DASHBOARD%%%%DATADIR%%/web/v3/npm.react.dom.a50346141b4b28c87254.js.LICENSE.txt +%%DASHBOARD%%%%DATADIR%%/web/v3/netdata.charts.d3d2859278a768d7e6c0.js +%%DASHBOARD%%%%DATADIR%%/web/v3/netdata.charts.d3d2859278a768d7e6c0.js.LICENSE.txt +%%DASHBOARD%%%%DATADIR%%/web/v3/netdata.ui.0e9d1b8c948c5858baa6.js +%%DASHBOARD%%%%DATADIR%%/web/v3/netdata.ui.0e9d1b8c948c5858baa6.js.LICENSE.txt +%%DASHBOARD%%%%DATADIR%%/web/v3/npm.react.dom.2ce993ff9a3b4f64332d.js +%%DASHBOARD%%%%DATADIR%%/web/v3/npm.react.dom.2ce993ff9a3b4f64332d.js.LICENSE.txt %%DASHBOARD%%%%DATADIR%%/web/v3/registry-access.html %%DASHBOARD%%%%DATADIR%%/web/v3/registry-alert-redirect.html %%DASHBOARD%%%%DATADIR%%/web/v3/registry-hello.html -%%DASHBOARD%%%%DATADIR%%/web/v3/runtime.303142dbf12c54d89776.js +%%DASHBOARD%%%%DATADIR%%/web/v3/runtime.cb02d0bbda86530b8e5f.js %%DASHBOARD%%%%DATADIR%%/web/v3/static/.well-known/assetlinks.json %%DASHBOARD%%%%DATADIR%%/web/v3/static/apple-app-site-association %%DASHBOARD%%%%DATADIR%%/web/v3/static/email/img/clea_badge.png diff --git a/net-mgmt/networkmgr/Makefile b/net-mgmt/networkmgr/Makefile index 58cb4eafe8ec..68cf5ac8668b 100644 --- a/net-mgmt/networkmgr/Makefile +++ b/net-mgmt/networkmgr/Makefile @@ -12,10 +12,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= gtk-update-icon-cache:graphics/gtk-update-icon-cache \ ${PYTHON_PKGNAMEPREFIX}python-distutils-extra>=2.15:devel/py-python-distutils-extra@${PY_FLAVOR} -RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme \ - sudo:security/sudo +RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme -USES= gettext-tools gnome python shebangfix +USES= gettext-tools gnome python shebangfix sudo USE_GITHUB= yes GH_ACCOUNT= GhostBSD USE_GNOME= pygobject3 intltool diff --git a/net-mgmt/nfs-exporter/Makefile b/net-mgmt/nfs-exporter/Makefile index 7cf6cd32e7c3..f1ce080604e3 100644 --- a/net-mgmt/nfs-exporter/Makefile +++ b/net-mgmt/nfs-exporter/Makefile @@ -1,5 +1,6 @@ PORTNAME= nfs-exporter DISTVERSION= 0.4.5 +PORTREVISION= 1 CATEGORIES= net-mgmt MASTER_SITES= CRATESIO MASTER_SITE_SUBDIR= freebsd-${PORTNAME}/${DISTVERSION} diff --git a/net-mgmt/nsd_exporter/Makefile b/net-mgmt/nsd_exporter/Makefile index 93134db9d1ed..4031dacf4d1e 100644 --- a/net-mgmt/nsd_exporter/Makefile +++ b/net-mgmt/nsd_exporter/Makefile @@ -1,7 +1,7 @@ PORTNAME= nsd_exporter PORTVERSION= 0.3.1 DISTVERSIONPREFIX= v -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= net-mgmt MAINTAINER= zi@FreeBSD.org diff --git a/net-mgmt/nvidia_gpu_prometheus_exporter/Makefile b/net-mgmt/nvidia_gpu_prometheus_exporter/Makefile index 8e7ebc4ae80a..ba9a028e058b 100644 --- a/net-mgmt/nvidia_gpu_prometheus_exporter/Makefile +++ b/net-mgmt/nvidia_gpu_prometheus_exporter/Makefile @@ -1,6 +1,6 @@ PORTNAME= nvidia_gpu_prometheus_exporter DISTVERSION= g20181028 -PORTREVISION= 32 +PORTREVISION= 33 CATEGORIES= net-mgmt MAINTAINER= 0mp@FreeBSD.org diff --git a/net-mgmt/observium/Makefile b/net-mgmt/observium/Makefile index 0bcaa1e54fdf..579c714d6a1a 100644 --- a/net-mgmt/observium/Makefile +++ b/net-mgmt/observium/Makefile @@ -20,10 +20,9 @@ RUN_DEPENDS= rrdtool:databases/rrdtool \ mtr:net/mtr@nox11 \ ${LOCALBASE}/share/pear/Net/IPv4.php:net/pear-Net_IPv4@${PHP_FLAVOR} \ ${LOCALBASE}/share/pear/Net/IPv6.php:net/pear-Net_IPv6@${PHP_FLAVOR} \ - snmpget:net-mgmt/net-snmp \ - sudo:security/sudo + snmpget:net-mgmt/net-snmp -USES= cpe php:cli,flavors python shebangfix +USES= cpe php:cli,flavors python shebangfix sudo USE_PHP= ctype filter gd iconv mysqli posix session snmp tokenizer xml zlib IGNORE_WITH_PHP= 81 SHEBANG_FILES= \ diff --git a/net-mgmt/php-fpm_exporter/Makefile b/net-mgmt/php-fpm_exporter/Makefile index 136e063dbfd7..40833f0b021c 100644 --- a/net-mgmt/php-fpm_exporter/Makefile +++ b/net-mgmt/php-fpm_exporter/Makefile @@ -1,7 +1,7 @@ PORTNAME= php-fpm_exporter DISTVERSIONPREFIX=v DISTVERSION= 2.2.0 -PORTREVISION= 29 +PORTREVISION= 30 CATEGORIES= net-mgmt MAINTAINER= freebsd.org@neant.ro diff --git a/net-mgmt/phpfpm_exporter/Makefile b/net-mgmt/phpfpm_exporter/Makefile index 5fae166f15ca..8411bae1edf6 100644 --- a/net-mgmt/phpfpm_exporter/Makefile +++ b/net-mgmt/phpfpm_exporter/Makefile @@ -1,7 +1,7 @@ PORTNAME= phpfpm_exporter DISTVERSIONPREFIX= v DISTVERSION= 0.6.1 -PORTREVISION= 21 +PORTREVISION= 22 CATEGORIES= net-mgmt MAINTAINER= gasol.wu@gmail.com diff --git a/net-mgmt/ping_exporter/Makefile b/net-mgmt/ping_exporter/Makefile index 32afc7357e53..e04ab10b6f2f 100644 --- a/net-mgmt/ping_exporter/Makefile +++ b/net-mgmt/ping_exporter/Makefile @@ -1,6 +1,6 @@ PORTNAME= ping_exporter DISTVERSION= 1.1.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-mgmt MAINTAINER= ivy@FreeBSD.org diff --git a/net-mgmt/prometheus-bird-exporter/Makefile b/net-mgmt/prometheus-bird-exporter/Makefile index fa6c2e9e8260..5c6ed897fa61 100644 --- a/net-mgmt/prometheus-bird-exporter/Makefile +++ b/net-mgmt/prometheus-bird-exporter/Makefile @@ -1,6 +1,6 @@ PORTNAME= prometheus-bird-exporter DISTVERSION= 1.4.3 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net-mgmt MAINTAINER= ivy@FreeBSD.org diff --git a/net-mgmt/prometheus-collectd-exporter/Makefile b/net-mgmt/prometheus-collectd-exporter/Makefile index 1df3df06fd49..f945fdabd9fc 100644 --- a/net-mgmt/prometheus-collectd-exporter/Makefile +++ b/net-mgmt/prometheus-collectd-exporter/Makefile @@ -1,7 +1,7 @@ PORTNAME= prometheus-collectd-exporter PORTVERSION= 0.5.0 DISTVERSIONPREFIX= v -PORTREVISION= 32 +PORTREVISION= 33 CATEGORIES= net-mgmt MAINTAINER= dsp@php.net diff --git a/net-mgmt/prometheus1/Makefile b/net-mgmt/prometheus1/Makefile index 341f220e7b04..f0dcc2f5d487 100644 --- a/net-mgmt/prometheus1/Makefile +++ b/net-mgmt/prometheus1/Makefile @@ -1,7 +1,7 @@ PORTNAME= prometheus PORTVERSION= 1.8.2 DISTVERSIONPREFIX= v -PORTREVISION= 35 +PORTREVISION= 36 CATEGORIES= net-mgmt PKGNAMESUFFIX= 1 diff --git a/net-mgmt/prometheus3/Makefile b/net-mgmt/prometheus3/Makefile index 4a1d88878190..74edb0d98017 100644 --- a/net-mgmt/prometheus3/Makefile +++ b/net-mgmt/prometheus3/Makefile @@ -1,6 +1,7 @@ PORTNAME= prometheus DISTVERSIONPREFIX= v DISTVERSION= 3.7.3 +PORTREVISION= 1 CATEGORIES= net-mgmt MASTER_SITES= https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod \ https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/${DISTVERSIONFULL}/:ui diff --git a/net-mgmt/promscale/Makefile b/net-mgmt/promscale/Makefile index 39c09bafba5b..7f3d3320cace 100644 --- a/net-mgmt/promscale/Makefile +++ b/net-mgmt/promscale/Makefile @@ -1,6 +1,6 @@ PORTNAME= promscale DISTVERSION= 0.17.0 -PORTREVISION= 23 +PORTREVISION= 24 CATEGORIES= net-mgmt MASTER_SITES= https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod DISTFILES= go.mod:gomod diff --git a/net-mgmt/promxy/Makefile b/net-mgmt/promxy/Makefile index 8cf352c8f496..72b73819860c 100644 --- a/net-mgmt/promxy/Makefile +++ b/net-mgmt/promxy/Makefile @@ -1,7 +1,7 @@ PORTNAME= promxy DISTVERSIONPREFIX= v DISTVERSION= 0.0.93 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net-mgmt MAINTAINER= timp87@gmail.com diff --git a/net-mgmt/pushgateway/Makefile b/net-mgmt/pushgateway/Makefile index 38519e2778b7..c9b5b0386e82 100644 --- a/net-mgmt/pushgateway/Makefile +++ b/net-mgmt/pushgateway/Makefile @@ -1,6 +1,7 @@ PORTNAME= pushgateway DISTVERSIONPREFIX= v DISTVERSION= 1.11.2 +PORTREVISION= 1 CATEGORIES= net-mgmt MAINTAINER= dutra@FreeBSD.org diff --git a/net-mgmt/rs-aggregate/Makefile b/net-mgmt/rs-aggregate/Makefile index 14d60266565c..55122c64e775 100644 --- a/net-mgmt/rs-aggregate/Makefile +++ b/net-mgmt/rs-aggregate/Makefile @@ -1,7 +1,7 @@ PORTNAME= rs-aggregate DISTVERSIONPREFIX= v DISTVERSION= 0.3.2 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= net-mgmt MAINTAINER= marcel@herrbischoff.com diff --git a/net-mgmt/rubygem-oxidized-web/Makefile b/net-mgmt/rubygem-oxidized-web/Makefile index 8c75acd1f77f..fe15da9fb47a 100644 --- a/net-mgmt/rubygem-oxidized-web/Makefile +++ b/net-mgmt/rubygem-oxidized-web/Makefile @@ -1,5 +1,6 @@ PORTNAME= oxidized-web PORTVERSION= 0.17.1 +PORTREVISION= 1 CATEGORIES= net-mgmt rubygems MASTER_SITES= RG diff --git a/net-mgmt/rubygem-oxidized-web/files/patch-oxidized-web.gemspec b/net-mgmt/rubygem-oxidized-web/files/patch-oxidized-web.gemspec new file mode 100644 index 000000000000..99801ec8c334 --- /dev/null +++ b/net-mgmt/rubygem-oxidized-web/files/patch-oxidized-web.gemspec @@ -0,0 +1,20 @@ +--- oxidized-web.gemspec.orig 2025-11-11 21:42:23.300288000 +0000 ++++ oxidized-web.gemspec 2025-11-11 21:46:40.770850000 +0000 +@@ -23,13 +23,13 @@ + + s.add_runtime_dependency(%q<charlock_holmes>.freeze, [">= 0.7.5".freeze, "< 0.8.0".freeze]) + s.add_runtime_dependency(%q<emk-sinatra-url-for>.freeze, ["~> 0.2".freeze]) +- s.add_runtime_dependency(%q<haml>.freeze, [">= 6.0.0".freeze, "< 6.4.0".freeze]) ++ s.add_runtime_dependency(%q<haml>.freeze, [">= 7.0.1".freeze, "~> 7.0".freeze]) + s.add_runtime_dependency(%q<htmlentities>.freeze, [">= 4.3.0".freeze, "< 4.4.0".freeze]) +- s.add_runtime_dependency(%q<json>.freeze, [">= 2.3.0".freeze, "< 2.14.0".freeze]) ++ s.add_runtime_dependency(%q<json>.freeze, [">= 2.3.0".freeze, "~> 2.3".freeze]) + s.add_runtime_dependency(%q<oxidized>.freeze, ["~> 0.34.1".freeze]) + s.add_runtime_dependency(%q<puma>.freeze, ["~> 6.6.0".freeze]) +- s.add_runtime_dependency(%q<sinatra>.freeze, ["~> 4.1.1".freeze]) +- s.add_runtime_dependency(%q<sinatra-contrib>.freeze, ["~> 4.1.1".freeze]) ++ s.add_runtime_dependency(%q<sinatra>.freeze, ["~> 4.1".freeze]) ++ s.add_runtime_dependency(%q<sinatra-contrib>.freeze, ["~> 4.1".freeze]) + s.add_development_dependency(%q<bundler>.freeze, ["~> 2.2".freeze]) + s.add_development_dependency(%q<minitest>.freeze, ["~> 5.18".freeze]) + s.add_development_dependency(%q<mocha>.freeze, ["~> 2.1".freeze]) diff --git a/net-mgmt/semaphore/Makefile b/net-mgmt/semaphore/Makefile index 04d1a5daf446..c5a150f6c311 100644 --- a/net-mgmt/semaphore/Makefile +++ b/net-mgmt/semaphore/Makefile @@ -1,7 +1,7 @@ PORTNAME= semaphore PORTVERSION= 2.9.2 DISTVERSIONPREFIX= v -PORTREVISION= 18 +PORTREVISION= 19 CATEGORIES= net-mgmt MAINTAINER= egypcio@FreeBSD.org diff --git a/net-mgmt/simplomon/Makefile b/net-mgmt/simplomon/Makefile new file mode 100644 index 000000000000..63c670ac3c1a --- /dev/null +++ b/net-mgmt/simplomon/Makefile @@ -0,0 +1,60 @@ +PORTNAME= simplomon +DISTVERSION= g20250224 +CATEGORIES= net-mgmt dns net +MAINTAINER= dch@FreeBSD.org +COMMENT= Simple network status and uptime monitoring tool +WWW= https://github.com/berthubert/simplomon + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE + +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} \ + nlohmann-json>0:devel/nlohmann-json \ + xxd>0:sysutils/xxd + +LIB_DEPENDS= libcurl.so:ftp/curl \ + libfmt.so:devel/libfmt \ + libnghttp2.so:www/libnghttp2 +USES= cmake:indirect compiler:c++17-lang llvm:18,build lua:53,build \ + meson ninja pkgconfig python:build sqlite ssl + +USE_GITHUB= yes +GH_ACCOUNT= berthubert +GH_TAGNAME= b4fea5b # https://github.com/berthubert/simplomon/pull/58 +GH_TUPLE= berthubert:sqlitewrite:a2c2ee:sqlitewrite \ + ahuPowerDNS:simplesocket:3af5e1d:simplesocket \ + yhirose:cpp-httplib:v0.13.1:httplib + +USE_RC_SUBR= simplomon + +MESON_ARGS+= --default-library=static \ + --prefer-static \ + --strip \ + --wrap-mode=nodownload + +SUB_FILES= pkg-message simplomon +SUB_LIST= ETCDIR=${ETCDIR} + +PLIST_FILES= bin/simplomon +PORTDOCS= README.md + +OPTIONS_DEFINE= DOCS + +post-extract: + ${RLN} ${WRKDIR}/sqlitewrite-* ${WRKSRC}/subprojects/sqlitewriter + ${RLN} ${WRKDIR}/simplesocket-* ${WRKSRC}/subprojects/simplesockets + ${RLN} ${WRKDIR}/cpp-httplib-* ${WRKSRC}/subprojects/ + +post-build: + ${RM} -rf ${WRKDIR}/_build/meson-private ${WRKSRC}/subprojects + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/_build/simplomon \ + ${STAGEDIR}${PREFIX}/bin + +post-install-DOCS-on: + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} \ + ${STAGEDIR}${DOCSDIR} + +.include <bsd.port.mk> diff --git a/net-mgmt/simplomon/distinfo b/net-mgmt/simplomon/distinfo new file mode 100644 index 000000000000..f13d8452e4fe --- /dev/null +++ b/net-mgmt/simplomon/distinfo @@ -0,0 +1,9 @@ +TIMESTAMP = 1741342561 +SHA256 (berthubert-simplomon-g20250224-b4fea5b_GH0.tar.gz) = 834aa0f83167feb1b9eeb36602bb933cb71884dcf558fea8e69cce73a2556c4f +SIZE (berthubert-simplomon-g20250224-b4fea5b_GH0.tar.gz) = 260634 +SHA256 (berthubert-sqlitewrite-a2c2ee_GH0.tar.gz) = 5a0d40c1e1e28a673fbc9b2f311bc97a629470a8388c0aa297720a7a83d4d8d8 +SIZE (berthubert-sqlitewrite-a2c2ee_GH0.tar.gz) = 78179 +SHA256 (ahuPowerDNS-simplesocket-3af5e1d_GH0.tar.gz) = 5a5ee9856f0ec44ddbb956c6f35408f2f90e37c2fc66269603aae7b190051c76 +SIZE (ahuPowerDNS-simplesocket-3af5e1d_GH0.tar.gz) = 84280 +SHA256 (yhirose-cpp-httplib-v0.13.1_GH0.tar.gz) = 9b837d290b61e3f0c4239da0b23bbf14c382922e2bf2a9bac21c1e3feabe1ff9 +SIZE (yhirose-cpp-httplib-v0.13.1_GH0.tar.gz) = 644015 diff --git a/net-mgmt/simplomon/files/patch-mailmon.cc b/net-mgmt/simplomon/files/patch-mailmon.cc new file mode 100644 index 000000000000..dded82335e7c --- /dev/null +++ b/net-mgmt/simplomon/files/patch-mailmon.cc @@ -0,0 +1,12 @@ +--- mailmon.cc.orig 2025-11-03 17:55:52 UTC ++++ mailmon.cc +@@ -246,7 +246,8 @@ CheckResult SMTPChecker::perform() + msg+=fmt::format("Message-Id: <{}@simplomon.hostname>\r\n", time(nullptr)); + + //Date: Thu, 28 Dec 2023 14:31:37 +0100 (CET) +- msg += fmt::format("Date: {:%a, %d %b %Y %H:%M:%S %z (%Z)}\r\n", fmt::localtime(time(0))); ++ time_t now = time(0); ++ msg += fmt::format("Date: {:%a, %d %b %Y %H:%M:%S %z (%Z)}\r\n", *std::localtime(&now)); + msg+="\r\n"; + + msg+=to_string(time(nullptr))+"\r\n"; diff --git a/net-mgmt/simplomon/files/patch-meson.build b/net-mgmt/simplomon/files/patch-meson.build new file mode 100644 index 000000000000..7ee99bcf1842 --- /dev/null +++ b/net-mgmt/simplomon/files/patch-meson.build @@ -0,0 +1,22 @@ +--- meson.build.orig 2025-02-19 22:01:58 UTC ++++ meson.build +@@ -66,7 +66,6 @@ sqlitewriter_dep = dependency('sqlitewriter', static: + + cpphttplib = dependency('cpp-httplib') + sqlitewriter_dep = dependency('sqlitewriter', static: true) +-doctest_dep=dependency('doctest') + simplesockets_dep = dependency('simplesockets', static: true) + # argparse_dep = dependency('argparse', version: '>=3') + +@@ -104,11 +103,3 @@ webpages, + webpages, + dependencies: [json_dep, fmt_dep, cpphttplib, + simplesockets_dep, lua_dep, curl_dep, sqlite_dep, sqlitewriter_dep]) +- +-executable('testrunner', 'testrunner.cc', 'notifiers.cc', 'minicurl.cc', 'dnsmon.cc', 'record-types.cc', 'dnsmessages.cc', 'dns-storage.cc', 'netmon.cc', 'luabridge.cc', 'webservice.cc', 'support.cc', 'promon.cc', 'mailmon.cc', 'nonblocker.cc', +- dependencies: [doctest_dep, curl_dep, json_dep, fmt_dep, cpphttplib, sqlite_dep, +- simplesockets_dep, lua_dep, sqlitewriter_dep]) +- +- +- +- diff --git a/net-mgmt/simplomon/files/patch-notifiers.cc b/net-mgmt/simplomon/files/patch-notifiers.cc new file mode 100644 index 000000000000..d3d6159fabd7 --- /dev/null +++ b/net-mgmt/simplomon/files/patch-notifiers.cc @@ -0,0 +1,17 @@ +--- notifiers.cc.orig 2025-11-01 23:43:58 UTC ++++ notifiers.cc +@@ -117,7 +117,8 @@ static void sendAsciiEmailAsync(const std::string& ser + sc.writen(fmt::format("Message-Id: <{}@simplomon.hostname>\r\n", getRandom64())); + + //Date: Thu, 28 Dec 2023 14:31:37 +0100 (CET) +- sc.writen(fmt::format("Date: {:%a, %d %b %Y %H:%M:%S %z (%Z)}\r\n", fmt::localtime(time(0)))); ++ time_t now = time(0); ++ sc.writen(fmt::format("Date: {:%a, %d %b %Y %H:%M:%S %z (%Z)}\r\n", *std::localtime(&now))); + sc.writen("\r\n"); + + string withCrlf; +@@ -267,4 +268,3 @@ void TelegramNotifier::alert(const std::string& messag + + // fmt::print("{}\n", res->body); + } +- diff --git a/net-mgmt/simplomon/files/pkg-message.in b/net-mgmt/simplomon/files/pkg-message.in new file mode 100644 index 000000000000..ba32dd61bf5e --- /dev/null +++ b/net-mgmt/simplomon/files/pkg-message.in @@ -0,0 +1,16 @@ +[ +{ type: install + message: <<EOM +Note this is a port of alpha-grade software. In local testing it has shown +to be solid already, but not all functionality works as expected on +FreeBSD yet, or may not work correctly at all. The port comes with an rc +daemon, expecting a config file in %%ETCDIR%%/simplomon.conf . +See the README.md for detailed configuration and setup. + +Please report any issues on the upstream PR: + + https://github.com/berthubert/simplomon/pull/58 + +EOM +} +] diff --git a/net-mgmt/simplomon/files/simplomon.in b/net-mgmt/simplomon/files/simplomon.in new file mode 100644 index 000000000000..e216c9f4af54 --- /dev/null +++ b/net-mgmt/simplomon/files/simplomon.in @@ -0,0 +1,54 @@ +#!/bin/sh +# +# PROVIDE: simplomon +# REQUIRE: NETWORKING SERVERS +# KEYWORD: shutdown +# +# Add the following lines to /etc/rc.conf.local or /etc/rc.conf +# to enable this service: +# +# simplomon_enable (bool): Set to NO by default. +# Set it to YES to enable simplomon. +# simplomon_acct (user): Set user to run simplomon as. +# Default is "www". +# simplomon_config (path): Set to /usr/local/etc/simplomon.conf +# by default. +# + +. /etc/rc.subr + +name=simplomon +rcvar=simplomon_enable + +load_rc_config $name + +: ${simplomon_enable:="NO"} +: ${simplomon_acct:="www"} +: ${simplomon_config:="%%PREFIX%%/etc/simplomon.conf"} + +pidfile="/var/run/${name}.pid" +daemon_pidfile="/var/run/${name}-daemon.pid" +required_files="${simplomon_config}" +procname="%%PREFIX%%/bin/simplomon" + +command="/usr/sbin/daemon" +command_args="-c -r -R 15 -f -t ${name} -T ${name} \ + -p ${pidfile} \ + -P ${daemon_pidfile} \ + -u ${simplomon_acct} \ + ${procname} ${simplomon_config}" + +start_precmd=simplomon_precmd + +simplomon_precmd() +{ + if [ ! -e ${pidfile} ]; then + install -o ${simplomon_acct} -g wheel -m 644 /dev/null ${pidfile} + fi + + if [ ! -e ${daemon_pidfile} ]; then + install -o ${simplomon_acct} -g wheel -m 644 /dev/null ${daemon_pidfile} + fi +} + +run_rc_command "$1" diff --git a/net-mgmt/simplomon/pkg-descr b/net-mgmt/simplomon/pkg-descr new file mode 100644 index 000000000000..6c24d72f4141 --- /dev/null +++ b/net-mgmt/simplomon/pkg-descr @@ -0,0 +1,6 @@ +Simplomon is a lightweight and easy-to-setup availability monitoring +system. It offers advanced features such as certificate expiry checking, +IPv6 autoconfiguration, DNS synchronization, DNSSEC signature freshness +checks, HTTP redirect checking, providing a web page, JSON status, and a +Prometheus node exporter. It is suitable for quickly setting up monitoring +without the need for complex configuration or maintenance. diff --git a/net-mgmt/telegraf/Makefile b/net-mgmt/telegraf/Makefile index 5edded404a7a..b6877a4831e6 100644 --- a/net-mgmt/telegraf/Makefile +++ b/net-mgmt/telegraf/Makefile @@ -1,6 +1,6 @@ PORTNAME= telegraf DISTVERSIONPREFIX=v -DISTVERSION= 1.36.3 +DISTVERSION= 1.36.4 CATEGORIES= net-mgmt MAINTAINER= girgen@FreeBSD.org diff --git a/net-mgmt/telegraf/distinfo b/net-mgmt/telegraf/distinfo index 6c9ceb857a2b..37f60f605bbe 100644 --- a/net-mgmt/telegraf/distinfo +++ b/net-mgmt/telegraf/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1761054043 -SHA256 (go/net-mgmt_telegraf/telegraf-v1.36.3/v1.36.3.mod) = 94e6e60b7e6b5f97f51d00e91b8322edba08ce4fbca6915d4455b2c9a556fcdf -SIZE (go/net-mgmt_telegraf/telegraf-v1.36.3/v1.36.3.mod) = 29453 -SHA256 (go/net-mgmt_telegraf/telegraf-v1.36.3/v1.36.3.zip) = 2495c9af2b4e683b3daa236797852f9188ea5dc15ca64d75a0dbac75c906174c -SIZE (go/net-mgmt_telegraf/telegraf-v1.36.3/v1.36.3.zip) = 12054733 +TIMESTAMP = 1763469227 +SHA256 (go/net-mgmt_telegraf/telegraf-v1.36.4/v1.36.4.mod) = b732523af670b1432736a5f109c7ae5553f26c4bb069c706267b3854da41f801 +SIZE (go/net-mgmt_telegraf/telegraf-v1.36.4/v1.36.4.mod) = 29552 +SHA256 (go/net-mgmt_telegraf/telegraf-v1.36.4/v1.36.4.zip) = a22d4d92704d4c3c821e0319a73f254de092f2a03e39cb63f7ad68689aa14bc4 +SIZE (go/net-mgmt_telegraf/telegraf-v1.36.4/v1.36.4.zip) = 7735017 diff --git a/net-mgmt/thanos/Makefile b/net-mgmt/thanos/Makefile index 025d4ec91842..b8fd8483a745 100644 --- a/net-mgmt/thanos/Makefile +++ b/net-mgmt/thanos/Makefile @@ -1,6 +1,7 @@ PORTNAME= thanos DISTVERSIONPREFIX= v DISTVERSION= 0.40.1 +PORTREVISION= 1 CATEGORIES= net-mgmt MAINTAINER= alven@FreeBSD.org diff --git a/net-mgmt/unbound_exporter/Makefile b/net-mgmt/unbound_exporter/Makefile index 7e642248bd11..154e19b2f066 100644 --- a/net-mgmt/unbound_exporter/Makefile +++ b/net-mgmt/unbound_exporter/Makefile @@ -1,7 +1,7 @@ PORTNAME= unbound_exporter PORTVERSION= 0.4.6 DISTVERSIONPREFIX= v -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= net-mgmt MAINTAINER= aduitsis@cpan.org diff --git a/net-mgmt/victoria-logs/Makefile b/net-mgmt/victoria-logs/Makefile index fa989919a596..4127af2c05ef 100644 --- a/net-mgmt/victoria-logs/Makefile +++ b/net-mgmt/victoria-logs/Makefile @@ -1,6 +1,7 @@ PORTNAME= victoria-logs -PORTVERSION= 1.37.2 +PORTVERSION= 1.38.0 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= net-mgmt MAINTAINER= samm@FreeBSD.org diff --git a/net-mgmt/victoria-logs/distinfo b/net-mgmt/victoria-logs/distinfo index c230d281a047..1468ff430d0f 100644 --- a/net-mgmt/victoria-logs/distinfo +++ b/net-mgmt/victoria-logs/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1762114863 -SHA256 (go/net-mgmt_victoria-logs/victoria-logs-v1.37.2/v1.37.2.mod) = 35197fe1574bcdd0d6c2edbd3669add56fc91925706341c26874ed4faa163205 -SIZE (go/net-mgmt_victoria-logs/victoria-logs-v1.37.2/v1.37.2.mod) = 958 -SHA256 (go/net-mgmt_victoria-logs/victoria-logs-v1.37.2/v1.37.2.zip) = ea9b88298f731831439d1c8934da3d8fa2c8f4c02202b3bd21bfb0e3aa14cd7d -SIZE (go/net-mgmt_victoria-logs/victoria-logs-v1.37.2/v1.37.2.zip) = 3042606 +TIMESTAMP = 1763336232 +SHA256 (go/net-mgmt_victoria-logs/victoria-logs-v1.38.0/v1.38.0.mod) = 75bb3d35d6a81b687fddfb7e571fc939d754ae9b7881fee57b785ff20115a932 +SIZE (go/net-mgmt_victoria-logs/victoria-logs-v1.38.0/v1.38.0.mod) = 958 +SHA256 (go/net-mgmt_victoria-logs/victoria-logs-v1.38.0/v1.38.0.zip) = 18f886e472c8e6a4a460476c9fe7b597fca10fefe491d88088d4258cdc732f8c +SIZE (go/net-mgmt_victoria-logs/victoria-logs-v1.38.0/v1.38.0.zip) = 3841839 diff --git a/net-mgmt/victoria-logs/pkg-plist b/net-mgmt/victoria-logs/pkg-plist index 8b755d335b10..0c1767bbaf71 100644 --- a/net-mgmt/victoria-logs/pkg-plist +++ b/net-mgmt/victoria-logs/pkg-plist @@ -40,4 +40,11 @@ bin/vlogscli %%PORTDOCS%%%%DOCSDIR%%/metrics.md %%PORTDOCS%%%%DOCSDIR%%/vlagent-metrics.md %%PORTDOCS%%%%DOCSDIR%%/logsql.md +%%PORTDOCS%%%%DOCSDIR%%/integrations/_index.md +%%PORTDOCS%%%%DOCSDIR%%/integrations/perses-datasource.webp +%%PORTDOCS%%%%DOCSDIR%%/integrations/perses-logs-panel.webp +%%PORTDOCS%%%%DOCSDIR%%/integrations/perses-overview.webp +%%PORTDOCS%%%%DOCSDIR%%/integrations/perses-time-panel.webp +%%PORTDOCS%%%%DOCSDIR%%/integrations/perses-variable.webp +%%PORTDOCS%%%%DOCSDIR%%/integrations/perses.md @dir(%%VICTORIA_USER%%,%%VICTORIA_GROUP%%,750) %%VICTORIA_DATA%% diff --git a/net-mgmt/victoria-metrics/Makefile b/net-mgmt/victoria-metrics/Makefile index 9f861be6c742..b9b05c0fc40b 100644 --- a/net-mgmt/victoria-metrics/Makefile +++ b/net-mgmt/victoria-metrics/Makefile @@ -1,7 +1,7 @@ PORTNAME?= victoria-metrics -PORTVERSION= 1.126.0 # don't forget to update BUILDINFO_TAG +PORTVERSION= 1.130.0 # don't forget to update BUILDINFO_TAG DISTVERSIONPREFIX= v -PORTREVISION?= 2 +PORTREVISION?= 0 CATEGORIES= net-mgmt MAINTAINER= danfe@FreeBSD.org @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= gmake go:1.25,no_targets USE_RC_SUBR?= ${PORTNAME} MAKE_ENV= PKG_TAG=v${PORTVERSION} GOOS=${OPSYS:tl} \ - BUILDINFO_TAG=tags-v${PORTVERSION}-0-gaa42963 \ + BUILDINFO_TAG=tags-v${PORTVERSION}-0-g04c24fc \ DATEINFO_TAG=${_GET_DATE:sh} ALL_TARGET= ${PORTNAME}-pure diff --git a/net-mgmt/victoria-metrics/distinfo b/net-mgmt/victoria-metrics/distinfo index 358825537494..fb2acc31e21f 100644 --- a/net-mgmt/victoria-metrics/distinfo +++ b/net-mgmt/victoria-metrics/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1757681862 -SHA256 (VictoriaMetrics-VictoriaMetrics-v1.126.0_GH0.tar.gz) = 460871ab460183220624df41b4400419e3635615803374c6a8f5844d159e0988 -SIZE (VictoriaMetrics-VictoriaMetrics-v1.126.0_GH0.tar.gz) = 41162635 +TIMESTAMP = 1763383757 +SHA256 (VictoriaMetrics-VictoriaMetrics-v1.130.0_GH0.tar.gz) = bc83f1aab0c9cdec047919a6a4a1a8d7afb3f73d1153bfc24bb45065ec424c51 +SIZE (VictoriaMetrics-VictoriaMetrics-v1.130.0_GH0.tar.gz) = 42640160 diff --git a/net-mgmt/victoria-metrics/pkg-plist b/net-mgmt/victoria-metrics/pkg-plist index 15ac487e5f52..f18a9443c34c 100644 --- a/net-mgmt/victoria-metrics/pkg-plist +++ b/net-mgmt/victoria-metrics/pkg-plist @@ -1,11 +1,13 @@ bin/victoria-metrics %%PORTDOCS%%%%DOCSDIR%%/anomaly-detection/CHANGELOG.md %%PORTDOCS%%%%DOCSDIR%%/anomaly-detection/FAQ.md +%%PORTDOCS%%%%DOCSDIR%%/anomaly-detection/Migration.md %%PORTDOCS%%%%DOCSDIR%%/anomaly-detection/Presets.md %%PORTDOCS%%%%DOCSDIR%%/anomaly-detection/QuickStart.md %%PORTDOCS%%%%DOCSDIR%%/anomaly-detection/README.md %%PORTDOCS%%%%DOCSDIR%%/anomaly-detection/Scaling vmanomaly.md %%PORTDOCS%%%%DOCSDIR%%/anomaly-detection/Self-monitoring.md +%%PORTDOCS%%%%DOCSDIR%%/anomaly-detection/UI.md %%PORTDOCS%%%%DOCSDIR%%/anomaly-detection/_index.md %%PORTDOCS%%%%DOCSDIR%%/anomaly-detection/components/README.md %%PORTDOCS%%%%DOCSDIR%%/anomaly-detection/components/_index.md @@ -43,7 +45,6 @@ bin/victoria-metrics %%PORTDOCS%%%%DOCSDIR%%/anomaly-detection/guides/guide-vmanomaly-vmalert/guide-vmanomaly-vmalert_docker-compose.webp %%PORTDOCS%%%%DOCSDIR%%/anomaly-detection/guides/guide-vmanomaly-vmalert/guide-vmanomaly-vmalert_files.webp %%PORTDOCS%%%%DOCSDIR%%/anomaly-detection/guides/guide-vmanomaly-vmalert/guide-vmanomaly-vmalert_overview.webp -%%PORTDOCS%%%%DOCSDIR%%/anomaly-detection/presets-localhost.webp %%PORTDOCS%%%%DOCSDIR%%/anomaly-detection/presets_anomalies_by_node.webp %%PORTDOCS%%%%DOCSDIR%%/anomaly-detection/presets_anomalous_node_selection.webp %%PORTDOCS%%%%DOCSDIR%%/anomaly-detection/presets_cpu_seconds_softirq.webp @@ -67,6 +68,18 @@ bin/victoria-metrics %%PORTDOCS%%%%DOCSDIR%%/anomaly-detection/vmanomaly-holtwinters-example.webp %%PORTDOCS%%%%DOCSDIR%%/anomaly-detection/vmanomaly-prophet-example.webp %%PORTDOCS%%%%DOCSDIR%%/anomaly-detection/vmanomaly-sharding-ha-diagram.webp +%%PORTDOCS%%%%DOCSDIR%%/anomaly-detection/vmanomaly-ui-model-config-menu-yaml-tab.webp +%%PORTDOCS%%%%DOCSDIR%%/anomaly-detection/vmanomaly-ui-model-config-menu.webp +%%PORTDOCS%%%%DOCSDIR%%/anomaly-detection/vmanomaly-ui-model-config-wizard.webp +%%PORTDOCS%%%%DOCSDIR%%/anomaly-detection/vmanomaly-ui-open-config-btn.webp +%%PORTDOCS%%%%DOCSDIR%%/anomaly-detection/vmanomaly-ui-open-config-menu.webp +%%PORTDOCS%%%%DOCSDIR%%/anomaly-detection/vmanomaly-ui-overview.webp +%%PORTDOCS%%%%DOCSDIR%%/anomaly-detection/vmanomaly-ui-sections-explore.webp +%%PORTDOCS%%%%DOCSDIR%%/anomaly-detection/vmanomaly-ui-sections-model.webp +%%PORTDOCS%%%%DOCSDIR%%/anomaly-detection/vmanomaly-ui-sections-plot-area-detect-mode.webp +%%PORTDOCS%%%%DOCSDIR%%/anomaly-detection/vmanomaly-ui-sections-plot-area-query-mode.webp +%%PORTDOCS%%%%DOCSDIR%%/anomaly-detection/vmanomaly-ui-sections-settings.webp +%%PORTDOCS%%%%DOCSDIR%%/anomaly-detection/vmanomaly-ui-state-sharing-url.webp %%PORTDOCS%%%%DOCSDIR%%/guides/_index.md %%PORTDOCS%%%%DOCSDIR%%/guides/collecting-openshift-logs-with-victoria-logs/README.md %%PORTDOCS%%%%DOCSDIR%%/guides/collecting-openshift-logs-with-victoria-logs/_index.md @@ -142,6 +155,11 @@ bin/victoria-metrics %%PORTDOCS%%%%DOCSDIR%%/guides/k8s-monitoring-via-vm-single/grafana-k8s-dashboard.webp %%PORTDOCS%%%%DOCSDIR%%/guides/k8s-monitoring-via-vm-single/grafana.webp %%PORTDOCS%%%%DOCSDIR%%/guides/k8s-monitoring-via-vm-single/k8s-scheme.webp +%%PORTDOCS%%%%DOCSDIR%%/guides/k8s-ui-headlamp/README.md +%%PORTDOCS%%%%DOCSDIR%%/guides/k8s-ui-headlamp/_index.md +%%PORTDOCS%%%%DOCSDIR%%/guides/k8s-ui-headlamp/cluster-metrics.webp +%%PORTDOCS%%%%DOCSDIR%%/guides/k8s-ui-headlamp/vmcluster-plugin-settings.webp +%%PORTDOCS%%%%DOCSDIR%%/guides/k8s-ui-headlamp/vmsingle-plugin-settings.webp %%PORTDOCS%%%%DOCSDIR%%/guides/migrate-from-influx/README.md %%PORTDOCS%%%%DOCSDIR%%/guides/migrate-from-influx/_index.md %%PORTDOCS%%%%DOCSDIR%%/guides/migrate-from-influx/data-sample-in-influx.webp @@ -152,6 +170,15 @@ bin/victoria-metrics %%PORTDOCS%%%%DOCSDIR%%/guides/multi-regional-setup-dedicated-regions/setup.webp %%PORTDOCS%%%%DOCSDIR%%/guides/understand-your-setup-size/README.md %%PORTDOCS%%%%DOCSDIR%%/guides/understand-your-setup-size/_index.md +%%PORTDOCS%%%%DOCSDIR%%/guides/vm-architectures/README.md +%%PORTDOCS%%%%DOCSDIR%%/guides/vm-architectures/_index.md +%%PORTDOCS%%%%DOCSDIR%%/guides/vm-architectures/arch-schemas.excalidraw +%%PORTDOCS%%%%DOCSDIR%%/guides/vm-architectures/basic-architecture.webp +%%PORTDOCS%%%%DOCSDIR%%/guides/vm-architectures/decision-tree.webp +%%PORTDOCS%%%%DOCSDIR%%/guides/vm-architectures/hyperscale-architecture.webp +%%PORTDOCS%%%%DOCSDIR%%/guides/vm-architectures/logical-layers-architecture.webp +%%PORTDOCS%%%%DOCSDIR%%/guides/vm-architectures/multi-az-architecture.webp +%%PORTDOCS%%%%DOCSDIR%%/guides/vm-architectures/single-az-architecture.webp %%PORTDOCS%%%%DOCSDIR%%/victoriametrics/Articles.md %%PORTDOCS%%%%DOCSDIR%%/victoriametrics/BestPractices.md %%PORTDOCS%%%%DOCSDIR%%/victoriametrics/CONTRIBUTING.md @@ -192,17 +219,23 @@ bin/victoria-metrics %%PORTDOCS%%%%DOCSDIR%%/victoriametrics/data-ingestion/vmagent.md %%PORTDOCS%%%%DOCSDIR%%/victoriametrics/enterprise.md %%PORTDOCS%%%%DOCSDIR%%/victoriametrics/goals.md +%%PORTDOCS%%%%DOCSDIR%%/victoriametrics/integrations/OpenShift.md %%PORTDOCS%%%%DOCSDIR%%/victoriametrics/integrations/_index.md %%PORTDOCS%%%%DOCSDIR%%/victoriametrics/integrations/datadog.md %%PORTDOCS%%%%DOCSDIR%%/victoriametrics/integrations/datadog_sending_metrics_to_VM.webp %%PORTDOCS%%%%DOCSDIR%%/victoriametrics/integrations/datadog_sending_metrics_to_VM_and_DD.webp -%%PORTDOCS%%%%DOCSDIR%%/victoriametrics/integrations/grafana-datasource-prometheus.webp -%%PORTDOCS%%%%DOCSDIR%%/victoriametrics/integrations/grafana.md +%%PORTDOCS%%%%DOCSDIR%%/victoriametrics/integrations/grafana/_index.md +%%PORTDOCS%%%%DOCSDIR%%/victoriametrics/integrations/grafana/datasource-prometheus.webp %%PORTDOCS%%%%DOCSDIR%%/victoriametrics/integrations/graphite.md %%PORTDOCS%%%%DOCSDIR%%/victoriametrics/integrations/influxdb.md %%PORTDOCS%%%%DOCSDIR%%/victoriametrics/integrations/kafka.md %%PORTDOCS%%%%DOCSDIR%%/victoriametrics/integrations/newrelic.md %%PORTDOCS%%%%DOCSDIR%%/victoriametrics/integrations/opentsdb.md +%%PORTDOCS%%%%DOCSDIR%%/victoriametrics/integrations/perses-datasource.webp +%%PORTDOCS%%%%DOCSDIR%%/victoriametrics/integrations/perses-overview.webp +%%PORTDOCS%%%%DOCSDIR%%/victoriametrics/integrations/perses-time-panel.webp +%%PORTDOCS%%%%DOCSDIR%%/victoriametrics/integrations/perses-variable.webp +%%PORTDOCS%%%%DOCSDIR%%/victoriametrics/integrations/perses.md %%PORTDOCS%%%%DOCSDIR%%/victoriametrics/integrations/prometheus.md %%PORTDOCS%%%%DOCSDIR%%/victoriametrics/integrations/pubsub.md %%PORTDOCS%%%%DOCSDIR%%/victoriametrics/keyConcepts/_index.md diff --git a/net-mgmt/vmutils/Makefile b/net-mgmt/vmutils/Makefile index aef04e3b8094..faa8e86c8244 100644 --- a/net-mgmt/vmutils/Makefile +++ b/net-mgmt/vmutils/Makefile @@ -1,5 +1,4 @@ PORTNAME= vmutils -PORTREVISION= 2 COMMENT= Ancillary utilities and agent for VictoriaMetrics diff --git a/net-mgmt/xymon-server/Makefile b/net-mgmt/xymon-server/Makefile index fd0da5d3ac0e..4b2f5cdda735 100644 --- a/net-mgmt/xymon-server/Makefile +++ b/net-mgmt/xymon-server/Makefile @@ -1,6 +1,6 @@ PORTNAME= xymon PORTVERSION= 4.3.30 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-mgmt www MASTER_SITES= SF/xymon/Xymon/${PORTVERSION} PKGNAMESUFFIX= -server${PKGNAMESUFFIX2} diff --git a/net-mgmt/xymon-server/files/patch-bbcombotest-fix b/net-mgmt/xymon-server/files/patch-bbcombotest-fix new file mode 100644 index 000000000000..a71d722b739b --- /dev/null +++ b/net-mgmt/xymon-server/files/patch-bbcombotest-fix @@ -0,0 +1,18 @@ +Description: Fix bbcombotest: "Could not access hobbitd board, error 0" +Author: Christoph Berg <myon@debian.org> +Forwarded: no +Last-Update: 2015-09-10 + +Index: xymon/xymond/combostatus.c +=================================================================== +--- xymond/combostatus.c 2012-07-23 23:39:37.000000000 +0200 ++++ xymond/combostatus.c 2012-07-23 23:41:04.000000000 +0200 +@@ -207,7 +207,7 @@ + xymondresult = sendmessage("xymondboard fields=hostname,testname,color", NULL, XYMON_TIMEOUT, sres); + board = getsendreturnstr(sres, 1); + +- if ((xymondresult != XYMONSEND_OK) || (board == NULL)) { ++ if (xymondresult != XYMONSEND_OK) { + board = ""; + *errptr += sprintf(*errptr, "Could not access xymond board, error %d\n", xymondresult); + return COL_CLEAR; diff --git a/net-mgmt/xymon-server/files/patch-fix_tls13_banner b/net-mgmt/xymon-server/files/patch-fix_tls13_banner new file mode 100644 index 000000000000..ebcffdcfdf30 --- /dev/null +++ b/net-mgmt/xymon-server/files/patch-fix_tls13_banner @@ -0,0 +1,39 @@ +From: Andreas Oberritter <obi@saftware.de> +Date: Tue, 11 May 2021 13:05:10 +0200 +Subject: Fix reading service banners from TLS-1.3-enabled hosts + +Bug-Debian: https://bugs.debian.org/930532 +Forwarded: https://lists.xymon.com/archive/2024-February/048290.html +Last-Update: 2021-05-11 + + +Related discussion: +https://lists.xymon.com/archive/2019-July/046585.html +https://lists.xymon.com/archive/2019-November/046893.html +https://lists.xymon.com/archive/2020-February/046986.html +https://lists.xymon.com/archive/2020-March/046987.html +https://sourceforge.net/p/xymon/discussion/435278/thread/c0359f08e7/ +--- + xymonnet/contest.c | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +--- xymonnet/contest.c ++++ xymonnet/contest.c +@@ -1347,13 +1347,12 @@ restartselect: + } + } + +- if ((item->svcinfo->flags & TCP_HTTP) && +- ((res > 0) || item->sslagain) && +- (!datadone) ) { ++ if (((item->svcinfo->flags & TCP_HTTP) && res > 0) || item->sslagain) { + /* +- * HTTP : Grab the entire response. ++ * Grab the entire HTTP response or wait for ++ * TLS handshake to complete. + */ +- wantmoredata = 1; ++ wantmoredata = !datadone; + } + + if (!wantmoredata) { diff --git a/net-mgmt/xymon-server/files/patch-md5_buffer_overflow b/net-mgmt/xymon-server/files/patch-md5_buffer_overflow new file mode 100644 index 000000000000..3b4d1a92ae89 --- /dev/null +++ b/net-mgmt/xymon-server/files/patch-md5_buffer_overflow @@ -0,0 +1,17 @@ +From: Roland Rosenfeld <roland@debian.org> +Date: Tue, 24 Sep 2024 21:53:18 +0200 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/xymon/+bug/2078638 +Subject: Fix buffer overflow in md5hash + This is triggered/found by -D_FORTIFY_SOURCE=3 + +--- lib/digest.c ++++ lib/digest.c +@@ -41,7 +41,7 @@ char *md5hash(char *input) + myMD5_Final(md_value, ctx->mdctx); + + for(i = 0, p = md_string; (i < sizeof(md_value)); i++) +- p += snprintf(p, (sizeof(md_string) - (md_string - p)), "%02x", md_value[i]); ++ p += snprintf(p, (sizeof(md_string) - (p - md_string)), "%02x", md_value[i]); + *p = '\0'; + + return md_string; diff --git a/net-mgmt/xymon-server/files/patch-nousemultipart b/net-mgmt/xymon-server/files/patch-nousemultipart new file mode 100644 index 000000000000..44cc7550971a --- /dev/null +++ b/net-mgmt/xymon-server/files/patch-nousemultipart @@ -0,0 +1,29 @@ +From: Roland Rosenfeld <roland@debian.org> +Date: Mon, 12 Jul 2021 13:34:10 +0200 +Forwarded: https://lists.xymon.com/archive/2024-February/048287.html +Subject: Fix Snapshort and Availability Report on Firefox + +Bug-Debian: https://bugs.debian.org/990989 + +--- web/report.c ++++ web/report.c +@@ -204,7 +204,7 @@ int main(int argc, char *argv[]) + int argi, newargi; + char *envarea = NULL; + char *useragent = NULL; +- int usemultipart = 1; ++ int usemultipart = 0; + + SBUF_MALLOC(outdir, PATH_MAX+1024); + SBUF_MALLOC(xymonwebenv, PATH_MAX+1024); +--- web/snapshot.c ++++ web/snapshot.c +@@ -145,7 +145,7 @@ int main(int argc, char *argv[]) + int argi, newargi; + char *envarea = NULL; + char *useragent; +- int usemultipart = 1; ++ int usemultipart = 0; + + SBUF_MALLOC(xymongencmd, 2048+PATH_MAX); + SBUF_MALLOC(xymonwebenv, 4096); diff --git a/net-mgmt/zabbix6-server/Makefile b/net-mgmt/zabbix6-server/Makefile index d0ce369330e3..137fbe1523e2 100644 --- a/net-mgmt/zabbix6-server/Makefile +++ b/net-mgmt/zabbix6-server/Makefile @@ -156,8 +156,8 @@ MODBUS_DESC= Support for Modbus checks MODBUS_CONFIGURE_WITH= libmodbus MODBUS_LIB_DEPENDS= libmodbus.so:comms/libmodbus -NMAP_RUN_DEPENDS= nmap:security/nmap \ - sudo:security/sudo +NMAP_RUN_DEPENDS= nmap:security/nmap +NMAP_USES= sudo OPENSSL_CONFIGURE_WITH= openssl OPENSSL_USES= ssl diff --git a/net-mgmt/zabbix7-server/Makefile b/net-mgmt/zabbix7-server/Makefile index f83deea580c7..c13406b28585 100644 --- a/net-mgmt/zabbix7-server/Makefile +++ b/net-mgmt/zabbix7-server/Makefile @@ -155,8 +155,8 @@ MODBUS_DESC= Support for Modbus checks MODBUS_CONFIGURE_WITH= libmodbus MODBUS_LIB_DEPENDS= libmodbus.so:comms/libmodbus -NMAP_RUN_DEPENDS= nmap:security/nmap \ - sudo:security/sudo +NMAP_RUN_DEPENDS= nmap:security/nmap +NMAP_USES= sudo OPENSSL_CONFIGURE_WITH= openssl OPENSSL_USES= ssl diff --git a/net-mgmt/zabbix72-server/Makefile b/net-mgmt/zabbix72-server/Makefile index e12b74b7f7d6..a30df70e89fd 100644 --- a/net-mgmt/zabbix72-server/Makefile +++ b/net-mgmt/zabbix72-server/Makefile @@ -153,8 +153,8 @@ MODBUS_DESC= Support for Modbus checks MODBUS_CONFIGURE_WITH= libmodbus MODBUS_LIB_DEPENDS= libmodbus.so:comms/libmodbus -NMAP_RUN_DEPENDS= nmap:security/nmap \ - sudo:security/sudo +NMAP_RUN_DEPENDS= nmap:security/nmap +NMAP_USES= sudo OPENSSL_CONFIGURE_WITH= openssl OPENSSL_USES= ssl diff --git a/net-mgmt/zabbix74-server/Makefile b/net-mgmt/zabbix74-server/Makefile index 901b698a26c0..f84cb1890285 100644 --- a/net-mgmt/zabbix74-server/Makefile +++ b/net-mgmt/zabbix74-server/Makefile @@ -147,8 +147,8 @@ MODBUS_DESC= Support for Modbus checks MODBUS_CONFIGURE_WITH= libmodbus MODBUS_LIB_DEPENDS= libmodbus.so:comms/libmodbus -NMAP_RUN_DEPENDS= nmap:security/nmap \ - sudo:security/sudo +NMAP_RUN_DEPENDS= nmap:security/nmap +NMAP_USES= sudo OPENSSL_CONFIGURE_WITH= openssl OPENSSL_USES= ssl |