MM-43077 Allow inline JSON in config.json for advanced logging config (#23324)
* add AdvancedLoggingJSON to LogSettings and deprecate AdvancedLoggingConfig * allow embedded JSON in config for advanced logging.
Этот коммит содержится в:
@@ -533,7 +533,8 @@ func (ts *TelemetryService) trackConfig() {
|
||||
"file_json": cfg.LogSettings.FileJson,
|
||||
"enable_webhook_debugging": cfg.LogSettings.EnableWebhookDebugging,
|
||||
"isdefault_file_location": isDefault(cfg.LogSettings.FileLocation, ""),
|
||||
"advanced_logging_config": *cfg.LogSettings.AdvancedLoggingConfig != "",
|
||||
"advanced_logging_json": len(cfg.LogSettings.AdvancedLoggingJSON) != 0,
|
||||
"advanced_logging_config": cfg.LogSettings.AdvancedLoggingConfig != nil && *cfg.LogSettings.AdvancedLoggingConfig != "",
|
||||
})
|
||||
|
||||
ts.SendTelemetry(TrackConfigAudit, map[string]any{
|
||||
@@ -543,7 +544,8 @@ func (ts *TelemetryService) trackConfig() {
|
||||
"file_max_backups": *cfg.ExperimentalAuditSettings.FileMaxBackups,
|
||||
"file_compress": *cfg.ExperimentalAuditSettings.FileCompress,
|
||||
"file_max_queue_size": *cfg.ExperimentalAuditSettings.FileMaxQueueSize,
|
||||
"advanced_logging_config": *cfg.ExperimentalAuditSettings.AdvancedLoggingConfig != "",
|
||||
"advanced_logging_json": len(cfg.ExperimentalAuditSettings.AdvancedLoggingJSON) != 0,
|
||||
"advanced_logging_config": cfg.ExperimentalAuditSettings.AdvancedLoggingConfig != nil && *cfg.ExperimentalAuditSettings.AdvancedLoggingConfig != "",
|
||||
})
|
||||
|
||||
ts.SendTelemetry(TrackConfigNotificationLog, map[string]any{
|
||||
@@ -554,7 +556,8 @@ func (ts *TelemetryService) trackConfig() {
|
||||
"file_level": *cfg.NotificationLogSettings.FileLevel,
|
||||
"file_json": *cfg.NotificationLogSettings.FileJson,
|
||||
"isdefault_file_location": isDefault(*cfg.NotificationLogSettings.FileLocation, ""),
|
||||
"advanced_logging_config": *cfg.NotificationLogSettings.AdvancedLoggingConfig != "",
|
||||
"advanced_logging_json": len(cfg.NotificationLogSettings.AdvancedLoggingJSON) != 0,
|
||||
"advanced_logging_config": cfg.NotificationLogSettings.AdvancedLoggingConfig != nil && *cfg.NotificationLogSettings.AdvancedLoggingConfig != "",
|
||||
})
|
||||
|
||||
ts.SendTelemetry(TrackConfigPassword, map[string]any{
|
||||
|
||||
Ссылка в новой задаче
Block a user