X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Faction_show_graph.c;h=0e0e89a6a8d14735ac02e0f1fbac98c5f3d71307;hb=e05de8dc7bc5a2f0fa7da365e2f3c60b2f42ef4a;hp=2f124de41974ec2b0ed926355fa29ea57ad060e3;hpb=022298601cad5a59aba37fa205f6f5ae6a364956;p=collection4.git
diff --git a/src/action_show_graph.c b/src/action_show_graph.c
index 2f124de..0e0e89a 100644
--- a/src/action_show_graph.c
+++ b/src/action_show_graph.c
@@ -8,7 +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"
@@ -28,7 +30,8 @@ struct show_graph_data_s
};
typedef struct show_graph_data_s show_graph_data_t;
-static void show_breadcrump_field (const char *str) /* {{{ */
+static void show_breadcrump_field (const char *str, /* {{{ */
+ const char *field_name)
{
if ((str == NULL) || (str[0] == 0))
printf ("none");
@@ -39,8 +42,14 @@ static void show_breadcrump_field (const char *str) /* {{{ */
else
{
char *str_html = html_escape (str);
- printf ("%s",
- script_name (), str_html, str_html);
+
+ 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 */
@@ -62,20 +71,49 @@ static int show_breadcrump (show_graph_data_t *data) /* {{{ */
}
printf ("
%s: "", prefix);
- show_breadcrump_field (ident_get_host (ident));
+ show_breadcrump_field (ident_get_host (ident), "host");
printf (" / ");
- show_breadcrump_field (ident_get_plugin (ident));
+ show_breadcrump_field (ident_get_plugin (ident), "plugin");
printf (" – ");
- show_breadcrump_field (ident_get_plugin_instance (ident));
+ show_breadcrump_field (ident_get_plugin_instance (ident), "plugin_instance");
printf (" / ");
- show_breadcrump_field (ident_get_type (ident));
+ show_breadcrump_field (ident_get_type (ident), "type");
printf (" – ");
- show_breadcrump_field (ident_get_type_instance (ident));
+ 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)
{
@@ -136,7 +174,9 @@ 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);
@@ -148,14 +188,27 @@ static int show_instance (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);
+ }
+
+ memset (params_html, 0, sizeof (params_html));
+ html_escape_copy (params_html, params, sizeof (params_html));
- printf ("\n",
script_name (), params, title, descr);
+ param_destroy (pl);
+ free (params);
return (0);
} /* }}} int show_instance */
@@ -197,6 +250,7 @@ int action_show_graph (void) /* {{{ */
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);
}