ceph.in: use PRIO_INTERESTING as daemonperf threshold

Using PRIO_USEFUL as the threshold for what goes into
time series databases.  I'm claiming that we have
more "useful" counters than fit on the screen,
so daemonperf's "a screen's worth" threshold
should be at the "interesting" level.

Signed-off-by: John Spray <john.spray@redhat.com>

diff --git a/src/ceph.in b/src/ceph.in
index e96eca568202a540b5a49c6c59f6b356b5a42fad..daec2993764504c0070fc58a98400962e95e0594 100755 (executable)
--- a/src/ceph.in
+++ b/src/ceph.in
@@ -48,7 +48,7 @@ PRIO_USEFUL = 5
 PRIO_UNINTERESTING = 2
 PRIO_DEBUGONLY = 0
 
-PRIO_DEFAULT = PRIO_USEFUL
+PRIO_DEFAULT = PRIO_INTERESTING
 
 # Make life easier on developers:
 # If our parent dir contains CMakeCache.txt and bin/init-ceph,

diff --git a/src/common/perf_counters.h b/src/common/perf_counters.h
index ec81de4f3595f6839c6b83de726f328444998fd8..27fc5f071ae1ae5aa4924b742e1eb573b7ef9ab4 100644 (file)
--- a/src/common/perf_counters.h
+++ b/src/common/perf_counters.h
@@ -279,9 +279,14 @@ public:
 
   // prio values: higher is better, and higher values get included in
   // 'ceph daemonperf' (and similar) results.
+  // Use of priorities enables us to add large numbers of counters
+  // internally without necessarily overwhelming consumers.
   enum {
     PRIO_CRITICAL = 10,
+    // 'interesting' is the default threshold for `daemonperf` output
     PRIO_INTERESTING = 8,
+    // `useful` is the default threshold for transmission to ceph-mgr
+    // and inclusion in prometheus/influxdb plugin output
     PRIO_USEFUL = 5,
     PRIO_UNINTERESTING = 2,
     PRIO_DEBUGONLY = 0,