me
/
guix
Archived
1
0
Fork 0
Code

services: zabbix-agent: Adjust command-line when using zabbix_agent2. 

* gnu/services/monitoring.scm (zabbix-agent-arguments): New procedure.
(zabbix-agent-shepherd-service): Use that to determine command line arguments.
Marius Bakke 2022-12-07 18:47:10 +01:00
parent 10251c4456
commit 40153fe033
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gnu/services/monitoring.scm
View File

@ -513,6 +513,18 @@ configuration file."))
(format port #$(serialize-configuration (format port #$(serialize-configuration
config zabbix-agent-configuration-fields))))))) config zabbix-agent-configuration-fields)))))))
(define (zabbix-agent-arguments config)
#~(let* ((config-file #$(zabbix-agent-config-file config))
(agent #$(zabbix-agent-configuration-zabbix-agent config))
(agent2? (file-exists? (string-append agent "/sbin/zabbix_agent2"))))
(if agent2?
(list (string-append agent "/sbin/zabbix_agent2")
"-config" config-file
"-foreground")
(list (string-append agent "/sbin/zabbix_agentd")
"--config" config-file
"--foreground"))))
(define (zabbix-agent-shepherd-service config) (define (zabbix-agent-shepherd-service config)
"Return a <shepherd-service> for Zabbix agent with CONFIG." "Return a <shepherd-service> for Zabbix agent with CONFIG."
(list (shepherd-service (list (shepherd-service
@ -520,10 +532,7 @@ configuration file."))
(requirement '(user-processes)) (requirement '(user-processes))
(documentation "Run Zabbix agent daemon.") (documentation "Run Zabbix agent daemon.")
(start #~(make-forkexec-constructor (start #~(make-forkexec-constructor
(list #$(file-append (zabbix-agent-configuration-zabbix-agent config) #$(zabbix-agent-arguments config)
"/sbin/zabbix_agentd")
"--config" #$(zabbix-agent-config-file config)
"--foreground")
#:user #$(zabbix-agent-configuration-user config) #:user #$(zabbix-agent-configuration-user config)
#:group #$(zabbix-agent-configuration-group config) #:group #$(zabbix-agent-configuration-group config)
#:pid-file #$(zabbix-agent-configuration-pid-file config) #:pid-file #$(zabbix-agent-configuration-pid-file config)