Fixing issue with hostmetrics agent where it can't restart logstash

Author: arlake228

psconfig/perfsonar-psconfig/Makefile

@@ -31,6 +31,10 @@ endif
 ifndef HTTPD-CONFIGPATH
 	@echo No HTTPD-CONFIGPATH specified for installation
 	@false
+endif
+ifndef SUDOERSDPATH
+	@echo No SUDOERSDPATH specified for installation
+	@false
 endif
 	python3 setup.py install --root=${PYTHON-ROOTPATH} -O1 --record=INSTALLED_FILES
 	mkdir -p ${PERFSONAR-ROOTPATH}/bin/commands
@@ -39,12 +43,14 @@ endif
 	mkdir -p ${PERFSONAR-DATAPATH} 
 	mkdir -p ${BINPATH}
 	mkdir -p ${HTTPD-CONFIGPATH}
+	mkdir -p ${SUDOERSDPATH}
 	install -m 0755 bin/psconfig* ${PERFSONAR-ROOTPATH}/bin
 	ln -fs  /usr/lib/perfsonar/psconfig/bin/psconfig ${BINPATH}/psconfig
 	install -m 0755 bin/commands/* ${PERFSONAR-ROOTPATH}/bin/commands
 	install -m 0644 templates/* ${PERFSONAR-ROOTPATH}/templates
 	install -m 0644 etc/*.json ${PERFSONAR-CONFIGPATH}/
 	install -m 0644 etc/*.conf ${PERFSONAR-CONFIGPATH}/
+	install -m 0644 sudoers.d/* ${SUDOERSDPATH}/
 	install -m 644 apache-psconfig-publisher.conf ${HTTPD-CONFIGPATH}/
 
 clean:

psconfig/perfsonar-psconfig/psconfig/hostmetrics/agent.py

@@ -143,7 +143,7 @@ def _run_end(self, agent_conf):
             }))
             # Restart service
             if agent_conf.restart_service():
-                restart_result = subprocess.run(["systemctl", "restart", agent_conf.restart_service()])
+                restart_result = subprocess.run(["sudo", "systemctl", "restart", agent_conf.restart_service()])
                 if restart_result.returncode == 0:
                     self.logger.debug(self.logf.format("Service {} restarted".format(agent_conf.restart_service())))
                 else:

psconfig/perfsonar-psconfig/sudoers.d/psconfig-hostmetrics

@@ -0,0 +1 @@
+perfsonar ALL=NOPASSWD: /bin/systemctl restart logstash

psconfig/perfsonar-psconfig/unibuild-packaging/deb/perfsonar-psconfig-pscheduler.install

@@ -2,4 +2,5 @@ usr/lib/perfsonar/psconfig/bin/psconfig_pscheduler_agent
 usr/lib/perfsonar/psconfig/bin/commands/pscheduler-tasks
 etc/perfsonar/psconfig/pscheduler-agent.json
 etc/perfsonar/psconfig/pscheduler-agent-logger.conf
+etc/sudoers.d/psconfig-hostmetrics
 systemd/psconfig-pscheduler-agent.service lib/systemd/system/

psconfig/perfsonar-psconfig/unibuild-packaging/deb/rules

@@ -14,5 +14,5 @@ override_dh_auto_build:
 override_dh_auto_test:
 
 override_dh_install:
-	make PYTHON-ROOTPATH=. PERFSONAR-CONFIGPATH=etc/perfsonar/psconfig PERFSONAR-ROOTPATH=usr/lib/perfsonar/psconfig PERFSONAR-DATAPATH=var/lib/perfsonar/psconfig BINPATH=usr/bin install HTTPD-CONFIGPATH=etc/apache2/conf-available
+	make PYTHON-ROOTPATH=. PERFSONAR-CONFIGPATH=etc/perfsonar/psconfig PERFSONAR-ROOTPATH=usr/lib/perfsonar/psconfig PERFSONAR-DATAPATH=var/lib/perfsonar/psconfig BINPATH=usr/bin install HTTPD-CONFIGPATH=etc/apache2/conf-available SUDOERSDPATH=etc/sudoers.d
 	dh_install

psconfig/perfsonar-psconfig/unibuild-packaging/rpm/perfsonar-psconfig.spec

@@ -138,7 +138,7 @@ make -f /usr/share/selinux/devel/Makefile -C selinux psconfig-hostmetrics.pp
 
 %install
 rm -rf %{buildroot}
-make install PYTHON-ROOTPATH=%{buildroot} PERFSONAR-CONFIGPATH=%{buildroot}/%{config_base} PERFSONAR-ROOTPATH=%{buildroot}/%{psconfig_base} PERFSONAR-DATAPATH=%{buildroot}/%{psconfig_datadir} BINPATH=%{buildroot}/%{_bindir} HTTPD-CONFIGPATH=%{buildroot}/%{httpd_config_base}
+make install PYTHON-ROOTPATH=%{buildroot} PERFSONAR-CONFIGPATH=%{buildroot}/%{config_base} PERFSONAR-ROOTPATH=%{buildroot}/%{psconfig_base} PERFSONAR-DATAPATH=%{buildroot}/%{psconfig_datadir} BINPATH=%{buildroot}/%{_bindir} HTTPD-CONFIGPATH=%{buildroot}/%{httpd_config_base} SUDOERSDPATH=%{buildroot}/etc/sudoers.d
 mkdir -p %{buildroot}/%{_unitdir}/
 install -m 644 systemd/* %{buildroot}/%{_unitdir}/
 mkdir -p %{buildroot}/usr/share/selinux/packages/
@@ -267,6 +267,7 @@ fi
 %attr(0644,root,root) /usr/share/selinux/packages/psconfig-hostmetrics.pp
 %{template_base}/prometheus-logstash-input.conf.j2
 %{_unitdir}/psconfig-hostmetrics-agent.service
+/etc/sudoers.d/psconfig-hostmetrics
 
 %files utils
 %defattr(0644,perfsonar,perfsonar,0755)