From 1486397f318c88c9cd2ed07f5eb89cc407f8f400 Mon Sep 17 00:00:00 2001 From: John Spray Date: Fri, 14 Jul 2017 11:35:18 -0400 Subject: [PATCH] ceph.in: filter out audit from ceph -w ...and add an optional --watch-channel argument. Signed-off-by: John Spray --- PendingReleaseNotes | 4 ++++ src/ceph.in | 19 +++++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/PendingReleaseNotes b/PendingReleaseNotes index 572e45f438b..6f7266a37cd 100644 --- a/PendingReleaseNotes +++ b/PendingReleaseNotes @@ -203,3 +203,7 @@ * Certain extra fields in the 'ceph health' structured output that used to appear if the mons were low on disk space (which duplicated the information in the normal health warning messages) are now gone. + +* The "ceph -w" output no longer contains audit log entries by default. + Add a "--watch-channel=audit" or "--watch-channel=*" to see them. + diff --git a/src/ceph.in b/src/ceph.in index 6a6672a8592..04c9ed2238f 100755 --- a/src/ceph.in +++ b/src/ceph.in @@ -295,6 +295,11 @@ def parse_cmdargs(args=None, target=''): parser.add_argument('--watch-error', action='store_true', help='watch error events') + parser.add_argument('--watch-channel', dest="watch_channel", + help="which log channel to follow " \ + "when using -w/--watch. One of ['cluster', 'audit', '*'", + default='cluster') + parser.add_argument('--version', '-v', action="store_true", help="display version") parser.add_argument('--verbose', action="store_true", help="make verbose") parser.add_argument('--concise', dest='verbose', action="store_false", @@ -933,14 +938,16 @@ def main(): if k.startswith('watch') and v: if k == 'watch': level = 'info' - else: + elif k != "watch_channel": level = k.replace('watch_', '') if level: - # an awfully simple callback - def watch_cb(arg, line, who, stamp_sec, stamp_nsec, seq, level, msg): - print(line) - sys.stdout.flush() + def watch_cb(arg, line, channel, name, who, stamp_sec, stamp_nsec, seq, level, msg): + # Filter on channel + if (channel == parsed_args.watch_channel or \ + parsed_args.watch_channel == "*"): + print(line) + sys.stdout.flush() # first do a ceph status ret, outbuf, outs = json_command(cluster_handle, prefix='status') @@ -951,7 +958,7 @@ def main(): # this instance keeps the watch connection alive, but is # otherwise unused - run_in_thread(cluster_handle.monitor_log, level, watch_cb, 0) + run_in_thread(cluster_handle.monitor_log2, level, watch_cb, 0) # loop forever letting watch_cb print lines try: -- 2.39.5