X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fplugin.h;h=25c745cbbccede74eb1398da38653d129566b248;hb=54ada5ddddb3692d8ec3493fbf4a5fd7aa39b5d1;hp=96eb0cb5633cf1cbe5fe6153b176f46040b49c5e;hpb=c9db0c1a0dd6af026c3fbbf934eec02bd32bf043;p=collectd.git

diff --git a/src/plugin.h b/src/plugin.h
index 96eb0cb5..25c745cb 100644
--- a/src/plugin.h
+++ b/src/plugin.h
@@ -97,18 +97,16 @@ struct data_set_s
 };
 typedef struct data_set_s data_set_t;
 
-typedef struct complain_s
-{
-	unsigned int interval; /* how long we wait for reporting this error again */
-	unsigned int delay;    /* how many more iterations we still need to wait */
-} complain_t;
-
 typedef struct notification_s
 {
 	int    severity;
-	char   message[NOTIF_MAX_MSG_LEN];
 	time_t time;
+	char   message[NOTIF_MAX_MSG_LEN];
 	char   host[DATA_MAX_NAME_LEN];
+	char   plugin[DATA_MAX_NAME_LEN];
+	char   plugin_instance[DATA_MAX_NAME_LEN];
+	char   type[DATA_MAX_NAME_LEN];
+	char   type_instance[DATA_MAX_NAME_LEN];
 } notification_t;
 
 /*
@@ -150,7 +148,7 @@ void plugin_set_dir (const char *dir);
 int plugin_load (const char *name);
 
 void plugin_init_all (void);
-void plugin_read_all (const int *loop);
+void plugin_read_all (void);
 void plugin_shutdown_all (void);
 
 /*
@@ -218,10 +216,6 @@ void plugin_log (int level, const char *format, ...);
 # define DEBUG(...)  /* noop */
 #endif /* ! COLLECT_DEBUG */
 
-/* TODO: Move plugin_{complain,relief} into `utils_complain.[ch]'. -octo */
-void plugin_complain (int level, complain_t *c, const char *format, ...);
-void plugin_relief (int level, complain_t *c, const char *format, ...);
-
 const data_set_t *plugin_get_ds (const char *name);
 
 #endif /* PLUGIN_H */