From a984da258bde23e38c7aa77e0d823c4a5da766ad Mon Sep 17 00:00:00 2001 From: arunan Date: Fri, 29 Mar 2024 13:58:22 +0530 Subject: [PATCH] Rename watcher parameter in diagnostic tool --- .../distribution/product/src/main/resources/conf/default.json | 4 ++-- .../conf/templates/diagnostics-tool/conf/config.toml.j2 | 4 ++-- pom.xml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/distribution/product/src/main/resources/conf/default.json b/modules/distribution/product/src/main/resources/conf/default.json index 50c511df3f..5f085c7af7 100644 --- a/modules/distribution/product/src/main/resources/conf/default.json +++ b/modules/distribution/product/src/main/resources/conf/default.json @@ -494,14 +494,14 @@ "cpu_watcher": { "enabled": "true", "threshold": "80", - "retry_count": "2", + "attempts": "2", "interval": "5", "action_executors": "ThreadDumper,MetricsSnapshot,ServerInfo" }, "memory_watcher": { "enabled": "true", "threshold": "80", - "retry_count": "2", + "attempts": "2", "interval": "5", "action_executors": "ThreadDumper,MetricsSnapshot,ServerInfo" }, diff --git a/modules/distribution/product/src/main/resources/conf/templates/diagnostics-tool/conf/config.toml.j2 b/modules/distribution/product/src/main/resources/conf/templates/diagnostics-tool/conf/config.toml.j2 index 65994e110d..7703b49da1 100644 --- a/modules/distribution/product/src/main/resources/conf/templates/diagnostics-tool/conf/config.toml.j2 +++ b/modules/distribution/product/src/main/resources/conf/templates/diagnostics-tool/conf/config.toml.j2 @@ -73,14 +73,14 @@ executor = "{{action.executor}}" [cpu_watcher] enabled = "{{cpu_watcher.enabled}}" threshold = "{{cpu_watcher.threshold}}" -retry_count = "{{cpu_watcher.retry_count}}" +attempts = "{{cpu_watcher.attempts}} interval = "{{cpu_watcher.interval}}" action_executors = "{{cpu_watcher.action_executors}}" [memory_watcher] enabled = "{{memory_watcher.enabled}}" threshold = "{{memory_watcher.threshold}}" -retry_count = "{{memory_watcher.retry_count}}" +attempts = "{{memory_watcher.attempts}}" interval = "{{memory_watcher.interval}}" action_executors = "{{memory_watcher.action_executors}}" diff --git a/pom.xml b/pom.xml index 52eb21ea4f..643653cd39 100644 --- a/pom.xml +++ b/pom.xml @@ -1461,7 +1461,7 @@ 1.0.24 - 1.0.14 + 1.0.15 5.11.34