Auto-Merge pull request #2505 from jiriproX/dpdkstat_enh

Automatically merged due to "Automerge" label

diff --git a/docs/maintainer_guide.md b/docs/maintainer_guide.md
new file mode 100644 (file)
index 0000000..a9a29f1
--- /dev/null
+++ b/docs/maintainer_guide.md
@@ -0,0 +1,37 @@
+## Maintainer Guide
+
+This document documents best practises and guidelines for *collectd*
+maintainers.
+
+### Ideology
+
+As maintainer of an open-source project, you are one of the most knowledgable
+people of the project's structure, best practices, goals, etc. You are most
+helping the project by *facilitating change*, in other words "help contributors
+make changes to the codebase."
+
+The most common form of helping users is doing *code reviews* and (eventually)
+using your commit rights to merge the pull request.
+
+### Code reviews
+
+*   Be friendly, especially with new contributors. Write "Hi" and thank them for their contribution before diving into review comments.
+*   Criticize code, not people. Ideally, tell the contributor a better way to do what they need.
+*   Clearly mark optional suggestions as such. Best practise, start your comment with *At your option: …*
+*   Wait for a successful run of our [continuous integration system](https://ci.collectd.org/) before merging.
+
+### Repository access
+
+You have write access to the *collectd/collectd* repository. Please use it
+responsibly.
+
+#### Own work
+
+Open *pull requests* for your own changes, too:
+
+*   For simple changes it's okay to self-approve and merge after a
+    successful build on the CI systems.
+*   Trivial changes, cherry-picks from *master* and roll-up merges are
+    excempt and may be pushed to the version branches and *master* directly.
+*   "Simple" and "trivial" are not further defined; use your best judgement.
+    We'll revisit this if and when it becomes necessary.

diff --git a/src/memcached.c b/src/memcached.c
index 85794a5..1cd5a30 100644 (file)
--- a/src/memcached.c
+++ b/src/memcached.c
@@ -523,7 +523,7 @@ static int memcached_read(user_data_t *user_data) {
     else if (FIELD_IS("curr_connections")) {
       submit_gauge("memcached_connections", "current", atof(fields[2]), st);
     } else if (FIELD_IS("listen_disabled_num")) {
-      submit_derive("connections", "listen_disabled", atoll(fields[2]), st);
+      submit_derive("total_events", "listen_disabled", atoll(fields[2]), st);
     }
     /*
      * Total number of connections opened since the server started running

diff --git a/src/types.db b/src/types.db
index 577d28f..4ca57aa 100644 (file)
--- a/src/types.db
+++ b/src/types.db
@@ -245,6 +245,7 @@ time_ref                value:GAUGE:0:U
 timeleft                value:GAUGE:0:U
 total_bytes             value:DERIVE:0:U
 total_connections       value:DERIVE:0:U
+total_events            value:DERIVE:0:U
 total_objects           value:DERIVE:0:U
 total_operations        value:DERIVE:0:U
 total_requests          value:DERIVE:0:U