[MediaWiki-commits] [Gerrit] ganglia::web::view: order resources in template - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged. Change subject: ganglia::web::view: order resources in template .. ganglia::web::view: order resources in template Change-Id: I7f114ca595c70f6b235b7e682a66c3c8a5bd7508 --- M modules/ganglia_new/templates/ganglia_view.json.erb 1 file changed, 1 insertion(+), 3 deletions(-) Approvals: Giuseppe Lavagetto: Looks good to me, approved Alexandros Kosiaris: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/modules/ganglia_new/templates/ganglia_view.json.erb b/modules/ganglia_new/templates/ganglia_view.json.erb index f5717c1..ee2aefb 100644 --- a/modules/ganglia_new/templates/ganglia_view.json.erb +++ b/modules/ganglia_new/templates/ganglia_view.json.erb @@ -1,6 +1,4 @@ <% -require 'json' - # If graphs was specified, convert it into # the items structure expected by ganglia-web. @graphs.each do |graph| @@ -22,7 +20,7 @@ "view_type":"<%= @view_type %>", "default_size":"<%= @default_size %>", - "items":<%= JSON.pretty_generate(@items) %> + "items":<%= scope.function_ordered_json([@items]) %> } -- To view, visit https://gerrit.wikimedia.org/r/200603 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7f114ca595c70f6b235b7e682a66c3c8a5bd7508 Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto Gerrit-Reviewer: Alexandros Kosiaris Gerrit-Reviewer: Giuseppe Lavagetto Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ganglia::web::view: order resources in template - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/200603 Change subject: ganglia::web::view: order resources in template .. ganglia::web::view: order resources in template Change-Id: I7f114ca595c70f6b235b7e682a66c3c8a5bd7508 --- M modules/ganglia_new/templates/ganglia_view.json.erb 1 file changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/03/200603/1 diff --git a/modules/ganglia_new/templates/ganglia_view.json.erb b/modules/ganglia_new/templates/ganglia_view.json.erb index 7e52b9f..c2494c7 100644 --- a/modules/ganglia_new/templates/ganglia_view.json.erb +++ b/modules/ganglia_new/templates/ganglia_view.json.erb @@ -1,6 +1,4 @@ <% -require 'json' - # If graphs was specified, convert it into # the items structure expected by ganglia-web. @graphs.each do |graph| @@ -22,7 +20,7 @@ "view_type":"<%= @view_type %>", "default_size":"<%= @default_size %>", - "items":<%= JSON.pretty_generate(items) %> + "items":<%= function_ordered_json([items]) %> } -- To view, visit https://gerrit.wikimedia.org/r/200603 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7f114ca595c70f6b235b7e682a66c3c8a5bd7508 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
