From dae051d664e6431225f71e3d414e44f3e57f7a44 Mon Sep 17 00:00:00 2001 From: eclark Date: Fri, 21 Dec 2012 23:36:10 +0000 Subject: [PATCH] HBASE-7425 Move to the newest BootStrap css and js for the webui. git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1425196 13f79535-47bb-0310-9956-ffa450edef68 --- .../hbase/tmpl/common/TaskMonitorTmpl.jamon | 16 +- .../master/AssignmentManagerStatusTmpl.jamon | 2 + .../hbase/tmpl/master/MasterStatusTmpl.jamon | 220 +- .../tmpl/master/RegionServerListTmpl.jamon | 22 +- .../tmpl/regionserver/RSStatusTmpl.jamon | 19 +- .../tmpl/regionserver/RegionListTmpl.jamon | 18 +- .../tmpl/regionserver/ServerMetricsTmpl.jamon | 26 +- .../resources/hbase-webapps/master/table.jsp | 26 +- .../hbase-webapps/master/tablesDetailed.jsp | 9 +- .../resources/hbase-webapps/master/zk.jsp | 7 +- .../static/css/bootstrap-responsive.css | 1097 +++--- .../static/css/bootstrap-responsive.min.css | 4 +- .../hbase-webapps/static/css/bootstrap.css | 3052 +++++++++++------ .../static/css/bootstrap.min.css | 4 +- .../hbase-webapps/static/css/hbase.css | 1 + .../hbase-webapps/static/hbase_logo_small.png | Bin 0 -> 1926 bytes .../hbase-webapps/static/js/bootstrap.js | 840 +++-- .../hbase-webapps/static/js/bootstrap.min.js | 2 +- .../hbase-webapps/static/js/jquery.min.js | 6 +- .../resources/hbase-webapps/static/js/tab.js | 15 +- 20 files changed, 3531 insertions(+), 1855 deletions(-) create mode 100644 hbase-server/src/main/resources/hbase-webapps/static/hbase_logo_small.png diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.jamon index e1861dcdf97..b4a5feae456 100644 --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.jamon +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.jamon @@ -56,14 +56,14 @@ boolean first = true; [<%for MonitoredTask task : tasks%><%if first%><%java>first = false;<%else>,<% task.toJSON() %>] <%else>

Tasks

-
- Show All Monitored Tasks - Show non-RPC Tasks - Show All RPC Handler Tasks - Show Active RPC Calls - Show Client Operations - View as JSON -
+ <%if tasks.isEmpty()%>

No tasks currently running on this node.

<%else> diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon index 497603ccb55..efa81659fe4 100644 --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon @@ -76,6 +76,7 @@ if (toRemove > 0) { <%if !rit.isEmpty() %> +

Regions in Transition

@@ -95,5 +96,6 @@ if (toRemove > 0) { <%if removed > 0 %> (<% removed %> more regions in transition not shown) + diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon index 9587af80958..fb6fbeaef62 100644 --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon @@ -73,7 +73,7 @@ org.apache.hadoop.hbase.HBaseConfiguration; - HBase Master + HBase Logo
  • Home
    • @@ -93,15 +93,12 @@ org.apache.hadoop.hbase.HBaseConfiguration;
    -
    -

    Master: <% master.getServerName().getHostname() %>

    -
    - - +
    <%if JvmVersion.isBadJvmVersion() %>
    @@ -126,115 +123,124 @@ org.apache.hadoop.hbase.HBaseConfiguration;
    +
    +

    Region Servers

    + <& RegionServerListTmpl; master= master; servers = servers &> -

    Region Servers

    - <& RegionServerListTmpl; master= master; servers = servers &> + <%if (deadServers != null) %> + <& deadRegionServers &> + +
    - <%if (deadServers != null) %> - <& deadRegionServers &> - +
    +

    Backup Masters

    + <& BackupMasterListTmpl; master = master &> +
    -

    Backup Masters

    - <& BackupMasterListTmpl; master = master &> - -

    Tables

    -
    - -
    -
    - <%if (metaLocation != null) %> - <& userTables &> - -
    -
    - <%if (rootLocation != null) %> - <& catalogTables &> - +
    +

    Tables

    +
    + +
    +
    + <%if (metaLocation != null) %> + <& userTables &> + +
    +
    + <%if (rootLocation != null) %> + <& catalogTables &> + +
    -
    - + <& AssignmentManagerStatusTmpl; assignmentManager=master.getAssignmentManager()&> - <& ../common/TaskMonitorTmpl; filter = filter &> +
    + <& ../common/TaskMonitorTmpl; filter = filter &> +
    -

    Software Attributes

    -
RegionStateRIT time (ms)
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <%if frags != null %> - - - - - - - - - - - - - - - - - - - - - - - - - - -
Attribute NameValueDescription
HBase Version<% org.apache.hadoop.hbase.util.VersionInfo.getVersion() %>, r<% org.apache.hadoop.hbase.util.VersionInfo.getRevision() %>HBase version and revision
HBase Compiled<% org.apache.hadoop.hbase.util.VersionInfo.getDate() %>, <% org.apache.hadoop.hbase.util.VersionInfo.getUser() %>When HBase version was compiled and by whom
Hadoop Version<% org.apache.hadoop.util.VersionInfo.getVersion() %>, r<% org.apache.hadoop.util.VersionInfo.getRevision() %>Hadoop version and revision
Hadoop Compiled<% org.apache.hadoop.util.VersionInfo.getDate() %>, <% org.apache.hadoop.util.VersionInfo.getUser() %>When Hadoop version was compiled and by whom
HBase Root Directory<% FSUtils.getRootDir(master.getConfiguration()).toString() %>Location of HBase home directory
HBase Cluster ID<% master.getClusterId() != null ? master.getClusterId() : "Not set" %>Unique identifier generated for each HBase cluster
Load average<% StringUtils.limitDecimalTo2(master.getServerManager().getAverageLoad()) %>Average number of regions per regionserver. Naive computation.
Fragmentation<% frags.get("-TOTAL-") != null ? frags.get("-TOTAL-").intValue() + "%" : "n/a" %>Overall fragmentation of all tables, including .META. and -ROOT-.
Zookeeper Quorum<% master.getZooKeeperWatcher().getQuorum() %>Addresses of all registered ZK servers. For more, see zk dump.
Coprocessors<% java.util.Arrays.toString(master.getCoprocessors()) %>Coprocessors currently loaded by the master
HMaster Start Time<% new Date(master.getMasterStartTime()) %>Date stamp of when this HMaster was started
HMaster Active Time<% new Date(master.getMasterActiveTime()) %>Date stamp of when this HMaster became active
+
+

Software Attributes

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%if frags != null %> + + + + + + + + + + + + + + + + + + + + + + + + + + +
Attribute NameValueDescription
HBase Version<% org.apache.hadoop.hbase.util.VersionInfo.getVersion() %>, r<% org.apache.hadoop.hbase.util.VersionInfo.getRevision() %>HBase version and revision
HBase Compiled<% org.apache.hadoop.hbase.util.VersionInfo.getDate() %>, <% org.apache.hadoop.hbase.util.VersionInfo.getUser() %>When HBase version was compiled and by whom
Hadoop Version<% org.apache.hadoop.util.VersionInfo.getVersion() %>, r<% org.apache.hadoop.util.VersionInfo.getRevision() %>Hadoop version and revision
Hadoop Compiled<% org.apache.hadoop.util.VersionInfo.getDate() %>, <% org.apache.hadoop.util.VersionInfo.getUser() %>When Hadoop version was compiled and by whom
HBase Root Directory<% FSUtils.getRootDir(master.getConfiguration()).toString() %>Location of HBase home directory
HBase Cluster ID<% master.getClusterId() != null ? master.getClusterId() : "Not set" %>Unique identifier generated for each HBase cluster
Load average<% StringUtils.limitDecimalTo2(master.getServerManager().getAverageLoad()) %>Average number of regions per regionserver. Naive computation.
Fragmentation<% frags.get("-TOTAL-") != null ? frags.get("-TOTAL-").intValue() + "%" : "n/a" %>Overall fragmentation of all tables, including .META. and -ROOT-.
Zookeeper Quorum<% master.getZooKeeperWatcher().getQuorum() %>Addresses of all registered ZK servers. For more, see zk dump.
Coprocessors<% java.util.Arrays.toString(master.getCoprocessors()) %>Coprocessors currently loaded by the master
HMaster Start Time<% new Date(master.getMasterStartTime()) %>Date stamp of when this HMaster was started
HMaster Active Time<% new Date(master.getMasterActiveTime()) %>Date stamp of when this HMaster became active
+
+ diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon index 169b868e78f..b064d498719 100644 --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon @@ -48,27 +48,27 @@ Arrays.sort(serverNames);
-
    -
  • Base Stats
    • -
  • Memory
    • -
  • Requests
    • -
  • Storefiles
    • -
  • Compactions
    • +
    -
    +
    <& baseStats; serverNames = serverNames; &>
    -
    +
    <& memoryStats; serverNames = serverNames; &>
    -
    +
    <& requestStats; serverNames = serverNames; &>
    -
    +
    <& storeStats; serverNames = serverNames; &>
    -
    +
    <& compactionStats; serverNames = serverNames; &>
    diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon index df20f3cd273..10427346aec 100644 --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon @@ -68,7 +68,7 @@ org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionLoad; - HBase Region Server + HBase Logo
    • Home
      • @@ -87,22 +87,27 @@ org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionLoad;
      -
      -

      RegionServer: <% serverName.getHostname() %>

      -
      - +
      +

      Server Metrics

      <& ServerMetricsTmpl; mWrap = regionServer.getMetrics().getRegionServerWrapper(); &> +
      +
      <& ../common/TaskMonitorTmpl; filter = filter &> +
      +

      Regions

      <& RegionListTmpl; regionServer = regionServer; onlineRegions = onlineRegions; &> +
      +

      Software Attributes

      @@ -151,6 +156,8 @@ org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionLoad;
      Address of HBase Master
      +
      +
      diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon index 997793984e2..b07381ae0ac 100644 --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon @@ -38,23 +38,23 @@
      -
        -
      • Base Info
        • -
      • Request metrics
        • -
      • Storefile Metrics
        • -
      • Compaction Metrics
        • +
        -
        +
        <& baseInfo; onlineRegions = onlineRegions; &>
        -
        +
        <& requestStats; onlineRegions = onlineRegions; &>
        -
        +
        <& storeStats; onlineRegions = onlineRegions; &>
        -
        +
        <& compactStats; onlineRegions = onlineRegions; &>
        diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon index 0f1c5f43d95..95098970e12 100644 --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon @@ -35,31 +35,31 @@ com.yammer.metrics.stats.Snapshot; java.lang.management.ManagementFactory;
        -
          -
        • Base Stats
          • -
        • Memory
          • -
        • Requests
          • -
        • Storefiles
          • -
        • Queues
          • -
        • Block Cache
          • +
          -
          +
          <& baseStats; mWrap = mWrap &>
          -
          +
          <& memoryStats; mWrap = mWrap &>
          -
          +
          <& requestStats; mWrap = mWrap &>
          -
          +
          <& storeStats; mWrap = mWrap &>
          -
          +
          <& queueStats; mWrap = mWrap &>
          -
          +
          <& blockCacheStats; mWrap = mWrap &>
          diff --git a/hbase-server/src/main/resources/hbase-webapps/master/table.jsp b/hbase-server/src/main/resources/hbase-webapps/master/table.jsp index c24f5ed12c6..127cd656547 100644 --- a/hbase-server/src/main/resources/hbase-webapps/master/table.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/master/table.jsp @@ -91,7 +91,7 @@ - HBase Master + HBase Logo
          • Home
            • @@ -108,12 +108,11 @@
            -
            -
            -

            Table action request accepted

            -
            -