X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Faction_show_instance.c;h=bb807a62af026b2a1af4a7bc8bf298a3ae5e34c8;hb=cc5ecbf3e8768c8a69e22df3e6a73ef3d57d9b9e;hp=c4ca6cde60a0273387157c4ebc858dd6f5e96726;hpb=b988bcc13c655299bc3796cccaa583f62704e759;p=collection4.git
diff --git a/src/action_show_instance.c b/src/action_show_instance.c
index c4ca6cd..bb807a6 100644
--- a/src/action_show_instance.c
+++ b/src/action_show_instance.c
@@ -70,10 +70,10 @@ static void show_breadcrump_field (const char *str, /* {{{ */
char *str_html = html_escape (str);
if (field_name != NULL)
- printf ("%s",
+ printf ("%s",
script_name (), field_name, str_html, str_html);
else
- printf ("%s",
+ printf ("%s",
script_name (), str_html, str_html);
free (str_html);
@@ -142,60 +142,47 @@ static int show_time_selector (__attribute__((unused)) void *user_data) /* {{{ *
return (0);
} /* }}} int show_time_selector */
-static int show_instance_list_cb (graph_instance_t *inst, /* {{{ */
- void *user_data)
+static int left_menu (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 ("
%s\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 (" "
- "%s\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));
+ graph_instance_t *inst;
+ graph_ident_t *ident;
+ const char *host;
memset (params, 0, sizeof (params));
graph_get_params (data->cfg, params, sizeof (params));
html_escape_buffer (params, sizeof (params));
- printf ("\n"
- " - %s\n"
- "
\n",
- script_name (), params, title);
+ inst = inst_get_selected (data->cfg);
+ ident = inst_get_selector (inst);
+ host = ident_get_host (ident);
+ if (IS_ANY (host))
+ host = NULL;
+
+ printf ("\n\n"
- "
\n");
+ printf (" - Host "%s"
\n",
+ script_name (), host_uri, host_html);
+ }
+ printf ("
\n");
+
+ host = NULL;
+ ident_destroy (ident);
return (0);
-} /* }}} int show_instance_list */
+} /* }}} int left_menu */
static int show_instance_cb (graph_config_t *cfg, /* {{{ */
graph_instance_t *inst,
@@ -206,6 +193,11 @@ static int show_instance_cb (graph_config_t *cfg, /* {{{ */
char descr[128];
char params[1024];
+ long begin;
+ long end;
+ char time_params[128];
+ int status;
+
memset (title, 0, sizeof (title));
graph_get_title (cfg, title, sizeof (title));
html_escape_buffer (title, sizeof (title));
@@ -218,14 +210,26 @@ static int show_instance_cb (graph_config_t *cfg, /* {{{ */
inst_get_params (cfg, inst, params, sizeof (params));
html_escape_buffer (params, sizeof (params));
- printf ("Instance "%s"
\n", descr);
+ time_params[0] = 0;
+ begin = 0;
+ end = 0;
+
+ status = get_time_args (&begin, &end, /* now = */ NULL);
+ if (status == 0)
+ {
+ snprintf (time_params, sizeof (time_params), ";begin=%li;end=%li",
+ begin, end);
+ time_params[sizeof (time_params) - 1] = 0;
+ }
+
+ printf ("Instance "%s"
\n", descr);
show_breadcrump (cfg, inst);
if (data->graph_count < MAX_SHOW_GRAPHS)
- printf ("\n",
- script_name (), params, title, descr);
+ script_name (), params, time_params, title, descr);
else
printf ("Show graph "
""%s / %s"\n",
@@ -241,7 +245,6 @@ 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 = */ data);
if (status != 0)
@@ -271,7 +274,7 @@ int action_show_instance (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_left = left_menu;
pg_callbacks.middle_right = show_time_selector;
html_print_page (title, &pg_callbacks, &pg_data);