collection.conf: Add some more graphs.

[collection4.git] / action_list_graphs.c

diff --git a/action_list_graphs.c b/action_list_graphs.c
index 0663b98..29e3d8b 100644 (file)
--- a/action_list_graphs.c
+++ b/action_list_graphs.c
@@ -4,6 +4,7 @@
 #include <errno.h>
 
 #include "action_list_graphs.h"
+#include "graph.h"
 #include "graph_list.h"
 #include "utils_params.h"
 
@@ -20,7 +21,7 @@ static int print_graph_inst_json (__attribute__((unused)) graph_config_t *cfg, /
 
   first = user_data;
 
-  ident = gl_instance_get_selector (inst);
+  ident = inst_get_selector (inst);
   if (ident == NULL)
     return (-1);
 
@@ -65,12 +66,17 @@ static int print_graph_inst_html (graph_config_t *cfg, /* {{{ */
     graph_instance_t *inst,
     __attribute__((unused)) void *user_data)
 {
-  char buffer[1024];
+  char params[1024];
+  char desc[1024];
 
-  memset (buffer, 0, sizeof (buffer));
-  gl_instance_get_params (cfg, inst, buffer, sizeof (buffer));
+  memset (params, 0, sizeof (params));
+  inst_get_params (cfg, inst, params, sizeof (params));
 
-  printf ("<li><a href=\"test.fcgi?action=graph;%s\">%s</a></li>\n", buffer, buffer);
+  memset (desc, 0, sizeof (desc));
+  inst_describe (cfg, inst, desc, sizeof (desc));
+
+  printf ("    <li><a href=\"test.fcgi?action=graph;%s\">%s</a></li>\n",
+      params, desc);
 
   return (0);
 } /* }}} int print_graph_inst_html */
@@ -81,11 +87,11 @@ static int print_graph_html (graph_config_t *cfg, /* {{{ */
   char buffer[1024];
 
   memset (buffer, 0, sizeof (buffer));
-  gl_graph_get_title (cfg, buffer, sizeof (buffer));
+  graph_get_title (cfg, buffer, sizeof (buffer));
 
-  printf ("<li>%s\n<ul>\n", buffer);
+  printf ("  <li>%s\n  <ul>\n", buffer);
   gl_graph_instance_get_all (cfg, print_graph_inst_html, /* user_data = */ NULL);
-  printf ("</ul>\n");
+  printf ("  </ul></li>\n");
 
   return (0);
 } /* }}} int print_graph_html */