X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fwrite_graphite.c;h=ad8dfcef487a2e512e4c2e539c8698625c17a105;hb=c5ffa797883f238776e6294054f260df3cd0aea6;hp=845ba898b2dff38362116d841bd06452c473301c;hpb=59919c47562a2266a6dbd306a78113cb8ddd5ffe;p=collectd.git diff --git a/src/write_graphite.c b/src/write_graphite.c index 845ba898..ad8dfcef 100644 --- a/src/write_graphite.c +++ b/src/write_graphite.c @@ -52,16 +52,34 @@ #include -#define WG_DEFAULT_NODE "localhost" -#define WG_DEFAULT_SERVICE "2003" -#define WG_DEFAULT_PROTOCOL "tcp" -#define WG_DEFAULT_LOG_SEND_ERRORS 1 -#define WG_DEFAULT_ESCAPE '_' +#ifndef WG_DEFAULT_NODE +# define WG_DEFAULT_NODE "localhost" +#endif + +#ifndef WG_DEFAULT_SERVICE +# define WG_DEFAULT_SERVICE "2003" +#endif + +#ifndef WG_DEFAULT_PROTOCOL +# define WG_DEFAULT_PROTOCOL "tcp" +#endif + +#ifndef WG_DEFAULT_LOG_SEND_ERRORS +# define WG_DEFAULT_LOG_SEND_ERRORS 1 +#endif + +#ifndef WG_DEFAULT_ESCAPE +# define WG_DEFAULT_ESCAPE '_' +#endif /* Ethernet - (IPv6 + TCP) = 1500 - (40 + 32) = 1428 */ -#define WG_SEND_BUF_SIZE 1428 +#ifndef WG_SEND_BUF_SIZE +# define WG_SEND_BUF_SIZE 1428 +#endif -#define WG_MIN_RECONNECT_INTERVAL TIME_T_TO_CDTIME_T (1) +#ifndef WG_MIN_RECONNECT_INTERVAL +# define WG_MIN_RECONNECT_INTERVAL TIME_T_TO_CDTIME_T (1) +#endif /* * Private variables @@ -548,6 +566,9 @@ static int wg_config_node (oconfig_item_t *ci) else if (strcasecmp ("AlwaysAppendDS", child->key) == 0) cf_util_get_flag (child, &cb->format_flags, GRAPHITE_ALWAYS_APPEND_DS); + else if (strcasecmp ("DropDuplicateFields", child->key) == 0) + cf_util_get_flag (child, &cb->format_flags, + GRAPHITE_DROP_DUPE_FIELDS); else if (strcasecmp ("EscapeCharacter", child->key) == 0) config_set_char (&cb->escape_char, child); else