X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=graph_list.h;h=89351a981723cb6c266248ea59c49f3a500e2af2;hb=37e7f29d384c1eeda8c7bcb850e9c916303ffb8d;hp=567575b8f3a29abbe283851f37fb0d81e89ff8fe;hpb=0bdac0286e8d3c42dd8d5c3058d822e9ad0e6313;p=collection4.git

diff --git a/graph_list.h b/graph_list.h
index 567575b..89351a9 100644
--- a/graph_list.h
+++ b/graph_list.h
@@ -1,11 +1,9 @@
 #ifndef GRAPH_LIST_H
 #define GRAPH_LIST_H 1
 
-#include "utils_array.h"
-
-struct graph_ident_s;
-typedef struct graph_ident_s graph_ident_t;
-
+/*
+ * Data types
+ */
 struct graph_instance_s;
 typedef struct graph_instance_s graph_instance_t;
 
@@ -21,10 +19,16 @@ typedef int (*gl_cfg_callback) (graph_config_t *cfg,
 typedef int (*gl_inst_callback) (graph_config_t *cfg,
     graph_instance_t *inst, void *user_data);
 
+#include "graph_def.h"
+#include "graph_ident.h"
+#include "utils_array.h"
+#include "oconfig.h"
+
 /*
  * Functions
  */
-char *ident_to_file (const graph_ident_t *ident);
+int graph_config_add (const oconfig_item_t *ci);
+int graph_config_submit (void);
 
 int gl_graph_get_all (gl_cfg_callback callback,
     void *user_data);
@@ -34,6 +38,10 @@ graph_config_t *graph_get_selected (void);
 int gl_graph_get_title (graph_config_t *cfg,
     char *buffer, size_t buffer_size);
 
+graph_ident_t *gl_graph_get_selector (graph_config_t *cfg);
+
+int gl_graph_add_def (graph_config_t *cfg, graph_def_t *def);
+
 int gl_graph_instance_get_all (graph_config_t *cfg,
     gl_inst_callback callback, void *user_data);
 
@@ -48,21 +56,9 @@ int gl_instance_get_params (graph_config_t *cfg, graph_instance_t *inst,
 int gl_instance_get_rrdargs (graph_config_t *cfg, graph_instance_t *inst,
     str_array_t *args);
 
-struct graph_list_s
-{
-  char *host;
-  char *plugin;
-  char *plugin_instance;
-  char *type;
-  char *type_instance;
-};
-typedef struct graph_list_s graph_list_t;
-
-typedef int (*gl_callback) (
-    const graph_list_t *, void *user_data);
+graph_ident_t *gl_instance_get_selector (graph_instance_t *inst);
 
 int gl_update (void);
-int gl_foreach (gl_callback callback, void *user_data);
 
 #endif /* GRAPH_LIST_H */
 /* vim: set sw=2 sts=2 et fdm=marker : */