action_graph.c action_graph.h \
action_list_graphs.c action_list_graphs.h \
action_search_json.c action_search_json.h \
- action_show_graph.c action_show_graph.h \
+ action_show_instance.c action_show_instance.h \
common.c common.h \
filesystem.c filesystem.h \
graph_types.h \
+++ /dev/null
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <stdint.h>
-#include <inttypes.h>
-#include <assert.h>
-
-#include "action_show_graph.h"
-#include "common.h"
-#include "graph.h"
-#include "graph_ident.h"
-#include "graph_instance.h"
-#include "graph_list.h"
-#include "utils_cgi.h"
-
-#include <fcgiapp.h>
-#include <fcgi_stdio.h>
-
-#define OUTPUT_ERROR(...) do { \
- printf ("Content-Type: text/plain\n\n"); \
- printf (__VA_ARGS__); \
- return (0); \
-} while (0)
-
-struct show_graph_data_s
-{
- graph_config_t *cfg;
- graph_instance_t *inst;
-};
-typedef struct show_graph_data_s show_graph_data_t;
-
-static void show_breadcrump_field (const char *str, /* {{{ */
- const char *field_name)
-{
- if ((str == NULL) || (str[0] == 0))
- printf ("<em>none</em>");
- else if (IS_ANY (str))
- printf ("<em>any</em>");
- else if (IS_ALL (str))
- printf ("<em>all</em>");
- else
- {
- char *str_html = html_escape (str);
-
- if (field_name != NULL)
- printf ("<a href=\"%s?action=list_graphs;q=%s:%s\">%s</a>",
- script_name (), field_name, str_html, str_html);
- else
- printf ("<a href=\"%s?action=list_graphs;q=%s\">%s</a>",
- script_name (), str_html, str_html);
-
- free (str_html);
- }
-} /* }}} void show_breadcrump_field */
-
-static int show_breadcrump (show_graph_data_t *data) /* {{{ */
-{
- graph_ident_t *ident;
- char *prefix;
-
- if (data->inst != NULL)
- {
- prefix = "Instance";
- ident = inst_get_selector (data->inst);
- }
- else
- {
- prefix = "Graph";
- ident = graph_get_selector (data->cfg);
- }
-
- printf ("<div class=\"breadcrump\">%s: "", prefix);
- show_breadcrump_field (ident_get_host (ident), "host");
- printf (" / ");
- show_breadcrump_field (ident_get_plugin (ident), "plugin");
- printf (" – ");
- show_breadcrump_field (ident_get_plugin_instance (ident), "plugin_instance");
- printf (" / ");
- show_breadcrump_field (ident_get_type (ident), "type");
- printf (" – ");
- show_breadcrump_field (ident_get_type_instance (ident), "type_instance");
- printf (""</div>\n");
-
- return (0);
-} /* }}} int show_breadcrump */
-
-static int show_time_selector (__attribute__((unused)) void *user_data) /* {{{ */
-{
- param_list_t *pl;
-
- pl = param_create (/* query string = */ NULL);
- param_set (pl, "begin", NULL);
- param_set (pl, "end", NULL);
- param_set (pl, "button", NULL);
-
- printf ("<form action=\"%s\" method=\"get\">\n", script_name ());
-
- param_print_hidden (pl);
-
- printf (" <select name=\"begin\">\n"
- " <option value=\"-3600\">Hour</option>\n"
- " <option value=\"-86400\">Day</option>\n"
- " <option value=\"-604800\">Week</option>\n"
- " <option value=\"-2678400\">Month</option>\n"
- " <option value=\"-31622400\">Year</option>\n"
- " </select>\n"
- " <input type=\"submit\" name=\"button\" value=\"Go\" />\n");
-
- printf ("</form>\n");
-
- param_destroy (pl);
-
- return (0);
-} /* }}} int show_time_selector */
-
-static int show_instance_list_cb (graph_instance_t *inst, /* {{{ */
- void *user_data)
-{
- show_graph_data_t *data = user_data;
- char descr[128];
- char params[1024];
-
- memset (descr, 0, sizeof (descr));
- inst_describe (data->cfg, inst, descr, sizeof (descr));
- html_escape_buffer (descr, sizeof (descr));
-
- if (inst == data->inst)
- {
- printf (" <li class=\"instance\"><strong>%s</strong></li>\n", descr);
- return (0);
- }
-
- memset (params, 0, sizeof (params));
- inst_get_params (data->cfg, inst, params, sizeof (params));
- html_escape_buffer (params, sizeof (params));
-
- printf (" <li class=\"instance\">"
- "<a href=\"%s?action=show_graph;%s\">%s</a></li>\n",
- script_name (), params, descr);
-
- return (0);
-} /* }}} int show_instance_list_cb */
-
-static int show_instance_list (void *user_data) /* {{{ */
-{
- show_graph_data_t *data = user_data;
- char title[128];
- char params[1024];
-
- memset (title, 0, sizeof (title));
- graph_get_title (data->cfg, title, sizeof (title));
- html_escape_buffer (title, sizeof (title));
-
- memset (params, 0, sizeof (params));
- graph_get_params (data->cfg, params, sizeof (params));
- html_escape_buffer (params, sizeof (params));
-
- printf ("<ul class=\"graph_list\">\n"
- " <li class=\"graph\"><a href=\"%s?action=show_graph;%s\">%s</a>\n"
- " <ul class=\"instance_list\">\n",
- script_name (), params, title);
-
- graph_inst_foreach (data->cfg, show_instance_list_cb, user_data);
-
- printf (" </ul>\n"
- "</ul>\n");
-
- return (0);
-} /* }}} int show_instance_list */
-
-static int show_instance_cb (graph_config_t *cfg, /* {{{ */
- graph_instance_t *inst,
- __attribute__((unused)) void *user_data)
-{
- char title[128];
- char descr[128];
- char params[1024];
-
- memset (title, 0, sizeof (title));
- graph_get_title (cfg, title, sizeof (title));
- html_escape_buffer (title, sizeof (title));
-
- memset (descr, 0, sizeof (descr));
- inst_describe (cfg, inst, descr, sizeof (descr));
- html_escape_buffer (descr, sizeof (descr));
-
- memset (params, 0, sizeof (params));
- inst_get_params (cfg, inst, params, sizeof (params));
- html_escape_buffer (params, sizeof (params));
-
- printf ("<h3>Instance "%s"</h3>\n", descr);
- printf ("<div class=\"graph-img\"><img src=\"%s?action=graph;%s\" "
- "title=\"%s / %s\" /></div>\n",
- script_name (), params, title, descr);
-
- return (0);
-} /* }}} int show_instance_cb */
-
-static int show_instance (void *user_data) /* {{{ */
-{
- show_graph_data_t *data = user_data;
- int status;
-
- fprintf (stderr, "show_instance: Calling inst_get_all_selected()\n");
- status = inst_get_all_selected (data->cfg,
- /* callback = */ show_instance_cb, /* user data = */ NULL);
- if (status != 0)
- fprintf (stderr, "show_instance: inst_get_all_selected failed "
- "with status %i\n", status);
-
- return (0);
-} /* }}} int show_instance */
-
-static int show_graph (void *user_data) /* {{{ */
-{
- show_graph_data_t *data = user_data;
-
- show_breadcrump (data);
- return (show_instance_list (user_data));
-} /* }}} int show_graph */
-
-int action_show_graph (void) /* {{{ */
-{
- page_callbacks_t pg_callbacks = PAGE_CALLBACKS_INIT;
- show_graph_data_t pg_data;
-
- char tmp[128];
- char title[128];
-
- pg_data.cfg = gl_graph_get_selected ();
- if (pg_data.cfg == NULL)
- OUTPUT_ERROR ("gl_graph_get_selected () failed.\n");
-
- memset (tmp, 0, sizeof (tmp));
- graph_get_title (pg_data.cfg, tmp, sizeof (tmp));
- snprintf (title, sizeof (title), "Graph \"%s\"", tmp);
- title[sizeof (title) - 1] = 0;
-
- pg_callbacks.top_right = html_print_search_box;
- pg_callbacks.middle_center = show_instance;
- pg_callbacks.middle_left = show_instance_list;
- pg_callbacks.middle_right = show_time_selector;
-
- html_print_page (title, &pg_callbacks, &pg_data);
-
- return (0);
-} /* }}} int action_graph */
-
-/* vim: set sw=2 sts=2 et fdm=marker : */
+++ /dev/null
-#ifndef ACTION_SHOW_GRAPH_H
-#define ACTION_SHOW_GRAPH_H 1
-
-int action_show_graph (void);
-
-#endif /* ACTION_SHOW_GRAPH_H */
-/* vim: set sw=2 sts=2 et fdm=marker : */
--- /dev/null
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <stdint.h>
+#include <inttypes.h>
+#include <assert.h>
+
+#include "action_show_instance.h"
+#include "common.h"
+#include "graph.h"
+#include "graph_ident.h"
+#include "graph_instance.h"
+#include "graph_list.h"
+#include "utils_cgi.h"
+
+#include <fcgiapp.h>
+#include <fcgi_stdio.h>
+
+#define OUTPUT_ERROR(...) do { \
+ printf ("Content-Type: text/plain\n\n"); \
+ printf (__VA_ARGS__); \
+ return (0); \
+} while (0)
+
+struct show_graph_data_s
+{
+ graph_config_t *cfg;
+ graph_instance_t *inst;
+};
+typedef struct show_graph_data_s show_graph_data_t;
+
+static void show_breadcrump_field (const char *str, /* {{{ */
+ const char *field_name)
+{
+ if ((str == NULL) || (str[0] == 0))
+ printf ("<em>none</em>");
+ else if (IS_ANY (str))
+ printf ("<em>any</em>");
+ else if (IS_ALL (str))
+ printf ("<em>all</em>");
+ else
+ {
+ char *str_html = html_escape (str);
+
+ if (field_name != NULL)
+ printf ("<a href=\"%s?action=list_graphs;q=%s:%s\">%s</a>",
+ script_name (), field_name, str_html, str_html);
+ else
+ printf ("<a href=\"%s?action=list_graphs;q=%s\">%s</a>",
+ script_name (), str_html, str_html);
+
+ free (str_html);
+ }
+} /* }}} void show_breadcrump_field */
+
+static int show_breadcrump (show_graph_data_t *data) /* {{{ */
+{
+ graph_ident_t *ident;
+ char *prefix;
+
+ if (data->inst != NULL)
+ {
+ prefix = "Instance";
+ ident = inst_get_selector (data->inst);
+ }
+ else
+ {
+ prefix = "Graph";
+ ident = graph_get_selector (data->cfg);
+ }
+
+ printf ("<div class=\"breadcrump\">%s: "", prefix);
+ show_breadcrump_field (ident_get_host (ident), "host");
+ printf (" / ");
+ show_breadcrump_field (ident_get_plugin (ident), "plugin");
+ printf (" – ");
+ show_breadcrump_field (ident_get_plugin_instance (ident), "plugin_instance");
+ printf (" / ");
+ show_breadcrump_field (ident_get_type (ident), "type");
+ printf (" – ");
+ show_breadcrump_field (ident_get_type_instance (ident), "type_instance");
+ printf (""</div>\n");
+
+ return (0);
+} /* }}} int show_breadcrump */
+
+static int show_time_selector (__attribute__((unused)) void *user_data) /* {{{ */
+{
+ param_list_t *pl;
+
+ pl = param_create (/* query string = */ NULL);
+ param_set (pl, "begin", NULL);
+ param_set (pl, "end", NULL);
+ param_set (pl, "button", NULL);
+
+ printf ("<form action=\"%s\" method=\"get\">\n", script_name ());
+
+ param_print_hidden (pl);
+
+ printf (" <select name=\"begin\">\n"
+ " <option value=\"-3600\">Hour</option>\n"
+ " <option value=\"-86400\">Day</option>\n"
+ " <option value=\"-604800\">Week</option>\n"
+ " <option value=\"-2678400\">Month</option>\n"
+ " <option value=\"-31622400\">Year</option>\n"
+ " </select>\n"
+ " <input type=\"submit\" name=\"button\" value=\"Go\" />\n");
+
+ printf ("</form>\n");
+
+ param_destroy (pl);
+
+ return (0);
+} /* }}} int show_time_selector */
+
+static int show_instance_list_cb (graph_instance_t *inst, /* {{{ */
+ void *user_data)
+{
+ show_graph_data_t *data = user_data;
+ char descr[128];
+ char params[1024];
+
+ memset (descr, 0, sizeof (descr));
+ inst_describe (data->cfg, inst, descr, sizeof (descr));
+ html_escape_buffer (descr, sizeof (descr));
+
+ if (inst == data->inst)
+ {
+ printf (" <li class=\"instance\"><strong>%s</strong></li>\n", descr);
+ return (0);
+ }
+
+ memset (params, 0, sizeof (params));
+ inst_get_params (data->cfg, inst, params, sizeof (params));
+ html_escape_buffer (params, sizeof (params));
+
+ printf (" <li class=\"instance\">"
+ "<a href=\"%s?action=show_graph;%s\">%s</a></li>\n",
+ script_name (), params, descr);
+
+ return (0);
+} /* }}} int show_instance_list_cb */
+
+static int show_instance_list (void *user_data) /* {{{ */
+{
+ show_graph_data_t *data = user_data;
+ char title[128];
+ char params[1024];
+
+ memset (title, 0, sizeof (title));
+ graph_get_title (data->cfg, title, sizeof (title));
+ html_escape_buffer (title, sizeof (title));
+
+ memset (params, 0, sizeof (params));
+ graph_get_params (data->cfg, params, sizeof (params));
+ html_escape_buffer (params, sizeof (params));
+
+ printf ("<ul class=\"graph_list\">\n"
+ " <li class=\"graph\"><a href=\"%s?action=show_graph;%s\">%s</a>\n"
+ " <ul class=\"instance_list\">\n",
+ script_name (), params, title);
+
+ graph_inst_foreach (data->cfg, show_instance_list_cb, user_data);
+
+ printf (" </ul>\n"
+ "</ul>\n");
+
+ return (0);
+} /* }}} int show_instance_list */
+
+static int show_instance_cb (graph_config_t *cfg, /* {{{ */
+ graph_instance_t *inst,
+ __attribute__((unused)) void *user_data)
+{
+ char title[128];
+ char descr[128];
+ char params[1024];
+
+ memset (title, 0, sizeof (title));
+ graph_get_title (cfg, title, sizeof (title));
+ html_escape_buffer (title, sizeof (title));
+
+ memset (descr, 0, sizeof (descr));
+ inst_describe (cfg, inst, descr, sizeof (descr));
+ html_escape_buffer (descr, sizeof (descr));
+
+ memset (params, 0, sizeof (params));
+ inst_get_params (cfg, inst, params, sizeof (params));
+ html_escape_buffer (params, sizeof (params));
+
+ printf ("<h3>Instance "%s"</h3>\n", descr);
+ printf ("<div class=\"graph-img\"><img src=\"%s?action=graph;%s\" "
+ "title=\"%s / %s\" /></div>\n",
+ script_name (), params, title, descr);
+
+ return (0);
+} /* }}} int show_instance_cb */
+
+static int show_instance (void *user_data) /* {{{ */
+{
+ show_graph_data_t *data = user_data;
+ int status;
+
+ fprintf (stderr, "show_instance: Calling inst_get_all_selected()\n");
+ status = inst_get_all_selected (data->cfg,
+ /* callback = */ show_instance_cb, /* user data = */ NULL);
+ if (status != 0)
+ fprintf (stderr, "show_instance: inst_get_all_selected failed "
+ "with status %i\n", status);
+
+ return (0);
+} /* }}} int show_instance */
+
+static int show_graph (void *user_data) /* {{{ */
+{
+ show_graph_data_t *data = user_data;
+
+ show_breadcrump (data);
+ return (show_instance_list (user_data));
+} /* }}} int show_graph */
+
+int action_show_instance (void) /* {{{ */
+{
+ page_callbacks_t pg_callbacks = PAGE_CALLBACKS_INIT;
+ show_graph_data_t pg_data;
+
+ char tmp[128];
+ char title[128];
+
+ pg_data.cfg = gl_graph_get_selected ();
+ if (pg_data.cfg == NULL)
+ OUTPUT_ERROR ("gl_graph_get_selected () failed.\n");
+
+ memset (tmp, 0, sizeof (tmp));
+ graph_get_title (pg_data.cfg, tmp, sizeof (tmp));
+ snprintf (title, sizeof (title), "Graph \"%s\"", tmp);
+ title[sizeof (title) - 1] = 0;
+
+ pg_callbacks.top_right = html_print_search_box;
+ pg_callbacks.middle_center = show_instance;
+ pg_callbacks.middle_left = show_instance_list;
+ pg_callbacks.middle_right = show_time_selector;
+
+ html_print_page (title, &pg_callbacks, &pg_data);
+
+ return (0);
+} /* }}} int action_show_instance */
+
+/* vim: set sw=2 sts=2 et fdm=marker : */
--- /dev/null
+#ifndef ACTION_SHOW_GRAPH_H
+#define ACTION_SHOW_GRAPH_H 1
+
+int action_show_instance (void);
+
+#endif /* ACTION_SHOW_GRAPH_H */
+/* vim: set sw=2 sts=2 et fdm=marker : */
#include "action_graph.h"
#include "action_list_graphs.h"
#include "action_search_json.h"
-#include "action_show_graph.h"
+#include "action_show_instance.h"
/* Include this last, so the macro magic of <fcgi_stdio.h> doesn't interfere
* with our own header files. */
{ "graph", action_graph },
{ "list_graphs", action_list_graphs },
{ "search_json", action_search_json },
- { "show_graph", action_show_graph },
+ { "show_graph", action_show_instance },
{ "usage", action_usage }
};
static const size_t actions_num = sizeof (actions) / sizeof (actions[0]);