From 41c80b0ede16a7bb115f54ca232f674b89e49770 Mon Sep 17 00:00:00 2001 From: Pablo Llopis Date: Thu, 10 Jan 2019 14:46:31 +0100 Subject: [PATCH] add slurm types --- src/slurm.c | 14 +++++++------- src/types.db | 4 ++++ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/slurm.c b/src/slurm.c index ce6677631..e9744eaa4 100644 --- a/src/slurm.c +++ b/src/slurm.c @@ -111,18 +111,18 @@ static void slurm_submit(const char *plugin_instance, const char *type, static void slurm_submit_partition(partition_state_t *partition) { for (int i = 0; i < JOB_END; i++) { - slurm_submit(partition->name, "count", job_state_names[i], + slurm_submit(partition->name, "slurm_job_state", job_state_names[i], partition->jobs_states[i]); } for (int i = 0; i < NODE_STATE_END; i++) { - slurm_submit(partition->name, "count", node_state_names[i], + slurm_submit(partition->name, "slurm_node_state", node_state_names[i], partition->nodes_states[i]); } - slurm_submit(partition->name, "count", "drain", partition->drain); - slurm_submit(partition->name, "count", "completing", partition->completing); - slurm_submit(partition->name, "count", "no_respond", partition->no_respond); - slurm_submit(partition->name, "count", "power_save", partition->power_save); - slurm_submit(partition->name, "count", "fail", partition->fail); + slurm_submit(partition->name, "slurm_node_flag", "drain", partition->drain); + slurm_submit(partition->name, "slurm_node_flag", "completing", partition->completing); + slurm_submit(partition->name, "slurm_node_flag", "no_respond", partition->no_respond); + slurm_submit(partition->name, "slurm_node_flag", "power_save", partition->power_save); + slurm_submit(partition->name, "slurm_node_flag", "fail", partition->fail); } static int slurm_read(void) { diff --git a/src/types.db b/src/types.db index 69f59b065..0762671be 100644 --- a/src/types.db +++ b/src/types.db @@ -231,6 +231,10 @@ serial_octets rx:DERIVE:0:U, tx:DERIVE:0:U signal_noise value:GAUGE:U:0 signal_power value:GAUGE:U:0 signal_quality value:GAUGE:0:U +slurm_job_state value:GAUGE:0:U +slurm_node_state value:GAUGE:0:U +slurm_node_flag value:GAUGE:0:U +slurm_stats value:GAUGE:0:U smart_attribute current:GAUGE:0:255, worst:GAUGE:0:255, threshold:GAUGE:0:255, pretty:GAUGE:0:U smart_badsectors value:GAUGE:0:U smart_powercycles value:GAUGE:0:U -- 2.47.2