projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
85a05a3
)
netapp plugin: Use the “volume-” prefix for all volume related data.
author
Florian Forster
<octo@noris.net>
Wed, 30 Sep 2009 15:49:54 +0000
(17:49 +0200)
committer
Florian Forster
<octo@noris.net>
Wed, 30 Sep 2009 15:49:54 +0000
(17:49 +0200)
src/netapp.c
patch
|
blob
|
history
diff --git
a/src/netapp.c
b/src/netapp.c
index
a58aaf9
..
7f0fa19
100644
(file)
--- a/
src/netapp.c
+++ b/
src/netapp.c
@@
-731,11
+731,19
@@
static int submit_volume_perf_data (const char *hostname, /* {{{ */
data_volume_perf_t *old_data,
const data_volume_perf_t *new_data)
{
data_volume_perf_t *old_data,
const data_volume_perf_t *new_data)
{
+ char plugin_instance[DATA_MAX_NAME_LEN];
+
+ if ((hostname == NULL) || (old_data == NULL) || (new_data == NULL))
+ return (-1);
+
+ ssnprintf (plugin_instance, sizeof (plugin_instance),
+ "volume-%s", old_data->name);
+
/* Check for and submit disk-octet values */
if (HAS_ALL_FLAGS (old_data->flags, CFG_VOLUME_PERF_IO)
&& HAS_ALL_FLAGS (new_data->flags, HAVE_VOLUME_PERF_BYTES_READ | HAVE_VOLUME_PERF_BYTES_WRITE))
{
/* Check for and submit disk-octet values */
if (HAS_ALL_FLAGS (old_data->flags, CFG_VOLUME_PERF_IO)
&& HAS_ALL_FLAGS (new_data->flags, HAVE_VOLUME_PERF_BYTES_READ | HAVE_VOLUME_PERF_BYTES_WRITE))
{
- submit_two_counters (hostname,
old_data->nam
e, "disk_octets", /* type instance = */ NULL,
+ submit_two_counters (hostname,
plugin_instanc
e, "disk_octets", /* type instance = */ NULL,
(counter_t) new_data->read_bytes, (counter_t) new_data->write_bytes, new_data->timestamp);
}
(counter_t) new_data->read_bytes, (counter_t) new_data->write_bytes, new_data->timestamp);
}
@@
-743,7
+751,7
@@
static int submit_volume_perf_data (const char *hostname, /* {{{ */
if (HAS_ALL_FLAGS (old_data->flags, CFG_VOLUME_PERF_OPS)
&& HAS_ALL_FLAGS (new_data->flags, HAVE_VOLUME_PERF_OPS_READ | HAVE_VOLUME_PERF_OPS_WRITE))
{
if (HAS_ALL_FLAGS (old_data->flags, CFG_VOLUME_PERF_OPS)
&& HAS_ALL_FLAGS (new_data->flags, HAVE_VOLUME_PERF_OPS_READ | HAVE_VOLUME_PERF_OPS_WRITE))
{
- submit_two_counters (hostname,
old_data->nam
e, "disk_ops", /* type instance = */ NULL,
+ submit_two_counters (hostname,
plugin_instanc
e, "disk_ops", /* type instance = */ NULL,
(counter_t) new_data->read_ops, (counter_t) new_data->write_ops, new_data->timestamp);
}
(counter_t) new_data->read_ops, (counter_t) new_data->write_ops, new_data->timestamp);
}
@@
-787,7
+795,7
@@
static int submit_volume_perf_data (const char *hostname, /* {{{ */
latency_per_op_write = ((gauge_t) diff_latency_write) / ((gauge_t) diff_ops_write);
}
latency_per_op_write = ((gauge_t) diff_latency_write) / ((gauge_t) diff_ops_write);
}
- submit_two_gauge (hostname,
old_data->nam
e, "disk_latency", /* type instance = */ NULL,
+ submit_two_gauge (hostname,
plugin_instanc
e, "disk_latency", /* type instance = */ NULL,
latency_per_op_read, latency_per_op_write, new_data->timestamp);
}
latency_per_op_read, latency_per_op_write, new_data->timestamp);
}
@@
-1349,6
+1357,8
@@
static int cna_submit_volume_usage_data (const char *hostname, /* {{{ */
for (v = cfg_volume->volumes; v != NULL; v = v->next)
{
for (v = cfg_volume->volumes; v != NULL; v = v->next)
{
+ char plugin_instance[DATA_MAX_NAME_LEN];
+
uint64_t norm_used = v->norm_used;
uint64_t norm_free = v->norm_free;
uint64_t sis_saved = v->sis_saved;
uint64_t norm_used = v->norm_used;
uint64_t norm_free = v->norm_free;
uint64_t sis_saved = v->sis_saved;
@@
-1356,6
+1366,9
@@
static int cna_submit_volume_usage_data (const char *hostname, /* {{{ */
uint64_t snap_reserve_free = v->snap_reserved;
uint64_t snap_norm_used = v->snap_used;
uint64_t snap_reserve_free = v->snap_reserved;
uint64_t snap_norm_used = v->snap_used;
+ ssnprintf (plugin_instance, sizeof (plugin_instance),
+ "volume-%s", v->name);
+
if (HAS_ALL_FLAGS (v->flags, HAVE_VOLUME_USAGE_SNAP_USED | HAVE_VOLUME_USAGE_SNAP_RSVD)) {
if (v->snap_reserved > v->snap_used) {
snap_reserve_free = v->snap_reserved - v->snap_used;
if (HAS_ALL_FLAGS (v->flags, HAVE_VOLUME_USAGE_SNAP_USED | HAVE_VOLUME_USAGE_SNAP_RSVD)) {
if (v->snap_reserved > v->snap_used) {
snap_reserve_free = v->snap_reserved - v->snap_used;
@@
-1372,32
+1385,32
@@
static int cna_submit_volume_usage_data (const char *hostname, /* {{{ */
}
if (HAS_ALL_FLAGS (v->flags, HAVE_VOLUME_USAGE_NORM_FREE))
}
if (HAS_ALL_FLAGS (v->flags, HAVE_VOLUME_USAGE_NORM_FREE))
- submit_double (hostname, /* plugin instance = */
v->nam
e,
+ submit_double (hostname, /* plugin instance = */
plugin_instanc
e,
"df_complex", "free",
(double) norm_free, /* timestamp = */ 0);
if (HAS_ALL_FLAGS (v->flags, HAVE_VOLUME_USAGE_SIS_SAVED))
"df_complex", "free",
(double) norm_free, /* timestamp = */ 0);
if (HAS_ALL_FLAGS (v->flags, HAVE_VOLUME_USAGE_SIS_SAVED))
- submit_double (hostname, /* plugin instance = */
v->nam
e,
+ submit_double (hostname, /* plugin instance = */
plugin_instanc
e,
"df_complex", "sis_saved",
(double) sis_saved, /* timestamp = */ 0);
if (HAS_ALL_FLAGS (v->flags, HAVE_VOLUME_USAGE_NORM_USED))
"df_complex", "sis_saved",
(double) sis_saved, /* timestamp = */ 0);
if (HAS_ALL_FLAGS (v->flags, HAVE_VOLUME_USAGE_NORM_USED))
- submit_double (hostname, /* plugin instance = */
v->nam
e,
+ submit_double (hostname, /* plugin instance = */
plugin_instanc
e,
"df_complex", "used",
(double) norm_used, /* timestamp = */ 0);
if (HAS_ALL_FLAGS (v->flags, HAVE_VOLUME_USAGE_SNAP_RSVD))
"df_complex", "used",
(double) norm_used, /* timestamp = */ 0);
if (HAS_ALL_FLAGS (v->flags, HAVE_VOLUME_USAGE_SNAP_RSVD))
- submit_double (hostname, /* plugin instance = */
v->nam
e,
+ submit_double (hostname, /* plugin instance = */
plugin_instanc
e,
"df_complex", "snap_reserved",
(double) snap_reserve_free, /* timestamp = */ 0);
if (HAS_ALL_FLAGS (v->flags, HAVE_VOLUME_USAGE_SNAP_USED | HAVE_VOLUME_USAGE_SNAP_RSVD))
"df_complex", "snap_reserved",
(double) snap_reserve_free, /* timestamp = */ 0);
if (HAS_ALL_FLAGS (v->flags, HAVE_VOLUME_USAGE_SNAP_USED | HAVE_VOLUME_USAGE_SNAP_RSVD))
- submit_double (hostname, /* plugin instance = */
v->nam
e,
+ submit_double (hostname, /* plugin instance = */
plugin_instanc
e,
"df_complex", "snap_reserve_used",
(double) snap_reserve_used, /* timestamp = */ 0);
if (HAS_ALL_FLAGS (v->flags, HAVE_VOLUME_USAGE_SNAP_USED))
"df_complex", "snap_reserve_used",
(double) snap_reserve_used, /* timestamp = */ 0);
if (HAS_ALL_FLAGS (v->flags, HAVE_VOLUME_USAGE_SNAP_USED))
- submit_double (hostname, /* plugin instance = */
v->nam
e,
+ submit_double (hostname, /* plugin instance = */
plugin_instanc
e,
"df_complex", "snap_normal_used",
(double) snap_norm_used, /* timestamp = */ 0);
"df_complex", "snap_normal_used",
(double) snap_norm_used, /* timestamp = */ 0);