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.3' into collectd-4.4
[collectd.git]
/
src
/
plugin.h
diff --git
a/src/plugin.h
b/src/plugin.h
index
83c2109
..
7b59930
100644
(file)
--- a/
src/plugin.h
+++ b/
src/plugin.h
@@
-1,9
+1,8
@@
#ifndef PLUGIN_H
#define PLUGIN_H
#ifndef PLUGIN_H
#define PLUGIN_H
-
/**
* collectd - src/plugin.h
/**
* collectd - src/plugin.h
- * Copyright (C) 2005
,2006
Florian octo Forster
+ * Copyright (C) 2005
-2008
Florian octo Forster
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@
-20,8
+19,12
@@
*
* Authors:
* Florian octo Forster <octo at verplant.org>
*
* Authors:
* Florian octo Forster <octo at verplant.org>
+ * Sebastian Harl <sh at tokkee.org>
**/
**/
+#include "collectd.h"
+#include "configfile.h"
+
#define DATA_MAX_NAME_LEN 64
#define DS_TYPE_COUNTER 0
#define DATA_MAX_NAME_LEN 64
#define DS_TYPE_COUNTER 0
@@
-43,6
+46,12
@@
# define LOG_DEBUG 7
#endif
# define LOG_DEBUG 7
#endif
+#define NOTIF_MAX_MSG_LEN 256
+
+#define NOTIF_FAILURE 1
+#define NOTIF_WARNING 2
+#define NOTIF_OKAY 4
+
/*
* Public data types
*/
/*
* Public data types
*/
@@
-61,6
+70,7
@@
struct value_list_s
value_t *values;
int values_len;
time_t time;
value_t *values;
int values_len;
time_t time;
+ int interval;
char host[DATA_MAX_NAME_LEN];
char plugin[DATA_MAX_NAME_LEN];
char plugin_instance[DATA_MAX_NAME_LEN];
char host[DATA_MAX_NAME_LEN];
char plugin[DATA_MAX_NAME_LEN];
char plugin_instance[DATA_MAX_NAME_LEN];
@@
-68,7
+78,8
@@
struct value_list_s
};
typedef struct value_list_s value_list_t;
};
typedef struct value_list_s value_list_t;
-#define VALUE_LIST_INIT { NULL, 0, 0, "localhost", "", "", "" }
+#define VALUE_LIST_INIT { NULL, 0, 0, interval_g, "localhost", "", "", "" }
+#define VALUE_LIST_STATIC { NULL, 0, 0, 0, "localhost", "", "", "" }
struct data_source_s
{
struct data_source_s
{
@@
-87,11
+98,17
@@
struct data_set_s
};
typedef struct data_set_s data_set_t;
};
typedef struct data_set_s data_set_t;
-typedef struct
complai
n_s
+typedef struct
notificatio
n_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;
+ int severity;
+ 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;
/*
* NAME
/*
* NAME
@@
-132,9
+149,12
@@
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_flush_all (int timeout);
void plugin_shutdown_all (void);
void plugin_shutdown_all (void);
+int plugin_flush_one (int timeout, const char *name);
+
/*
* The `plugin_register_*' functions are used to make `config', `init',
* `read', `write' and `shutdown' functions known to the plugin
/*
* The `plugin_register_*' functions are used to make `config', `init',
* `read', `write' and `shutdown' functions known to the plugin
@@
-143,25
+163,35
@@
void plugin_shutdown_all (void);
int plugin_register_config (const char *name,
int (*callback) (const char *key, const char *val),
const char **keys, int keys_num);
int plugin_register_config (const char *name,
int (*callback) (const char *key, const char *val),
const char **keys, int keys_num);
+int plugin_register_complex_config (const char *type,
+ int (*callback) (oconfig_item_t *));
int plugin_register_init (const char *name,
int (*callback) (void));
int plugin_register_read (const char *name,
int (*callback) (void));
int plugin_register_write (const char *name,
int (*callback) (const data_set_t *ds, const value_list_t *vl));
int plugin_register_init (const char *name,
int (*callback) (void));
int plugin_register_read (const char *name,
int (*callback) (void));
int plugin_register_write (const char *name,
int (*callback) (const data_set_t *ds, const value_list_t *vl));
+int plugin_register_flush (const char *name,
+ int (*callback) (const int));
int plugin_register_shutdown (char *name,
int (*callback) (void));
int plugin_register_data_set (const data_set_t *ds);
int plugin_register_log (char *name,
void (*callback) (int, const char *));
int plugin_register_shutdown (char *name,
int (*callback) (void));
int plugin_register_data_set (const data_set_t *ds);
int plugin_register_log (char *name,
void (*callback) (int, const char *));
+int plugin_register_notification (const char *name,
+ int (*callback) (const notification_t *notif));
int plugin_unregister_config (const char *name);
int plugin_unregister_config (const char *name);
+int plugin_unregister_complex_config (const char *name);
int plugin_unregister_init (const char *name);
int plugin_unregister_read (const char *name);
int plugin_unregister_write (const char *name);
int plugin_unregister_init (const char *name);
int plugin_unregister_read (const char *name);
int plugin_unregister_write (const char *name);
+int plugin_unregister_flush (const char *name);
int plugin_unregister_shutdown (const char *name);
int plugin_unregister_data_set (const char *name);
int plugin_unregister_log (const char *name);
int plugin_unregister_shutdown (const char *name);
int plugin_unregister_data_set (const char *name);
int plugin_unregister_log (const char *name);
+int plugin_unregister_notification (const char *name);
+
/*
* NAME
/*
* NAME
@@
-180,16
+210,18
@@
int plugin_unregister_log (const char *name);
*/
int plugin_dispatch_values (const char *name, value_list_t *vl);
*/
int plugin_dispatch_values (const char *name, value_list_t *vl);
+int plugin_dispatch_notification (const notification_t *notif);
+
void plugin_log (int level, const char *format, ...);
#define ERROR(...) plugin_log (LOG_ERR, __VA_ARGS__)
#define WARNING(...) plugin_log (LOG_WARNING, __VA_ARGS__)
#define NOTICE(...) plugin_log (LOG_NOTICE, __VA_ARGS__)
#define INFO(...) plugin_log (LOG_INFO, __VA_ARGS__)
void plugin_log (int level, const char *format, ...);
#define ERROR(...) plugin_log (LOG_ERR, __VA_ARGS__)
#define WARNING(...) plugin_log (LOG_WARNING, __VA_ARGS__)
#define NOTICE(...) plugin_log (LOG_NOTICE, __VA_ARGS__)
#define INFO(...) plugin_log (LOG_INFO, __VA_ARGS__)
-#
define DEBUG(...) plugin_log (LOG_DEBUG, __VA_ARGS__)
-
-
/* 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, ...);
+#
if COLLECT_DEBUG
+# define DEBUG(...) plugin_log (LOG_DEBUG, __VA_ARGS__)
+
#else /* COLLECT_DEBUG
*/
+# define DEBUG(...) /* noop */
+#endif /* ! COLLECT_DEBUG */
const data_set_t *plugin_get_ds (const char *name);
const data_set_t *plugin_get_ds (const char *name);