Merge branch 'collectd-5.3' into collectd-5.4

Conflicts:
	src/zfs_arc.c

diff --cc configure.ac
Simple merge

diff --cc src/Makefile.am
Simple merge

diff --cc src/collectd.conf.pod
Simple merge

diff --cc src/curl.c
Simple merge

diff --cc src/curl_json.c
Simple merge

diff --cc src/types.db
Simple merge

diff --cc src/zfs_arc.c
index 2edba6d1b68d4abc803b06145d6b2f5376503eca,cc988625b32178a005222befd9dccae0898270e5..96ffc54957aae84a8fb548e3df352307a9a9d168
--- 1/src/zfs_arc.c
--- 2/src/zfs_arc.c
+++ b/src/zfs_arc.c
@@@ -96,10 -60,10 +96,10 @@@ static int za_read_derive (kstat_t *ksp
    long long tmp;
    value_t v;
  
 -  tmp = get_kstat_value (ksp, (char *)kstat_value);
 +  tmp = get_zfs_value (ksp, (char *)kstat_value);
    if (tmp == -1LL)
    {
-     ERROR ("zfs_arc plugin: Reading kstat value \"%s\" failed.", kstat_value);
+     WARNING ("zfs_arc plugin: Reading kstat value \"%s\" failed.", kstat_value);
      return (-1);
    }
  
@@@ -114,10 -78,10 +114,10 @@@ static int za_read_gauge (kstat_t *ksp
    long long tmp;
    value_t v;
  
 -  tmp = get_kstat_value (ksp, (char *)kstat_value);
 +  tmp = get_zfs_value (ksp, (char *)kstat_value);
    if (tmp == -1LL)
    {
-     ERROR ("zfs_arc plugin: Reading kstat value \"%s\" failed.", kstat_value);
+     WARNING ("zfs_arc plugin: Reading kstat value \"%s\" failed.", kstat_value);
      return (-1);
    }
  
@@@ -160,16 -122,18 +160,18 @@@ static int za_read (void
        za_read_gauge (ksp, "size",    "cache_size", "arc");
        za_read_gauge (ksp, "l2_size", "cache_size", "L2");
  
 -        /* Operations */
 +      /* Operations */
-       za_read_derive (ksp, "allocated","cache_operation", "allocated");
        za_read_derive (ksp, "deleted",  "cache_operation", "deleted");
+ #if __FreeBSD__
+       za_read_derive (ksp, "allocated","cache_operation", "allocated");
        za_read_derive (ksp, "stolen",   "cache_operation", "stolen");
+ #endif
  
 -        /* Issue indicators */
 -        za_read_derive (ksp, "mutex_miss", "mutex_operations", "miss");
 +      /* Issue indicators */
 +      za_read_derive (ksp, "mutex_miss", "mutex_operations", "miss");
        za_read_derive (ksp, "hash_collisions", "hash_collisions", "");
        
 -        /* Evictions */
 +      /* Evictions */
        za_read_derive (ksp, "evict_l2_cached",     "cache_eviction", "cached");
        za_read_derive (ksp, "evict_l2_eligible",   "cache_eviction", "eligible");
        za_read_derive (ksp, "evict_l2_ineligible", "cache_eviction", "ineligible");