Alexandros Kosiaris has submitted this change and it was merged.
Change subject: ganglia_view.json.erb variable qualification
......................................................................
ganglia_view.json.erb variable qualification
As various other patches already submitted, this prepends the @ in front
of various variables passed by puppet to the ERB as the are instance
variables now
Change-Id: I87a8a1a66950e1d0ddf19158291b9eaff9caf016
---
M templates/ganglia/ganglia_view.json.erb
1 file changed, 5 insertions(+), 5 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/ganglia/ganglia_view.json.erb
b/templates/ganglia/ganglia_view.json.erb
index 2a8b8ac..8add330 100644
--- a/templates/ganglia/ganglia_view.json.erb
+++ b/templates/ganglia/ganglia_view.json.erb
@@ -3,8 +3,8 @@
# If graphs was specified, convert it into
# the items structure expected by ganglia-web.
-graphs.each do |graph|
- items.push({
[email protected] do |graph|
+ @items.push({
'aggregate_graph' => 'true',
'host_regex' => [{'regex' => graph['host_regex']}],
'metric_regex' => [{'regex' => graph['metric_regex']}],
@@ -18,9 +18,9 @@
-%>
{
- "view_name":"<%= name %>",
- "view_type":"<%= view_type %>",
- "default_size":"<%= default_size %>",
+ "view_name":"<%= @name %>",
+ "view_type":"<%= @view_type %>",
+ "default_size":"<%= @default_size %>",
"items":<%= JSON.pretty_generate(items) %>
}
--
To view, visit https://gerrit.wikimedia.org/r/148346
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I87a8a1a66950e1d0ddf19158291b9eaff9caf016
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
