From d55912b3dfdfcae248376ca92a5dfd843d9acf0b Mon Sep 17 00:00:00 2001
From: Simon Delamare <simon.delamare@ens-lyon.fr>
Date: Mon, 30 Mar 2020 16:02:27 +0200
Subject: [PATCH] [lib] kwollect : use new snmp_name field for network metric
---
lib/refrepo/gen/puppet/templates/kwollect-network.erb | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/lib/refrepo/gen/puppet/templates/kwollect-network.erb b/lib/refrepo/gen/puppet/templates/kwollect-network.erb
index 7475b23cb5d..18ed45dde9a 100644
--- a/lib/refrepo/gen/puppet/templates/kwollect-network.erb
+++ b/lib/refrepo/gen/puppet/templates/kwollect-network.erb
@@ -10,9 +10,8 @@ neteq.fetch('metrics', []).each {|metric|
neteq['linecards'].each_with_index {|linecard, linecard_uid|
linecard.fetch('ports', []).each_with_index {|lport, lport_uid|
next if lport.empty?
- lport_uid += 12
port_uid = neteq['linecards'].length > 1 ? "#{linecard_uid}_#{lport_uid}" : lport_uid
- port_name = linecard["snmp_pattern"].sub("%LINECARD%",linecard_uid.to_s).sub("%PORT%",lport_uid.to_s)
+ port_name = lport['snmp_name']
# TODO: Handle secondary interface
port_node = lport['uid']
-%>
--
GitLab