diff --git a/buildpack/telemetry/metrics.py b/buildpack/telemetry/metrics.py index 224ae25e6..f589dc5fb 100644 --- a/buildpack/telemetry/metrics.py +++ b/buildpack/telemetry/metrics.py @@ -352,8 +352,8 @@ def _inject_health(self, stats): else: health["health"] = translation["critical"] health["diagnosis"] = ( - "Health check failed unexpectedly: %s", - health_response.get_error(), + "Health check failed unexpectedly: " + f"{health_response.get_error()}" ) else: feedback = health_response.get_feedback() @@ -365,7 +365,7 @@ def _inject_health(self, stats): except Exception as exc: logging.warning("Metrics: Failed to get health status %s", str(exc)) health["health"] = translation["critical"] - health["diagnosis"] = "Health check failed unexpectedly: %s", exc + health["diagnosis"] = f"Health check failed unexpectedly: {exc}" return stats @staticmethod diff --git a/dependencies.yml b/dependencies.yml index 4fc0c9578..a9e0583c9 100644 --- a/dependencies.yml +++ b/dependencies.yml @@ -49,8 +49,8 @@ dependencies: - jdk vendor: Adoptium version: - - "8": 8u332 - - "11": 11.0.16 + - "8": 8u372 + - "11": 11.0.18 logs: mendix-logfilter: artifact: logs/mendix-logfilter-{{version}}.tar.gz diff --git a/etc/telegraf/telegraf.toml.j2 b/etc/telegraf/telegraf.toml.j2 index 874cdc5f6..a400261a1 100644 --- a/etc/telegraf/telegraf.toml.j2 +++ b/etc/telegraf/telegraf.toml.j2 @@ -16,7 +16,10 @@ flush_jitter = "5s" precision = "" debug = {{ telegraf_debug_enabled }} - logfile = "" + logtarget = "file" + logfile = "/app/log/telegraf.log" + logfile_rotation_max_size = "10MB" + logfile_rotation_max_archives = 5 hostname = "{{ hostname }}" omit_hostname = false @@ -377,11 +380,11 @@ ## The file will be rotated after the time interval specified. When set ## to 0 no time based rotation is performed. - rotation_interval = "12h" + # rotation_interval = "12h" ## The logfile will be rotated when it becomes larger than the specified ## size. When set to 0 no size based rotation is performed. - # rotation_max_size = "0MB" + rotation_max_size = "10MB" ## Maximum number of rotated archives to keep, any older logs are deleted. ## If set to -1, no archives are removed. diff --git a/tests/unit/test_java_tls10_11.py b/tests/unit/test_java_tls10_11.py index 7acd140fb..45b66e1f0 100644 --- a/tests/unit/test_java_tls10_11.py +++ b/tests/unit/test_java_tls10_11.py @@ -90,7 +90,7 @@ def test_security_properties_file(self): MAJOR_VERSION_TEST_CASES = [ ("8", 8), ("1.8.0", 8), - ("8u332", 8), + ("8u372", 8), ("11", 11), ("11.0.15", 11), ("7", ""),