From patchwork Thu Dec 22 01:59:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 708032 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tkZVy4cYPz9s9Y for ; Thu, 22 Dec 2016 13:00:58 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=zacarias.com.ar header.i=@zacarias.com.ar header.b="dZHTOnsI"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id DA6B6825AC; Thu, 22 Dec 2016 02:00:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id etbD+uk-lU6q; Thu, 22 Dec 2016 02:00:52 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id E750984198; Thu, 22 Dec 2016 02:00:51 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id DF3FD1C0412 for ; Thu, 22 Dec 2016 02:00:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id CD7BC8400A for ; Thu, 22 Dec 2016 02:00:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id c1ytYUwZLY8L for ; Thu, 22 Dec 2016 02:00:45 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from www.zacarias.com.ar (www.zacarias.com.ar [176.9.42.171]) by whitealder.osuosl.org (Postfix) with ESMTPS id 4FF268413A for ; Thu, 22 Dec 2016 02:00:42 +0000 (UTC) Received: from asgard (cpe-190-55-196-87.telecentro-reversos.com.ar [190.55.196.87] (may be forged)) (authenticated bits=0) by www.zacarias.com.ar (8.15.2/8.15.2) with ESMTPSA id uBM20ZlX008763 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 22 Dec 2016 02:00:38 GMT DMARC-Filter: OpenDMARC Filter v1.3.1 www.zacarias.com.ar uBM20ZlX008763 Authentication-Results: zacarias.com.ar; dmarc=fail header.from=zacarias.com.ar Authentication-Results: zacarias.com.ar; spf=pass smtp.mailfrom=gustavo@zacarias.com.ar DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1482372040; bh=H50rEy4pj3EsVCcgG7OsD7hCSDgUH9UjbJ7rNcnbrBk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=dZHTOnsIwT9swdlcDUVZsSeGmmIfCDXsIKzD4TM2DLekHJcWlM7nYd40pHZwf8dtp ILtihqZkQH+N/kvIjYGBw5h94E1UMYI6EnII6dUm8/lBcUSbTeD8hiuxREmj7laGcy 7Q5Q1WtquS10r+hVluRFDKfhPXTD6Xzz6wrgYh70= Received: by asgard (sSMTP sendmail emulation); Wed, 21 Dec 2016 23:00:35 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Wed, 21 Dec 2016 22:59:21 -0300 Message-Id: <20161222015921.6832-14-gustavo@zacarias.com.ar> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20161222015921.6832-1-gustavo@zacarias.com.ar> References: <20161222015921.6832-1-gustavo@zacarias.com.ar> X-Virus-Scanned: clamav-milter 0.99 at www X-Virus-Status: Clean Subject: [Buildroot] [PATCH 14/14] collectd: add write_prometheus plugin support X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Add explicit support for the write_prometheus plugin, it requires the libmicrohttpd and protobuf-c libraries. Signed-off-by: Gustavo Zacarias --- package/collectd/Config.in | 14 ++++++++++++++ package/collectd/collectd.mk | 4 +++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/package/collectd/Config.in b/package/collectd/Config.in index 02c02b7..fc60917 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -572,6 +572,20 @@ config BR2_PACKAGE_COLLECTD_WRITELOG help Writes data to the log. +config BR2_PACKAGE_COLLECTD_WRITEPROMETHEUS + bool "write_prometheus" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" + select BR2_PACKAGE_LIBMICROHTTPD + select BR2_PACKAGE_PROTOBUF_C + help + Publishes values using an embedded HTTP server, in a format + compatible with Prometheus' collectd_exporter. + +comment "write_prometheus needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP + depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" + config BR2_PACKAGE_COLLECTD_WRITESENSU bool "write_sensu" help diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index 520ce1c..50a2e53 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -119,6 +119,7 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_WIRELESS),--enable-wireless,--disable-wireless) \ $(if $(BR2_PACKAGE_COLLECTD_WRITEHTTP),--enable-write_http,--disable-write_http) \ $(if $(BR2_PACKAGE_COLLECTD_WRITELOG),--enable-write_log,--disable-write_log) \ + $(if $(BR2_PACKAGE_COLLECTD_WRITEPROMETHEUS),--enable-write_prometheus,--disable-write_prometheus) \ $(if $(BR2_PACKAGE_COLLECTD_WRITESENSU),--enable-write_sensu,--disable-write_sensu) \ $(if $(BR2_PACKAGE_COLLECTD_WRITETSDB),--enable-write_tsdb,--disable-write_tsdb) \ $(if $(BR2_PACKAGE_COLLECTD_ZOOKEEPER),--enable-zookeeper,--disable-zookeeper) @@ -150,7 +151,8 @@ COLLECTD_DEPENDENCIES = \ $(if $(BR2_PACKAGE_COLLECTD_SENSORS),lm-sensors) \ $(if $(BR2_PACKAGE_COLLECTD_SMART),libatasmart) \ $(if $(BR2_PACKAGE_COLLECTD_SNMP),netsnmp) \ - $(if $(BR2_PACKAGE_COLLECTD_WRITEHTTP),libcurl) + $(if $(BR2_PACKAGE_COLLECTD_WRITEHTTP),libcurl) \ + $(if $(BR2_PACKAGE_COLLECTD_WRITEPROMETHEUS),libmicrohttpd protobuf-c) # include/library fixups ifeq ($(BR2_PACKAGE_LIBCURL),y)