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>
(cherry picked from commit 30a74ce343caec2a433cb532ba697fe7013ed05c)

diff --git a/src/ceph.in b/src/ceph.in
index c14c477e801a734f3cf34238ae1c8a75d5af681c..7c1eda2c0920bdc57d356b18140eba7f0d74531f 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 992ee534c136ba0e7de6cb933759ca4ed2a15be7..8208140d28b617e183802bab4ea70d066c7a5225 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,