From 922b0bc51d2ad28a2e63d583dd3025ade6d34d85 Mon Sep 17 00:00:00 2001
From: Julien Dubois <julien.dubois@gmail.com>
Date: Tue, 7 Oct 2014 11:58:56 +0200
Subject: [PATCH] Release v1.3.0

---
 .editorconfig                                 |  4 +
 Gruntfile.js                                  |  2 +-
 bower.json                                    | 46 ++++-----
 package.json                                  | 96 +++++++++----------
 pom.xml                                       | 26 -----
 .../java/com/mycompany/myapp/Application.java |  3 -
 .../metrics/DatabaseHealthIndicator.java      |  1 -
 .../myapp/domain/AbstractAuditingEntity.java  |  2 +-
 src/main/resources/config/application-dev.yml | 15 ---
 ....xml => 00000000000000_initial_schema.xml} | 20 +---
 .../resources/config/liquibase/master.xml     |  5 +-
 src/main/resources/templates/error.html       |  2 +-
 src/main/webapp/i18n/ca.json                  | 30 ++++--
 src/main/webapp/i18n/da.json                  | 28 ++++--
 src/main/webapp/i18n/de.json                  | 28 ++++--
 src/main/webapp/i18n/en.json                  | 28 ++++--
 src/main/webapp/i18n/es.json                  | 28 ++++--
 src/main/webapp/i18n/fr.json                  | 28 ++++--
 src/main/webapp/i18n/kr.json                  | 30 ++++--
 src/main/webapp/i18n/pl.json                  | 28 ++++--
 src/main/webapp/i18n/pt.json                  | 28 ++++--
 src/main/webapp/i18n/ru.json                  | 27 ++++--
 src/main/webapp/i18n/tr.json                  | 28 ++++--
 src/main/webapp/index.html                    | 16 ++++
 src/main/webapp/scripts/app.js                |  7 ++
 src/main/webapp/scripts/controllers.js        | 38 +++++---
 src/main/webapp/views/health.html             | 49 ++++++++++
 src/main/webapp/views/metrics.html            | 48 ----------
 28 files changed, 426 insertions(+), 265 deletions(-)
 rename src/main/resources/config/liquibase/changelog/{db-changelog-001.xml => 00000000000000_initial_schema.xml} (92%)
 create mode 100644 src/main/webapp/views/health.html

diff --git a/.editorconfig b/.editorconfig
index 51ceaea8..a03599dd 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -18,3 +18,7 @@ insert_final_newline = true
 
 [*.md]
 trim_trailing_whitespace = false
+
+[{package,bower}.json]
+indent_style = space
+indent_size = 2
diff --git a/Gruntfile.js b/Gruntfile.js
index 77dd7c54..b14dc94b 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,4 +1,4 @@
-// Generated on 2014-10-02 using generator-jhipster 1.2.2
+// Generated on 2014-10-07 using generator-jhipster 1.3.0
 'use strict';
 
 // # Globbing
diff --git a/bower.json b/bower.json
index 884e01d1..e80a4813 100644
--- a/bower.json
+++ b/bower.json
@@ -1,25 +1,25 @@
 {
-    "name": "jhipster",
-    "version": "0.0.0",
-    "dependencies": {
-        "bootstrap-sass": "twbs/bootstrap-sass#~3.1.1",
-        "modernizr": "2.7.1",
-        "jquery": "2.1.1",
-        "angular": "1.2.22",
-        "json3": "3.3.2",
-        "angular-route": "1.2.22",
-        "angular-resource": "1.2.22",
-        "angular-cookies": "1.2.22",
-        "angular-sanitize": "1.2.22",
-        "angular-translate": "2.2.0",
-        "angular-translate-storage-cookie": "2.2.0",
-        "angular-translate-loader-static-files": "2.2.0",
-        "angular-dynamic-locale": "0.1.1",
-        "angular-i18n": "1.2.22",
-        "swagger-ui": "2.0.18"
-    },
-    "devDependencies": {
-        "angular-mocks": "1.2.22",
-        "angular-scenario": "1.2.22"
-    }
+  "name": "jhipster",
+  "version": "0.0.0",
+  "dependencies": {
+    "bootstrap-sass": "twbs/bootstrap-sass#~3.1.1",
+    "modernizr": "2.7.1",
+    "jquery": "2.1.1",
+    "angular": "1.2.22",
+    "json3": "3.3.2",
+    "angular-route": "1.2.22",
+    "angular-resource": "1.2.22",
+    "angular-cookies": "1.2.22",
+    "angular-sanitize": "1.2.22",
+    "angular-translate": "2.2.0",
+    "angular-translate-storage-cookie": "2.2.0",
+    "angular-translate-loader-static-files": "2.2.0",
+    "angular-dynamic-locale": "0.1.1",
+    "angular-i18n": "1.2.22",
+    "swagger-ui": "2.0.18"
+  },
+  "devDependencies": {
+    "angular-mocks": "1.2.22",
+    "angular-scenario": "1.2.22"
+  }
 }
diff --git a/package.json b/package.json
index 319458f5..3071b8fe 100644
--- a/package.json
+++ b/package.json
@@ -1,50 +1,50 @@
 {
-    "name": "jhipster",
-    "version": "0.0.0",
-    "description": "Description for jhipster",
-    "dependencies": {
-    },
-    "devDependencies": {
-        "grunt": "0.4.5",
-        "grunt-autoprefixer": "0.7.5",
-        "grunt-build-control": "0.1.3",
-        "grunt-wiredep": "1.8.0",
-        "grunt-cli": "0.1.13",
-        "grunt-contrib-copy": "0.5.0",
-        "grunt-concurrent": "0.5.0",
-        "grunt-connect-proxy": "0.1.10",
-        "grunt-contrib-clean": "0.5.0",
-        "grunt-contrib-concat": "0.4.0",
-        "grunt-contrib-connect": "0.8.0",
-        "grunt-contrib-cssmin": "0.9.0",
-        "grunt-contrib-htmlmin": "0.3.0",
-        "grunt-contrib-imagemin": "0.7.1",
-        "grunt-contrib-jshint": "0.10.0",
-        "grunt-contrib-uglify": "0.4.0",
-        "grunt-contrib-watch": "0.6.1",
-        "grunt-modernizr": "0.5.2",
-        "grunt-ng-annotate": "0.3.2",
-        "grunt-rev": "0.1.0",
-        "grunt-svgmin": "0.4.0",
-        "grunt-text-replace": "0.3.12",
-        "grunt-usemin": "2.2.0",
-        "load-grunt-tasks": "0.5.0",
-        "grunt-karma": "0.8.3",
-        "time-grunt": "0.3.2",
-        "event-stream": "3.1.5",
-        "karma-script-launcher": "0.1.0",
-        "karma-chrome-launcher": "0.1.4",
-        "karma-html2js-preprocessor": "0.1.0",
-        "karma-jasmine": "0.2.2",
-        "karma-requirejs": "0.2.2",
-        "karma-phantomjs-launcher": "0.1.4",
-        "karma": "0.12.16",
-        "bower": "1.3.5",
-        "generator-jhipster": "1.2.2",
-        "lodash": "2.4.1",
-        "zeparser": "0.0.7"
-    },
-    "engines": {
-        "node": ">=0.10.0"
-    }
+  "name": "jhipster",
+  "version": "0.0.0",
+  "description": "Description for jhipster",
+  "dependencies": {
+  },
+  "devDependencies": {
+    "grunt": "0.4.5",
+    "grunt-autoprefixer": "0.7.5",
+    "grunt-build-control": "0.1.3",
+    "grunt-wiredep": "1.8.0",
+    "grunt-cli": "0.1.13",
+    "grunt-contrib-copy": "0.5.0",
+    "grunt-concurrent": "0.5.0",
+    "grunt-connect-proxy": "0.1.10",
+    "grunt-contrib-clean": "0.5.0",
+    "grunt-contrib-concat": "0.4.0",
+    "grunt-contrib-connect": "0.8.0",
+    "grunt-contrib-cssmin": "0.9.0",
+    "grunt-contrib-htmlmin": "0.3.0",
+    "grunt-contrib-imagemin": "0.7.1",
+    "grunt-contrib-jshint": "0.10.0",
+    "grunt-contrib-uglify": "0.4.0",
+    "grunt-contrib-watch": "0.6.1",
+    "grunt-modernizr": "0.5.2",
+    "grunt-ng-annotate": "0.3.2",
+    "grunt-rev": "0.1.0",
+    "grunt-svgmin": "0.4.0",
+    "grunt-text-replace": "0.3.12",
+    "grunt-usemin": "2.2.0",
+    "load-grunt-tasks": "0.5.0",
+    "grunt-karma": "0.8.3",
+    "time-grunt": "0.3.2",
+    "event-stream": "3.1.5",
+    "karma-script-launcher": "0.1.0",
+    "karma-chrome-launcher": "0.1.4",
+    "karma-html2js-preprocessor": "0.1.0",
+    "karma-jasmine": "0.2.2",
+    "karma-requirejs": "0.2.2",
+    "karma-phantomjs-launcher": "0.1.4",
+    "karma": "0.12.16",
+    "bower": "1.3.5",
+    "generator-jhipster": "1.3.0",
+    "lodash": "2.4.1",
+    "zeparser": "0.0.7"
+  },
+  "engines": {
+    "node": ">=0.10.0"
+  }
 }
diff --git a/pom.xml b/pom.xml
index 2163da5a..4ac94600 100644
--- a/pom.xml
+++ b/pom.xml
@@ -388,32 +388,6 @@
                     <expandEmptyElements>false</expandEmptyElements>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>io.github.jhipster.loaded</groupId>
-                                    <artifactId>agent</artifactId>
-                                    <version>${jhipster-loaded.version}</version>
-                                    <type>jar</type>
-                                    <overWrite>true</overWrite>
-                                    <outputDirectory>spring_loaded</outputDirectory>
-                                    <destFileName>springloaded-jhipster.jar</destFileName>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-eclipse-plugin</artifactId>
diff --git a/src/main/java/com/mycompany/myapp/Application.java b/src/main/java/com/mycompany/myapp/Application.java
index d3d20b7d..87723818 100644
--- a/src/main/java/com/mycompany/myapp/Application.java
+++ b/src/main/java/com/mycompany/myapp/Application.java
@@ -42,9 +42,6 @@ public class Application {
 
     /**
      * Main method, used to run the application.
-     *
-     * To run the application with hot reload enabled, add the following arguments to your JVM:
-     * "-javaagent:spring_loaded/springloaded-jhipster.jar -noverify -Dspringloaded=plugins=io.github.jhipster.loaded.instrument.JHipsterLoadtimeInstrumentationPlugin"
      */
     public static void main(String[] args) {
         SpringApplication app = new SpringApplication(Application.class);
diff --git a/src/main/java/com/mycompany/myapp/config/metrics/DatabaseHealthIndicator.java b/src/main/java/com/mycompany/myapp/config/metrics/DatabaseHealthIndicator.java
index c683e91c..c1a74cd2 100644
--- a/src/main/java/com/mycompany/myapp/config/metrics/DatabaseHealthIndicator.java
+++ b/src/main/java/com/mycompany/myapp/config/metrics/DatabaseHealthIndicator.java
@@ -38,7 +38,6 @@ public class DatabaseHealthIndicator extends AbstractHealthIndicator {
 
     private String query = null;
 
-    
     public DatabaseHealthIndicator(DataSource dataSource) {
         this.dataSource = dataSource;
         this.jdbcTemplate = new JdbcTemplate(dataSource);
diff --git a/src/main/java/com/mycompany/myapp/domain/AbstractAuditingEntity.java b/src/main/java/com/mycompany/myapp/domain/AbstractAuditingEntity.java
index 1a52929d..7861ef7d 100644
--- a/src/main/java/com/mycompany/myapp/domain/AbstractAuditingEntity.java
+++ b/src/main/java/com/mycompany/myapp/domain/AbstractAuditingEntity.java
@@ -25,7 +25,7 @@ public abstract class AbstractAuditingEntity {
 
     @CreatedBy
     @NotNull
-    @Column(name = "created_by", nullable = false, length = 50)
+    @Column(name = "created_by", nullable = false, length = 50, updatable = false)
     private String createdBy;
 
     @CreatedDate
diff --git a/src/main/resources/config/application-dev.yml b/src/main/resources/config/application-dev.yml
index a4a60bf8..e9c425c5 100644
--- a/src/main/resources/config/application-dev.yml
+++ b/src/main/resources/config/application-dev.yml
@@ -46,18 +46,3 @@ cache:
     timeToLiveSeconds: 3600
     ehcache:
         maxBytesLocalHeap: 16M
-
-# You can add as many as folders to watch
-# You just need to add a dash + the directory to watch
-hotReload:
-    enabled: true
-    package:
-      project: com.mycompany.myapp
-      domain: com.mycompany.myapp.domain
-      restdto: com.mycompany.myapp.web.rest.dto
-    liquibase:
-      defaultCatalogName: 
-      defaultSchema: public
-      excludeTables: T_AUTHORITY,T_PERSISTENT_AUDIT_EVENT,T_PERSISTENT_AUDIT_EVENT_DATA,T_PERSISTENT_TOKEN,T_USER,T_USER_AUTHORITY
-    watchdir:
-      - target/classes
diff --git a/src/main/resources/config/liquibase/changelog/db-changelog-001.xml b/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml
similarity index 92%
rename from src/main/resources/config/liquibase/changelog/db-changelog-001.xml
rename to src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml
index a99bd604..40d2be14 100644
--- a/src/main/resources/config/liquibase/changelog/db-changelog-001.xml
+++ b/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml
@@ -7,8 +7,11 @@
     <property name="now" value="now()" dbms="mysql,h2"/>
     <property name="now" value="current_timestamp" dbms="postgresql"/>
 
-    <!-- JHipster core -->
-    <changeSet id="1" author="jhipster">
+    <!--
+        JHipster core tables.
+        The initial schema has the '00000000000000' id, so that it is over-written if we re-generate it.
+    -->
+    <changeSet id="00000000000000" author="jhipster">
         <createTable tableName="T_USER">
             <column name="login" type="varchar(50)">
                 <constraints primaryKey="true" nullable="false"/>
@@ -150,17 +153,4 @@
                                  referencedTableName="T_PERSISTENT_AUDIT_EVENT"/>
     </changeSet>
     
-
-    <!-- Sample changeSet for creating a new Entity with the entity sub-generator -->
-    <!--
-    <changeSet id="100" author="jhipster">
-        <createTable tableName="T_FOO">
-            <column name="id" type="varchar(255)">
-                <constraints primaryKey="true" nullable="false"/>
-            </column>
-            <column name="sample_text_attribute" type="varchar(50)"/>
-            <column name="sample_date_attribute" type="date"/>
-        </createTable>
-    </changeSet>
-    -->
 </databaseChangeLog>
diff --git a/src/main/resources/config/liquibase/master.xml b/src/main/resources/config/liquibase/master.xml
index ebf75923..9d53e75b 100644
--- a/src/main/resources/config/liquibase/master.xml
+++ b/src/main/resources/config/liquibase/master.xml
@@ -4,5 +4,6 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
 
-    <include file="classpath:config/liquibase/changelog/db-changelog-001.xml" relativeToChangelogFile="false"/>
-</databaseChangeLog>
\ No newline at end of file
+    <include file="classpath:config/liquibase/changelog/00000000000000_initial_schema.xml" relativeToChangelogFile="false"/>
+    <!-- JHipster will add liquibase changelogs here -->
+</databaseChangeLog>
diff --git a/src/main/resources/templates/error.html b/src/main/resources/templates/error.html
index c3560133..a2914f26 100644
--- a/src/main/resources/templates/error.html
+++ b/src/main/resources/templates/error.html
@@ -148,7 +148,7 @@
 
     <span th:text="#{error.status}">Status:</span>&nbsp;<span th:text="${error}"></span>&nbsp;(<span th:text="${error}"></span>)<br/>
     <span th:if="${!#strings.isEmpty(message)}">
-        <span th:text="#{message}">Message:</span>&nbsp;<span th:text="${message}"></span><br/>
+        <span th:text="#{error.message}">Message:</span>&nbsp;<span th:text="${message}"></span><br/>
     </span>
 
     <script th:inline="text">
diff --git a/src/main/webapp/i18n/ca.json b/src/main/webapp/i18n/ca.json
index 8acd3b0d..1aa1df8f 100644
--- a/src/main/webapp/i18n/ca.json
+++ b/src/main/webapp/i18n/ca.json
@@ -4,6 +4,9 @@
         "browsehappy": "Està usant un navegador <strong>des-actualitzat</strong>. Si us plau <a href=\"http://browsehappy.com/?locale=en\">actualitzi el seu navegador</a> per millorar l'experiencia.",
         "menu": {
             "home": "Inici",
+            "entities": {
+                "main": "Entities"
+            },
             "account": {
                 "main": "Compte",
                 "settings": "Ajustos",
@@ -11,9 +14,10 @@
                 "sessions": "Sessions",
                 "tracker": "User tracker",
                 "metrics": "Mètriques",
+                "health": "Salud",
                 "logs": "Registres",
                 "audits": "Auditories",
-                    "login": "Autenticar",
+                "login": "Autenticar",
                 "logout": "Finalitzar la sessió",
                 "apidocs": "API",
                 "register": "Registre"
@@ -180,12 +184,6 @@
         "title": "Mètriques d'aplicació",
         "refresh.button": "Actualitzar",
         "updating": "Actualització...",
-        "health": {
-            "title": "Revisions de salud",
-            "database": "Base de dades: ",
-            "email": "Compte de correu electrònic: ",
-            "stacktrace": "Traça d'error"
-        },
         "jvm": {
             "title": "Mètriques JVM",
             "memory": {
@@ -262,6 +260,24 @@
             "mean": "Temps d'obtenció mig (ms)"
         }
     },
+    "health": {
+        "title": "Revisions de salud",
+        "refresh.button": "Actualitzar",
+        "stacktrace": "Traça d'error",
+        "indicator": {
+            "db": "Base de dades",
+            "mail": "Compte de correu electrònic",
+            "mongo": "Mongo DB"
+        },
+        "table": {
+            "service": "Nom del servei",
+            "status": "Estat"
+        },
+        "status": {
+            "UP": "FINS",
+            "DOWN": "BAIX"
+        }
+    },
     "logs": {
         "title": "Registres",
         "nbloggers": "Hi han {{ total }} loggers.",
diff --git a/src/main/webapp/i18n/da.json b/src/main/webapp/i18n/da.json
index 23e980d5..660e5104 100644
--- a/src/main/webapp/i18n/da.json
+++ b/src/main/webapp/i18n/da.json
@@ -4,6 +4,9 @@
         "browsehappy": "Du bruger en <strong>forældet</strong> browser. <a href=\"http://browsehappy.com/?locale=da\">Opgrader din browser</a> og få gavn af hele den tilgængelige funktionalitet.",
         "menu": {
             "home": "Forsiden",
+            "entities": {
+                "main": "Entities"
+            },
             "account": {
                 "main": "Konto",
                 "settings": "Indstillinger",
@@ -11,6 +14,7 @@
                 "sessions": "Sessions",
                 "tracker": "Brugersporing",
                 "metrics": "Målinger",
+                "health": "Sundheds",
                 "logs": "Logs",
                 "audits": "Audits",
                 "login": "Log ind",
@@ -180,12 +184,6 @@
         "title": "Program målinger",
         "refresh.button": "Opdatér",
         "updating": "Ajourføring...",
-        "health": {
-            "title": "Sundhedskontroller",
-            "database": "Database: ",
-            "email": "Email: ",
-            "stacktrace": "Stacktrace"
-        },
         "jvm": {
             "title": "JVM målinger",
             "memory": {
@@ -262,6 +260,24 @@
             "mean": "Middel get time (ms)"
         }
     },
+    "health": {
+        "title": "Sundhed",
+        "refresh.button": "Opdatér",
+        "stacktrace": "Stacktrace",
+        "indicator": {
+            "db": "Database",
+            "mail": "Email",
+            "mongo": "Mongo DB"
+        },
+        "table": {
+            "service": "Tjeneste navn",
+            "status": "Status"
+        },
+        "status": {
+            "UP": "OP",
+            "DOWN": "NED"
+        }
+    },
     "logs": {
         "title": "Logs",
         "nbloggers": "Der findes {{ total }} logger.",
diff --git a/src/main/webapp/i18n/de.json b/src/main/webapp/i18n/de.json
index 46478e46..3ac453bb 100644
--- a/src/main/webapp/i18n/de.json
+++ b/src/main/webapp/i18n/de.json
@@ -4,6 +4,9 @@
         "browsehappy": "Sie benutzen einen <strong>veralteten</strong> Browser. Bitte <a href=\"http://browsehappy.com/?locale=de/\">aktualisieren Sie Ihren Browser</a>, um die Benutzerfreundlichkeit zu erhöhen.",
         "menu": {
             "home": "Startseite",
+            "entities": {
+                "main": "Entities"
+            },
             "account": {
                 "main": "Zugang",
                 "settings": "Einstellungen",
@@ -11,6 +14,7 @@
                 "sessions": "Sitzungen",
                 "tracker": "User tracker",
                 "metrics": "Metriken",
+                "health": "Heath",
                 "logs": "Protokoll",
                 "audits": "Audits",
                 "login": "Anmelden",
@@ -181,12 +185,6 @@
         "title": "Anwendungs-Metriken",
         "refresh.button": "Aktualisieren",
         "updating": "Aktualisierung...",
-        "health": {
-            "title": "Heath checks",
-            "database": "Datenbank: ",
-            "email": "Email: ",
-            "stacktrace": "Stacktrace"
-        },
         "jvm": {
             "title": "JVM Metriken",
             "memory": {
@@ -263,6 +261,24 @@
             "mean": "Durchschnittliche Zugriffszeit (ms)"
         }
     },
+    "health": {
+        "title": "Heath checks",
+        "refresh.button": "Aktualisieren",
+        "stacktrace": "Stacktrace",
+        "indicator": {
+            "db": "Datenbank",
+            "mail": "Email",
+            "mongo": "Mongo"
+        },
+        "table": {
+            "service": "Dienst Name",
+            "status": "Status"
+        },
+        "status": {
+            "UP": "UP",
+            "DOWN": "DOWN"
+        }
+    },
     "logs": {
         "title": "Protokolle",
         "nbloggers": "Es existieren {{ total }} Logger.",
diff --git a/src/main/webapp/i18n/en.json b/src/main/webapp/i18n/en.json
index 1677dffa..e7647bf0 100644
--- a/src/main/webapp/i18n/en.json
+++ b/src/main/webapp/i18n/en.json
@@ -4,6 +4,9 @@
         "browsehappy": "You are using an <strong>outdated</strong> browser. Please <a href=\"http://browsehappy.com/?locale=en\">upgrade your browser</a> to improve your experience.",
         "menu": {
             "home": "Home",
+            "entities": {
+                "main": "Entities"
+            },
             "account": {
                 "main": "Account",
                 "settings": "Settings",
@@ -11,6 +14,7 @@
                 "sessions": "Sessions",
                 "tracker": "User tracker",
                 "metrics": "Metrics",
+                "health": "Health",
                 "logs": "Logs",
                 "audits": "Audits",
                 "login": "Authenticate",
@@ -180,12 +184,6 @@
         "title": "Application Metrics",
         "refresh.button": "Refresh",
         "updating": "Updating...",
-        "health": {
-            "title": "Health checks",
-            "database": "Database: ",
-            "email": "Email: ",
-            "stacktrace": "Stacktrace"
-        },
         "jvm": {
             "title": "JVM Metrics",
             "memory": {
@@ -262,6 +260,24 @@
             "mean": "Mean get time (ms)"
         }
     },
+    "health": {
+        "title": "Health checks",
+        "refresh.button": "Refresh",
+        "stacktrace": "Stacktrace",
+        "indicator": {
+            "db": "Database",
+            "mail": "Email",
+            "mongo": "Mongo DB"
+        },
+        "table": {
+            "service": "Service name",
+            "status": "Status"
+        },
+        "status": {
+            "UP": "UP",
+            "DOWN": "DOWN"
+        }
+    },
     "logs": {
         "title": "Logs",
         "nbloggers": "There are {{ total }} loggers.",
diff --git a/src/main/webapp/i18n/es.json b/src/main/webapp/i18n/es.json
index b9809515..4be9f756 100644
--- a/src/main/webapp/i18n/es.json
+++ b/src/main/webapp/i18n/es.json
@@ -4,6 +4,9 @@
         "browsehappy": "Está usando un navegador <strong>no actualizado</strong>. Por favor <a href=\"http://browsehappy.com/?locale=en\">actualice su navegador</a> para mejorar su experiencia.",
         "menu": {
             "home": "Inicio",
+            "entities": {
+                "main": "Entities"
+            },
             "account": {
                 "main": "Cuenta",
                 "settings": "Ajustes",
@@ -11,6 +14,7 @@
                 "sessions": "Sesiones",
                 "tracker": "Rastreador de los usarios",
                 "metrics": "Métricas",
+                "health": "Heath",
                 "logs": "Logs",
                 "audits": "Auditorías",
                 "login": "Iniciar sesión",
@@ -180,12 +184,6 @@
         "title": "Application Metrics",
         "refresh.button": "Refresh",
         "updating": "Actualización...",
-        "health": {
-            "title": "Heath checks",
-            "database": "Database: ",
-            "email": "Email: ",
-            "stacktrace": "Stacktrace"
-        },
         "jvm": {
             "title": "JVM Metrics",
             "memory": {
@@ -262,6 +260,24 @@
             "mean": "Mean get time (ms)"
         }
     },
+    "health": {
+        "title": "Heath checks",
+        "refresh.button": "Refresh",
+        "stacktrace": "Stacktrace",
+        "indicator": {
+            "db": "Database",
+            "mail": "Email",
+            "mongo": "Mongo DB"
+        },
+        "table": {
+            "service": "Nombre del servicio",
+            "status": "Estado"
+        },
+        "status": {
+            "UP": "HASTA",
+            "DOWN": "ABAJO"
+        }
+    },
     "logs": {
         "title": "Logs",
         "nbloggers": "Hay {{ total }} loggers.",
diff --git a/src/main/webapp/i18n/fr.json b/src/main/webapp/i18n/fr.json
index 80c93056..fe1a40e8 100644
--- a/src/main/webapp/i18n/fr.json
+++ b/src/main/webapp/i18n/fr.json
@@ -4,6 +4,9 @@
         "browsehappy": "Vous utilisez un <strong>ancien</strong> navigateur. Veuillez <a href=\"http://browsehappy.com/?locale=fr\">mettre à jour votre navigateur</a> pour une meilleure expérience.",
         "menu": {
             "home": "Accueil",
+            "entities": {
+                "main": "Entities"
+            },
             "account": {
                 "main": "Compte",
                 "settings": "Profil",
@@ -11,6 +14,7 @@
                 "sessions": "Sessions",
                 "tracker": "Suivi des utilisateurs",
                 "metrics": "Métriques",
+                "health": "Diagnostics",
                 "logs": "Logs",
                 "audits": "Audits",
                 "login": "S'authentifier",
@@ -180,12 +184,6 @@
         "title": "Métriques de l'application",
         "refresh.button": "Rafraichir",
         "updating": "Mise à jour...",
-        "health": {
-            "title": "Diagnostics",
-            "database": "Base de données: ",
-            "email": "Email: ",
-            "stacktrace": "Stacktrace"
-        },
         "jvm": {
             "title": "Métriques de la JVM",
             "memory": {
@@ -262,6 +260,24 @@
             "mean": "Temps de réponse (ms)"
         }
     },
+    "health": {
+        "title": "Diagnostics",
+        "refresh.button": "Rafraichir",
+        "indicator": {
+            "db": "Base de données",
+            "mail": "Email",
+            "mongo": "Mongo DB"
+        },
+        "stacktrace": "Stacktrace",
+        "table": {
+            "service": "Nom du service",
+            "status": "Etat"
+        },
+        "status": {
+            "UP": "DISPONIBLE",
+            "DOWN": "HORS SERVICE"
+        }
+    },
     "logs": {
         "title": "Logs",
         "nbloggers": "Total de {{ total }} \"loggers\".",
diff --git a/src/main/webapp/i18n/kr.json b/src/main/webapp/i18n/kr.json
index a161fbd1..c7a2e3e2 100644
--- a/src/main/webapp/i18n/kr.json
+++ b/src/main/webapp/i18n/kr.json
@@ -4,6 +4,9 @@
         "browsehappy": "당신은 <strong>오래된</strong> 브라우저를 사용하고 있군요. <a href=\"http://browsehappy.com/?locale=en\">브라우저를 업그레이드</a> 해 당신의 경험을 발전시키세요.",
         "menu": {
             "home": "홈",
+            "entities": {
+                "main": "Entities"
+            },
             "account": {
                 "main": "계정",
                 "settings": "설정",
@@ -11,6 +14,7 @@
                 "sessions": "세션",
                 "tracker": "사용자 트랙커",
                 "metrics": "메트릭스",
+                "health": "상태 확인",
                 "logs": "로그",
                 "audits": "Audit",
                 "login": "인증",
@@ -180,12 +184,6 @@
         "title": "애플리케이션 메트릭스",
         "refresh.button": "새로고침",
         "updating": "업데이트...",
-        "health": {
-            "title": "상태 확인",
-            "database": "데이터베이스: ",
-            "email": "이메일: ",
-            "stacktrace": "스택트레이스"
-        },
         "jvm": {
             "title": "JVM 메트릭스",
             "memory": {
@@ -262,6 +260,24 @@
             "mean": "평균시간 (밀리초)"
         }
     },
+    "health": {
+        "title": "상태 확인",
+        "refresh.button": "새로고침",
+        "indicator": {
+            "db": "데이터베이스",
+            "mail": "이메일",
+            "mongo": "Mongo DB"
+        },
+        "stacktrace": "스택트레이스",
+        "table": {
+            "service": "서비스 이름",
+            "status": "상태"
+        },
+        "status": {
+            "UP": "사용할 수",
+            "DOWN": "서비스 중"
+        }
+    },
     "logs": {
         "title": "로그",
         "nbloggers": "총 {{ total }} 개의 logger가 있습니다.",
@@ -302,4 +318,4 @@
         "403": "이 페이지에 접근할 권한이 없습니다."
     },
     "footer": "하단영역"
-}
\ No newline at end of file
+}
diff --git a/src/main/webapp/i18n/pl.json b/src/main/webapp/i18n/pl.json
index ef2e89ad..aee89e75 100644
--- a/src/main/webapp/i18n/pl.json
+++ b/src/main/webapp/i18n/pl.json
@@ -4,6 +4,9 @@
         "browsehappy": "Używasz <strong>przestarzałej</strong> przeglądarki. Proszę <a href=\"http://browsehappy.com/\">uaktualnij swoją przeglądarkę</a> aby polepszyć doświadczenie użytkownika.",
         "menu": {
             "home": "Strona domowa",
+            "entities": {
+                "main": "Entities"
+            },
             "account": {
                 "main": "Konto",
                 "settings": "Ustawienia",
@@ -11,6 +14,7 @@
                 "sessions": "Sesje",
                 "tracker": "Śledzenie użytkownika",
                 "metrics": "Metryki",
+                "health": "Heath",
                 "logs": "Logi",
                 "audits": "Audyty",
                 "login": "Autoryzacja",
@@ -180,12 +184,6 @@
         "title": "Metryki aplikacji",
         "refresh.button": "Odśwież",
         "updating": "Aktualizacja...",
-        "health": {
-            "title": "Heath checks",
-            "database": "Baza danych: ",
-            "email": "Email: ",
-            "stacktrace": "Stos wywołań"
-        },
         "jvm": {
             "title": "Metryki JVM",
             "memory": {
@@ -262,6 +260,24 @@
             "mean": "Średni czas pobierania (ms)"
         }
     },
+    "health": {
+        "title": "Heath checks",
+        "refresh.button": "Odśwież",
+        "stacktrace": "Stos wywołań",
+        "indicator": {
+            "db": "Baza danych",
+            "mail": "Email",
+            "mongo": "Mongo DB"
+        },
+        "table": {
+            "service": "Nazwa usługi",
+            "status": "Status"
+        },
+        "status": {
+            "UP": "DOSTĘPNE",
+            "DOWN": "NIE DZIAŁAJĄCY"
+        }
+    },
     "logs": {
         "title": "Logi",
         "nbloggers": "Jest {{ total }} loggerów.",
diff --git a/src/main/webapp/i18n/pt.json b/src/main/webapp/i18n/pt.json
index 3ec6b12d..ebf72ac0 100644
--- a/src/main/webapp/i18n/pt.json
+++ b/src/main/webapp/i18n/pt.json
@@ -4,6 +4,9 @@
         "browsehappy": "Você está usando um navegador <strong>desatualizado</strong>. Favor <a href=\"http://browsehappy.com/?locale=pt_BR\">atualizar o seu navegador</a> para ter uma experiência melhor.",
         "menu": {
             "home": "Início",
+            "entities": {
+                "main": "Entities"
+            },
             "account": {
                 "main": "Conta",
                 "settings": "Configuração",
@@ -11,6 +14,7 @@
                 "sessions": "Sessões",
                 "tracker": "Rastreamento de usuário",
                 "metrics": "Métricas",
+                "health": "Verificações",
                 "logs": "Logs",
                 "audits": "Auditorias",
                 "login": "Entrar",
@@ -180,12 +184,6 @@
         "title": "Métricas da aplicação",
         "refresh.button": "Atualizar",
         "updating": "Atualização...",
-        "health": {
-            "title": "Verificações",
-            "database": "Banco de dados: ",
-            "email": "E-mail: ",
-            "stacktrace": "Stacktrace"
-        },
         "jvm": {
             "title": "Métricas da JVM",
             "memory": {
@@ -262,6 +260,24 @@
             "mean": "Mediana (ms)"
         }
     },
+    "health": {
+        "title": "Verificações",
+        "refresh.button": "Atualizar",
+        "stacktrace": "Stacktrace",
+        "indicator": {
+            "db": "Banco de dados",
+            "mail": "E-mail",
+            "mongo": "Mongo DB"
+        },
+        "table": {
+            "service": "Nome do Serviço",
+            "status": "Estado"
+        },
+        "status": {
+            "UP": "UP",
+            "DOWN": "DOWN"
+        }
+    },
     "logs": {
         "title": "Logs",
         "nbloggers": "Existem {{ total }} loggers.",
diff --git a/src/main/webapp/i18n/ru.json b/src/main/webapp/i18n/ru.json
index e3dd4608..e21f6ce3 100644
--- a/src/main/webapp/i18n/ru.json
+++ b/src/main/webapp/i18n/ru.json
@@ -4,6 +4,9 @@
         "browsehappy": "Ваш браузер <strong>устарел</strong>. Пожалуйста <a href=\"http://browsehappy.com/?locale=en\">обновите ваш браузер</a>.",
         "menu": {
             "home": "Главная",
+            "entities": {
+                "main": "Entities"
+            },
             "account": {
                 "main": "Профиль",
                 "settings": "Настройки",
@@ -11,6 +14,7 @@
                 "sessions": "Сессии",
                 "tracker": "Трекер польз.",
                 "metrics": "Метрики",
+                "health": "Состояние",
                 "logs": "Логи",
                 "audits": "Аудит",
                 "login": "Authenticate",
@@ -180,12 +184,6 @@
         "title": "Метрики приложения",
         "refresh.button": "Обновить",
         "updating": "Обновление...",
-        "health": {
-            "title": "Состояние",
-            "database": "База данных: ",
-            "email": "Email: ",
-            "stacktrace": "Stacktrace"
-        },
         "jvm": {
             "title": "JVM Метрики",
             "memory": {
@@ -262,6 +260,23 @@
             "mean": "Среднее по времени (мс)"
         }
     },
+    "health": {
+        "title": "Состояние",
+        "stacktrace": "Stacktrace",
+        "indicator": {
+            "db": "База данных",
+            "mail": "Email",
+            "mongo": "Mongo DB"
+        },
+        "table": {
+            "service": "Название сервисаo",
+            "status": "статус"
+        },
+        "status": {
+            "UP": "UP",
+            "DOWN": "DOWN"
+        }
+    },
     "logs": {
         "title": "Логи",
         "nbloggers": "Есть {{ total }} логгеров.",
diff --git a/src/main/webapp/i18n/tr.json b/src/main/webapp/i18n/tr.json
index 9bbe65b0..80f759f8 100644
--- a/src/main/webapp/i18n/tr.json
+++ b/src/main/webapp/i18n/tr.json
@@ -4,6 +4,9 @@
         "browsehappy": "<strong>Çok eski</strong> bir tarayıcı kullanıyorsunuz. Lütfen kullanım kalitenizi arttırmak için <a href=\"http://browsehappy.com/?locale=tr\">tarayıcınızı yükseltin</a>.",
         "menu": {
             "home": "Ana Sayfa",
+            "entities": {
+                "main": "Entities"
+            },
             "account": {
                 "main": "Hesap",
                 "settings": "Ayarlar",
@@ -11,6 +14,7 @@
                 "sessions": "Oturumlar",
                 "tracker": "Kullanıcı Takip",
                 "metrics": "Ölçümler",
+                "health": "Heath",
                 "logs": "Loglar",
                 "audits": "Denetim",
                 "login": "Giriş",
@@ -180,12 +184,6 @@
         "title": "Uygulama Ölçütleri",
         "refresh.button": "Yenile",
         "updating": "Güncellenmesi...",
-        "health": {
-            "title": "Heath checks",
-            "database": "Veritabanı: ",
-            "email": "E-posta: ",
-            "stacktrace": "Stacktrace"
-        },
         "jvm": {
             "title": "JVM Ölçütleri",
             "memory": {
@@ -262,6 +260,24 @@
             "mean": "Mean get time (ms)"
         }
     },
+    "health": {
+        "title": "Heath checks",
+        "refresh.button": "Yenile",
+        "stacktrace": "Stacktrace",
+        "indicator": {
+            "db": "Veritabanı",
+            "mail": "E-posta",
+            "mongo": "Mongo DB"
+        },
+        "table": {
+            "service": "Hizmetin adı",
+            "status": "Durum"
+        },
+        "status": {
+            "UP": "UP",
+            "DOWN": "DOWN"
+        }
+    },
     "logs": {
         "title": "Loglar",
         "nbloggers": "Toplam {{ total }} logger var.",
diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html
index 9f43cfae..e9ee4348 100644
--- a/src/main/webapp/index.html
+++ b/src/main/webapp/index.html
@@ -39,6 +39,20 @@
                                 <span translate="global.menu.home">Home</span>
                             </a>
                         </li>
+                        <li ng-switch-when="true" class="dropdown pointer">
+                            <a class="dropdown-toggle" data-toggle="dropdown" href="javascript:;">
+                                <span>
+                                    <span class="glyphicon glyphicon-th-list"></span>
+                                    <span class="hidden-tablet" translate="global.menu.entities.main">
+                                        Entities
+                                    </span>
+                                    <b class="caret"></b>
+                                </span>
+                            </a>
+                            <ul class="dropdown-menu" ng-controller="MenuController">
+                                <!-- JHipster will add entities to the menu here -->
+                            </ul>
+                        </li>
                         <li class="dropdown pointer">
                             <a class="dropdown-toggle" data-toggle="dropdown" href="javascript:;">
                                 <span>
@@ -76,6 +90,8 @@
                             <ul class="dropdown-menu">
                                 <li><a href="#/metrics"><span class="glyphicon glyphicon-dashboard"></span>
                                     &#xA0;<span translate="global.menu.account.metrics">Metrics</span></a></li>
+                                <li><a href="#/health"><span class="glyphicon glyphicon-heart"></span>
+                                    &#xA0;<span translate="global.menu.account.health">Health</span></a></li>
                                 <li><a href="#/audits"><span class="glyphicon glyphicon-bell"></span>
                                     &#xA0;<span translate="global.menu.account.audits">Audits</span></a></li>
                                 <li><a href="#/logs"><span class="glyphicon glyphicon-tasks"></span>
diff --git a/src/main/webapp/scripts/app.js b/src/main/webapp/scripts/app.js
index 353948e6..b9538798 100644
--- a/src/main/webapp/scripts/app.js
+++ b/src/main/webapp/scripts/app.js
@@ -68,6 +68,13 @@ jhipsterApp
                         authorizedRoles: [USER_ROLES.admin]
                     }
                 })
+                .when('/health', {
+                    templateUrl: 'views/health.html',
+                    controller: 'HealthController',
+                    access: {
+                        authorizedRoles: [USER_ROLES.admin]
+                    }
+                })
                 .when('/logs', {
                     templateUrl: 'views/logs.html',
                     controller: 'LogsController',
diff --git a/src/main/webapp/scripts/controllers.js b/src/main/webapp/scripts/controllers.js
index eef7399f..4846c1f5 100644
--- a/src/main/webapp/scripts/controllers.js
+++ b/src/main/webapp/scripts/controllers.js
@@ -143,23 +143,37 @@ jhipsterApp.controller('SessionsController', function ($scope, resolvedSessions,
         };
     });
 
- jhipsterApp.controller('MetricsController', function ($scope, MetricsService, HealthCheckService, ThreadDumpService) {
+ jhipsterApp.controller('HealthController', function ($scope, HealthCheckService) {
+     $scope.updatingHealth = true;
 
+     $scope.refresh = function() {
+         $scope.updatingHealth = true;
+         HealthCheckService.check().then(function(promise) {
+             $scope.healthCheck = promise;
+             $scope.updatingHealth = false;
+         },function(promise) {
+             $scope.healthCheck = promise.data;
+             $scope.updatingHealth = false;
+         });
+     }
+
+     $scope.refresh();
+
+     $scope.getLabelClass = function(statusState) {
+         if (statusState == 'UP') {
+             return "label-success";
+         } else {
+             return "label-danger";
+         }
+     }
+ });
+
+jhipsterApp.controller('MetricsController', function ($scope, MetricsService, HealthCheckService, ThreadDumpService) {
         $scope.metrics = {};
-		$scope.updatingHealth = true;
 		$scope.updatingMetrics = true;
 
         $scope.refresh = function() {
-			$scope.updatingHealth = true;
 			$scope.updatingMetrics = true;
-        	HealthCheckService.check().then(function(promise) {
-        		$scope.healthCheck = promise;
-				$scope.updatingHealth = false;
-        	},function(promise) {
-        		$scope.healthCheck = promise.data;
-				$scope.updatingHealth = false;
-        	});
-
 			MetricsService.get().then(function(promise) {
         		$scope.metrics = promise;
 				$scope.updatingMetrics = false;
@@ -167,8 +181,6 @@ jhipsterApp.controller('SessionsController', function ($scope, resolvedSessions,
         		$scope.metrics = promise.data;
 				$scope.updatingMetrics = false;
         	});
-
-
         };
 
 		$scope.$watch('metrics', function(newValue, oldValue) {
diff --git a/src/main/webapp/views/health.html b/src/main/webapp/views/health.html
new file mode 100644
index 00000000..e1a409f3
--- /dev/null
+++ b/src/main/webapp/views/health.html
@@ -0,0 +1,49 @@
+<div>
+
+    <h2 translate="health.title">Application Health Check</h2>
+
+    <p>
+        <button type="button" class="btn btn-primary" ng-click="refresh()"><span
+                class="glyphicon glyphicon-refresh"></span>&nbsp;{{'health.refresh.button' | translate}}
+        </button>
+    </p>
+
+    <table class="table table-striped">
+        <thead>
+        <tr>
+            <th>{{'health.table.service' | translate}}</th>
+            <th>{{'health.table.status' | translate}}</th>
+            <th>{{'health.stacktrace' | translate}}</th>
+        </tr>
+        </thead>
+        <tbody>
+        <tr ng-repeat="(k, v) in healthCheck" ng-show="k != 'status'">
+            <td>{{'health.' + k | translate}}</td>
+            <td><span class="label" ng-class="getLabelClass(v.status)">{{'health.status.' + v.status | translate}}</span></td>
+            <td>
+                <div id="healthCheck" class="row" ng-show="v.error">
+                    <div class="col-md-4">
+                        <a class="hand" ng-click="showEmailException = !showEmailException">
+                            <i class="glyphicon glyphicon-eye-open"></i>
+                        </a>
+                        <div class="popover" ng-show="showEmailException">
+                            <div class="popover-title">
+                                <h4>{{'health.stacktrace' | translate}}
+                                    <button type="button" class="close"
+                                            ng-click="showEmailException = !showEmailException">
+                                        x
+                                    </button>
+                                </h4>
+                            </div>
+                            <div class="popover-content">
+                                <pre>{{healthCheck.mail.error}}</pre>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+            </td>
+        </tr>
+        </tbody>
+    </table>
+</div>
\ No newline at end of file
diff --git a/src/main/webapp/views/metrics.html b/src/main/webapp/views/metrics.html
index 520324d1..41e3fb0b 100644
--- a/src/main/webapp/views/metrics.html
+++ b/src/main/webapp/views/metrics.html
@@ -5,54 +5,6 @@
     <button type="button" class="btn btn-primary" ng-click="refresh()"><span class="glyphicon glyphicon-refresh"></span>&nbsp;{{'metrics.refresh.button' | translate}}</button>
 </p>
 
-<h3 translate="metrics.health.title">Health Checks</h3>
-<div id="healthCheck" class="row" ng-hide="updatingHealth">
-    <div class="col-md-3" ng-show="healthCheck.db.status == 'UP'">
-        <div class="alert alert-success"><strong translate="metrics.health.database">Database: </strong>OK</div>
-    </div>
-    <div class="col-md-4" ng-show="healthCheck.db.status != 'UP'">
-        <div class="alert alert-danger">
-            <strong translate="metrics.health.database">Database: </strong>ERROR
-            <span ng-show="healthCheck.db.error">
-                <a class="hand" ng-click="showDatabaseException = !showDatabaseException">
-                    <i class="glyphicon glyphicon-eye-open"></i>
-                </a>
-                <div class="popover" ng-show="showDatabaseException">
-                    <div class="popover-title">
-                        <h4>{{'metrics.health.stacktrace' | translate}}<button type="button" class="close" ng-click="showDatabaseException = !showDatabaseException">x</button></h4>
-                    </div>
-                    <div class="popover-content">
-                        <pre>{{healthCheck.db.error}}</pre>
-                    </div>
-                </div>
-            </span>
-
-        </div>
-    </div>
-    <div class="col-md-3" ng-show="healthCheck.mail.status == 'UP'" >
-        <div class="alert alert-success"><strong translate="metrics.health.email">Email: </strong>OK</div>
-    </div>
-    <div class="col-md-4" ng-show="healthCheck.mail.status != 'UP'">
-        <div class="alert alert-danger">
-            <strong translate="metrics.health.email">Email: </strong>ERROR
-            <span ng-show="healthCheck.mail.error">
-                <a class="hand" ng-click="showEmailException = !showEmailException">
-                    <i class="glyphicon glyphicon-eye-open"></i>
-                </a>
-                <div class="popover" ng-show="showEmailException">
-                    <div class="popover-title">
-                        <h4>{{'metrics.health.stacktrace' | translate}}<button type="button" class="close" ng-click="showEmailException = !showEmailException">x</button></h4>
-                    </div>
-                    <div class="popover-content">
-                        <pre>{{healthCheck.mail.error}}</pre>
-                    </div>
-                </div>
-            </span>
-        </div>
-    </div>
-</div>
-<div class="well well-lg" ng-show="updatingHealth" translate="metrics.updating">Updating...</div>
-
 <h3 translate="metrics.jvm.title">JVM Metrics</h3>
 <div class="row" ng-hide="updatingMetrics">
     <div class="col-md-4">