**/
#include "collectd.h"
+
#include "common.h"
#include "plugin.h"
static void free_zfs_values (kstat_t *ksp)
{
- llentry_t *e;
-
if (ksp == NULL)
return;
- for (e = llist_head (ksp); e != NULL; e = e->next)
+ for (llentry_t *e = llist_head (ksp); e != NULL; e = e->next)
{
sfree (e->key);
sfree (e->value);
#endif
/* Sizes */
- za_read_gauge (ksp, "size", "cache_size", "arc");
- za_read_gauge (ksp, "c", "cache_size", "c");
- za_read_gauge (ksp, "c_min", "cache_size", "c_min");
- za_read_gauge (ksp, "c_max", "cache_size", "c_max");
+ za_read_gauge (ksp, "anon_size", "cache_size", "anon_size");
+ za_read_gauge (ksp, "c", "cache_size", "c");
+ za_read_gauge (ksp, "c_max", "cache_size", "c_max");
+ za_read_gauge (ksp, "c_min", "cache_size", "c_min");
+ za_read_gauge (ksp, "hdr_size", "cache_size", "hdr_size");
+ za_read_gauge (ksp, "metadata_size", "cache_size", "metadata_size");
+ za_read_gauge (ksp, "mfu_ghost_size", "cache_size", "mfu_ghost_size");
+ za_read_gauge (ksp, "mfu_size", "cache_size", "mfu_size");
+ za_read_gauge (ksp, "mru_ghost_size", "cache_size", "mru_ghost_size");
+ za_read_gauge (ksp, "mru_size", "cache_size", "mru_size");
+ za_read_gauge (ksp, "other_size", "cache_size", "other_size");
+ za_read_gauge (ksp, "p", "cache_size", "p");
+ za_read_gauge (ksp, "size", "cache_size", "arc");
/* The "l2_size" value has disappeared from Solaris some time in
* early 2013, and has only reappeared recently in Solaris 11.2.
za_read_derive (ksp, "demand_metadata_misses", "cache_result", "demand_metadata-miss");
za_read_derive (ksp, "prefetch_data_misses", "cache_result", "prefetch_data-miss");
za_read_derive (ksp, "prefetch_metadata_misses", "cache_result", "prefetch_metadata-miss");
+ za_read_derive (ksp, "mfu_hits", "cache_result", "mfu-hit");
+ za_read_derive (ksp, "mfu_ghost_hits", "cache_result", "mfu_ghost-hit");
+ za_read_derive (ksp, "mru_hits", "cache_result", "mru-hit");
+ za_read_derive (ksp, "mru_ghost_hits", "cache_result", "mru_ghost-hit");
+ za_read_derive (ksp, "prefetch_metadata_misses", "cache_result", "prefetch_metadata-miss");
/* Ratios */
arc_hits = (gauge_t) get_zfs_value(ksp, "hits");