Skip to content

Commit

Permalink
Merge pull request #76 from joewiz/monex-1.x
Browse files Browse the repository at this point in the history 
Prepare monex 1.0.0 release and new monex-1.x branch
  • Loading branch information
@duncdrum
duncdrum authored Apr 24, 2019
2 parents b11e99e + 8b6d115 commit 75c19be
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 21 deletions.
6 changes: 4 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<groupId>org.exist-db.apps</groupId>
<artifactId>monex</artifactId>
<version>0.9.18-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>

<name>Monex</name>
<description>An application for monitoring, profiling and inspecting a running eXist-db instance.</description>
Expand Down Expand Up @@ -63,7 +63,9 @@
<project.build.source>1.8</project.build.source>
<project.build.target>1.8</project.build.target>

<exist.version>5.0.0-SNAPSHOT</exist.version>
<exist.version>4.6.1</exist.version>
<min.version>3.7.0-SNAPSHOT</min.version>
<max.version>4.99.0</max.version>

<!-- used in the EXPath Package Descriptor -->
<package-name>http://exist-db.org/apps/monex</package-name>
Expand Down
31 changes: 16 additions & 15 deletions src/main/xar-resources/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ <h1>
Active DB Processes
</div>
<div class="info-box-number" id="jmx-brokers">
<span data-bind="text: jmx.Database.ActiveBrokers">?</span> of
<span data-bind="text: jmx.Database.ActiveBrokers">?</span> of
<span data-bind="text: jmx.Database.TotalBrokers">?</span>
</div>
</div>
Expand Down Expand Up @@ -77,7 +77,7 @@ <h1>
<span class="info-box-text">
Waiting Threads
</span>
<span class="info-box-number" data-bind="text: $data.jmx.LockTable.Attempting.length || 0">?</span>
<span class="info-box-number" data-bind="text: $data.jmx.LockManager.WaitingThreads().length || 0">?</span>
</div>
</div>
</div><!-- ./col -->
Expand Down Expand Up @@ -294,7 +294,7 @@ <h3 class="box-title">Cache Usage</h3>
</button>
</div>
</div><!-- /.box-header -->
<div class="box-body jmx-cache-manager" data-bind="with: findByName($data.jmx.CacheManager, 'org.exist.management.exist:type=CacheManager')">
<div class="box-body jmx-cache-manager" data-bind="with: findByName($data.jmx.CacheManager(), 'org.exist.management.exist:type=CacheManager')">
<div class="clearfix">
<span class="pull-left">Cache Manager</span>
<small class="pull-right">
Expand All @@ -304,7 +304,7 @@ <h3 class="box-title">Cache Usage</h3>
<div class="progress-bar progress-bar-success progress-cache" data-bind="style: {width: Math.round($data.CurrentSize() / ($data.MaxTotal() / 100)) + '%'}"/>
</div>
</div>
<div class="box-body jmx-cache-manager" data-bind="with: findByName($data.jmx.CacheManager, 'org.exist.management.exist:type=CollectionCacheManager')">
<div class="box-body jmx-cache-manager" data-bind="with: findByName($data.jmx.CacheManager(), 'org.exist.management.exist:type=CollectionCacheManager')">
<div class="clearfix">
<span class="pull-left">Collection Cache Manager</span>
<small class="pull-right">
Expand Down Expand Up @@ -519,24 +519,25 @@ <h3 class="box-title">Waiting Threads</h3>
<table class="table table-striped">
<thead>
<tr>
<th>Resource</th>
<th>Thread</th>
<th>Waiting for</th>
<th>Resource</th>
<th>Lock mode</th>
<th>Lock type</th>
</tr>
</thead>
<tbody data-bind="visible: !$data.jmx.LockTable.Acquired() || $data.jmx.LockTable.Acquired().length == 0">
<tbody data-bind="visible: $data.jmx.LockManager.WaitingThreads().length == 0">
<tr>
<td colspan="5">No waiting threads</td>
</tr>
</tbody>
<tbody data-bind="foreach: jmx.LockTable.Acquired">
<tbody data-bind="foreach: jmx.LockManager.WaitingThreads">
<tr>
<td data-bind="text: key"/>
<td data-bind="foreach: value">
<span data-bind="text: key"/>
(<span data-bind="foreach: value">
<span data-bind="text: key"/>
</span>)
</td>
<td data-bind="text: waitingThread"/>
<td data-bind="text: owner"/>
<td data-bind="text: id"/>
<td data-bind="text: lockMode"/>
<td data-bind="text: lockType"/>
</tr>
</tbody>
</table>
Expand Down Expand Up @@ -591,4 +592,4 @@ <h3 class="box-title">Active Threads</h3>
<script type="text/javascript" src="resources/scripts/ion.rangeSlider.js"/>
<script type="text/javascript" src="resources/scripts/util.js"/>
<script type="text/javascript" src="resources/scripts/exadmin.js"/>
</div>
</div>
6 changes: 3 additions & 3 deletions src/main/xar-resources/resources/scripts/util.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ JMX.util = (function() {
}
}
if (data.jmx.LockManager) {
var waiting = data.jmx.LockTable.Attempting;
var waiting = data.jmx.LockManager.WaitingThreads;
if (!waiting || !waiting.length) {
data.jmx.LockTable.Attempting = [];
data.jmx.LockManager.WaitingThreads = [];
}
}
if (data.jmx.Database) {
Expand All @@ -77,4 +77,4 @@ JMX.util = (function() {
return data;
}
}
}());
}());
12 changes: 11 additions & 1 deletion xar-assembly.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<tag>application</tag>
<category id="apps">Applications</category>

<dependency processor="http://exist-db.org" semver-min="${exist.version}" />
<dependency processor="http://exist-db.org" semver-min="${min.version}" semver-max="${max.version}" />
<dependency package="http://exist-db.org/apps/shared"/>

<!-- Collection inside /db/apps where xar-resources will be copied to -->
Expand Down Expand Up @@ -147,6 +147,16 @@
<li>Repair for eXist 5.0.0 release</li>
</ul>
</change>
<change version="1.0.0">
<ul xmlns="http://www.w3.org/1999/xhtml">
<li>Version note: Due to changes in JMX output in eXist 5.x, Monex is now split into a 1.x branch for users of eXist 4.x and the develop branch will carry Monex 2.0 releases for users of eXist 5+</li>
<li>Improved: Monex is now built with maven</li>
<li>Improved: Removed dependency on Jetty. Monex now uses the standard Java WebSocket API.</li>
<li>Improved: Declared front end dependencies via npm.</li>
<li>Removed: HipChat module</li>
<li>Fixed: Javascript errors when loading various pages</li>
</ul>
</change>
</changelog>

</package>

0 comments on commit 75c19be

Please sign in to comment.