Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

net-analyzer/monitoring-plugins: make 'check_ping -4' call 'ping -4' #11169

Closed
wants to merge 1 commit into from

Conversation

sbraz
Copy link
Member

@sbraz sbraz commented Feb 27, 2019

Hi @orlitzky @hydrapolic.

Currently, when calling 'check_icmp -4' on a host that has both A and AAAA
records, the AAAA record is used. This is because the IPv4 ping command
is set to 'ping' at configure-time, when it should be 'ping -4'.

For consistency, this commit also changes the IPv6 ping command from
'ping6' to 'ping -6'.

The upstream issue is
monitoring-plugins/monitoring-plugins#898.
Changing the ping command at configure-time was proposed in
monitoring-plugins/monitoring-plugins#1531.

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Louis Sautier sbraz@gentoo.org

--- monitoring-plugins-2.2-r3.ebuild    2018-12-10 14:13:19.235034260 +0100
+++ monitoring-plugins-2.2-r4.ebuild    2019-02-27 13:00:58.012460494 +0100
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 sparc x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
 IUSE="gnutls ipv6 ldap libressl mysql dns fping game postgres radius samba snmp ssh +ssl"
 
 # Most of the plugins use automagic dependencies, i.e. the plugin will
@@ -70,10 +70,10 @@
 
        # The autodetection for these two commands can hang if localhost is
        # down or ICMP traffic is filtered. Bug #468296.
-       myconf+=( --with-ping-command="/bin/ping -n -U -w %d -c %d %s" )
+       myconf+=( --with-ping-command="/bin/ping -4 -n -U -w %d -c %d %s" )
 
        if use ipv6; then
-               myconf+=( --with-ping6-command="/bin/ping6 -n -U -w %d -c %d %s" )
+               myconf+=( --with-ping6-command="/bin/ping -6 -n -U -w %d -c %d %s" )
        fi
 
        econf \

@gentoo-bot
Copy link

Copyright policy change

Please note that on 2018-09-15 Trustees have approved new Gentoo copyright policy. All contributions made to Gentoo need to follow this policy. If you include the Signed-off-by line in your commit message, you indicate that you have read the policy and agree to its terms. For more detailed explanation, please see the new Gentoo copyright policy explained article.

Pull Request assignment

Submitter: @sbraz
Areas affected: ebuilds
Packages affected: net-analyzer/monitoring-plugins

net-analyzer/monitoring-plugins: @hydrapolic, @orlitzky, @gentoo/proxy-maint

Linked bugs

No bugs to link found. If your pull request references any of the Gentoo bug reports, please add appropriate GLEP 66 tags to the commit message and request reassignment.

If you do not receive any reply to this pull request, please open or link a bug to attract the attention of maintainers.


In order to force reassignment and/or bug reference scan, please append [please reassign] to the pull request title.

Docs: Code of ConductCopyright policy (expl.) ● DevmanualGitHub PRsProxy-maint guide

@gentoo-bot gentoo-bot added assigned PR successfully assigned to the package maintainer(s). no bug found No Bug/Closes found in the commits. labels Feb 27, 2019
@hydrapolic
Copy link
Contributor

Currently, when calling 'check_icmp -4' on a host that has both A and AAAA
records, the AAAA record is used.

Are you sure it's check_icmp and not check_ping?

LGTM, thanks for the PR @sbraz.

Currently, when calling 'check_ping -4' on a host that has both A and AAAA
records, the AAAA record is used. This is because the IPv4 ping command
is set to 'ping' at configure-time, when it should be 'ping -4'.

For consistency, this commit also changes the IPv6 ping command from
'ping6' to 'ping -6'.

The upstream issue is
monitoring-plugins/monitoring-plugins#898.
Changing the ping command at configure-time was proposed in
monitoring-plugins/monitoring-plugins#1531.

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Louis Sautier <sbraz@gentoo.org>
@sbraz
Copy link
Member Author

sbraz commented Mar 1, 2019

Are you sure it's check_icmp and not check_ping?

Meh, sorry about that, I just fixed the commit message :)

@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2019-03-01 09:20 UTC
Newest commit scanned: ba7078e
Status: ✅ good

No issues found

@orlitzky
Copy link
Contributor

orlitzky commented Mar 2, 2019

Tomáš is in charge of this one, so if it's OK with him you can just merge it.

@hydrapolic
Copy link
Contributor

@sbraz, please merge it.

@sbraz
Copy link
Member Author

sbraz commented Mar 3, 2019

@hydrapolic Done, thanks!

@gentoo-bot gentoo-bot closed this in 31cbd14 Mar 3, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
assigned PR successfully assigned to the package maintainer(s). no bug found No Bug/Closes found in the commits.
Projects
None yet
5 participants