projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-4.2' into collectd-4.3
[collectd.git]
/
src
/
plugin.h
diff --git
a/src/plugin.h
b/src/plugin.h
index
96eb0cb
..
25c745c
100644
(file)
--- 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 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;
typedef struct notification_s
{
int severity;
- char message[NOTIF_MAX_MSG_LEN];
time_t time;
time_t time;
+ char message[NOTIF_MAX_MSG_LEN];
char host[DATA_MAX_NAME_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;
/*
} notification_t;
/*
@@
-150,7
+148,7
@@
void plugin_set_dir (const char *dir);
int plugin_load (const char *name);
void plugin_init_all (void);
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);
/*
void plugin_shutdown_all (void);
/*
@@
-218,10
+216,6
@@
void plugin_log (int level, const char *format, ...);
# define DEBUG(...) /* noop */
#endif /* ! COLLECT_DEBUG */
# 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 */
const data_set_t *plugin_get_ds (const char *name);
#endif /* PLUGIN_H */