diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-08-29 20:19:23 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-08-29 20:19:23 +0100 |
commit | 12bb627384ddfd47382b9f1b6464481a58d01ebb (patch) | |
tree | f9760c04ccd4fcd7de214e2acd5b0e43fb530aa9 /net-analyzer/check_mk_agent | |
parent | 5fdd950c7ae03e12746a45c86d85861beaacc846 (diff) |
gentoo resync : 29.08.2018
Diffstat (limited to 'net-analyzer/check_mk_agent')
-rw-r--r-- | net-analyzer/check_mk_agent/Manifest | 8 | ||||
-rw-r--r-- | net-analyzer/check_mk_agent/check_mk_agent-1.2.8_p27.ebuild (renamed from net-analyzer/check_mk_agent/check_mk_agent-1.2.8_p16.ebuild) | 36 | ||||
-rw-r--r-- | net-analyzer/check_mk_agent/check_mk_agent-1.4.0_p31.ebuild | 74 | ||||
-rw-r--r-- | net-analyzer/check_mk_agent/metadata.xml | 1 |
4 files changed, 88 insertions, 31 deletions
diff --git a/net-analyzer/check_mk_agent/Manifest b/net-analyzer/check_mk_agent/Manifest index 8a468990af3b..123994d159b8 100644 --- a/net-analyzer/check_mk_agent/Manifest +++ b/net-analyzer/check_mk_agent/Manifest @@ -1,3 +1,5 @@ -DIST check_mk-1.2.8p16.tar.gz 16298683 BLAKE2B 5023719c3e2e56807900ccb204862eccb73706bb23dfa3dfb4f30cb6fa592828e2d81aef12dd5129b280c37ca8d700c982f3b29469fd5ec0328e91e414b8c624 SHA512 601c76b2b62de9176122c69b011b5f7ac6b71650d1b3e411c103f5e9c3e91256ce8d3db6fcd1edc2a11f86dcba4e8ea18ec5a1f9f3eae5b25a4bb3ba712341eb -EBUILD check_mk_agent-1.2.8_p16.ebuild 2193 BLAKE2B 4e1cd86ffbcebf9548cbb1a344ad0fd17f250af8b99bc035eb5492bb8b23dcc207687da0a96623705583807196d2550bb0f59d6a3e45f8b9ad846f5003dd8ae5 SHA512 b62d188ec2825fa9bc983c75e92ac6e9d3a7bcdc0a244cf2b3e711c298c5f92731cb25d1a24913ba301a8b85c66fb7c515492ecfe7af7dadf6c820ba183ee9eb -MISC metadata.xml 1105 BLAKE2B bc6711c7504a490415a1eb43f523ef5ea0c365ec9b5c45594440110538c98e0885f2c742f1a19125dc7bb65292d3a3412d001f2f5d64897913e0e84fa92d05e7 SHA512 dee7505f21436e97d80242771f9f8f2347831cc4da163a1b9c873d1ee1d3dbdaaf1138f3e147fbb0e7ab4d124a386b71074a5c882e71952e13c3fb4af6a3e7d3 +DIST check-mk-raw-1.2.8p27.cre.tar.gz 150213236 BLAKE2B f239edee68fdfc32aba9af40dead69ecdcb699b437b3ec615a3bf84b5eaa3644203ba4afea3d24a16ae722fe05eebb2650af1846eded97e322d88f2d7f5d102d SHA512 781b3dad0e144dc23a0d6791fa90a8ee2652919f898fa275abf7760d137f18ebe037a7d5d8f17c437f99fb7d0b22e57fdb42749dd6c084c74c5e2ef404eb3c1f +DIST check-mk-raw-1.4.0p31.cre.tar.gz 314212612 BLAKE2B 07c9bda8524250f949a21204427d455ef0ac0a323fe38b66c7c4f03b50f7677099b5c24dae22f55fe1e1a2e475d541e1b643169a2368925e960ea514a03fd6b2 SHA512 b1dfe22e54a3d6f9c7f76b408adeb7ca46aa4b21d933149c1681bf87dae7af8f5bf645ba19b225f30b0057d8d075f657756019e3b908d3090e1d14451e7fcc0b +EBUILD check_mk_agent-1.2.8_p27.ebuild 2034 BLAKE2B fd61fb106c900c9b74615d53b4440d33bfa5a8d1107ba978ca8168537dda76f2182b3c3750d4f4bd8d7fc356f32cc52f38d184f41cea06509bee9b4843ad82fc SHA512 ceb3fa02f5cff39d5f3c239d9594cb5a10ca5a050faa3595103aaa4b8b5a8f82a938371c00717b2fbb1f303b6761559192fa81f31f67c1feae057b938d3e7adf +EBUILD check_mk_agent-1.4.0_p31.ebuild 2034 BLAKE2B fd61fb106c900c9b74615d53b4440d33bfa5a8d1107ba978ca8168537dda76f2182b3c3750d4f4bd8d7fc356f32cc52f38d184f41cea06509bee9b4843ad82fc SHA512 ceb3fa02f5cff39d5f3c239d9594cb5a10ca5a050faa3595103aaa4b8b5a8f82a938371c00717b2fbb1f303b6761559192fa81f31f67c1feae057b938d3e7adf +MISC metadata.xml 1184 BLAKE2B 4dad1714d5a7283ccab3072f4b1790a58f02124272e0f1949cbd0b82d0e07a83cfbaaed1cc8471a88241ae0560e79839a97bcf18e1e3735fc1280ad0df29e687 SHA512 7802ae43e00f96a3371d4e0e888342630a3773cb75ccc7f203e884cdc64ad283a27abc34cc940a2b4b8ab3911ef6a744d18527d04338253a7c5069b67c1d9ee1 diff --git a/net-analyzer/check_mk_agent/check_mk_agent-1.2.8_p16.ebuild b/net-analyzer/check_mk_agent/check_mk_agent-1.2.8_p27.ebuild index 0bb80b3ddcd0..c41c9b1f3484 100644 --- a/net-analyzer/check_mk_agent/check_mk_agent-1.2.8_p16.ebuild +++ b/net-analyzer/check_mk_agent/check_mk_agent-1.2.8_p27.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -9,12 +9,12 @@ DESCRIPTION="Agent to report data to Check_MK for monitoring" HOMEPAGE="http://mathias-kettner.de/check_mk.html" MY_PV="${PV/_p/p}" -MY_P="check_mk-${MY_PV}" +MY_P="check-mk-raw-${MY_PV}.cre" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="apache_status logwatch mysql nfsexports oracle postgres smart +xinetd zypper" +IUSE="apache_status inventory logwatch mysql nfsexports oracle postgres smart +xinetd zypper" RDEPEND="!!net-analyzer/check_mk app-shells/bash:* @@ -22,44 +22,23 @@ RDEPEND="!!net-analyzer/check_mk " DEPEND="${RDEPEND}" -SRC_URI="http://mathias-kettner.de/download/${MY_P}.tar.gz" +SRC_URI="http://mathias-kettner.de/support/${MY_PV}/${MY_P}.tar.gz" src_unpack() { # check_mk is a tarball containing tarballs unpack ${A} + unpack "${WORKDIR}"/${MY_P}/packages/check_mk/check_mk-${MY_PV}.tar.gz mkdir -p "${S}" || die cd "${S}" || die - unpack "${WORKDIR}"/${MY_P}/agents.tar.gz + unpack "${WORKDIR}"/check_mk-${MY_PV}/agents.tar.gz mkdir -p "${S}"/doc || die cd "${S}"/doc || die - unpack "${WORKDIR}"/${MY_P}/doc.tar.gz -} - -src_prepare() { - cat <<EOF >Makefile -all: waitmax - -waitmax: waitmax.c - \$(CC) \$(CFLAGS) \$< -o \$@ \$(LDFLAGS) - -EOF - - if [[ -f waitmax ]]; then - rm waitmax || die "Couldn't delete precompiled waitmax file" - fi - - default -} - -src_compile() { - # compile waitmax - emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" + unpack "${WORKDIR}"/check_mk-${MY_PV}/doc.tar.gz } src_install() { # Install agent related files newbin check_mk_agent.linux check_mk_agent - dobin waitmax keepdir /usr/lib/check_mk_agent/local dodir /usr/lib/check_mk_agent/plugins @@ -84,6 +63,7 @@ src_install() { # Install any other useflag-enabled agent plugins exeinto /usr/lib/check_mk_agent/plugins + use inventory && newexe plugins/mk_inventory.linux mk_inventory use smart && doexe plugins/smart use mysql && doexe plugins/mk_mysql use postgres && doexe plugins/mk_postgres diff --git a/net-analyzer/check_mk_agent/check_mk_agent-1.4.0_p31.ebuild b/net-analyzer/check_mk_agent/check_mk_agent-1.4.0_p31.ebuild new file mode 100644 index 000000000000..c41c9b1f3484 --- /dev/null +++ b/net-analyzer/check_mk_agent/check_mk_agent-1.4.0_p31.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit systemd + +DESCRIPTION="Agent to report data to Check_MK for monitoring" +HOMEPAGE="http://mathias-kettner.de/check_mk.html" + +MY_PV="${PV/_p/p}" +MY_P="check-mk-raw-${MY_PV}.cre" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="apache_status inventory logwatch mysql nfsexports oracle postgres smart +xinetd zypper" + +RDEPEND="!!net-analyzer/check_mk + app-shells/bash:* + xinetd? ( || ( sys-apps/xinetd sys-apps/systemd ) ) + " +DEPEND="${RDEPEND}" + +SRC_URI="http://mathias-kettner.de/support/${MY_PV}/${MY_P}.tar.gz" + +src_unpack() { + # check_mk is a tarball containing tarballs + unpack ${A} + unpack "${WORKDIR}"/${MY_P}/packages/check_mk/check_mk-${MY_PV}.tar.gz + mkdir -p "${S}" || die + cd "${S}" || die + unpack "${WORKDIR}"/check_mk-${MY_PV}/agents.tar.gz + mkdir -p "${S}"/doc || die + cd "${S}"/doc || die + unpack "${WORKDIR}"/check_mk-${MY_PV}/doc.tar.gz +} + +src_install() { + # Install agent related files + newbin check_mk_agent.linux check_mk_agent + + keepdir /usr/lib/check_mk_agent/local + dodir /usr/lib/check_mk_agent/plugins + dodir /etc/check_mk + + dodoc doc/{AUTHORS,COPYING,ChangeLog} + docompress + + if use xinetd; then + insinto /etc/xinetd.d + newins cfg_examples/xinetd.conf check_mk + systemd_dounit cfg_examples/systemd/check_mk{.socket,@.service} + fi + + # Install the check_mk_agent logwatch plugin + if use logwatch; then + insinto /etc/check_mk + doins cfg_examples/logwatch.cfg + exeinto /usr/lib/check_mk_agent/plugins + doexe plugins/mk_logwatch + fi + + # Install any other useflag-enabled agent plugins + exeinto /usr/lib/check_mk_agent/plugins + use inventory && newexe plugins/mk_inventory.linux mk_inventory + use smart && doexe plugins/smart + use mysql && doexe plugins/mk_mysql + use postgres && doexe plugins/mk_postgres + use apache_status && doexe plugins/apache_status + use zypper && doexe plugins/mk_zypper + use oracle && doexe plugins/mk_oracle + use nfsexports && doexe plugins/nfsexports +} diff --git a/net-analyzer/check_mk_agent/metadata.xml b/net-analyzer/check_mk_agent/metadata.xml index 8cdfbbe9f07a..1a171aa481ac 100644 --- a/net-analyzer/check_mk_agent/metadata.xml +++ b/net-analyzer/check_mk_agent/metadata.xml @@ -10,6 +10,7 @@ Nagios/Icigna centralized monitoring servers. </longdescription> <use> + <flag name="inventory">Install check_mk-agent linux inventory plugin.</flag> <flag name="logwatch">Install check_mk-agent logwatch plugin.</flag> <flag name="smart">Install check_mk-agent S.M.A.R.T plugin.</flag> <flag name="mysql">Install check_mk-agent mysql plugin.</flag> |