Skip to content

Commit

Permalink
Upgrade bootstrap version from 3 to 5 (#398)
Browse files Browse the repository at this point in the history
  • Loading branch information
@DomGarguilo
DomGarguilo authored Sep 15, 2023
1 parent b22a74f commit 6c8de39
Show file tree
Hide file tree
Showing 13 changed files with 149 additions and 152 deletions.
8 changes: 4 additions & 4 deletions _docs-2/administration/monitoring-metrics.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@ The monitor can be viewed at:
The Overview page (shown below) contains some summary information about the Accumulo instance and graphs
displaying various metrics over time. These include ingest and scan performance and other useful measurements.

<a class="thumbnail" href="{{ site.baseurl }}/images/accumulo-monitor-1.png">
<img src="{{ site.baseurl }}/images/accumulo-monitor-1.png" alt="monitor overview"/>
<a class="p-3 border rounded d-block" href="{{ site.baseurl }}/images/accumulo-monitor-1.png">
<img src="{{ site.baseurl }}/images/accumulo-monitor-1.png" class="img-fluid rounded" alt="monitor overview"/>
</a>

The Manager Server, Tablet Servers, and Tables pages display metrics grouped in different ways (e.g. by tablet server or by table).
Metrics typically include number of entries (key/value pairs), ingest and query rates.
The number of running scans, major and minor compactions are in the form _number_running_ (_number_queued_).
Another important metric is hold time, which is the amount of time a tablet has been waiting but unable to flush its memory in a minor compaction.

<a class="thumbnail" href="{{ site.baseurl }}/images/accumulo-monitor-2.png">
<img src="{{ site.baseurl }}/images/accumulo-monitor-2.png" alt="monitor manager"/>
<a class="p-3 border rounded d-block" href="{{ site.baseurl }}/images/accumulo-monitor-2.png">
<img src="{{ site.baseurl }}/images/accumulo-monitor-2.png" class="img-fluid rounded" alt="monitor manager"/>
</a>

The Server Activity page graphically displays tablet server status, with each server represented as a circle or square.
Expand Down
4 changes: 2 additions & 2 deletions _docs-2/getting-started/features.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -314,8 +314,8 @@ performance. It displays table sizes, ingest and query statistics, server
load, and last-update information. It also allows the user to view recent
diagnostic logs and traces.

<a class="thumbnail" href="/images/accumulo-monitor-1.png">
<img src="/images/accumulo-monitor-1.png" alt="monitor overview"/>
<a class="p-3 border rounded d-block" href="/images/accumulo-monitor-1.png">
<img src="/images/accumulo-monitor-1.png" class="img-fluid rounded" alt="monitor overview"/>
</a>

### Tracing
Expand Down
94 changes: 46 additions & 48 deletions _includes/nav.html
View file
Original file line number Diff line number Diff line change
@@ -1,64 +1,62 @@
<nav class="navbar navbar-default navbar-fixed-top">
<nav class="navbar navbar-expand-lg navbar-light fixed-top bg-light">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-items">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a href="{{ site.baseurl }}/"><img id="nav-logo" alt="Apache Accumulo" class="img-responsive" src="{{ site.baseurl }}/images/accumulo-logo.png" width="200"
/></a>
</div>
<a class="navbar-brand" href="{{ site.baseurl }}/">
<img alt="Apache Accumulo" id="nav-logo" src="{{ site.baseurl }}/images/accumulo-logo.png" width="200">
</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbar-items">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbar-items">
<ul class="nav navbar-nav">
<li class="nav-link"><a href="{{ site.baseurl }}/downloads">Download</a></li>
<li class="nav-link"><a href="{{ site.baseurl }}/tour">Tour</a></li>
<li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
<ul class="navbar-nav me-auto">
<li class="nav-item"><a class="nav-link" href="{{ site.baseurl }}/downloads">Download</a></li>
<li class="nav-item"><a class="nav-link" href="{{ site.baseurl }}/tour">Tour</a></li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown">Releases</a>
<ul class="dropdown-menu">
<li><a href="{{ site.baseurl }}/release/accumulo-3.0.0/">3.0.0 (Latest non-LTM)</a></li>
<li><a href="{{ site.baseurl }}/release/accumulo-2.1.2/">2.1.2 (Latest LTM)</a></li>
<li><a href="{{ site.baseurl }}/release/accumulo-1.10.3/">1.10.3 (Legacy LTM)</a></li>
<li><a href="{{ site.baseurl }}/release/">Archive</a></li>
<li><a class="dropdown-item" href="{{ site.baseurl }}/release/accumulo-3.0.0/">3.0.0 (Latest non-LTM)</a></li>
<li><a class="dropdown-item" href="{{ site.baseurl }}/release/accumulo-2.1.2/">2.1.2 (Latest LTM)</a></li>
<li><a class="dropdown-item" href="{{ site.baseurl }}/release/accumulo-1.10.3/">1.10.3 (Legacy LTM)</a></li>
<li><a class="dropdown-item" href="{{ site.baseurl }}/release/">Archive</a></li>
</ul>
</li>
<li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown">Documentation</a>
<ul class="dropdown-menu">
<li><a href="{{ site.docs_baseurl }}">User Manual (2.x)</a></li>
<li><a href="{{ site.baseurl }}/docs/2.x/apidocs">Javadocs (2.x)</a></li>
<li><a href="{{ site.baseurl }}/api">Public API</a></li>
<li><a href="{{ site.baseurl }}/quickstart-1.x">Quickstart (1.x)</a></li>
<li><a href="{{ site.baseurl }}/accumulo2-maven-plugin">Accumulo Maven Plugin</a></li>
<li><a href="{{ site.baseurl }}/1.10/accumulo_user_manual.html">User Manual (1.10)</a></li>
<li><a href="{{ site.baseurl }}/1.10/apidocs">Javadocs (1.10)</a></li>
<li><a href="{{ site.baseurl }}/external-docs">External Docs</a></li>
<li><a href="{{ site.baseurl }}/docs-archive/">Archive</a></li>
<li><a class="dropdown-item" href="{{ site.docs_baseurl }}">User Manual (2.x)</a></li>
<li><a class="dropdown-item" href="{{ site.baseurl }}/docs/2.x/apidocs">Javadocs (2.x)</a></li>
<li><a class="dropdown-item" href="{{ site.baseurl }}/api">Public API</a></li>
<li><a class="dropdown-item" href="{{ site.baseurl }}/quickstart-1.x">Quickstart (1.x)</a></li>
<li><a class="dropdown-item" href="{{ site.baseurl }}/accumulo2-maven-plugin">Accumulo Maven Plugin</a></li>
<li><a class="dropdown-item" href="{{ site.baseurl }}/1.10/accumulo_user_manual.html">User Manual (1.10)</a></li>
<li><a class="dropdown-item" href="{{ site.baseurl }}/1.10/apidocs">Javadocs (1.10)</a></li>
<li><a class="dropdown-item" href="{{ site.baseurl }}/external-docs">External Docs</a></li>
<li><a class="dropdown-item" href="{{ site.baseurl }}/docs-archive/">Archive</a></li>
</ul>
</li>
<li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#">Community<span class="caret"></span></a>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown">Community</a>
<ul class="dropdown-menu">
<li><a href="{{ site.baseurl }}/contact-us">Contact Us</a></li>
<li><a href="{{ site.baseurl }}/how-to-contribute">How To Contribute</a></li>
<li><a href="{{ site.baseurl }}/people">People</a></li>
<li><a href="{{ site.baseurl }}/related-projects">Related Projects</a></li>
<li><a class="dropdown-item" href="{{ site.baseurl }}/contact-us">Contact Us</a></li>
<li><a class="dropdown-item" href="{{ site.baseurl }}/how-to-contribute">How To Contribute</a></li>
<li><a class="dropdown-item" href="{{ site.baseurl }}/people">People</a></li>
<li><a class="dropdown-item" href="{{ site.baseurl }}/related-projects">Related Projects</a></li>
</ul>
</li>
<li class="nav-link"><a href="{{ site.baseurl }}/search">Search</a></li>
<li class="nav-item"><a class="nav-link" href="{{ site.baseurl }}/search">Search</a></li>
</ul>
<ul class="nav navbar-nav navbar-right">
<li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#"><img alt="Apache Software Foundation" src="https://www.apache.org/foundation/press/kit/feather.svg" width="15"/><span class="caret"></span></a>
<ul class="navbar-nav ms-auto">
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown">
<img alt="Apache Software Foundation" src="https://www.apache.org/foundation/press/kit/feather.svg" width="15"/>
</a>
<ul class="dropdown-menu">
<li><a href="https://www.apache.org">Apache Homepage <i class="fa-solid fa-up-right-from-square"></i></a></li>
<li><a href="https://www.apache.org/licenses/">License <i class="fa-solid fa-up-right-from-square"></i></a></li>
<li><a href="https://www.apache.org/foundation/sponsorship">Sponsorship <i class="fa-solid fa-up-right-from-square"></i></a></li>
<li><a href="https://www.apache.org/security">Security <i class="fa-solid fa-up-right-from-square"></i></a></li>
<li><a href="https://www.apache.org/foundation/thanks">Thanks <i class="fa-solid fa-up-right-from-square"></i></a></li>
<li><a href="https://www.apache.org/foundation/policies/conduct">Code of Conduct <i class="fa-solid fa-up-right-from-square"></i></a></li>
<li><a href="https://www.apache.org/events/current-event.html">Current Event <i class="fa-solid fa-up-right-from-square"></i></a></li>
<li><a class="dropdown-item" href="https://www.apache.org">Apache Homepage <span class="fa-solid fa-up-right-from-square"></span></a></li>
<li><a class="dropdown-item" href="https://www.apache.org/licenses/">License <span class="fa-solid fa-up-right-from-square"></span></a></li>
<li><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship">Sponsorship <span class="fa-solid fa-up-right-from-square"></span></a></li>
<li><a class="dropdown-item" href="https://www.apache.org/security">Security <span class="fa-solid fa-up-right-from-square"></span></a></li>
<li><a class="dropdown-item" href="https://www.apache.org/foundation/thanks">Thanks <span class="fa-solid fa-up-right-from-square"></span></a></li>
<li><a class="dropdown-item" href="https://www.apache.org/foundation/policies/conduct">Code of Conduct <span class="fa-solid fa-up-right-from-square"></span></a></li>
<li><a class="dropdown-item" href="https://www.apache.org/events/current-event.html">Current Event <span class="fa-solid fa-up-right-from-square"></span></a></li>
</ul>
</li>
</ul>
Expand Down
4 changes: 2 additions & 2 deletions _includes/scripts.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@

$(function() {
// decorate section headers with anchors
return $("h2, h3, h4, h5, h6").each(function(i, el) {
return $("h2, h3, h4, h5, h6").not(".accordion-header").each(function(i, el) {
var $el, icon, id;
$el = $(el);
id = $el.attr('id');
icon = '<i class="fa-solid fa-link"></i>';
icon = '<span class="fa-solid fa-link"></span>';
if (id) {
return $el.append($("<a />").addClass("header-link").attr("href", "#" + id).html(icon));
}
Expand Down
8 changes: 4 additions & 4 deletions _layouts/default.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href="https://maxcdn.bootstrapcdn.com/bootswatch/3.3.7/paper/bootstrap.min.css" rel="stylesheet" integrity="sha384-awusxf8AUojygHf2+joICySzB780jVvQaVCAt1clU3QsyAitLGul28Qxb2r1e5g+" crossorigin="anonymous">
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.1/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-4bw+/aepP/YC94hEpVNVgiZdgIC5+VKNBQNGCHeKRQN+PtmoHDEXuppvnDJzQIu9" crossorigin="anonymous">
<link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.2/css/all.min.css" rel="stylesheet">
<link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/v/bs/dt-1.13.6/datatables.min.css">
<link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/v/bs5/dt-1.13.6/datatables.min.css">
<link href="{{ site.baseurl }}/css/accumulo.css" rel="stylesheet" type="text/css">

<title>{% if page.title_prefix %}{{ page.title_prefix | escape }}{% endif %}{% if page.title %}{{ page.title | escape }}{% else %}{{ site.title | escape }}{% endif %}</title>

<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.0/jquery.min.js" integrity="sha256-2Pmvv0kuTBOenSvLm6bvfBSSHrUJ+3A7x6P5Ebd07/g=" crossorigin="anonymous"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
<script type="text/javascript" src="https://cdn.datatables.net/v/bs/dt-1.13.6/datatables.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.1/dist/js/bootstrap.bundle.min.js" integrity="sha384-HwwvtgBNo3bZJJLYd8oVXjrBZt8cqVSpeBNS5n7C8IVInixGAoxmnlMuBnhbgrkm" crossorigin="anonymous"></script>
<script type="text/javascript" src="https://cdn.datatables.net/v/bs5/dt-1.13.6/datatables.min.js"></script>
<script type="text/javascript" src="https://www.apachecon.com/event-images/snippet.js"></script>
{% include scripts.html %}
</head>
Expand Down
49 changes: 24 additions & 25 deletions _layouts/docs-2.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,51 +5,50 @@

<div class="row">
<div class="col-md-3">
<div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true" data-spy="affix">
<div class="panel panel-default">
<div class="accordion sticky-top" id="myAccordion" style="top: 100px;">
{% assign mydocs = site.docs-2 | group_by: 'category' %}
{% assign categories = "getting-started,development,security,configuration,administration,troubleshooting" | split: "," %}
{% for pcat in categories %}
{% for dcat in mydocs %}
{% if pcat == dcat.name %}
<div class="panel-heading" role="tab" id="headingOne">
<h4 class="panel-title">
<a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapse{{ pcat }}" aria-expanded="{% if pcat == page.category %}true{% else %}false{% endif %}" aria-controls="collapse{{ pcat }}">
<div class="accordion-item">
<div class="accordion-header fs-5 fw-bold" id="heading{{ pcat }}">
<button class="accordion-button {% if pcat != page.category %}collapsed{% endif %}" type="button" data-bs-toggle="collapse" data-bs-target="#collapse{{ pcat }}" aria-expanded="{% if pcat == page.category %}true{% else %}false{% endif %}" aria-controls="collapse{{ pcat }}">
{{ pcat | capitalize | replace: "-", " " }}
</a>
</h4>
</div>
<div id="collapse{{pcat}}" class="panel-collapse collapse{% if pcat == page.category %} in{% endif %}" role="tabpanel" aria-labelledby="headingOne">
<div class="panel-body">
{% assign items = dcat.items | sort: 'order' %}
{% for item in items %}
<div class="row doc-sidebar-link{% if page.title == item.title %} doc-sidebar-selected{% endif %}"><a href="{{ item.url }}">{{ item.title }} </a></div>
{% endfor %}
</button>
</div>
<div id="collapse{{pcat}}" class="accordion-collapse collapse{% if pcat == page.category %} show{% endif %}" aria-labelledby="heading{{ pcat }}" data-bs-parent="#myAccordion">
<div class="accordion-body">
{% assign items = dcat.items | sort: 'order' %}
{% for item in items %}
<div class="row{% if page.title == item.title %} selected{% endif %}"><a href="{{ item.url }}">{{ item.title }}</a></div>
{% endfor %}
</div>
</div>
</div>
{% endif %}
{% endfor %}
{% endfor %}
</div>
</div>
</div>
<div class="col-md-9">
{% if page.category %}
<p>Accumulo {{ page.version }} Documentation &nbsp;&gt;&gt;&nbsp; {{ page.category | capitalize | replace: "-", " " }} &nbsp;&gt;&gt;&nbsp; {{ page.title }}</p>
<p>Accumulo {{ page.version }} Documentation &gt;&gt; {{ page.category | capitalize | replace: "-", " " }} &gt;&gt; {{ page.title }}</p>
{% endif %}

{% unless page.skip_doc_h1 %}
<div class="row">
<div class="col-md-10"><h1>{{ page.title }}</h1></div>
<div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/main/{{ page.path }}" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
<div class="row mt-4">
<div class="col-md-12 d-flex justify-content-between">
<h1>{{ page.title }}</h1>
<a href="https://github.com/apache/accumulo-website/edit/main/{{ page.path }}" role="button"><span class="fa-solid fa-pen-to-square"></span> <small>Edit this page</small></a>
</div>
</div>
{% endunless %}

{{ content }}

<div class="row" style="margin-top: 20px;">
<div class="col-md-10"><strong>Find documentation for all releases in the <a href="{{ site.baseurl }}/docs-archive">archive</strong></div>
<div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/main/{{ page.path }}" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
<div class="row mt-4">
<div class="col-md-12 d-flex justify-content-between">
<strong>Find documentation for all releases in the <a href="{{ site.baseurl }}/docs-archive">archive</strong>
<a href="https://github.com/apache/accumulo-website/edit/main/{{ page.path }}" role="button"><span class="fa-solid fa-pen-to-square"></span> <small>Edit this page</small></a>
</div>
</div>
</div>
</div>
Loading

0 comments on commit 6c8de39

Please sign in to comment.