X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fceph%2Fsrc%2Fmon%2FLogMonitor.cc;fp=src%2Fceph%2Fsrc%2Fmon%2FLogMonitor.cc;h=0000000000000000000000000000000000000000;hb=7da45d65be36d36b880cc55c5036e96c24b53f00;hp=b52767f9bceb8563dda0a866a16c568e8b623653;hpb=691462d09d0987b47e112d6ee8740375df3c51b2;p=stor4nfv.git

diff --git a/src/ceph/src/mon/LogMonitor.cc b/src/ceph/src/mon/LogMonitor.cc
deleted file mode 100644
index b52767f..0000000
--- a/src/ceph/src/mon/LogMonitor.cc
+++ /dev/null
@@ -1,845 +0,0 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- 
-// vim: ts=8 sw=2 smarttab
-/*
- * Ceph - scalable distributed file system
- *
- * Copyright (C) 2004-2006 Sage Weil <sage@newdream.net>
- *
- * This is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1, as published by the Free Software 
- * Foundation.  See file COPYING.
- * 
- */
-
-#include <boost/algorithm/string/predicate.hpp>
-
-#include <sstream>
-#include <syslog.h>
-
-#include "LogMonitor.h"
-#include "Monitor.h"
-#include "MonitorDBStore.h"
-
-#include "messages/MMonCommand.h"
-#include "messages/MLog.h"
-#include "messages/MLogAck.h"
-#include "common/Graylog.h"
-#include "common/errno.h"
-#include "common/strtol.h"
-#include "include/assert.h"
-#include "include/str_list.h"
-#include "include/str_map.h"
-#include "include/compat.h"
-
-#define dout_subsys ceph_subsys_mon
-#undef dout_prefix
-#define dout_prefix _prefix(_dout, mon, get_last_committed())
-static ostream& _prefix(std::ostream *_dout, Monitor *mon, version_t v) {
-  return *_dout << "mon." << mon->name << "@" << mon->rank
-		<< "(" << mon->get_state_name()
-		<< ").log v" << v << " ";
-}
-
-ostream& operator<<(ostream &out, const LogMonitor &pm)
-{
-  return out << "log";
-}
-
-/*
- Tick function to update the map based on performance every N seconds
-*/
-
-void LogMonitor::tick() 
-{
-  if (!is_active()) return;
-
-  dout(10) << *this << dendl;
-
-}
-
-void LogMonitor::create_initial()
-{
-  dout(10) << "create_initial -- creating initial map" << dendl;
-  LogEntry e;
-  memset(&e.who, 0, sizeof(e.who));
-  e.name = g_conf->name;
-  e.stamp = ceph_clock_now();
-  e.prio = CLOG_INFO;
-  std::stringstream ss;
-  ss << "mkfs " << mon->monmap->get_fsid();
-  e.msg = ss.str();
-  e.seq = 0;
-  pending_log.insert(pair<utime_t,LogEntry>(e.stamp, e));
-}
-
-void LogMonitor::update_from_paxos(bool *need_bootstrap)
-{
-  dout(10) << __func__ << dendl;
-  version_t version = get_last_committed();
-  dout(10) << __func__ << " version " << version
-           << " summary v " << summary.version << dendl;
-  if (version == summary.version)
-    return;
-  assert(version >= summary.version);
-
-  map<string,bufferlist> channel_blog;
-
-  version_t latest_full = get_version_latest_full();
-  dout(10) << __func__ << " latest full " << latest_full << dendl;
-  if ((latest_full > 0) && (latest_full > summary.version)) {
-    bufferlist latest_bl;
-    get_version_full(latest_full, latest_bl);
-    assert(latest_bl.length() != 0);
-    dout(7) << __func__ << " loading summary e" << latest_full << dendl;
-    bufferlist::iterator p = latest_bl.begin();
-    ::decode(summary, p);
-    dout(7) << __func__ << " loaded summary e" << summary.version << dendl;
-  }
-
-  // walk through incrementals
-  while (version > summary.version) {
-    bufferlist bl;
-    int err = get_version(summary.version+1, bl);
-    assert(err == 0);
-    assert(bl.length());
-
-    bufferlist::iterator p = bl.begin();
-    __u8 v;
-    ::decode(v, p);
-    while (!p.end()) {
-      LogEntry le;
-      le.decode(p);
-      dout(7) << "update_from_paxos applying incremental log " << summary.version+1 <<  " " << le << dendl;
-
-      string channel = le.channel;
-      if (channel.empty()) // keep retrocompatibility
-        channel = CLOG_CHANNEL_CLUSTER;
-
-      if (channels.do_log_to_syslog(channel)) {
-        string level = channels.get_level(channel);
-        string facility = channels.get_facility(channel);
-        if (level.empty() || facility.empty()) {
-          derr << __func__ << " unable to log to syslog -- level or facility"
-               << " not defined (level: " << level << ", facility: "
-               << facility << ")" << dendl;
-          continue;
-        }
-        le.log_to_syslog(channels.get_level(channel),
-                         channels.get_facility(channel));
-      }
-
-      if (channels.do_log_to_graylog(channel)) {
-	ceph::logging::Graylog::Ref graylog = channels.get_graylog(channel);
-	if (graylog) {
-	  graylog->log_log_entry(&le);
-	}
-	dout(7) << "graylog: " << channel << " " << graylog
-		<< " host:" << channels.log_to_graylog_host << dendl;
-      }
-
-      string log_file = channels.get_log_file(channel);
-      dout(20) << __func__ << " logging for channel '" << channel
-               << "' to file '" << log_file << "'" << dendl;
-
-      if (!log_file.empty()) {
-        string log_file_level = channels.get_log_file_level(channel);
-        if (log_file_level.empty()) {
-          dout(1) << __func__ << " warning: log file level not defined for"
-                  << " channel '" << channel << "' yet a log file is --"
-                  << " will assume lowest level possible" << dendl;
-        }
-
-	int min = string_to_syslog_level(log_file_level);
-	int l = clog_type_to_syslog_level(le.prio);
-	if (l <= min) {
-	  stringstream ss;
-	  ss << le << "\n";
-          // init entry if DNE
-          bufferlist &blog = channel_blog[channel];
-          blog.append(ss.str());
-	}
-      }
-
-      summary.add(le);
-    }
-
-    summary.version++;
-    summary.prune(g_conf->mon_log_max_summary);
-  }
-
-  dout(15) << __func__ << " logging for "
-           << channel_blog.size() << " channels" << dendl;
-  for(map<string,bufferlist>::iterator p = channel_blog.begin();
-      p != channel_blog.end(); ++p) {
-    if (!p->second.length()) {
-      dout(15) << __func__ << " channel '" << p->first
-               << "': nothing to log" << dendl;
-      continue;
-    }
-
-    dout(15) << __func__ << " channel '" << p->first
-             << "' logging " << p->second.length() << " bytes" << dendl;
-    string log_file = channels.get_log_file(p->first);
-
-    int fd = ::open(log_file.c_str(), O_WRONLY|O_APPEND|O_CREAT, 0600);
-    if (fd < 0) {
-      int err = -errno;
-      dout(1) << "unable to write to '" << log_file << "' for channel '"
-              << p->first << "': " << cpp_strerror(err) << dendl;
-    } else {
-      int err = p->second.write_fd(fd);
-      if (err < 0) {
-	dout(1) << "error writing to '" << log_file << "' for channel '"
-                << p->first << ": " << cpp_strerror(err) << dendl;
-      }
-      VOID_TEMP_FAILURE_RETRY(::close(fd));
-    }
-  }
-
-  check_subs();
-}
-
-void LogMonitor::create_pending()
-{
-  pending_log.clear();
-  pending_summary = summary;
-  dout(10) << "create_pending v " << (get_last_committed() + 1) << dendl;
-}
-
-void LogMonitor::encode_pending(MonitorDBStore::TransactionRef t)
-{
-  version_t version = get_last_committed() + 1;
-  bufferlist bl;
-  dout(10) << __func__ << " v" << version << dendl;
-  __u8 v = 1;
-  ::encode(v, bl);
-  multimap<utime_t,LogEntry>::iterator p;
-  for (p = pending_log.begin(); p != pending_log.end(); ++p)
-    p->second.encode(bl, mon->get_quorum_con_features());
-
-  put_version(t, version, bl);
-  put_last_committed(t, version);
-}
-
-void LogMonitor::encode_full(MonitorDBStore::TransactionRef t)
-{
-  dout(10) << __func__ << " log v " << summary.version << dendl;
-  assert(get_last_committed() == summary.version);
-
-  bufferlist summary_bl;
-  ::encode(summary, summary_bl, mon->get_quorum_con_features());
-
-  put_version_full(t, summary.version, summary_bl);
-  put_version_latest_full(t, summary.version);
-}
-
-version_t LogMonitor::get_trim_to()
-{
-  if (!mon->is_leader())
-    return 0;
-
-  unsigned max = g_conf->mon_max_log_epochs;
-  version_t version = get_last_committed();
-  if (version > max)
-    return version - max;
-  return 0;
-}
-
-bool LogMonitor::preprocess_query(MonOpRequestRef op)
-{
-  op->mark_logmon_event("preprocess_query");
-  PaxosServiceMessage *m = static_cast<PaxosServiceMessage*>(op->get_req());
-  dout(10) << "preprocess_query " << *m << " from " << m->get_orig_source_inst() << dendl;
-  switch (m->get_type()) {
-  case MSG_MON_COMMAND:
-    return preprocess_command(op);
-
-  case MSG_LOG:
-    return preprocess_log(op);
-
-  default:
-    ceph_abort();
-    return true;
-  }
-}
-
-bool LogMonitor::prepare_update(MonOpRequestRef op)
-{
-  op->mark_logmon_event("prepare_update");
-  PaxosServiceMessage *m = static_cast<PaxosServiceMessage*>(op->get_req());
-  dout(10) << "prepare_update " << *m << " from " << m->get_orig_source_inst() << dendl;
-  switch (m->get_type()) {
-  case MSG_MON_COMMAND:
-    return prepare_command(op);
-  case MSG_LOG:
-    return prepare_log(op);
-  default:
-    ceph_abort();
-    return false;
-  }
-}
-
-bool LogMonitor::preprocess_log(MonOpRequestRef op)
-{
-  op->mark_logmon_event("preprocess_log");
-  MLog *m = static_cast<MLog*>(op->get_req());
-  dout(10) << "preprocess_log " << *m << " from " << m->get_orig_source() << dendl;
-  int num_new = 0;
-
-  MonSession *session = m->get_session();
-  if (!session)
-    goto done;
-  if (!session->is_capable("log", MON_CAP_W)) {
-    dout(0) << "preprocess_log got MLog from entity with insufficient privileges "
-	    << session->caps << dendl;
-    goto done;
-  }
-  
-  for (deque<LogEntry>::iterator p = m->entries.begin();
-       p != m->entries.end();
-       ++p) {
-    if (!pending_summary.contains(p->key()))
-      num_new++;
-  }
-  if (!num_new) {
-    dout(10) << "  nothing new" << dendl;
-    goto done;
-  }
-
-  return false;
-
- done:
-  return true;
-}
-
-struct LogMonitor::C_Log : public C_MonOp {
-  LogMonitor *logmon;
-  C_Log(LogMonitor *p, MonOpRequestRef o) :
-    C_MonOp(o), logmon(p) {}
-  void _finish(int r) override {
-    if (r == -ECANCELED) {
-      return;
-    }
-    logmon->_updated_log(op);
-  }
-};
-
-bool LogMonitor::prepare_log(MonOpRequestRef op) 
-{
-  op->mark_logmon_event("prepare_log");
-  MLog *m = static_cast<MLog*>(op->get_req());
-  dout(10) << "prepare_log " << *m << " from " << m->get_orig_source() << dendl;
-
-  if (m->fsid != mon->monmap->fsid) {
-    dout(0) << "handle_log on fsid " << m->fsid << " != " << mon->monmap->fsid 
-	    << dendl;
-    return false;
-  }
-
-  for (deque<LogEntry>::iterator p = m->entries.begin();
-       p != m->entries.end();
-       ++p) {
-    dout(10) << " logging " << *p << dendl;
-    if (!pending_summary.contains(p->key())) {
-      pending_summary.add(*p);
-      pending_log.insert(pair<utime_t,LogEntry>(p->stamp, *p));
-    }
-  }
-  pending_summary.prune(g_conf->mon_log_max_summary);
-  wait_for_finished_proposal(op, new C_Log(this, op));
-  return true;
-}
-
-void LogMonitor::_updated_log(MonOpRequestRef op)
-{
-  MLog *m = static_cast<MLog*>(op->get_req());
-  dout(7) << "_updated_log for " << m->get_orig_source_inst() << dendl;
-  mon->send_reply(op, new MLogAck(m->fsid, m->entries.rbegin()->seq));
-}
-
-bool LogMonitor::should_propose(double& delay)
-{
-  // commit now if we have a lot of pending events
-  if (g_conf->mon_max_log_entries_per_event > 0 &&
-      pending_log.size() >= (unsigned)g_conf->mon_max_log_entries_per_event)
-    return true;
-
-  // otherwise fall back to generic policy
-  return PaxosService::should_propose(delay);
-}
-
-
-bool LogMonitor::preprocess_command(MonOpRequestRef op)
-{
-  op->mark_logmon_event("preprocess_command");
-  MMonCommand *m = static_cast<MMonCommand*>(op->get_req());
-  int r = -EINVAL;
-  bufferlist rdata;
-  stringstream ss;
-
-  map<string, cmd_vartype> cmdmap;
-  if (!cmdmap_from_json(m->cmd, &cmdmap, ss)) {
-    string rs = ss.str();
-    mon->reply_command(op, -EINVAL, rs, get_last_committed());
-    return true;
-  }
-  MonSession *session = m->get_session();
-  if (!session) {
-    mon->reply_command(op, -EACCES, "access denied", get_last_committed());
-    return true;
-  }
-
-  string prefix;
-  cmd_getval(g_ceph_context, cmdmap, "prefix", prefix);
-
-  string format;
-  cmd_getval(g_ceph_context, cmdmap, "format", format, string("plain"));
-  boost::scoped_ptr<Formatter> f(Formatter::create(format));
-
-  if (prefix == "log last") {
-    int64_t num = 20;
-    cmd_getval(g_ceph_context, cmdmap, "num", num);
-    if (f) {
-      f->open_array_section("tail");
-    }
-
-    std::string level_str;
-    clog_type level;
-    if (cmd_getval(g_ceph_context, cmdmap, "level", level_str)) {
-      level = LogEntry::str_to_level(level_str);
-      if (level == CLOG_UNKNOWN) {
-        ss << "Invalid severity '" << level_str << "'";
-        mon->reply_command(op, -EINVAL, ss.str(), get_last_committed());
-        return true;
-      }
-    } else {
-      level = CLOG_INFO;
-    }
-
-    std::string channel;
-    if (!cmd_getval(g_ceph_context, cmdmap, "channel", channel)) {
-      channel = CLOG_CHANNEL_DEFAULT;
-    }
-
-    // We'll apply this twice, once while counting out lines
-    // and once while outputting them.
-    auto match = [level, channel](const LogEntry &entry) {
-      return entry.prio >= level && (entry.channel == channel || channel == "*");
-    };
-
-    auto rp = summary.tail.rbegin();
-    for (; num > 0 && rp != summary.tail.rend(); ++rp) {
-      if (match(*rp)) {
-        num--;
-      }
-    }
-    if (rp == summary.tail.rend()) {
-      --rp;
-    }
-    ostringstream ss;
-    for (; rp != summary.tail.rbegin(); --rp) {
-      if (!match(*rp)) {
-        continue;
-      }
-
-      if (f) {
-	f->dump_object("entry", *rp);
-      } else {
-	ss << *rp << "\n";
-      }
-    }
-    if (f) {
-      f->close_section();
-      f->flush(rdata);
-    } else {
-      rdata.append(ss.str());
-    }
-    r = 0;
-  } else {
-    return false;
-  }
-
-  string rs;
-  getline(ss, rs);
-  mon->reply_command(op, r, rs, rdata, get_last_committed());
-  return true;
-}
-
-
-bool LogMonitor::prepare_command(MonOpRequestRef op)
-{
-  op->mark_logmon_event("prepare_command");
-  MMonCommand *m = static_cast<MMonCommand*>(op->get_req());
-  stringstream ss;
-  string rs;
-  int err = -EINVAL;
-
-  map<string, cmd_vartype> cmdmap;
-  if (!cmdmap_from_json(m->cmd, &cmdmap, ss)) {
-    // ss has reason for failure
-    string rs = ss.str();
-    mon->reply_command(op, -EINVAL, rs, get_last_committed());
-    return true;
-  }
-
-  string prefix;
-  cmd_getval(g_ceph_context, cmdmap, "prefix", prefix);
-
-  MonSession *session = m->get_session();
-  if (!session) {
-    mon->reply_command(op, -EACCES, "access denied", get_last_committed());
-    return true;
-  }
-
-  if (prefix == "log") {
-    vector<string> logtext;
-    cmd_getval(g_ceph_context, cmdmap, "logtext", logtext);
-    LogEntry le;
-    le.who = m->get_orig_source_inst();
-    le.name = session->entity_name;
-    le.stamp = m->get_recv_stamp();
-    le.seq = 0;
-    le.prio = CLOG_INFO;
-    le.channel = CLOG_CHANNEL_DEFAULT;
-    le.msg = str_join(logtext, " ");
-    pending_summary.add(le);
-    pending_summary.prune(g_conf->mon_log_max_summary);
-    pending_log.insert(pair<utime_t,LogEntry>(le.stamp, le));
-    wait_for_finished_proposal(op, new Monitor::C_Command(
-          mon, op, 0, string(), get_last_committed() + 1));
-    return true;
-  }
-
-  getline(ss, rs);
-  mon->reply_command(op, err, rs, get_last_committed());
-  return false;
-}
-
-
-int LogMonitor::sub_name_to_id(const string& n)
-{
-  if (n.substr(0, 4) == "log-" && n.size() > 4) {
-    return LogEntry::str_to_level(n.substr(4));
-  } else {
-    return CLOG_UNKNOWN;
-  }
-}
-
-void LogMonitor::check_subs()
-{
-  dout(10) << __func__ << dendl;
-  for (map<string, xlist<Subscription*>*>::iterator i = mon->session_map.subs.begin();
-       i != mon->session_map.subs.end();
-       ++i) {
-    for (xlist<Subscription*>::iterator j = i->second->begin(); !j.end(); ++j) {
-      if (sub_name_to_id((*j)->type) >= 0)
-	check_sub(*j);
-    }
-  }
-}
-
-void LogMonitor::check_sub(Subscription *s)
-{
-  dout(10) << __func__ << " client wants " << s->type << " ver " << s->next << dendl;
-
-  int sub_level = sub_name_to_id(s->type);
-  assert(sub_level >= 0);
-
-  version_t summary_version = summary.version;
-  if (s->next > summary_version) {
-    dout(10) << __func__ << " client " << s->session->inst 
-	    << " requested version (" << s->next << ") is greater than ours (" 
-	    << summary_version << "), which means we already sent him" 
-	    << " everything we have." << dendl;
-    return;
-  } 
- 
-  MLog *mlog = new MLog(mon->monmap->fsid);
-
-  if (s->next == 0) { 
-    /* First timer, heh? */
-    bool ret = _create_sub_summary(mlog, sub_level);
-    if (!ret) {
-      dout(1) << __func__ << " ret = " << ret << dendl;
-      mlog->put();
-      return;
-    }
-  } else {
-    /* let us send you an incremental log... */
-    _create_sub_incremental(mlog, sub_level, s->next);
-  }
-
-  dout(1) << __func__ << " sending message to " << s->session->inst 
-	  << " with " << mlog->entries.size() << " entries"
-	  << " (version " << mlog->version << ")" << dendl;
-  
-  if (!mlog->entries.empty()) {
-    s->session->con->send_message(mlog);
-  } else {
-    mlog->put();
-  }
-  if (s->onetime)
-    mon->session_map.remove_sub(s);
-  else
-    s->next = summary_version+1;
-}
-
-/**
- * Create a log message containing only the last message in the summary.
- *
- * @param mlog	Log message we'll send to the client.
- * @param level Maximum log level the client is interested in.
- * @return	'true' if we consider we successfully populated @mlog;
- *		'false' otherwise.
- */
-bool LogMonitor::_create_sub_summary(MLog *mlog, int level)
-{
-  dout(10) << __func__ << dendl;
-
-  assert(mlog != NULL);
-
-  if (!summary.tail.size())
-    return false;
-
-  list<LogEntry>::reverse_iterator it = summary.tail.rbegin();
-  for (; it != summary.tail.rend(); ++it) {
-    LogEntry e = *it;
-    if (e.prio < level)
-      continue;
-
-    mlog->entries.push_back(e);
-    mlog->version = summary.version;
-    break;
-  }
-
-  return true;
-}
-
-/**
- * Create an incremental log message from version \p sv to \p summary.version
- *
- * @param mlog	Log message we'll send to the client with the messages received
- *		since version \p sv, inclusive.
- * @param level	The max log level of the messages the client is interested in.
- * @param sv	The version the client is looking for.
- */
-void LogMonitor::_create_sub_incremental(MLog *mlog, int level, version_t sv)
-{
-  dout(10) << __func__ << " level " << level << " ver " << sv 
-	  << " cur summary ver " << summary.version << dendl; 
-
-  if (sv < get_first_committed()) {
-    dout(10) << __func__ << " skipped from " << sv
-	     << " to first_committed " << get_first_committed() << dendl;
-    LogEntry le;
-    le.stamp = ceph_clock_now();
-    le.prio = CLOG_WARN;
-    ostringstream ss;
-    ss << "skipped log messages from " << sv << " to " << get_first_committed();
-    le.msg = ss.str();
-    mlog->entries.push_back(le);
-    sv = get_first_committed();
-  }
-
-  version_t summary_ver = summary.version;
-  while (sv <= summary_ver) {
-    bufferlist bl;
-    int err = get_version(sv, bl);
-    assert(err == 0);
-    assert(bl.length());
-    bufferlist::iterator p = bl.begin();
-    __u8 v;
-    ::decode(v,p);
-    while (!p.end()) {
-      LogEntry le;
-      le.decode(p);
-
-      if (le.prio < level) {
-	dout(20) << __func__ << " requested " << level 
-		 << " entry " << le.prio << dendl;
-	continue;
-      }
-
-      mlog->entries.push_back(le);
-    }
-    mlog->version = sv++;
-  }
-
-  dout(10) << __func__ << " incremental message ready (" 
-	   << mlog->entries.size() << " entries)" << dendl;
-}
-
-void LogMonitor::update_log_channels()
-{
-  ostringstream oss;
-
-  channels.clear();
-
-  int r = get_conf_str_map_helper(g_conf->mon_cluster_log_to_syslog,
-                                  oss, &channels.log_to_syslog,
-                                  CLOG_CONFIG_DEFAULT_KEY);
-  if (r < 0) {
-    derr << __func__ << " error parsing 'mon_cluster_log_to_syslog'" << dendl;
-    return;
-  }
-
-  r = get_conf_str_map_helper(g_conf->mon_cluster_log_to_syslog_level,
-                              oss, &channels.syslog_level,
-                              CLOG_CONFIG_DEFAULT_KEY);
-  if (r < 0) {
-    derr << __func__ << " error parsing 'mon_cluster_log_to_syslog_level'"
-         << dendl;
-    return;
-  }
-
-  r = get_conf_str_map_helper(g_conf->mon_cluster_log_to_syslog_facility,
-                              oss, &channels.syslog_facility,
-                              CLOG_CONFIG_DEFAULT_KEY);
-  if (r < 0) {
-    derr << __func__ << " error parsing 'mon_cluster_log_to_syslog_facility'"
-         << dendl;
-    return;
-  }
-
-  r = get_conf_str_map_helper(g_conf->mon_cluster_log_file, oss,
-                              &channels.log_file,
-                              CLOG_CONFIG_DEFAULT_KEY);
-  if (r < 0) {
-    derr << __func__ << " error parsing 'mon_cluster_log_file'" << dendl;
-    return;
-  }
-
-  r = get_conf_str_map_helper(g_conf->mon_cluster_log_file_level, oss,
-                              &channels.log_file_level,
-                              CLOG_CONFIG_DEFAULT_KEY);
-  if (r < 0) {
-    derr << __func__ << " error parsing 'mon_cluster_log_file_level'"
-         << dendl;
-    return;
-  }
-
-  r = get_conf_str_map_helper(g_conf->mon_cluster_log_to_graylog, oss,
-                              &channels.log_to_graylog,
-                              CLOG_CONFIG_DEFAULT_KEY);
-  if (r < 0) {
-    derr << __func__ << " error parsing 'mon_cluster_log_to_graylog'"
-         << dendl;
-    return;
-  }
-
-  r = get_conf_str_map_helper(g_conf->mon_cluster_log_to_graylog_host, oss,
-                              &channels.log_to_graylog_host,
-                              CLOG_CONFIG_DEFAULT_KEY);
-  if (r < 0) {
-    derr << __func__ << " error parsing 'mon_cluster_log_to_graylog_host'"
-         << dendl;
-    return;
-  }
-
-  r = get_conf_str_map_helper(g_conf->mon_cluster_log_to_graylog_port, oss,
-                              &channels.log_to_graylog_port,
-                              CLOG_CONFIG_DEFAULT_KEY);
-  if (r < 0) {
-    derr << __func__ << " error parsing 'mon_cluster_log_to_graylog_port'"
-         << dendl;
-    return;
-  }
-
-  channels.expand_channel_meta();
-}
-
-void LogMonitor::log_channel_info::expand_channel_meta(map<string,string> &m)
-{
-  generic_dout(20) << __func__ << " expand map: " << m << dendl;
-  for (map<string,string>::iterator p = m.begin(); p != m.end(); ++p) {
-    m[p->first] = expand_channel_meta(p->second, p->first);
-  }
-  generic_dout(20) << __func__ << " expanded map: " << m << dendl;
-}
-
-string LogMonitor::log_channel_info::expand_channel_meta(
-    const string &input,
-    const string &change_to)
-{
-  size_t pos = string::npos;
-  string s(input);
-  while ((pos = s.find(LOG_META_CHANNEL)) != string::npos) {
-    string tmp = s.substr(0, pos) + change_to;
-    if (pos+LOG_META_CHANNEL.length() < s.length())
-      tmp += s.substr(pos+LOG_META_CHANNEL.length());
-    s = tmp;
-  }
-  generic_dout(20) << __func__ << " from '" << input
-                   << "' to '" << s << "'" << dendl;
-
-  return s;
-}
-
-bool LogMonitor::log_channel_info::do_log_to_syslog(const string &channel) {
-  string v = get_str_map_key(log_to_syslog, channel,
-                             &CLOG_CONFIG_DEFAULT_KEY);
-  // We expect booleans, but they are in k/v pairs, kept
-  // as strings, in 'log_to_syslog'. We must ensure
-  // compatibility with existing boolean handling, and so
-  // we are here using a modified version of how
-  // md_config_t::set_val_raw() handles booleans. We will
-  // accept both 'true' and 'false', but will also check for
-  // '1' and '0'. The main distiction between this and the
-  // original code is that we will assume everything not '1',
-  // '0', 'true' or 'false' to be 'false'.
-  bool ret = false;
-
-  if (boost::iequals(v, "false")) {
-    ret = false;
-  } else if (boost::iequals(v, "true")) {
-    ret = true;
-  } else {
-    std::string err;
-    int b = strict_strtol(v.c_str(), 10, &err);
-    ret = (err.empty() && b == 1);
-  }
-
-  return ret;
-}
-
-ceph::logging::Graylog::Ref LogMonitor::log_channel_info::get_graylog(
-    const string &channel)
-{
-  generic_dout(25) << __func__ << " for channel '"
-		   << channel << "'" << dendl;
-
-  if (graylogs.count(channel) == 0) {
-    auto graylog(std::make_shared<ceph::logging::Graylog>("mon"));
-
-    graylog->set_fsid(g_conf->get_val<uuid_d>("fsid"));
-    graylog->set_hostname(g_conf->host);
-    graylog->set_destination(get_str_map_key(log_to_graylog_host, channel,
-					     &CLOG_CONFIG_DEFAULT_KEY),
-			     atoi(get_str_map_key(log_to_graylog_port, channel,
-						  &CLOG_CONFIG_DEFAULT_KEY).c_str()));
-
-    graylogs[channel] = graylog;
-    generic_dout(20) << __func__ << " for channel '"
-		     << channel << "' to graylog host '"
-		     << log_to_graylog_host[channel] << ":"
-		     << log_to_graylog_port[channel]
-		     << "'" << dendl;
-  }
-  return graylogs[channel];
-}
-
-void LogMonitor::handle_conf_change(const struct md_config_t *conf,
-                                    const std::set<std::string> &changed)
-{
-  if (changed.count("mon_cluster_log_to_syslog") ||
-      changed.count("mon_cluster_log_to_syslog_level") ||
-      changed.count("mon_cluster_log_to_syslog_facility") ||
-      changed.count("mon_cluster_log_file") ||
-      changed.count("mon_cluster_log_file_level") ||
-      changed.count("mon_cluster_log_to_graylog") ||
-      changed.count("mon_cluster_log_to_graylog_host") ||
-      changed.count("mon_cluster_log_to_graylog_port")) {
-    update_log_channels();
-  }
-}