Update patch to add minion ID to master logs

Updates the Cloudflare patch to add minion ID to master logs:

* Reverts changes to the default log formats - as with the existing
support for JID it should probably be up to user to set that rather than
us changing the defaults and potentially causing breakage.

* Updates code to get id and log_fmt_minion_id from context as data is
no longer available in _log

Author: barneysowood

salt/_logging/__init__.py

@@ -15,8 +15,8 @@
     DFLT_LOG_DATEFMT_LOGFILE,
     DFLT_LOG_FMT_CONSOLE,
     DFLT_LOG_FMT_JID,
-    DFLT_LOG_FMT_MINION_ID,
     DFLT_LOG_FMT_LOGFILE,
+    DFLT_LOG_FMT_MINION_ID,
     LOG_COLORS,
     LOG_LEVELS,
     LOG_VALUES_TO_LEVELS,

salt/_logging/impl.py

@@ -1,8 +1,8 @@
 """
-    salt._logging.impl
-    ~~~~~~~~~~~~~~~~~~
+salt._logging.impl
+~~~~~~~~~~~~~~~~~~
 
-    Salt's logging implementation classes/functionality
+Salt's logging implementation classes/functionality
 """
 
 import atexit
@@ -103,8 +103,8 @@
 DFLT_LOG_FMT_MINION_ID = "[%(minion_id)s]"
 DFLT_LOG_DATEFMT = "%H:%M:%S"
 DFLT_LOG_DATEFMT_LOGFILE = "%Y-%m-%d %H:%M:%S"
-DFLT_LOG_FMT_CONSOLE = "[%(levelname)-8s]%(jid)s%(minion_id)s %(message)s"
-DFLT_LOG_FMT_LOGFILE = "%(asctime)s,%(msecs)03d [%(name)-17s:%(lineno)-4d][%(levelname)-8s][%(process)d]%(jid)s%(minion_id)s %(message)s"
+DFLT_LOG_FMT_CONSOLE = "[%(levelname)-8s] %(message)s"
+DFLT_LOG_FMT_LOGFILE = "%(asctime)s,%(msecs)03d [%(name)-17s:%(lineno)-4d][%(levelname)-8s][%(process)d] %(message)s"
 
 
 class SaltLogRecord(logging.LogRecord):
@@ -257,15 +257,22 @@ def _log(
             .get("log_fmt_jid", None)
         )
 
+        current_minion_id = (
+            salt.utils.ctx.get_request_context().get("data", {}).get("id", None)
+        )
+
+        log_fmt_minion_id = (
+            salt.utils.ctx.get_request_context()
+            .get("opts", {})
+            .get("log_fmt_minion_id", None)
+        )
+
         if current_jid is not None:
             extra["jid"] = current_jid
 
         if log_fmt_jid is not None:
             extra["log_fmt_jid"] = log_fmt_jid
 
-        current_minion_id = data.get("id", None)
-        log_fmt_minion_id = opts.get("log_fmt_minion_id", None)
-
         if current_minion_id is not None:
             extra["minion_id"] = current_minion_id
 

salt/config/__init__.py

@@ -36,8 +36,8 @@
     DFLT_LOG_DATEFMT_LOGFILE,
     DFLT_LOG_FMT_CONSOLE,
     DFLT_LOG_FMT_JID,
-    DFLT_LOG_FMT_MINION_ID,
     DFLT_LOG_FMT_LOGFILE,
+    DFLT_LOG_FMT_MINION_ID,
 )
 
 try:
@@ -353,7 +353,7 @@ def _gather_buffer_space():
         "log_fmt_logfile": (tuple, str),
         # The format for JIDs prior to formatting into log lines as %(jid)s
         "log_fmt_jid": str,
-        # The format for minion_ids prior to formatting into log lines as %(jid)s
+        # The format for minion_ids prior to formatting into log lines as %(minion_id)s
         "log_fmt_minion_id": str,
         # A dictionary of logging levels
         "log_granular_levels": dict,