Varnish plugin: Use the more common "Collect" prefix for config options.

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index eb2a4e85f870396ff564c56e2c5c5ac4dcacfec2..10ec9807ed158c298270f4cfc056d8fe434e7bd1 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -853,7 +853,7 @@
 #        - cache hits
 #        - cache misses
 #        - cache hits for pass
-#      MonitorCache true
+#      CollectCache true
 #
 #      Will monitor:
 #        - backend connection : success
@@ -864,13 +864,13 @@
 #        - backend connection : was closed
 #        - backend connection : recycles
 #        - backend connection : unused
-#      MonitorBackend true
+#      CollectBackend true
 #
 #      Will monitor :
 #        - client connections accepted
 #        - connection dropped
 #        - client requests received
-#      MonitorConnections true
+#      CollectConnections true
 #
 #      Will monitor:
 #        - SHM records
@@ -878,12 +878,12 @@
 #        - SHM flushes due to overflow
 #        - SHM MTX contention
 #        - SHM cycles through buffer
-#      MonitorSHM true
+#      CollectSHM true
 #
 #      Will monitor:
 #        - Objects ESI parsed
 #        - ESI parse errors
-#      MonitorESI false
+#      CollectESI false
 #
 #      Will monitor:
 #        - fetch head
@@ -895,13 +895,13 @@
 #        - fetch pre HTTP/1.1 closed
 #        - fetch zero length
 #        - fetch failed
-#      MonitorFetch false
+#      CollectFetch false
 #
 #      Will monitor:
 #       - HCB lookups without lock
 #       - HCB lookups with lock
 #       - HCB inserts
-#      MonitorHCB false
+#      CollectHCB false
 #
 #      Will monitor:
 #        - SMA allocator requests
@@ -909,7 +909,7 @@
 #        - SMA outstanding bytes
 #        - SMA bytes allocated
 #        - SMA bytes free
-#      MonitorSMA false
+#      CollectSMA false
 #
 #      Will monitor:
 #        - SMS allocator requests
@@ -917,14 +917,14 @@
 #        - SMS outstanding bytes
 #        - SMS bytes allocated
 #        - SMS bytes freed
-#      MonitorSMS false
+#      CollectSMS false
 #
 #      Will monitor:
 #        - allocator requests
 #        - outstanding allocations
 #        - bytes allocated
 #        - bytes free
-#      MonitorSM false
+#      CollectSM false
 #   </Instance>
 #</Plugin>
 

diff --git a/src/varnish.c b/src/varnish.c
index e62bb99afa9177fa5901571e3ca0864982b3060b..f7334900324cdded172b1ccde8e703d322df7531 100644 (file)
--- a/src/varnish.c
+++ b/src/varnish.c
@@ -367,25 +367,25 @@ static int varnish_config_instance (const oconfig_item_t *ci) /* {{{ */
        {
                oconfig_item_t *child = ci->children + i;
 
-               if (strcasecmp ("MonitorCache", child->key) == 0)
+               if (strcasecmp ("CollectCache", child->key) == 0)
                        cf_util_get_boolean (child, &conf->monitor_cache);
-               else if (strcasecmp ("MonitorConnections", child->key) == 0)
+               else if (strcasecmp ("CollectConnections", child->key) == 0)
                        cf_util_get_boolean (child, &conf->monitor_connections);
-               else if (strcasecmp ("MonitorESI", child->key) == 0)
+               else if (strcasecmp ("CollectESI", child->key) == 0)
                        cf_util_get_boolean (child, &conf->monitor_esi);
-               else if (strcasecmp ("MonitorBackend", child->key) == 0)
+               else if (strcasecmp ("CollectBackend", child->key) == 0)
                        cf_util_get_boolean (child, &conf->monitor_backend);
-               else if (strcasecmp ("MonitorFetch", child->key) == 0)
+               else if (strcasecmp ("CollectFetch", child->key) == 0)
                        cf_util_get_boolean (child, &conf->monitor_fetch);
-               else if (strcasecmp ("MonitorHCB", child->key) == 0)
+               else if (strcasecmp ("CollectHCB", child->key) == 0)
                        cf_util_get_boolean (child, &conf->monitor_hcb);
-               else if (strcasecmp ("MonitorSHM", child->key) == 0)
+               else if (strcasecmp ("CollectSHM", child->key) == 0)
                        cf_util_get_boolean (child, &conf->monitor_shm);
-               else if (strcasecmp ("MonitorSMA", child->key) == 0)
+               else if (strcasecmp ("CollectSMA", child->key) == 0)
                        cf_util_get_boolean (child, &conf->monitor_sma);
-               else if (strcasecmp ("MonitorSMS", child->key) == 0)
+               else if (strcasecmp ("CollectSMS", child->key) == 0)
                        cf_util_get_boolean (child, &conf->monitor_sms);
-               else if (strcasecmp ("MonitorSM", child->key) == 0)
+               else if (strcasecmp ("CollectSM", child->key) == 0)
                        cf_util_get_boolean (child, &conf->monitor_sm);
                else
                {