zabbix-agent/accounting: Support @ in unit names

Signed-off-by: Florian Pritz <bluewind@xinu.at>

roles/zabbix-agent/files/systemd-discover-accounting-units.py

@@ -23,6 +23,6 @@ def get_unit_prop(interface, propname):
 for u in units:
     unit_properties = dbus.Interface(bus.get_object('org.freedesktop.systemd1', u[6]), dbus_interface='org.freedesktop.DBus.Properties')
     if get_unit_prop(unit_properties, "CPUAccounting") or get_unit_prop(unit_properties, "MemoryAccounting"):
-        discovered.append({"{#UNITNAME}": u[0]})
+        discovered.append({"{#UNITNAME}": u[0].replace("@", "--AT--")})
 
 print(json.dumps({"data": discovered}));

roles/zabbix-agent/templates/zabbix_agentd.conf

@@ -22,7 +22,7 @@ UserParameter=systemd.unit.is-enabled[*],systemctl is-enabled --quiet '$1' && ec
 UserParameter=systemd.failed_units,/usr/local/bin/systemd-units-failed.py
 
 UserParameter=systemd.accounting_discover,/usr/local/bin/systemd-discover-accounting-units.py
-UserParameter=systemd.unit_data[*],systemctl show '$1' | perl -MJSON -ne 'BEGIN{my %h}; my ($$k,$$v) = split(/=/,$$_,2); chomp($$h{$$k} = $v); END {print encode_json(\%h)};'
+UserParameter=systemd.unit_data[*],systemctl show $(echo '$1' | sed 's#--AT--#@#g') | perl -MJSON -ne 'BEGIN{my %h}; my ($$k,$$v) = split(/=/,$$_,2); chomp($$h{$$k} = $v); END {print encode_json(\%h)};'
 
 UserParameter=postfix.pfmailq,mailq | grep -v "Mail queue is empty" | grep -c '^[0-9A-Z]'
 UserParameter=postfix[*],/usr/local/bin/postfix-zabbix-stats.sh $1