#define MAX_SHOW_GRAPHS 10
+#define SGD_FORMAT_JSON 0
+#define SGD_FORMAT_RRD 1
+
struct show_graph_data_s
{
graph_config_t *cfg;
graph_instance_t *inst;
int graph_count;
+ int format;
};
typedef struct show_graph_data_s show_graph_data_t;
" <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");
+ " </select><br />\n");
+ printf (" <input id=\"format-json\" type=\"radio\" name=\"format\" value=\"JSON\" checked=\"checked\" />"
+ "<label for=\"format-json\"> JSON (gRaphaël)</label><br />\n"
+ " <input id=\"format-rrd\" type=\"radio\" name=\"format\" value=\"RRD\" />"
+ "<label for=\"format-rrd\"> RRDtool</label>\n<br />");
+ printf (" <input type=\"submit\" name=\"button\" value=\"Go\" />\n");
printf ("</form>\n");
return (0);
} /* }}} int left_menu */
-static int show_instance_cb (graph_config_t *cfg, /* {{{ */
+static int show_instance_json (graph_config_t *cfg, /* {{{ */
graph_instance_t *inst,
- void *user_data)
+ long begin, long end, int index)
+{
+ yajl_gen_config handler_config;
+ yajl_gen handler;
+ const unsigned char *json_buffer;
+ unsigned int json_buffer_length;
+
+ graph_ident_t *graph_selector;
+ graph_ident_t *inst_selector;
+
+ graph_selector = graph_get_selector (cfg);
+ if (graph_selector == NULL)
+ return (ENOMEM);
+
+ inst_selector = inst_get_selector (inst);
+ if (inst_selector == NULL)
+ {
+ ident_destroy (inst_selector);
+ return (ENOMEM);
+ }
+
+ memset (&handler_config, 0, sizeof (handler_config));
+ handler_config.beautify = 1;
+ handler_config.indentString = " ";
+
+ handler = yajl_gen_alloc2 (/* callback = */ NULL,
+ &handler_config,
+ /* alloc functions = */ NULL,
+ /* context = */ NULL);
+ if (handler == NULL)
+ {
+ ident_destroy (inst_selector);
+ ident_destroy (graph_selector);
+ return (-1);
+ }
+
+ yajl_gen_map_open (handler);
+
+ yajl_gen_string (handler,
+ (unsigned char *) "graph_selector",
+ (unsigned int) strlen ("graph_selector"));
+ ident_to_json (graph_selector, handler);
+ ident_destroy (graph_selector);
+
+ yajl_gen_string (handler,
+ (unsigned char *) "instance_selector",
+ (unsigned int) strlen ("instance_selector"));
+ ident_to_json (inst_selector, handler);
+ ident_destroy (inst_selector);
+
+ yajl_gen_string (handler,
+ (unsigned char *) "begin",
+ (unsigned int) strlen ("begin"));
+ yajl_gen_integer (handler, begin);
+
+ yajl_gen_string (handler,
+ (unsigned char *) "end",
+ (unsigned int) strlen ("end"));
+ yajl_gen_integer (handler, end);
+
+ yajl_gen_map_close (handler);
+
+ json_buffer = NULL;
+ json_buffer_length = 0;
+ yajl_gen_get_buf (handler, &json_buffer, &json_buffer_length);
+
+ if (json_buffer == NULL)
+ {
+ yajl_gen_free (handler);
+ return (EINVAL);
+ }
+
+ printf ("<div id=\"c4-graph%i\" class=\"graph-json\"></div>\n", index);
+ printf ("<script type=\"text/javascript\">c4.instances[%i] = %s;</script>\n",
+ index, (const char *) json_buffer);
+
+ yajl_gen_free (handler);
+ return (0);
+} /* }}} int show_instance_json */
+
+static int show_instance_rrdtool (graph_config_t *cfg, /* {{{ */
+ graph_instance_t *inst,
+ long begin, long end, int index)
{
- show_graph_data_t *data = user_data;
char title[128];
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));
inst_get_params (cfg, inst, params, sizeof (params));
html_escape_buffer (params, sizeof (params));
- 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 ("<h2>Instance "%s"</h2>\n", descr);
-
- show_breadcrump (cfg, inst);
+ snprintf (time_params, sizeof (time_params), ";begin=%li;end=%li",
+ begin, end);
+ time_params[sizeof (time_params) - 1] = 0;
- if (data->graph_count < MAX_SHOW_GRAPHS)
+ if (index < MAX_SHOW_GRAPHS)
printf ("<div class=\"graph-img\"><img src=\"%s?action=graph;%s%s\" "
"title=\"%s / %s\" /></div>\n",
script_name (), params, time_params, title, descr);
""%s / %s"</a>\n",
script_name (), params, title, descr);
- printf ("<div id=\"c4-graph%i\" class=\"graph-json\"></div>\n", data->graph_count);
- printf ("<script type=\"text/javascript\">c4.graphs[%i] = { \"params\": \"%s\", \"begin\": %li, \"end\": %li };</script>\n",
- data->graph_count, params, (long) begin, (long) end);
-
- printf ("<div style=\"clear: both;\"><a href=\"%s?action=graph_data_json;%s%s\">"
+#if 0
+ printf ("<div><a href=\"%s?action=instance_data_json;%s%s\">"
"Get graph data as JSON</a></div>\n",
script_name (), params, time_params);
+#endif
+
+ return (0);
+} /* }}} int show_instance_rrdtool */
+
+static int show_instance_cb (graph_config_t *cfg, /* {{{ */
+ graph_instance_t *inst,
+ void *user_data)
+{
+ show_graph_data_t *data = user_data;
+ char descr[128];
+
+ long begin;
+ long end;
+ int status;
+
+ memset (descr, 0, sizeof (descr));
+ inst_describe (cfg, inst, descr, sizeof (descr));
+ html_escape_buffer (descr, sizeof (descr));
+
+ begin = 0;
+ end = 0;
+
+ status = get_time_args (&begin, &end, /* now = */ NULL);
+ if (status != 0)
+ return (status);
+
+ printf ("<h2>Instance "%s"</h2>\n", descr);
+
+ show_breadcrump (cfg, inst);
+
+ if (data->format == SGD_FORMAT_RRD)
+ show_instance_rrdtool (cfg, inst, begin, end, data->graph_count);
+ else
+ show_instance_json (cfg, inst, begin, end, data->graph_count);
data->graph_count++;
static int show_instance (void *user_data) /* {{{ */
{
show_graph_data_t *data = user_data;
- char params[1024];
+ /* char params[1024]; */
int status;
status = inst_get_all_selected (data->cfg,
fprintf (stderr, "show_instance: inst_get_all_selected failed "
"with status %i\n", status);
+#if 0
memset (params, 0, sizeof (params));
graph_get_params (data->cfg, params, sizeof (params));
html_escape_buffer (params, sizeof (params));
printf ("<div style=\"clear: both;\"><a href=\"%s?action=graph_def_json;%s\">"
"Get graph definition as JSON</a></div>\n",
script_name (), params);
+#endif
return (0);
} /* }}} int show_instance */
char tmp[128];
char title[128];
+ const char *format;
memset (&pg_data, 0, sizeof (pg_data));
pg_data.cfg = gl_graph_get_selected ();
snprintf (title, sizeof (title), "Graph \"%s\"", tmp);
title[sizeof (title) - 1] = 0;
+ format = param ("format");
+ if ((format != NULL) && (strcasecmp ("RRD", format) == 0))
+ pg_data.format = SGD_FORMAT_RRD;
+ else
+ pg_data.format = SGD_FORMAT_JSON;
+
pg_callbacks.top_right = html_print_search_box;
pg_callbacks.middle_center = show_instance;
pg_callbacks.middle_left = left_menu;