X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Faction_show_graph.c;h=193ba225cf1cecf372575c94c0ece8d17e5cc352;hb=11c35f96040b5cfc9f842ed27a555a6f15318472;hp=40ebcd305e55b043db41b2e1ba9527c04ffd8496;hpb=25849a1143a916b31fb9782a6cf10399849f88ef;p=collection4.git
diff --git a/src/action_show_graph.c b/src/action_show_graph.c
index 40ebcd3..193ba22 100644
--- a/src/action_show_graph.c
+++ b/src/action_show_graph.c
@@ -8,6 +8,9 @@
#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"
@@ -27,6 +30,90 @@ struct show_graph_data_s
};
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 ("none");
+ else if (IS_ANY (str))
+ printf ("any");
+ else if (IS_ALL (str))
+ printf ("all");
+ else
+ {
+ char *str_html = html_escape (str);
+
+ if (field_name != NULL)
+ printf ("%s",
+ script_name (), field_name, str_html, str_html);
+ else
+ printf ("%s",
+ 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 ("
%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 (""
\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 ("\n");
+
+ param_destroy (pl);
+
+ return (0);
+} /* }}} int show_time_selector */
+
static int show_instance_list_cb (graph_instance_t *inst, /* {{{ */
void *user_data)
{
@@ -48,7 +135,8 @@ static int show_instance_list_cb (graph_instance_t *inst, /* {{{ */
inst_get_params (data->cfg, inst, params, sizeof (params));
html_escape_buffer (params, sizeof (params));
- printf (" %s\n",
+ printf (" "
+ "%s\n",
script_name (), params, descr);
return (0);
@@ -57,19 +145,23 @@ static int show_instance_list_cb (graph_instance_t *inst, /* {{{ */
static int show_instance_list (void *user_data) /* {{{ */
{
show_graph_data_t *data = user_data;
- graph_instance_t *inst;
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 ("\n"
- " - %s\n"
- "
\n", title);
+ " - %s\n"
+ "
\n",
+ script_name (), params, title);
- inst = graph_get_instances (data->cfg);
- inst_foreach (inst, show_instance_list_cb, user_data);
+ graph_inst_foreach (data->cfg, show_instance_list_cb, user_data);
printf ("
\n"
"
\n");
@@ -77,12 +169,16 @@ static int show_instance_list (void *user_data) /* {{{ */
return (0);
} /* }}} int show_instance_list */
-static int show_graph (void *user_data) /* {{{ */
+static int show_instance (void *user_data) /* {{{ */
{
show_graph_data_t *data = user_data;
char title[128];
char descr[128];
- char params[1024];
+ param_list_t *pl;
+ char *params;
+ char params_html[1024];
+
+ show_breadcrump (data);
memset (title, 0, sizeof (title));
graph_get_title (data->cfg, title, sizeof (title));
@@ -92,15 +188,36 @@ static int show_graph (void *user_data) /* {{{ */
inst_describe (data->cfg, data->inst, descr, sizeof (descr));
html_escape_buffer (descr, sizeof (descr));
- memset (params, 0, sizeof (params));
- inst_get_params (data->cfg, data->inst, params, sizeof (params));
- html_escape_buffer (params, sizeof (params));
+ pl = param_create (/* query string = */ NULL);
+ param_set (pl, "action", "graph");
+ param_set (pl, "button", NULL);
+
+ params = param_as_string (pl);
+ if (params == NULL)
+ {
+ printf ("param_as_string failed.
\n");
+ param_destroy (pl);
+ return (-1);
+ }
- printf ("\n",
script_name (), params, title, descr);
+ param_destroy (pl);
+ free (params);
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) /* {{{ */
@@ -109,32 +226,41 @@ int action_show_graph (void) /* {{{ */
show_graph_data_t pg_data;
char title[128];
- char descr[128];
- char html_title[128];
pg_data.cfg = gl_graph_get_selected ();
if (pg_data.cfg == NULL)
OUTPUT_ERROR ("gl_graph_get_selected () failed.\n");
- pg_data.inst = inst_get_selected (pg_data.cfg);
- if (pg_data.inst == NULL)
- OUTPUT_ERROR ("inst_get_selected (%p) failed.\n", (void *) pg_data.cfg);
-
memset (title, 0, sizeof (title));
graph_get_title (pg_data.cfg, title, sizeof (title));
- memset (descr, 0, sizeof (descr));
- inst_describe (pg_data.cfg, pg_data.inst, descr, sizeof (descr));
+ pg_data.inst = inst_get_selected (pg_data.cfg);
+ if (pg_data.inst != NULL)
+ {
+ char descr[128];
+ char html_title[128];
- snprintf (html_title, sizeof (html_title), "Graph \"%s / %s\"",
- title, descr);
- html_title[sizeof (html_title) - 1] = 0;
+ memset (descr, 0, sizeof (descr));
+ inst_describe (pg_data.cfg, pg_data.inst, descr, sizeof (descr));
- pg_callbacks.top_right = html_print_search_box;
- pg_callbacks.middle_center = show_graph;
- pg_callbacks.middle_left = show_instance_list;
+ snprintf (html_title, sizeof (html_title), "Graph \"%s / %s\"",
+ title, descr);
+ html_title[sizeof (html_title) - 1] = 0;
- html_print_page (html_title, &pg_callbacks, &pg_data);
+ 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 (html_title, &pg_callbacks, &pg_data);
+ }
+ else /* if (pg_data.inst == NULL) */
+ {
+ pg_callbacks.top_right = html_print_search_box;
+ pg_callbacks.middle_center = show_graph;
+
+ html_print_page (title, &pg_callbacks, &pg_data);
+ }
return (0);
} /* }}} int action_graph */