Module: check_mk
Branch: master
Commit: 217f8512f4cbc156502975018ca356cc9f45687d
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=217f8512f4cbc1…
Author: Simon Betz <si(a)mathias-kettner.de>
Date: Wed Dec 19 12:58:06 2018 +0100
6996 FIX docker_node_network: Fixed crash of HW/SW inventory service if bridge name is
missing
Change-Id: I5a1a5cd809696eb62730d5111296162291d8467c
---
.werks/6996 | 10 ++++++++++
inventory/docker_node_network | 6 +++++-
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/.werks/6996 b/.werks/6996
new file mode 100644
index 0000000..f8f3bf7
--- /dev/null
+++ b/.werks/6996
@@ -0,0 +1,10 @@
+Title: docker_node_network: Fixed crash of HW/SW inventory service if bridge name is
missing
+Level: 1
+Component: checks
+Compatible: compat
+Edition: cre
+Version: 1.6.0i1
+Date: 1545220260
+Class: fix
+
+
diff --git a/inventory/docker_node_network b/inventory/docker_node_network
index 2888b2f..fb6f972 100644
--- a/inventory/docker_node_network
+++ b/inventory/docker_node_network
@@ -53,11 +53,15 @@ def inv_docker_node_network_networks(info, inventory_tree,
status_data_tree):
network_ = {
"name": network_name,
- "host_ifname":
network["Options"]["com.docker.network.bridge.name"],
"network_id": _docker_trunc_id(network["Id"]),
"scope": network["Scope"],
}
+ try:
+ network["host_ifname"] =
network["Options"]["com.docker.network.bridge.name"]
+ except KeyError:
+ pass
+
labels = sorted(["%s: %s" % (k, v) for k, v in
network.get("Labels", {}).items()])
if labels:
network_["labels"] = ", ".join(labels)