Merge ~lvoytek/ubuntu/+source/munin:munin-node-configure-lp1680975-doc-fix-jammy into ubuntu/+source/munin:ubuntu/devel
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | b31dd8d0a2b1b6bc5207f47416b18d8ac112ad81 | ||||
Proposed branch: | ~lvoytek/ubuntu/+source/munin:munin-node-configure-lp1680975-doc-fix-jammy | ||||
Merge into: | ubuntu/+source/munin:ubuntu/devel | ||||
Diff against target: |
83 lines (+63/-0) 3 files modified
debian/changelog (+8/-0) debian/patches/munin-node-configure-doc-fix.patch (+54/-0) debian/patches/series (+1/-0) |
||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Sergio Durigan Junior (community) | Approve | ||
Canonical Server MOTU reviewers | Pending | ||
Canonical Server | Pending | ||
Review via email: mp+411872@code.launchpad.net |
Description of the change
Created new fix for documentation which displays the correct commands that can be used in munin-node-
* d/p/munin-
exitnoerror and update some snmp arguments to match their correct naming.
(LP: 1680975)
PPA: ppa:lvoytek/
Steps to test:
# lxc launch images:ubuntu/jammy builder
# lxc exec builder bash
# apt update
# apt dist-upgrade
# apt install -y munin
# munin-node-
* This will print all options including the following:
Usage:
munin-
Options:
...
--exitnoterror
Do not consider plugins that exit non-zero exit-value as error.
...
Snmp Options:
...
--snmpauthp
in which case defaults to the privacy password
--snmpauthp
and SHA-1/HMAC-SHA-96, NIST FIPS PIB 180, RFC2264). ['md5']
--snmpprivp
Privacy password to enable encryption. There is no default. An empty
('') password is considered as no password and will not enable
encryption.
Privacy requires a privprotocol as well as an authprotocol and a
the privpassword value, respectively) and may therefore be left
--snmpprivp
If the privpassword is set this setting controls what kind of
encryption is used to achieve privacy in the session. Only the very
weak 'des' encryption method is supported officially. ['des']
Triple-DES, NIST FIPS 46-3) as specified in IETF
particular device, we do not know.
* The options shown above are all incorrect, running munin-node-
# munin-node-
Unknown option: snmpauthpassword
Usage:
munin-
* This is followed by the incorrect help information
# apt install -y software-
# add-apt-repository ppa:lvoytek/
# apt update
# apt upgrade
# munin-node-
* This will now print the help page with incorrect commands replaced with the following
Usage:
munin-
Options:
...
Snmp Options:
...
--snmpauthpass <password>
in which case defaults to the privacy password ("--snmpprivpass").
--snmpauthproto <protocol>
and SHA-1/HMAC-SHA-96, NIST FIPS PIB 180, RFC2264). ['md5']
--snmpprivpass <password>
Privacy password to enable encryption. There is no default. An empty
('') password is considered as no password and will not enable
encryption.
Privacy requires a privprotocol as well as an authprotocol and a
the privpassword value, respectively) and may therefore be left
--snmpprivproto <protocol>
If the privpassword is set this setting controls what kind of
encryption is used to achieve privacy in the session. Only the very
weak 'des' encryption method is supported officially. ['des']
Triple-DES, NIST FIPS 46-3) as specified in IETF
particular device, we do not know.
* exitnoerror has been removed with no replacement as it is just a depricated argument
* Running any of these replacement commands will result in the following
# munin-node-
Option snmpauthpass requires an argument
Usage:
munin-
* The correct help menu is then printed out afterward
Package Test Results for munin-node-
t/munin-
t/munin-run.t .......
t/munin_
t/munin_
t/munin_
# Hostname localhost resolves to 2 IPs. Using 127.0.0.1
t/munin_
t/munin_
t/munin_
* Note that 1 autopkgtest is failing but is unrelated to this fix:
# Failed test 'Death signal is captured'
# at t/munin_node_os.t line 75.
# got: '0'
# expected: '13'
# Looks like you failed 1 test of 28.
t/munin_node_os.t .......
Dubious, test returned 1 (wstat 256, 0x100)
Failed 1/28 subtests
Thanks for the MP, Lena.
I'm leaving a few inline comments, but overall it LGTM. A question: have you considered forwarding this patch to the Debian munin package? I don't have a problem with carrying this as a delta temporarily, but ultimately Debian could also benefit from this and we'd get rid of the maintenance burden.
I haven't built/tested the package yet, FWIW.
Thanks.