Skip to content

fix: return device's primary ip for netbox services not explicitly bound to any IP #224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
koalajoe23 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: return device's primary ip for netbox services not explicitly bound to any IP #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions netbox_prometheus_sd/api/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,8 @@ def extract_service_ips(obj, labels: LabelDict):
labels["ipaddresses"] = ",".join(
[str(ipaddr.address.ip) for ipaddr in obj.ipaddresses.all()]
)
elif hasattr(obj.parent, "primary_ip") and obj.parent.primary_ip is not None:
labels["ipaddresses"] = str(IPNetwork(obj.parent.primary_ip.address).ip)


def extract_service_ports(obj, labels: LabelDict):
Expand Down
10 changes: 10 additions & 0 deletions netbox_prometheus_sd/tests/test_serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,6 +493,11 @@ def test_device_service_full_to_target(self):
{"__meta_netbox_primary_ip6": "2001:db8:1701::2"}, data["labels"]
)
)
self.assertTrue(
utils.dictContainsSubset(
{"__meta_netbox_ipaddresses": "2001:db8:1701::2"}, data["labels"]
)
)

def test_vm_service_full_to_target(self):
vm = utils.build_vm_full("vm-full-01.example.com")
Expand Down Expand Up @@ -576,3 +581,8 @@ def test_vm_service_full_to_target(self):
{"__meta_netbox_primary_ip6": "2001:db8:1701::2"}, data["labels"]
)
)
self.assertTrue(
utils.dictContainsSubset(
{"__meta_netbox_ipaddresses": "2001:db8:1701::2"}, data["labels"]
)
)