X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/ff044920428608b2c04507ad52d6ab52c9d6555f..3109ee7e5ed6fc8141c8cd700502b130fe468468:/cookbooks/munin/libraries/expand.rb?ds=sidebyside

diff --git a/cookbooks/munin/libraries/expand.rb b/cookbooks/munin/libraries/expand.rb
index 081dfc5c1..248c5ad5f 100644
--- a/cookbooks/munin/libraries/expand.rb
+++ b/cookbooks/munin/libraries/expand.rb
@@ -1,13 +1,17 @@
 class Chef
   class Munin
-    def self.expand(template, nodes)
+    def self.expand(template, nodes, separator = " ")
       nodes.map do |node|
-        if node.kind_of?(Hash)
-          template.gsub(/%%([^%]+)%%/) { node[$1.to_sym] }
+        if node.is_a?(Hash)
+          template
+            .gsub(/%%%([^%]+)%%%/) { node[Regexp.last_match[1].to_sym].tr("-", "_") }
+            .gsub(/%%([^%]+)%%/) { node[Regexp.last_match[1].to_sym] }
         else
-          template.gsub("%%", node)
+          template
+            .gsub("%%%", node.tr("-", "_"))
+            .gsub("%%", node)
         end
-      end.join(" ")
+      end.join(separator)
     end
   end
 end