From a78f607649122abb0684b191f6e8d1e44a117017 Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Mon, 5 Sep 2016 13:21:45 +0200 Subject: [PATCH] hugepages plugin: Implement the "ValuesPages", "ValuesBytes" and "ValuesPercentage" options. --- src/collectd.conf.in | 7 +++-- src/collectd.conf.pod | 19 ++++++++++++-- src/hugepages.c | 61 ++++++++++++++++++++++++++++++------------- src/types.db | 1 - 4 files changed, 65 insertions(+), 23 deletions(-) diff --git a/src/collectd.conf.in b/src/collectd.conf.in index 6a207aba..345af3d5 100644 --- a/src/collectd.conf.in +++ b/src/collectd.conf.in @@ -597,8 +597,11 @@ # # -# ReportPerNodeHP "true" -# ReportRootHP "true" +# ReportPerNodeHP true +# ReportRootHP true +# ValuesPages true +# ValuesBytes false +# ValuesPercentage false # # diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod index baef1c31..f2443599 100644 --- a/src/collectd.conf.pod +++ b/src/collectd.conf.pod @@ -2836,20 +2836,35 @@ options (default is enabled). =over 4 -=item B I|I +=item B B|B If enabled, information will be collected from the hugepage counters in "/sys/devices/system/node/*/hugepages". This is used to check the per-node hugepage statistics on a NUMA system. -=item B I|I +=item B B|B If enabled, information will be collected from the hugepage counters in "/sys/kernel/mm/hugepages". This can be used on both NUMA and non-NUMA systems to check the overall hugepage statistics. +=item B B|B + +Whether to report hugepages metrics in number of pages. +Defaults to B. + +=item B B|B + +Whether to report hugepages metrics in bytes. +Defaults to B. + +=item B B|B + +Whether to report hugepages metrics as percentage. +Defaults to B. + =back =head2 Plugin C diff --git a/src/hugepages.c b/src/hugepages.c index b5acfba2..957eedb0 100644 --- a/src/hugepages.c +++ b/src/hugepages.c @@ -36,6 +36,10 @@ static const char g_plugin_name[] = "hugepages"; static _Bool g_flag_rpt_numa = 1; static _Bool g_flag_rpt_mm = 1; +static _Bool values_pages = 1; +static _Bool values_bytes = 0; +static _Bool values_percent = 0; + #define HP_HAVE_NR 0x01 #define HP_HAVE_SURPLUS 0x02 #define HP_HAVE_FREE 0x04 @@ -59,6 +63,12 @@ static int hp_config(oconfig_item_t *ci) { cf_util_get_boolean(child, &g_flag_rpt_numa); else if (strcasecmp("ReportRootHP", child->key) == 0) cf_util_get_boolean(child, &g_flag_rpt_mm); + else if (strcasecmp("ValuesPages", child->key) == 0) + cf_util_get_boolean(child, &values_pages); + else if (strcasecmp("ValuesBytes", child->key) == 0) + cf_util_get_boolean(child, &values_bytes); + else if (strcasecmp("ValuesPercentage", child->key) == 0) + cf_util_get_boolean(child, &values_percent); else ERROR("%s: Invalid configuration option: \"%s\".", g_plugin_name, child->key); @@ -67,29 +77,45 @@ static int hp_config(oconfig_item_t *ci) { return (0); } -static void submit_hp(const char *plug_inst, const char *type_instance, - gauge_t free_value, gauge_t used_value) { +static void submit_hp(const struct entry_info *info) { value_list_t vl = VALUE_LIST_INIT; - value_t values[] = { - { .gauge = free_value }, - { .gauge = used_value }, - }; - vl.values = values; - vl.values_len = STATIC_ARRAY_SIZE (values); + vl.values = &(value_t) { .gauge = NAN }; + vl.values_len = 1; + sstrncpy(vl.host, hostname_g, sizeof(vl.host)); sstrncpy(vl.plugin, g_plugin_name, sizeof(vl.plugin)); - sstrncpy(vl.plugin_instance, plug_inst, sizeof(vl.plugin_instance)); - sstrncpy(vl.type, "hugepages", sizeof(vl.type)); - - if (type_instance != NULL) { - sstrncpy(vl.type_instance, type_instance, sizeof(vl.type_instance)); + if (info->node) { + ssnprintf(vl.plugin_instance, sizeof(vl.plugin_instance), "%s-%zuKb", + info->node, info->page_size_kb); + } else { + ssnprintf(vl.plugin_instance, sizeof(vl.plugin_instance), "%zuKb", + info->page_size_kb); } - DEBUG("submit_hp pl_inst:%s, inst_type %s, free=%lf, used=%lf", plug_inst, - type_instance, free_value, used_value); + /* ensure all metrics have the same timestamp */ + vl.time = cdtime(); + + gauge_t free = info->free; + gauge_t used = (info->nr + info->surplus) - info->free; - plugin_dispatch_values(&vl); + if (values_pages) { + sstrncpy(vl.type, "vmpage_number", sizeof(vl.type)); + plugin_dispatch_multivalue(&vl, /* store_percentage = */ 0, DS_TYPE_GAUGE, + "free", free, "used", used, NULL); + } + if (values_bytes) { + gauge_t page_size = (gauge_t)(1024 * info->page_size_kb); + sstrncpy(vl.type, "memory", sizeof(vl.type)); + plugin_dispatch_multivalue(&vl, /* store_percentage = */ 0, DS_TYPE_GAUGE, + "free", free * page_size, "used", + used * page_size, NULL); + } + if (values_percent) { + sstrncpy(vl.type, "percent", sizeof(vl.type)); + plugin_dispatch_multivalue(&vl, /* store_percentage = */ 1, DS_TYPE_GAUGE, + "free", free, "used", used, NULL); + } } static int read_hugepage_entry(const char *path, const char *entry, @@ -131,8 +157,7 @@ static int read_hugepage_entry(const char *path, const char *entry, ssnprintf(type_instance, sizeof(type_instance), "free_used-%zukB", info->page_size_kb); - submit_hp(info->node, type_instance, info->free, - (info->nr + info->surplus) - info->free); + submit_hp(info); /* Reset flags so subsequent calls don't submit again. */ info->flags = 0; diff --git a/src/types.db b/src/types.db index 6ec78128..4f8d31c7 100644 --- a/src/types.db +++ b/src/types.db @@ -94,7 +94,6 @@ hash_collisions value:DERIVE:0:U http_request_methods value:DERIVE:0:U http_requests value:DERIVE:0:U http_response_codes value:DERIVE:0:U -hugepages free:GAUGE:0:4294967295, used:GAUGE:0:4294967295 humidity value:GAUGE:0:100 if_collisions value:DERIVE:0:U if_dropped rx:DERIVE:0:U, tx:DERIVE:0:U -- 2.30.2