Skip to content

IGNITE-23260 [Extensions] Update dependency versions of performance s… #336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nao-it wants to merge 1 commit into
base: master
Choose a base branch
from
Open

IGNITE-23260 [Extensions] Update dependency versions of performance s… #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/performance-statistics-ext/report/css/dashboard.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ body {
}

.sidebar .nav-link.active {
color: #007bff;
color: #0d6efd;
}

.sidebar .nav-link:hover .feather,
Expand Down
59 changes: 33 additions & 26 deletions modules/performance-statistics-ext/report/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<html lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="theme-color" content="#563d7c">

<title>Ignite performance statistics report</title>
Expand All @@ -29,10 +29,10 @@
<!-- Bootstrap table. -->
<link rel="stylesheet" href="libs/bootstrap-table.min.css">

<!-- Bootstrap select. -->
<link rel="stylesheet" href="libs/bootstrap-select.min.css">
<!-- Bootstrap select (use-bootstrap-select). -->
<link rel="stylesheet" href="libs/use-bootstrap-select.min.css">

<!-- Font Awesome Free 5.13.0 -->
<!-- Font Awesome Free 5.15.4 -->
<link rel="stylesheet" href="libs/fontawesome/css/all.min.css">

<!-- Favicons. -->
Expand All @@ -42,7 +42,7 @@
</head>
<body>
<nav class="navbar navbar-dark fixed-top bg-dark flex-md-nowrap p-0 shadow">
<a class="navbar-brand col-sm-3 col-md-2 mr-0" href="#">Ignite performance statistics report</a>
<a class="navbar-brand col-sm-3 col-md-2 me-0" href="#">Ignite performance statistics report</a>
</nav>

<div class="container-fluid">
Expand All @@ -51,42 +51,42 @@
<div class="sidebar-sticky">
<ul class="nav flex-column">
<li class="nav-item">
<a class="nav-link active" data-toggle="tab" href="#clusterInfoTab" role="tab"
<a class="nav-link active" data-bs-toggle="tab" href="#clusterInfoTab" role="tab"
aria-selected="true">Cluster info</a>
</li>
<li class="nav-item">
<a class="nav-link" data-toggle="tab" href="#cacheOperationsTab" role="tab"
<a class="nav-link" data-bs-toggle="tab" href="#cacheOperationsTab" role="tab"
aria-selected="false">Cache operations</a>
</li>
<li class="nav-item">
<a class="nav-link" data-toggle="tab" href="#txOperationsTab" role="tab"
<a class="nav-link" data-bs-toggle="tab" href="#txOperationsTab" role="tab"
aria-selected="false">Transactions</a>
</li>
<li class="nav-item">
<a class="nav-link" data-toggle="tab" href="#sqlStatisticsTab" role="tab"
<a class="nav-link" data-bs-toggle="tab" href="#sqlStatisticsTab" role="tab"
aria-selected="false">SQL queries</a>
</li>
<li class="nav-item">
<a class="nav-link" data-toggle="tab" href="#scanStatisticsTab" role="tab"
<a class="nav-link" data-bs-toggle="tab" href="#scanStatisticsTab" role="tab"
aria-selected="false">Scan queries</a>
</li>
<li class="nav-item">
<a class="nav-link" data-toggle="tab" href="#indexQueryStatisticsTab" role="tab"
<a class="nav-link" data-bs-toggle="tab" href="#indexQueryStatisticsTab" role="tab"
aria-selected="false">Index queries</a>
</li>
<li class="nav-item">
<a class="nav-link" data-toggle="tab" href="#computeStatisticsTab" role="tab"
<a class="nav-link" data-bs-toggle="tab" href="#computeStatisticsTab" role="tab"
aria-selected="false">Tasks and jobs</a>
</li>
<li class="nav-item">
<a class="nav-link" data-toggle="tab" href="#systemViewTab" role="tab"
<a class="nav-link" data-bs-toggle="tab" href="#systemViewTab" role="tab"
aria-selected="false">System views</a>
</li>
</ul>
</div>
</nav>

<main role="main" class="col-md-9 ml-sm-auto col-lg-10 px-4">
<main role="main" class="col-md-9 ms-sm-auto col-lg-10 px-4">
<div class="tab-content">
<div class="tab-pane fade show active" id="clusterInfoTab" role="tabpanel">
<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
Expand All @@ -103,8 +103,10 @@ <h2 class="mt-4">Started caches</h2>
<h1 class="h2">Cache operations statistics</h1>
</div>

<select id="searchCaches" class="selectpicker" data-live-search="true"></select>
<select id="searchNodes" class="selectpicker" data-live-search="true"></select>
<div class="d-flex gap-2 mb-3" style="max-width: 50%;">
<select id="searchCaches" class="form-select" data-searchable="true"></select>
<select id="searchNodes" class="form-select" data-searchable="true"></select>
</div>

<div id="operationsCharts"></div>
</div>
Expand All @@ -113,8 +115,10 @@ <h1 class="h2">Cache operations statistics</h1>
<h1 class="h2">Transactions statistics</h1>
</div>

<select id="txSearchCaches" class="selectpicker" data-live-search="true"></select>
<select id="txSearchNodes" class="selectpicker" data-live-search="true"></select>
<div class="d-flex gap-2 mb-3" style="max-width: 50%;">
<select id="txSearchCaches" class="form-select" data-searchable="true"></select>
<select id="txSearchNodes" class="form-select" data-searchable="true"></select>
</div>

<div id="txCharts"></div>
</div>
Expand Down Expand Up @@ -158,8 +162,10 @@ <h2 class="mt-4">Top of slowest tasks</h2>
<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
<h1 class="h2">System views</h1>
</div>
<select id="sysViewSearchNodes" class="selectpicker" data-live-search="true"></select>
<select id="searchViews" class="selectpicker" data-live-search="true"></select>
<div class="d-flex gap-2 mb-3" style="max-width: 50%;">
<select id="sysViewSearchNodes" class="form-select" data-searchable="true"></select>
<select id="searchViews" class="form-select" data-searchable="true"></select>
</div>

<div id="systemViewTableDiv"></div>
</div>
Expand All @@ -168,10 +174,11 @@ <h1 class="h2">System views</h1>
</div>
</div>

<!-- Bootstrap JS, Popper.js, and jQuery. -->
<script src="libs/jquery-3.6.1.min.js"></script>
<script src="libs/popper.min.js"></script>
<script src="libs/bootstrap.min.js"></script>
<!-- jQuery. -->
<script src="libs/jquery-3.7.1.min.js"></script>

<!-- Bootstrap JS (includes Popper.js). -->
<script src="libs/bootstrap.bundle.min.js"></script>

<!-- Bootstrap table. -->
<script src="libs/bootstrap-table.min.js"></script>
Expand All @@ -185,8 +192,8 @@ <h1 class="h2">System views</h1>
<!-- Chart JS. -->
<script src="libs/Chart.min.js"></script>

<!-- Bootstrap select. -->
<script src="libs/bootstrap-select.min.js"></script>
<!-- Bootstrap select (use-bootstrap-select). -->
<script src="libs/use-bootstrap-select.min.js"></script>

<!-- Report data. -->
<script type="text/javascript" src="data/data.json.js"></script>
Expand Down
34 changes: 19 additions & 15 deletions modules/performance-statistics-ext/report/js/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ function sortByKeyAsc(array, key) {
});
}

/** Builds bootstrap-select for caches. */
/** Builds select for caches. */
function buildSelectCaches(el, onSelect) {
el.append('<option data-content="<b>All caches</b>" value="total"/>');
el.append('<option value="total">All caches</option>');

var caches = REPORT_DATA.clusterInfo.caches;

Expand All @@ -66,40 +66,44 @@ function buildSelectCaches(el, onSelect) {
$.each(caches, function (idx, cache) {
var name = cache.name === undefined || cache.name == null ? cache.id : cache.name;

el.append('<option data-content="' + name + '" value="' + cache.id + '"/>');
el.append('<option value="' + cache.id + '">' + name + '</option>');
});

el.on('changed.bs.select', onSelect);
UseBootstrapSelect.getOrCreateInstance(el[0]);
el.on('change', onSelect);
}

/** Builds bootstrap-select for nodes. */
/** Builds select for nodes. */
function buildSelectNodes(el, onSelect) {
el.append('<option data-content="<b>All nodes</b>" value="total"/>');
el.append('<option value="total">All nodes</option>');

var nodes = REPORT_DATA.clusterInfo.nodes;

$.each(nodes, (nodeId, node) => {
el.append('<option data-content="' + node.id + '" value="' + node.id + '"/>');
el.append('<option value="' + node.id + '">' + node.id + '</option>');
});

el.on('changed.bs.select', onSelect);
UseBootstrapSelect.getOrCreateInstance(el[0]);
el.on('change', onSelect);
}

/** Builds bootstrap-select for nodes in system view tab. */
/** Builds select for nodes in system view tab. */
function buildSelectNodesSystemView(el, onSelect) {
el.append('<option data-content="<b>All nodes</b>" value="total"/>');
el.append('<option value="total">All nodes</option>');

Object.keys(REPORT_DATA['systemView']).forEach(nodeId =>
el.append('<option data-content="' + nodeId + '" value="' + nodeId + '"/>'));
el.append('<option value="' + nodeId + '">' + nodeId + '</option>'));

el.on('changed.bs.select', onSelect);
UseBootstrapSelect.getOrCreateInstance(el[0]);
el.on('change', onSelect);
}

/** Builds bootstrap-select for system views. */
/** Builds select for system views. */
function buildSelectSystemViews(el, onSelect) {
const views = new Set(Object.values(REPORT_DATA['systemView']).flatMap(nodeData => Object.keys(nodeData)));

views.forEach(view => el.append('<option data-content="' + view + '" value="' + view + '"/>'));
views.forEach(view => el.append('<option value="' + view + '">' + view + '</option>'));

el.on('changed.bs.select', onSelect);
UseBootstrapSelect.getOrCreateInstance(el[0]);
el.on('change', onSelect);
}
13 changes: 5 additions & 8 deletions modules/performance-statistics-ext/report/libs/Chart.min.js
View file
Open in desktop

Large diffs are not rendered by default.

Loading