Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions kube_downscaler/cmd.py
Original file line number Diff line number Diff line change
Expand Up @@ -134,4 +134,9 @@ def get_parser():
default=os.getenv("ADMISSION_CONTROLLER", ""),
help="Apply downscaling to jobs using the supplied admission controller. Jobs should be included inside --include-resources if you want to use this parameter. kyverno and gatekeeper are supported.",
)
parser.add_argument(
"--json-logs",
help="Output logs in JSON format instead of plain text (default: false)",
action="store_true",
)
return parser
18 changes: 13 additions & 5 deletions kube_downscaler/helper.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import datetime
import json
import logging
import re
import sys
Expand Down Expand Up @@ -159,15 +160,22 @@ def create_event(resource, message: str, reason: str, event_type: str, dry_run:
except Exception as e:
logger.error(f"Could not create event {event.obj}: {e}")

def setup_logging(debug: bool):
def setup_logging(debug: bool, json_logs: bool):
logging.getLogger().handlers.clear()

root_logger = logging.getLogger()
root_logger.setLevel(logging.DEBUG if debug else logging.INFO)

formatter = logging.Formatter("%(asctime)s %(levelname)s: %(message)s")

stderr_handler = logging.StreamHandler(sys.stderr)
stderr_handler.setFormatter(formatter)

if json_logs:
formatter = logging.Formatter()
formatter.format = lambda record: json.dumps({
"time": logging.Formatter.formatTime(logging.Formatter(), record),
"severity": record.levelname,
"message": record.getMessage().replace('"', "'")
})
else:
formatter = logging.Formatter("%(asctime)s %(levelname)s: %(message)s")

stderr_handler.setFormatter(formatter)
root_logger.addHandler(stderr_handler)
2 changes: 1 addition & 1 deletion kube_downscaler/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def main(args=None):
parser = cmd.get_parser()
args = parser.parse_args(args)

helper.setup_logging(args.debug)
helper.setup_logging(args.debug, args.json_logs)

config_str = ", ".join(f"{k}={v}" for k, v in sorted(vars(args).items()))
logger.info(f"Downscaler v{__version__} started with {config_str}")
Expand Down