kunsi/bundlewrap
1
0
Fork 0
Code Issues 1 Pull requests 1 Releases Activity

bundles/powerdns: fix socket path for telegraf

Browse source
This commit is contained in:
Franzi 2023-01-29 11:02:49 +01:00
parent ef16a2d081
commit 55bebda4d4
Signed by: kunsi
GPG key ID: 12E3D2136B818350
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
bundles/powerdns/metadata.py
View file

@ -43,7 +43,11 @@ if node.has_bundle('telegraf'):
defaults['telegraf'] = { defaults['telegraf'] = {
'input_plugins': { 'input_plugins': {
'builtin': { 'builtin': {
'powerdns': [{}], 'powerdns': [{
'unix_sockets': [
'/var/run/pdns/pdns.controlsocket',
],
}],
}, },
}, },
'additional_groups': { 'additional_groups': {
@ -186,16 +190,16 @@ def hosts_entries_for_all_dns_servers(metadata):
if rnode.name == node.name: if rnode.name == node.name:
continue continue
ip = rnode.metadata.get('external_ipv4') found_ips = repo.libs.tools.resolve_identifier(repo, rnode.name)
for ip in sorted(found_ips['ipv4']):
if ip: if not ip.is_private:
entries[ip] = { entries[str(ip)] = {
rnode.metadata.get('hostname'), rnode.metadata.get('hostname'),
rnode.name, rnode.name,
} }
if rnode.metadata.get('powerdns/my_hostname', None): if rnode.metadata.get('powerdns/my_hostname', None):
entries[ip].add(rnode.metadata.get('powerdns/my_hostname')) entries[str(ip)].add(rnode.metadata.get('powerdns/my_hostname'))
return { return {
'hosts': { 'hosts': {