From 0a116775f091004f4c7e7736f1c908dcc7851099 Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Wed, 16 Jan 2013 22:00:11 +0100 Subject: [PATCH] write_riemann plugin: Rename the "riemann" plugin. --- configure.in | 8 ++++---- src/Makefile.am | 22 +++++++++++----------- src/{riemann.c => write_riemann.c} | 0 3 files changed, 15 insertions(+), 15 deletions(-) rename src/{riemann.c => write_riemann.c} (100%) diff --git a/configure.in b/configure.in index 005b30b6..5598a0b1 100644 --- a/configure.in +++ b/configure.in @@ -4932,7 +4932,6 @@ AC_PLUGIN([processes], [$plugin_processes], [Process statistics]) AC_PLUGIN([protocols], [$plugin_protocols], [Protocol (IP, TCP, ...) statistics]) AC_PLUGIN([python], [$with_python], [Embed a Python interpreter]) AC_PLUGIN([redis], [$with_libcredis], [Redis plugin]) -AC_PLUGIN([riemann], [$have_protoc_c], [Riemann plugin]) AC_PLUGIN([routeros], [$with_librouteros], [RouterOS plugin]) AC_PLUGIN([rrdcached], [$librrd_rrdc_update], [RRDTool output plugin]) AC_PLUGIN([rrdtool], [$with_librrd], [RRDTool output plugin]) @@ -4965,8 +4964,9 @@ AC_PLUGIN([vserver], [$plugin_vserver], [Linux VServer statistics]) AC_PLUGIN([wireless], [$plugin_wireless], [Wireless statistics]) AC_PLUGIN([write_graphite], [yes], [Graphite / Carbon output plugin]) AC_PLUGIN([write_http], [$with_libcurl], [HTTP output plugin]) -AC_PLUGIN([write_redis], [$with_libcredis], [Redis output plugin]) AC_PLUGIN([write_mongodb], [$with_libmongoc], [MongoDB output plugin]) +AC_PLUGIN([write_redis], [$with_libcredis], [Redis output plugin]) +AC_PLUGIN([write_riemann], [$have_protoc_c], [Riemann output plugin]) AC_PLUGIN([xmms], [$with_libxmms], [XMMS statistics]) AC_PLUGIN([zfs_arc], [$plugin_zfs_arc], [ZFS ARC statistics]) @@ -5266,7 +5266,6 @@ Configuration: protocols . . . . . . $enable_protocols python . . . . . . . $enable_python redis . . . . . . . . $enable_redis - riemann . . . . . . . $enable_riemann routeros . . . . . . $enable_routeros rrdcached . . . . . . $enable_rrdcached rrdtool . . . . . . . $enable_rrdtool @@ -5299,8 +5298,9 @@ Configuration: wireless . . . . . . $enable_wireless write_graphite . . . $enable_write_graphite write_http . . . . . $enable_write_http - write_redis . . . . . $enable_write_redis write_mongodb . . . . $enable_write_mongodb + write_redis . . . . . $enable_write_redis + write_riemann . . . . $enable_write_riemann xmms . . . . . . . . $enable_xmms zfs_arc . . . . . . . $enable_zfs_arc diff --git a/src/Makefile.am b/src/Makefile.am index e084930a..8bdf9f84 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -981,17 +981,6 @@ collectd_LDADD += "-dlopen" redis.la collectd_DEPENDENCIES += redis.la endif -if BUILD_PLUGIN_RIEMANN -BUILT_SOURCES += riemann.pb-c.c riemann.pb-c.h -CLEANFILES += riemann.pb-c.c riemann.pb-c.h -pkglib_LTLIBRARIES += riemann.la -riemann_la_SOURCES = riemann.c riemann.pb-c.c -riemann_la_LDFLAGS = -module -avoid-version -riemann_la_LIBADD = -lprotobuf-c -collectd_LDADD += "-dlopen" riemann.la -collectd_DEPENDENCIES += riemann.la -endif - if BUILD_PLUGIN_ROUTEROS pkglib_LTLIBRARIES += routeros.la routeros_la_SOURCES = routeros.c @@ -1347,6 +1336,17 @@ collectd_LDADD += "-dlopen" write_redis.la collectd_DEPENDENCIES += write_redis.la endif +if BUILD_PLUGIN_WRITE_RIEMANN +BUILT_SOURCES += riemann.pb-c.c riemann.pb-c.h +CLEANFILES += riemann.pb-c.c riemann.pb-c.h +pkglib_LTLIBRARIES += write_riemann.la +write_riemann_la_SOURCES = write_riemann.c riemann.pb-c.c +write_riemann_la_LDFLAGS = -module -avoid-version +write_riemann_la_LIBADD = -lprotobuf-c +collectd_LDADD += "-dlopen" write_riemann.la +collectd_DEPENDENCIES += write_riemann.la +endif + if BUILD_PLUGIN_XMMS pkglib_LTLIBRARIES += xmms.la xmms_la_SOURCES = xmms.c diff --git a/src/riemann.c b/src/write_riemann.c similarity index 100% rename from src/riemann.c rename to src/write_riemann.c -- 2.30.2