fixed bugs in sandbox

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch-si.com>
eclipse-ditto · Apr 27, 2018 · e8bfdea · e8bfdea
1 parent 186cc21
commit e8bfdea
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 36 deletions.
diff --git a/docker/nginx.conf b/docker/nginx.conf
@@ -67,36 +67,8 @@ http {
 
     # status
     location /status {
-      proxy_pass                    http://gateway:8080/status;
-      proxy_http_version            1.1;
-      proxy_set_header              Host                $http_host;
-      proxy_set_header              X-Real-IP           $remote_addr;
-      proxy_set_header              X-Forwarded-For     $proxy_add_x_forwarded_for;
-      proxy_set_header              X-Forwarded-User    $remote_user;
-    }
-
-    # stats
-    location /stats {
-      proxy_pass                    http://gateway:8080/stats;
-      proxy_http_version            1.1;
-      proxy_set_header              Host                $http_host;
-      proxy_set_header              X-Real-IP           $remote_addr;
-      proxy_set_header              X-Forwarded-For     $proxy_add_x_forwarded_for;
-      proxy_set_header              X-Forwarded-User    $remote_user;
-    }
-
-    # devops
-    location /devops {
-      proxy_pass                    http://gateway:8080/devops;
-      proxy_http_version            1.1;
-      proxy_set_header              Host                $http_host;
-      proxy_set_header              X-Real-IP           $remote_addr;
-      proxy_set_header              X-Forwarded-For     $proxy_add_x_forwarded_for;
-      proxy_set_header              X-Forwarded-User    $remote_user;
-    }
+      include nginx-cors.conf;
 
-    # status
-    location /status {
       proxy_pass                    http://gateway:8080/status;
       proxy_http_version            1.1;
       proxy_set_header              Host                $http_host;
@@ -107,6 +79,8 @@ http {
 
     # stats
     location /stats {
+      include nginx-cors.conf;
+
       proxy_pass                    http://gateway:8080/stats;
       proxy_http_version            1.1;
       proxy_set_header              Host                $http_host;
@@ -117,8 +91,10 @@ http {
 
     # devops
     location /devops {
+      include nginx-cors.conf;
+
       proxy_pass                    http://gateway:8080/devops;
-      proxy_http_version            1.1;
+        proxy_http_version            1.1;
       proxy_set_header              Host                $http_host;
       proxy_set_header              X-Real-IP           $remote_addr;
       proxy_set_header              X-Forwarded-For     $proxy_add_x_forwarded_for;

diff --git a/docker/sandbox/html/index.html b/docker/sandbox/html/index.html
@@ -195,14 +195,14 @@ <h2>Statistics</h2>
         </p>`).appendTo("#health-content");
 
         let items = [];
-        $.each(data.roles, function (key, val) {
-            if (keysToIgnore.includes(key)) {
+        $.each(data.children, function (idx, child) {
+            if (keysToIgnore.includes(child.label)) {
                 // ignore
             } else {
                 items.push(`<li>
-                    <span class="health-key">${key}:</span>
-                    <span class="health ${calcHealthStatusClass(val.status)}"></span>
-                    <span class="health-status">${val.status}</span>
+                    <span class="health-key">${child.label}:</span>
+                    <span class="health ${calcHealthStatusClass(child.status)}"></span>
+                    <span class="health-status">${child.status}</span>
                 </li>`);
             }
         });

diff --git a/docker/sandbox/nginx.conf b/docker/sandbox/nginx.conf
@@ -164,6 +164,8 @@ http {
 
     # status
     location /status {
+      include nginx-cors.conf;
+
       proxy_pass                    http://gateway:8080/status;
       proxy_http_version            1.1;
       proxy_set_header              Host                $http_host;
@@ -174,6 +176,8 @@ http {
 
     # stats
     location /stats {
+      include nginx-cors.conf;
+
       proxy_pass                    http://gateway:8080/stats;
       proxy_http_version            1.1;
       proxy_set_header              Host                $http_host;
@@ -184,6 +188,8 @@ http {
 
     # devops
     location /devops {
+      include nginx-cors.conf;
+
       auth_basic                    "DevOps Authentication required";
       auth_basic_user_file          nginx-devops.htpasswd;
 

diff --git a/services/connectivity/starter/src/main/resources/connectivity.conf b/services/connectivity/starter/src/main/resources/connectivity.conf
@@ -93,7 +93,7 @@ ditto {
     client.init-timeout = 5s
 
     health-check {
-      enabled = false
+      enabled = true
       enabled = ${?HEALTH_CHECK_ENABLED} # may be overridden with this environment variable
       interval = 60s