projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Various plugins: Change various plugins to use "derive" internally.
[collectd.git]
/
src
/
apache.c
diff --git
a/src/apache.c
b/src/apache.c
index
506ba84
..
9be32d1
100644
(file)
--- a/
src/apache.c
+++ b/
src/apache.c
@@
-476,13
+476,13
@@
static void submit_value (const char *type, const char *type_instance,
plugin_dispatch_values (&vl);
} /* void submit_value */
plugin_dispatch_values (&vl);
} /* void submit_value */
-static void submit_
counter
(const char *type, const char *type_instance,
-
counter
_t c, apache_t *st)
+static void submit_
derive
(const char *type, const char *type_instance,
+
derive
_t c, apache_t *st)
{
value_t v;
{
value_t v;
- v.
counter
= c;
+ v.
derive
= c;
submit_value (type, type_instance, v, st);
submit_value (type, type_instance, v, st);
-} /* void submit_
counter
*/
+} /* void submit_
derive
*/
static void submit_gauge (const char *type, const char *type_instance,
gauge_t g, apache_t *st)
static void submit_gauge (const char *type, const char *type_instance,
gauge_t g, apache_t *st)
@@
-644,11
+644,11
@@
static int apache_read_host (user_data_t *user_data) /* {{{ */
{
if ((strcmp (fields[0], "Total") == 0)
&& (strcmp (fields[1], "Accesses:") == 0))
{
if ((strcmp (fields[0], "Total") == 0)
&& (strcmp (fields[1], "Accesses:") == 0))
- submit_
counter
("apache_requests", "",
+ submit_
derive
("apache_requests", "",
atoll (fields[2]), st);
else if ((strcmp (fields[0], "Total") == 0)
&& (strcmp (fields[1], "kBytes:") == 0))
atoll (fields[2]), st);
else if ((strcmp (fields[0], "Total") == 0)
&& (strcmp (fields[1], "kBytes:") == 0))
- submit_
counter
("apache_bytes", "",
+ submit_
derive
("apache_bytes", "",
1024LL * atoll (fields[2]), st);
}
else if (fields_num == 2)
1024LL * atoll (fields[2]), st);
}
else if (fields_num == 2)