starlingx/monitoring
Code Issues Proposed changes

Merge "Fix Debian NTP path used by collectd plugin"

Browse Source
This commit is contained in:
Zuul
2022-12-02 14:22:35 +00:00
committed by Gerrit Code Review
parent 4efcb548db c9a017b1d7
commit 9e1618b1c5
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
collectd-extensions/src/ntpq.py
View File

@@ -78,6 +78,7 @@ PLUGIN = 'NTP query plugin'
PLUGIN_INTERVAL = 300 # audit interval in secs
PLUGIN_CONF = '/etc/ntp.conf'
PLUGIN_EXEC = '/usr/sbin/ntpq'
PLUGIN_EXEC_DEBIAN = '/usr/bin/ntpq'
PLUGIN_EXEC_OPTIONS = '-pn'
PLUGIN_ALARMID = "100.114"
@@ -715,7 +716,7 @@ def read_func():
data = subprocess.check_output([PLUGIN_EXEC, PLUGIN_EXEC_OPTIONS])
else:
# Debian
data = subprocess.check_output([PLUGIN_EXEC, PLUGIN_EXEC_OPTIONS], encoding='utf-8')
data = subprocess.check_output([PLUGIN_EXEC_DEBIAN, PLUGIN_EXEC_OPTIONS], encoding='utf-8')
# Keep this FIT test code but make it commented out for security
#