-
Notifications
You must be signed in to change notification settings - Fork 74
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #889 from hawkular/HWKMETRICS-737
HWKMETRICS-737 Revert "Merge pull request #857 from jotak/angular-ui"
- Loading branch information
Showing
15 changed files
with
176 additions
and
101 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
47 changes: 0 additions & 47 deletions
47
.../src/main/java/org/hawkular/metrics/api/jaxrs/handler/ClientRouterDispatchingServlet.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| @font-face { | ||
| font-family: 'Exo 2'; | ||
| font-style: normal; | ||
| font-weight: 400; | ||
| src: local('Exo 2'), local('Exo2-Regular'), url(/hawkular/metrics/static/fonts/exo-2/cyrillic.woff2) format('woff2'); | ||
| unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; | ||
| } | ||
|
|
||
| @font-face { | ||
| font-family: 'Exo 2'; | ||
| font-style: normal; | ||
| font-weight: 400; | ||
| src: local('Exo 2'), local('Exo2-Regular'), url(/hawkular/metrics/static/fonts/exo-2/latin-ext.woff2) format('woff2'); | ||
| unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF; | ||
| } | ||
|
|
||
| @font-face { | ||
| font-family: 'Exo 2'; | ||
| font-style: normal; | ||
| font-weight: 400; | ||
| src: local('Exo 2'), local('Exo2-Regular'), url(/hawkular/metrics/static/fonts/exo-2/latin.woff2) format('woff2'); | ||
| unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215; | ||
| } |
Binary file added
BIN
+10.3 KB
api/metrics-api-jaxrs/src/main/webapp/static/fonts/exo-2/cyrillic.woff2
Binary file not shown.
Binary file added
BIN
+10.9 KB
api/metrics-api-jaxrs/src/main/webapp/static/fonts/exo-2/latin-ext.woff2
Binary file not shown.
Binary file not shown.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| <!-- | ||
| ~ Copyright 2014-2015 Red Hat, Inc. and/or its affiliates | ||
| ~ and other contributors as indicated by the @author tags. | ||
| ~ | ||
| ~ Licensed under the Apache License, Version 2.0 (the "License"); | ||
| ~ you may not use this file except in compliance with the License. | ||
| ~ You may obtain a copy of the License at | ||
| ~ | ||
| ~ http://www.apache.org/licenses/LICENSE-2.0 | ||
| ~ | ||
| ~ Unless required by applicable law or agreed to in writing, software | ||
| ~ distributed under the License is distributed on an "AS IS" BASIS, | ||
| ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| ~ See the License for the specific language governing permissions and | ||
| ~ limitations under the License. | ||
| --> | ||
| <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> | ||
| <html> | ||
| <head> | ||
| <title>Hawkular Metrics</title> | ||
| <link rel="shortcut icon" href="/hawkular/metrics/static/favicon.ico" type="image/x-icon"> | ||
| <link rel="stylesheet" href="/hawkular/metrics/static/welcome.css" type="text/css"> | ||
| <link rel="stylesheet" href="/hawkular/metrics/static/fonts.css" type="text/css"> | ||
| <script src="/hawkular/metrics/static/status.js" type="text/javascript"></script> | ||
| </head> | ||
|
|
||
| <body> | ||
| <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> | ||
|
|
||
| <p id="implementation-version"></p> | ||
| <p id="built-from-git-sha1" style="font-size:12px;"></p> | ||
|
|
||
| <p id="status">Status: <i>Checking...</i></p> | ||
| </div> | ||
| </body> | ||
| </html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| /* | ||
| * Copyright 2014-2017 Red Hat, Inc. and/or its affiliates | ||
| * and other contributors as indicated by the @author tags. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| var httpRequest; | ||
|
|
||
| if (window.XMLHttpRequest) { | ||
| httpRequest = new XMLHttpRequest(); | ||
| } else if (window.ActiveXObject) { | ||
| try { | ||
| httpRequest = new ActiveXObject("Msxml2.XMLHTTP"); | ||
| } catch (e) { | ||
| httpRequest = new ActiveXObject("Microsoft.XMLHTTP"); | ||
| } | ||
| } | ||
|
|
||
| httpRequest.onreadystatechange = updateStatus; | ||
| httpRequest.open("GET", "/hawkular/metrics/status"); | ||
| httpRequest.send(); | ||
|
|
||
| function updateStatus() { | ||
| if (httpRequest.readyState === 4) { | ||
| 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 = "(Git SHA1 - " + statusJson["Built-From-Git-SHA1"] + ")"; | ||
| } else if (httpRequest.status === 404 || httpRequest.status === 503) { | ||
| document.getElementById("status").innerHTML = "The server is not available"; | ||
| } else { | ||
| document.getElementById("status").innerHTML = "An error occured while accessing the server :" + httpRequest.responseText; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| /* | ||
| * Copyright 2014-2017 Red Hat, Inc. and/or its affiliates | ||
| * and other contributors as indicated by the @author tags. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| html { | ||
| width: 100%; | ||
| } | ||
|
|
||
| body { | ||
| font-family: 'Exo 2', sans-serif; | ||
| } | ||
|
|
||
| .content { | ||
| margin-left: auto; | ||
| margin-right: auto; | ||
| max-width: 100%; | ||
| width: 50em; | ||
| padding: 1em; | ||
| text-align: center; | ||
| } | ||
|
|
||
| .logo { | ||
| margin-left: auto; | ||
| margin-right: auto; | ||
| text-align: center; | ||
| } | ||
|
|
||
| .logo img { | ||
| max-width: 100%; | ||
| margin-left: auto; | ||
| margin-right: auto; | ||
| } | ||
|
|
||
| h1, h3 { | ||
| text-align: center; | ||
| word-wrap:break-word; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters