projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6b672d6
)
netapp plugin: Implement "submit_two_counters".
author
Florian Forster
<octo@noris.net>
Wed, 23 Sep 2009 16:51:08 +0000
(18:51 +0200)
committer
Florian Forster
<octo@noris.net>
Wed, 23 Sep 2009 16:51:08 +0000
(18:51 +0200)
src/netapp.c
patch
|
blob
|
history
diff --git
a/src/netapp.c
b/src/netapp.c
index
70422f0
..
d303378
100644
(file)
--- a/
src/netapp.c
+++ b/
src/netapp.c
@@
-225,15
+225,16
@@
static disk_t *get_disk(host_config_t *host, const char *name) /* {{{ */
return v;
} /* }}} disk_t *get_disk */
return v;
} /* }}} disk_t *get_disk */
-static int submit_
one_value
(const char *host, /* {{{ */
+static int submit_
values
(const char *host, /* {{{ */
const char *plugin_inst,
const char *plugin_inst,
- const char *type, const char *type_inst, value_t value,
+ const char *type, const char *type_inst,
+ value_t *values, int values_len,
time_t timestamp)
{
value_list_t vl = VALUE_LIST_INIT;
time_t timestamp)
{
value_list_t vl = VALUE_LIST_INIT;
- vl.values =
&value
;
- vl.values_len =
1
;
+ vl.values =
values
;
+ vl.values_len =
values_len
;
if (timestamp > 0)
vl.time = timestamp;
if (timestamp > 0)
vl.time = timestamp;
@@
-252,17
+253,18
@@
static int submit_one_value (const char *host, /* {{{ */
return (plugin_dispatch_values (&vl));
} /* }}} int submit_uint64 */
return (plugin_dispatch_values (&vl));
} /* }}} int submit_uint64 */
-#if 0
-static int submit_uint64 (const char *host, const char *plugin_inst, /* {{{ */
-
const char *type, const char *type_inst, uint64_t ui64
)
+static int submit_two_counters (const char *host, const char *plugin_inst, /* {{{ */
+ const char *type, const char *type_inst, counter_t val0, counter_t val1,
+
time_t timestamp
)
{
{
- value_t v;
+ value_t v
alues[2]
;
- v.counter = (counter_t) ui64;
+ values[0].counter = val0;
+ values[1].counter = val1;
- return (submit_
one_value (host, plugin_inst, type, type_inst, v));
-} /* }}} int submit_uint64 */
-#endif
+ return (submit_
values (host, plugin_inst, type, type_inst,
+ values, 2, timestamp));
+} /* }}} int submit_two_counters */
static int submit_double (const char *host, const char *plugin_inst, /* {{{ */
const char *type, const char *type_inst, double d, time_t timestamp)
static int submit_double (const char *host, const char *plugin_inst, /* {{{ */
const char *type, const char *type_inst, double d, time_t timestamp)
@@
-271,7
+273,8
@@
static int submit_double (const char *host, const char *plugin_inst, /* {{{ */
v.gauge = (gauge_t) d;
v.gauge = (gauge_t) d;
- return (submit_one_value (host, plugin_inst, type, type_inst, v, timestamp));
+ return (submit_values (host, plugin_inst, type, type_inst,
+ &v, 1, timestamp));
} /* }}} int submit_uint64 */
static int submit_cache_ratio (const char *host, /* {{{ */
} /* }}} int submit_uint64 */
static int submit_cache_ratio (const char *host, /* {{{ */
@@
-300,7
+303,8
@@
static int submit_cache_ratio (const char *host, /* {{{ */
*old_hits = new_hits;
*old_misses = new_misses;
*old_hits = new_hits;
*old_misses = new_misses;
- return (submit_one_value (host, plugin_inst, "cache_ratio", type_inst, v, timestamp));
+ return (submit_values (host, plugin_inst, "cache_ratio", type_inst,
+ &v, 1, timestamp));
} /* }}} int submit_cache_ratio */
static void collect_perf_wafl_data(host_config_t *host, na_elem_t *out, void *data) { /* {{{ */
} /* }}} int submit_cache_ratio */
static void collect_perf_wafl_data(host_config_t *host, na_elem_t *out, void *data) { /* {{{ */