Extend logging
Change-Id: I27b0d3f3facbd7c5afc6d1fc0515c377563f83d3
diff --git a/watchdog/files/watchdog.conf b/watchdog/files/watchdog.conf
index 25e570f..4e09bde 100644
--- a/watchdog/files/watchdog.conf
+++ b/watchdog/files/watchdog.conf
@@ -42,6 +42,7 @@
#repair-binary = /usr/sbin/repair
#repair-timeout =
+
#test-binary =
#test-timeout =
@@ -66,12 +67,21 @@
{%- endif %}
#logtick = 1
+{%- if server.logtick is defined %}
+logtick = {{ server.logtick }}
+{%- endif %}
+
+# Please refer to:
+# http://www.sat.dundee.ac.uk/psc/watchdog/watchdog-configure.html#Verbosity
+# for logging and verbosity configuration info
#log-dir = /var/log/watchdog
{%- if server.log_dir is defined %}
log-dir = {{ server.log_dir }}
{%- endif %}
+verbose = {{ server.log_verbose|default('no') }}
+
# This greatly decreases the chance that watchdog won't be scheduled before
# your machine is really loaded
#realtime = yes
@@ -81,6 +91,9 @@
# Check if rsyslogd is still running by enabling the following line
#pidfile = /var/run/rsyslogd.pid
+{%- if server.pidfile is defined %}
+pidfile = {{ server.pidfile }}
+{%- endif %}
# Set the watchdog device timeout during startup. If not set, the
# default is driver-dependent.
diff --git a/watchdog/schemas/server.yaml b/watchdog/schemas/server.yaml
index 51c1881..8d1deaa 100644
--- a/watchdog/schemas/server.yaml
+++ b/watchdog/schemas/server.yaml
@@ -29,16 +29,41 @@
description: |
Explicit name of required kernel module. By default "softdog" will be used.
type: string
+ logtick:
+ description: |
+ Option allows you to reduce the volume of periodic messages in syslog
+ by only reporting 1 out of N times, though the default is to report all.
+ type: integer
+ example: 1
+ log_verbose:
+ description: |
+ Possible options: yes/no. "Yes" sends all debug info to the syslog
+ and should be used for unusual cases only. It will generate a lot of
+ syslog traffic and it will be harder to find the real problem
+ type: string
+ example: no
+ enum: [yes, no]
log_dir:
description: |
- Set the log directory to capture the standard output and standard error from repair-binary and test-binary execution
+ Set the log directory to capture the standard output and standard error
+ from repair-binary and test-binary execution
type: string
example: /var/log/watchdog
+ pidfile:
+ description: |
+ The watchdog daemon can be configured to check for the running of other
+ daemons by means of these PID files. When this test is enabled,
+ the watchdog tries to open the PID file and read the numeric value of
+ the PID from it, then it uses the kill() function to attempt to send
+ the null (zero) signal to this process to check it is running
+ type: string
+ example: /var/run/rsyslogd.pid
realtime:
description: |
If set to yes watchdog will lock itself into memory so it is never swapped out
type: string
example: yes
+ enum: [yes, no]
timeout:
description: |
Seting "watchdog-timer" config parameter placed in /etc/watchdog.conf