{"action":"created","comment":{"url":"https://api.github.com/repos/ManageIQ/manageiq/pulls/comments/48733227","id":48733227,"diff_hunk":"@@ -117,27 +119,41 @@ def get_url_to_entity(entity)\n \n   def heatmaps\n     # Get latest hourly rollup for each node.\n-    node_ids = @ems.container_nodes if @ems\n+    node_ids = @ems.container_nodes if @ems.present?\n     metrics = MetricRollup.latest_rollups(ContainerNode.name, node_ids)\n+    metrics = metrics.includes(:resource => [:ext_management_system]) unless @ems.present?\n \n-    {\n-      :nodeCpuUsage => metrics.collect { |m|\n-        avg_cpu = m.cpu_usage_rate_average.round(2)\n-        {\n-          :id      => m.resource_id,\n-          :tooltip => \"#{m.resource.name} - #{avg_cpu}%\",\n-          :value   => avg_cpu / 100.0 # 1% should be 0.01\n+    node_cpu_usage = []\n+    node_memory_usage = []\n+\n+    if metrics.any?\n+      metrics.each do |m|\n+        node_cpu_usage << {\n+          :id    => m.resource_id,\n+          :info  => {\n+            :node     => m.resource.name,\n+            :provider => @ems.present? ? @ems.ext_management_system.name : m.resource.ext_management_system.name,\n+            :total    => m.derived_vm_numvcpus\n+          },\n+          :value => (m.cpu_usage_rate_average / 100.0).round(CPU_USAGE_PRECISION)\n         }\n-      },\n-      :nodeMemoryUsage => metrics.collect { |m|\n-        avg_mem = m.mem_usage_absolute_average.round(2)\n-        {\n-          :id      => m.resource_id,\n-          :tooltip => \"#{m.resource.name} - #{avg_mem}%\",\n-          :value   => avg_mem / 100.0 # 1% should be 0.01\n+\n+        node_memory_usage << {\n+          :id    => m.resource_id,\n+          :info  => {\n+            :node     => m.resource.name,\n+            :provider => m.resource.ext_management_system.name,\n+            :total    => m.derived_memory_available\n+          },\n+          :value => (m.mem_usage_absolute_average / 100.0).round(CPU_USAGE_PRECISION)","path":"app/services/container_dashboard_service.rb","position":52,"original_position":52,"commit_id":"d8e8c50b15c9dbea5513b0b779d2aa72ff4d7890","original_commit_id":"d8e8c50b15c9dbea5513b0b779d2aa72ff4d7890","user":{"login":"zeari","id":11256940,"avatar_url":"https://avatars.githubusercontent.com/u/11256940?v=3","gravatar_id":"","url":"https://api.github.com/users/zeari","html_url":"https://github.com/zeari","followers_url":"https://api.github.com/users/zeari/followers","following_url":"https://api.github.com/users/zeari/following{/other_user}","gists_url":"https://api.github.com/users/zeari/gists{/gist_id}","starred_url":"https://api.github.com/users/zeari/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zeari/subscriptions","organizations_url":"https://api.github.com/users/zeari/orgs","repos_url":"https://api.github.com/users/zeari/repos","events_url":"https://api.github.com/users/zeari/events{/privacy}","received_events_url":"https://api.github.com/users/zeari/received_events","type":"User","site_admin":false},"body":"> Patternfly accepts the value here as a fraction, meaning 90% should be 0.9\r\n\r\nsame here @simon3z ","created_at":"2016-01-04T14:09:59Z","updated_at":"2016-01-04T14:09:59Z","html_url":"https://github.com/ManageIQ/manageiq/pull/6001#discussion_r48733227","pull_request_url":"https://api.github.com/repos/ManageIQ/manageiq/pulls/6001","_links":{"self":{"href":"https://api.github.com/repos/ManageIQ/manageiq/pulls/comments/48733227"},"html":{"href":"https://github.com/ManageIQ/manageiq/pull/6001#discussion_r48733227"},"pull_request":{"href":"https://api.github.com/repos/ManageIQ/manageiq/pulls/6001"}}},"pull_request":{"url":"https://api.github.com/repos/ManageIQ/manageiq/pulls/6001","id":54718857,"html_url":"https://github.com/ManageIQ/manageiq/pull/6001","diff_url":"https://github.com/ManageIQ/manageiq/pull/6001.diff","patch_url":"https://github.com/ManageIQ/manageiq/pull/6001.patch","issue_url":"https://api.github.com/repos/ManageIQ/manageiq/issues/6001","number":6001,"state":"open","locked":false,"title":"Added tooltip details to heatmaps","user":{"login":"zeari","id":11256940,"avatar_url":"https://avatars.githubusercontent.com/u/11256940?v=3","gravatar_id":"","url":"https://api.github.com/users/zeari","html_url":"https://github.com/zeari","followers_url":"https://api.github.com/users/zeari/followers","following_url":"https://api.github.com/users/zeari/following{/other_user}","gists_url":"https://api.github.com/users/zeari/gists{/gist_id}","starred_url":"https://api.github.com/users/zeari/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zeari/subscriptions","organizations_url":"https://api.github.com/users/zeari/orgs","repos_url":"https://api.github.com/users/zeari/repos","events_url":"https://api.github.com/users/zeari/events{/privacy}","received_events_url":"https://api.github.com/users/zeari/received_events","type":"User","site_admin":false},"body":"Before:\r\n![heatmap_tooltip_before](https://cloud.githubusercontent.com/assets/11256940/12035008/b82c8ab0-ae40-11e5-9ebe-e5436f0b750f.png)\r\n\r\n\r\nAfter:\r\n![heatmap_tooltip_after](https://cloud.githubusercontent.com/assets/11256940/12033590/40515678-ae2d-11e5-9810-eeb6f2e4aa45.png)\r\n\r\n@himdel @abonas Please review.","created_at":"2015-12-29T11:09:21Z","updated_at":"2016-01-04T14:10:00Z","closed_at":null,"merged_at":null,"merge_commit_sha":"05b66659403538f9b3e7427968672663664f23c0","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/ManageIQ/manageiq/pulls/6001/commits","review_comments_url":"https://api.github.com/repos/ManageIQ/manageiq/pulls/6001/comments","review_comment_url":"https://api.github.com/repos/ManageIQ/manageiq/pulls/comments{/number}","comments_url":"https://api.github.com/repos/ManageIQ/manageiq/issues/6001/comments","statuses_url":"https://api.github.com/repos/ManageIQ/manageiq/statuses/d8e8c50b15c9dbea5513b0b779d2aa72ff4d7890","head":{"label":"zeari:add_dashboard_formatted_tooltips","ref":"add_dashboard_formatted_tooltips","sha":"d8e8c50b15c9dbea5513b0b779d2aa72ff4d7890","user":{"login":"zeari","id":11256940,"avatar_url":"https://avatars.githubusercontent.com/u/11256940?v=3","gravatar_id":"","url":"https://api.github.com/users/zeari","html_url":"https://github.com/zeari","followers_url":"https://api.github.com/users/zeari/followers","following_url":"https://api.github.com/users/zeari/following{/other_user}","gists_url":"https://api.github.com/users/zeari/gists{/gist_id}","starred_url":"https://api.github.com/users/zeari/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zeari/subscriptions","organizations_url":"https://api.github.com/users/zeari/orgs","repos_url":"https://api.github.com/users/zeari/repos","events_url":"https://api.github.com/users/zeari/events{/privacy}","received_events_url":"https://api.github.com/users/zeari/received_events","type":"User","site_admin":false},"repo":{"id":32809554,"name":"manageiq","full_name":"zeari/manageiq","owner":{"login":"zeari","id":11256940,"avatar_url":"https://avatars.githubusercontent.com/u/11256940?v=3","gravatar_id":"","url":"https://api.github.com/users/zeari","html_url":"https://github.com/zeari","followers_url":"https://api.github.com/users/zeari/followers","following_url":"https://api.github.com/users/zeari/following{/other_user}","gists_url":"https://api.github.com/users/zeari/gists{/gist_id}","starred_url":"https://api.github.com/users/zeari/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zeari/subscriptions","organizations_url":"https://api.github.com/users/zeari/orgs","repos_url":"https://api.github.com/users/zeari/repos","events_url":"https://api.github.com/users/zeari/events{/privacy}","received_events_url":"https://api.github.com/users/zeari/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/zeari/manageiq","description":"ManageIQ Cloud Management Platform","fork":true,"url":"https://api.github.com/repos/zeari/manageiq","forks_url":"https://api.github.com/repos/zeari/manageiq/forks","keys_url":"https://api.github.com/repos/zeari/manageiq/keys{/key_id}","collaborators_url":"https://api.github.com/repos/zeari/manageiq/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/zeari/manageiq/teams","hooks_url":"https://api.github.com/repos/zeari/manageiq/hooks","issue_events_url":"https://api.github.com/repos/zeari/manageiq/issues/events{/number}","events_url":"https://api.github.com/repos/zeari/manageiq/events","assignees_url":"https://api.github.com/repos/zeari/manageiq/assignees{/user}","branches_url":"https://api.github.com/repos/zeari/manageiq/branches{/branch}","tags_url":"https://api.github.com/repos/zeari/manageiq/tags","blobs_url":"https://api.github.com/repos/zeari/manageiq/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/zeari/manageiq/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/zeari/manageiq/git/refs{/sha}","trees_url":"https://api.github.com/repos/zeari/manageiq/git/trees{/sha}","statuses_url":"https://api.github.com/repos/zeari/manageiq/statuses/{sha}","languages_url":"https://api.github.com/repos/zeari/manageiq/languages","stargazers_url":"https://api.github.com/repos/zeari/manageiq/stargazers","contributors_url":"https://api.github.com/repos/zeari/manageiq/contributors","subscribers_url":"https://api.github.com/repos/zeari/manageiq/subscribers","subscription_url":"https://api.github.com/repos/zeari/manageiq/subscription","commits_url":"https://api.github.com/repos/zeari/manageiq/commits{/sha}","git_commits_url":"https://api.github.com/repos/zeari/manageiq/git/commits{/sha}","comments_url":"https://api.github.com/repos/zeari/manageiq/comments{/number}","issue_comment_url":"https://api.github.com/repos/zeari/manageiq/issues/comments{/number}","contents_url":"https://api.github.com/repos/zeari/manageiq/contents/{+path}","compare_url":"https://api.github.com/repos/zeari/manageiq/compare/{base}...{head}","merges_url":"https://api.github.com/repos/zeari/manageiq/merges","archive_url":"https://api.github.com/repos/zeari/manageiq/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/zeari/manageiq/downloads","issues_url":"https://api.github.com/repos/zeari/manageiq/issues{/number}","pulls_url":"https://api.github.com/repos/zeari/manageiq/pulls{/number}","milestones_url":"https://api.github.com/repos/zeari/manageiq/milestones{/number}","notifications_url":"https://api.github.com/repos/zeari/manageiq/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/zeari/manageiq/labels{/name}","releases_url":"https://api.github.com/repos/zeari/manageiq/releases{/id}","created_at":"2015-03-24T16:05:33Z","updated_at":"2015-04-19T08:03:20Z","pushed_at":"2016-01-04T13:22:16Z","git_url":"git://github.com/zeari/manageiq.git","ssh_url":"git@github.com:zeari/manageiq.git","clone_url":"https://github.com/zeari/manageiq.git","svn_url":"https://github.com/zeari/manageiq","homepage":"manageiq.org","size":99699,"stargazers_count":0,"watchers_count":0,"language":"Ruby","has_issues":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"ManageIQ:master","ref":"master","sha":"190da6238ec6493c108b79f554976ca3083afaff","user":{"login":"ManageIQ","id":1125575,"avatar_url":"https://avatars.githubusercontent.com/u/1125575?v=3","gravatar_id":"","url":"https://api.github.com/users/ManageIQ","html_url":"https://github.com/ManageIQ","followers_url":"https://api.github.com/users/ManageIQ/followers","following_url":"https://api.github.com/users/ManageIQ/following{/other_user}","gists_url":"https://api.github.com/users/ManageIQ/gists{/gist_id}","starred_url":"https://api.github.com/users/ManageIQ/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ManageIQ/subscriptions","organizations_url":"https://api.github.com/users/ManageIQ/orgs","repos_url":"https://api.github.com/users/ManageIQ/repos","events_url":"https://api.github.com/users/ManageIQ/events{/privacy}","received_events_url":"https://api.github.com/users/ManageIQ/received_events","type":"Organization","site_admin":false},"repo":{"id":20789757,"name":"manageiq","full_name":"ManageIQ/manageiq","owner":{"login":"ManageIQ","id":1125575,"avatar_url":"https://avatars.githubusercontent.com/u/1125575?v=3","gravatar_id":"","url":"https://api.github.com/users/ManageIQ","html_url":"https://github.com/ManageIQ","followers_url":"https://api.github.com/users/ManageIQ/followers","following_url":"https://api.github.com/users/ManageIQ/following{/other_user}","gists_url":"https://api.github.com/users/ManageIQ/gists{/gist_id}","starred_url":"https://api.github.com/users/ManageIQ/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ManageIQ/subscriptions","organizations_url":"https://api.github.com/users/ManageIQ/orgs","repos_url":"https://api.github.com/users/ManageIQ/repos","events_url":"https://api.github.com/users/ManageIQ/events{/privacy}","received_events_url":"https://api.github.com/users/ManageIQ/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/ManageIQ/manageiq","description":"ManageIQ Cloud Management Platform","fork":false,"url":"https://api.github.com/repos/ManageIQ/manageiq","forks_url":"https://api.github.com/repos/ManageIQ/manageiq/forks","keys_url":"https://api.github.com/repos/ManageIQ/manageiq/keys{/key_id}","collaborators_url":"https://api.github.com/repos/ManageIQ/manageiq/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/ManageIQ/manageiq/teams","hooks_url":"https://api.github.com/repos/ManageIQ/manageiq/hooks","issue_events_url":"https://api.github.com/repos/ManageIQ/manageiq/issues/events{/number}","events_url":"https://api.github.com/repos/ManageIQ/manageiq/events","assignees_url":"https://api.github.com/repos/ManageIQ/manageiq/assignees{/user}","branches_url":"https://api.github.com/repos/ManageIQ/manageiq/branches{/branch}","tags_url":"https://api.github.com/repos/ManageIQ/manageiq/tags","blobs_url":"https://api.github.com/repos/ManageIQ/manageiq/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/ManageIQ/manageiq/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/ManageIQ/manageiq/git/refs{/sha}","trees_url":"https://api.github.com/repos/ManageIQ/manageiq/git/trees{/sha}","statuses_url":"https://api.github.com/repos/ManageIQ/manageiq/statuses/{sha}","languages_url":"https://api.github.com/repos/ManageIQ/manageiq/languages","stargazers_url":"https://api.github.com/repos/ManageIQ/manageiq/stargazers","contributors_url":"https://api.github.com/repos/ManageIQ/manageiq/contributors","subscribers_url":"https://api.github.com/repos/ManageIQ/manageiq/subscribers","subscription_url":"https://api.github.com/repos/ManageIQ/manageiq/subscription","commits_url":"https://api.github.com/repos/ManageIQ/manageiq/commits{/sha}","git_commits_url":"https://api.github.com/repos/ManageIQ/manageiq/git/commits{/sha}","comments_url":"https://api.github.com/repos/ManageIQ/manageiq/comments{/number}","issue_comment_url":"https://api.github.com/repos/ManageIQ/manageiq/issues/comments{/number}","contents_url":"https://api.github.com/repos/ManageIQ/manageiq/contents/{+path}","compare_url":"https://api.github.com/repos/ManageIQ/manageiq/compare/{base}...{head}","merges_url":"https://api.github.com/repos/ManageIQ/manageiq/merges","archive_url":"https://api.github.com/repos/ManageIQ/manageiq/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/ManageIQ/manageiq/downloads","issues_url":"https://api.github.com/repos/ManageIQ/manageiq/issues{/number}","pulls_url":"https://api.github.com/repos/ManageIQ/manageiq/pulls{/number}","milestones_url":"https://api.github.com/repos/ManageIQ/manageiq/milestones{/number}","notifications_url":"https://api.github.com/repos/ManageIQ/manageiq/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/ManageIQ/manageiq/labels{/name}","releases_url":"https://api.github.com/repos/ManageIQ/manageiq/releases{/id}","created_at":"2014-06-13T02:31:26Z","updated_at":"2016-01-04T06:17:32Z","pushed_at":"2016-01-04T14:07:46Z","git_url":"git://github.com/ManageIQ/manageiq.git","ssh_url":"git@github.com:ManageIQ/manageiq.git","clone_url":"https://github.com/ManageIQ/manageiq.git","svn_url":"https://github.com/ManageIQ/manageiq","homepage":"manageiq.org","size":134509,"stargazers_count":187,"watchers_count":187,"language":"Ruby","has_issues":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":199,"mirror_url":null,"open_issues_count":492,"forks":199,"open_issues":492,"watchers":187,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/ManageIQ/manageiq/pulls/6001"},"html":{"href":"https://github.com/ManageIQ/manageiq/pull/6001"},"issue":{"href":"https://api.github.com/repos/ManageIQ/manageiq/issues/6001"},"comments":{"href":"https://api.github.com/repos/ManageIQ/manageiq/issues/6001/comments"},"review_comments":{"href":"https://api.github.com/repos/ManageIQ/manageiq/pulls/6001/comments"},"review_comment":{"href":"https://api.github.com/repos/ManageIQ/manageiq/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/ManageIQ/manageiq/pulls/6001/commits"},"statuses":{"href":"https://api.github.com/repos/ManageIQ/manageiq/statuses/d8e8c50b15c9dbea5513b0b779d2aa72ff4d7890"}}}}