You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by gh...@apache.org on 2019/04/05 21:27:17 UTC

[sling-org-apache-sling-starter] branch master updated: SLING-8343 Introduced feature healthcheck using Felix Health Checks as runtime

This is an automated email from the ASF dual-hosted git repository.

ghenzler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter.git


The following commit(s) were added to refs/heads/master by this push:
     new 7e02bd9  SLING-8343 Introduced feature healthcheck using Felix Health Checks as runtime
7e02bd9 is described below

commit 7e02bd9df07741dc5738c916bc857514db3fe6e5
Author: georg.henzler <ge...@netcentric.biz>
AuthorDate: Fri Apr 5 23:25:56 2019 +0200

    SLING-8343 Introduced feature healthcheck using Felix Health Checks as
    runtime
---
 src/main/provisioning/healthcheck.txt | 74 +++++++++++++++++++++++++++++++++++
 src/main/provisioning/sling.txt       |  3 --
 2 files changed, 74 insertions(+), 3 deletions(-)

diff --git a/src/main/provisioning/healthcheck.txt b/src/main/provisioning/healthcheck.txt
new file mode 100644
index 0000000..6eba9b2
--- /dev/null
+++ b/src/main/provisioning/healthcheck.txt
@@ -0,0 +1,74 @@
+#
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you 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.
+##
+[feature name=healthcheck]
+
+# startlevel 5 together with jetty (to allow use during startup)
+[artifacts startLevel=5]
+    org.apache.felix/org.apache.felix.healthcheck.api/2.0.0
+    org.apache.felix/org.apache.felix.healthcheck.core/2.0.2
+    org.apache.felix/org.apache.felix.healthcheck.generalchecks/2.0.2
+    org.apache.felix/org.apache.felix.healthcheck.webconsoleplugin/2.0.0
+
+# sling health check bundles at startlevel 20
+[artifacts startLevel=20]
+    org.apache.sling/org.apache.sling.hc.api/1.0.2
+
+[configurations]
+    
+  ## servlet
+    
+  org.apache.felix.hc.core.impl.servlet.HealthCheckExecutorServlet-default
+    servletPath="/system/health"
+
+  ## systemalive checks
+
+  org.apache.felix.hc.generalchecks.FrameworkStartCheck
+    hc.tags=["systemalive"]
+    targetStartLevel=I"30"
+    
+  org.apache.felix.hc.generalchecks.ServicesCheck
+    hc.tags=["systemalive"]
+    services.list=[
+      "org.apache.sling.jcr.api.SlingRepository",
+      "org.apache.sling.engine.auth.Authenticator",
+      "org.apache.sling.api.resource.ResourceResolverFactory",
+      "org.apache.sling.api.servlets.ServletResolver",      
+      "javax.script.ScriptEngineManager",
+    ]
+
+  ## bundles
+  
+  org.apache.felix.hc.generalchecks.BundlesStartedCheck  
+    hc.tags=["bundles"]
+    
+  ## system resources    
+  
+  org.apache.felix.hc.generalchecks.ThreadUsageCheck  
+    hc.tags=["threads", "cpu", "system-resources"]
+
+  org.apache.felix.hc.generalchecks.CpuCheck
+    hc.tags=["cpu", "system-resources"]
+        
+   org.apache.felix.hc.generalchecks.DiskSpaceCheck    
+    hc.tags=["diskspace", "system-resources"]
+  
+   org.apache.felix.hc.generalchecks.MemoryCheck
+    hc.tags=["memory", "system-resources"]
+    
+  
\ No newline at end of file
diff --git a/src/main/provisioning/sling.txt b/src/main/provisioning/sling.txt
index 55f2d9b..ca38b7d 100644
--- a/src/main/provisioning/sling.txt
+++ b/src/main/provisioning/sling.txt
@@ -47,9 +47,6 @@
     org.apache.sling/org.apache.sling.commons.threads/3.2.18
     org.apache.sling/org.apache.sling.engine/2.6.18
     org.apache.sling/org.apache.sling.fsresource/2.1.14
-    org.apache.sling/org.apache.sling.hc.api/1.0.2
-    org.apache.sling/org.apache.sling.hc.core/1.2.10
-    org.apache.sling/org.apache.sling.hc.webconsole/1.1.2
     org.apache.sling/org.apache.sling.i18n/2.5.14
     org.apache.sling/org.apache.sling.installer.console/1.0.2
     org.apache.sling/org.apache.sling.installer.provider.jcr/3.1.26