Compare commits

..

10 commits

7 changed files with 61 additions and 3 deletions

View file

@ -3,7 +3,7 @@ include:
- https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml
variables:
RELEASE: 'trixie'
RELEASE: 'unstable'
SALSA_CI_DISABLE_APTLY: 0
SALSA_CI_DISABLE_AUTOPKGTEST: 0
SALSA_CI_DISABLE_BLHC: 1

24
debian/changelog vendored
View file

@ -1,3 +1,27 @@
monitoring-plugins (2.4.0-5) UNRELEASED; urgency=medium
*
-- Jan Wagner <waja@cyconet.org> Mon, 06 Oct 2025 12:04:34 +0200
monitoring-plugins (2.4.0-4) unstable; urgency=medium
[ Jan Wagner ]
* [bee01b8] d/control: Remove Alexander Wirt from Uploaders
* [7236330] d/control: Adding libsystemd-dev and libsystemd0 as build-dep
(Closes: #1110265)
* [8cd52e3] Adding d/patches/25_check_users_sd_get_uids to fix user count
[ Bas Couwenberg ]
* [4770fe3] Update lintian overrides.
* [294841c] Drop Priority: optional, default since dpkg 1.22.13.
* [97009f5] Revert "Drop Priority: optional, default since dpkg 1.22.13."
[ Jan Wagner ]
* [3f438f9] Adding d/p/26_check_mysql_replica from upstream (Closes: #1116027)
-- Jan Wagner <waja@cyconet.org> Mon, 06 Oct 2025 11:29:35 +0200
monitoring-plugins (2.4.0-3) unstable; urgency=medium
* Upload to unstable

4
debian/control vendored
View file

@ -2,7 +2,7 @@ Source: monitoring-plugins
Section: net
Priority: optional
Maintainer: Debian Nagios Maintainer Group <pkg-nagios-devel@lists.alioth.debian.org>
Uploaders: Jan Wagner <waja@cyconet.org>, Alexander Wirt <formorer@debian.org>
Uploaders: Jan Wagner <waja@cyconet.org>
Build-Depends: debhelper-compat (= 13),
libcurl4-openssl-dev | libcurl4-nss-dev | libcurl4-gnutls-dev,
libdbi-dev,
@ -13,6 +13,8 @@ Build-Depends: debhelper-compat (= 13),
libnet-snmp-perl,
libpq-dev,
libssl-dev,
libsystemd0,
libsystemd-dev,
liburiparser-dev,
mawk | awk,
perl,

View file

@ -0,0 +1,28 @@
From fb39f96ac6f72bb56d17f3e8694134dfea9186e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lorenz=20K=C3=A4stle?=
<12514511+RincewindsHat@users.noreply.github.com>
Date: Mon, 11 Aug 2025 21:49:20 +0200
Subject: [PATCH] check_users: Use sd_get_uids instead of sd_get_session
Previously check_users in combination with systemd used
sd_get_sessions (3) to aquire the number of users, probably
with the idea that every users opens a session.
Turns out, that a user can have multiple sessions and we only really
want to know how many users there are.
This commit changes to sd_get_uids (3) to achieve that target.
---
plugins/check_users.d/users.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/plugins/check_users.c
+++ b/plugins/check_users.c
@@ -92,7 +92,7 @@
#ifdef HAVE_LIBSYSTEMD
if (sd_booted () > 0)
- users = sd_get_sessions (NULL);
+ users = sd_get_uids(NULL);
else {
#endif
#if HAVE_WTSAPI32_H

View file

@ -17,5 +17,6 @@
22_check_by_ssh_missing_options
23_sslutils_fix_error_message
24_check_http_deprecation
25_check_mysql_replica
25_check_users_sd_get_uids
26_check_mysql_replica
# feature patches

3
debian/source/lintian-overrides vendored Normal file
View file

@ -0,0 +1,3 @@
# Not supported by devscripts in trixie
older-debian-watch-file-standard 4 *