From: Florian Forster <octo@collectd.org>
Date: Sat, 25 Feb 2012 17:16:59 +0000 (+0100)
Subject: Merge branch 'collectd-5.0'
X-Git-Tag: collectd-5.1.0~19
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=3b473acc5d4d27e5cf5101a4b8cc8a21c2bb7262;hp=-c

Merge branch 'collectd-5.0'

Conflicts:
	src/amqp.c

Change-Id: I85ab3ee2b51830ad0b5d474cf1f18b5c828d6588
---

3b473acc5d4d27e5cf5101a4b8cc8a21c2bb7262
diff --combined src/bind.c
index 36e225bf,38d4a27f..5b7d7a05
--- a/src/bind.c
+++ b/src/bind.c
@@@ -98,10 -98,6 +98,10 @@@ struct list_info_ptr_
  };
  typedef struct list_info_ptr_s list_info_ptr_t;
  
 +/* FIXME: Enabled by default for backwards compatibility. */
 +/* TODO: Remove time parsing code. */
 +static _Bool config_parse_time = 1;
 +
  static char *url                   = NULL;
  static int global_opcodes          = 1;
  static int global_qtypes           = 1;
@@@ -253,8 -249,7 +253,8 @@@ static void submit (time_t ts, const ch
  
    vl.values = values;
    vl.values_len = 1;
 -  vl.time = TIME_T_TO_CDTIME_T (ts);
 +  if (config_parse_time)
 +    vl.time = TIME_T_TO_CDTIME_T (ts);
    sstrncpy(vl.host, hostname_g, sizeof(vl.host));
    sstrncpy(vl.plugin, "bind", sizeof(vl.plugin));
    if (plugin_instance) {
@@@ -799,7 -794,7 +799,7 @@@ static int bind_xml_stats_handle_view (
      list_info_ptr_t list_info =
      {
        plugin_instance,
-       /* type = */ "dns_qtype_gauge"
+       /* type = */ "dns_qtype"
      };
  
      ssnprintf (plugin_instance, sizeof (plugin_instance), "%s-qtypes",
@@@ -830,13 -825,14 +830,14 @@@
          doc, path_ctx, current_time, DS_TYPE_COUNTER);
    } /* }}} */
  
+   /* Record types in the cache */
    if (view->cacherrsets != 0) /* {{{ */
    {
      char plugin_instance[DATA_MAX_NAME_LEN];
      list_info_ptr_t list_info =
      {
        plugin_instance,
-       /* type = */ "dns_qtype_gauge"
+       /* type = */ "dns_qtype_cached"
      };
  
      ssnprintf (plugin_instance, sizeof (plugin_instance), "%s-cache_rr_sets",
@@@ -1368,8 -1364,6 +1369,8 @@@ static int bind_config (oconfig_item_t 
        bind_config_set_bool ("MemoryStats", &global_memory_stats, child);
      else if (strcasecmp ("View", child->key) == 0)
        bind_config_add_view (child);
 +    else if (strcasecmp ("ParseTime", child->key) == 0)
 +      cf_util_get_boolean (child, &config_parse_time);
      else
      {
        WARNING ("bind plugin: Unknown configuration option "