[HWKMETRICS-128] Update status pages to use the version returned by t…

…he status endpoint.
hawkular · Aug 25, 2015 · af73b08 · af73b08
1 parent f09b9a7
commit af73b08
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 11 deletions.
diff --git a/api/metrics-api-jaxrs-1.1/src/main/webapp/index.html b/api/metrics-api-jaxrs-1.1/src/main/webapp/index.html
@@ -24,17 +24,20 @@
 </head>
 
 <body>
-<div class="content">
-    <div class="logo"/>
-    <img src="/hawkular/metrics/static/hawkular_logo.png" alt="Hawkular Logo"/>
-</div>
-<h1>Hawkular Metrics</h1>
+  <div class="content">
+    <div class="logo">
+      <img src="/hawkular/metrics/static/hawkular_logo.png" alt="Hawkular Logo"/>
+    </div>
+    <h1>Hawkular Metrics</h1>
 
-<h3>A time series metrics engine based on Cassandra</h3>
+    <h3>A time series metrics engine based on Cassandra</h3>
 
-<p>${project.version}</p>
+    <p>
+      <span id="implementation-version"></span>
+      <span id="built-from-git-sha1"></span>
+    </p>
 
-<p id="status">Status: <i>Checking...</i></p>
-</div>
+    <p id="status">Status: <i>Checking...</i></p>
+  </div>
 </body>
 </html>
diff --git a/api/metrics-api-jaxrs-1.1/src/main/webapp/status.js b/api/metrics-api-jaxrs-1.1/src/main/webapp/status.js
@@ -36,6 +36,8 @@ function updateStatus() {
         if (httpRequest.status === 200) {
             statusJson = JSON.parse(httpRequest.responseText);
             document.getElementById("status").innerHTML = "Metrics Service :" + statusJson.MetricsService;
+            document.getElementById("implementation-version").innerHTML = statusJson["Implementation-Version"];
+            document.getElementById("built-from-git-sha1").innerHTML = "(" + statusJson["Built-From-Git-SHA1"] + ")";
         } else if (httpRequest.status === 404 || httpRequest.status === 503) {
             document.getElementById("status").innerHTML = "The server is not available";
         } else {

diff --git a/api/metrics-api-jaxrs/src/main/webapp/static/index.html b/api/metrics-api-jaxrs/src/main/webapp/static/index.html
@@ -30,12 +30,17 @@
 
 <body>
   <div class="content">
-    <div class="logo"/>
+    <div class="logo">
       <img src="/hawkular/metrics/static/hawkular_logo.png" alt="Hawkular Logo"/>
     </div>
     <h1>Hawkular Metrics</h1>
     <h3>A time series metrics engine based on Cassandra</h3>
-    <p>${project.version}</p>
+
+    <p>
+      <span id="implementation-version"></span>
+      <span id="built-from-git-sha1"></span>
+    </p>
+
     <p id="status">Status: <i>Checking...</i></p>
   </div>
 </body>

diff --git a/api/metrics-api-jaxrs/src/main/webapp/static/status.js b/api/metrics-api-jaxrs/src/main/webapp/static/status.js
@@ -35,6 +35,8 @@ function updateStatus() {
    if (httpRequest.status === 200) {
      statusJson = JSON.parse(httpRequest.responseText);
      document.getElementById("status").innerHTML = "Metrics Service :" + statusJson.MetricsService;
+     document.getElementById("implementation-version").innerHTML = statusJson["Implementation-Version"];
+     document.getElementById("built-from-git-sha1").innerHTML = "(" + statusJson["Built-From-Git-SHA1"] + ")";
    } else if (httpRequest.status === 404 || httpRequest.status === 503) {
      document.getElementById("status").innerHTML = "The server is not available";
    } else {