Merge pull request #169 from OpenLiberty/staging

Merge staging to prod - update health checks (#168)

Author: gkwan-ibm

finish/src/main/java/io/openliberty/guides/inventory/InventoryLivenessCheck.java

@@ -1,6 +1,6 @@
 // tag::copyright[]
 /*******************************************************************************
- * Copyright (c) 2018, 2021 IBM Corporation and others.
+ * Copyright (c) 2018, 2022 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -34,8 +34,6 @@ public HealthCheckResponse call() {
 
       return HealthCheckResponse.named(
         InventoryResource.class.getSimpleName() + " Liveness Check")
-                                .withData("memory used", memUsed)
-                                .withData("memory max", memMax)
                                 .status(memUsed < memMax * 0.9).build();
   }
 }

finish/src/main/java/io/openliberty/guides/inventory/InventoryStartupCheck.java

@@ -34,7 +34,6 @@ public HealthCheckResponse call() {
         String cpuUsage = String.valueOf(cpuUsed);
         return HealthCheckResponse.named(InventoryResource.class
                                             .getSimpleName() + " Startup Check")
-                                            .withData("cpu used", cpuUsage)
                                             .status(cpuUsed < 0.95).build();
     }
 }

finish/src/main/java/io/openliberty/guides/system/SystemLivenessCheck.java

@@ -1,6 +1,6 @@
 // tag::copyright[]
 /*******************************************************************************
- * Copyright (c) 2018, 2021 IBM Corporation and others.
+ * Copyright (c) 2018, 2022 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -35,8 +35,6 @@ public HealthCheckResponse call() {
 
     return HealthCheckResponse.named(
       SystemResource.class.getSimpleName() + " Liveness Check")
-                              .withData("memory used", memUsed)
-                              .withData("memory max", memMax)
                               .status(memUsed < memMax * 0.9).build();
   }
 }

finish/src/main/java/io/openliberty/guides/system/SystemStartupCheck.java

@@ -34,7 +34,6 @@ public HealthCheckResponse call() {
         String cpuUsage = String.valueOf(cpuUsed);
         return HealthCheckResponse.named(SystemResource.class
                                             .getSimpleName() + " Startup Check")
-                                            .withData("cpu used", cpuUsage)
                                             .status(cpuUsed < 0.95).build();
     }
 }