Skip to content

Commit

Permalink
some further cleanup to align aggregate status better
Browse files Browse the repository at this point in the history 
And added code to handle dummy data for testing purposes

https://www.pivotaltracker.com/story/show/147962059
  • Loading branch information
@h-kataria
h-kataria committed Aug 8, 2017
1 parent 5aad94e commit 75a8e99
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 69 deletions.
94 changes: 31 additions & 63 deletions app/assets/javascripts/controllers/pf_charts/heatmap_controller.js
View file
Expand Up @@ -7,59 +7,37 @@ angular.module( 'patternfly.charts' ).controller('heatmapController', ['$scope',
var init = function() {
ManageIQ.angular.scope = vm;

// vm.data = [
// {'id': 9,'value': 0.96,'tooltip': 'Node 8 : My OpenShift Provider<br\>96% : 96 Used of 100 Total<br\>4 Available'},
// {'id': 44, 'value': 0.94, 'tooltip': 'Node 19 : My Kubernetes Provider<br\>94% : 94 Used of 100 Total<br\>6 Available'},
// {'id': 0, 'value': 0.91, 'tooltip': 'Node 9 : My OpenShift Provider<br\>91% : 91 Used of 100 Total<br\>9 Available'},
// {'id': 43, 'value': 0.9, 'tooltip': 'Node 18 : My Kubernetes Provider<br\>90% : 90 Used of 100 Total<br\>10 Available'},
// {'id': 7, 'value': 0.89, 'tooltip': 'Node 12 : My OpenShift Provider<br\>89% : 89 Used of 100 Total<br\>11 Available'},
// {'id': 41, 'value': 0.82, 'tooltip': 'Node 16 : My Kubernetes Provider<br\>82% : 82 Used of 100 Total<br\>18 Available'},
// {'id': 21, 'value': 0.81, 'tooltip': 'Node 21 : My OpenShift Provider<br\>81% : 81 Used of 100 Total<br\>19 Available'},
// {'id': 26, 'value': 0.8, 'tooltip': 'Node 1 : My Kubernetes Provider<br\>80% : 80 Used of 100 Total<br\>20 Available'},
// {'id': 48, 'value': 0.74, 'tooltip': 'Node 23 : My Kubernetes Provider<br\>74% : 74 Used of 100 Total<br\>26 Available'},
// {'id': 27, 'value': 0.72, 'tooltip': 'Node 2 : My Kubernetes Provider<br\>72% : 72 Used of 100 Total<br\>28 Available'},
// {'id': 42, 'value': 0.71, 'tooltip': 'Node 17 : My Kubernetes Provider<br\>71% : 71 Used of 100 Total<br\>29 Available'},
// {'id': 23, 'value': 0.71, 'tooltip': 'Node 23 : My OpenShift Provider<br\>71% : 71 Used of 100 Total<br\>29 Available'},
// {'id': 22, 'value': 0.69, 'tooltip': 'Node 22 : My OpenShift Provider<br\>69% : 69 Used of 100 Total<br\>31 Available'},
// {'id': 2, 'value': 0.66, 'tooltip': 'Node 2 : M8y OpenShift Provider<br\>66% : 66 Used of 100 Total<br\>34 Available'},
// {'id': 39, 'value': 0.66, 'tooltip': 'Node 14 : My Kubernetes Provider<br\>66% : 66 Used of 100 Total<br\>34 Available'},
// {'id': 3, 'value': 0.65, 'tooltip': 'Node 39 : My OpenShift Provider<br\>65% : 65 Used of 100 Total<br\>35 Available'},
// {'id': 29, 'value': 0.65, 'tooltip': 'Node 4 : My Kubernetes Provider<br\>65% : 65 Used of 100 Total<br\>35 Available'},
// {'id': 32, 'value': 0.56, 'tooltip': 'Node 7 : My Kubernetes Provider<br\>56% : 56 Used of 100 Total<br\>44 Available'},
// {'id': 13, 'value': 0.56, 'tooltip': 'Node 13 : My OpenShift Provider<br\>56% : 56 Used of 100 Total<br\>44 Available'},
// {'id': 49, 'value': 0.52, 'tooltip': 'Node 24 : My Kubernetes Provider<br\>52% : 52 Used of 100 Total<br\>48 Available'},
// {'id': 36, 'value': 0.5, 'tooltip': 'Node 11 : My Kubernetes Provider<br\>50% : 50 Used of 100 Total<br\>50 Available'},
// {'id': 6, 'value': 0.5, 'tooltip': 'Node 5 : My OpenShift Provider<br\>50% : 50 Used of 100 Total<br\>50 Available'},
// {'id': 38, 'value': 0.49, 'tooltip': 'Node 13 : My Kubernetes Provider<br\>49% : 49 Used of 100 Total<br\>51 Available'},
// {'id': 15, 'value': 0.48, 'tooltip': 'Node 15 : My OpenShift Provider<br\>48% : 48 Used of 100 Total<br\>52 Available'},
// {'id': 30, 'value': 0.48, 'tooltip': 'Node 5 : My Kubernetes Provider<br\>48% : 48 Used of 100 Total<br\>52 Available'},
// {'id': 11, 'value': 0.47, 'tooltip': 'Node 11 : My OpenShift Provider<br\>47% : 47 Used of 100 Total<br\>53 Available'},
// {'id': 17, 'value': 0.46, 'tooltip': 'Node 17 : My OpenShift Provider<br\>46% : 46 Used of 100 Total<br\>54 Available'},
// {'id': 25, 'value': 0.45, 'tooltip': 'Node 0 : My Kubernetes Provider<br\>45% : 45 Used of 100 Total<br\>55 Available'},
// {'id': 50, 'value': 0.45, 'tooltip': 'Node 25 : My Kubernetes Provider<br\>45% : 45 Used of 100 Total<br\>55 Available'},
// {'id': 46, 'value': 0.45, 'tooltip': 'Node 21 : My Kubernetes Provider<br\>45% : 45 Used of 100 Total<br\>55 Available'},
// {'id': 47, 'value': 0.45, 'tooltip': 'Node 22 : My Kubernetes Provider<br\>45% : 45 Used of 100 Total<br\>55 Available'},
// {'id': 1, 'value': 0.44, 'tooltip': 'Node 1 : My OpenShift Provider<br\>44% : 44 Used of 100 Total<br\>56 Available'},
// {'id': 31, 'value': 0.44, 'tooltip': 'Node 6 : My Kubernetes Provider<br\>44% : 44 Used of 100 Total<br\>56 Available'},
// {'id': 37, 'value': 0.44, 'tooltip': 'Node 12 : My Kubernetes Provider<br\>44% : 44 Used of 100 Total<br\>56 Available'},
// {'id': 24, 'value': 0.44, 'tooltip': 'Node 24 : My OpenShift Provider<br\>44% : 44 Used of 100 Total<br\>56 Available'},
// {'id': 40, 'value': 0.43, 'tooltip': 'Node 40 : My Kubernetes Provider<br\>43% : 43 Used of 100 Total<br\>57 Available'},
// {'id': 20, 'value': 0.39, 'tooltip': 'Node 20 : My OpenShift Provider<br\>39% : 39 Used of 100 Total<br\>61 Available'},
// {'id': 8, 'value': 0.39, 'tooltip': 'Node 8 : My OpenShift Provider<br\>39% : 39 Used of 100 Total<br\>61 Available'},
// {'id': 5, 'value': 0.38, 'tooltip': 'Node 5 : My OpenShift Provider<br\>38% : 38 Used of 100 Total<br\>62 Available'},
// {'id': 45, 'value': 0.37, 'tooltip': 'Node 20 : My Kubernetes Provider<br\>37% : 37 Used of 100 Total<br\>63 Available'},
// {'id': 12, 'value': 0.37, 'tooltip': 'Node 12 : My OpenShift Provider<br\>37% : 37 Used of 100 Total<br\>63 Available'},
// {'id': 34, 'value': 0.37, 'tooltip': 'Node 9 : My Kubernetes Provider<br\>37% : 37 Used of 100 Total<br\>63 Available'},
// {'id': 33, 'value': 0.33, 'tooltip': 'Node 8 : My Kubernetes Provider<br\>33% : 33 Used of 100 Total<br\>67 Available'},
// {'id': 16, 'value': 0.32, 'tooltip': 'Node 16 : My OpenShift Provider<br\>32% : 32 Used of 100 Total<br\>68 Available'},
// {'id': 10, 'value': 0.29, 'tooltip': 'Node 10 : My OpenShift Provider<br\>28% : 29 Used of 100 Total<br\>71 Available'},
// {'id': 35, 'value': 0.28, 'tooltip': 'Node 35 : My Kubernetes Provider<br\>28% : 28 Used of 100 Total<br\>72 Available'},
// {'id': 18, 'value': 0.27, 'tooltip': 'Node 18 : My OpenShift Provider<br\>27% : 27 Used of 100 Total<br\>73 Available'},
// {'id': 4, 'value': 0.26, 'tooltip': 'Node 4 : My OpenShift Provider<br\>26% : 26 Used of 100 Total<br\>74 Available'},
// {'id': 19, 'value': 0.25, 'tooltip': 'Node 19 : My OpenShift Provider<br\>25% : 25 Used of 100 Total<br\>75 Available'},
// {'id': 28, 'value': 0.25, 'tooltip': 'Node 3 : My Kubernetes Provider<br\>25% : 25 Used of 100 Total<br\>75 Available'},
// {'id': 51, 'value': 0.22, 'tooltip': 'Node 26 : My Kubernetes Provider<br\>22% : 22 Used of 100 Total<br\>78 Available'},
// {'id': 14, 'value': 0.2, 'tooltip': 'Node 14 : My OpenShift Provider<br\>20% : 20 Used of 100 Total<br\>80 Available'}];
///////////////////////////////////////
// Comment/remove block below to use http call
///////////////////////////////////////
data = {
'clusterCpuUsage': [{"id":10000000000002,"node":"Default","provider":"RHV","unit":"Cores","total":48,"percent":0.35},
{"id":10000000000003,"node":"Default","provider":"RHV","unit":"Cores","total":98,"percent":0.95}],
'clusterMemoryUsage': [{"id":10000000000002,"node":"Default","provider":"RHV","unit":"GB","total":753,"percent":0.53},
{"id":10000000000003,"node":"Default","provider":"RHV","unit":"GB","total":2753,"percent":0.93}]
};
vm.title = 'Cluster Utilization';
vm.data = processHeatmapData(vm.data, data)

///////////////////////////////////////
// Comment/remove block above to use http call
///////////////////////////////////////

////////////
//// use block below to use http call to set data
////////////
// var url = '/ems_infra_dashboard/data/' + providerId;
// var heatmapPromise = $http.get(url).then(function(response) {
// vm.heatmapData = response.data.data;
// })
//
// $q.all([heatmapPromise]).then(function() {
// vm.data = processHeatmapData(vm.data, vm.heatmapData.heatmaps)
// vm.title = vm.heatmapData.heatmaps.title;
// });
////////////
//// use block above to use http call to set data
////////////

vm.dataAvailable = true;
vm.titleAlt = 'Utilization - Overriding Defaults';
Expand All @@ -69,16 +47,6 @@ angular.module( 'patternfly.charts' ).controller('heatmapController', ['$scope',
vm.heatmapColorPattern = ['#d4f0fa', '#F9D67A', '#EC7A08', '#CE0000', '#f00'];
vm.showLegends = true;

var url = '/ems_infra_dashboard/data/' + providerId;
var heatmapPromise = $http.get(url).then(function(response) {
vm.heatmapData = response.data.data;
})

$q.all([heatmapPromise]).then(function() {
vm.data = processHeatmapData(vm.data, vm.heatmapData.heatmaps)
vm.title = vm.heatmapData.heatmaps.title;
});

var clickAction = function (block) {
console.log(block);
};
Expand Down
13 changes: 7 additions & 6 deletions app/views/ems_infra/_aggregate-status-card.html.haml
View file
@@ -1,8 +1,9 @@
.container-fluid.container-tiles-pf.aggregate_status{"ng-controller" => "aggregateStatusCardController as vm", "style" => "display:inline-block;"}
.row.row-tile-pf
.col-xs-12.col-sm-12.col-md-6
%pf-aggregate-status-card{"status" => "vm.status", "show-top-border" => "true"}
.col-xs-12.col-sm-12.col-md-8
.row
%div{:class => "col-xs-6.col-sm-6.col-md-3", "ng-repeat" => "status in vm.AggStatus"}
%pf-aggregate-status-card{"status" => "status", "show-top-border" => "true"}
.col-xs-12.col-sm-12.col-md-12
.col-xs-12.col-sm-12.col-md-2
%pf-aggregate-status-card{"status" => "vm.status", "show-top-border" => "true"}
.col-xs-12.col-sm-12.col-md-10
.row
.col-xs-6.col-sm-6.col-md-3{"ng-repeat" => "status in vm.AggStatus"}
%pf-aggregate-status-card{"status" => "status", "show-top-border" => "true"}

0 comments on commit 75a8e99

Please sign in to comment.