diff --git a/playbook.retry b/playbook.retry
index a726c05..03a8fb1 100644
--- a/playbook.retry
+++ b/playbook.retry
@@ -1 +1 @@
-spolsa5069stu02.spolizei-bw.edu
+epolsa5073bit03.tpolizei-bw.de
diff --git a/roles/ams_0019_14.1.6.0_enable_monitoring/files/extension.system.properties b/roles/ams_0019_14.1.6.0_enable_monitoring/files/extension.system.properties
new file mode 100644
index 0000000..769c099
--- /dev/null
+++ b/roles/ams_0019_14.1.6.0_enable_monitoring/files/extension.system.properties
@@ -0,0 +1,75 @@
+# System properties evaluated by Rola OSGi framework system extension during early OSGi framework boot phase.
+# Don't set OSGi/Equinox framework properties here (use launcher.system.properties for this use case)!
+#
+# Support variable substitution based on system properties and environment variables. Format: ${PROPERTY_OR_ENV_KEY}
+#
+# Mandatory (pre-set) system properties:
+# rola.frameworkconfig : Framework configuration root directory e.g. "C:\...\frameworkconfig"
+# Support calculated system-properties to access framework configuration root directory:
+# rola.frameworkconfig.uri : Framework configuration root directory converted to URI, e.g. "file://.../frameworkconfig/"
+# rola.service.name: Rola Service Name
+
+# PAX Logging defaults
+org.ops4j.pax.logging.DefaultServiceLog.level=OFF
+org.ops4j.pax.logging.service.frameworkEventsLogLevel=DISABLED
+
+
+# Felix fileinstall
+felix.fileinstall.dir=${rola.frameworkconfig}/configadmin
+felix.fileinstall.tmpdir=${rola.work.configuration}/fileinstall-tmp
+felix.fileinstall.filter=.*\.cfg
+felix.fileinstall.noInitialDelay=true
+felix.fileinstall.poll=2000
+felix.fileinstall.enableConfigSave=false
+felix.fileinstall.log.level=10
+
+#Felix configadmin patch
+org.apache.felix.cm.impl.enablepersistence=false
+
+# Logging
+rola.logback.basedir=${rola.frameworkconfig}/logging
+rola.logback.configfile=${rola.logback.basedir}/logback.xml
+rola.logfile.path=${rola.work.configuration}/logs
+rola.logfile.name=${rola.service.name}
+rola.logfile.suffix=.log
+
+# Spring actuator support (follows configuration above)
+logging.file=${rola.logfile.path}/${rola.logfile.name}${rola.logfile.suffix}
+
+# Rola
+rola.boot.checkenv.mindiskspace=500
+# Warn for slow bean creation (ms)
+com.rola.spring.context.OsgiApplicationContext.slowbeancreation: -1
+
+##########################################################################################
+## Vaadin related settings
+##
+##########################################################################################
+org.atmosphere.cpr.broadcaster.maxAsyncWriteThreads=-1
+
+##########################################################################################
+## OSGi HTTP Service
+##
+## Details/Reference:
+## http://felix.apache.org/documentation/subprojects/apache-felix-http-service.html
+##########################################################################################
+
+#org.osgi.service.http.port=8080
+#org.osgi.service.http.port.secure=8443
+org.apache.felix.http.host=0.0.0.0
+org.apache.felix.http.timeout=600000
+
+org.apache.felix.http.requestlog.file.path=${rola.logfile.path}/jetty-${rola.service.name}-yyyy_mm_dd.request.log
+#org.apache.felix.http.requestlog.file.async=false
+org.apache.felix.http.requestlog.file.loglatency=true
+org.apache.felix.http.requestlog.file.retaindays=2
+
+
+# HTTP session timeout in minutes (default: 120, 0=infinite)
+# Documentation: http://felix.apache.org/documentation/subprojects/apache-felix-http-service.html
+org.apache.felix.http.session.timeout=120
+org.eclipse.jetty.servlet.SessionCookie=JSESSIONID
+org.apache.felix.http.jetty.maxFormSize=1048576
+
+
+
diff --git a/roles/ams_0019_14.1.6.0_enable_monitoring/files/tech.diagnostics.yaml b/roles/ams_0019_14.1.6.0_enable_monitoring/files/tech.diagnostics.yaml
new file mode 100644
index 0000000..28dec5c
--- /dev/null
+++ b/roles/ams_0019_14.1.6.0_enable_monitoring/files/tech.diagnostics.yaml
@@ -0,0 +1,24 @@
+## Scope
+bundle.name: com.rola.spring
+
+## Diagnostic endpoint and actuator security configuration
+diag.security:
+ ## Optional username for "/diag" remote access [development default: "actuator]
+ #user: actuator
+
+ ## Optional password hash for "/diag" remote access [format: passwd/htpasswd compatible, default: "actuator#1234"]
+ ## Generation tools e.g. openssl or mkpasswd, e.g. "openssl passwd -apr1 -salt salt hello" or "mkpasswd -m sha-256"
+ #password: "$6$iHta0sAPdmS$uwatLr4PTUMtRTlTZxyd5F.u.zth12FWsFhC2.gsT6JPbI7IKmcYAGWN3.BD3Zpn0.4MCt.xfMK81RKCirdbU/"
+
+ ## Mandatory spring security access filter expression (https://docs.spring.io/spring-security/site/docs/5.0.x/reference/html/el-access.html) [default: "denyAll()"]
+ #access: "isAuthenticated()"
+ ## Other common samples for "access" expression:
+ #access: "isAuthenticated() and (hasIpAddress('127.0.0.1/24') or hasIpAddress('::1'))"
+ #access: "hasIpAddress('127.0.0.1') or hasIpAddress('::1')"
+ access: "permitAll()"
+ #access: "denyAll()"
+
+## Spring actuator config: enable or disable health endpoint [true|false, default: true]
+management.endpoint.health.enabled: true
+## Spring actuator config: configure health endpoint details [when-authorized|always|never, default: when-authorized]
+management.endpoint.health.show-details: always
diff --git a/roles/ams_0019_14.1.6.0_enable_monitoring/tasks/main.yml b/roles/ams_0019_14.1.6.0_enable_monitoring/tasks/main.yml
index 24c42f5..4e8f872 100644
--- a/roles/ams_0019_14.1.6.0_enable_monitoring/tasks/main.yml
+++ b/roles/ams_0019_14.1.6.0_enable_monitoring/tasks/main.yml
@@ -1,6 +1,23 @@
---
##hiermit wird das Monitoring eingeschaltet
+
+ - name: copy tech.diagnostics.yaml to /opt/rola/ams/linux/webclient-services/rsAmsBvService-14.1.6.0/frameworkconfig/prefs/tech.diagnostics.yaml
+ copy:
+ src: tech.diagnostics.yaml
+ dest: /opt/rola/ams/linux/webclient-services/rsAmsBvService-14.1.6.0/frameworkconfig/prefs/tech.diagnostics.yaml
+ owner: jetty
+ group: dba
+ mode: 0644
+
+ - name: copy extension.system.properties to /opt/rola/ams/linux/webclient-services/rsAmsBvService-14.1.6.0/frameworkconfig/boot/extension.system.properties
+ copy:
+ src: extension.system.properties
+ dest: /opt/rola/ams/linux/webclient-services/rsAmsBvService-14.1.6.0/frameworkconfig/boot/extension.system.properties
+ owner: jetty
+ group: dba
+ mode: 0644
+
- name: Template file rsWebserviceAppserver.xml_enable_mon.j2 with owner and permissions
template:
src: rsWebserviceAppserver.xml_enable_mon.j2
diff --git a/roles/ams_0019_14.1.6.0_enable_monitoring/templates/rsWebserviceAppserver.xml_enable_mon.j2 b/roles/ams_0019_14.1.6.0_enable_monitoring/templates/rsWebserviceAppserver.xml_enable_mon.j2
index 5425b01..c09f2cf 100644
--- a/roles/ams_0019_14.1.6.0_enable_monitoring/templates/rsWebserviceAppserver.xml_enable_mon.j2
+++ b/roles/ams_0019_14.1.6.0_enable_monitoring/templates/rsWebserviceAppserver.xml_enable_mon.j2
@@ -256,14 +256,14 @@
true
- NORMAL
+ HIGH
STANDARD
MON1
- true
+ false
false
diff --git a/roles/ams_0019_14.1.6.0_enable_monitoring/templates/rsWebserviceAppserverAdmin.xml_enable_mon.j2 b/roles/ams_0019_14.1.6.0_enable_monitoring/templates/rsWebserviceAppserverAdmin.xml_enable_mon.j2
index fd5da7e..7a5f80c 100644
--- a/roles/ams_0019_14.1.6.0_enable_monitoring/templates/rsWebserviceAppserverAdmin.xml_enable_mon.j2
+++ b/roles/ams_0019_14.1.6.0_enable_monitoring/templates/rsWebserviceAppserverAdmin.xml_enable_mon.j2
@@ -256,14 +256,14 @@
true
- NORMAL
+ HIGH
STANDARD
MON1
- true
+ false
false
diff --git a/roles/ams_0019_14.1.6.0_enable_monitoring/templates/rsWebserviceImp20.xml_enable_mon.j2 b/roles/ams_0019_14.1.6.0_enable_monitoring/templates/rsWebserviceImp20.xml_enable_mon.j2
index 6fef2cb..5b04784 100644
--- a/roles/ams_0019_14.1.6.0_enable_monitoring/templates/rsWebserviceImp20.xml_enable_mon.j2
+++ b/roles/ams_0019_14.1.6.0_enable_monitoring/templates/rsWebserviceImp20.xml_enable_mon.j2
@@ -418,14 +418,14 @@
true
- NORMAL
+ HIGH
STANDARD
MON1
- true
+ false
false