Bug#1033666: icinga2-common: wrong executable in /usr/share/icinga2/include/plugins-contrib.d/systemd.conf

2023-03-30 Thread Baptiste Beauplat 
Control: forwarded -1 https://github.com/Icinga/icinga2/issues/9547

On 2023-03-29 20:32, Sebastiaan Couwenberg wrote:
> On 3/29/23 20:07, Andreas B. Mundt wrote:
>> the configuration in
>> '/usr/share/icinga2/include/plugins-contrib.d/systemd.conf'
>> contains a wrong executable in line 4:
>>
>>  command = [ PluginContribDir + "/check_systemd.py" ]
>>
>> The plugin's path is '/usr/lib/nagios/plugins/check_systemd' (no .py)
>> [1].
> 
> That's a divergence from upstream in the Debian package:
> 
> 
> https://salsa.debian.org/python-team/packages/monitoring-plugins-systemd/-/blob/debian/master/debian/monitoring-plugins-systemd.install

The monitoring-plugins-systemd package is actually following upstream,
check_systemd.py is supposed to be installed as check_systemd.

> 
> We'll have to patch the CheckCommand like check_postgres:
> 
> 
> https://salsa.debian.org/nagios-team/icinga2/-/blob/master/debian/patches/postgres-checkcommand.patch

There is an upstream issue for that, but unfortunately, both yayayayaka
and myself refused to sign Icinga2 CLA, leaving the trivial fix for
someone else.

-- 
Baptiste Beauplat - lyknode

Bug#1033666: [Pkg-nagios-devel] Bug#1033666: icinga2-common: wrong executable in /usr/share/icinga2/include/plugins-contrib.d/systemd.conf

2023-03-29 Thread Sebastiaan Couwenberg 

Control: tags -1 pending

On 3/29/23 20:07, Andreas B. Mundt wrote:

the configuration in '/usr/share/icinga2/include/plugins-contrib.d/systemd.conf'
contains a wrong executable in line 4:

 command = [ PluginContribDir + "/check_systemd.py" ]

The plugin's path is '/usr/lib/nagios/plugins/check_systemd' (no .py) [1].


That's a divergence from upstream in the Debian package:


https://salsa.debian.org/python-team/packages/monitoring-plugins-systemd/-/blob/debian/master/debian/monitoring-plugins-systemd.install

We'll have to patch the CheckCommand like check_postgres:


https://salsa.debian.org/nagios-team/icinga2/-/blob/master/debian/patches/postgres-checkcommand.patch

Kind Regards,

Bas

--
 GPG Key ID: 4096R/6750F10AE88D4AF1
Fingerprint: 8182 DE41 7056 408D 6146  50D1 6750 F10A E88D 4AF1

Bug#1033666: icinga2-common: wrong executable in /usr/share/icinga2/include/plugins-contrib.d/systemd.conf

2023-03-29 Thread Andreas B. Mundt 
Package: icinga2-common
Version: 2.13.6-2
Severity: normal
Tags: patch
X-Debbugs-Cc: a...@debian.org

Hi,

the configuration in '/usr/share/icinga2/include/plugins-contrib.d/systemd.conf'
contains a wrong executable in line 4:

command = [ PluginContribDir + "/check_systemd.py" ]

The plugin's path is '/usr/lib/nagios/plugins/check_systemd' (no .py) [1].

Thanks and best regards,

  Andi


[1] https://packages.debian.org/sid/all/monitoring-plugins-systemd/filelist
>From a807766be0459b0ac69afcb9584485bc43594d55 Mon Sep 17 00:00:00 2001
From: "Andreas B. Mundt" 
Date: Wed, 29 Mar 2023 19:59:15 +0200
Subject: [PATCH] Fix wrong executable name.

---
 itl/plugins-contrib.d/systemd.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/itl/plugins-contrib.d/systemd.conf 
b/itl/plugins-contrib.d/systemd.conf
index 4c0bbca1..236499bc 100644
--- a/itl/plugins-contrib.d/systemd.conf
+++ b/itl/plugins-contrib.d/systemd.conf
@@ -1,7 +1,7 @@
 /* Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+ */
 
 object CheckCommand "systemd" {
-   command = [ PluginContribDir + "/check_systemd.py" ]
+   command = [ PluginContribDir + "/check_systemd" ]
 
arguments = {
"--unit" = {
-- 
2.39.2