From 0bdac0286e8d3c42dd8d5c3058d822e9ad0e6313 Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Mon, 14 Jun 2010 12:26:36 +0200 Subject: [PATCH] First working version of the configurable graphlist stuff. --- action_graph.c | 171 ++++++++++++++++++------------------------ common.c | 73 ++++++++++++++++++ common.h | 5 ++ graph_list.c | 229 +++++++++++++++++++++++++++++++++++++++++++++++++++++---- graph_list.h | 12 ++- test.fcgi.c | 8 +- 6 files changed, 379 insertions(+), 119 deletions(-) diff --git a/action_graph.c b/action_graph.c index ea5e3d5..585a49a 100644 --- a/action_graph.c +++ b/action_graph.c @@ -112,15 +112,10 @@ static uint32_t get_random_color (void) /* {{{ */ } /* }}} uint32_t get_random_color */ static int graph_def_add_ds (graph_def_t *gd, /* {{{ */ - const char *file, - const char *in_ds_name, size_t ds_name_len) + const char *file, const char *ds_name) { - char ds_name[ds_name_len + 1]; data_source_t *ds; - strncpy (ds_name, in_ds_name, sizeof (ds_name)); - ds_name[sizeof (ds_name) - 1] = 0; - ds = realloc (gd->data_sources, sizeof (*ds) * (gd->data_sources_num + 1)); if (ds == NULL) return (ENOMEM); @@ -150,49 +145,32 @@ static int graph_def_add_ds (graph_def_t *gd, /* {{{ */ static graph_def_t *graph_def_from_rrd_file (char *file) /* {{{ */ { - char *rrd_argv[] = { "info", file, NULL }; - int rrd_argc = (sizeof (rrd_argv) / sizeof (rrd_argv[0])) - 1; - rrd_info_t *info; - rrd_info_t *ptr; graph_def_t *gd; + char **dses = NULL; + size_t dses_num = 0; + int status; + size_t i; gd = malloc (sizeof (*gd)); if (gd == NULL) return (NULL); memset (gd, 0, sizeof (*gd)); - gd->data_sources = NULL; - info = rrd_info (rrd_argc, rrd_argv); - if (info == NULL) + status = ds_list_from_rrd_file (file, &dses_num, &dses); + if (status != 0) { - printf ("%s: rrd_info (%s) failed.\n", __func__, file); free (gd); return (NULL); } - for (ptr = info; ptr != NULL; ptr = ptr->next) + for (i = 0; i < dses_num; i++) { - size_t keylen; - size_t dslen; - - if (strncmp ("ds[", ptr->key, strlen ("ds[")) != 0) - continue; - - keylen = strlen (ptr->key); - if (keylen < strlen ("ds[?].index")) - continue; - - dslen = keylen - strlen ("ds[].index"); - assert (dslen >= 1); - - if (strcmp ("].index", ptr->key + (strlen ("ds[") + dslen)) != 0) - continue; - - graph_def_add_ds (gd, file, ptr->key + strlen ("ds["), dslen); + graph_def_add_ds (gd, file, dses[i]); + free (dses[i]); } - rrd_info_free (info); + free (dses); return (gd); } /* }}} graph_def_t *graph_def_from_rrd_file */ @@ -270,7 +248,7 @@ static void emulate_graph (int argc, char **argv) /* {{{ */ } } /* }}} void emulate_graph */ -static int ag_info_print (rrd_info_t *info) +static int ag_info_print (rrd_info_t *info) /* {{{ */ { if (info->type == RD_I_VAL) printf ("[info] %s = %g;\n", info->key, info->value.u_val); @@ -288,7 +266,7 @@ static int ag_info_print (rrd_info_t *info) return (0); } /* }}} int ag_info_print */ -static int output_graph (rrd_info_t *info) +static int output_graph (rrd_info_t *info) /* {{{ */ { rrd_info_t *img; @@ -310,58 +288,11 @@ static int output_graph (rrd_info_t *info) return (0); } /* }}} int output_graph */ -static int draw_graph (graph_def_t *gd) /* {{{ */ -{ - str_array_t *args; - rrd_info_t *info; - size_t i; - - args = array_create (); - if (args == NULL) - return (ENOMEM); - - array_append (args, "graph"); - array_append (args, "-"); - array_append (args, "--imgformat"); - array_append (args, "PNG"); - - for (i = 0; i < gd->data_sources_num; i++) - draw_graph_ds (gd, i, args); - - rrd_clear_error (); - info = rrd_graph_v (array_argc (args), array_argv (args)); - if ((info == NULL) || rrd_test_error ()) - { - printf ("Content-Type: text/plain\n\n"); - printf ("rrd_graph_v failed: %s\n", rrd_get_error ()); - emulate_graph (array_argc (args), array_argv (args)); - } - else - { - int status; - - status = output_graph (info); - if (status != 0) - { - rrd_info_t *ptr; - - printf ("Content-Type: text/plain\n\n"); - printf ("output_graph failed. Maybe the \"image\" info was not found?\n\n"); - - for (ptr = info; ptr != NULL; ptr = ptr->next) - { - ag_info_print (ptr); - } - } - } - - if (info != NULL) - rrd_info_free (info); - - array_destroy (args); - - return (0); -} /* }}} int draw_graph */ +#define OUTPUT_ERROR(...) do { \ + printf ("Content-Type: text/plain\n\n"); \ + printf (__VA_ARGS__); \ + return (0); \ +} while (0) static int init_gl (graph_list_t *gl) /* {{{ */ { @@ -398,28 +329,68 @@ static int init_gl (graph_list_t *gl) /* {{{ */ int action_graph (void) /* {{{ */ { - graph_list_t gl; - graph_def_t *gd; + str_array_t *args; + graph_config_t *cfg; + graph_instance_t *inst; + rrd_info_t *info; int status; - memset (&gl, 0, sizeof (gl)); - status = init_gl (&gl); + cfg = graph_get_selected (); + if (cfg == NULL) + OUTPUT_ERROR ("graph_get_selected () failed.\n"); + + inst = inst_get_selected (cfg); + if (inst == NULL) + OUTPUT_ERROR ("inst_get_selected (%p) failed.\n", (void *) cfg); + + args = array_create (); + if (args == NULL) + return (ENOMEM); + + array_append (args, "graph"); + array_append (args, "-"); + array_append (args, "--imgformat"); + array_append (args, "PNG"); + + status = gl_instance_get_rrdargs (cfg, inst, args); if (status != 0) { - printf ("Content-Type: text/plain\n\n" - "init_gl failed with status %i.\n", status); - return (status); + array_destroy (args); + OUTPUT_ERROR ("gl_instance_get_rrdargs failed with status %i.\n", status); } - gd = graph_def_from_gl (&gl); - if (gd == NULL) + rrd_clear_error (); + info = rrd_graph_v (array_argc (args), array_argv (args)); + if ((info == NULL) || rrd_test_error ()) { - printf ("graph_def_from_gl failed.\n"); - return (0); + printf ("Content-Type: text/plain\n\n"); + printf ("rrd_graph_v failed: %s\n", rrd_get_error ()); + emulate_graph (array_argc (args), array_argv (args)); } + else + { + int status; - draw_graph (gd); - graph_def_free (gd); + status = output_graph (info); + if (status != 0) + { + rrd_info_t *ptr; + + printf ("Content-Type: text/plain\n\n"); + printf ("output_graph failed. Maybe the \"image\" info was not found?\n\n"); + + for (ptr = info; ptr != NULL; ptr = ptr->next) + { + ag_info_print (ptr); + } + } + } + + if (info != NULL) + rrd_info_free (info); + + array_destroy (args); + args = NULL; return (0); } /* }}} int action_graph */ diff --git a/common.c b/common.c index ec267af..5d2a67d 100644 --- a/common.c +++ b/common.c @@ -8,7 +8,10 @@ #include #include +#include + #include "common.h" +#include "graph_list.h" static int foreach_rrd_file (const char *dir, /* {{{ */ int (*callback) (const char *, void *), @@ -170,6 +173,76 @@ size_t c_strlcat (char *dst, const char *src, size_t size) /* {{{ */ return (retval); } /* }}} size_t c_strlcat */ +int ds_list_from_rrd_file (char *file, /* {{{ */ + size_t *ret_dses_num, char ***ret_dses) +{ + char *rrd_argv[] = { "info", file, NULL }; + int rrd_argc = (sizeof (rrd_argv) / sizeof (rrd_argv[0])) - 1; + + rrd_info_t *info; + rrd_info_t *ptr; + + char **dses = NULL; + size_t dses_num = 0; + + info = rrd_info (rrd_argc, rrd_argv); + if (info == NULL) + { + printf ("%s: rrd_info (%s) failed.\n", __func__, file); + return (-1); + } + + for (ptr = info; ptr != NULL; ptr = ptr->next) + { + size_t keylen; + size_t dslen; + char *ds; + char **tmp; + + if (strncmp ("ds[", ptr->key, strlen ("ds[")) != 0) + continue; + + keylen = strlen (ptr->key); + if (keylen < strlen ("ds[?].index")) + continue; + + dslen = keylen - strlen ("ds[].index"); + assert (dslen >= 1); + + if (strcmp ("].index", ptr->key + (strlen ("ds[") + dslen)) != 0) + continue; + + ds = malloc (dslen + 1); + if (ds == NULL) + continue; + + memcpy (ds, ptr->key + strlen ("ds["), dslen); + ds[dslen] = 0; + + tmp = realloc (dses, sizeof (*dses) * (dses_num + 1)); + if (tmp == NULL) + { + free (ds); + continue; + } + dses = tmp; + + dses[dses_num] = ds; + dses_num++; + } + + rrd_info_free (info); + + if (dses_num < 1) + { + assert (dses == NULL); + return (ENOENT); + } + + *ret_dses_num = dses_num; + *ret_dses = dses; + return (0); +} /* }}} int ds_list_from_rrd_file */ /* vim: set sw=2 sts=2 et fdm=marker : */ diff --git a/common.h b/common.h index e211406..8aa1a53 100644 --- a/common.h +++ b/common.h @@ -3,6 +3,8 @@ #define DATA_DIR "/var/lib/collectd/rrd" +#include "graph_list.h" + typedef int (*callback_type_t) (const char *type, void *user_data); typedef int (*callback_plugin_t) (const char *plugin, void *user_data); typedef int (*callback_host_t) (const char *host, void *user_data); @@ -15,5 +17,8 @@ int foreach_host (callback_host_t, void *user_data); size_t c_strlcat (char *dst, const char *src, size_t size); #define strlcat c_strlcat +int ds_list_from_rrd_file (char *file, + size_t *ret_dses_num, char ***ret_dses); + #endif /* COMMON_H */ /* vim: set sw=2 sts=2 et fdm=marker : */ diff --git a/graph_list.c b/graph_list.c index 389a03b..a07ed5c 100644 --- a/graph_list.c +++ b/graph_list.c @@ -4,14 +4,15 @@ #include #include #include - -#include -#include +#include /* PATH_MAX */ #include "graph_list.h" #include "common.h" #include "utils_params.h" +#include +#include + /* * Defines */ @@ -20,6 +21,15 @@ #define ANY_TOKEN "/any/" #define ALL_TOKEN "/all/" +#if 0 +# define GL_DEBUG(...) do { \ + printf ("Content-Type: text/plain\n\n"); \ + printf (__VA_ARGS__); \ +} while (0) +#else +# define GL_DEBUG(...) /**/ +#endif + /* * Data types */ @@ -182,6 +192,65 @@ static _Bool file_matches (const graph_ident_t *sel, /* {{{ */ return (1); } /* }}} _Bool ident_compare */ +/* Free all the pointers contained in the graph_ident_t but don't free the + * graph_ident_t* itself. */ +static void ident_destroy (graph_ident_t *ident) /* {{{ */ +{ + if (ident == NULL) + return; + + free (ident->host); + ident->host = NULL; + free (ident->plugin); + ident->plugin = NULL; + free (ident->plugin_instance); + ident->plugin_instance = NULL; + free (ident->type); + ident->type = NULL; + free (ident->type_instance); + ident->type_instance = NULL; +} /* }}} void ident_destroy */ + +static void instance_destroy (graph_instance_t *inst) /* {{{ */ +{ + graph_instance_t *next; + size_t i; + + if (inst == NULL) + return; + + next = inst->next; + + ident_destroy (&inst->select); + + for (i = 0; i < inst->files_num; i++) + ident_destroy (inst->files + i); + free (inst->files); + + free (inst); + + instance_destroy (next); +} /* }}} void instance_destroy */ + +static void graph_destroy (graph_config_t *cfg) /* {{{ */ +{ + graph_config_t *next; + + if (cfg == NULL) + return; + + next = cfg->next; + + ident_destroy (&cfg->select); + + free (cfg->title); + free (cfg->vertical_label); + + instance_destroy (cfg->instances); + + graph_destroy (next); +} /* }}} void graph_destroy */ + /* * Copy part of an identifier. If the "template" value is ANY_TOKEN, "value" is * copied and returned. This function is used when creating graph_instance_t @@ -391,7 +460,8 @@ static int register_file (const graph_ident_t *file) /* {{{ */ return (0); } /* }}} int register_file */ -static int FIXME_graph_create_from_file (const graph_ident_t *file) /* {{{ */ +static int FIXME_graph_create_from_file (const graph_ident_t *file, /* {{{ */ + const char *title) { graph_config_t *cfg; @@ -407,6 +477,8 @@ static int FIXME_graph_create_from_file (const graph_ident_t *file) /* {{{ */ cfg->select.type_instance = strdup (file->type_instance); cfg->title = NULL; + if (title != NULL) + cfg->title = strdup (title); cfg->vertical_label = NULL; cfg->instances = NULL; cfg->next = NULL; @@ -430,35 +502,33 @@ static int read_graph_config (void) /* {{{ */ ident.plugin_instance = ANY_TOKEN; ident.type = "cpu"; ident.type_instance = ALL_TOKEN; - FIXME_graph_create_from_file (&ident); + FIXME_graph_create_from_file (&ident, "CPU {instance} usage"); ident.plugin = "memory"; ident.plugin_instance = ""; ident.type = "memory"; - FIXME_graph_create_from_file (&ident); + FIXME_graph_create_from_file (&ident, "Memory usage"); ident.plugin = "swap"; ident.plugin_instance = ""; ident.type = "swap"; - FIXME_graph_create_from_file (&ident); + FIXME_graph_create_from_file (&ident, "Swap"); ident.plugin = ANY_TOKEN; ident.plugin_instance = ANY_TOKEN; ident.type = "ps_state"; - FIXME_graph_create_from_file (&ident); + FIXME_graph_create_from_file (&ident, "Processes"); ident.host = ALL_TOKEN; ident.plugin = "cpu"; ident.plugin_instance = ALL_TOKEN; ident.type = "cpu"; ident.type_instance = "idle"; - FIXME_graph_create_from_file (&ident); + FIXME_graph_create_from_file (&ident, "CPU idle overview"); return (0); } /* }}} int read_graph_config */ - - static int gl_compare (const void *p0, const void *p1) /* {{{ */ { const graph_ident_t *gl0 = p0; @@ -505,6 +575,11 @@ static void gl_clear_entry (graph_ident_t *gl) /* {{{ */ static void gl_clear (void) /* {{{ */ { size_t i; + graph_config_t *cfg; + + cfg = graph_config_head; + graph_config_head = NULL; + graph_destroy (cfg); for (i = 0; i < graph_list_length; i++) gl_clear_entry (graph_list + i); @@ -684,9 +759,88 @@ static const char *get_part_from_param (const char *prim_key, /* {{{ */ return (param (sec_key)); } /* }}} const char *get_part_from_param */ +int gl_ident_get_rrdargs (graph_config_t *cfg, /* {{{ */ + graph_instance_t *inst, + graph_ident_t *ident, + str_array_t *args) +{ + char *file; + char **dses = NULL; + size_t dses_num = 0; + int status; + size_t i; + + if ((cfg == NULL) || (inst == NULL) || (ident == NULL) || (args == NULL)) + return (EINVAL); + + file = ident_to_file (ident); + if (file == NULL) + { + GL_DEBUG ("gl_ident_get_rrdargs: ident_to_file returned NULL.\n"); + return (-1); + } + + GL_DEBUG ("gl_ident_get_rrdargs: file = %s;\n", file); + + status = ds_list_from_rrd_file (file, &dses_num, &dses); + if (status != 0) + { + free (file); + return (status); + } + + for (i = 0; i < dses_num; i++) + { + int id; + + GL_DEBUG ("gl_ident_get_rrdargs: ds[%lu] = %s;\n", (unsigned long) i, dses[i]); + + id = array_argc (args); + array_append_format (args, "DEF:avg%i=%s:%s:AVERAGE", id, file, dses[i]); + array_append_format (args, "LINE1:avg%i#ff0000:%s\\l", id, file); + + free (dses[i]); + } + free (dses); + + free (file); + + return (0); +} /* }}} int gl_ident_get_rrdargs */ + /* * Global functions */ +char *ident_to_file (const graph_ident_t *ident) /* {{{ */ +{ + char buffer[PATH_MAX]; + + buffer[0] = 0; + + strlcat (buffer, DATA_DIR, sizeof (buffer)); + strlcat (buffer, "/", sizeof (buffer)); + + strlcat (buffer, ident->host, sizeof (buffer)); + strlcat (buffer, "/", sizeof (buffer)); + strlcat (buffer, ident->plugin, sizeof (buffer)); + if (ident->plugin_instance[0] != 0) + { + strlcat (buffer, "-", sizeof (buffer)); + strlcat (buffer, ident->plugin_instance, sizeof (buffer)); + } + strlcat (buffer, "/", sizeof (buffer)); + strlcat (buffer, ident->type, sizeof (buffer)); + if (ident->type_instance[0] != 0) + { + strlcat (buffer, "-", sizeof (buffer)); + strlcat (buffer, ident->type_instance, sizeof (buffer)); + } + + strlcat (buffer, ".rrd", sizeof (buffer)); + + return (strdup (buffer)); +} /* }}} char *ident_to_file */ + int gl_instance_get_params (graph_config_t *cfg, graph_instance_t *inst, /* {{{ */ char *buffer, size_t buffer_size) { @@ -744,12 +898,18 @@ graph_instance_t *inst_get_selected (graph_config_t *cfg) /* {{{ */ cfg = graph_get_selected (); if (cfg == NULL) + { + GL_DEBUG ("inst_get_selected: cfg == NULL;\n"); return (NULL); + } if ((host == NULL) || (plugin == NULL) || (plugin_instance == NULL) || (type == NULL) || (type_instance == NULL)) + { + GL_DEBUG ("inst_get_selected: A parameter is NULL.\n"); return (NULL); + } for (inst = cfg->instances; inst != NULL; inst = inst->next) { @@ -763,6 +923,7 @@ graph_instance_t *inst_get_selected (graph_config_t *cfg) /* {{{ */ return (inst); } + GL_DEBUG ("inst_get_selected: No match found.\n"); return (NULL); } /* }}} graph_instance_t *inst_get_selected */ @@ -774,6 +935,8 @@ int gl_graph_get_all (gl_cfg_callback callback, /* {{{ */ if (callback == NULL) return (EINVAL); + gl_update (); + for (cfg = graph_config_head; cfg != NULL; cfg = cfg->next) { int status; @@ -798,7 +961,13 @@ graph_config_t *graph_get_selected (void) /* {{{ */ if ((host == NULL) || (plugin == NULL) || (plugin_instance == NULL) || (type == NULL) || (type_instance == NULL)) + { + printf ("Content-Type: text/plain\n\n"); + printf ("graph_get_selected(): A param is NULL.\n"); return (NULL); + } + + gl_update (); for (cfg = graph_config_head; cfg != NULL; cfg = cfg->next) { @@ -812,6 +981,9 @@ graph_config_t *graph_get_selected (void) /* {{{ */ return (cfg); } + printf ("Content-Type: text/plain\n\n"); + printf ("graph_get_selected(): No matching graph found.\n"); + return (NULL); } /* }}} graph_config_t *graph_get_selected */ @@ -866,6 +1038,8 @@ int gl_instance_get_all (gl_inst_callback callback, /* {{{ */ { graph_config_t *cfg; + gl_update (); + for (cfg = graph_config_head; cfg != NULL; cfg = cfg->next) { graph_instance_t *inst; @@ -883,6 +1057,35 @@ int gl_instance_get_all (gl_inst_callback callback, /* {{{ */ return (0); } /* }}} int gl_instance_get_all */ +int gl_instance_get_rrdargs (graph_config_t *cfg, /* {{{ */ + graph_instance_t *inst, + str_array_t *args) +{ + size_t i; + + if ((cfg == NULL) || (inst == NULL) || (args == NULL)) + return (EINVAL); + + if (cfg->title != NULL) + { + array_append (args, "-t"); + array_append (args, cfg->title); + } + + for (i = 0; i < inst->files_num; i++) + { + int status; + + status = gl_ident_get_rrdargs (cfg, inst, inst->files + i, args); + if (status != 0) + return (status); + } + + return (0); +} /* }}} int gl_instance_get_rrdargs */ + +/* DELETEME */ + int gl_update (void) /* {{{ */ { time_t now; @@ -893,8 +1096,6 @@ int gl_update (void) /* {{{ */ printf ("Content-Type: text/plain\n\n"); */ - read_graph_config (); - now = time (NULL); if ((gl_last_update + UPDATE_INTERVAL) >= now) @@ -902,6 +1103,8 @@ int gl_update (void) /* {{{ */ gl_clear (); + read_graph_config (); + memset (&gl, 0, sizeof (gl)); gl.host = NULL; gl.plugin = NULL; diff --git a/graph_list.h b/graph_list.h index 5910484..567575b 100644 --- a/graph_list.h +++ b/graph_list.h @@ -1,6 +1,8 @@ #ifndef GRAPH_LIST_H #define GRAPH_LIST_H 1 +#include "utils_array.h" + struct graph_ident_s; typedef struct graph_ident_s graph_ident_t; @@ -22,11 +24,16 @@ typedef int (*gl_inst_callback) (graph_config_t *cfg, /* * Functions */ +char *ident_to_file (const graph_ident_t *ident); + int gl_graph_get_all (gl_cfg_callback callback, void *user_data); graph_config_t *graph_get_selected (void); +int gl_graph_get_title (graph_config_t *cfg, + char *buffer, size_t buffer_size); + int gl_graph_instance_get_all (graph_config_t *cfg, gl_inst_callback callback, void *user_data); @@ -38,9 +45,8 @@ int gl_instance_get_all (gl_inst_callback callback, int gl_instance_get_params (graph_config_t *cfg, graph_instance_t *inst, char *buffer, size_t buffer_size); -int gl_graph_get_title (graph_config_t *cfg, - char *buffer, size_t buffer_size); - +int gl_instance_get_rrdargs (graph_config_t *cfg, graph_instance_t *inst, + str_array_t *args); struct graph_list_s { diff --git a/test.fcgi.c b/test.fcgi.c index f566965..097c55c 100644 --- a/test.fcgi.c +++ b/test.fcgi.c @@ -9,9 +9,6 @@ #include #include -#include -#include - #include "common.h" #include "graph_list.h" #include "utils_params.h" @@ -19,6 +16,11 @@ #include "action_graph.h" #include "action_list_graphs.h" +/* Include this last, so the macro magic of doesn't interfere + * with our own header files. */ +#include +#include + struct action_s { const char *name; -- 2.11.0