[3/3] zabbix_agentd: Add UserParameter for Pakfire Status

Message ID 1556393206-17040-3-git-send-email-ipfire@starkstromkonsument.de
State Accepted
Commit 5737a22cf2feee68f4865683dff192e8c897e24f
Headers
Series [1/3] zabbix_agentd: update to 4.2.1 |

Commit Message

Alexander Koch April 28, 2019, 5:26 a.m. UTC
  Ship the UserParameter for monitoring the status of pakfire for keeping track of available updates etc.

Signed-off-by: Alexander Koch <ipfire@starkstromkonsument.de>
---
 config/rootfiles/packages/zabbix_agentd         | 1 +
 config/zabbix_agentd/sudoers                    | 8 ++++----
 config/zabbix_agentd/userparameter_pakfire.conf | 2 ++
 lfs/zabbix_agentd                               | 2 ++
 4 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 config/zabbix_agentd/userparameter_pakfire.conf
  

Patch

diff --git a/config/rootfiles/packages/zabbix_agentd b/config/rootfiles/packages/zabbix_agentd
index eaecf26..4420bda 100644
--- a/config/rootfiles/packages/zabbix_agentd
+++ b/config/rootfiles/packages/zabbix_agentd
@@ -5,6 +5,7 @@  etc/zabbix_agentd
 etc/zabbix_agentd/scripts
 etc/zabbix_agentd/zabbix_agentd.conf
 etc/zabbix_agentd/zabbix_agentd.d
+etc/zabbix_agentd/zabbix_agentd.d/userparameter_pakfire.conf
 usr/bin/zabbix_get
 usr/bin/zabbix_sender
 usr/lib/modules
diff --git a/config/zabbix_agentd/sudoers b/config/zabbix_agentd/sudoers
index f4e4321..1b362a4 100644
--- a/config/zabbix_agentd/sudoers
+++ b/config/zabbix_agentd/sudoers
@@ -8,10 +8,10 @@ 
 # Some hints:
 # - It is strongly recommended to edit this file only using the visudo -f <filename> command. If you mess up this file,
 #   you might end up locking yourself out of your system!
-# - Append the full path to each command, using "," as separator.
+# - Append the full path incl. parameters to each command, using "," as separator.
 # - Only add commands you really need. Zabbix should not have more rights than it has to.
 #
-# Uncomment the following two lines and edit the example of commands to fit your needs:
+# Append / edit the following list of commands to fit your needs:
 #
-#Defaults:zabbix !requiretty
-#zabbix ALL=(ALL) NOPASSWD: <path to command1>, <path to command2>
+Defaults:zabbix !requiretty
+zabbix ALL=(ALL) NOPASSWD: /opt/pakfire/pakfire status
diff --git a/config/zabbix_agentd/userparameter_pakfire.conf b/config/zabbix_agentd/userparameter_pakfire.conf
new file mode 100644
index 0000000..aa2e80f
--- /dev/null
+++ b/config/zabbix_agentd/userparameter_pakfire.conf
@@ -0,0 +1,2 @@ 
+### Parameter for monitoring pakfire status
+UserParameter=pakfire.status,sudo /opt/pakfire/pakfire status
diff --git a/lfs/zabbix_agentd b/lfs/zabbix_agentd
index 1dcf28c..d4d5a22 100644
--- a/lfs/zabbix_agentd
+++ b/lfs/zabbix_agentd
@@ -91,6 +91,8 @@  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	-mkdir -pv /etc/zabbix_agentd/scripts
 	install -v -m 644 $(DIR_SRC)/config/zabbix_agentd/zabbix_agentd.conf \
 		/etc/zabbix_agentd/zabbix_agentd.conf
+	install -v -m 644 $(DIR_SRC)/config/zabbix_agentd/userparameter_pakfire.conf \
+		/etc/zabbix_agentd/zabbix_agentd.d/userparameter_pakfire.conf
 
 	# Create directory for additional agent modules
 	-mkdir -pv /usr/lib/zabbix