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 #3125 from Cousjava/PAYARA-2479-health-check-checker
PAYARA-2479 PAYARA-3118 MP health check checker
- Loading branch information
Showing
17 changed files
with
936 additions
and
14 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
129 changes: 129 additions & 0 deletions
129
...ice-console-plugin/src/main/resources/healthcheck/checkers/mphealthcheckConfiguration.jsf
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,129 @@ | ||
| <!-- | ||
|
|
||
| Copyright (c) 2018 Payara Foundation and/or its affiliates. All rights reserved. | ||
|
|
||
| The contents of this file are subject to the terms of either the GNU | ||
| General Public License Version 2 only ("GPL") or the Common Development | ||
| and Distribution License("CDDL") (collectively, the "License"). You | ||
| may not use this file except in compliance with the License. You can | ||
| obtain a copy of the License at | ||
| https://github.com/payara/Payara/blob/master/LICENSE.txt | ||
| See the License for the specific | ||
| language governing permissions and limitations under the License. | ||
|
|
||
| When distributing the software, include this License Header Notice in each | ||
| file and include the License file at glassfish/legal/LICENSE.txt. | ||
|
|
||
| GPL Classpath Exception: | ||
| The Payara Foundation designates this particular file as subject to the "Classpath" | ||
| exception as provided by the Payara Foundation in the GPL Version 2 section of the License | ||
| file that accompanied this code. | ||
|
|
||
| Modifications: | ||
| If applicable, add the following below the License Header, with the fields | ||
| enclosed by brackets [] replaced by your own identifying information: | ||
| "Portions Copyright [year] [name of copyright owner]" | ||
|
|
||
| Contributor(s): | ||
| If you wish your version of this file to be governed by only the CDDL or | ||
| only the GPL Version 2, indicate your decision by adding "[Contributor] | ||
| elects to include this software in this distribution under the [CDDL or GPL | ||
| Version 2] license." If you don't indicate a single choice of license, a | ||
| recipient has the option to distribute your version of this file under | ||
| either the CDDL, the GPL Version 2 or to extend the choice of license to | ||
| its licensees as provided above. However, if you add GPL Version 2 code | ||
| and therefore, elected the GPL Version 2 license, then the option applies | ||
| only if the new code is made subject to such option by the copyright | ||
| holder. | ||
| --> | ||
|
|
||
| <!initPage | ||
| setResourceBundle(key="i18nhx" bundle="fish.payara.admingui.healthcheck.Strings"); | ||
| /> | ||
| <!composition template="/templates/default.layout" | ||
| guiTitle="$resource{i18nhx.healthcheck.checker.configuration.microprofileHealthcheckChecker.pageTitle}"> | ||
|
|
||
| <!define name="content"> | ||
|
|
||
| <event> | ||
| <!beforeCreate | ||
| getRequestValue(key="configName" value="#{pageSession.configName}"); | ||
| setPageSessionAttribute(key="HEALTHCHECK_CONFIG_URL", | ||
| value="#{sessionScope.REST_URL}/configs/config/#{pageSession.configName}/health-check-service-configuration"); | ||
|
|
||
| gf.restRequest(endpoint="#{pageSession.HEALTHCHECK_CONFIG_URL}/get-healthcheck-configuration?target=#{pageSession.configName}" | ||
| method="GET" result="#{requestScope.resp}"); | ||
| setPageSessionAttribute(key="valueMap", | ||
| value="#{requestScope.resp.data.subReports.get(4).extraProperties.mpHealth}"); | ||
| mapPut(map="#{pageSession.valueMap}" key="target" value="#{pageSession.configName}"); | ||
|
|
||
| setPageSessionAttribute(key="convertToFalseList", value={"enabled", "dynamic"}); | ||
| if (#{pageSession.valueMap['enabled']}=true) { | ||
| setPageSessionAttribute(key="enabledSelected", value="true"); | ||
| } | ||
|
|
||
| setPageSessionAttribute(key="dynamic", value="true"); | ||
| /> | ||
| </event> | ||
|
|
||
| <sun:form id="propertyForm"> | ||
| #include "/common/shared/alertMsg_1.inc" | ||
| #include "/healthcheck/healthcheck/healthcheckConfigTabs.inc | ||
| <sun:title id="propertyContentPage" title="$resource{i18nhx.healthcheck.checker.configuration.microprofileHealthcheckChecker.pageTitle}" | ||
| helpText="$resource{i18nhx.healthcheck.checker.configuration.microprofileHealthcheckChecker.pageTitleHelpText}" > | ||
| <!facet pageButtonsTop> | ||
| <sun:panelGroup id="topButtons"> | ||
| <sun:button id="saveButton" text="$resource{i18n.button.Save}" | ||
| onClick="if (guiValidate('#{reqMsg}','#{reqInt}','#{reqPort}')) submitAndDisable(this, '$resource{i18n.button.Processing}'); return false;" > | ||
| <!command | ||
| mapPut(map="#{pageSession.valueMap}" key="enabled" value="#{pageSession.enabledSelected}"); | ||
| mapPut(map="#{pageSession.valueMap}" key="dynamic" value="#{pageSession.dynamic}"); | ||
| prepareSuccessfulMsg(); | ||
| gf.updateEntity(endpoint="#{pageSession.HEALTHCHECK_CONFIG_URL}/healthcheck-mp-configure" | ||
| attrs="#{pageSession.valueMap}" convertToFalse="#{pageSession.convertToFalseList}"); | ||
| /> | ||
| </sun:button> | ||
| </sun:panelGroup> | ||
| </facet> | ||
| </sun:title> | ||
| <sun:propertySheet id="propertySheet"> | ||
| #include "/common/shared/configNameSection.inc" | ||
| <sun:propertySheetSection id="mpHealthcheckCheckerProps"> | ||
| <sun:property id="enabledProp" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" | ||
| label="$resource{i18nhx.healthcheck.configuration.enabledLabel}" | ||
| helpText="$resource{i18nhx.healthcheck.configuration.enabledLabelHelpText}"> | ||
| <sun:checkbox id="enabledBox" selected="#{pageSession.enabledSelected}" selectedValue="true" /> | ||
| </sun:property> | ||
| <sun:property id="dynamicProp" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" | ||
| label="$resource{i18nhx.healthcheck.configuration.dynamicLabel}" | ||
| helpText="$resource{i18nhx.healthcheck.configuration.dynamicLabelHelpText}"> | ||
| <sun:checkbox id="dynamicBox" selected="#{pageSession.dynamic}" selectedValue="true" /> | ||
| </sun:property> | ||
| <sun:property id="nameProp" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" | ||
| label="$resource{i18nhx.healthcheck.checker.configuration.nameLabel}" | ||
| helpText="$resource{i18nhx.healthcheck.checker.configuration.nameLabelHelpText}"> | ||
| <sun:textField id="nameField" columns="$int{40}" maxLength="250" text="#{pageSession.valueMap['checkerName']}"/> | ||
| </sun:property> | ||
| <sun:property id="timeProp" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" | ||
| label="$resource{i18nhx.healthcheck.checker.configuration.timeLabel}" | ||
| helpText="$resource{i18nhx.healthcheck.checker.configuration.timeLabelHelpText}"> | ||
| <sun:textField id="timeField" columns="$int{40}" maxLength="250" styleClass="integer" | ||
| text="#{pageSession.valueMap['time']}"/> | ||
| </sun:property> | ||
| <sun:property id="unitProp" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" | ||
| label="$resource{i18nhx.healthcheck.checker.configuration.unitLabel}" | ||
| helpText="$resource{i18nhx.healthcheck.checker.configuration.unitLabelHelpText}"> | ||
| <sun:dropDown id="unitDropdown" selected="#{pageSession.valueMap['unit']}" | ||
| labels={"NANOSECONDS", "MICROSECONDS", "MILLISECONDS", "SECONDS", "MINUTES", "HOURS", "DAYS"} /> | ||
| </sun:property> | ||
| <sun:property id="thresholdTimeProp" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" | ||
| label="$resource{i18nhx.healthcheck.checker.configuration.microprofileHealthcheckChecker.timeoutLabel}" | ||
| helpText="$resource{i18nhx.healthcheck.checker.configuration.microprofileHealthcheckChecker.timeoutLabelHelpText}"> | ||
| <sun:textField id="timeField" columns="$int{40}" maxLength="250" styleClass="integer" | ||
| text="#{pageSession.valueMap['timeout']}"/> | ||
| </sun:property> | ||
| </sun:propertySheetSection> | ||
| </sun:propertySheet> | ||
| </sun:form> | ||
| </define> | ||
| </composition> |
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
101 changes: 101 additions & 0 deletions
101
appserver/payara-appserver-modules/healthcheck-checker/pom.xml
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,101 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. | ||
| Copyright (c) [2018] Payara Foundation and/or its affiliates. All rights reserved. | ||
| The contents of this file are subject to the terms of either the GNU | ||
| General Public License Version 2 only ("GPL") or the Common Development | ||
| and Distribution License("CDDL") (collectively, the "License"). You | ||
| may not use this file except in compliance with the License. You can | ||
| obtain a copy of the License at | ||
| https://github.com/payara/Payara/blob/master/LICENSE.txt | ||
| See the License for the specific | ||
| language governing permissions and limitations under the License. | ||
| When distributing the software, include this License Header Notice in each | ||
| file and include the License. | ||
| When distributing the software, include this License Header Notice in each | ||
| file and include the License file at glassfish/legal/LICENSE.txt. | ||
| GPL Classpath Exception: | ||
| The Payara Foundation designates this particular file as subject to the "Classpath" | ||
| exception as provided by the Payara Foundation in the GPL Version 2 section of the License | ||
| file that accompanied this code. | ||
| Modifications: | ||
| If applicable, add the following below the License Header, with the fields | ||
| enclosed by brackets [] replaced by your own identifying information: | ||
| "Portions Copyright [year] [name of copyright owner]" | ||
| Contributor(s): | ||
| If you wish your version of this file to be governed by only the CDDL or | ||
| only the GPL Version 2, indicate your decision by adding "[Contributor] | ||
| elects to include this software in this distribution under the [CDDL or GPL | ||
| Version 2] license." If you don't indicate a single choice of license, a | ||
| recipient has the option to distribute your version of this file under | ||
| either the CDDL, the GPL Version 2 or to extend the choice of license to | ||
| its licensees as provided above. However, if you add GPL Version 2 code | ||
| and therefore, elected the GPL Version 2 license, then the option applies | ||
| only if the new code is made subject to such option by the copyright | ||
| holder. | ||
| --> | ||
|
|
||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <parent> | ||
| <groupId>org.glassfish.main</groupId> | ||
| <artifactId>payara-appserver-modules</artifactId> | ||
| <version>5.184-SNAPSHOT</version> | ||
| </parent> | ||
| <groupId>fish.payara.appserver</groupId> | ||
| <artifactId>healthcheck-checker</artifactId> | ||
| <packaging>glassfish-jar</packaging> | ||
| <name>Healthcheck Checker</name> | ||
| <description>Microprofile Healthcheck Checker</description> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>fish.payara.payara-modules</groupId> | ||
| <artifactId>healthcheck-core</artifactId> | ||
| <version>${project.version}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>fish.payara.payara-modules</groupId> | ||
| <artifactId>notification-core</artifactId> | ||
| <version>${project.version}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.eclipse.microprofile.health</groupId> | ||
| <artifactId>microprofile-health-api</artifactId> | ||
| <version>${microprofile-healthcheck.version}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>fish.payara.microprofile.healthcheck</groupId> | ||
| <artifactId>microprofile-healthcheck</artifactId> | ||
| <version>${project.version}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.glassfish.main.admin</groupId> | ||
| <artifactId>config-api</artifactId> | ||
| <version>${project.version}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>fish.payara.admingui</groupId> | ||
| <artifactId>console-common</artifactId> | ||
| <version>${project.version}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>fish.payara.micro</groupId> | ||
| <artifactId>payara-micro-service</artifactId> | ||
| <version>${project.version}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>javax</groupId> | ||
| <artifactId>javaee-api</artifactId> | ||
| <version>${javaee.api.version}</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| </dependencies> | ||
| </project> |
72 changes: 72 additions & 0 deletions
72
...er/src/main/java/fish/payara/healthcheck/mphealth/HealthCheckTimeoutExecutionOptions.java
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,72 @@ | ||
| /* | ||
| * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. | ||
| * | ||
| * Copyright (c) [2018] Payara Foundation and/or its affiliates. All rights reserved. | ||
| * | ||
| * The contents of this file are subject to the terms of either the GNU | ||
| * General Public License Version 2 only ("GPL") or the Common Development | ||
| * and Distribution License("CDDL") (collectively, the "License"). You | ||
| * may not use this file except in compliance with the License. You can | ||
| * obtain a copy of the License at | ||
| * https://github.com/payara/Payara/blob/master/LICENSE.txt | ||
| * See the License for the specific | ||
| * language governing permissions and limitations under the License. | ||
| * | ||
| * When distributing the software, include this License Header Notice in each | ||
| * file and include the License. | ||
| * | ||
| * When distributing the software, include this License Header Notice in each | ||
| * file and include the License file at glassfish/legal/LICENSE.txt. | ||
| * | ||
| * GPL Classpath Exception: | ||
| * The Payara Foundation designates this particular file as subject to the "Classpath" | ||
| * exception as provided by the Payara Foundation in the GPL Version 2 section of the License | ||
| * file that accompanied this code. | ||
| * | ||
| * Modifications: | ||
| * If applicable, add the following below the License Header, with the fields | ||
| * enclosed by brackets [] replaced by your own identifying information: | ||
| * "Portions Copyright [year] [name of copyright owner]" | ||
| * | ||
| * Contributor(s): | ||
| * If you wish your version of this file to be governed by only the CDDL or | ||
| * only the GPL Version 2, indicate your decision by adding "[Contributor] | ||
| * elects to include this software in this distribution under the [CDDL or GPL | ||
| * Version 2] license." If you don't indicate a single choice of license, a | ||
| * recipient has the option to distribute your version of this file under | ||
| * either the CDDL, the GPL Version 2 or to extend the choice of license to | ||
| * its licensees as provided above. However, if you add GPL Version 2 code | ||
| * and therefore, elected the GPL Version 2 license, then the option applies | ||
| * only if the new code is made subject to such option by the copyright | ||
| * holder. | ||
| */ | ||
| package fish.payara.healthcheck.mphealth; | ||
|
|
||
| import fish.payara.nucleus.healthcheck.HealthCheckExecutionOptions; | ||
| import java.util.concurrent.TimeUnit; | ||
|
|
||
| /** | ||
| * Execution Options for the Microprofile Healthcheck checker. | ||
| * | ||
| * This contains the timeout for getting the healthcheck from the remote endpoint | ||
| * @author jonathan coustick | ||
| * @since 5.184 | ||
| */ | ||
| public class HealthCheckTimeoutExecutionOptions extends HealthCheckExecutionOptions { | ||
|
|
||
| private final long timeout; | ||
|
|
||
| public HealthCheckTimeoutExecutionOptions(boolean enabled, long time, TimeUnit unit, long timeout) { | ||
| super(enabled, time, unit); | ||
| this.timeout = timeout; | ||
| } | ||
|
|
||
| /** | ||
| * The timeout for getting a response from the remove server | ||
| * @return The connection timeout in milliseconds | ||
| */ | ||
| public long getTimeout() { | ||
| return timeout; | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.