Make containers dashboard a shareable view and fix wrong pf-utilization-trend-chart directive #7296
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,120 +1 @@ | ||
| = render :partial => "shared/views/show_containers_dashboard" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,119 +1 @@ | ||
| = render :partial => "shared/views/show_containers_dashboard" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,125 @@ | ||
| .container-fluid.container-tiles-pf.containers-dashboard.miq-dashboard-view{"ng-app" => "containerDashboard", | ||
| "ng-controller" => "containerDashboardController as dashboard"} | ||
| .row.row-tile-pf | ||
| .col-xs-6.col-sm-4.col-md-2 | ||
| .col-xs-12.provider-card{"pf-card" => "", | ||
| "show-top-border" => "true", | ||
| "ng-if" => "providerTypeIconClass"} | ||
|
There was a problem hiding this comment. Any chance we could make the if a bit more specific? This will pretend to be the other thing whenever But maybe that's for a separate PR (or not :)) because looking at the code, |
||
| %span.provider-icon-large{"ng-class" => "providerTypeIconClass"} | ||
| %div{:layout => "tall", | ||
| "pf-aggregate-status-card" => "", | ||
| "show-top-border" => "true", | ||
| :status => "objectStatus.providers", | ||
| "ng-if" => "!providerTypeIconClass"} | ||
|
|
||
| .col-xs-12.col-sm-12.col-md-10 | ||
| .row | ||
| .col-xs-6.col-sm-6.col-md-3 | ||
| %div{:layout => "mini", | ||
| "pf-aggregate-status-card" => "", | ||
| "show-top-border" => "true", | ||
| :status => "objectStatus.nodes", | ||
| :url => "navigation"} | ||
| .col-xs-6.col-sm-6.col-md-3 | ||
| %div{:layout => "mini", | ||
| "pf-aggregate-status-card" => "", | ||
| "show-top-border" => "true", | ||
| :status => "objectStatus.containers", | ||
| :url => "navigation"} | ||
| .col-xs-6.col-sm-6.col-md-3 | ||
| %div{:layout => "mini", | ||
| "pf-aggregate-status-card" => "", | ||
| "show-top-border" => "true", | ||
| :status => "objectStatus.registries", | ||
| :url => "navigation"} | ||
| .col-xs-6.col-sm-6.col-md-3 | ||
| %div{:layout => "mini", | ||
| "pf-aggregate-status-card" => "", | ||
| "show-top-border" => "true", | ||
| :status => "objectStatus.projects", | ||
| :url => "navigation"} | ||
| .col-xs-6.col-sm-6.col-md-3 | ||
| %div{:layout => "mini", | ||
| "pf-aggregate-status-card" => "", | ||
| "show-top-border" => "true", | ||
| :status => "objectStatus.pods", | ||
| :url => "navigation"} | ||
| .col-xs-6.col-sm-6.col-md-3 | ||
| %div{:layout => "mini", | ||
| "pf-aggregate-status-card" => "", | ||
| "show-top-border" => "true", | ||
| :status => "objectStatus.services", | ||
| :url => "navigation"} | ||
| .col-xs-6.col-sm-6.col-md-3 | ||
| %div{:layout => "mini", | ||
| "pf-aggregate-status-card" => "", | ||
| "show-top-border" => "true", | ||
| :status => "objectStatus.images", | ||
| :url => "navigation"} | ||
| .col-xs-6.col-sm-6.col-md-3 | ||
| %div{:layout => "mini", | ||
| "pf-aggregate-status-card" => "", | ||
| "show-top-border" => "true", | ||
| :status => "objectStatus.routes", | ||
| :url => "navigation"} | ||
|
|
||
| .row.row-tile-pf | ||
| .col-xs-6.col-sm-6.col-md-6 | ||
| %div{"head-title" => _("Aggregated Node Utilization"), | ||
| :hidetopborder => "true", | ||
| "pf-card" => ""} | ||
|
|
||
| .spinner.spinner-lg.loading{"ng-if" => "!utilizationLoadingDone"} | ||
| .row{"ng-if" => "utilizationLoadingDone"} | ||
|
|
||
| .col-xs-6.col-sm-6.col-md-6 | ||
| %div{"ng-if" => "cpuUsageData"} | ||
| %div{"chart-data" => "cpuUsageData", | ||
| :config => "cpuUsageConfig", | ||
| "donut-config" => "cpuUsageDonutConfig", | ||
| "pf-utilization-trend-chart" => "", | ||
| "sparkline-config" => "cpuUsageSparklineConfig"} | ||
| %span.trend-footer-pf{"ng-class" => "{ 'chart-transparent-text': !cpuUsageData }"} | ||
| = _("Last 30 Days") | ||
|
|
||
| .col-xs-6.col-sm-6.col-md-6 | ||
| %div{"ng-if" => "memoryUsageData"} | ||
| %div{"chart-data" => "memoryUsageData", | ||
| :config => "memoryUsageConfig", | ||
| "donut-config" => "memoryUsageDonutConfig", | ||
| "pf-utilization-trend-chart" => "", | ||
| "sparkline-config" => "memoryUsageSparklineConfig"} | ||
| %span.trend-footer-pf{"ng-class" => "{ 'chart-transparent-text': !memoryUsageData }"} | ||
| = _("Last 30 Days") | ||
|
|
||
| .col-xs-6.col-sm-6.col-md-6 | ||
| %div{"column-sizing-class" => "col-xs-8 col-sm-6 col-md-6", | ||
| "heat-map-usage-legend-labels" => "nodeHeatMapUsageLegendLabels", | ||
| "heatmap-chart-height" => "dashboardHeatmapChartHeight", | ||
| :heatmaps => "heatmaps", | ||
| "heatmaps-card" => "", | ||
| :hidetopborder => "true", | ||
| :title => _("Node Utilization")} | ||
|
|
||
| .row.row-tile-pf.row-tile-pf-last | ||
| .col-md-6 | ||
| %div{"head-title" => "{{networkUtilizationHourlyConfig.headTitle}}", | ||
| "pf-card" => ""} | ||
|
|
||
| .spinner.spinner-lg.loading{"ng-if" => "!networkUtilizationLoadingDone"} | ||
| %div{"chart-data" => "hourlyNetworkUtilization", | ||
| "chart-height" => "chartHeight", | ||
| :config => "networkUtilizationHourlyConfig", | ||
| "ng-if" => "networkUtilizationLoadingDone", | ||
| "pf-trends-chart" => ""} | ||
|
|
||
| .col-md-6 | ||
| %div{"head-title" => "{{networkUtilizationDailyConfig.headTitle}}", | ||
| "pf-card" => ""} | ||
|
|
||
| .spinner.spinner-lg.loading{"ng-if" => "!networkUtilizationLoadingDone"} | ||
| %div{"chart-data" => "dailyNetworkUtilization", | ||
| "chart-height" => "chartHeight", | ||
| :config => "networkUtilizationDailyConfig", | ||
| "ng-if" => "networkUtilizationLoadingDone", | ||
| "pf-trends-chart" => ""} | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
.containers-dashboardinshow.html.hamlbut.single-provider-containers-dashboardin_show_dashboard.html.hamlThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Right. Thats hard to fix without #6981. We will know what to do when we will have those images\icons.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh, that's right.. can you (or @abonas ?) reply to Eric there? I'm almost sure we do want font icons but maybe I'm wrong?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Either way, an alternative would be to make the shared partial only from line 9 on ..but yeah, that has its own problems :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I dont think thats up to us :\
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm pretty sure @epwinchell was asking about the actual practical limitations..