From patchwork Mon May 21 17:53:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charles Hardin X-Patchwork-Id: 917778 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=storagecraft.com Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40qRGZ12Wlz9s1w for ; Tue, 22 May 2018 03:53:42 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id A204E86A22; Mon, 21 May 2018 17:53:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2mXdxXBIDNT9; Mon, 21 May 2018 17:53:39 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4B42C86958; Mon, 21 May 2018 17:53:39 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 0E8451C2040 for ; Mon, 21 May 2018 17:53:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 0BD4488C4C for ; Mon, 21 May 2018 17:53:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3i0GqV9Hdske for ; Mon, 21 May 2018 17:53:37 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from us-smtp-delivery-103.mimecast.com (us-smtp-delivery-103.mimecast.com [216.205.24.103]) by hemlock.osuosl.org (Postfix) with ESMTPS id 65D1F88C4B for ; Mon, 21 May 2018 17:53:37 +0000 (UTC) Received: from STC-EXCH.stc.local (autodiscover.storagecraft.co.jp [198.135.233.15]) (Using TLS) by us-smtp-1.mimecast.com with ESMTP id us-mta-155-Qb9nTNqlNwiHktEEL-VwOA-1; Mon, 21 May 2018 13:53:35 -0400 Received: from localhost.localdomain (50.1.97.2) by webmail.storagecraft.com (10.1.0.30) with Microsoft SMTP Server id 14.3.382.0; Mon, 21 May 2018 11:53:33 -0600 From: To: Date: Mon, 21 May 2018 10:53:10 -0700 Message-ID: <20180521175310.18563-6-charles.hardin@storagecraft.com> X-Mailer: git-send-email 2.15.1 (Apple Git-101) In-Reply-To: <20180521175310.18563-1-charles.hardin@storagecraft.com> References: <20180521175310.18563-1-charles.hardin@storagecraft.com> MIME-Version: 1.0 X-MC-Unique: Qb9nTNqlNwiHktEEL-VwOA-1 Subject: [Buildroot] [PATCH v2 5/5] package/collectd: allow the grpc plugin to be configured X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Charles Hardin Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Charles Hardin Allow collectd to use the gRPC package since that package can now be compiled as part of buildroot. This plugin can be used to push collectd datasets over the network to other instances as needed. Signed-off-by: Charles Hardin --- package/collectd/Config.in | 11 +++++++++++ package/collectd/collectd.mk | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/package/collectd/Config.in b/package/collectd/Config.in index ccd3fbe13f..5f25f01cb8 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -248,6 +248,17 @@ config BR2_PACKAGE_COLLECTD_GPS Reports the number of sattelites seen by and precision of a GPS receiver. +config BR2_PACKAGE_COLLECTD_GRPC + bool "grpc" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_GRPC + help + Add support for the gRPC plugin for network communication + +comment "grpc needs a toolchain w/ C++, threads" + depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS) + config BR2_PACKAGE_COLLECTD_HUGEPAGES bool "hugepages" help diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index 6c987b2e36..00efee4a18 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -15,7 +15,7 @@ COLLECTD_LICENSE_FILES = COPYING # These require unmet dependencies, are fringe, pointless or deprecated COLLECTD_PLUGINS_DISABLE = \ amqp apple_sensors aquaero ascent barometer dbi dpdkstat email \ - gmond grpc hddtemp intel_rdt ipmi java libvirt lpar lvm \ + gmond hddtemp intel_rdt ipmi java libvirt lpar lvm \ madwifi mbmon mic multimeter netapp notify_desktop numa \ nut onewire oracle perl pf pinba powerdns python redis routeros \ rrdcached sigrok tape target_v5upgrade teamspeak2 ted \ @@ -73,6 +73,7 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_FSCACHE),--enable-fscache,--disable-fscache) \ $(if $(BR2_PACKAGE_COLLECTD_GPS),--enable-gps,--disable-gps) \ $(if $(BR2_PACKAGE_COLLECTD_GRAPHITE),--enable-write_graphite,--disable-write_graphite) \ + $(if $(BR2_PACKAGE_COLLECTD_GRPC),--enable-grpc,--disable-grpc) \ $(if $(BR2_PACKAGE_COLLECTD_HASHED),--enable-match_hashed,--disable-match_hashed) \ $(if $(BR2_PACKAGE_COLLECTD_HUGEPAGES),--enable-hugepages,--disable-hugepages) \ $(if $(BR2_PACKAGE_COLLECTD_INTERFACE),--enable-interface,--disable-interface) \ @@ -148,6 +149,7 @@ COLLECTD_DEPENDENCIES = \ $(if $(BR2_PACKAGE_COLLECTD_CURL_XML),libcurl libxml2) \ $(if $(BR2_PACKAGE_COLLECTD_DNS),libpcap) \ $(if $(BR2_PACKAGE_COLLECTD_GPS),gpsd) \ + $(if $(BR2_PACKAGE_COLLECTD_GRPC),grpc) \ $(if $(BR2_PACKAGE_COLLECTD_IPTABLES),iptables) \ $(if $(BR2_PACKAGE_COLLECTD_LOGSTASH),yajl) \ $(if $(BR2_PACKAGE_COLLECTD_MEMCACHEC),libmemcached) \