diff --git a/blocks/java-pkg-centos.dck b/blocks/java-pkg-centos.dck
index 612e8a4..8cf7d58 100644
--- a/blocks/java-pkg-centos.dck
+++ b/blocks/java-pkg-centos.dck
@@ -4,7 +4,7 @@
 RUN yum install -y \
        java-{{= fp.config.version.version }}-openjdk-{{= fp.config.base.javaPackage[major]}} \ {{? fp.param.type === "jdk" }}
        java-{{= fp.config.version.version }}-openjdk-devel-{{= fp.config.base.javaPackage[major]}} \ {{?}}
-    && echo "securerandom.source=file:/dev/urandom" >> /usr/lib/jvm/jre/lib/security/java.security \
-    && yum clean all
+       && echo "securerandom.source=file:/dev/urandom" >> /usr/lib/jvm/jre/lib/security/java.security \
+       && yum clean all
 
 ENV JAVA_HOME /etc/alternatives/jre
diff --git a/blocks/jmx_exporter/fp-files/prometheus-config.yml b/blocks/jmx_exporter/fp-files/prometheus-config.yml
new file mode 100644
index 0000000..f6eaa2b
--- /dev/null
+++ b/blocks/jmx_exporter/fp-files/prometheus-config.yml
@@ -0,0 +1,586 @@
+startDelaySecs: 5
+ssl: false
+blacklistObjectNames: ["java.lang:*"]
+rules:
+# Context level
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesCompleted'
+    name: org.apache.camel.ExchangesCompleted
+    help: Exchanges Completed
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesFailed'
+    name: org.apache.camel.ExchangesFailed
+    help: Exchanges Failed
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesInflight'
+    name: org.apache.camel.ExchangesInflight
+    help: Exchanges Inflight
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>FailuresHandled'
+    name: org.apache.camel.FailuresHandled
+    help: Failures Handled
+    labels:
+        context: $1
+        type: context
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExternalRedeliveries'
+    name: org.apache.camel.ExternalRedeliveries
+    help: External Redeliveries
+    labels:
+        context: $1
+        type: context
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>MaxProcessingTime'
+    name: org.apache.camel.MaxProcessingTime
+    help: Maximum Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>MeanProcessingTime'
+    name: org.apache.camel.MeanProcessingTime
+    help: Mean Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>MinProcessingTime'
+    name: org.apache.camel.MinProcessingTime
+    help: Minimum Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>LastProcessingTime'
+    name: org.apache.camel.LastProcessingTime
+    help: Last Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>DeltaProcessingTime'
+    name: org.apache.camel.DeltaProcessingTime
+    help: Delta Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>Redeliveries'
+    name: org.apache.camel.Redeliveries
+    help: Redeliveries
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>TotalProcessingTime'
+    name: org.apache.camel.TotalProcessingTime
+    help: Total Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=consumers, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+
+
+# Route level
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesCompleted'
+    name: org.apache.camel.ExchangesCompleted
+    help: Exchanges Completed
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesFailed'
+    name: org.apache.camel.ExchangesFailed
+    help: Exchanges Failed
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesInflight'
+    name: org.apache.camel.ExchangesInflight
+    help: Exchanges Inflight
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>FailuresHandled'
+    name: org.apache.camel.FailuresHandled
+    help: Failures Handled
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExternalRedeliveries'
+    name: org.apache.camel.ExternalRedeliveries
+    help: External Redeliveries
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>MaxProcessingTime'
+    name: org.apache.camel.MaxProcessingTime
+    help: Maximum Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>MeanProcessingTime'
+    name: org.apache.camel.MeanProcessingTime
+    help: Mean Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>MinProcessingTime'
+    name: org.apache.camel.MinProcessingTime
+    help: Minimum Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>LastProcessingTime'
+    name: org.apache.camel.LastProcessingTime
+    help: Last Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>DeltaProcessingTime'
+    name: org.apache.camel.DeltaProcessingTime
+    help: Delta Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>Redeliveries'
+    name: org.apache.camel.Redeliveries
+    help: Redeliveries
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>TotalProcessingTime'
+    name: org.apache.camel.TotalProcessingTime
+    help: Total Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+
+# Processor level
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesCompleted'
+    name: org.apache.camel.ExchangesCompleted
+    help: Exchanges Completed
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesFailed'
+    name: org.apache.camel.ExchangesFailed
+    help: Exchanges Failed
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesInflight'
+    name: org.apache.camel.ExchangesInflight
+    help: Exchanges Inflight
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>FailuresHandled'
+    name: org.apache.camel.FailuresHandled
+    help: Failures Handled
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExternalRedeliveries'
+    name: org.apache.camel.ExternalRedeliveries
+    help: External Redeliveries
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>MaxProcessingTime'
+    name: org.apache.camel.MaxProcessingTime
+    help: Maximum Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>MeanProcessingTime'
+    name: org.apache.camel.MeanProcessingTime
+    help: Mean Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>MinProcessingTime'
+    name: org.apache.camel.MinProcessingTime
+    help: Minimum Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>LastProcessingTime'
+    name: org.apache.camel.LastProcessingTime
+    help: Last Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>DeltaProcessingTime'
+    name: org.apache.camel.DeltaProcessingTime
+    help: Delta Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>Redeliveries'
+    name: org.apache.camel.Redeliveries
+    help: Redeliveries
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>TotalProcessingTime'
+    name: org.apache.camel.TotalProcessingTime
+    help: Total Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: COUNTER
+
+# Consumers
+  - pattern: 'org.apache.camel<context=([^,]+), type=consumers, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        consumer: $2
+        type: consumers
+    type: GAUGE
+
+# Services
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>MaxDuration'
+    name: org.apache.camel.MaxDuration
+    help: Maximum Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>MeanDuration'
+    name: org.apache.camel.MeanDuration
+    help: Mean Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>MinDuration'
+    name: org.apache.camel.MinDuration
+    help: Minimum Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>TotalDuration'
+    name: org.apache.camel.TotalDuration
+    help: Total Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>ThreadsBlocked'
+    name: org.apache.camel.ThreadsBlocked
+    help: Threads Blocked
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>ThreadsInterrupted'
+    name: org.apache.camel.ThreadsInterrupted
+    help: Threads Interrupted
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumLogicalRuntimeFaults'
+    name: org.apache.cxf.NumLogicalRuntimeFaults
+    help: Number of logical runtime faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumLogicalRuntimeFaults'
+    name: org.apache.cxf.NumLogicalRuntimeFaults
+    help: Number of logical runtime faults
+    type: GAUGE
+    labels:
+       bus.id: $1
+       type: $2
+       service: $3
+       port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>AvgResponseTime'
+    name: org.apache.cxf.AvgResponseTime
+    help: Average Response Time
+    type: GAUGE
+    labels:
+       bus.id: $1
+       type: $2
+       service: $3
+       port: $4
+       operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>AvgResponseTime'
+    name: org.apache.cxf.AvgResponseTime
+    help: Average Response Time
+    type: GAUGE
+    labels:
+          bus.id: $1
+          type: $2
+          service: $3
+          port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumInvocations'
+    name: org.apache.cxf.NumInvocations
+    help: Number of invocations
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumInvocations'
+    name: org.apache.cxf.NumInvocations
+    help: Number of invocations
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>MaxResponseTime'
+    name: org.apache.cxf.MaxResponseTime
+    help: Maximum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>MaxResponseTime'
+    name: org.apache.cxf.MaxResponseTime
+    help: Maximum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>MinResponseTime'
+    name: org.apache.cxf.MinResponseTime
+    help: Minimum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>MinResponseTime'
+    name: org.apache.cxf.MinResponseTime
+    help: Minimum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>TotalHandlingTime'
+    name: org.apache.cxf.TotalHandlingTime
+    help: Total Handling Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>TotalHandlingTime'
+    name: org.apache.cxf.TotalHandlingTime
+    help: Total Handling Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumRuntimeFaults'
+    name: org.apache.cxf.NumRuntimeFaults
+    help: Number of runtime faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumRuntimeFaults'
+    name: org.apache.cxf.NumRuntimeFaults
+    help: Number of runtime faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumUnCheckedApplicationFaults'
+    name: org.apache.cxf.NumUnCheckedApplicationFaults
+    help: Number of unchecked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumUnCheckedApplicationFaults'
+    name: org.apache.cxf.NumUnCheckedApplicationFaults
+    help: Number of unchecked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumCheckedApplicationFaults'
+    name: org.apache.cxf.NumCheckedApplicationFaults
+    help: Number of checked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumCheckedApplicationFaults'
+    name: org.apache.cxf.NumCheckedApplicationFaults
+    help: Number of checked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
diff --git a/blocks/jmx_exporter/fp-files/prometheus-opts b/blocks/jmx_exporter/fp-files/prometheus-opts
new file mode 100644
index 0000000..3c43968
--- /dev/null
+++ b/blocks/jmx_exporter/fp-files/prometheus-opts
@@ -0,0 +1,23 @@
+#!/bin/sh
+# Scripted for getting Prometheus options
+# meant to be evaluated (not to be sourced)
+
+# Exit if switched off
+if [ -n "${AB_PROMETHEUS_OFF:-}" ] && [ "${AB_PROMETHEUS_OFF}" != "false" ]; then
+  exit 0
+fi
+
+# Global switch, turning of all agents
+if [ -n "${AB_OFF:-}" ] && [ "${AB_OFF}" != "false" ]; then
+  exit 0
+fi
+
+port=${AB_PROMETHEUS_PORT:-9779}
+config=${AB_PROMETHEUS_CONFIG:-/opt/prometheus/prometheus-config.yml}
+if [ -n "${AB_PROMETHEUS_HOST:-}" ]; then
+  hostPort="${AB_PROMETHEUS_HOST}:$port"
+else
+  hostPort="$port"
+fi
+
+echo "-javaagent:/opt/prometheus/jmx_prometheus_javaagent.jar=${hostPort}:$config"
diff --git a/blocks/jmx_exporter/install.dck b/blocks/jmx_exporter/install.dck
new file mode 100644
index 0000000..21ae689
--- /dev/null
+++ b/blocks/jmx_exporter/install.dck
@@ -0,0 +1,20 @@
+{{
+  var destPath = fp.blockOpts.dest || "/opt/prometheus/prometheus-opts";
+  var globalVersions = fp.version || {};
+  var jmxExporterVersion =  fp.blockOpts.version || globalVersions.jmx_exporter;
+  var jmxExporterArtifact = fp.blockOpts.jmxExporterArtifact || "jmx_prometheus_javaagent";
+  var mavenRepo = fp.blockOpts.mavenRepo || "http://central.maven.org/maven2";
+  var userGroupMode = fp.blockOpts.userGroupMode;
+}}# Prometheus JMX exporter agent
+RUN mkdir -p /opt/prometheus/etc \
+ && curl {{= mavenRepo }}/io/prometheus/jmx/{{= jmxExporterArtifact}}/{{= jmxExporterVersion }}/{{= jmxExporterArtifact}}-{{= jmxExporterVersion }}.jar \
+          -o /opt/prometheus/jmx_prometheus_javaagent.jar
+ADD prometheus-opts {{= destPath }}
+ADD prometheus-config.yml /opt/prometheus/prometheus-config.yml
+RUN chmod 444 /opt/prometheus/jmx_prometheus_javaagent.jar \
+ && chmod 444 /opt/prometheus/prometheus-config.yml \
+ && chmod 755 {{= destPath }} \
+ && chmod 775 /opt/prometheus/etc \
+ && chgrp root /opt/prometheus/etc
+
+EXPOSE 9779
diff --git a/blocks/jmx_exporter/readme.md b/blocks/jmx_exporter/readme.md
new file mode 100644
index 0000000..f736fa3
--- /dev/null
+++ b/blocks/jmx_exporter/readme.md
@@ -0,0 +1,6 @@
+#### jmx_exporter Configuration
+
+* **AB_OFF** and **AB_PROMETHEUS_OFF**: If set to any value except 'false', disable Prometheus export
+* **AB_PROMETHEUS_PORT** : Port to expose Prometheus (default: 9779)
+* **AB_PROMETHEUS_HOST** : Host address to listen on for exporting Prometheus metrics. Otherwise the exporter listens on any IP
+* **AB_PROMETHEUS_CONFIG** : Path to the Prometheus configuration file (default: `/opt/prometheus/prometheus-config.yml`
diff --git a/blocks/jolokia/fp-files/jolokia-opts b/blocks/jolokia/fp-files/jolokia-opts
new file mode 100755
index 0000000..1aa273e
--- /dev/null
+++ b/blocks/jolokia/fp-files/jolokia-opts
@@ -0,0 +1,103 @@
+#!/bin/sh
+
+
+# Exit if switched off
+if [ -n "${AB_JOLOKIA_OFF:-}" ] && [ "${AB_JOLOKIA_OFF}" != "false" ]; then
+  exit 0
+fi
+
+# Global switch, turning of all agents
+if [ -n "${AB_OFF:-}" ] && [ "${AB_OFF}" != "false" ]; then
+  exit 0
+fi
+
+# Check whether a given config is contained in AB_JOLOKIA_OPTS
+is_in_jolokia_opts() {
+  local prop=$1
+  if [ -n "${AB_JOLOKIA_OPTS:-}" ] && [ "${AB_JOLOKIA_OPTS}" != "${AB_JOLOKIA_OPTS/${prop}/}" ]; then
+     echo "yes"
+  else
+     echo "no"
+  fi
+}
+
+get_jolokia_properties() {
+
+  echo "host=${AB_JOLOKIA_HOST:-*}"
+  echo "port=${AB_JOLOKIA_PORT:-8778}"
+  echo "discoveryEnabled=${AB_JOLOKIA_DISCOVERY_ENABLED:-false}"
+
+  if [ -n "${AB_JOLOKIA_PASSWORD:-}" ]; then
+     echo "user=${AB_JOLOKIA_USER:-jolokia}"
+     echo "password=${AB_JOLOKIA_PASSWORD}"
+  fi
+  if [ -n "${AB_JOLOKIA_HTTPS:-}" ]; then
+     echo "protocol=https"
+     https_used=1
+  fi
+
+  # Integration with OpenShift client cert auth is enabled
+  # by default if not explicitly turned off by setting to 'false'
+  if [ "${AB_JOLOKIA_AUTH_OPENSHIFT:-}" != "false" ] && [ -f "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt" ]; then
+     echo "useSslClientAuthentication=true"
+     echo "extraClientCheck=true"
+
+     # Check if the 'protocol' property has already been set to 'https'
+     # If not, then defaults to using HTTPS
+     if [ -z ${https_used+x} ]; then
+       echo "protocol=https"
+     fi
+     if [ $(is_in_jolokia_opts "caCert") != "yes" ]; then
+        echo "caCert=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
+     fi
+
+     if [ $(is_in_jolokia_opts "clientPrincipal") != "yes" ]; then
+        if [  "${AB_JOLOKIA_AUTH_OPENSHIFT}" != "${AB_JOLOKIA_AUTH_OPENSHIFT/=/}" ]; then
+           # Supposed to contain a principal name to check
+           echo "clientPrincipal=$(echo ${AB_JOLOKIA_AUTH_OPENSHIFT} | sed -e 's/ /\\\\ /g')"
+        else
+           echo "clientPrincipal=cn=system:master-proxy"
+        fi
+     fi
+  fi
+
+  # Add extra opts
+  if [ -n "${AB_JOLOKIA_OPTS:-}" ]; then
+     echo "${AB_JOLOKIA_OPTS}" | tr "," "\n"
+  fi
+
+}
+
+write_jolokia_properties() {
+  local jolokia_property_file="$1"
+
+  # Setup Jolokia to accept basic auth, using a randomly generated password that is stored
+  # in the container in the ${DEPLOYMENTS_DIR}/jolokia.pw file.
+  if [ "${AB_JOLOKIA_PASSWORD_RANDOM:-}" == "true" ]; then
+    pw_file="/opt/jolokia/etc/jolokia.pw"
+    if [ -f "${pw_file}" ] ; then
+      AB_JOLOKIA_PASSWORD=$(cat "${pw_file}")
+    else
+      AB_JOLOKIA_PASSWORD=$(tr -cd '[:alnum:]' < /dev/urandom | fold -w30 | head -n1)
+      touch "${pw_file}"
+      chmod 660 "${pw_file}"
+      cat > "${pw_file}" <<EOF
+$AB_JOLOKIA_PASSWORD
+EOF
+    fi
+    export AB_JOLOKIA_PASSWORD
+  fi
+
+  touch "${jolokia_property_file}"
+  chmod 660 "${jolokia_property_file}"
+  cat > "${jolokia_property_file}" <<EOF
+$(get_jolokia_properties)
+EOF
+
+}
+
+if [ -z "${AB_JOLOKIA_CONFIG:-}" ]; then
+  AB_JOLOKIA_CONFIG="/opt/jolokia/etc/jolokia.properties"
+  write_jolokia_properties "$AB_JOLOKIA_CONFIG"
+fi
+echo "-javaagent:/opt/jolokia/jolokia.jar=config=${AB_JOLOKIA_CONFIG}"
diff --git a/blocks/jolokia/install.dck b/blocks/jolokia/install.dck
new file mode 100644
index 0000000..4b0b2a0
--- /dev/null
+++ b/blocks/jolokia/install.dck
@@ -0,0 +1,19 @@
+{{
+  var destPath = fp.blockOpts.dest || "/opt/jolokia/jolokia-options";
+  var globalVersions = fp.version || {};
+  var jolokiaVersion =  fp.blockOpts.version || globalVersions.jolokia || "1.5.0";
+  var jolokiaArtifact = jolokiaVersion.match(/^2.*$/) ? "jolokia-agent-jvm" : "jolokia-jvm";
+  var mavenRepo = fp.blockOpts.mavenRepo || "http://central.maven.org/maven2";
+  var userGroupMode = fp.blockOpts.userGroupMode;
+}}# Jolokia agent
+RUN mkdir -p /opt/jolokia/etc \
+ && curl {{= mavenRepo }}/org/jolokia/{{= jolokiaArtifact }}/{{= jolokiaVersion }}/{{= jolokiaArtifact }}-{{= jolokiaVersion }}-agent.jar \
+         -o /opt/jolokia/jolokia.jar
+ADD jolokia-opts {{= destPath }}
+RUN chmod 444 /opt/jolokia/jolokia.jar \
+ && chmod 755 {{= destPath}} \{{? userGroupMode }}
+ && chmod 775 /opt/jolokia/etc \
+ && chgrp {{= userGroupMode }} /opt/jolokia/etc{{??}}
+ && chmod 755 /opt/jolokia/etc{{?}}
+
+EXPOSE 8778
diff --git a/blocks/jolokia/readme.md b/blocks/jolokia/readme.md
new file mode 100644
index 0000000..8067a0f
--- /dev/null
+++ b/blocks/jolokia/readme.md
@@ -0,0 +1,25 @@
+#### Jolokia Configuration
+
+* **AB_JOLOKIA_OFF** : If set disables activation of Jolokia (i.e. echos an empty value). By default, Jolokia is enabled.
+* **AB_JOLOKIA_CONFIG** : If set uses this file (including path) as Jolokia JVM agent properties (as described
+  in Jolokia's [reference manual](http://www.jolokia.org/reference/html/agents.html#agents-jvm)). If not set,
+  the `/opt/jolokia/etc/jolokia.properties` will be created using the settings as defined in this document, otherwise
+  the reset of the settings in this document are ignored.
+* **AB_JOLOKIA_HOST** : Host address to bind to (Default: `0.0.0.0`)
+* **AB_JOLOKIA_PORT** : Port to use (Default: `8778`)
+* **AB_JOLOKIA_USER** : User for basic authentication. Defaults to 'jolokia'
+* **AB_JOLOKIA_PASSWORD** : Password for basic authentication. By default authentication is switched off.
+* **AB_JOLOKIA_PASSWORD_RANDOM** : Should a random AB_JOLOKIA_PASSWORD be generated? Generated value will be written to `/opt/jolokia/etc/jolokia.pw`
+* **AB_JOLOKIA_HTTPS** : Switch on secure communication with https. By default self signed server certificates are generated
+  if no `serverCert` configuration is given in `AB_JOLOKIA_OPTS`
+* **AB_JOLOKIA_ID** : Agent ID to use (`$HOSTNAME` by default, which is the container id)
+* **AB_JOLOKIA_DISCOVERY_ENABLED** : Enable Jolokia discovery.  Defaults to false.
+* **AB_JOLOKIA_OPTS**  : Additional options to be appended to the agent configuration. They should be given in the format
+  "key=value,key=value,..."
+
+Some options for integration in various environments:
+
+* **AB_JOLOKIA_AUTH_OPENSHIFT** : Switch on client authentication for OpenShift TSL communication. The value of this
+  parameter can be a relative distinguished name which must be contained in a presented client certificate. Enabling this
+  parameter will automatically switch Jolokia into https communication mode. The default CA cert is set to
+  `/var/run/secrets/kubernetes.io/serviceaccount/ca.crt`
diff --git a/fish-pepper.yml b/fish-pepper.yml
index 365ce9b..5159552 100644
--- a/fish-pepper.yml
+++ b/fish-pepper.yml
@@ -2,7 +2,6 @@
 
 # Versions of support libs
 version:
-  agentBond: "1.2.0"
   jolokia: "1.6.2"
   jmxExporter: "0.3.1"
 
@@ -20,7 +19,3 @@ blocks:
   - type: "git"
     url: "https://github.com/fabric8io-images/run-java-sh.git"
     tag: v1.3.4
-  # agent bond for export Jolokia and jmx_exporter data
-  - type: "git"
-    url: "https://github.com/fabric8io/agent-bond.git"
-    tag: v1.2.0
diff --git a/images.yml b/images.yml
index b5454ec..54f0aee 100644
--- a/images.yml
+++ b/images.yml
@@ -5,7 +5,7 @@ fish-pepper:
     - version
     - type
   name: "fabric8/java"
-  build: "1.6.4"
+  build: "2.0.0"
 
 # Used for escaping in 'agent-bond-opts' where the same delimiters are used
 abSepOpen: "{{"
@@ -14,7 +14,6 @@ abSepClosed: "}}"
 config:
   base:
     default:
-      agent: "agent-bond"
       baseDir: "/deployments"
     alpine:
       from: "alpine:3.10"
@@ -62,9 +61,5 @@ config:
   type:
     jre:
       description: "Java Runtime Environment (JRE)"
-      # Ignore JREs for JBoss image since there are no JRE variants for them available
-      fish-pepper:
-        ignore-for:
-           - [ "jboss" ]
     jdk:
       description: "Java Development Kit (JDK)"
diff --git a/images/alpine/openjdk11/jdk/Dockerfile b/images/alpine/openjdk11/jdk/Dockerfile
index 27c4b93..4236f34 100644
--- a/images/alpine/openjdk11/jdk/Dockerfile
+++ b/images/alpine/openjdk11/jdk/Dockerfile
@@ -17,20 +17,39 @@ RUN apk add --update \
  && rm /var/cache/apk/* \
  && echo "securerandom.source=file:/dev/urandom" >> /usr/lib/jvm/default-jvm/jre/lib/security/java.security
 
-# Agent bond including Jolokia and jmx_exporter
-ADD agent-bond-opts /opt/run-java-options
-RUN mkdir -p /opt/agent-bond \
- && curl http://central.maven.org/maven2/io/fabric8/agent-bond-agent/1.2.0/agent-bond-agent-1.2.0.jar \
-          -o /opt/agent-bond/agent-bond.jar \
- && chmod 444 /opt/agent-bond/agent-bond.jar \
- && chmod 755 /opt/run-java-options
-ADD jmx_exporter_config.yml /opt/agent-bond/
-EXPOSE 8778 9779
+# Prometheus JMX exporter agent
+RUN mkdir -p /opt/prometheus/etc \
+ && curl http://central.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/undefined/jmx_prometheus_javaagent-undefined.jar \
+          -o /opt/prometheus/jmx_prometheus_javaagent.jar
+ADD prometheus-opts /opt/prometheus/prometheus-opts
+ADD prometheus-config.yml /opt/prometheus/prometheus-config.yml
+RUN chmod 444 /opt/prometheus/jmx_prometheus_javaagent.jar \
+ && chmod 444 /opt/prometheus/prometheus-config.yml \
+ && chmod 755 /opt/prometheus/prometheus-opts \
+ && chmod 775 /opt/prometheus/etc \
+ && chgrp root /opt/prometheus/etc
+
+EXPOSE 9779
+
+
+# Jolokia agent
+RUN mkdir -p /opt/jolokia/etc \
+ && curl http://central.maven.org/maven2/org/jolokia/jolokia-jvm/1.6.2/jolokia-jvm-1.6.2-agent.jar \
+         -o /opt/jolokia/jolokia.jar
+ADD jolokia-opts /opt/jolokia/jolokia-opts
+RUN chmod 444 /opt/jolokia/jolokia.jar \
+ && chmod 755 /opt/jolokia/jolokia-opts \
+ && chmod 775 /opt/jolokia/etc \
+ && chgrp root /opt/jolokia/etc
+
+EXPOSE 8778
+
 
 # Add run script as /deployments/run-java.sh and make it executable
 COPY run-java.sh /deployments/
 RUN chmod 755 /deployments/run-java.sh
 
+COPY run-java-options /opt
 
 
 
diff --git a/images/alpine/openjdk11/jdk/README.md b/images/alpine/openjdk11/jdk/README.md
index a62cc70..1e9fcd9 100644
--- a/images/alpine/openjdk11/jdk/README.md
+++ b/images/alpine/openjdk11/jdk/README.md
@@ -1,72 +1,12 @@
 ## Fabric8 Java Base Image OpenJDK 11 (JDK)
 
-
-
 This image is based on Alpine and provides OpenJDK 11 (JDK)
 
 It includes:
 
-
-* An [Agent Bond](https://github.com/fabric8io/agent-bond) agent with [Jolokia](http://www.jolokia.org) and Prometheus' [jmx_exporter](https://github.com/prometheus/jmx_exporter). The agent is installed as `/opt/agent-bond/agent-bond.jar`. See below for configuration options.
-
-
 * A startup script [`/deployments/run-java.sh`](#startup-script-run-javash) for starting up Java applications.
-
-### Agent Bond
-
-In order to enable Jolokia for your application you should use this image as a base image (via `FROM`) and use the output of `agent-bond-opts` in your startup scripts to include it in for the Java startup options.
-
-For example, the following snippet can be added to a script starting up your Java application
-
-    # ...
-    export JAVA_OPTIONS="$JAVA_OPTIONS $(agent-bond-opts)"
-    # .... use JAVA_OPTIONS when starting your app, e.g. as Tomcat does
-
-The following versions and defaults are used:
-
-* [Jolokia](http://www.jolokia.org) : version **1.6.2** and port **8778**
-* [jmx_exporter](https://github.com/prometheus/jmx_exporter): version **0.3.1** and port **9779**
-
-You can influence the behaviour of `agent-bond-opts` by setting various environment variables:
-
-### Agent-Bond Options
-
-Agent bond itself can be influenced with the following environment variables: 
-
-* **AB_OFF** : If set disables activation of agent-bond (i.e. echos an empty value). By default, agent-bond is enabled.
-* **AB_ENABLED** : Comma separated list of sub-agents enabled. Currently allowed values are `jolokia` and `jmx_exporter`. 
-  By default both are enabled.
-
-
-#### Jolokia configuration
-
-* **AB_JOLOKIA_CONFIG** : If set uses this file (including path) as Jolokia JVM agent properties (as described 
-  in Jolokia's [reference manual](http://www.jolokia.org/reference/html/agents.html#agents-jvm)).
-  By default this is `/opt/jolokia/jolokia.properties`.
-* **AB_JOLOKIA_HOST** : Host address to bind to (Default: `0.0.0.0`)
-* **AB_JOLOKIA_PORT** : Port to use (Default: `8778`)
-* **AB_JOLOKIA_USER** : User for authentication. By default authentication is switched off.
-* **AB_JOLOKIA_HTTPS** : Switch on secure communication with https. By default self signed server certificates are generated
-  if no `serverCert` configuration is given in `AB_JOLOKIA_OPTS`
-* **AB_JOLOKIA_PASSWORD** : Password for authentication. By default authentication is switched off.
-* **AB_JOLOKIA_ID** : Agent ID to use (`$HOSTNAME` by default, which is the container id)
-* **AB_JOLOKIA_OPTS**  : Additional options to be appended to the agent opts. They should be given in the format 
-  "key=value,key=value,..."
-
-Some options for integration in various environments:
-
-* **AB_JOLOKIA_AUTH_OPENSHIFT** : Switch on client authentication for OpenShift TLS communication. The value of this 
-  parameter can be a relative distinguished name which must be contained in a presented client certificate. Enabling this
-  parameter will automatically switch Jolokia into https communication mode. The default CA cert is set to 
-  `/var/run/secrets/kubernetes.io/serviceaccount/ca.crt` 
-  
-#### jmx_exporter configuration
-
-* **AB_JMX_EXPORTER_OPTS** : Configuration to use for `jmx_exporter` (in the format `<port>:<path to config>`)
-* **AB_JMX_EXPORTER_PORT** : Port to use for the JMX Exporter. Default: `9779`
-* **AB_JMX_EXPORTER_CONFIG** : Path to configuration to use for `jmx_exporter`: Default: `/opt/agent-bond/jmx_exporter_config.json`
-
-
+* [Jolokia](http://www.jolokia.org) agent installed in `/opt/jolokia`
+* Prometheus [jmx_exporter](https://github.com/prometheus/jmx_exporter) agent installed in `/opt/jmx_exporter`.
 
 ### Startup Script run-java.sh
 
@@ -177,8 +117,55 @@ mvn clean install
 ```
 
 
+### Monitoring Agents
+
+In order to enable Jolokia and Prometheus exporter for your application you should use this image as a base image (via `FROM`) and use the output of `jolokia-opts` and `prometheus-opts` in your startup scripts to include it in for the Java startup options. You can also just use the provided startup script `/opt/run-java.sh` which does this automatically.
+
+For example, the following snippet can be added to a script starting up your Java application
+
+    # ...
+    export JAVA_OPTIONS="$JAVA_OPTIONS $(/opt/jolokia/jolokia-opts) $(/opt/prometheus/prometheus-opts)"
+    # .... use JAVA_OPTIONS when starting your app, e.g. as Tomcat does
+
+The following versions and defaults are used:
+
+* [Jolokia](http://www.jolokia.org) : version **1.6.2** and port **8778**
+* [jmx_exporter](https://github.com/prometheus/jmx_exporter): version **0.3.1** and port **9779**
+
+You can influence the behaviour of these config scripts by setting various environment variables.
+
+#### Jolokia Configuration
+
+* **AB_JOLOKIA_OFF** : If set disables activation of Jolokia (i.e. echos an empty value). By default, Jolokia is enabled.
+* **AB_JOLOKIA_CONFIG** : If set uses this file (including path) as Jolokia JVM agent properties (as described
+  in Jolokia's [reference manual](http://www.jolokia.org/reference/html/agents.html#agents-jvm)). If not set,
+  the `/opt/jolokia/etc/jolokia.properties` will be created using the settings as defined in this document, otherwise
+  the reset of the settings in this document are ignored.
+* **AB_JOLOKIA_HOST** : Host address to bind to (Default: `0.0.0.0`)
+* **AB_JOLOKIA_PORT** : Port to use (Default: `8778`)
+* **AB_JOLOKIA_USER** : User for basic authentication. Defaults to 'jolokia'
+* **AB_JOLOKIA_PASSWORD** : Password for basic authentication. By default authentication is switched off.
+* **AB_JOLOKIA_PASSWORD_RANDOM** : Should a random AB_JOLOKIA_PASSWORD be generated? Generated value will be written to `/opt/jolokia/etc/jolokia.pw`
+* **AB_JOLOKIA_HTTPS** : Switch on secure communication with https. By default self signed server certificates are generated
+  if no `serverCert` configuration is given in `AB_JOLOKIA_OPTS`
+* **AB_JOLOKIA_ID** : Agent ID to use (`$HOSTNAME` by default, which is the container id)
+* **AB_JOLOKIA_DISCOVERY_ENABLED** : Enable Jolokia discovery.  Defaults to false.
+* **AB_JOLOKIA_OPTS**  : Additional options to be appended to the agent configuration. They should be given in the format
+  "key=value,key=value,..."
+
+Some options for integration in various environments:
+
+* **AB_JOLOKIA_AUTH_OPENSHIFT** : Switch on client authentication for OpenShift TSL communication. The value of this
+  parameter can be a relative distinguished name which must be contained in a presented client certificate. Enabling this
+  parameter will automatically switch Jolokia into https communication mode. The default CA cert is set to
+  `/var/run/secrets/kubernetes.io/serviceaccount/ca.crt`
+
+
+undefined
+
 ### Versions:
 
 * Base-Image: **Alpine 3.10**
 * Java: **OpenJDK 11 11** (Java Development Kit (JDK))
-* Agent-Bond: **1.2.0** (Jolokia 1.6.2, jmx_exporter 0.3.1)
+* Jolokia: **1.6.2**
+* jmx_exporter: **undefined**
diff --git a/images/alpine/openjdk11/jdk/agent-bond-opts b/images/alpine/openjdk11/jdk/agent-bond-opts
deleted file mode 100644
index 280313b..0000000
--- a/images/alpine/openjdk11/jdk/agent-bond-opts
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/bin/sh
-
-# Parse options
-while [ $# -gt 0 ]
-do
-key="$1"
-case ${key} in
-    # Escape for scripts which eval the output of this script
-    -e|--escape)
-    escape_sep=1
-    ;;
-esac
-shift
-done
-
-# Check whether a given config is contained in AB_JOLOKIA_OPTS
-is_in_jolokia_opts() {
-  local prop=$1
-  if [ -n "${AB_JOLOKIA_OPTS:-}" ] && [ "${AB_JOLOKIA_OPTS}" != "${AB_JOLOKIA_OPTS/${prop}/}" ]; then
-     echo "yes"
-  else
-     echo "no"
-  fi
-}
-
-dir=${AB_DIR:-/opt/agent-bond}
-sep="="
-
-# Options separators defined to avoid clash with fish-pepper templating
-ab_open_del="{""{"
-ab_close_del="}""}"
-if [ -n "${escape_sep:-}" ]; then
-  ab_open_del='\{\{'
-  ab_close_del='\}\}'
-fi
-
-if [ -z "${AB_OFF:-}" ]; then
-   opts="-javaagent:$dir/agent-bond.jar"
-   config="${AB_CONFIG:-$dir/agent-bond.properties}"
-   if [ -f "$config" ]; then
-      # Configuration takes precedence
-      opts="${opts}${sep}config=${config}"
-      sep=","
-   fi
-   if [ -z "${AB_ENABLED:-}" ] || [ "${AB_ENABLED}" != "${AB_ENABLED/jolokia/}" ]; then
-     # Direct options only if no configuration is found
-     jsep=""
-     jolokia_opts=""
-     if [ -n "${AB_JOLOKIA_CONFIG:-}" ] && [ -f "${AB_JOLOKIA_CONFIG}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}config=${AB_JOLOKIA_CONFIG}"
-        jsep=","
-        grep -q -e '^host' ${AB_JOLOKIA_CONFIG} && host_in_config=1
-     fi
-     if [ -z "${AB_JOLOKIA_HOST:-}" ] && [ -z "${host_in_config:-}" ]; then
-        AB_JOLOKIA_HOST='0.0.0.0'
-     fi
-     if [ -n "${AB_JOLOKIA_HOST:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}host=${AB_JOLOKIA_HOST}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_PORT:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}port=${AB_JOLOKIA_PORT}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_USER:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}user=${AB_JOLOKIA_USER}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_PASSWORD:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}password=${AB_JOLOKIA_PASSWORD}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_HTTPS:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}protocol=https"
-        https_used=1
-        jsep=","
-     fi
-     # Integration with OpenShift client cert auth
-     if [ -n "${AB_JOLOKIA_AUTH_OPENSHIFT:-}" ]; then
-        auth_opts="useSslClientAuthentication=true,extraClientCheck=true"
-        if [ -z "${https_used+x}" ]; then
-          auth_opts="${auth_opts},protocol=https"
-        fi
-        if [ $(is_in_jolokia_opts "caCert") != "yes" ]; then
-           auth_opts="${auth_opts},caCert=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
-        fi
-        if [ $(is_in_jolokia_opts "clientPrincipal") != "yes" ]; then
-           if [  "${AB_JOLOKIA_AUTH_OPENSHIFT}" != "${AB_JOLOKIA_AUTH_OPENSHIFT/=/}" ]; then
-              # Supposed to contain a principal name to check
-              auth_opts="${auth_opts},clientPrincipal=$(echo ${AB_JOLOKIA_AUTH_OPENSHIFT} | sed -e 's/ /\\\\ /g')"
-           else
-              auth_opts="${auth_opts},clientPrincipal=cn=system:master-proxy"
-           fi
-        fi
-        jolokia_opts="${jolokia_opts}${jsep}${auth_opts}"
-        jsep=","
-     fi
-     # Add extra opts to the end
-     if [ -n "${AB_JOLOKIA_OPTS:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}${AB_JOLOKIA_OPTS}"
-        jsep=","
-     fi
-
-     opts="${opts}${sep}jolokia${ab_open_del}${jolokia_opts}${ab_close_del}"
-     sep=","
-   fi
-   if [ -z "${AB_ENABLED:-}" ] || [ "${AB_ENABLED}" != "${AB_ENABLED/jmx_exporter/}" ]; then
-     je_opts=""
-     jsep=""
-     if [ -n "${AB_JMX_EXPORTER_OPTS:-}" ]; then
-        opts="${opts}${sep}jmx_exporter${ab_open_del}${AB_JMX_EXPORTER_OPTS}${ab_close_del}"
-        sep=","
-     else
-        port=${AB_JMX_EXPORTER_PORT:-9779}
-        config=${AB_JMX_EXPORTER_CONFIG:-/opt/agent-bond/jmx_exporter_config.yml}
-        opts="${opts}${sep}jmx_exporter${ab_open_del}${port}:${config}${ab_close_del}"
-        sep=","
-     fi
-   fi
-   if [ "${sep:-}" != '=' ] ; then
-     echo ${opts}
-   fi
-fi
diff --git a/images/alpine/openjdk11/jdk/jmx_exporter_config.yml b/images/alpine/openjdk11/jdk/jmx_exporter_config.yml
deleted file mode 100644
index 620cd4a..0000000
--- a/images/alpine/openjdk11/jdk/jmx_exporter_config.yml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-lowercaseOutputName: true
-lowercaseOutputLabelNames: true
-whitelistObjectNames:
-  - 'org.apache.camel:*'
-rules:
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>((?:Min|Mean|Max|Last|Delta)(?:ProcessingTime)):'
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>(TotalProcessingTime):'
-    type: COUNTER
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>(ExchangesInflight|LastProcessingTime):'
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>((?:Exchanges(?:Completed|Failed|Total))|FailuresHandled):'
-    type: COUNTER
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
diff --git a/images/alpine/openjdk11/jdk/jolokia-opts b/images/alpine/openjdk11/jdk/jolokia-opts
new file mode 100644
index 0000000..1aa273e
--- /dev/null
+++ b/images/alpine/openjdk11/jdk/jolokia-opts
@@ -0,0 +1,103 @@
+#!/bin/sh
+
+
+# Exit if switched off
+if [ -n "${AB_JOLOKIA_OFF:-}" ] && [ "${AB_JOLOKIA_OFF}" != "false" ]; then
+  exit 0
+fi
+
+# Global switch, turning of all agents
+if [ -n "${AB_OFF:-}" ] && [ "${AB_OFF}" != "false" ]; then
+  exit 0
+fi
+
+# Check whether a given config is contained in AB_JOLOKIA_OPTS
+is_in_jolokia_opts() {
+  local prop=$1
+  if [ -n "${AB_JOLOKIA_OPTS:-}" ] && [ "${AB_JOLOKIA_OPTS}" != "${AB_JOLOKIA_OPTS/${prop}/}" ]; then
+     echo "yes"
+  else
+     echo "no"
+  fi
+}
+
+get_jolokia_properties() {
+
+  echo "host=${AB_JOLOKIA_HOST:-*}"
+  echo "port=${AB_JOLOKIA_PORT:-8778}"
+  echo "discoveryEnabled=${AB_JOLOKIA_DISCOVERY_ENABLED:-false}"
+
+  if [ -n "${AB_JOLOKIA_PASSWORD:-}" ]; then
+     echo "user=${AB_JOLOKIA_USER:-jolokia}"
+     echo "password=${AB_JOLOKIA_PASSWORD}"
+  fi
+  if [ -n "${AB_JOLOKIA_HTTPS:-}" ]; then
+     echo "protocol=https"
+     https_used=1
+  fi
+
+  # Integration with OpenShift client cert auth is enabled
+  # by default if not explicitly turned off by setting to 'false'
+  if [ "${AB_JOLOKIA_AUTH_OPENSHIFT:-}" != "false" ] && [ -f "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt" ]; then
+     echo "useSslClientAuthentication=true"
+     echo "extraClientCheck=true"
+
+     # Check if the 'protocol' property has already been set to 'https'
+     # If not, then defaults to using HTTPS
+     if [ -z ${https_used+x} ]; then
+       echo "protocol=https"
+     fi
+     if [ $(is_in_jolokia_opts "caCert") != "yes" ]; then
+        echo "caCert=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
+     fi
+
+     if [ $(is_in_jolokia_opts "clientPrincipal") != "yes" ]; then
+        if [  "${AB_JOLOKIA_AUTH_OPENSHIFT}" != "${AB_JOLOKIA_AUTH_OPENSHIFT/=/}" ]; then
+           # Supposed to contain a principal name to check
+           echo "clientPrincipal=$(echo ${AB_JOLOKIA_AUTH_OPENSHIFT} | sed -e 's/ /\\\\ /g')"
+        else
+           echo "clientPrincipal=cn=system:master-proxy"
+        fi
+     fi
+  fi
+
+  # Add extra opts
+  if [ -n "${AB_JOLOKIA_OPTS:-}" ]; then
+     echo "${AB_JOLOKIA_OPTS}" | tr "," "\n"
+  fi
+
+}
+
+write_jolokia_properties() {
+  local jolokia_property_file="$1"
+
+  # Setup Jolokia to accept basic auth, using a randomly generated password that is stored
+  # in the container in the ${DEPLOYMENTS_DIR}/jolokia.pw file.
+  if [ "${AB_JOLOKIA_PASSWORD_RANDOM:-}" == "true" ]; then
+    pw_file="/opt/jolokia/etc/jolokia.pw"
+    if [ -f "${pw_file}" ] ; then
+      AB_JOLOKIA_PASSWORD=$(cat "${pw_file}")
+    else
+      AB_JOLOKIA_PASSWORD=$(tr -cd '[:alnum:]' < /dev/urandom | fold -w30 | head -n1)
+      touch "${pw_file}"
+      chmod 660 "${pw_file}"
+      cat > "${pw_file}" <<EOF
+$AB_JOLOKIA_PASSWORD
+EOF
+    fi
+    export AB_JOLOKIA_PASSWORD
+  fi
+
+  touch "${jolokia_property_file}"
+  chmod 660 "${jolokia_property_file}"
+  cat > "${jolokia_property_file}" <<EOF
+$(get_jolokia_properties)
+EOF
+
+}
+
+if [ -z "${AB_JOLOKIA_CONFIG:-}" ]; then
+  AB_JOLOKIA_CONFIG="/opt/jolokia/etc/jolokia.properties"
+  write_jolokia_properties "$AB_JOLOKIA_CONFIG"
+fi
+echo "-javaagent:/opt/jolokia/jolokia.jar=config=${AB_JOLOKIA_CONFIG}"
diff --git a/images/alpine/openjdk11/jdk/prometheus-config.yml b/images/alpine/openjdk11/jdk/prometheus-config.yml
new file mode 100644
index 0000000..f6eaa2b
--- /dev/null
+++ b/images/alpine/openjdk11/jdk/prometheus-config.yml
@@ -0,0 +1,586 @@
+startDelaySecs: 5
+ssl: false
+blacklistObjectNames: ["java.lang:*"]
+rules:
+# Context level
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesCompleted'
+    name: org.apache.camel.ExchangesCompleted
+    help: Exchanges Completed
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesFailed'
+    name: org.apache.camel.ExchangesFailed
+    help: Exchanges Failed
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesInflight'
+    name: org.apache.camel.ExchangesInflight
+    help: Exchanges Inflight
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>FailuresHandled'
+    name: org.apache.camel.FailuresHandled
+    help: Failures Handled
+    labels:
+        context: $1
+        type: context
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExternalRedeliveries'
+    name: org.apache.camel.ExternalRedeliveries
+    help: External Redeliveries
+    labels:
+        context: $1
+        type: context
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>MaxProcessingTime'
+    name: org.apache.camel.MaxProcessingTime
+    help: Maximum Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>MeanProcessingTime'
+    name: org.apache.camel.MeanProcessingTime
+    help: Mean Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>MinProcessingTime'
+    name: org.apache.camel.MinProcessingTime
+    help: Minimum Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>LastProcessingTime'
+    name: org.apache.camel.LastProcessingTime
+    help: Last Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>DeltaProcessingTime'
+    name: org.apache.camel.DeltaProcessingTime
+    help: Delta Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>Redeliveries'
+    name: org.apache.camel.Redeliveries
+    help: Redeliveries
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>TotalProcessingTime'
+    name: org.apache.camel.TotalProcessingTime
+    help: Total Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=consumers, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+
+
+# Route level
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesCompleted'
+    name: org.apache.camel.ExchangesCompleted
+    help: Exchanges Completed
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesFailed'
+    name: org.apache.camel.ExchangesFailed
+    help: Exchanges Failed
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesInflight'
+    name: org.apache.camel.ExchangesInflight
+    help: Exchanges Inflight
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>FailuresHandled'
+    name: org.apache.camel.FailuresHandled
+    help: Failures Handled
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExternalRedeliveries'
+    name: org.apache.camel.ExternalRedeliveries
+    help: External Redeliveries
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>MaxProcessingTime'
+    name: org.apache.camel.MaxProcessingTime
+    help: Maximum Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>MeanProcessingTime'
+    name: org.apache.camel.MeanProcessingTime
+    help: Mean Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>MinProcessingTime'
+    name: org.apache.camel.MinProcessingTime
+    help: Minimum Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>LastProcessingTime'
+    name: org.apache.camel.LastProcessingTime
+    help: Last Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>DeltaProcessingTime'
+    name: org.apache.camel.DeltaProcessingTime
+    help: Delta Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>Redeliveries'
+    name: org.apache.camel.Redeliveries
+    help: Redeliveries
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>TotalProcessingTime'
+    name: org.apache.camel.TotalProcessingTime
+    help: Total Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+
+# Processor level
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesCompleted'
+    name: org.apache.camel.ExchangesCompleted
+    help: Exchanges Completed
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesFailed'
+    name: org.apache.camel.ExchangesFailed
+    help: Exchanges Failed
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesInflight'
+    name: org.apache.camel.ExchangesInflight
+    help: Exchanges Inflight
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>FailuresHandled'
+    name: org.apache.camel.FailuresHandled
+    help: Failures Handled
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExternalRedeliveries'
+    name: org.apache.camel.ExternalRedeliveries
+    help: External Redeliveries
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>MaxProcessingTime'
+    name: org.apache.camel.MaxProcessingTime
+    help: Maximum Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>MeanProcessingTime'
+    name: org.apache.camel.MeanProcessingTime
+    help: Mean Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>MinProcessingTime'
+    name: org.apache.camel.MinProcessingTime
+    help: Minimum Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>LastProcessingTime'
+    name: org.apache.camel.LastProcessingTime
+    help: Last Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>DeltaProcessingTime'
+    name: org.apache.camel.DeltaProcessingTime
+    help: Delta Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>Redeliveries'
+    name: org.apache.camel.Redeliveries
+    help: Redeliveries
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>TotalProcessingTime'
+    name: org.apache.camel.TotalProcessingTime
+    help: Total Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: COUNTER
+
+# Consumers
+  - pattern: 'org.apache.camel<context=([^,]+), type=consumers, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        consumer: $2
+        type: consumers
+    type: GAUGE
+
+# Services
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>MaxDuration'
+    name: org.apache.camel.MaxDuration
+    help: Maximum Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>MeanDuration'
+    name: org.apache.camel.MeanDuration
+    help: Mean Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>MinDuration'
+    name: org.apache.camel.MinDuration
+    help: Minimum Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>TotalDuration'
+    name: org.apache.camel.TotalDuration
+    help: Total Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>ThreadsBlocked'
+    name: org.apache.camel.ThreadsBlocked
+    help: Threads Blocked
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>ThreadsInterrupted'
+    name: org.apache.camel.ThreadsInterrupted
+    help: Threads Interrupted
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumLogicalRuntimeFaults'
+    name: org.apache.cxf.NumLogicalRuntimeFaults
+    help: Number of logical runtime faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumLogicalRuntimeFaults'
+    name: org.apache.cxf.NumLogicalRuntimeFaults
+    help: Number of logical runtime faults
+    type: GAUGE
+    labels:
+       bus.id: $1
+       type: $2
+       service: $3
+       port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>AvgResponseTime'
+    name: org.apache.cxf.AvgResponseTime
+    help: Average Response Time
+    type: GAUGE
+    labels:
+       bus.id: $1
+       type: $2
+       service: $3
+       port: $4
+       operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>AvgResponseTime'
+    name: org.apache.cxf.AvgResponseTime
+    help: Average Response Time
+    type: GAUGE
+    labels:
+          bus.id: $1
+          type: $2
+          service: $3
+          port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumInvocations'
+    name: org.apache.cxf.NumInvocations
+    help: Number of invocations
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumInvocations'
+    name: org.apache.cxf.NumInvocations
+    help: Number of invocations
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>MaxResponseTime'
+    name: org.apache.cxf.MaxResponseTime
+    help: Maximum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>MaxResponseTime'
+    name: org.apache.cxf.MaxResponseTime
+    help: Maximum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>MinResponseTime'
+    name: org.apache.cxf.MinResponseTime
+    help: Minimum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>MinResponseTime'
+    name: org.apache.cxf.MinResponseTime
+    help: Minimum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>TotalHandlingTime'
+    name: org.apache.cxf.TotalHandlingTime
+    help: Total Handling Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>TotalHandlingTime'
+    name: org.apache.cxf.TotalHandlingTime
+    help: Total Handling Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumRuntimeFaults'
+    name: org.apache.cxf.NumRuntimeFaults
+    help: Number of runtime faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumRuntimeFaults'
+    name: org.apache.cxf.NumRuntimeFaults
+    help: Number of runtime faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumUnCheckedApplicationFaults'
+    name: org.apache.cxf.NumUnCheckedApplicationFaults
+    help: Number of unchecked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumUnCheckedApplicationFaults'
+    name: org.apache.cxf.NumUnCheckedApplicationFaults
+    help: Number of unchecked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumCheckedApplicationFaults'
+    name: org.apache.cxf.NumCheckedApplicationFaults
+    help: Number of checked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumCheckedApplicationFaults'
+    name: org.apache.cxf.NumCheckedApplicationFaults
+    help: Number of checked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
diff --git a/images/alpine/openjdk11/jdk/prometheus-opts b/images/alpine/openjdk11/jdk/prometheus-opts
new file mode 100644
index 0000000..3c43968
--- /dev/null
+++ b/images/alpine/openjdk11/jdk/prometheus-opts
@@ -0,0 +1,23 @@
+#!/bin/sh
+# Scripted for getting Prometheus options
+# meant to be evaluated (not to be sourced)
+
+# Exit if switched off
+if [ -n "${AB_PROMETHEUS_OFF:-}" ] && [ "${AB_PROMETHEUS_OFF}" != "false" ]; then
+  exit 0
+fi
+
+# Global switch, turning of all agents
+if [ -n "${AB_OFF:-}" ] && [ "${AB_OFF}" != "false" ]; then
+  exit 0
+fi
+
+port=${AB_PROMETHEUS_PORT:-9779}
+config=${AB_PROMETHEUS_CONFIG:-/opt/prometheus/prometheus-config.yml}
+if [ -n "${AB_PROMETHEUS_HOST:-}" ]; then
+  hostPort="${AB_PROMETHEUS_HOST}:$port"
+else
+  hostPort="$port"
+fi
+
+echo "-javaagent:/opt/prometheus/jmx_prometheus_javaagent.jar=${hostPort}:$config"
diff --git a/images/alpine/openjdk11/jdk/run-java-options b/images/alpine/openjdk11/jdk/run-java-options
new file mode 100644
index 0000000..759dee7
--- /dev/null
+++ b/images/alpine/openjdk11/jdk/run-java-options
@@ -0,0 +1,4 @@
+#!/bin/bash
+# Delegate to the individual agent options scripts which will
+# examine the environment for features to be enabled
+echo "$(/opt/jolokia/jolokia-opts) $(/opt/prometheus/prometheus-opts)"
diff --git a/images/alpine/openjdk11/jre/Dockerfile b/images/alpine/openjdk11/jre/Dockerfile
index 683b65a..1d3979c 100644
--- a/images/alpine/openjdk11/jre/Dockerfile
+++ b/images/alpine/openjdk11/jre/Dockerfile
@@ -17,20 +17,39 @@ RUN apk add --update \
  && rm /var/cache/apk/* \
  && echo "securerandom.source=file:/dev/urandom" >> /usr/lib/jvm/default-jvm/jre/lib/security/java.security
 
-# Agent bond including Jolokia and jmx_exporter
-ADD agent-bond-opts /opt/run-java-options
-RUN mkdir -p /opt/agent-bond \
- && curl http://central.maven.org/maven2/io/fabric8/agent-bond-agent/1.2.0/agent-bond-agent-1.2.0.jar \
-          -o /opt/agent-bond/agent-bond.jar \
- && chmod 444 /opt/agent-bond/agent-bond.jar \
- && chmod 755 /opt/run-java-options
-ADD jmx_exporter_config.yml /opt/agent-bond/
-EXPOSE 8778 9779
+# Prometheus JMX exporter agent
+RUN mkdir -p /opt/prometheus/etc \
+ && curl http://central.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/undefined/jmx_prometheus_javaagent-undefined.jar \
+          -o /opt/prometheus/jmx_prometheus_javaagent.jar
+ADD prometheus-opts /opt/prometheus/prometheus-opts
+ADD prometheus-config.yml /opt/prometheus/prometheus-config.yml
+RUN chmod 444 /opt/prometheus/jmx_prometheus_javaagent.jar \
+ && chmod 444 /opt/prometheus/prometheus-config.yml \
+ && chmod 755 /opt/prometheus/prometheus-opts \
+ && chmod 775 /opt/prometheus/etc \
+ && chgrp root /opt/prometheus/etc
+
+EXPOSE 9779
+
+
+# Jolokia agent
+RUN mkdir -p /opt/jolokia/etc \
+ && curl http://central.maven.org/maven2/org/jolokia/jolokia-jvm/1.6.2/jolokia-jvm-1.6.2-agent.jar \
+         -o /opt/jolokia/jolokia.jar
+ADD jolokia-opts /opt/jolokia/jolokia-opts
+RUN chmod 444 /opt/jolokia/jolokia.jar \
+ && chmod 755 /opt/jolokia/jolokia-opts \
+ && chmod 775 /opt/jolokia/etc \
+ && chgrp root /opt/jolokia/etc
+
+EXPOSE 8778
+
 
 # Add run script as /deployments/run-java.sh and make it executable
 COPY run-java.sh /deployments/
 RUN chmod 755 /deployments/run-java.sh
 
+COPY run-java-options /opt
 
 
 
diff --git a/images/alpine/openjdk11/jre/README.md b/images/alpine/openjdk11/jre/README.md
index b763f44..48c9251 100644
--- a/images/alpine/openjdk11/jre/README.md
+++ b/images/alpine/openjdk11/jre/README.md
@@ -1,72 +1,12 @@
 ## Fabric8 Java Base Image OpenJDK 11 (JRE)
 
-
-
 This image is based on Alpine and provides OpenJDK 11 (JRE)
 
 It includes:
 
-
-* An [Agent Bond](https://github.com/fabric8io/agent-bond) agent with [Jolokia](http://www.jolokia.org) and Prometheus' [jmx_exporter](https://github.com/prometheus/jmx_exporter). The agent is installed as `/opt/agent-bond/agent-bond.jar`. See below for configuration options.
-
-
 * A startup script [`/deployments/run-java.sh`](#startup-script-run-javash) for starting up Java applications.
-
-### Agent Bond
-
-In order to enable Jolokia for your application you should use this image as a base image (via `FROM`) and use the output of `agent-bond-opts` in your startup scripts to include it in for the Java startup options.
-
-For example, the following snippet can be added to a script starting up your Java application
-
-    # ...
-    export JAVA_OPTIONS="$JAVA_OPTIONS $(agent-bond-opts)"
-    # .... use JAVA_OPTIONS when starting your app, e.g. as Tomcat does
-
-The following versions and defaults are used:
-
-* [Jolokia](http://www.jolokia.org) : version **1.6.2** and port **8778**
-* [jmx_exporter](https://github.com/prometheus/jmx_exporter): version **0.3.1** and port **9779**
-
-You can influence the behaviour of `agent-bond-opts` by setting various environment variables:
-
-### Agent-Bond Options
-
-Agent bond itself can be influenced with the following environment variables: 
-
-* **AB_OFF** : If set disables activation of agent-bond (i.e. echos an empty value). By default, agent-bond is enabled.
-* **AB_ENABLED** : Comma separated list of sub-agents enabled. Currently allowed values are `jolokia` and `jmx_exporter`. 
-  By default both are enabled.
-
-
-#### Jolokia configuration
-
-* **AB_JOLOKIA_CONFIG** : If set uses this file (including path) as Jolokia JVM agent properties (as described 
-  in Jolokia's [reference manual](http://www.jolokia.org/reference/html/agents.html#agents-jvm)).
-  By default this is `/opt/jolokia/jolokia.properties`.
-* **AB_JOLOKIA_HOST** : Host address to bind to (Default: `0.0.0.0`)
-* **AB_JOLOKIA_PORT** : Port to use (Default: `8778`)
-* **AB_JOLOKIA_USER** : User for authentication. By default authentication is switched off.
-* **AB_JOLOKIA_HTTPS** : Switch on secure communication with https. By default self signed server certificates are generated
-  if no `serverCert` configuration is given in `AB_JOLOKIA_OPTS`
-* **AB_JOLOKIA_PASSWORD** : Password for authentication. By default authentication is switched off.
-* **AB_JOLOKIA_ID** : Agent ID to use (`$HOSTNAME` by default, which is the container id)
-* **AB_JOLOKIA_OPTS**  : Additional options to be appended to the agent opts. They should be given in the format 
-  "key=value,key=value,..."
-
-Some options for integration in various environments:
-
-* **AB_JOLOKIA_AUTH_OPENSHIFT** : Switch on client authentication for OpenShift TLS communication. The value of this 
-  parameter can be a relative distinguished name which must be contained in a presented client certificate. Enabling this
-  parameter will automatically switch Jolokia into https communication mode. The default CA cert is set to 
-  `/var/run/secrets/kubernetes.io/serviceaccount/ca.crt` 
-  
-#### jmx_exporter configuration
-
-* **AB_JMX_EXPORTER_OPTS** : Configuration to use for `jmx_exporter` (in the format `<port>:<path to config>`)
-* **AB_JMX_EXPORTER_PORT** : Port to use for the JMX Exporter. Default: `9779`
-* **AB_JMX_EXPORTER_CONFIG** : Path to configuration to use for `jmx_exporter`: Default: `/opt/agent-bond/jmx_exporter_config.json`
-
-
+* [Jolokia](http://www.jolokia.org) agent installed in `/opt/jolokia`
+* Prometheus [jmx_exporter](https://github.com/prometheus/jmx_exporter) agent installed in `/opt/jmx_exporter`.
 
 ### Startup Script run-java.sh
 
@@ -177,8 +117,55 @@ mvn clean install
 ```
 
 
+### Monitoring Agents
+
+In order to enable Jolokia and Prometheus exporter for your application you should use this image as a base image (via `FROM`) and use the output of `jolokia-opts` and `prometheus-opts` in your startup scripts to include it in for the Java startup options. You can also just use the provided startup script `/opt/run-java.sh` which does this automatically.
+
+For example, the following snippet can be added to a script starting up your Java application
+
+    # ...
+    export JAVA_OPTIONS="$JAVA_OPTIONS $(/opt/jolokia/jolokia-opts) $(/opt/prometheus/prometheus-opts)"
+    # .... use JAVA_OPTIONS when starting your app, e.g. as Tomcat does
+
+The following versions and defaults are used:
+
+* [Jolokia](http://www.jolokia.org) : version **1.6.2** and port **8778**
+* [jmx_exporter](https://github.com/prometheus/jmx_exporter): version **0.3.1** and port **9779**
+
+You can influence the behaviour of these config scripts by setting various environment variables.
+
+#### Jolokia Configuration
+
+* **AB_JOLOKIA_OFF** : If set disables activation of Jolokia (i.e. echos an empty value). By default, Jolokia is enabled.
+* **AB_JOLOKIA_CONFIG** : If set uses this file (including path) as Jolokia JVM agent properties (as described
+  in Jolokia's [reference manual](http://www.jolokia.org/reference/html/agents.html#agents-jvm)). If not set,
+  the `/opt/jolokia/etc/jolokia.properties` will be created using the settings as defined in this document, otherwise
+  the reset of the settings in this document are ignored.
+* **AB_JOLOKIA_HOST** : Host address to bind to (Default: `0.0.0.0`)
+* **AB_JOLOKIA_PORT** : Port to use (Default: `8778`)
+* **AB_JOLOKIA_USER** : User for basic authentication. Defaults to 'jolokia'
+* **AB_JOLOKIA_PASSWORD** : Password for basic authentication. By default authentication is switched off.
+* **AB_JOLOKIA_PASSWORD_RANDOM** : Should a random AB_JOLOKIA_PASSWORD be generated? Generated value will be written to `/opt/jolokia/etc/jolokia.pw`
+* **AB_JOLOKIA_HTTPS** : Switch on secure communication with https. By default self signed server certificates are generated
+  if no `serverCert` configuration is given in `AB_JOLOKIA_OPTS`
+* **AB_JOLOKIA_ID** : Agent ID to use (`$HOSTNAME` by default, which is the container id)
+* **AB_JOLOKIA_DISCOVERY_ENABLED** : Enable Jolokia discovery.  Defaults to false.
+* **AB_JOLOKIA_OPTS**  : Additional options to be appended to the agent configuration. They should be given in the format
+  "key=value,key=value,..."
+
+Some options for integration in various environments:
+
+* **AB_JOLOKIA_AUTH_OPENSHIFT** : Switch on client authentication for OpenShift TSL communication. The value of this
+  parameter can be a relative distinguished name which must be contained in a presented client certificate. Enabling this
+  parameter will automatically switch Jolokia into https communication mode. The default CA cert is set to
+  `/var/run/secrets/kubernetes.io/serviceaccount/ca.crt`
+
+
+undefined
+
 ### Versions:
 
 * Base-Image: **Alpine 3.10**
 * Java: **OpenJDK 11 11** (Java Runtime Environment (JRE))
-* Agent-Bond: **1.2.0** (Jolokia 1.6.2, jmx_exporter 0.3.1)
+* Jolokia: **1.6.2**
+* jmx_exporter: **undefined**
diff --git a/images/alpine/openjdk11/jre/agent-bond-opts b/images/alpine/openjdk11/jre/agent-bond-opts
deleted file mode 100644
index 280313b..0000000
--- a/images/alpine/openjdk11/jre/agent-bond-opts
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/bin/sh
-
-# Parse options
-while [ $# -gt 0 ]
-do
-key="$1"
-case ${key} in
-    # Escape for scripts which eval the output of this script
-    -e|--escape)
-    escape_sep=1
-    ;;
-esac
-shift
-done
-
-# Check whether a given config is contained in AB_JOLOKIA_OPTS
-is_in_jolokia_opts() {
-  local prop=$1
-  if [ -n "${AB_JOLOKIA_OPTS:-}" ] && [ "${AB_JOLOKIA_OPTS}" != "${AB_JOLOKIA_OPTS/${prop}/}" ]; then
-     echo "yes"
-  else
-     echo "no"
-  fi
-}
-
-dir=${AB_DIR:-/opt/agent-bond}
-sep="="
-
-# Options separators defined to avoid clash with fish-pepper templating
-ab_open_del="{""{"
-ab_close_del="}""}"
-if [ -n "${escape_sep:-}" ]; then
-  ab_open_del='\{\{'
-  ab_close_del='\}\}'
-fi
-
-if [ -z "${AB_OFF:-}" ]; then
-   opts="-javaagent:$dir/agent-bond.jar"
-   config="${AB_CONFIG:-$dir/agent-bond.properties}"
-   if [ -f "$config" ]; then
-      # Configuration takes precedence
-      opts="${opts}${sep}config=${config}"
-      sep=","
-   fi
-   if [ -z "${AB_ENABLED:-}" ] || [ "${AB_ENABLED}" != "${AB_ENABLED/jolokia/}" ]; then
-     # Direct options only if no configuration is found
-     jsep=""
-     jolokia_opts=""
-     if [ -n "${AB_JOLOKIA_CONFIG:-}" ] && [ -f "${AB_JOLOKIA_CONFIG}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}config=${AB_JOLOKIA_CONFIG}"
-        jsep=","
-        grep -q -e '^host' ${AB_JOLOKIA_CONFIG} && host_in_config=1
-     fi
-     if [ -z "${AB_JOLOKIA_HOST:-}" ] && [ -z "${host_in_config:-}" ]; then
-        AB_JOLOKIA_HOST='0.0.0.0'
-     fi
-     if [ -n "${AB_JOLOKIA_HOST:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}host=${AB_JOLOKIA_HOST}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_PORT:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}port=${AB_JOLOKIA_PORT}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_USER:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}user=${AB_JOLOKIA_USER}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_PASSWORD:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}password=${AB_JOLOKIA_PASSWORD}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_HTTPS:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}protocol=https"
-        https_used=1
-        jsep=","
-     fi
-     # Integration with OpenShift client cert auth
-     if [ -n "${AB_JOLOKIA_AUTH_OPENSHIFT:-}" ]; then
-        auth_opts="useSslClientAuthentication=true,extraClientCheck=true"
-        if [ -z "${https_used+x}" ]; then
-          auth_opts="${auth_opts},protocol=https"
-        fi
-        if [ $(is_in_jolokia_opts "caCert") != "yes" ]; then
-           auth_opts="${auth_opts},caCert=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
-        fi
-        if [ $(is_in_jolokia_opts "clientPrincipal") != "yes" ]; then
-           if [  "${AB_JOLOKIA_AUTH_OPENSHIFT}" != "${AB_JOLOKIA_AUTH_OPENSHIFT/=/}" ]; then
-              # Supposed to contain a principal name to check
-              auth_opts="${auth_opts},clientPrincipal=$(echo ${AB_JOLOKIA_AUTH_OPENSHIFT} | sed -e 's/ /\\\\ /g')"
-           else
-              auth_opts="${auth_opts},clientPrincipal=cn=system:master-proxy"
-           fi
-        fi
-        jolokia_opts="${jolokia_opts}${jsep}${auth_opts}"
-        jsep=","
-     fi
-     # Add extra opts to the end
-     if [ -n "${AB_JOLOKIA_OPTS:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}${AB_JOLOKIA_OPTS}"
-        jsep=","
-     fi
-
-     opts="${opts}${sep}jolokia${ab_open_del}${jolokia_opts}${ab_close_del}"
-     sep=","
-   fi
-   if [ -z "${AB_ENABLED:-}" ] || [ "${AB_ENABLED}" != "${AB_ENABLED/jmx_exporter/}" ]; then
-     je_opts=""
-     jsep=""
-     if [ -n "${AB_JMX_EXPORTER_OPTS:-}" ]; then
-        opts="${opts}${sep}jmx_exporter${ab_open_del}${AB_JMX_EXPORTER_OPTS}${ab_close_del}"
-        sep=","
-     else
-        port=${AB_JMX_EXPORTER_PORT:-9779}
-        config=${AB_JMX_EXPORTER_CONFIG:-/opt/agent-bond/jmx_exporter_config.yml}
-        opts="${opts}${sep}jmx_exporter${ab_open_del}${port}:${config}${ab_close_del}"
-        sep=","
-     fi
-   fi
-   if [ "${sep:-}" != '=' ] ; then
-     echo ${opts}
-   fi
-fi
diff --git a/images/alpine/openjdk11/jre/jmx_exporter_config.yml b/images/alpine/openjdk11/jre/jmx_exporter_config.yml
deleted file mode 100644
index 620cd4a..0000000
--- a/images/alpine/openjdk11/jre/jmx_exporter_config.yml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-lowercaseOutputName: true
-lowercaseOutputLabelNames: true
-whitelistObjectNames:
-  - 'org.apache.camel:*'
-rules:
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>((?:Min|Mean|Max|Last|Delta)(?:ProcessingTime)):'
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>(TotalProcessingTime):'
-    type: COUNTER
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>(ExchangesInflight|LastProcessingTime):'
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>((?:Exchanges(?:Completed|Failed|Total))|FailuresHandled):'
-    type: COUNTER
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
diff --git a/images/alpine/openjdk11/jre/jolokia-opts b/images/alpine/openjdk11/jre/jolokia-opts
new file mode 100644
index 0000000..1aa273e
--- /dev/null
+++ b/images/alpine/openjdk11/jre/jolokia-opts
@@ -0,0 +1,103 @@
+#!/bin/sh
+
+
+# Exit if switched off
+if [ -n "${AB_JOLOKIA_OFF:-}" ] && [ "${AB_JOLOKIA_OFF}" != "false" ]; then
+  exit 0
+fi
+
+# Global switch, turning of all agents
+if [ -n "${AB_OFF:-}" ] && [ "${AB_OFF}" != "false" ]; then
+  exit 0
+fi
+
+# Check whether a given config is contained in AB_JOLOKIA_OPTS
+is_in_jolokia_opts() {
+  local prop=$1
+  if [ -n "${AB_JOLOKIA_OPTS:-}" ] && [ "${AB_JOLOKIA_OPTS}" != "${AB_JOLOKIA_OPTS/${prop}/}" ]; then
+     echo "yes"
+  else
+     echo "no"
+  fi
+}
+
+get_jolokia_properties() {
+
+  echo "host=${AB_JOLOKIA_HOST:-*}"
+  echo "port=${AB_JOLOKIA_PORT:-8778}"
+  echo "discoveryEnabled=${AB_JOLOKIA_DISCOVERY_ENABLED:-false}"
+
+  if [ -n "${AB_JOLOKIA_PASSWORD:-}" ]; then
+     echo "user=${AB_JOLOKIA_USER:-jolokia}"
+     echo "password=${AB_JOLOKIA_PASSWORD}"
+  fi
+  if [ -n "${AB_JOLOKIA_HTTPS:-}" ]; then
+     echo "protocol=https"
+     https_used=1
+  fi
+
+  # Integration with OpenShift client cert auth is enabled
+  # by default if not explicitly turned off by setting to 'false'
+  if [ "${AB_JOLOKIA_AUTH_OPENSHIFT:-}" != "false" ] && [ -f "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt" ]; then
+     echo "useSslClientAuthentication=true"
+     echo "extraClientCheck=true"
+
+     # Check if the 'protocol' property has already been set to 'https'
+     # If not, then defaults to using HTTPS
+     if [ -z ${https_used+x} ]; then
+       echo "protocol=https"
+     fi
+     if [ $(is_in_jolokia_opts "caCert") != "yes" ]; then
+        echo "caCert=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
+     fi
+
+     if [ $(is_in_jolokia_opts "clientPrincipal") != "yes" ]; then
+        if [  "${AB_JOLOKIA_AUTH_OPENSHIFT}" != "${AB_JOLOKIA_AUTH_OPENSHIFT/=/}" ]; then
+           # Supposed to contain a principal name to check
+           echo "clientPrincipal=$(echo ${AB_JOLOKIA_AUTH_OPENSHIFT} | sed -e 's/ /\\\\ /g')"
+        else
+           echo "clientPrincipal=cn=system:master-proxy"
+        fi
+     fi
+  fi
+
+  # Add extra opts
+  if [ -n "${AB_JOLOKIA_OPTS:-}" ]; then
+     echo "${AB_JOLOKIA_OPTS}" | tr "," "\n"
+  fi
+
+}
+
+write_jolokia_properties() {
+  local jolokia_property_file="$1"
+
+  # Setup Jolokia to accept basic auth, using a randomly generated password that is stored
+  # in the container in the ${DEPLOYMENTS_DIR}/jolokia.pw file.
+  if [ "${AB_JOLOKIA_PASSWORD_RANDOM:-}" == "true" ]; then
+    pw_file="/opt/jolokia/etc/jolokia.pw"
+    if [ -f "${pw_file}" ] ; then
+      AB_JOLOKIA_PASSWORD=$(cat "${pw_file}")
+    else
+      AB_JOLOKIA_PASSWORD=$(tr -cd '[:alnum:]' < /dev/urandom | fold -w30 | head -n1)
+      touch "${pw_file}"
+      chmod 660 "${pw_file}"
+      cat > "${pw_file}" <<EOF
+$AB_JOLOKIA_PASSWORD
+EOF
+    fi
+    export AB_JOLOKIA_PASSWORD
+  fi
+
+  touch "${jolokia_property_file}"
+  chmod 660 "${jolokia_property_file}"
+  cat > "${jolokia_property_file}" <<EOF
+$(get_jolokia_properties)
+EOF
+
+}
+
+if [ -z "${AB_JOLOKIA_CONFIG:-}" ]; then
+  AB_JOLOKIA_CONFIG="/opt/jolokia/etc/jolokia.properties"
+  write_jolokia_properties "$AB_JOLOKIA_CONFIG"
+fi
+echo "-javaagent:/opt/jolokia/jolokia.jar=config=${AB_JOLOKIA_CONFIG}"
diff --git a/images/alpine/openjdk11/jre/prometheus-config.yml b/images/alpine/openjdk11/jre/prometheus-config.yml
new file mode 100644
index 0000000..f6eaa2b
--- /dev/null
+++ b/images/alpine/openjdk11/jre/prometheus-config.yml
@@ -0,0 +1,586 @@
+startDelaySecs: 5
+ssl: false
+blacklistObjectNames: ["java.lang:*"]
+rules:
+# Context level
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesCompleted'
+    name: org.apache.camel.ExchangesCompleted
+    help: Exchanges Completed
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesFailed'
+    name: org.apache.camel.ExchangesFailed
+    help: Exchanges Failed
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesInflight'
+    name: org.apache.camel.ExchangesInflight
+    help: Exchanges Inflight
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>FailuresHandled'
+    name: org.apache.camel.FailuresHandled
+    help: Failures Handled
+    labels:
+        context: $1
+        type: context
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExternalRedeliveries'
+    name: org.apache.camel.ExternalRedeliveries
+    help: External Redeliveries
+    labels:
+        context: $1
+        type: context
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>MaxProcessingTime'
+    name: org.apache.camel.MaxProcessingTime
+    help: Maximum Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>MeanProcessingTime'
+    name: org.apache.camel.MeanProcessingTime
+    help: Mean Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>MinProcessingTime'
+    name: org.apache.camel.MinProcessingTime
+    help: Minimum Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>LastProcessingTime'
+    name: org.apache.camel.LastProcessingTime
+    help: Last Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>DeltaProcessingTime'
+    name: org.apache.camel.DeltaProcessingTime
+    help: Delta Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>Redeliveries'
+    name: org.apache.camel.Redeliveries
+    help: Redeliveries
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>TotalProcessingTime'
+    name: org.apache.camel.TotalProcessingTime
+    help: Total Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=consumers, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+
+
+# Route level
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesCompleted'
+    name: org.apache.camel.ExchangesCompleted
+    help: Exchanges Completed
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesFailed'
+    name: org.apache.camel.ExchangesFailed
+    help: Exchanges Failed
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesInflight'
+    name: org.apache.camel.ExchangesInflight
+    help: Exchanges Inflight
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>FailuresHandled'
+    name: org.apache.camel.FailuresHandled
+    help: Failures Handled
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExternalRedeliveries'
+    name: org.apache.camel.ExternalRedeliveries
+    help: External Redeliveries
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>MaxProcessingTime'
+    name: org.apache.camel.MaxProcessingTime
+    help: Maximum Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>MeanProcessingTime'
+    name: org.apache.camel.MeanProcessingTime
+    help: Mean Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>MinProcessingTime'
+    name: org.apache.camel.MinProcessingTime
+    help: Minimum Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>LastProcessingTime'
+    name: org.apache.camel.LastProcessingTime
+    help: Last Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>DeltaProcessingTime'
+    name: org.apache.camel.DeltaProcessingTime
+    help: Delta Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>Redeliveries'
+    name: org.apache.camel.Redeliveries
+    help: Redeliveries
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>TotalProcessingTime'
+    name: org.apache.camel.TotalProcessingTime
+    help: Total Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+
+# Processor level
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesCompleted'
+    name: org.apache.camel.ExchangesCompleted
+    help: Exchanges Completed
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesFailed'
+    name: org.apache.camel.ExchangesFailed
+    help: Exchanges Failed
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesInflight'
+    name: org.apache.camel.ExchangesInflight
+    help: Exchanges Inflight
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>FailuresHandled'
+    name: org.apache.camel.FailuresHandled
+    help: Failures Handled
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExternalRedeliveries'
+    name: org.apache.camel.ExternalRedeliveries
+    help: External Redeliveries
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>MaxProcessingTime'
+    name: org.apache.camel.MaxProcessingTime
+    help: Maximum Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>MeanProcessingTime'
+    name: org.apache.camel.MeanProcessingTime
+    help: Mean Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>MinProcessingTime'
+    name: org.apache.camel.MinProcessingTime
+    help: Minimum Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>LastProcessingTime'
+    name: org.apache.camel.LastProcessingTime
+    help: Last Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>DeltaProcessingTime'
+    name: org.apache.camel.DeltaProcessingTime
+    help: Delta Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>Redeliveries'
+    name: org.apache.camel.Redeliveries
+    help: Redeliveries
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>TotalProcessingTime'
+    name: org.apache.camel.TotalProcessingTime
+    help: Total Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: COUNTER
+
+# Consumers
+  - pattern: 'org.apache.camel<context=([^,]+), type=consumers, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        consumer: $2
+        type: consumers
+    type: GAUGE
+
+# Services
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>MaxDuration'
+    name: org.apache.camel.MaxDuration
+    help: Maximum Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>MeanDuration'
+    name: org.apache.camel.MeanDuration
+    help: Mean Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>MinDuration'
+    name: org.apache.camel.MinDuration
+    help: Minimum Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>TotalDuration'
+    name: org.apache.camel.TotalDuration
+    help: Total Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>ThreadsBlocked'
+    name: org.apache.camel.ThreadsBlocked
+    help: Threads Blocked
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>ThreadsInterrupted'
+    name: org.apache.camel.ThreadsInterrupted
+    help: Threads Interrupted
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumLogicalRuntimeFaults'
+    name: org.apache.cxf.NumLogicalRuntimeFaults
+    help: Number of logical runtime faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumLogicalRuntimeFaults'
+    name: org.apache.cxf.NumLogicalRuntimeFaults
+    help: Number of logical runtime faults
+    type: GAUGE
+    labels:
+       bus.id: $1
+       type: $2
+       service: $3
+       port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>AvgResponseTime'
+    name: org.apache.cxf.AvgResponseTime
+    help: Average Response Time
+    type: GAUGE
+    labels:
+       bus.id: $1
+       type: $2
+       service: $3
+       port: $4
+       operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>AvgResponseTime'
+    name: org.apache.cxf.AvgResponseTime
+    help: Average Response Time
+    type: GAUGE
+    labels:
+          bus.id: $1
+          type: $2
+          service: $3
+          port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumInvocations'
+    name: org.apache.cxf.NumInvocations
+    help: Number of invocations
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumInvocations'
+    name: org.apache.cxf.NumInvocations
+    help: Number of invocations
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>MaxResponseTime'
+    name: org.apache.cxf.MaxResponseTime
+    help: Maximum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>MaxResponseTime'
+    name: org.apache.cxf.MaxResponseTime
+    help: Maximum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>MinResponseTime'
+    name: org.apache.cxf.MinResponseTime
+    help: Minimum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>MinResponseTime'
+    name: org.apache.cxf.MinResponseTime
+    help: Minimum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>TotalHandlingTime'
+    name: org.apache.cxf.TotalHandlingTime
+    help: Total Handling Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>TotalHandlingTime'
+    name: org.apache.cxf.TotalHandlingTime
+    help: Total Handling Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumRuntimeFaults'
+    name: org.apache.cxf.NumRuntimeFaults
+    help: Number of runtime faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumRuntimeFaults'
+    name: org.apache.cxf.NumRuntimeFaults
+    help: Number of runtime faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumUnCheckedApplicationFaults'
+    name: org.apache.cxf.NumUnCheckedApplicationFaults
+    help: Number of unchecked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumUnCheckedApplicationFaults'
+    name: org.apache.cxf.NumUnCheckedApplicationFaults
+    help: Number of unchecked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumCheckedApplicationFaults'
+    name: org.apache.cxf.NumCheckedApplicationFaults
+    help: Number of checked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumCheckedApplicationFaults'
+    name: org.apache.cxf.NumCheckedApplicationFaults
+    help: Number of checked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
diff --git a/images/alpine/openjdk11/jre/prometheus-opts b/images/alpine/openjdk11/jre/prometheus-opts
new file mode 100644
index 0000000..3c43968
--- /dev/null
+++ b/images/alpine/openjdk11/jre/prometheus-opts
@@ -0,0 +1,23 @@
+#!/bin/sh
+# Scripted for getting Prometheus options
+# meant to be evaluated (not to be sourced)
+
+# Exit if switched off
+if [ -n "${AB_PROMETHEUS_OFF:-}" ] && [ "${AB_PROMETHEUS_OFF}" != "false" ]; then
+  exit 0
+fi
+
+# Global switch, turning of all agents
+if [ -n "${AB_OFF:-}" ] && [ "${AB_OFF}" != "false" ]; then
+  exit 0
+fi
+
+port=${AB_PROMETHEUS_PORT:-9779}
+config=${AB_PROMETHEUS_CONFIG:-/opt/prometheus/prometheus-config.yml}
+if [ -n "${AB_PROMETHEUS_HOST:-}" ]; then
+  hostPort="${AB_PROMETHEUS_HOST}:$port"
+else
+  hostPort="$port"
+fi
+
+echo "-javaagent:/opt/prometheus/jmx_prometheus_javaagent.jar=${hostPort}:$config"
diff --git a/images/alpine/openjdk11/jre/run-java-options b/images/alpine/openjdk11/jre/run-java-options
new file mode 100644
index 0000000..759dee7
--- /dev/null
+++ b/images/alpine/openjdk11/jre/run-java-options
@@ -0,0 +1,4 @@
+#!/bin/bash
+# Delegate to the individual agent options scripts which will
+# examine the environment for features to be enabled
+echo "$(/opt/jolokia/jolokia-opts) $(/opt/prometheus/prometheus-opts)"
diff --git a/images/alpine/openjdk7/jdk/Dockerfile b/images/alpine/openjdk7/jdk/Dockerfile
index a0bd876..4ed90ab 100644
--- a/images/alpine/openjdk7/jdk/Dockerfile
+++ b/images/alpine/openjdk7/jdk/Dockerfile
@@ -17,20 +17,39 @@ RUN apk add --update \
  && rm /var/cache/apk/* \
  && echo "securerandom.source=file:/dev/urandom" >> /usr/lib/jvm/default-jvm/jre/lib/security/java.security
 
-# Agent bond including Jolokia and jmx_exporter
-ADD agent-bond-opts /opt/run-java-options
-RUN mkdir -p /opt/agent-bond \
- && curl http://central.maven.org/maven2/io/fabric8/agent-bond-agent/1.2.0/agent-bond-agent-1.2.0.jar \
-          -o /opt/agent-bond/agent-bond.jar \
- && chmod 444 /opt/agent-bond/agent-bond.jar \
- && chmod 755 /opt/run-java-options
-ADD jmx_exporter_config.yml /opt/agent-bond/
-EXPOSE 8778 9779
+# Prometheus JMX exporter agent
+RUN mkdir -p /opt/prometheus/etc \
+ && curl http://central.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/undefined/jmx_prometheus_javaagent-undefined.jar \
+          -o /opt/prometheus/jmx_prometheus_javaagent.jar
+ADD prometheus-opts /opt/prometheus/prometheus-opts
+ADD prometheus-config.yml /opt/prometheus/prometheus-config.yml
+RUN chmod 444 /opt/prometheus/jmx_prometheus_javaagent.jar \
+ && chmod 444 /opt/prometheus/prometheus-config.yml \
+ && chmod 755 /opt/prometheus/prometheus-opts \
+ && chmod 775 /opt/prometheus/etc \
+ && chgrp root /opt/prometheus/etc
+
+EXPOSE 9779
+
+
+# Jolokia agent
+RUN mkdir -p /opt/jolokia/etc \
+ && curl http://central.maven.org/maven2/org/jolokia/jolokia-jvm/1.6.2/jolokia-jvm-1.6.2-agent.jar \
+         -o /opt/jolokia/jolokia.jar
+ADD jolokia-opts /opt/jolokia/jolokia-opts
+RUN chmod 444 /opt/jolokia/jolokia.jar \
+ && chmod 755 /opt/jolokia/jolokia-opts \
+ && chmod 775 /opt/jolokia/etc \
+ && chgrp root /opt/jolokia/etc
+
+EXPOSE 8778
+
 
 # Add run script as /deployments/run-java.sh and make it executable
 COPY run-java.sh /deployments/
 RUN chmod 755 /deployments/run-java.sh
 
+COPY run-java-options /opt
 
 
 
diff --git a/images/alpine/openjdk7/jdk/README.md b/images/alpine/openjdk7/jdk/README.md
index 5acbc9b..4af89d9 100644
--- a/images/alpine/openjdk7/jdk/README.md
+++ b/images/alpine/openjdk7/jdk/README.md
@@ -1,72 +1,12 @@
 ## Fabric8 Java Base Image OpenJDK 7 (JDK)
 
-
-
 This image is based on Alpine and provides OpenJDK 7 (JDK)
 
 It includes:
 
-
-* An [Agent Bond](https://github.com/fabric8io/agent-bond) agent with [Jolokia](http://www.jolokia.org) and Prometheus' [jmx_exporter](https://github.com/prometheus/jmx_exporter). The agent is installed as `/opt/agent-bond/agent-bond.jar`. See below for configuration options.
-
-
 * A startup script [`/deployments/run-java.sh`](#startup-script-run-javash) for starting up Java applications.
-
-### Agent Bond
-
-In order to enable Jolokia for your application you should use this image as a base image (via `FROM`) and use the output of `agent-bond-opts` in your startup scripts to include it in for the Java startup options.
-
-For example, the following snippet can be added to a script starting up your Java application
-
-    # ...
-    export JAVA_OPTIONS="$JAVA_OPTIONS $(agent-bond-opts)"
-    # .... use JAVA_OPTIONS when starting your app, e.g. as Tomcat does
-
-The following versions and defaults are used:
-
-* [Jolokia](http://www.jolokia.org) : version **1.6.2** and port **8778**
-* [jmx_exporter](https://github.com/prometheus/jmx_exporter): version **0.3.1** and port **9779**
-
-You can influence the behaviour of `agent-bond-opts` by setting various environment variables:
-
-### Agent-Bond Options
-
-Agent bond itself can be influenced with the following environment variables: 
-
-* **AB_OFF** : If set disables activation of agent-bond (i.e. echos an empty value). By default, agent-bond is enabled.
-* **AB_ENABLED** : Comma separated list of sub-agents enabled. Currently allowed values are `jolokia` and `jmx_exporter`. 
-  By default both are enabled.
-
-
-#### Jolokia configuration
-
-* **AB_JOLOKIA_CONFIG** : If set uses this file (including path) as Jolokia JVM agent properties (as described 
-  in Jolokia's [reference manual](http://www.jolokia.org/reference/html/agents.html#agents-jvm)).
-  By default this is `/opt/jolokia/jolokia.properties`.
-* **AB_JOLOKIA_HOST** : Host address to bind to (Default: `0.0.0.0`)
-* **AB_JOLOKIA_PORT** : Port to use (Default: `8778`)
-* **AB_JOLOKIA_USER** : User for authentication. By default authentication is switched off.
-* **AB_JOLOKIA_HTTPS** : Switch on secure communication with https. By default self signed server certificates are generated
-  if no `serverCert` configuration is given in `AB_JOLOKIA_OPTS`
-* **AB_JOLOKIA_PASSWORD** : Password for authentication. By default authentication is switched off.
-* **AB_JOLOKIA_ID** : Agent ID to use (`$HOSTNAME` by default, which is the container id)
-* **AB_JOLOKIA_OPTS**  : Additional options to be appended to the agent opts. They should be given in the format 
-  "key=value,key=value,..."
-
-Some options for integration in various environments:
-
-* **AB_JOLOKIA_AUTH_OPENSHIFT** : Switch on client authentication for OpenShift TLS communication. The value of this 
-  parameter can be a relative distinguished name which must be contained in a presented client certificate. Enabling this
-  parameter will automatically switch Jolokia into https communication mode. The default CA cert is set to 
-  `/var/run/secrets/kubernetes.io/serviceaccount/ca.crt` 
-  
-#### jmx_exporter configuration
-
-* **AB_JMX_EXPORTER_OPTS** : Configuration to use for `jmx_exporter` (in the format `<port>:<path to config>`)
-* **AB_JMX_EXPORTER_PORT** : Port to use for the JMX Exporter. Default: `9779`
-* **AB_JMX_EXPORTER_CONFIG** : Path to configuration to use for `jmx_exporter`: Default: `/opt/agent-bond/jmx_exporter_config.json`
-
-
+* [Jolokia](http://www.jolokia.org) agent installed in `/opt/jolokia`
+* Prometheus [jmx_exporter](https://github.com/prometheus/jmx_exporter) agent installed in `/opt/jmx_exporter`.
 
 ### Startup Script run-java.sh
 
@@ -177,8 +117,55 @@ mvn clean install
 ```
 
 
+### Monitoring Agents
+
+In order to enable Jolokia and Prometheus exporter for your application you should use this image as a base image (via `FROM`) and use the output of `jolokia-opts` and `prometheus-opts` in your startup scripts to include it in for the Java startup options. You can also just use the provided startup script `/opt/run-java.sh` which does this automatically.
+
+For example, the following snippet can be added to a script starting up your Java application
+
+    # ...
+    export JAVA_OPTIONS="$JAVA_OPTIONS $(/opt/jolokia/jolokia-opts) $(/opt/prometheus/prometheus-opts)"
+    # .... use JAVA_OPTIONS when starting your app, e.g. as Tomcat does
+
+The following versions and defaults are used:
+
+* [Jolokia](http://www.jolokia.org) : version **1.6.2** and port **8778**
+* [jmx_exporter](https://github.com/prometheus/jmx_exporter): version **0.3.1** and port **9779**
+
+You can influence the behaviour of these config scripts by setting various environment variables.
+
+#### Jolokia Configuration
+
+* **AB_JOLOKIA_OFF** : If set disables activation of Jolokia (i.e. echos an empty value). By default, Jolokia is enabled.
+* **AB_JOLOKIA_CONFIG** : If set uses this file (including path) as Jolokia JVM agent properties (as described
+  in Jolokia's [reference manual](http://www.jolokia.org/reference/html/agents.html#agents-jvm)). If not set,
+  the `/opt/jolokia/etc/jolokia.properties` will be created using the settings as defined in this document, otherwise
+  the reset of the settings in this document are ignored.
+* **AB_JOLOKIA_HOST** : Host address to bind to (Default: `0.0.0.0`)
+* **AB_JOLOKIA_PORT** : Port to use (Default: `8778`)
+* **AB_JOLOKIA_USER** : User for basic authentication. Defaults to 'jolokia'
+* **AB_JOLOKIA_PASSWORD** : Password for basic authentication. By default authentication is switched off.
+* **AB_JOLOKIA_PASSWORD_RANDOM** : Should a random AB_JOLOKIA_PASSWORD be generated? Generated value will be written to `/opt/jolokia/etc/jolokia.pw`
+* **AB_JOLOKIA_HTTPS** : Switch on secure communication with https. By default self signed server certificates are generated
+  if no `serverCert` configuration is given in `AB_JOLOKIA_OPTS`
+* **AB_JOLOKIA_ID** : Agent ID to use (`$HOSTNAME` by default, which is the container id)
+* **AB_JOLOKIA_DISCOVERY_ENABLED** : Enable Jolokia discovery.  Defaults to false.
+* **AB_JOLOKIA_OPTS**  : Additional options to be appended to the agent configuration. They should be given in the format
+  "key=value,key=value,..."
+
+Some options for integration in various environments:
+
+* **AB_JOLOKIA_AUTH_OPENSHIFT** : Switch on client authentication for OpenShift TSL communication. The value of this
+  parameter can be a relative distinguished name which must be contained in a presented client certificate. Enabling this
+  parameter will automatically switch Jolokia into https communication mode. The default CA cert is set to
+  `/var/run/secrets/kubernetes.io/serviceaccount/ca.crt`
+
+
+undefined
+
 ### Versions:
 
 * Base-Image: **Alpine 3.10**
 * Java: **OpenJDK 7 1.7.0** (Java Development Kit (JDK))
-* Agent-Bond: **1.2.0** (Jolokia 1.6.2, jmx_exporter 0.3.1)
+* Jolokia: **1.6.2**
+* jmx_exporter: **undefined**
diff --git a/images/alpine/openjdk7/jdk/agent-bond-opts b/images/alpine/openjdk7/jdk/agent-bond-opts
deleted file mode 100644
index 280313b..0000000
--- a/images/alpine/openjdk7/jdk/agent-bond-opts
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/bin/sh
-
-# Parse options
-while [ $# -gt 0 ]
-do
-key="$1"
-case ${key} in
-    # Escape for scripts which eval the output of this script
-    -e|--escape)
-    escape_sep=1
-    ;;
-esac
-shift
-done
-
-# Check whether a given config is contained in AB_JOLOKIA_OPTS
-is_in_jolokia_opts() {
-  local prop=$1
-  if [ -n "${AB_JOLOKIA_OPTS:-}" ] && [ "${AB_JOLOKIA_OPTS}" != "${AB_JOLOKIA_OPTS/${prop}/}" ]; then
-     echo "yes"
-  else
-     echo "no"
-  fi
-}
-
-dir=${AB_DIR:-/opt/agent-bond}
-sep="="
-
-# Options separators defined to avoid clash with fish-pepper templating
-ab_open_del="{""{"
-ab_close_del="}""}"
-if [ -n "${escape_sep:-}" ]; then
-  ab_open_del='\{\{'
-  ab_close_del='\}\}'
-fi
-
-if [ -z "${AB_OFF:-}" ]; then
-   opts="-javaagent:$dir/agent-bond.jar"
-   config="${AB_CONFIG:-$dir/agent-bond.properties}"
-   if [ -f "$config" ]; then
-      # Configuration takes precedence
-      opts="${opts}${sep}config=${config}"
-      sep=","
-   fi
-   if [ -z "${AB_ENABLED:-}" ] || [ "${AB_ENABLED}" != "${AB_ENABLED/jolokia/}" ]; then
-     # Direct options only if no configuration is found
-     jsep=""
-     jolokia_opts=""
-     if [ -n "${AB_JOLOKIA_CONFIG:-}" ] && [ -f "${AB_JOLOKIA_CONFIG}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}config=${AB_JOLOKIA_CONFIG}"
-        jsep=","
-        grep -q -e '^host' ${AB_JOLOKIA_CONFIG} && host_in_config=1
-     fi
-     if [ -z "${AB_JOLOKIA_HOST:-}" ] && [ -z "${host_in_config:-}" ]; then
-        AB_JOLOKIA_HOST='0.0.0.0'
-     fi
-     if [ -n "${AB_JOLOKIA_HOST:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}host=${AB_JOLOKIA_HOST}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_PORT:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}port=${AB_JOLOKIA_PORT}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_USER:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}user=${AB_JOLOKIA_USER}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_PASSWORD:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}password=${AB_JOLOKIA_PASSWORD}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_HTTPS:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}protocol=https"
-        https_used=1
-        jsep=","
-     fi
-     # Integration with OpenShift client cert auth
-     if [ -n "${AB_JOLOKIA_AUTH_OPENSHIFT:-}" ]; then
-        auth_opts="useSslClientAuthentication=true,extraClientCheck=true"
-        if [ -z "${https_used+x}" ]; then
-          auth_opts="${auth_opts},protocol=https"
-        fi
-        if [ $(is_in_jolokia_opts "caCert") != "yes" ]; then
-           auth_opts="${auth_opts},caCert=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
-        fi
-        if [ $(is_in_jolokia_opts "clientPrincipal") != "yes" ]; then
-           if [  "${AB_JOLOKIA_AUTH_OPENSHIFT}" != "${AB_JOLOKIA_AUTH_OPENSHIFT/=/}" ]; then
-              # Supposed to contain a principal name to check
-              auth_opts="${auth_opts},clientPrincipal=$(echo ${AB_JOLOKIA_AUTH_OPENSHIFT} | sed -e 's/ /\\\\ /g')"
-           else
-              auth_opts="${auth_opts},clientPrincipal=cn=system:master-proxy"
-           fi
-        fi
-        jolokia_opts="${jolokia_opts}${jsep}${auth_opts}"
-        jsep=","
-     fi
-     # Add extra opts to the end
-     if [ -n "${AB_JOLOKIA_OPTS:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}${AB_JOLOKIA_OPTS}"
-        jsep=","
-     fi
-
-     opts="${opts}${sep}jolokia${ab_open_del}${jolokia_opts}${ab_close_del}"
-     sep=","
-   fi
-   if [ -z "${AB_ENABLED:-}" ] || [ "${AB_ENABLED}" != "${AB_ENABLED/jmx_exporter/}" ]; then
-     je_opts=""
-     jsep=""
-     if [ -n "${AB_JMX_EXPORTER_OPTS:-}" ]; then
-        opts="${opts}${sep}jmx_exporter${ab_open_del}${AB_JMX_EXPORTER_OPTS}${ab_close_del}"
-        sep=","
-     else
-        port=${AB_JMX_EXPORTER_PORT:-9779}
-        config=${AB_JMX_EXPORTER_CONFIG:-/opt/agent-bond/jmx_exporter_config.yml}
-        opts="${opts}${sep}jmx_exporter${ab_open_del}${port}:${config}${ab_close_del}"
-        sep=","
-     fi
-   fi
-   if [ "${sep:-}" != '=' ] ; then
-     echo ${opts}
-   fi
-fi
diff --git a/images/alpine/openjdk7/jdk/jmx_exporter_config.yml b/images/alpine/openjdk7/jdk/jmx_exporter_config.yml
deleted file mode 100644
index 620cd4a..0000000
--- a/images/alpine/openjdk7/jdk/jmx_exporter_config.yml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-lowercaseOutputName: true
-lowercaseOutputLabelNames: true
-whitelistObjectNames:
-  - 'org.apache.camel:*'
-rules:
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>((?:Min|Mean|Max|Last|Delta)(?:ProcessingTime)):'
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>(TotalProcessingTime):'
-    type: COUNTER
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>(ExchangesInflight|LastProcessingTime):'
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>((?:Exchanges(?:Completed|Failed|Total))|FailuresHandled):'
-    type: COUNTER
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
diff --git a/images/alpine/openjdk7/jdk/jolokia-opts b/images/alpine/openjdk7/jdk/jolokia-opts
new file mode 100644
index 0000000..1aa273e
--- /dev/null
+++ b/images/alpine/openjdk7/jdk/jolokia-opts
@@ -0,0 +1,103 @@
+#!/bin/sh
+
+
+# Exit if switched off
+if [ -n "${AB_JOLOKIA_OFF:-}" ] && [ "${AB_JOLOKIA_OFF}" != "false" ]; then
+  exit 0
+fi
+
+# Global switch, turning of all agents
+if [ -n "${AB_OFF:-}" ] && [ "${AB_OFF}" != "false" ]; then
+  exit 0
+fi
+
+# Check whether a given config is contained in AB_JOLOKIA_OPTS
+is_in_jolokia_opts() {
+  local prop=$1
+  if [ -n "${AB_JOLOKIA_OPTS:-}" ] && [ "${AB_JOLOKIA_OPTS}" != "${AB_JOLOKIA_OPTS/${prop}/}" ]; then
+     echo "yes"
+  else
+     echo "no"
+  fi
+}
+
+get_jolokia_properties() {
+
+  echo "host=${AB_JOLOKIA_HOST:-*}"
+  echo "port=${AB_JOLOKIA_PORT:-8778}"
+  echo "discoveryEnabled=${AB_JOLOKIA_DISCOVERY_ENABLED:-false}"
+
+  if [ -n "${AB_JOLOKIA_PASSWORD:-}" ]; then
+     echo "user=${AB_JOLOKIA_USER:-jolokia}"
+     echo "password=${AB_JOLOKIA_PASSWORD}"
+  fi
+  if [ -n "${AB_JOLOKIA_HTTPS:-}" ]; then
+     echo "protocol=https"
+     https_used=1
+  fi
+
+  # Integration with OpenShift client cert auth is enabled
+  # by default if not explicitly turned off by setting to 'false'
+  if [ "${AB_JOLOKIA_AUTH_OPENSHIFT:-}" != "false" ] && [ -f "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt" ]; then
+     echo "useSslClientAuthentication=true"
+     echo "extraClientCheck=true"
+
+     # Check if the 'protocol' property has already been set to 'https'
+     # If not, then defaults to using HTTPS
+     if [ -z ${https_used+x} ]; then
+       echo "protocol=https"
+     fi
+     if [ $(is_in_jolokia_opts "caCert") != "yes" ]; then
+        echo "caCert=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
+     fi
+
+     if [ $(is_in_jolokia_opts "clientPrincipal") != "yes" ]; then
+        if [  "${AB_JOLOKIA_AUTH_OPENSHIFT}" != "${AB_JOLOKIA_AUTH_OPENSHIFT/=/}" ]; then
+           # Supposed to contain a principal name to check
+           echo "clientPrincipal=$(echo ${AB_JOLOKIA_AUTH_OPENSHIFT} | sed -e 's/ /\\\\ /g')"
+        else
+           echo "clientPrincipal=cn=system:master-proxy"
+        fi
+     fi
+  fi
+
+  # Add extra opts
+  if [ -n "${AB_JOLOKIA_OPTS:-}" ]; then
+     echo "${AB_JOLOKIA_OPTS}" | tr "," "\n"
+  fi
+
+}
+
+write_jolokia_properties() {
+  local jolokia_property_file="$1"
+
+  # Setup Jolokia to accept basic auth, using a randomly generated password that is stored
+  # in the container in the ${DEPLOYMENTS_DIR}/jolokia.pw file.
+  if [ "${AB_JOLOKIA_PASSWORD_RANDOM:-}" == "true" ]; then
+    pw_file="/opt/jolokia/etc/jolokia.pw"
+    if [ -f "${pw_file}" ] ; then
+      AB_JOLOKIA_PASSWORD=$(cat "${pw_file}")
+    else
+      AB_JOLOKIA_PASSWORD=$(tr -cd '[:alnum:]' < /dev/urandom | fold -w30 | head -n1)
+      touch "${pw_file}"
+      chmod 660 "${pw_file}"
+      cat > "${pw_file}" <<EOF
+$AB_JOLOKIA_PASSWORD
+EOF
+    fi
+    export AB_JOLOKIA_PASSWORD
+  fi
+
+  touch "${jolokia_property_file}"
+  chmod 660 "${jolokia_property_file}"
+  cat > "${jolokia_property_file}" <<EOF
+$(get_jolokia_properties)
+EOF
+
+}
+
+if [ -z "${AB_JOLOKIA_CONFIG:-}" ]; then
+  AB_JOLOKIA_CONFIG="/opt/jolokia/etc/jolokia.properties"
+  write_jolokia_properties "$AB_JOLOKIA_CONFIG"
+fi
+echo "-javaagent:/opt/jolokia/jolokia.jar=config=${AB_JOLOKIA_CONFIG}"
diff --git a/images/alpine/openjdk7/jdk/prometheus-config.yml b/images/alpine/openjdk7/jdk/prometheus-config.yml
new file mode 100644
index 0000000..f6eaa2b
--- /dev/null
+++ b/images/alpine/openjdk7/jdk/prometheus-config.yml
@@ -0,0 +1,586 @@
+startDelaySecs: 5
+ssl: false
+blacklistObjectNames: ["java.lang:*"]
+rules:
+# Context level
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesCompleted'
+    name: org.apache.camel.ExchangesCompleted
+    help: Exchanges Completed
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesFailed'
+    name: org.apache.camel.ExchangesFailed
+    help: Exchanges Failed
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesInflight'
+    name: org.apache.camel.ExchangesInflight
+    help: Exchanges Inflight
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>FailuresHandled'
+    name: org.apache.camel.FailuresHandled
+    help: Failures Handled
+    labels:
+        context: $1
+        type: context
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExternalRedeliveries'
+    name: org.apache.camel.ExternalRedeliveries
+    help: External Redeliveries
+    labels:
+        context: $1
+        type: context
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>MaxProcessingTime'
+    name: org.apache.camel.MaxProcessingTime
+    help: Maximum Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>MeanProcessingTime'
+    name: org.apache.camel.MeanProcessingTime
+    help: Mean Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>MinProcessingTime'
+    name: org.apache.camel.MinProcessingTime
+    help: Minimum Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>LastProcessingTime'
+    name: org.apache.camel.LastProcessingTime
+    help: Last Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>DeltaProcessingTime'
+    name: org.apache.camel.DeltaProcessingTime
+    help: Delta Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>Redeliveries'
+    name: org.apache.camel.Redeliveries
+    help: Redeliveries
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>TotalProcessingTime'
+    name: org.apache.camel.TotalProcessingTime
+    help: Total Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=consumers, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+
+
+# Route level
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesCompleted'
+    name: org.apache.camel.ExchangesCompleted
+    help: Exchanges Completed
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesFailed'
+    name: org.apache.camel.ExchangesFailed
+    help: Exchanges Failed
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesInflight'
+    name: org.apache.camel.ExchangesInflight
+    help: Exchanges Inflight
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>FailuresHandled'
+    name: org.apache.camel.FailuresHandled
+    help: Failures Handled
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExternalRedeliveries'
+    name: org.apache.camel.ExternalRedeliveries
+    help: External Redeliveries
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>MaxProcessingTime'
+    name: org.apache.camel.MaxProcessingTime
+    help: Maximum Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>MeanProcessingTime'
+    name: org.apache.camel.MeanProcessingTime
+    help: Mean Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>MinProcessingTime'
+    name: org.apache.camel.MinProcessingTime
+    help: Minimum Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>LastProcessingTime'
+    name: org.apache.camel.LastProcessingTime
+    help: Last Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>DeltaProcessingTime'
+    name: org.apache.camel.DeltaProcessingTime
+    help: Delta Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>Redeliveries'
+    name: org.apache.camel.Redeliveries
+    help: Redeliveries
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>TotalProcessingTime'
+    name: org.apache.camel.TotalProcessingTime
+    help: Total Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+
+# Processor level
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesCompleted'
+    name: org.apache.camel.ExchangesCompleted
+    help: Exchanges Completed
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesFailed'
+    name: org.apache.camel.ExchangesFailed
+    help: Exchanges Failed
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesInflight'
+    name: org.apache.camel.ExchangesInflight
+    help: Exchanges Inflight
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>FailuresHandled'
+    name: org.apache.camel.FailuresHandled
+    help: Failures Handled
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExternalRedeliveries'
+    name: org.apache.camel.ExternalRedeliveries
+    help: External Redeliveries
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>MaxProcessingTime'
+    name: org.apache.camel.MaxProcessingTime
+    help: Maximum Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>MeanProcessingTime'
+    name: org.apache.camel.MeanProcessingTime
+    help: Mean Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>MinProcessingTime'
+    name: org.apache.camel.MinProcessingTime
+    help: Minimum Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>LastProcessingTime'
+    name: org.apache.camel.LastProcessingTime
+    help: Last Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>DeltaProcessingTime'
+    name: org.apache.camel.DeltaProcessingTime
+    help: Delta Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>Redeliveries'
+    name: org.apache.camel.Redeliveries
+    help: Redeliveries
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>TotalProcessingTime'
+    name: org.apache.camel.TotalProcessingTime
+    help: Total Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: COUNTER
+
+# Consumers
+  - pattern: 'org.apache.camel<context=([^,]+), type=consumers, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        consumer: $2
+        type: consumers
+    type: GAUGE
+
+# Services
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>MaxDuration'
+    name: org.apache.camel.MaxDuration
+    help: Maximum Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>MeanDuration'
+    name: org.apache.camel.MeanDuration
+    help: Mean Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>MinDuration'
+    name: org.apache.camel.MinDuration
+    help: Minimum Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>TotalDuration'
+    name: org.apache.camel.TotalDuration
+    help: Total Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>ThreadsBlocked'
+    name: org.apache.camel.ThreadsBlocked
+    help: Threads Blocked
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>ThreadsInterrupted'
+    name: org.apache.camel.ThreadsInterrupted
+    help: Threads Interrupted
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumLogicalRuntimeFaults'
+    name: org.apache.cxf.NumLogicalRuntimeFaults
+    help: Number of logical runtime faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumLogicalRuntimeFaults'
+    name: org.apache.cxf.NumLogicalRuntimeFaults
+    help: Number of logical runtime faults
+    type: GAUGE
+    labels:
+       bus.id: $1
+       type: $2
+       service: $3
+       port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>AvgResponseTime'
+    name: org.apache.cxf.AvgResponseTime
+    help: Average Response Time
+    type: GAUGE
+    labels:
+       bus.id: $1
+       type: $2
+       service: $3
+       port: $4
+       operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>AvgResponseTime'
+    name: org.apache.cxf.AvgResponseTime
+    help: Average Response Time
+    type: GAUGE
+    labels:
+          bus.id: $1
+          type: $2
+          service: $3
+          port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumInvocations'
+    name: org.apache.cxf.NumInvocations
+    help: Number of invocations
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumInvocations'
+    name: org.apache.cxf.NumInvocations
+    help: Number of invocations
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>MaxResponseTime'
+    name: org.apache.cxf.MaxResponseTime
+    help: Maximum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>MaxResponseTime'
+    name: org.apache.cxf.MaxResponseTime
+    help: Maximum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>MinResponseTime'
+    name: org.apache.cxf.MinResponseTime
+    help: Minimum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>MinResponseTime'
+    name: org.apache.cxf.MinResponseTime
+    help: Minimum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>TotalHandlingTime'
+    name: org.apache.cxf.TotalHandlingTime
+    help: Total Handling Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>TotalHandlingTime'
+    name: org.apache.cxf.TotalHandlingTime
+    help: Total Handling Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumRuntimeFaults'
+    name: org.apache.cxf.NumRuntimeFaults
+    help: Number of runtime faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumRuntimeFaults'
+    name: org.apache.cxf.NumRuntimeFaults
+    help: Number of runtime faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumUnCheckedApplicationFaults'
+    name: org.apache.cxf.NumUnCheckedApplicationFaults
+    help: Number of unchecked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumUnCheckedApplicationFaults'
+    name: org.apache.cxf.NumUnCheckedApplicationFaults
+    help: Number of unchecked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumCheckedApplicationFaults'
+    name: org.apache.cxf.NumCheckedApplicationFaults
+    help: Number of checked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumCheckedApplicationFaults'
+    name: org.apache.cxf.NumCheckedApplicationFaults
+    help: Number of checked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
diff --git a/images/alpine/openjdk7/jdk/prometheus-opts b/images/alpine/openjdk7/jdk/prometheus-opts
new file mode 100644
index 0000000..3c43968
--- /dev/null
+++ b/images/alpine/openjdk7/jdk/prometheus-opts
@@ -0,0 +1,23 @@
+#!/bin/sh
+# Scripted for getting Prometheus options
+# meant to be evaluated (not to be sourced)
+
+# Exit if switched off
+if [ -n "${AB_PROMETHEUS_OFF:-}" ] && [ "${AB_PROMETHEUS_OFF}" != "false" ]; then
+  exit 0
+fi
+
+# Global switch, turning of all agents
+if [ -n "${AB_OFF:-}" ] && [ "${AB_OFF}" != "false" ]; then
+  exit 0
+fi
+
+port=${AB_PROMETHEUS_PORT:-9779}
+config=${AB_PROMETHEUS_CONFIG:-/opt/prometheus/prometheus-config.yml}
+if [ -n "${AB_PROMETHEUS_HOST:-}" ]; then
+  hostPort="${AB_PROMETHEUS_HOST}:$port"
+else
+  hostPort="$port"
+fi
+
+echo "-javaagent:/opt/prometheus/jmx_prometheus_javaagent.jar=${hostPort}:$config"
diff --git a/images/alpine/openjdk7/jdk/run-java-options b/images/alpine/openjdk7/jdk/run-java-options
new file mode 100644
index 0000000..759dee7
--- /dev/null
+++ b/images/alpine/openjdk7/jdk/run-java-options
@@ -0,0 +1,4 @@
+#!/bin/bash
+# Delegate to the individual agent options scripts which will
+# examine the environment for features to be enabled
+echo "$(/opt/jolokia/jolokia-opts) $(/opt/prometheus/prometheus-opts)"
diff --git a/images/alpine/openjdk7/jre/Dockerfile b/images/alpine/openjdk7/jre/Dockerfile
index 9edd93b..cbae635 100644
--- a/images/alpine/openjdk7/jre/Dockerfile
+++ b/images/alpine/openjdk7/jre/Dockerfile
@@ -17,20 +17,39 @@ RUN apk add --update \
  && rm /var/cache/apk/* \
  && echo "securerandom.source=file:/dev/urandom" >> /usr/lib/jvm/default-jvm/jre/lib/security/java.security
 
-# Agent bond including Jolokia and jmx_exporter
-ADD agent-bond-opts /opt/run-java-options
-RUN mkdir -p /opt/agent-bond \
- && curl http://central.maven.org/maven2/io/fabric8/agent-bond-agent/1.2.0/agent-bond-agent-1.2.0.jar \
-          -o /opt/agent-bond/agent-bond.jar \
- && chmod 444 /opt/agent-bond/agent-bond.jar \
- && chmod 755 /opt/run-java-options
-ADD jmx_exporter_config.yml /opt/agent-bond/
-EXPOSE 8778 9779
+# Prometheus JMX exporter agent
+RUN mkdir -p /opt/prometheus/etc \
+ && curl http://central.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/undefined/jmx_prometheus_javaagent-undefined.jar \
+          -o /opt/prometheus/jmx_prometheus_javaagent.jar
+ADD prometheus-opts /opt/prometheus/prometheus-opts
+ADD prometheus-config.yml /opt/prometheus/prometheus-config.yml
+RUN chmod 444 /opt/prometheus/jmx_prometheus_javaagent.jar \
+ && chmod 444 /opt/prometheus/prometheus-config.yml \
+ && chmod 755 /opt/prometheus/prometheus-opts \
+ && chmod 775 /opt/prometheus/etc \
+ && chgrp root /opt/prometheus/etc
+
+EXPOSE 9779
+
+
+# Jolokia agent
+RUN mkdir -p /opt/jolokia/etc \
+ && curl http://central.maven.org/maven2/org/jolokia/jolokia-jvm/1.6.2/jolokia-jvm-1.6.2-agent.jar \
+         -o /opt/jolokia/jolokia.jar
+ADD jolokia-opts /opt/jolokia/jolokia-opts
+RUN chmod 444 /opt/jolokia/jolokia.jar \
+ && chmod 755 /opt/jolokia/jolokia-opts \
+ && chmod 775 /opt/jolokia/etc \
+ && chgrp root /opt/jolokia/etc
+
+EXPOSE 8778
+
 
 # Add run script as /deployments/run-java.sh and make it executable
 COPY run-java.sh /deployments/
 RUN chmod 755 /deployments/run-java.sh
 
+COPY run-java-options /opt
 
 
 
diff --git a/images/alpine/openjdk7/jre/README.md b/images/alpine/openjdk7/jre/README.md
index 981bb3f..01e9f8c 100644
--- a/images/alpine/openjdk7/jre/README.md
+++ b/images/alpine/openjdk7/jre/README.md
@@ -1,72 +1,12 @@
 ## Fabric8 Java Base Image OpenJDK 7 (JRE)
 
-
-
 This image is based on Alpine and provides OpenJDK 7 (JRE)
 
 It includes:
 
-
-* An [Agent Bond](https://github.com/fabric8io/agent-bond) agent with [Jolokia](http://www.jolokia.org) and Prometheus' [jmx_exporter](https://github.com/prometheus/jmx_exporter). The agent is installed as `/opt/agent-bond/agent-bond.jar`. See below for configuration options.
-
-
 * A startup script [`/deployments/run-java.sh`](#startup-script-run-javash) for starting up Java applications.
-
-### Agent Bond
-
-In order to enable Jolokia for your application you should use this image as a base image (via `FROM`) and use the output of `agent-bond-opts` in your startup scripts to include it in for the Java startup options.
-
-For example, the following snippet can be added to a script starting up your Java application
-
-    # ...
-    export JAVA_OPTIONS="$JAVA_OPTIONS $(agent-bond-opts)"
-    # .... use JAVA_OPTIONS when starting your app, e.g. as Tomcat does
-
-The following versions and defaults are used:
-
-* [Jolokia](http://www.jolokia.org) : version **1.6.2** and port **8778**
-* [jmx_exporter](https://github.com/prometheus/jmx_exporter): version **0.3.1** and port **9779**
-
-You can influence the behaviour of `agent-bond-opts` by setting various environment variables:
-
-### Agent-Bond Options
-
-Agent bond itself can be influenced with the following environment variables: 
-
-* **AB_OFF** : If set disables activation of agent-bond (i.e. echos an empty value). By default, agent-bond is enabled.
-* **AB_ENABLED** : Comma separated list of sub-agents enabled. Currently allowed values are `jolokia` and `jmx_exporter`. 
-  By default both are enabled.
-
-
-#### Jolokia configuration
-
-* **AB_JOLOKIA_CONFIG** : If set uses this file (including path) as Jolokia JVM agent properties (as described 
-  in Jolokia's [reference manual](http://www.jolokia.org/reference/html/agents.html#agents-jvm)).
-  By default this is `/opt/jolokia/jolokia.properties`.
-* **AB_JOLOKIA_HOST** : Host address to bind to (Default: `0.0.0.0`)
-* **AB_JOLOKIA_PORT** : Port to use (Default: `8778`)
-* **AB_JOLOKIA_USER** : User for authentication. By default authentication is switched off.
-* **AB_JOLOKIA_HTTPS** : Switch on secure communication with https. By default self signed server certificates are generated
-  if no `serverCert` configuration is given in `AB_JOLOKIA_OPTS`
-* **AB_JOLOKIA_PASSWORD** : Password for authentication. By default authentication is switched off.
-* **AB_JOLOKIA_ID** : Agent ID to use (`$HOSTNAME` by default, which is the container id)
-* **AB_JOLOKIA_OPTS**  : Additional options to be appended to the agent opts. They should be given in the format 
-  "key=value,key=value,..."
-
-Some options for integration in various environments:
-
-* **AB_JOLOKIA_AUTH_OPENSHIFT** : Switch on client authentication for OpenShift TLS communication. The value of this 
-  parameter can be a relative distinguished name which must be contained in a presented client certificate. Enabling this
-  parameter will automatically switch Jolokia into https communication mode. The default CA cert is set to 
-  `/var/run/secrets/kubernetes.io/serviceaccount/ca.crt` 
-  
-#### jmx_exporter configuration
-
-* **AB_JMX_EXPORTER_OPTS** : Configuration to use for `jmx_exporter` (in the format `<port>:<path to config>`)
-* **AB_JMX_EXPORTER_PORT** : Port to use for the JMX Exporter. Default: `9779`
-* **AB_JMX_EXPORTER_CONFIG** : Path to configuration to use for `jmx_exporter`: Default: `/opt/agent-bond/jmx_exporter_config.json`
-
-
+* [Jolokia](http://www.jolokia.org) agent installed in `/opt/jolokia`
+* Prometheus [jmx_exporter](https://github.com/prometheus/jmx_exporter) agent installed in `/opt/jmx_exporter`.
 
 ### Startup Script run-java.sh
 
@@ -177,8 +117,55 @@ mvn clean install
 ```
 
 
+### Monitoring Agents
+
+In order to enable Jolokia and Prometheus exporter for your application you should use this image as a base image (via `FROM`) and use the output of `jolokia-opts` and `prometheus-opts` in your startup scripts to include it in for the Java startup options. You can also just use the provided startup script `/opt/run-java.sh` which does this automatically.
+
+For example, the following snippet can be added to a script starting up your Java application
+
+    # ...
+    export JAVA_OPTIONS="$JAVA_OPTIONS $(/opt/jolokia/jolokia-opts) $(/opt/prometheus/prometheus-opts)"
+    # .... use JAVA_OPTIONS when starting your app, e.g. as Tomcat does
+
+The following versions and defaults are used:
+
+* [Jolokia](http://www.jolokia.org) : version **1.6.2** and port **8778**
+* [jmx_exporter](https://github.com/prometheus/jmx_exporter): version **0.3.1** and port **9779**
+
+You can influence the behaviour of these config scripts by setting various environment variables.
+
+#### Jolokia Configuration
+
+* **AB_JOLOKIA_OFF** : If set disables activation of Jolokia (i.e. echos an empty value). By default, Jolokia is enabled.
+* **AB_JOLOKIA_CONFIG** : If set uses this file (including path) as Jolokia JVM agent properties (as described
+  in Jolokia's [reference manual](http://www.jolokia.org/reference/html/agents.html#agents-jvm)). If not set,
+  the `/opt/jolokia/etc/jolokia.properties` will be created using the settings as defined in this document, otherwise
+  the reset of the settings in this document are ignored.
+* **AB_JOLOKIA_HOST** : Host address to bind to (Default: `0.0.0.0`)
+* **AB_JOLOKIA_PORT** : Port to use (Default: `8778`)
+* **AB_JOLOKIA_USER** : User for basic authentication. Defaults to 'jolokia'
+* **AB_JOLOKIA_PASSWORD** : Password for basic authentication. By default authentication is switched off.
+* **AB_JOLOKIA_PASSWORD_RANDOM** : Should a random AB_JOLOKIA_PASSWORD be generated? Generated value will be written to `/opt/jolokia/etc/jolokia.pw`
+* **AB_JOLOKIA_HTTPS** : Switch on secure communication with https. By default self signed server certificates are generated
+  if no `serverCert` configuration is given in `AB_JOLOKIA_OPTS`
+* **AB_JOLOKIA_ID** : Agent ID to use (`$HOSTNAME` by default, which is the container id)
+* **AB_JOLOKIA_DISCOVERY_ENABLED** : Enable Jolokia discovery.  Defaults to false.
+* **AB_JOLOKIA_OPTS**  : Additional options to be appended to the agent configuration. They should be given in the format
+  "key=value,key=value,..."
+
+Some options for integration in various environments:
+
+* **AB_JOLOKIA_AUTH_OPENSHIFT** : Switch on client authentication for OpenShift TSL communication. The value of this
+  parameter can be a relative distinguished name which must be contained in a presented client certificate. Enabling this
+  parameter will automatically switch Jolokia into https communication mode. The default CA cert is set to
+  `/var/run/secrets/kubernetes.io/serviceaccount/ca.crt`
+
+
+undefined
+
 ### Versions:
 
 * Base-Image: **Alpine 3.10**
 * Java: **OpenJDK 7 1.7.0** (Java Runtime Environment (JRE))
-* Agent-Bond: **1.2.0** (Jolokia 1.6.2, jmx_exporter 0.3.1)
+* Jolokia: **1.6.2**
+* jmx_exporter: **undefined**
diff --git a/images/alpine/openjdk7/jre/agent-bond-opts b/images/alpine/openjdk7/jre/agent-bond-opts
deleted file mode 100644
index 280313b..0000000
--- a/images/alpine/openjdk7/jre/agent-bond-opts
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/bin/sh
-
-# Parse options
-while [ $# -gt 0 ]
-do
-key="$1"
-case ${key} in
-    # Escape for scripts which eval the output of this script
-    -e|--escape)
-    escape_sep=1
-    ;;
-esac
-shift
-done
-
-# Check whether a given config is contained in AB_JOLOKIA_OPTS
-is_in_jolokia_opts() {
-  local prop=$1
-  if [ -n "${AB_JOLOKIA_OPTS:-}" ] && [ "${AB_JOLOKIA_OPTS}" != "${AB_JOLOKIA_OPTS/${prop}/}" ]; then
-     echo "yes"
-  else
-     echo "no"
-  fi
-}
-
-dir=${AB_DIR:-/opt/agent-bond}
-sep="="
-
-# Options separators defined to avoid clash with fish-pepper templating
-ab_open_del="{""{"
-ab_close_del="}""}"
-if [ -n "${escape_sep:-}" ]; then
-  ab_open_del='\{\{'
-  ab_close_del='\}\}'
-fi
-
-if [ -z "${AB_OFF:-}" ]; then
-   opts="-javaagent:$dir/agent-bond.jar"
-   config="${AB_CONFIG:-$dir/agent-bond.properties}"
-   if [ -f "$config" ]; then
-      # Configuration takes precedence
-      opts="${opts}${sep}config=${config}"
-      sep=","
-   fi
-   if [ -z "${AB_ENABLED:-}" ] || [ "${AB_ENABLED}" != "${AB_ENABLED/jolokia/}" ]; then
-     # Direct options only if no configuration is found
-     jsep=""
-     jolokia_opts=""
-     if [ -n "${AB_JOLOKIA_CONFIG:-}" ] && [ -f "${AB_JOLOKIA_CONFIG}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}config=${AB_JOLOKIA_CONFIG}"
-        jsep=","
-        grep -q -e '^host' ${AB_JOLOKIA_CONFIG} && host_in_config=1
-     fi
-     if [ -z "${AB_JOLOKIA_HOST:-}" ] && [ -z "${host_in_config:-}" ]; then
-        AB_JOLOKIA_HOST='0.0.0.0'
-     fi
-     if [ -n "${AB_JOLOKIA_HOST:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}host=${AB_JOLOKIA_HOST}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_PORT:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}port=${AB_JOLOKIA_PORT}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_USER:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}user=${AB_JOLOKIA_USER}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_PASSWORD:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}password=${AB_JOLOKIA_PASSWORD}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_HTTPS:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}protocol=https"
-        https_used=1
-        jsep=","
-     fi
-     # Integration with OpenShift client cert auth
-     if [ -n "${AB_JOLOKIA_AUTH_OPENSHIFT:-}" ]; then
-        auth_opts="useSslClientAuthentication=true,extraClientCheck=true"
-        if [ -z "${https_used+x}" ]; then
-          auth_opts="${auth_opts},protocol=https"
-        fi
-        if [ $(is_in_jolokia_opts "caCert") != "yes" ]; then
-           auth_opts="${auth_opts},caCert=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
-        fi
-        if [ $(is_in_jolokia_opts "clientPrincipal") != "yes" ]; then
-           if [  "${AB_JOLOKIA_AUTH_OPENSHIFT}" != "${AB_JOLOKIA_AUTH_OPENSHIFT/=/}" ]; then
-              # Supposed to contain a principal name to check
-              auth_opts="${auth_opts},clientPrincipal=$(echo ${AB_JOLOKIA_AUTH_OPENSHIFT} | sed -e 's/ /\\\\ /g')"
-           else
-              auth_opts="${auth_opts},clientPrincipal=cn=system:master-proxy"
-           fi
-        fi
-        jolokia_opts="${jolokia_opts}${jsep}${auth_opts}"
-        jsep=","
-     fi
-     # Add extra opts to the end
-     if [ -n "${AB_JOLOKIA_OPTS:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}${AB_JOLOKIA_OPTS}"
-        jsep=","
-     fi
-
-     opts="${opts}${sep}jolokia${ab_open_del}${jolokia_opts}${ab_close_del}"
-     sep=","
-   fi
-   if [ -z "${AB_ENABLED:-}" ] || [ "${AB_ENABLED}" != "${AB_ENABLED/jmx_exporter/}" ]; then
-     je_opts=""
-     jsep=""
-     if [ -n "${AB_JMX_EXPORTER_OPTS:-}" ]; then
-        opts="${opts}${sep}jmx_exporter${ab_open_del}${AB_JMX_EXPORTER_OPTS}${ab_close_del}"
-        sep=","
-     else
-        port=${AB_JMX_EXPORTER_PORT:-9779}
-        config=${AB_JMX_EXPORTER_CONFIG:-/opt/agent-bond/jmx_exporter_config.yml}
-        opts="${opts}${sep}jmx_exporter${ab_open_del}${port}:${config}${ab_close_del}"
-        sep=","
-     fi
-   fi
-   if [ "${sep:-}" != '=' ] ; then
-     echo ${opts}
-   fi
-fi
diff --git a/images/alpine/openjdk7/jre/jmx_exporter_config.yml b/images/alpine/openjdk7/jre/jmx_exporter_config.yml
deleted file mode 100644
index 620cd4a..0000000
--- a/images/alpine/openjdk7/jre/jmx_exporter_config.yml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-lowercaseOutputName: true
-lowercaseOutputLabelNames: true
-whitelistObjectNames:
-  - 'org.apache.camel:*'
-rules:
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>((?:Min|Mean|Max|Last|Delta)(?:ProcessingTime)):'
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>(TotalProcessingTime):'
-    type: COUNTER
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>(ExchangesInflight|LastProcessingTime):'
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>((?:Exchanges(?:Completed|Failed|Total))|FailuresHandled):'
-    type: COUNTER
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
diff --git a/images/alpine/openjdk7/jre/jolokia-opts b/images/alpine/openjdk7/jre/jolokia-opts
new file mode 100644
index 0000000..1aa273e
--- /dev/null
+++ b/images/alpine/openjdk7/jre/jolokia-opts
@@ -0,0 +1,103 @@
+#!/bin/sh
+
+
+# Exit if switched off
+if [ -n "${AB_JOLOKIA_OFF:-}" ] && [ "${AB_JOLOKIA_OFF}" != "false" ]; then
+  exit 0
+fi
+
+# Global switch, turning of all agents
+if [ -n "${AB_OFF:-}" ] && [ "${AB_OFF}" != "false" ]; then
+  exit 0
+fi
+
+# Check whether a given config is contained in AB_JOLOKIA_OPTS
+is_in_jolokia_opts() {
+  local prop=$1
+  if [ -n "${AB_JOLOKIA_OPTS:-}" ] && [ "${AB_JOLOKIA_OPTS}" != "${AB_JOLOKIA_OPTS/${prop}/}" ]; then
+     echo "yes"
+  else
+     echo "no"
+  fi
+}
+
+get_jolokia_properties() {
+
+  echo "host=${AB_JOLOKIA_HOST:-*}"
+  echo "port=${AB_JOLOKIA_PORT:-8778}"
+  echo "discoveryEnabled=${AB_JOLOKIA_DISCOVERY_ENABLED:-false}"
+
+  if [ -n "${AB_JOLOKIA_PASSWORD:-}" ]; then
+     echo "user=${AB_JOLOKIA_USER:-jolokia}"
+     echo "password=${AB_JOLOKIA_PASSWORD}"
+  fi
+  if [ -n "${AB_JOLOKIA_HTTPS:-}" ]; then
+     echo "protocol=https"
+     https_used=1
+  fi
+
+  # Integration with OpenShift client cert auth is enabled
+  # by default if not explicitly turned off by setting to 'false'
+  if [ "${AB_JOLOKIA_AUTH_OPENSHIFT:-}" != "false" ] && [ -f "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt" ]; then
+     echo "useSslClientAuthentication=true"
+     echo "extraClientCheck=true"
+
+     # Check if the 'protocol' property has already been set to 'https'
+     # If not, then defaults to using HTTPS
+     if [ -z ${https_used+x} ]; then
+       echo "protocol=https"
+     fi
+     if [ $(is_in_jolokia_opts "caCert") != "yes" ]; then
+        echo "caCert=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
+     fi
+
+     if [ $(is_in_jolokia_opts "clientPrincipal") != "yes" ]; then
+        if [  "${AB_JOLOKIA_AUTH_OPENSHIFT}" != "${AB_JOLOKIA_AUTH_OPENSHIFT/=/}" ]; then
+           # Supposed to contain a principal name to check
+           echo "clientPrincipal=$(echo ${AB_JOLOKIA_AUTH_OPENSHIFT} | sed -e 's/ /\\\\ /g')"
+        else
+           echo "clientPrincipal=cn=system:master-proxy"
+        fi
+     fi
+  fi
+
+  # Add extra opts
+  if [ -n "${AB_JOLOKIA_OPTS:-}" ]; then
+     echo "${AB_JOLOKIA_OPTS}" | tr "," "\n"
+  fi
+
+}
+
+write_jolokia_properties() {
+  local jolokia_property_file="$1"
+
+  # Setup Jolokia to accept basic auth, using a randomly generated password that is stored
+  # in the container in the ${DEPLOYMENTS_DIR}/jolokia.pw file.
+  if [ "${AB_JOLOKIA_PASSWORD_RANDOM:-}" == "true" ]; then
+    pw_file="/opt/jolokia/etc/jolokia.pw"
+    if [ -f "${pw_file}" ] ; then
+      AB_JOLOKIA_PASSWORD=$(cat "${pw_file}")
+    else
+      AB_JOLOKIA_PASSWORD=$(tr -cd '[:alnum:]' < /dev/urandom | fold -w30 | head -n1)
+      touch "${pw_file}"
+      chmod 660 "${pw_file}"
+      cat > "${pw_file}" <<EOF
+$AB_JOLOKIA_PASSWORD
+EOF
+    fi
+    export AB_JOLOKIA_PASSWORD
+  fi
+
+  touch "${jolokia_property_file}"
+  chmod 660 "${jolokia_property_file}"
+  cat > "${jolokia_property_file}" <<EOF
+$(get_jolokia_properties)
+EOF
+
+}
+
+if [ -z "${AB_JOLOKIA_CONFIG:-}" ]; then
+  AB_JOLOKIA_CONFIG="/opt/jolokia/etc/jolokia.properties"
+  write_jolokia_properties "$AB_JOLOKIA_CONFIG"
+fi
+echo "-javaagent:/opt/jolokia/jolokia.jar=config=${AB_JOLOKIA_CONFIG}"
diff --git a/images/alpine/openjdk7/jre/prometheus-config.yml b/images/alpine/openjdk7/jre/prometheus-config.yml
new file mode 100644
index 0000000..f6eaa2b
--- /dev/null
+++ b/images/alpine/openjdk7/jre/prometheus-config.yml
@@ -0,0 +1,586 @@
+startDelaySecs: 5
+ssl: false
+blacklistObjectNames: ["java.lang:*"]
+rules:
+# Context level
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesCompleted'
+    name: org.apache.camel.ExchangesCompleted
+    help: Exchanges Completed
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesFailed'
+    name: org.apache.camel.ExchangesFailed
+    help: Exchanges Failed
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesInflight'
+    name: org.apache.camel.ExchangesInflight
+    help: Exchanges Inflight
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>FailuresHandled'
+    name: org.apache.camel.FailuresHandled
+    help: Failures Handled
+    labels:
+        context: $1
+        type: context
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExternalRedeliveries'
+    name: org.apache.camel.ExternalRedeliveries
+    help: External Redeliveries
+    labels:
+        context: $1
+        type: context
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>MaxProcessingTime'
+    name: org.apache.camel.MaxProcessingTime
+    help: Maximum Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>MeanProcessingTime'
+    name: org.apache.camel.MeanProcessingTime
+    help: Mean Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>MinProcessingTime'
+    name: org.apache.camel.MinProcessingTime
+    help: Minimum Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>LastProcessingTime'
+    name: org.apache.camel.LastProcessingTime
+    help: Last Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>DeltaProcessingTime'
+    name: org.apache.camel.DeltaProcessingTime
+    help: Delta Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>Redeliveries'
+    name: org.apache.camel.Redeliveries
+    help: Redeliveries
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>TotalProcessingTime'
+    name: org.apache.camel.TotalProcessingTime
+    help: Total Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=consumers, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+
+
+# Route level
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesCompleted'
+    name: org.apache.camel.ExchangesCompleted
+    help: Exchanges Completed
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesFailed'
+    name: org.apache.camel.ExchangesFailed
+    help: Exchanges Failed
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesInflight'
+    name: org.apache.camel.ExchangesInflight
+    help: Exchanges Inflight
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>FailuresHandled'
+    name: org.apache.camel.FailuresHandled
+    help: Failures Handled
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExternalRedeliveries'
+    name: org.apache.camel.ExternalRedeliveries
+    help: External Redeliveries
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>MaxProcessingTime'
+    name: org.apache.camel.MaxProcessingTime
+    help: Maximum Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>MeanProcessingTime'
+    name: org.apache.camel.MeanProcessingTime
+    help: Mean Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>MinProcessingTime'
+    name: org.apache.camel.MinProcessingTime
+    help: Minimum Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>LastProcessingTime'
+    name: org.apache.camel.LastProcessingTime
+    help: Last Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>DeltaProcessingTime'
+    name: org.apache.camel.DeltaProcessingTime
+    help: Delta Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>Redeliveries'
+    name: org.apache.camel.Redeliveries
+    help: Redeliveries
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>TotalProcessingTime'
+    name: org.apache.camel.TotalProcessingTime
+    help: Total Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+
+# Processor level
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesCompleted'
+    name: org.apache.camel.ExchangesCompleted
+    help: Exchanges Completed
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesFailed'
+    name: org.apache.camel.ExchangesFailed
+    help: Exchanges Failed
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesInflight'
+    name: org.apache.camel.ExchangesInflight
+    help: Exchanges Inflight
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>FailuresHandled'
+    name: org.apache.camel.FailuresHandled
+    help: Failures Handled
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExternalRedeliveries'
+    name: org.apache.camel.ExternalRedeliveries
+    help: External Redeliveries
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>MaxProcessingTime'
+    name: org.apache.camel.MaxProcessingTime
+    help: Maximum Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>MeanProcessingTime'
+    name: org.apache.camel.MeanProcessingTime
+    help: Mean Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>MinProcessingTime'
+    name: org.apache.camel.MinProcessingTime
+    help: Minimum Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>LastProcessingTime'
+    name: org.apache.camel.LastProcessingTime
+    help: Last Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>DeltaProcessingTime'
+    name: org.apache.camel.DeltaProcessingTime
+    help: Delta Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>Redeliveries'
+    name: org.apache.camel.Redeliveries
+    help: Redeliveries
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>TotalProcessingTime'
+    name: org.apache.camel.TotalProcessingTime
+    help: Total Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: COUNTER
+
+# Consumers
+  - pattern: 'org.apache.camel<context=([^,]+), type=consumers, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        consumer: $2
+        type: consumers
+    type: GAUGE
+
+# Services
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>MaxDuration'
+    name: org.apache.camel.MaxDuration
+    help: Maximum Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>MeanDuration'
+    name: org.apache.camel.MeanDuration
+    help: Mean Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>MinDuration'
+    name: org.apache.camel.MinDuration
+    help: Minimum Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>TotalDuration'
+    name: org.apache.camel.TotalDuration
+    help: Total Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>ThreadsBlocked'
+    name: org.apache.camel.ThreadsBlocked
+    help: Threads Blocked
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>ThreadsInterrupted'
+    name: org.apache.camel.ThreadsInterrupted
+    help: Threads Interrupted
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumLogicalRuntimeFaults'
+    name: org.apache.cxf.NumLogicalRuntimeFaults
+    help: Number of logical runtime faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumLogicalRuntimeFaults'
+    name: org.apache.cxf.NumLogicalRuntimeFaults
+    help: Number of logical runtime faults
+    type: GAUGE
+    labels:
+       bus.id: $1
+       type: $2
+       service: $3
+       port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>AvgResponseTime'
+    name: org.apache.cxf.AvgResponseTime
+    help: Average Response Time
+    type: GAUGE
+    labels:
+       bus.id: $1
+       type: $2
+       service: $3
+       port: $4
+       operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>AvgResponseTime'
+    name: org.apache.cxf.AvgResponseTime
+    help: Average Response Time
+    type: GAUGE
+    labels:
+          bus.id: $1
+          type: $2
+          service: $3
+          port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumInvocations'
+    name: org.apache.cxf.NumInvocations
+    help: Number of invocations
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumInvocations'
+    name: org.apache.cxf.NumInvocations
+    help: Number of invocations
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>MaxResponseTime'
+    name: org.apache.cxf.MaxResponseTime
+    help: Maximum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>MaxResponseTime'
+    name: org.apache.cxf.MaxResponseTime
+    help: Maximum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>MinResponseTime'
+    name: org.apache.cxf.MinResponseTime
+    help: Minimum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>MinResponseTime'
+    name: org.apache.cxf.MinResponseTime
+    help: Minimum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>TotalHandlingTime'
+    name: org.apache.cxf.TotalHandlingTime
+    help: Total Handling Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>TotalHandlingTime'
+    name: org.apache.cxf.TotalHandlingTime
+    help: Total Handling Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumRuntimeFaults'
+    name: org.apache.cxf.NumRuntimeFaults
+    help: Number of runtime faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumRuntimeFaults'
+    name: org.apache.cxf.NumRuntimeFaults
+    help: Number of runtime faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumUnCheckedApplicationFaults'
+    name: org.apache.cxf.NumUnCheckedApplicationFaults
+    help: Number of unchecked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumUnCheckedApplicationFaults'
+    name: org.apache.cxf.NumUnCheckedApplicationFaults
+    help: Number of unchecked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumCheckedApplicationFaults'
+    name: org.apache.cxf.NumCheckedApplicationFaults
+    help: Number of checked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumCheckedApplicationFaults'
+    name: org.apache.cxf.NumCheckedApplicationFaults
+    help: Number of checked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
diff --git a/images/alpine/openjdk7/jre/prometheus-opts b/images/alpine/openjdk7/jre/prometheus-opts
new file mode 100644
index 0000000..3c43968
--- /dev/null
+++ b/images/alpine/openjdk7/jre/prometheus-opts
@@ -0,0 +1,23 @@
+#!/bin/sh
+# Scripted for getting Prometheus options
+# meant to be evaluated (not to be sourced)
+
+# Exit if switched off
+if [ -n "${AB_PROMETHEUS_OFF:-}" ] && [ "${AB_PROMETHEUS_OFF}" != "false" ]; then
+  exit 0
+fi
+
+# Global switch, turning of all agents
+if [ -n "${AB_OFF:-}" ] && [ "${AB_OFF}" != "false" ]; then
+  exit 0
+fi
+
+port=${AB_PROMETHEUS_PORT:-9779}
+config=${AB_PROMETHEUS_CONFIG:-/opt/prometheus/prometheus-config.yml}
+if [ -n "${AB_PROMETHEUS_HOST:-}" ]; then
+  hostPort="${AB_PROMETHEUS_HOST}:$port"
+else
+  hostPort="$port"
+fi
+
+echo "-javaagent:/opt/prometheus/jmx_prometheus_javaagent.jar=${hostPort}:$config"
diff --git a/images/alpine/openjdk7/jre/run-java-options b/images/alpine/openjdk7/jre/run-java-options
new file mode 100644
index 0000000..759dee7
--- /dev/null
+++ b/images/alpine/openjdk7/jre/run-java-options
@@ -0,0 +1,4 @@
+#!/bin/bash
+# Delegate to the individual agent options scripts which will
+# examine the environment for features to be enabled
+echo "$(/opt/jolokia/jolokia-opts) $(/opt/prometheus/prometheus-opts)"
diff --git a/images/alpine/openjdk8/jdk/Dockerfile b/images/alpine/openjdk8/jdk/Dockerfile
index 91d5ee7..c5a4af7 100644
--- a/images/alpine/openjdk8/jdk/Dockerfile
+++ b/images/alpine/openjdk8/jdk/Dockerfile
@@ -17,20 +17,39 @@ RUN apk add --update \
  && rm /var/cache/apk/* \
  && echo "securerandom.source=file:/dev/urandom" >> /usr/lib/jvm/default-jvm/jre/lib/security/java.security
 
-# Agent bond including Jolokia and jmx_exporter
-ADD agent-bond-opts /opt/run-java-options
-RUN mkdir -p /opt/agent-bond \
- && curl http://central.maven.org/maven2/io/fabric8/agent-bond-agent/1.2.0/agent-bond-agent-1.2.0.jar \
-          -o /opt/agent-bond/agent-bond.jar \
- && chmod 444 /opt/agent-bond/agent-bond.jar \
- && chmod 755 /opt/run-java-options
-ADD jmx_exporter_config.yml /opt/agent-bond/
-EXPOSE 8778 9779
+# Prometheus JMX exporter agent
+RUN mkdir -p /opt/prometheus/etc \
+ && curl http://central.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/undefined/jmx_prometheus_javaagent-undefined.jar \
+          -o /opt/prometheus/jmx_prometheus_javaagent.jar
+ADD prometheus-opts /opt/prometheus/prometheus-opts
+ADD prometheus-config.yml /opt/prometheus/prometheus-config.yml
+RUN chmod 444 /opt/prometheus/jmx_prometheus_javaagent.jar \
+ && chmod 444 /opt/prometheus/prometheus-config.yml \
+ && chmod 755 /opt/prometheus/prometheus-opts \
+ && chmod 775 /opt/prometheus/etc \
+ && chgrp root /opt/prometheus/etc
+
+EXPOSE 9779
+
+
+# Jolokia agent
+RUN mkdir -p /opt/jolokia/etc \
+ && curl http://central.maven.org/maven2/org/jolokia/jolokia-jvm/1.6.2/jolokia-jvm-1.6.2-agent.jar \
+         -o /opt/jolokia/jolokia.jar
+ADD jolokia-opts /opt/jolokia/jolokia-opts
+RUN chmod 444 /opt/jolokia/jolokia.jar \
+ && chmod 755 /opt/jolokia/jolokia-opts \
+ && chmod 775 /opt/jolokia/etc \
+ && chgrp root /opt/jolokia/etc
+
+EXPOSE 8778
+
 
 # Add run script as /deployments/run-java.sh and make it executable
 COPY run-java.sh /deployments/
 RUN chmod 755 /deployments/run-java.sh
 
+COPY run-java-options /opt
 
 
 
diff --git a/images/alpine/openjdk8/jdk/README.md b/images/alpine/openjdk8/jdk/README.md
index 00e11d4..99a7054 100644
--- a/images/alpine/openjdk8/jdk/README.md
+++ b/images/alpine/openjdk8/jdk/README.md
@@ -1,72 +1,12 @@
 ## Fabric8 Java Base Image OpenJDK 8 (JDK)
 
-
-
 This image is based on Alpine and provides OpenJDK 8 (JDK)
 
 It includes:
 
-
-* An [Agent Bond](https://github.com/fabric8io/agent-bond) agent with [Jolokia](http://www.jolokia.org) and Prometheus' [jmx_exporter](https://github.com/prometheus/jmx_exporter). The agent is installed as `/opt/agent-bond/agent-bond.jar`. See below for configuration options.
-
-
 * A startup script [`/deployments/run-java.sh`](#startup-script-run-javash) for starting up Java applications.
-
-### Agent Bond
-
-In order to enable Jolokia for your application you should use this image as a base image (via `FROM`) and use the output of `agent-bond-opts` in your startup scripts to include it in for the Java startup options.
-
-For example, the following snippet can be added to a script starting up your Java application
-
-    # ...
-    export JAVA_OPTIONS="$JAVA_OPTIONS $(agent-bond-opts)"
-    # .... use JAVA_OPTIONS when starting your app, e.g. as Tomcat does
-
-The following versions and defaults are used:
-
-* [Jolokia](http://www.jolokia.org) : version **1.6.2** and port **8778**
-* [jmx_exporter](https://github.com/prometheus/jmx_exporter): version **0.3.1** and port **9779**
-
-You can influence the behaviour of `agent-bond-opts` by setting various environment variables:
-
-### Agent-Bond Options
-
-Agent bond itself can be influenced with the following environment variables: 
-
-* **AB_OFF** : If set disables activation of agent-bond (i.e. echos an empty value). By default, agent-bond is enabled.
-* **AB_ENABLED** : Comma separated list of sub-agents enabled. Currently allowed values are `jolokia` and `jmx_exporter`. 
-  By default both are enabled.
-
-
-#### Jolokia configuration
-
-* **AB_JOLOKIA_CONFIG** : If set uses this file (including path) as Jolokia JVM agent properties (as described 
-  in Jolokia's [reference manual](http://www.jolokia.org/reference/html/agents.html#agents-jvm)).
-  By default this is `/opt/jolokia/jolokia.properties`.
-* **AB_JOLOKIA_HOST** : Host address to bind to (Default: `0.0.0.0`)
-* **AB_JOLOKIA_PORT** : Port to use (Default: `8778`)
-* **AB_JOLOKIA_USER** : User for authentication. By default authentication is switched off.
-* **AB_JOLOKIA_HTTPS** : Switch on secure communication with https. By default self signed server certificates are generated
-  if no `serverCert` configuration is given in `AB_JOLOKIA_OPTS`
-* **AB_JOLOKIA_PASSWORD** : Password for authentication. By default authentication is switched off.
-* **AB_JOLOKIA_ID** : Agent ID to use (`$HOSTNAME` by default, which is the container id)
-* **AB_JOLOKIA_OPTS**  : Additional options to be appended to the agent opts. They should be given in the format 
-  "key=value,key=value,..."
-
-Some options for integration in various environments:
-
-* **AB_JOLOKIA_AUTH_OPENSHIFT** : Switch on client authentication for OpenShift TLS communication. The value of this 
-  parameter can be a relative distinguished name which must be contained in a presented client certificate. Enabling this
-  parameter will automatically switch Jolokia into https communication mode. The default CA cert is set to 
-  `/var/run/secrets/kubernetes.io/serviceaccount/ca.crt` 
-  
-#### jmx_exporter configuration
-
-* **AB_JMX_EXPORTER_OPTS** : Configuration to use for `jmx_exporter` (in the format `<port>:<path to config>`)
-* **AB_JMX_EXPORTER_PORT** : Port to use for the JMX Exporter. Default: `9779`
-* **AB_JMX_EXPORTER_CONFIG** : Path to configuration to use for `jmx_exporter`: Default: `/opt/agent-bond/jmx_exporter_config.json`
-
-
+* [Jolokia](http://www.jolokia.org) agent installed in `/opt/jolokia`
+* Prometheus [jmx_exporter](https://github.com/prometheus/jmx_exporter) agent installed in `/opt/jmx_exporter`.
 
 ### Startup Script run-java.sh
 
@@ -177,8 +117,55 @@ mvn clean install
 ```
 
 
+### Monitoring Agents
+
+In order to enable Jolokia and Prometheus exporter for your application you should use this image as a base image (via `FROM`) and use the output of `jolokia-opts` and `prometheus-opts` in your startup scripts to include it in for the Java startup options. You can also just use the provided startup script `/opt/run-java.sh` which does this automatically.
+
+For example, the following snippet can be added to a script starting up your Java application
+
+    # ...
+    export JAVA_OPTIONS="$JAVA_OPTIONS $(/opt/jolokia/jolokia-opts) $(/opt/prometheus/prometheus-opts)"
+    # .... use JAVA_OPTIONS when starting your app, e.g. as Tomcat does
+
+The following versions and defaults are used:
+
+* [Jolokia](http://www.jolokia.org) : version **1.6.2** and port **8778**
+* [jmx_exporter](https://github.com/prometheus/jmx_exporter): version **0.3.1** and port **9779**
+
+You can influence the behaviour of these config scripts by setting various environment variables.
+
+#### Jolokia Configuration
+
+* **AB_JOLOKIA_OFF** : If set disables activation of Jolokia (i.e. echos an empty value). By default, Jolokia is enabled.
+* **AB_JOLOKIA_CONFIG** : If set uses this file (including path) as Jolokia JVM agent properties (as described
+  in Jolokia's [reference manual](http://www.jolokia.org/reference/html/agents.html#agents-jvm)). If not set,
+  the `/opt/jolokia/etc/jolokia.properties` will be created using the settings as defined in this document, otherwise
+  the reset of the settings in this document are ignored.
+* **AB_JOLOKIA_HOST** : Host address to bind to (Default: `0.0.0.0`)
+* **AB_JOLOKIA_PORT** : Port to use (Default: `8778`)
+* **AB_JOLOKIA_USER** : User for basic authentication. Defaults to 'jolokia'
+* **AB_JOLOKIA_PASSWORD** : Password for basic authentication. By default authentication is switched off.
+* **AB_JOLOKIA_PASSWORD_RANDOM** : Should a random AB_JOLOKIA_PASSWORD be generated? Generated value will be written to `/opt/jolokia/etc/jolokia.pw`
+* **AB_JOLOKIA_HTTPS** : Switch on secure communication with https. By default self signed server certificates are generated
+  if no `serverCert` configuration is given in `AB_JOLOKIA_OPTS`
+* **AB_JOLOKIA_ID** : Agent ID to use (`$HOSTNAME` by default, which is the container id)
+* **AB_JOLOKIA_DISCOVERY_ENABLED** : Enable Jolokia discovery.  Defaults to false.
+* **AB_JOLOKIA_OPTS**  : Additional options to be appended to the agent configuration. They should be given in the format
+  "key=value,key=value,..."
+
+Some options for integration in various environments:
+
+* **AB_JOLOKIA_AUTH_OPENSHIFT** : Switch on client authentication for OpenShift TSL communication. The value of this
+  parameter can be a relative distinguished name which must be contained in a presented client certificate. Enabling this
+  parameter will automatically switch Jolokia into https communication mode. The default CA cert is set to
+  `/var/run/secrets/kubernetes.io/serviceaccount/ca.crt`
+
+
+undefined
+
 ### Versions:
 
 * Base-Image: **Alpine 3.10**
 * Java: **OpenJDK 8 1.8.0** (Java Development Kit (JDK))
-* Agent-Bond: **1.2.0** (Jolokia 1.6.2, jmx_exporter 0.3.1)
+* Jolokia: **1.6.2**
+* jmx_exporter: **undefined**
diff --git a/images/alpine/openjdk8/jdk/agent-bond-opts b/images/alpine/openjdk8/jdk/agent-bond-opts
deleted file mode 100644
index 280313b..0000000
--- a/images/alpine/openjdk8/jdk/agent-bond-opts
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/bin/sh
-
-# Parse options
-while [ $# -gt 0 ]
-do
-key="$1"
-case ${key} in
-    # Escape for scripts which eval the output of this script
-    -e|--escape)
-    escape_sep=1
-    ;;
-esac
-shift
-done
-
-# Check whether a given config is contained in AB_JOLOKIA_OPTS
-is_in_jolokia_opts() {
-  local prop=$1
-  if [ -n "${AB_JOLOKIA_OPTS:-}" ] && [ "${AB_JOLOKIA_OPTS}" != "${AB_JOLOKIA_OPTS/${prop}/}" ]; then
-     echo "yes"
-  else
-     echo "no"
-  fi
-}
-
-dir=${AB_DIR:-/opt/agent-bond}
-sep="="
-
-# Options separators defined to avoid clash with fish-pepper templating
-ab_open_del="{""{"
-ab_close_del="}""}"
-if [ -n "${escape_sep:-}" ]; then
-  ab_open_del='\{\{'
-  ab_close_del='\}\}'
-fi
-
-if [ -z "${AB_OFF:-}" ]; then
-   opts="-javaagent:$dir/agent-bond.jar"
-   config="${AB_CONFIG:-$dir/agent-bond.properties}"
-   if [ -f "$config" ]; then
-      # Configuration takes precedence
-      opts="${opts}${sep}config=${config}"
-      sep=","
-   fi
-   if [ -z "${AB_ENABLED:-}" ] || [ "${AB_ENABLED}" != "${AB_ENABLED/jolokia/}" ]; then
-     # Direct options only if no configuration is found
-     jsep=""
-     jolokia_opts=""
-     if [ -n "${AB_JOLOKIA_CONFIG:-}" ] && [ -f "${AB_JOLOKIA_CONFIG}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}config=${AB_JOLOKIA_CONFIG}"
-        jsep=","
-        grep -q -e '^host' ${AB_JOLOKIA_CONFIG} && host_in_config=1
-     fi
-     if [ -z "${AB_JOLOKIA_HOST:-}" ] && [ -z "${host_in_config:-}" ]; then
-        AB_JOLOKIA_HOST='0.0.0.0'
-     fi
-     if [ -n "${AB_JOLOKIA_HOST:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}host=${AB_JOLOKIA_HOST}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_PORT:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}port=${AB_JOLOKIA_PORT}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_USER:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}user=${AB_JOLOKIA_USER}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_PASSWORD:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}password=${AB_JOLOKIA_PASSWORD}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_HTTPS:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}protocol=https"
-        https_used=1
-        jsep=","
-     fi
-     # Integration with OpenShift client cert auth
-     if [ -n "${AB_JOLOKIA_AUTH_OPENSHIFT:-}" ]; then
-        auth_opts="useSslClientAuthentication=true,extraClientCheck=true"
-        if [ -z "${https_used+x}" ]; then
-          auth_opts="${auth_opts},protocol=https"
-        fi
-        if [ $(is_in_jolokia_opts "caCert") != "yes" ]; then
-           auth_opts="${auth_opts},caCert=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
-        fi
-        if [ $(is_in_jolokia_opts "clientPrincipal") != "yes" ]; then
-           if [  "${AB_JOLOKIA_AUTH_OPENSHIFT}" != "${AB_JOLOKIA_AUTH_OPENSHIFT/=/}" ]; then
-              # Supposed to contain a principal name to check
-              auth_opts="${auth_opts},clientPrincipal=$(echo ${AB_JOLOKIA_AUTH_OPENSHIFT} | sed -e 's/ /\\\\ /g')"
-           else
-              auth_opts="${auth_opts},clientPrincipal=cn=system:master-proxy"
-           fi
-        fi
-        jolokia_opts="${jolokia_opts}${jsep}${auth_opts}"
-        jsep=","
-     fi
-     # Add extra opts to the end
-     if [ -n "${AB_JOLOKIA_OPTS:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}${AB_JOLOKIA_OPTS}"
-        jsep=","
-     fi
-
-     opts="${opts}${sep}jolokia${ab_open_del}${jolokia_opts}${ab_close_del}"
-     sep=","
-   fi
-   if [ -z "${AB_ENABLED:-}" ] || [ "${AB_ENABLED}" != "${AB_ENABLED/jmx_exporter/}" ]; then
-     je_opts=""
-     jsep=""
-     if [ -n "${AB_JMX_EXPORTER_OPTS:-}" ]; then
-        opts="${opts}${sep}jmx_exporter${ab_open_del}${AB_JMX_EXPORTER_OPTS}${ab_close_del}"
-        sep=","
-     else
-        port=${AB_JMX_EXPORTER_PORT:-9779}
-        config=${AB_JMX_EXPORTER_CONFIG:-/opt/agent-bond/jmx_exporter_config.yml}
-        opts="${opts}${sep}jmx_exporter${ab_open_del}${port}:${config}${ab_close_del}"
-        sep=","
-     fi
-   fi
-   if [ "${sep:-}" != '=' ] ; then
-     echo ${opts}
-   fi
-fi
diff --git a/images/alpine/openjdk8/jdk/jmx_exporter_config.yml b/images/alpine/openjdk8/jdk/jmx_exporter_config.yml
deleted file mode 100644
index 620cd4a..0000000
--- a/images/alpine/openjdk8/jdk/jmx_exporter_config.yml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-lowercaseOutputName: true
-lowercaseOutputLabelNames: true
-whitelistObjectNames:
-  - 'org.apache.camel:*'
-rules:
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>((?:Min|Mean|Max|Last|Delta)(?:ProcessingTime)):'
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>(TotalProcessingTime):'
-    type: COUNTER
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>(ExchangesInflight|LastProcessingTime):'
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>((?:Exchanges(?:Completed|Failed|Total))|FailuresHandled):'
-    type: COUNTER
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
diff --git a/images/alpine/openjdk8/jdk/jolokia-opts b/images/alpine/openjdk8/jdk/jolokia-opts
new file mode 100644
index 0000000..1aa273e
--- /dev/null
+++ b/images/alpine/openjdk8/jdk/jolokia-opts
@@ -0,0 +1,103 @@
+#!/bin/sh
+
+
+# Exit if switched off
+if [ -n "${AB_JOLOKIA_OFF:-}" ] && [ "${AB_JOLOKIA_OFF}" != "false" ]; then
+  exit 0
+fi
+
+# Global switch, turning of all agents
+if [ -n "${AB_OFF:-}" ] && [ "${AB_OFF}" != "false" ]; then
+  exit 0
+fi
+
+# Check whether a given config is contained in AB_JOLOKIA_OPTS
+is_in_jolokia_opts() {
+  local prop=$1
+  if [ -n "${AB_JOLOKIA_OPTS:-}" ] && [ "${AB_JOLOKIA_OPTS}" != "${AB_JOLOKIA_OPTS/${prop}/}" ]; then
+     echo "yes"
+  else
+     echo "no"
+  fi
+}
+
+get_jolokia_properties() {
+
+  echo "host=${AB_JOLOKIA_HOST:-*}"
+  echo "port=${AB_JOLOKIA_PORT:-8778}"
+  echo "discoveryEnabled=${AB_JOLOKIA_DISCOVERY_ENABLED:-false}"
+
+  if [ -n "${AB_JOLOKIA_PASSWORD:-}" ]; then
+     echo "user=${AB_JOLOKIA_USER:-jolokia}"
+     echo "password=${AB_JOLOKIA_PASSWORD}"
+  fi
+  if [ -n "${AB_JOLOKIA_HTTPS:-}" ]; then
+     echo "protocol=https"
+     https_used=1
+  fi
+
+  # Integration with OpenShift client cert auth is enabled
+  # by default if not explicitly turned off by setting to 'false'
+  if [ "${AB_JOLOKIA_AUTH_OPENSHIFT:-}" != "false" ] && [ -f "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt" ]; then
+     echo "useSslClientAuthentication=true"
+     echo "extraClientCheck=true"
+
+     # Check if the 'protocol' property has already been set to 'https'
+     # If not, then defaults to using HTTPS
+     if [ -z ${https_used+x} ]; then
+       echo "protocol=https"
+     fi
+     if [ $(is_in_jolokia_opts "caCert") != "yes" ]; then
+        echo "caCert=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
+     fi
+
+     if [ $(is_in_jolokia_opts "clientPrincipal") != "yes" ]; then
+        if [  "${AB_JOLOKIA_AUTH_OPENSHIFT}" != "${AB_JOLOKIA_AUTH_OPENSHIFT/=/}" ]; then
+           # Supposed to contain a principal name to check
+           echo "clientPrincipal=$(echo ${AB_JOLOKIA_AUTH_OPENSHIFT} | sed -e 's/ /\\\\ /g')"
+        else
+           echo "clientPrincipal=cn=system:master-proxy"
+        fi
+     fi
+  fi
+
+  # Add extra opts
+  if [ -n "${AB_JOLOKIA_OPTS:-}" ]; then
+     echo "${AB_JOLOKIA_OPTS}" | tr "," "\n"
+  fi
+
+}
+
+write_jolokia_properties() {
+  local jolokia_property_file="$1"
+
+  # Setup Jolokia to accept basic auth, using a randomly generated password that is stored
+  # in the container in the ${DEPLOYMENTS_DIR}/jolokia.pw file.
+  if [ "${AB_JOLOKIA_PASSWORD_RANDOM:-}" == "true" ]; then
+    pw_file="/opt/jolokia/etc/jolokia.pw"
+    if [ -f "${pw_file}" ] ; then
+      AB_JOLOKIA_PASSWORD=$(cat "${pw_file}")
+    else
+      AB_JOLOKIA_PASSWORD=$(tr -cd '[:alnum:]' < /dev/urandom | fold -w30 | head -n1)
+      touch "${pw_file}"
+      chmod 660 "${pw_file}"
+      cat > "${pw_file}" <<EOF
+$AB_JOLOKIA_PASSWORD
+EOF
+    fi
+    export AB_JOLOKIA_PASSWORD
+  fi
+
+  touch "${jolokia_property_file}"
+  chmod 660 "${jolokia_property_file}"
+  cat > "${jolokia_property_file}" <<EOF
+$(get_jolokia_properties)
+EOF
+
+}
+
+if [ -z "${AB_JOLOKIA_CONFIG:-}" ]; then
+  AB_JOLOKIA_CONFIG="/opt/jolokia/etc/jolokia.properties"
+  write_jolokia_properties "$AB_JOLOKIA_CONFIG"
+fi
+echo "-javaagent:/opt/jolokia/jolokia.jar=config=${AB_JOLOKIA_CONFIG}"
diff --git a/images/alpine/openjdk8/jdk/prometheus-config.yml b/images/alpine/openjdk8/jdk/prometheus-config.yml
new file mode 100644
index 0000000..f6eaa2b
--- /dev/null
+++ b/images/alpine/openjdk8/jdk/prometheus-config.yml
@@ -0,0 +1,586 @@
+startDelaySecs: 5
+ssl: false
+blacklistObjectNames: ["java.lang:*"]
+rules:
+# Context level
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesCompleted'
+    name: org.apache.camel.ExchangesCompleted
+    help: Exchanges Completed
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesFailed'
+    name: org.apache.camel.ExchangesFailed
+    help: Exchanges Failed
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesInflight'
+    name: org.apache.camel.ExchangesInflight
+    help: Exchanges Inflight
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>FailuresHandled'
+    name: org.apache.camel.FailuresHandled
+    help: Failures Handled
+    labels:
+        context: $1
+        type: context
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExternalRedeliveries'
+    name: org.apache.camel.ExternalRedeliveries
+    help: External Redeliveries
+    labels:
+        context: $1
+        type: context
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>MaxProcessingTime'
+    name: org.apache.camel.MaxProcessingTime
+    help: Maximum Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>MeanProcessingTime'
+    name: org.apache.camel.MeanProcessingTime
+    help: Mean Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>MinProcessingTime'
+    name: org.apache.camel.MinProcessingTime
+    help: Minimum Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>LastProcessingTime'
+    name: org.apache.camel.LastProcessingTime
+    help: Last Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>DeltaProcessingTime'
+    name: org.apache.camel.DeltaProcessingTime
+    help: Delta Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>Redeliveries'
+    name: org.apache.camel.Redeliveries
+    help: Redeliveries
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>TotalProcessingTime'
+    name: org.apache.camel.TotalProcessingTime
+    help: Total Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=consumers, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+
+
+# Route level
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesCompleted'
+    name: org.apache.camel.ExchangesCompleted
+    help: Exchanges Completed
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesFailed'
+    name: org.apache.camel.ExchangesFailed
+    help: Exchanges Failed
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesInflight'
+    name: org.apache.camel.ExchangesInflight
+    help: Exchanges Inflight
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>FailuresHandled'
+    name: org.apache.camel.FailuresHandled
+    help: Failures Handled
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExternalRedeliveries'
+    name: org.apache.camel.ExternalRedeliveries
+    help: External Redeliveries
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>MaxProcessingTime'
+    name: org.apache.camel.MaxProcessingTime
+    help: Maximum Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>MeanProcessingTime'
+    name: org.apache.camel.MeanProcessingTime
+    help: Mean Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>MinProcessingTime'
+    name: org.apache.camel.MinProcessingTime
+    help: Minimum Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>LastProcessingTime'
+    name: org.apache.camel.LastProcessingTime
+    help: Last Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>DeltaProcessingTime'
+    name: org.apache.camel.DeltaProcessingTime
+    help: Delta Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>Redeliveries'
+    name: org.apache.camel.Redeliveries
+    help: Redeliveries
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>TotalProcessingTime'
+    name: org.apache.camel.TotalProcessingTime
+    help: Total Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+
+# Processor level
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesCompleted'
+    name: org.apache.camel.ExchangesCompleted
+    help: Exchanges Completed
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesFailed'
+    name: org.apache.camel.ExchangesFailed
+    help: Exchanges Failed
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesInflight'
+    name: org.apache.camel.ExchangesInflight
+    help: Exchanges Inflight
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>FailuresHandled'
+    name: org.apache.camel.FailuresHandled
+    help: Failures Handled
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExternalRedeliveries'
+    name: org.apache.camel.ExternalRedeliveries
+    help: External Redeliveries
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>MaxProcessingTime'
+    name: org.apache.camel.MaxProcessingTime
+    help: Maximum Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>MeanProcessingTime'
+    name: org.apache.camel.MeanProcessingTime
+    help: Mean Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>MinProcessingTime'
+    name: org.apache.camel.MinProcessingTime
+    help: Minimum Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>LastProcessingTime'
+    name: org.apache.camel.LastProcessingTime
+    help: Last Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>DeltaProcessingTime'
+    name: org.apache.camel.DeltaProcessingTime
+    help: Delta Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>Redeliveries'
+    name: org.apache.camel.Redeliveries
+    help: Redeliveries
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>TotalProcessingTime'
+    name: org.apache.camel.TotalProcessingTime
+    help: Total Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: COUNTER
+
+# Consumers
+  - pattern: 'org.apache.camel<context=([^,]+), type=consumers, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        consumer: $2
+        type: consumers
+    type: GAUGE
+
+# Services
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>MaxDuration'
+    name: org.apache.camel.MaxDuration
+    help: Maximum Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>MeanDuration'
+    name: org.apache.camel.MeanDuration
+    help: Mean Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>MinDuration'
+    name: org.apache.camel.MinDuration
+    help: Minimum Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>TotalDuration'
+    name: org.apache.camel.TotalDuration
+    help: Total Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>ThreadsBlocked'
+    name: org.apache.camel.ThreadsBlocked
+    help: Threads Blocked
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>ThreadsInterrupted'
+    name: org.apache.camel.ThreadsInterrupted
+    help: Threads Interrupted
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumLogicalRuntimeFaults'
+    name: org.apache.cxf.NumLogicalRuntimeFaults
+    help: Number of logical runtime faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumLogicalRuntimeFaults'
+    name: org.apache.cxf.NumLogicalRuntimeFaults
+    help: Number of logical runtime faults
+    type: GAUGE
+    labels:
+       bus.id: $1
+       type: $2
+       service: $3
+       port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>AvgResponseTime'
+    name: org.apache.cxf.AvgResponseTime
+    help: Average Response Time
+    type: GAUGE
+    labels:
+       bus.id: $1
+       type: $2
+       service: $3
+       port: $4
+       operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>AvgResponseTime'
+    name: org.apache.cxf.AvgResponseTime
+    help: Average Response Time
+    type: GAUGE
+    labels:
+          bus.id: $1
+          type: $2
+          service: $3
+          port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumInvocations'
+    name: org.apache.cxf.NumInvocations
+    help: Number of invocations
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumInvocations'
+    name: org.apache.cxf.NumInvocations
+    help: Number of invocations
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>MaxResponseTime'
+    name: org.apache.cxf.MaxResponseTime
+    help: Maximum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>MaxResponseTime'
+    name: org.apache.cxf.MaxResponseTime
+    help: Maximum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>MinResponseTime'
+    name: org.apache.cxf.MinResponseTime
+    help: Minimum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>MinResponseTime'
+    name: org.apache.cxf.MinResponseTime
+    help: Minimum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>TotalHandlingTime'
+    name: org.apache.cxf.TotalHandlingTime
+    help: Total Handling Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>TotalHandlingTime'
+    name: org.apache.cxf.TotalHandlingTime
+    help: Total Handling Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumRuntimeFaults'
+    name: org.apache.cxf.NumRuntimeFaults
+    help: Number of runtime faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumRuntimeFaults'
+    name: org.apache.cxf.NumRuntimeFaults
+    help: Number of runtime faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumUnCheckedApplicationFaults'
+    name: org.apache.cxf.NumUnCheckedApplicationFaults
+    help: Number of unchecked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumUnCheckedApplicationFaults'
+    name: org.apache.cxf.NumUnCheckedApplicationFaults
+    help: Number of unchecked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumCheckedApplicationFaults'
+    name: org.apache.cxf.NumCheckedApplicationFaults
+    help: Number of checked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumCheckedApplicationFaults'
+    name: org.apache.cxf.NumCheckedApplicationFaults
+    help: Number of checked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
diff --git a/images/alpine/openjdk8/jdk/prometheus-opts b/images/alpine/openjdk8/jdk/prometheus-opts
new file mode 100644
index 0000000..3c43968
--- /dev/null
+++ b/images/alpine/openjdk8/jdk/prometheus-opts
@@ -0,0 +1,23 @@
+#!/bin/sh
+# Scripted for getting Prometheus options
+# meant to be evaluated (not to be sourced)
+
+# Exit if switched off
+if [ -n "${AB_PROMETHEUS_OFF:-}" ] && [ "${AB_PROMETHEUS_OFF}" != "false" ]; then
+  exit 0
+fi
+
+# Global switch, turning of all agents
+if [ -n "${AB_OFF:-}" ] && [ "${AB_OFF}" != "false" ]; then
+  exit 0
+fi
+
+port=${AB_PROMETHEUS_PORT:-9779}
+config=${AB_PROMETHEUS_CONFIG:-/opt/prometheus/prometheus-config.yml}
+if [ -n "${AB_PROMETHEUS_HOST:-}" ]; then
+  hostPort="${AB_PROMETHEUS_HOST}:$port"
+else
+  hostPort="$port"
+fi
+
+echo "-javaagent:/opt/prometheus/jmx_prometheus_javaagent.jar=${hostPort}:$config"
diff --git a/images/alpine/openjdk8/jdk/run-java-options b/images/alpine/openjdk8/jdk/run-java-options
new file mode 100644
index 0000000..759dee7
--- /dev/null
+++ b/images/alpine/openjdk8/jdk/run-java-options
@@ -0,0 +1,4 @@
+#!/bin/bash
+# Delegate to the individual agent options scripts which will
+# examine the environment for features to be enabled
+echo "$(/opt/jolokia/jolokia-opts) $(/opt/prometheus/prometheus-opts)"
diff --git a/images/alpine/openjdk8/jre/Dockerfile b/images/alpine/openjdk8/jre/Dockerfile
index cf03cc9..98aeef5 100644
--- a/images/alpine/openjdk8/jre/Dockerfile
+++ b/images/alpine/openjdk8/jre/Dockerfile
@@ -17,20 +17,39 @@ RUN apk add --update \
  && rm /var/cache/apk/* \
  && echo "securerandom.source=file:/dev/urandom" >> /usr/lib/jvm/default-jvm/jre/lib/security/java.security
 
-# Agent bond including Jolokia and jmx_exporter
-ADD agent-bond-opts /opt/run-java-options
-RUN mkdir -p /opt/agent-bond \
- && curl http://central.maven.org/maven2/io/fabric8/agent-bond-agent/1.2.0/agent-bond-agent-1.2.0.jar \
-          -o /opt/agent-bond/agent-bond.jar \
- && chmod 444 /opt/agent-bond/agent-bond.jar \
- && chmod 755 /opt/run-java-options
-ADD jmx_exporter_config.yml /opt/agent-bond/
-EXPOSE 8778 9779
+# Prometheus JMX exporter agent
+RUN mkdir -p /opt/prometheus/etc \
+ && curl http://central.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/undefined/jmx_prometheus_javaagent-undefined.jar \
+          -o /opt/prometheus/jmx_prometheus_javaagent.jar
+ADD prometheus-opts /opt/prometheus/prometheus-opts
+ADD prometheus-config.yml /opt/prometheus/prometheus-config.yml
+RUN chmod 444 /opt/prometheus/jmx_prometheus_javaagent.jar \
+ && chmod 444 /opt/prometheus/prometheus-config.yml \
+ && chmod 755 /opt/prometheus/prometheus-opts \
+ && chmod 775 /opt/prometheus/etc \
+ && chgrp root /opt/prometheus/etc
+
+EXPOSE 9779
+
+
+# Jolokia agent
+RUN mkdir -p /opt/jolokia/etc \
+ && curl http://central.maven.org/maven2/org/jolokia/jolokia-jvm/1.6.2/jolokia-jvm-1.6.2-agent.jar \
+         -o /opt/jolokia/jolokia.jar
+ADD jolokia-opts /opt/jolokia/jolokia-opts
+RUN chmod 444 /opt/jolokia/jolokia.jar \
+ && chmod 755 /opt/jolokia/jolokia-opts \
+ && chmod 775 /opt/jolokia/etc \
+ && chgrp root /opt/jolokia/etc
+
+EXPOSE 8778
+
 
 # Add run script as /deployments/run-java.sh and make it executable
 COPY run-java.sh /deployments/
 RUN chmod 755 /deployments/run-java.sh
 
+COPY run-java-options /opt
 
 
 
diff --git a/images/alpine/openjdk8/jre/README.md b/images/alpine/openjdk8/jre/README.md
index 8570993..6e05668 100644
--- a/images/alpine/openjdk8/jre/README.md
+++ b/images/alpine/openjdk8/jre/README.md
@@ -1,72 +1,12 @@
 ## Fabric8 Java Base Image OpenJDK 8 (JRE)
 
-
-
 This image is based on Alpine and provides OpenJDK 8 (JRE)
 
 It includes:
 
-
-* An [Agent Bond](https://github.com/fabric8io/agent-bond) agent with [Jolokia](http://www.jolokia.org) and Prometheus' [jmx_exporter](https://github.com/prometheus/jmx_exporter). The agent is installed as `/opt/agent-bond/agent-bond.jar`. See below for configuration options.
-
-
 * A startup script [`/deployments/run-java.sh`](#startup-script-run-javash) for starting up Java applications.
-
-### Agent Bond
-
-In order to enable Jolokia for your application you should use this image as a base image (via `FROM`) and use the output of `agent-bond-opts` in your startup scripts to include it in for the Java startup options.
-
-For example, the following snippet can be added to a script starting up your Java application
-
-    # ...
-    export JAVA_OPTIONS="$JAVA_OPTIONS $(agent-bond-opts)"
-    # .... use JAVA_OPTIONS when starting your app, e.g. as Tomcat does
-
-The following versions and defaults are used:
-
-* [Jolokia](http://www.jolokia.org) : version **1.6.2** and port **8778**
-* [jmx_exporter](https://github.com/prometheus/jmx_exporter): version **0.3.1** and port **9779**
-
-You can influence the behaviour of `agent-bond-opts` by setting various environment variables:
-
-### Agent-Bond Options
-
-Agent bond itself can be influenced with the following environment variables: 
-
-* **AB_OFF** : If set disables activation of agent-bond (i.e. echos an empty value). By default, agent-bond is enabled.
-* **AB_ENABLED** : Comma separated list of sub-agents enabled. Currently allowed values are `jolokia` and `jmx_exporter`. 
-  By default both are enabled.
-
-
-#### Jolokia configuration
-
-* **AB_JOLOKIA_CONFIG** : If set uses this file (including path) as Jolokia JVM agent properties (as described 
-  in Jolokia's [reference manual](http://www.jolokia.org/reference/html/agents.html#agents-jvm)).
-  By default this is `/opt/jolokia/jolokia.properties`.
-* **AB_JOLOKIA_HOST** : Host address to bind to (Default: `0.0.0.0`)
-* **AB_JOLOKIA_PORT** : Port to use (Default: `8778`)
-* **AB_JOLOKIA_USER** : User for authentication. By default authentication is switched off.
-* **AB_JOLOKIA_HTTPS** : Switch on secure communication with https. By default self signed server certificates are generated
-  if no `serverCert` configuration is given in `AB_JOLOKIA_OPTS`
-* **AB_JOLOKIA_PASSWORD** : Password for authentication. By default authentication is switched off.
-* **AB_JOLOKIA_ID** : Agent ID to use (`$HOSTNAME` by default, which is the container id)
-* **AB_JOLOKIA_OPTS**  : Additional options to be appended to the agent opts. They should be given in the format 
-  "key=value,key=value,..."
-
-Some options for integration in various environments:
-
-* **AB_JOLOKIA_AUTH_OPENSHIFT** : Switch on client authentication for OpenShift TLS communication. The value of this 
-  parameter can be a relative distinguished name which must be contained in a presented client certificate. Enabling this
-  parameter will automatically switch Jolokia into https communication mode. The default CA cert is set to 
-  `/var/run/secrets/kubernetes.io/serviceaccount/ca.crt` 
-  
-#### jmx_exporter configuration
-
-* **AB_JMX_EXPORTER_OPTS** : Configuration to use for `jmx_exporter` (in the format `<port>:<path to config>`)
-* **AB_JMX_EXPORTER_PORT** : Port to use for the JMX Exporter. Default: `9779`
-* **AB_JMX_EXPORTER_CONFIG** : Path to configuration to use for `jmx_exporter`: Default: `/opt/agent-bond/jmx_exporter_config.json`
-
-
+* [Jolokia](http://www.jolokia.org) agent installed in `/opt/jolokia`
+* Prometheus [jmx_exporter](https://github.com/prometheus/jmx_exporter) agent installed in `/opt/jmx_exporter`.
 
 ### Startup Script run-java.sh
 
@@ -177,8 +117,55 @@ mvn clean install
 ```
 
 
+### Monitoring Agents
+
+In order to enable Jolokia and Prometheus exporter for your application you should use this image as a base image (via `FROM`) and use the output of `jolokia-opts` and `prometheus-opts` in your startup scripts to include it in for the Java startup options. You can also just use the provided startup script `/opt/run-java.sh` which does this automatically.
+
+For example, the following snippet can be added to a script starting up your Java application
+
+    # ...
+    export JAVA_OPTIONS="$JAVA_OPTIONS $(/opt/jolokia/jolokia-opts) $(/opt/prometheus/prometheus-opts)"
+    # .... use JAVA_OPTIONS when starting your app, e.g. as Tomcat does
+
+The following versions and defaults are used:
+
+* [Jolokia](http://www.jolokia.org) : version **1.6.2** and port **8778**
+* [jmx_exporter](https://github.com/prometheus/jmx_exporter): version **0.3.1** and port **9779**
+
+You can influence the behaviour of these config scripts by setting various environment variables.
+
+#### Jolokia Configuration
+
+* **AB_JOLOKIA_OFF** : If set disables activation of Jolokia (i.e. echos an empty value). By default, Jolokia is enabled.
+* **AB_JOLOKIA_CONFIG** : If set uses this file (including path) as Jolokia JVM agent properties (as described
+  in Jolokia's [reference manual](http://www.jolokia.org/reference/html/agents.html#agents-jvm)). If not set,
+  the `/opt/jolokia/etc/jolokia.properties` will be created using the settings as defined in this document, otherwise
+  the reset of the settings in this document are ignored.
+* **AB_JOLOKIA_HOST** : Host address to bind to (Default: `0.0.0.0`)
+* **AB_JOLOKIA_PORT** : Port to use (Default: `8778`)
+* **AB_JOLOKIA_USER** : User for basic authentication. Defaults to 'jolokia'
+* **AB_JOLOKIA_PASSWORD** : Password for basic authentication. By default authentication is switched off.
+* **AB_JOLOKIA_PASSWORD_RANDOM** : Should a random AB_JOLOKIA_PASSWORD be generated? Generated value will be written to `/opt/jolokia/etc/jolokia.pw`
+* **AB_JOLOKIA_HTTPS** : Switch on secure communication with https. By default self signed server certificates are generated
+  if no `serverCert` configuration is given in `AB_JOLOKIA_OPTS`
+* **AB_JOLOKIA_ID** : Agent ID to use (`$HOSTNAME` by default, which is the container id)
+* **AB_JOLOKIA_DISCOVERY_ENABLED** : Enable Jolokia discovery.  Defaults to false.
+* **AB_JOLOKIA_OPTS**  : Additional options to be appended to the agent configuration. They should be given in the format
+  "key=value,key=value,..."
+
+Some options for integration in various environments:
+
+* **AB_JOLOKIA_AUTH_OPENSHIFT** : Switch on client authentication for OpenShift TSL communication. The value of this
+  parameter can be a relative distinguished name which must be contained in a presented client certificate. Enabling this
+  parameter will automatically switch Jolokia into https communication mode. The default CA cert is set to
+  `/var/run/secrets/kubernetes.io/serviceaccount/ca.crt`
+
+
+undefined
+
 ### Versions:
 
 * Base-Image: **Alpine 3.10**
 * Java: **OpenJDK 8 1.8.0** (Java Runtime Environment (JRE))
-* Agent-Bond: **1.2.0** (Jolokia 1.6.2, jmx_exporter 0.3.1)
+* Jolokia: **1.6.2**
+* jmx_exporter: **undefined**
diff --git a/images/alpine/openjdk8/jre/agent-bond-opts b/images/alpine/openjdk8/jre/agent-bond-opts
deleted file mode 100644
index 280313b..0000000
--- a/images/alpine/openjdk8/jre/agent-bond-opts
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/bin/sh
-
-# Parse options
-while [ $# -gt 0 ]
-do
-key="$1"
-case ${key} in
-    # Escape for scripts which eval the output of this script
-    -e|--escape)
-    escape_sep=1
-    ;;
-esac
-shift
-done
-
-# Check whether a given config is contained in AB_JOLOKIA_OPTS
-is_in_jolokia_opts() {
-  local prop=$1
-  if [ -n "${AB_JOLOKIA_OPTS:-}" ] && [ "${AB_JOLOKIA_OPTS}" != "${AB_JOLOKIA_OPTS/${prop}/}" ]; then
-     echo "yes"
-  else
-     echo "no"
-  fi
-}
-
-dir=${AB_DIR:-/opt/agent-bond}
-sep="="
-
-# Options separators defined to avoid clash with fish-pepper templating
-ab_open_del="{""{"
-ab_close_del="}""}"
-if [ -n "${escape_sep:-}" ]; then
-  ab_open_del='\{\{'
-  ab_close_del='\}\}'
-fi
-
-if [ -z "${AB_OFF:-}" ]; then
-   opts="-javaagent:$dir/agent-bond.jar"
-   config="${AB_CONFIG:-$dir/agent-bond.properties}"
-   if [ -f "$config" ]; then
-      # Configuration takes precedence
-      opts="${opts}${sep}config=${config}"
-      sep=","
-   fi
-   if [ -z "${AB_ENABLED:-}" ] || [ "${AB_ENABLED}" != "${AB_ENABLED/jolokia/}" ]; then
-     # Direct options only if no configuration is found
-     jsep=""
-     jolokia_opts=""
-     if [ -n "${AB_JOLOKIA_CONFIG:-}" ] && [ -f "${AB_JOLOKIA_CONFIG}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}config=${AB_JOLOKIA_CONFIG}"
-        jsep=","
-        grep -q -e '^host' ${AB_JOLOKIA_CONFIG} && host_in_config=1
-     fi
-     if [ -z "${AB_JOLOKIA_HOST:-}" ] && [ -z "${host_in_config:-}" ]; then
-        AB_JOLOKIA_HOST='0.0.0.0'
-     fi
-     if [ -n "${AB_JOLOKIA_HOST:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}host=${AB_JOLOKIA_HOST}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_PORT:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}port=${AB_JOLOKIA_PORT}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_USER:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}user=${AB_JOLOKIA_USER}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_PASSWORD:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}password=${AB_JOLOKIA_PASSWORD}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_HTTPS:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}protocol=https"
-        https_used=1
-        jsep=","
-     fi
-     # Integration with OpenShift client cert auth
-     if [ -n "${AB_JOLOKIA_AUTH_OPENSHIFT:-}" ]; then
-        auth_opts="useSslClientAuthentication=true,extraClientCheck=true"
-        if [ -z "${https_used+x}" ]; then
-          auth_opts="${auth_opts},protocol=https"
-        fi
-        if [ $(is_in_jolokia_opts "caCert") != "yes" ]; then
-           auth_opts="${auth_opts},caCert=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
-        fi
-        if [ $(is_in_jolokia_opts "clientPrincipal") != "yes" ]; then
-           if [  "${AB_JOLOKIA_AUTH_OPENSHIFT}" != "${AB_JOLOKIA_AUTH_OPENSHIFT/=/}" ]; then
-              # Supposed to contain a principal name to check
-              auth_opts="${auth_opts},clientPrincipal=$(echo ${AB_JOLOKIA_AUTH_OPENSHIFT} | sed -e 's/ /\\\\ /g')"
-           else
-              auth_opts="${auth_opts},clientPrincipal=cn=system:master-proxy"
-           fi
-        fi
-        jolokia_opts="${jolokia_opts}${jsep}${auth_opts}"
-        jsep=","
-     fi
-     # Add extra opts to the end
-     if [ -n "${AB_JOLOKIA_OPTS:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}${AB_JOLOKIA_OPTS}"
-        jsep=","
-     fi
-
-     opts="${opts}${sep}jolokia${ab_open_del}${jolokia_opts}${ab_close_del}"
-     sep=","
-   fi
-   if [ -z "${AB_ENABLED:-}" ] || [ "${AB_ENABLED}" != "${AB_ENABLED/jmx_exporter/}" ]; then
-     je_opts=""
-     jsep=""
-     if [ -n "${AB_JMX_EXPORTER_OPTS:-}" ]; then
-        opts="${opts}${sep}jmx_exporter${ab_open_del}${AB_JMX_EXPORTER_OPTS}${ab_close_del}"
-        sep=","
-     else
-        port=${AB_JMX_EXPORTER_PORT:-9779}
-        config=${AB_JMX_EXPORTER_CONFIG:-/opt/agent-bond/jmx_exporter_config.yml}
-        opts="${opts}${sep}jmx_exporter${ab_open_del}${port}:${config}${ab_close_del}"
-        sep=","
-     fi
-   fi
-   if [ "${sep:-}" != '=' ] ; then
-     echo ${opts}
-   fi
-fi
diff --git a/images/alpine/openjdk8/jre/jmx_exporter_config.yml b/images/alpine/openjdk8/jre/jmx_exporter_config.yml
deleted file mode 100644
index 620cd4a..0000000
--- a/images/alpine/openjdk8/jre/jmx_exporter_config.yml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-lowercaseOutputName: true
-lowercaseOutputLabelNames: true
-whitelistObjectNames:
-  - 'org.apache.camel:*'
-rules:
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>((?:Min|Mean|Max|Last|Delta)(?:ProcessingTime)):'
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>(TotalProcessingTime):'
-    type: COUNTER
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>(ExchangesInflight|LastProcessingTime):'
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>((?:Exchanges(?:Completed|Failed|Total))|FailuresHandled):'
-    type: COUNTER
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
diff --git a/images/alpine/openjdk8/jre/jolokia-opts b/images/alpine/openjdk8/jre/jolokia-opts
new file mode 100644
index 0000000..1aa273e
--- /dev/null
+++ b/images/alpine/openjdk8/jre/jolokia-opts
@@ -0,0 +1,103 @@
+#!/bin/sh
+
+
+# Exit if switched off
+if [ -n "${AB_JOLOKIA_OFF:-}" ] && [ "${AB_JOLOKIA_OFF}" != "false" ]; then
+  exit 0
+fi
+
+# Global switch, turning of all agents
+if [ -n "${AB_OFF:-}" ] && [ "${AB_OFF}" != "false" ]; then
+  exit 0
+fi
+
+# Check whether a given config is contained in AB_JOLOKIA_OPTS
+is_in_jolokia_opts() {
+  local prop=$1
+  if [ -n "${AB_JOLOKIA_OPTS:-}" ] && [ "${AB_JOLOKIA_OPTS}" != "${AB_JOLOKIA_OPTS/${prop}/}" ]; then
+     echo "yes"
+  else
+     echo "no"
+  fi
+}
+
+get_jolokia_properties() {
+
+  echo "host=${AB_JOLOKIA_HOST:-*}"
+  echo "port=${AB_JOLOKIA_PORT:-8778}"
+  echo "discoveryEnabled=${AB_JOLOKIA_DISCOVERY_ENABLED:-false}"
+
+  if [ -n "${AB_JOLOKIA_PASSWORD:-}" ]; then
+     echo "user=${AB_JOLOKIA_USER:-jolokia}"
+     echo "password=${AB_JOLOKIA_PASSWORD}"
+  fi
+  if [ -n "${AB_JOLOKIA_HTTPS:-}" ]; then
+     echo "protocol=https"
+     https_used=1
+  fi
+
+  # Integration with OpenShift client cert auth is enabled
+  # by default if not explicitly turned off by setting to 'false'
+  if [ "${AB_JOLOKIA_AUTH_OPENSHIFT:-}" != "false" ] && [ -f "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt" ]; then
+     echo "useSslClientAuthentication=true"
+     echo "extraClientCheck=true"
+
+     # Check if the 'protocol' property has already been set to 'https'
+     # If not, then defaults to using HTTPS
+     if [ -z ${https_used+x} ]; then
+       echo "protocol=https"
+     fi
+     if [ $(is_in_jolokia_opts "caCert") != "yes" ]; then
+        echo "caCert=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
+     fi
+
+     if [ $(is_in_jolokia_opts "clientPrincipal") != "yes" ]; then
+        if [  "${AB_JOLOKIA_AUTH_OPENSHIFT}" != "${AB_JOLOKIA_AUTH_OPENSHIFT/=/}" ]; then
+           # Supposed to contain a principal name to check
+           echo "clientPrincipal=$(echo ${AB_JOLOKIA_AUTH_OPENSHIFT} | sed -e 's/ /\\\\ /g')"
+        else
+           echo "clientPrincipal=cn=system:master-proxy"
+        fi
+     fi
+  fi
+
+  # Add extra opts
+  if [ -n "${AB_JOLOKIA_OPTS:-}" ]; then
+     echo "${AB_JOLOKIA_OPTS}" | tr "," "\n"
+  fi
+
+}
+
+write_jolokia_properties() {
+  local jolokia_property_file="$1"
+
+  # Setup Jolokia to accept basic auth, using a randomly generated password that is stored
+  # in the container in the ${DEPLOYMENTS_DIR}/jolokia.pw file.
+  if [ "${AB_JOLOKIA_PASSWORD_RANDOM:-}" == "true" ]; then
+    pw_file="/opt/jolokia/etc/jolokia.pw"
+    if [ -f "${pw_file}" ] ; then
+      AB_JOLOKIA_PASSWORD=$(cat "${pw_file}")
+    else
+      AB_JOLOKIA_PASSWORD=$(tr -cd '[:alnum:]' < /dev/urandom | fold -w30 | head -n1)
+      touch "${pw_file}"
+      chmod 660 "${pw_file}"
+      cat > "${pw_file}" <<EOF
+$AB_JOLOKIA_PASSWORD
+EOF
+    fi
+    export AB_JOLOKIA_PASSWORD
+  fi
+
+  touch "${jolokia_property_file}"
+  chmod 660 "${jolokia_property_file}"
+  cat > "${jolokia_property_file}" <<EOF
+$(get_jolokia_properties)
+EOF
+
+}
+
+if [ -z "${AB_JOLOKIA_CONFIG:-}" ]; then
+  AB_JOLOKIA_CONFIG="/opt/jolokia/etc/jolokia.properties"
+  write_jolokia_properties "$AB_JOLOKIA_CONFIG"
+fi
+echo "-javaagent:/opt/jolokia/jolokia.jar=config=${AB_JOLOKIA_CONFIG}"
diff --git a/images/alpine/openjdk8/jre/prometheus-config.yml b/images/alpine/openjdk8/jre/prometheus-config.yml
new file mode 100644
index 0000000..f6eaa2b
--- /dev/null
+++ b/images/alpine/openjdk8/jre/prometheus-config.yml
@@ -0,0 +1,586 @@
+startDelaySecs: 5
+ssl: false
+blacklistObjectNames: ["java.lang:*"]
+rules:
+# Context level
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesCompleted'
+    name: org.apache.camel.ExchangesCompleted
+    help: Exchanges Completed
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesFailed'
+    name: org.apache.camel.ExchangesFailed
+    help: Exchanges Failed
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesInflight'
+    name: org.apache.camel.ExchangesInflight
+    help: Exchanges Inflight
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>FailuresHandled'
+    name: org.apache.camel.FailuresHandled
+    help: Failures Handled
+    labels:
+        context: $1
+        type: context
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExternalRedeliveries'
+    name: org.apache.camel.ExternalRedeliveries
+    help: External Redeliveries
+    labels:
+        context: $1
+        type: context
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>MaxProcessingTime'
+    name: org.apache.camel.MaxProcessingTime
+    help: Maximum Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>MeanProcessingTime'
+    name: org.apache.camel.MeanProcessingTime
+    help: Mean Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>MinProcessingTime'
+    name: org.apache.camel.MinProcessingTime
+    help: Minimum Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>LastProcessingTime'
+    name: org.apache.camel.LastProcessingTime
+    help: Last Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>DeltaProcessingTime'
+    name: org.apache.camel.DeltaProcessingTime
+    help: Delta Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>Redeliveries'
+    name: org.apache.camel.Redeliveries
+    help: Redeliveries
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>TotalProcessingTime'
+    name: org.apache.camel.TotalProcessingTime
+    help: Total Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=consumers, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+
+
+# Route level
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesCompleted'
+    name: org.apache.camel.ExchangesCompleted
+    help: Exchanges Completed
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesFailed'
+    name: org.apache.camel.ExchangesFailed
+    help: Exchanges Failed
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesInflight'
+    name: org.apache.camel.ExchangesInflight
+    help: Exchanges Inflight
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>FailuresHandled'
+    name: org.apache.camel.FailuresHandled
+    help: Failures Handled
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExternalRedeliveries'
+    name: org.apache.camel.ExternalRedeliveries
+    help: External Redeliveries
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>MaxProcessingTime'
+    name: org.apache.camel.MaxProcessingTime
+    help: Maximum Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>MeanProcessingTime'
+    name: org.apache.camel.MeanProcessingTime
+    help: Mean Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>MinProcessingTime'
+    name: org.apache.camel.MinProcessingTime
+    help: Minimum Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>LastProcessingTime'
+    name: org.apache.camel.LastProcessingTime
+    help: Last Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>DeltaProcessingTime'
+    name: org.apache.camel.DeltaProcessingTime
+    help: Delta Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>Redeliveries'
+    name: org.apache.camel.Redeliveries
+    help: Redeliveries
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>TotalProcessingTime'
+    name: org.apache.camel.TotalProcessingTime
+    help: Total Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+
+# Processor level
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesCompleted'
+    name: org.apache.camel.ExchangesCompleted
+    help: Exchanges Completed
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesFailed'
+    name: org.apache.camel.ExchangesFailed
+    help: Exchanges Failed
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesInflight'
+    name: org.apache.camel.ExchangesInflight
+    help: Exchanges Inflight
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>FailuresHandled'
+    name: org.apache.camel.FailuresHandled
+    help: Failures Handled
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExternalRedeliveries'
+    name: org.apache.camel.ExternalRedeliveries
+    help: External Redeliveries
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>MaxProcessingTime'
+    name: org.apache.camel.MaxProcessingTime
+    help: Maximum Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>MeanProcessingTime'
+    name: org.apache.camel.MeanProcessingTime
+    help: Mean Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>MinProcessingTime'
+    name: org.apache.camel.MinProcessingTime
+    help: Minimum Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>LastProcessingTime'
+    name: org.apache.camel.LastProcessingTime
+    help: Last Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>DeltaProcessingTime'
+    name: org.apache.camel.DeltaProcessingTime
+    help: Delta Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>Redeliveries'
+    name: org.apache.camel.Redeliveries
+    help: Redeliveries
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>TotalProcessingTime'
+    name: org.apache.camel.TotalProcessingTime
+    help: Total Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: COUNTER
+
+# Consumers
+  - pattern: 'org.apache.camel<context=([^,]+), type=consumers, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        consumer: $2
+        type: consumers
+    type: GAUGE
+
+# Services
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>MaxDuration'
+    name: org.apache.camel.MaxDuration
+    help: Maximum Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>MeanDuration'
+    name: org.apache.camel.MeanDuration
+    help: Mean Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>MinDuration'
+    name: org.apache.camel.MinDuration
+    help: Minimum Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>TotalDuration'
+    name: org.apache.camel.TotalDuration
+    help: Total Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>ThreadsBlocked'
+    name: org.apache.camel.ThreadsBlocked
+    help: Threads Blocked
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>ThreadsInterrupted'
+    name: org.apache.camel.ThreadsInterrupted
+    help: Threads Interrupted
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumLogicalRuntimeFaults'
+    name: org.apache.cxf.NumLogicalRuntimeFaults
+    help: Number of logical runtime faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumLogicalRuntimeFaults'
+    name: org.apache.cxf.NumLogicalRuntimeFaults
+    help: Number of logical runtime faults
+    type: GAUGE
+    labels:
+       bus.id: $1
+       type: $2
+       service: $3
+       port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>AvgResponseTime'
+    name: org.apache.cxf.AvgResponseTime
+    help: Average Response Time
+    type: GAUGE
+    labels:
+       bus.id: $1
+       type: $2
+       service: $3
+       port: $4
+       operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>AvgResponseTime'
+    name: org.apache.cxf.AvgResponseTime
+    help: Average Response Time
+    type: GAUGE
+    labels:
+          bus.id: $1
+          type: $2
+          service: $3
+          port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumInvocations'
+    name: org.apache.cxf.NumInvocations
+    help: Number of invocations
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumInvocations'
+    name: org.apache.cxf.NumInvocations
+    help: Number of invocations
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>MaxResponseTime'
+    name: org.apache.cxf.MaxResponseTime
+    help: Maximum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>MaxResponseTime'
+    name: org.apache.cxf.MaxResponseTime
+    help: Maximum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>MinResponseTime'
+    name: org.apache.cxf.MinResponseTime
+    help: Minimum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>MinResponseTime'
+    name: org.apache.cxf.MinResponseTime
+    help: Minimum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>TotalHandlingTime'
+    name: org.apache.cxf.TotalHandlingTime
+    help: Total Handling Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>TotalHandlingTime'
+    name: org.apache.cxf.TotalHandlingTime
+    help: Total Handling Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumRuntimeFaults'
+    name: org.apache.cxf.NumRuntimeFaults
+    help: Number of runtime faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumRuntimeFaults'
+    name: org.apache.cxf.NumRuntimeFaults
+    help: Number of runtime faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumUnCheckedApplicationFaults'
+    name: org.apache.cxf.NumUnCheckedApplicationFaults
+    help: Number of unchecked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumUnCheckedApplicationFaults'
+    name: org.apache.cxf.NumUnCheckedApplicationFaults
+    help: Number of unchecked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumCheckedApplicationFaults'
+    name: org.apache.cxf.NumCheckedApplicationFaults
+    help: Number of checked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumCheckedApplicationFaults'
+    name: org.apache.cxf.NumCheckedApplicationFaults
+    help: Number of checked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
diff --git a/images/alpine/openjdk8/jre/prometheus-opts b/images/alpine/openjdk8/jre/prometheus-opts
new file mode 100644
index 0000000..3c43968
--- /dev/null
+++ b/images/alpine/openjdk8/jre/prometheus-opts
@@ -0,0 +1,23 @@
+#!/bin/sh
+# Scripted for getting Prometheus options
+# meant to be evaluated (not to be sourced)
+
+# Exit if switched off
+if [ -n "${AB_PROMETHEUS_OFF:-}" ] && [ "${AB_PROMETHEUS_OFF}" != "false" ]; then
+  exit 0
+fi
+
+# Global switch, turning of all agents
+if [ -n "${AB_OFF:-}" ] && [ "${AB_OFF}" != "false" ]; then
+  exit 0
+fi
+
+port=${AB_PROMETHEUS_PORT:-9779}
+config=${AB_PROMETHEUS_CONFIG:-/opt/prometheus/prometheus-config.yml}
+if [ -n "${AB_PROMETHEUS_HOST:-}" ]; then
+  hostPort="${AB_PROMETHEUS_HOST}:$port"
+else
+  hostPort="$port"
+fi
+
+echo "-javaagent:/opt/prometheus/jmx_prometheus_javaagent.jar=${hostPort}:$config"
diff --git a/images/alpine/openjdk8/jre/run-java-options b/images/alpine/openjdk8/jre/run-java-options
new file mode 100644
index 0000000..759dee7
--- /dev/null
+++ b/images/alpine/openjdk8/jre/run-java-options
@@ -0,0 +1,4 @@
+#!/bin/bash
+# Delegate to the individual agent options scripts which will
+# examine the environment for features to be enabled
+echo "$(/opt/jolokia/jolokia-opts) $(/opt/prometheus/prometheus-opts)"
diff --git a/images/centos/openjdk11/jdk/Dockerfile b/images/centos/openjdk11/jdk/Dockerfile
index 47bfce5..b33c27c 100644
--- a/images/centos/openjdk11/jdk/Dockerfile
+++ b/images/centos/openjdk11/jdk/Dockerfile
@@ -14,31 +14,51 @@ ENV JAVA_APP_DIR=/deployments \
 RUN yum install -y \
        java-11-openjdk-11.0.5.10-0.el7_7 \ 
        java-11-openjdk-devel-11.0.5.10-0.el7_7 \ 
-    && echo "securerandom.source=file:/dev/urandom" >> /usr/lib/jvm/jre/lib/security/java.security \
-    && yum clean all
+       && echo "securerandom.source=file:/dev/urandom" >> /usr/lib/jvm/jre/lib/security/java.security \
+       && yum clean all
 
 ENV JAVA_HOME /etc/alternatives/jre
 
-# Agent bond including Jolokia and jmx_exporter
-ADD agent-bond-opts /opt/run-java-options
-RUN mkdir -p /opt/agent-bond \
- && curl http://central.maven.org/maven2/io/fabric8/agent-bond-agent/1.2.0/agent-bond-agent-1.2.0.jar \
-          -o /opt/agent-bond/agent-bond.jar \
- && chmod 444 /opt/agent-bond/agent-bond.jar \
- && chmod 755 /opt/run-java-options
-ADD jmx_exporter_config.yml /opt/agent-bond/
-EXPOSE 8778 9779
+# Prometheus JMX exporter agent
+RUN mkdir -p /opt/prometheus/etc \
+ && curl http://central.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/undefined/jmx_prometheus_javaagent-undefined.jar \
+          -o /opt/prometheus/jmx_prometheus_javaagent.jar
+ADD prometheus-opts /opt/prometheus/prometheus-opts
+ADD prometheus-config.yml /opt/prometheus/prometheus-config.yml
+RUN chmod 444 /opt/prometheus/jmx_prometheus_javaagent.jar \
+ && chmod 444 /opt/prometheus/prometheus-config.yml \
+ && chmod 755 /opt/prometheus/prometheus-opts \
+ && chmod 775 /opt/prometheus/etc \
+ && chgrp root /opt/prometheus/etc
+
+EXPOSE 9779
+
+
+# Jolokia agent
+RUN mkdir -p /opt/jolokia/etc \
+ && curl http://central.maven.org/maven2/org/jolokia/jolokia-jvm/1.6.2/jolokia-jvm-1.6.2-agent.jar \
+         -o /opt/jolokia/jolokia.jar
+ADD jolokia-opts /opt/jolokia/jolokia-opts
+RUN chmod 444 /opt/jolokia/jolokia.jar \
+ && chmod 755 /opt/jolokia/jolokia-opts \
+ && chmod 775 /opt/jolokia/etc \
+ && chgrp root /opt/jolokia/etc
+
+EXPOSE 8778
+
 
 # Add run script as /deployments/run-java.sh and make it executable
 COPY run-java.sh /deployments/
 RUN chmod 755 /deployments/run-java.sh
 
+COPY run-java-options /opt
 
 
 # Run under user "jboss" and prepare for be running
 # under OpenShift, too
 RUN groupadd -r jboss -g 1000 \
   && useradd -u 1000 -r -g jboss -m -d /opt/jboss -s /sbin/nologin jboss \
+  && chmod 755 /opt/run-java-options \
   && chmod 755 /opt/jboss \
   && chown -R jboss /deployments \
   && usermod -g root -G `id -g jboss` jboss \
diff --git a/images/centos/openjdk11/jdk/README.md b/images/centos/openjdk11/jdk/README.md
index 437c940..1e1b25c 100644
--- a/images/centos/openjdk11/jdk/README.md
+++ b/images/centos/openjdk11/jdk/README.md
@@ -1,72 +1,12 @@
 ## Fabric8 Java Base Image OpenJDK 11 (JDK)
 
-
-
 This image is based on CentOS and provides OpenJDK 11 (JDK)
 
 It includes:
 
-
-* An [Agent Bond](https://github.com/fabric8io/agent-bond) agent with [Jolokia](http://www.jolokia.org) and Prometheus' [jmx_exporter](https://github.com/prometheus/jmx_exporter). The agent is installed as `/opt/agent-bond/agent-bond.jar`. See below for configuration options.
-
-
 * A startup script [`/deployments/run-java.sh`](#startup-script-run-javash) for starting up Java applications.
-
-### Agent Bond
-
-In order to enable Jolokia for your application you should use this image as a base image (via `FROM`) and use the output of `agent-bond-opts` in your startup scripts to include it in for the Java startup options.
-
-For example, the following snippet can be added to a script starting up your Java application
-
-    # ...
-    export JAVA_OPTIONS="$JAVA_OPTIONS $(agent-bond-opts)"
-    # .... use JAVA_OPTIONS when starting your app, e.g. as Tomcat does
-
-The following versions and defaults are used:
-
-* [Jolokia](http://www.jolokia.org) : version **1.6.2** and port **8778**
-* [jmx_exporter](https://github.com/prometheus/jmx_exporter): version **0.3.1** and port **9779**
-
-You can influence the behaviour of `agent-bond-opts` by setting various environment variables:
-
-### Agent-Bond Options
-
-Agent bond itself can be influenced with the following environment variables: 
-
-* **AB_OFF** : If set disables activation of agent-bond (i.e. echos an empty value). By default, agent-bond is enabled.
-* **AB_ENABLED** : Comma separated list of sub-agents enabled. Currently allowed values are `jolokia` and `jmx_exporter`. 
-  By default both are enabled.
-
-
-#### Jolokia configuration
-
-* **AB_JOLOKIA_CONFIG** : If set uses this file (including path) as Jolokia JVM agent properties (as described 
-  in Jolokia's [reference manual](http://www.jolokia.org/reference/html/agents.html#agents-jvm)).
-  By default this is `/opt/jolokia/jolokia.properties`.
-* **AB_JOLOKIA_HOST** : Host address to bind to (Default: `0.0.0.0`)
-* **AB_JOLOKIA_PORT** : Port to use (Default: `8778`)
-* **AB_JOLOKIA_USER** : User for authentication. By default authentication is switched off.
-* **AB_JOLOKIA_HTTPS** : Switch on secure communication with https. By default self signed server certificates are generated
-  if no `serverCert` configuration is given in `AB_JOLOKIA_OPTS`
-* **AB_JOLOKIA_PASSWORD** : Password for authentication. By default authentication is switched off.
-* **AB_JOLOKIA_ID** : Agent ID to use (`$HOSTNAME` by default, which is the container id)
-* **AB_JOLOKIA_OPTS**  : Additional options to be appended to the agent opts. They should be given in the format 
-  "key=value,key=value,..."
-
-Some options for integration in various environments:
-
-* **AB_JOLOKIA_AUTH_OPENSHIFT** : Switch on client authentication for OpenShift TLS communication. The value of this 
-  parameter can be a relative distinguished name which must be contained in a presented client certificate. Enabling this
-  parameter will automatically switch Jolokia into https communication mode. The default CA cert is set to 
-  `/var/run/secrets/kubernetes.io/serviceaccount/ca.crt` 
-  
-#### jmx_exporter configuration
-
-* **AB_JMX_EXPORTER_OPTS** : Configuration to use for `jmx_exporter` (in the format `<port>:<path to config>`)
-* **AB_JMX_EXPORTER_PORT** : Port to use for the JMX Exporter. Default: `9779`
-* **AB_JMX_EXPORTER_CONFIG** : Path to configuration to use for `jmx_exporter`: Default: `/opt/agent-bond/jmx_exporter_config.json`
-
-
+* [Jolokia](http://www.jolokia.org) agent installed in `/opt/jolokia`
+* Prometheus [jmx_exporter](https://github.com/prometheus/jmx_exporter) agent installed in `/opt/jmx_exporter`.
 
 ### Startup Script run-java.sh
 
@@ -177,8 +117,55 @@ mvn clean install
 ```
 
 
+### Monitoring Agents
+
+In order to enable Jolokia and Prometheus exporter for your application you should use this image as a base image (via `FROM`) and use the output of `jolokia-opts` and `prometheus-opts` in your startup scripts to include it in for the Java startup options. You can also just use the provided startup script `/opt/run-java.sh` which does this automatically.
+
+For example, the following snippet can be added to a script starting up your Java application
+
+    # ...
+    export JAVA_OPTIONS="$JAVA_OPTIONS $(/opt/jolokia/jolokia-opts) $(/opt/prometheus/prometheus-opts)"
+    # .... use JAVA_OPTIONS when starting your app, e.g. as Tomcat does
+
+The following versions and defaults are used:
+
+* [Jolokia](http://www.jolokia.org) : version **1.6.2** and port **8778**
+* [jmx_exporter](https://github.com/prometheus/jmx_exporter): version **0.3.1** and port **9779**
+
+You can influence the behaviour of these config scripts by setting various environment variables.
+
+#### Jolokia Configuration
+
+* **AB_JOLOKIA_OFF** : If set disables activation of Jolokia (i.e. echos an empty value). By default, Jolokia is enabled.
+* **AB_JOLOKIA_CONFIG** : If set uses this file (including path) as Jolokia JVM agent properties (as described
+  in Jolokia's [reference manual](http://www.jolokia.org/reference/html/agents.html#agents-jvm)). If not set,
+  the `/opt/jolokia/etc/jolokia.properties` will be created using the settings as defined in this document, otherwise
+  the reset of the settings in this document are ignored.
+* **AB_JOLOKIA_HOST** : Host address to bind to (Default: `0.0.0.0`)
+* **AB_JOLOKIA_PORT** : Port to use (Default: `8778`)
+* **AB_JOLOKIA_USER** : User for basic authentication. Defaults to 'jolokia'
+* **AB_JOLOKIA_PASSWORD** : Password for basic authentication. By default authentication is switched off.
+* **AB_JOLOKIA_PASSWORD_RANDOM** : Should a random AB_JOLOKIA_PASSWORD be generated? Generated value will be written to `/opt/jolokia/etc/jolokia.pw`
+* **AB_JOLOKIA_HTTPS** : Switch on secure communication with https. By default self signed server certificates are generated
+  if no `serverCert` configuration is given in `AB_JOLOKIA_OPTS`
+* **AB_JOLOKIA_ID** : Agent ID to use (`$HOSTNAME` by default, which is the container id)
+* **AB_JOLOKIA_DISCOVERY_ENABLED** : Enable Jolokia discovery.  Defaults to false.
+* **AB_JOLOKIA_OPTS**  : Additional options to be appended to the agent configuration. They should be given in the format
+  "key=value,key=value,..."
+
+Some options for integration in various environments:
+
+* **AB_JOLOKIA_AUTH_OPENSHIFT** : Switch on client authentication for OpenShift TSL communication. The value of this
+  parameter can be a relative distinguished name which must be contained in a presented client certificate. Enabling this
+  parameter will automatically switch Jolokia into https communication mode. The default CA cert is set to
+  `/var/run/secrets/kubernetes.io/serviceaccount/ca.crt`
+
+
+undefined
+
 ### Versions:
 
 * Base-Image: **CentOS 7**
 * Java: **OpenJDK 11 11** (Java Development Kit (JDK))
-* Agent-Bond: **1.2.0** (Jolokia 1.6.2, jmx_exporter 0.3.1)
+* Jolokia: **1.6.2**
+* jmx_exporter: **undefined**
diff --git a/images/centos/openjdk11/jdk/agent-bond-opts b/images/centos/openjdk11/jdk/agent-bond-opts
deleted file mode 100644
index 280313b..0000000
--- a/images/centos/openjdk11/jdk/agent-bond-opts
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/bin/sh
-
-# Parse options
-while [ $# -gt 0 ]
-do
-key="$1"
-case ${key} in
-    # Escape for scripts which eval the output of this script
-    -e|--escape)
-    escape_sep=1
-    ;;
-esac
-shift
-done
-
-# Check whether a given config is contained in AB_JOLOKIA_OPTS
-is_in_jolokia_opts() {
-  local prop=$1
-  if [ -n "${AB_JOLOKIA_OPTS:-}" ] && [ "${AB_JOLOKIA_OPTS}" != "${AB_JOLOKIA_OPTS/${prop}/}" ]; then
-     echo "yes"
-  else
-     echo "no"
-  fi
-}
-
-dir=${AB_DIR:-/opt/agent-bond}
-sep="="
-
-# Options separators defined to avoid clash with fish-pepper templating
-ab_open_del="{""{"
-ab_close_del="}""}"
-if [ -n "${escape_sep:-}" ]; then
-  ab_open_del='\{\{'
-  ab_close_del='\}\}'
-fi
-
-if [ -z "${AB_OFF:-}" ]; then
-   opts="-javaagent:$dir/agent-bond.jar"
-   config="${AB_CONFIG:-$dir/agent-bond.properties}"
-   if [ -f "$config" ]; then
-      # Configuration takes precedence
-      opts="${opts}${sep}config=${config}"
-      sep=","
-   fi
-   if [ -z "${AB_ENABLED:-}" ] || [ "${AB_ENABLED}" != "${AB_ENABLED/jolokia/}" ]; then
-     # Direct options only if no configuration is found
-     jsep=""
-     jolokia_opts=""
-     if [ -n "${AB_JOLOKIA_CONFIG:-}" ] && [ -f "${AB_JOLOKIA_CONFIG}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}config=${AB_JOLOKIA_CONFIG}"
-        jsep=","
-        grep -q -e '^host' ${AB_JOLOKIA_CONFIG} && host_in_config=1
-     fi
-     if [ -z "${AB_JOLOKIA_HOST:-}" ] && [ -z "${host_in_config:-}" ]; then
-        AB_JOLOKIA_HOST='0.0.0.0'
-     fi
-     if [ -n "${AB_JOLOKIA_HOST:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}host=${AB_JOLOKIA_HOST}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_PORT:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}port=${AB_JOLOKIA_PORT}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_USER:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}user=${AB_JOLOKIA_USER}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_PASSWORD:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}password=${AB_JOLOKIA_PASSWORD}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_HTTPS:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}protocol=https"
-        https_used=1
-        jsep=","
-     fi
-     # Integration with OpenShift client cert auth
-     if [ -n "${AB_JOLOKIA_AUTH_OPENSHIFT:-}" ]; then
-        auth_opts="useSslClientAuthentication=true,extraClientCheck=true"
-        if [ -z "${https_used+x}" ]; then
-          auth_opts="${auth_opts},protocol=https"
-        fi
-        if [ $(is_in_jolokia_opts "caCert") != "yes" ]; then
-           auth_opts="${auth_opts},caCert=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
-        fi
-        if [ $(is_in_jolokia_opts "clientPrincipal") != "yes" ]; then
-           if [  "${AB_JOLOKIA_AUTH_OPENSHIFT}" != "${AB_JOLOKIA_AUTH_OPENSHIFT/=/}" ]; then
-              # Supposed to contain a principal name to check
-              auth_opts="${auth_opts},clientPrincipal=$(echo ${AB_JOLOKIA_AUTH_OPENSHIFT} | sed -e 's/ /\\\\ /g')"
-           else
-              auth_opts="${auth_opts},clientPrincipal=cn=system:master-proxy"
-           fi
-        fi
-        jolokia_opts="${jolokia_opts}${jsep}${auth_opts}"
-        jsep=","
-     fi
-     # Add extra opts to the end
-     if [ -n "${AB_JOLOKIA_OPTS:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}${AB_JOLOKIA_OPTS}"
-        jsep=","
-     fi
-
-     opts="${opts}${sep}jolokia${ab_open_del}${jolokia_opts}${ab_close_del}"
-     sep=","
-   fi
-   if [ -z "${AB_ENABLED:-}" ] || [ "${AB_ENABLED}" != "${AB_ENABLED/jmx_exporter/}" ]; then
-     je_opts=""
-     jsep=""
-     if [ -n "${AB_JMX_EXPORTER_OPTS:-}" ]; then
-        opts="${opts}${sep}jmx_exporter${ab_open_del}${AB_JMX_EXPORTER_OPTS}${ab_close_del}"
-        sep=","
-     else
-        port=${AB_JMX_EXPORTER_PORT:-9779}
-        config=${AB_JMX_EXPORTER_CONFIG:-/opt/agent-bond/jmx_exporter_config.yml}
-        opts="${opts}${sep}jmx_exporter${ab_open_del}${port}:${config}${ab_close_del}"
-        sep=","
-     fi
-   fi
-   if [ "${sep:-}" != '=' ] ; then
-     echo ${opts}
-   fi
-fi
diff --git a/images/centos/openjdk11/jdk/jmx_exporter_config.yml b/images/centos/openjdk11/jdk/jmx_exporter_config.yml
deleted file mode 100644
index 620cd4a..0000000
--- a/images/centos/openjdk11/jdk/jmx_exporter_config.yml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-lowercaseOutputName: true
-lowercaseOutputLabelNames: true
-whitelistObjectNames:
-  - 'org.apache.camel:*'
-rules:
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>((?:Min|Mean|Max|Last|Delta)(?:ProcessingTime)):'
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>(TotalProcessingTime):'
-    type: COUNTER
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>(ExchangesInflight|LastProcessingTime):'
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>((?:Exchanges(?:Completed|Failed|Total))|FailuresHandled):'
-    type: COUNTER
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
diff --git a/images/centos/openjdk11/jdk/jolokia-opts b/images/centos/openjdk11/jdk/jolokia-opts
new file mode 100644
index 0000000..1aa273e
--- /dev/null
+++ b/images/centos/openjdk11/jdk/jolokia-opts
@@ -0,0 +1,103 @@
+#!/bin/sh
+
+
+# Exit if switched off
+if [ -n "${AB_JOLOKIA_OFF:-}" ] && [ "${AB_JOLOKIA_OFF}" != "false" ]; then
+  exit 0
+fi
+
+# Global switch, turning of all agents
+if [ -n "${AB_OFF:-}" ] && [ "${AB_OFF}" != "false" ]; then
+  exit 0
+fi
+
+# Check whether a given config is contained in AB_JOLOKIA_OPTS
+is_in_jolokia_opts() {
+  local prop=$1
+  if [ -n "${AB_JOLOKIA_OPTS:-}" ] && [ "${AB_JOLOKIA_OPTS}" != "${AB_JOLOKIA_OPTS/${prop}/}" ]; then
+     echo "yes"
+  else
+     echo "no"
+  fi
+}
+
+get_jolokia_properties() {
+
+  echo "host=${AB_JOLOKIA_HOST:-*}"
+  echo "port=${AB_JOLOKIA_PORT:-8778}"
+  echo "discoveryEnabled=${AB_JOLOKIA_DISCOVERY_ENABLED:-false}"
+
+  if [ -n "${AB_JOLOKIA_PASSWORD:-}" ]; then
+     echo "user=${AB_JOLOKIA_USER:-jolokia}"
+     echo "password=${AB_JOLOKIA_PASSWORD}"
+  fi
+  if [ -n "${AB_JOLOKIA_HTTPS:-}" ]; then
+     echo "protocol=https"
+     https_used=1
+  fi
+
+  # Integration with OpenShift client cert auth is enabled
+  # by default if not explicitly turned off by setting to 'false'
+  if [ "${AB_JOLOKIA_AUTH_OPENSHIFT:-}" != "false" ] && [ -f "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt" ]; then
+     echo "useSslClientAuthentication=true"
+     echo "extraClientCheck=true"
+
+     # Check if the 'protocol' property has already been set to 'https'
+     # If not, then defaults to using HTTPS
+     if [ -z ${https_used+x} ]; then
+       echo "protocol=https"
+     fi
+     if [ $(is_in_jolokia_opts "caCert") != "yes" ]; then
+        echo "caCert=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
+     fi
+
+     if [ $(is_in_jolokia_opts "clientPrincipal") != "yes" ]; then
+        if [  "${AB_JOLOKIA_AUTH_OPENSHIFT}" != "${AB_JOLOKIA_AUTH_OPENSHIFT/=/}" ]; then
+           # Supposed to contain a principal name to check
+           echo "clientPrincipal=$(echo ${AB_JOLOKIA_AUTH_OPENSHIFT} | sed -e 's/ /\\\\ /g')"
+        else
+           echo "clientPrincipal=cn=system:master-proxy"
+        fi
+     fi
+  fi
+
+  # Add extra opts
+  if [ -n "${AB_JOLOKIA_OPTS:-}" ]; then
+     echo "${AB_JOLOKIA_OPTS}" | tr "," "\n"
+  fi
+
+}
+
+write_jolokia_properties() {
+  local jolokia_property_file="$1"
+
+  # Setup Jolokia to accept basic auth, using a randomly generated password that is stored
+  # in the container in the ${DEPLOYMENTS_DIR}/jolokia.pw file.
+  if [ "${AB_JOLOKIA_PASSWORD_RANDOM:-}" == "true" ]; then
+    pw_file="/opt/jolokia/etc/jolokia.pw"
+    if [ -f "${pw_file}" ] ; then
+      AB_JOLOKIA_PASSWORD=$(cat "${pw_file}")
+    else
+      AB_JOLOKIA_PASSWORD=$(tr -cd '[:alnum:]' < /dev/urandom | fold -w30 | head -n1)
+      touch "${pw_file}"
+      chmod 660 "${pw_file}"
+      cat > "${pw_file}" <<EOF
+$AB_JOLOKIA_PASSWORD
+EOF
+    fi
+    export AB_JOLOKIA_PASSWORD
+  fi
+
+  touch "${jolokia_property_file}"
+  chmod 660 "${jolokia_property_file}"
+  cat > "${jolokia_property_file}" <<EOF
+$(get_jolokia_properties)
+EOF
+
+}
+
+if [ -z "${AB_JOLOKIA_CONFIG:-}" ]; then
+  AB_JOLOKIA_CONFIG="/opt/jolokia/etc/jolokia.properties"
+  write_jolokia_properties "$AB_JOLOKIA_CONFIG"
+fi
+echo "-javaagent:/opt/jolokia/jolokia.jar=config=${AB_JOLOKIA_CONFIG}"
diff --git a/images/centos/openjdk11/jdk/prometheus-config.yml b/images/centos/openjdk11/jdk/prometheus-config.yml
new file mode 100644
index 0000000..f6eaa2b
--- /dev/null
+++ b/images/centos/openjdk11/jdk/prometheus-config.yml
@@ -0,0 +1,586 @@
+startDelaySecs: 5
+ssl: false
+blacklistObjectNames: ["java.lang:*"]
+rules:
+# Context level
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesCompleted'
+    name: org.apache.camel.ExchangesCompleted
+    help: Exchanges Completed
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesFailed'
+    name: org.apache.camel.ExchangesFailed
+    help: Exchanges Failed
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesInflight'
+    name: org.apache.camel.ExchangesInflight
+    help: Exchanges Inflight
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>FailuresHandled'
+    name: org.apache.camel.FailuresHandled
+    help: Failures Handled
+    labels:
+        context: $1
+        type: context
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExternalRedeliveries'
+    name: org.apache.camel.ExternalRedeliveries
+    help: External Redeliveries
+    labels:
+        context: $1
+        type: context
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>MaxProcessingTime'
+    name: org.apache.camel.MaxProcessingTime
+    help: Maximum Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>MeanProcessingTime'
+    name: org.apache.camel.MeanProcessingTime
+    help: Mean Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>MinProcessingTime'
+    name: org.apache.camel.MinProcessingTime
+    help: Minimum Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>LastProcessingTime'
+    name: org.apache.camel.LastProcessingTime
+    help: Last Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>DeltaProcessingTime'
+    name: org.apache.camel.DeltaProcessingTime
+    help: Delta Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>Redeliveries'
+    name: org.apache.camel.Redeliveries
+    help: Redeliveries
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>TotalProcessingTime'
+    name: org.apache.camel.TotalProcessingTime
+    help: Total Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=consumers, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+
+
+# Route level
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesCompleted'
+    name: org.apache.camel.ExchangesCompleted
+    help: Exchanges Completed
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesFailed'
+    name: org.apache.camel.ExchangesFailed
+    help: Exchanges Failed
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesInflight'
+    name: org.apache.camel.ExchangesInflight
+    help: Exchanges Inflight
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>FailuresHandled'
+    name: org.apache.camel.FailuresHandled
+    help: Failures Handled
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExternalRedeliveries'
+    name: org.apache.camel.ExternalRedeliveries
+    help: External Redeliveries
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>MaxProcessingTime'
+    name: org.apache.camel.MaxProcessingTime
+    help: Maximum Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>MeanProcessingTime'
+    name: org.apache.camel.MeanProcessingTime
+    help: Mean Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>MinProcessingTime'
+    name: org.apache.camel.MinProcessingTime
+    help: Minimum Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>LastProcessingTime'
+    name: org.apache.camel.LastProcessingTime
+    help: Last Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>DeltaProcessingTime'
+    name: org.apache.camel.DeltaProcessingTime
+    help: Delta Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>Redeliveries'
+    name: org.apache.camel.Redeliveries
+    help: Redeliveries
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>TotalProcessingTime'
+    name: org.apache.camel.TotalProcessingTime
+    help: Total Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+
+# Processor level
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesCompleted'
+    name: org.apache.camel.ExchangesCompleted
+    help: Exchanges Completed
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesFailed'
+    name: org.apache.camel.ExchangesFailed
+    help: Exchanges Failed
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesInflight'
+    name: org.apache.camel.ExchangesInflight
+    help: Exchanges Inflight
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>FailuresHandled'
+    name: org.apache.camel.FailuresHandled
+    help: Failures Handled
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExternalRedeliveries'
+    name: org.apache.camel.ExternalRedeliveries
+    help: External Redeliveries
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>MaxProcessingTime'
+    name: org.apache.camel.MaxProcessingTime
+    help: Maximum Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>MeanProcessingTime'
+    name: org.apache.camel.MeanProcessingTime
+    help: Mean Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>MinProcessingTime'
+    name: org.apache.camel.MinProcessingTime
+    help: Minimum Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>LastProcessingTime'
+    name: org.apache.camel.LastProcessingTime
+    help: Last Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>DeltaProcessingTime'
+    name: org.apache.camel.DeltaProcessingTime
+    help: Delta Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>Redeliveries'
+    name: org.apache.camel.Redeliveries
+    help: Redeliveries
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>TotalProcessingTime'
+    name: org.apache.camel.TotalProcessingTime
+    help: Total Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: COUNTER
+
+# Consumers
+  - pattern: 'org.apache.camel<context=([^,]+), type=consumers, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        consumer: $2
+        type: consumers
+    type: GAUGE
+
+# Services
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>MaxDuration'
+    name: org.apache.camel.MaxDuration
+    help: Maximum Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>MeanDuration'
+    name: org.apache.camel.MeanDuration
+    help: Mean Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>MinDuration'
+    name: org.apache.camel.MinDuration
+    help: Minimum Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>TotalDuration'
+    name: org.apache.camel.TotalDuration
+    help: Total Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>ThreadsBlocked'
+    name: org.apache.camel.ThreadsBlocked
+    help: Threads Blocked
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>ThreadsInterrupted'
+    name: org.apache.camel.ThreadsInterrupted
+    help: Threads Interrupted
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumLogicalRuntimeFaults'
+    name: org.apache.cxf.NumLogicalRuntimeFaults
+    help: Number of logical runtime faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumLogicalRuntimeFaults'
+    name: org.apache.cxf.NumLogicalRuntimeFaults
+    help: Number of logical runtime faults
+    type: GAUGE
+    labels:
+       bus.id: $1
+       type: $2
+       service: $3
+       port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>AvgResponseTime'
+    name: org.apache.cxf.AvgResponseTime
+    help: Average Response Time
+    type: GAUGE
+    labels:
+       bus.id: $1
+       type: $2
+       service: $3
+       port: $4
+       operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>AvgResponseTime'
+    name: org.apache.cxf.AvgResponseTime
+    help: Average Response Time
+    type: GAUGE
+    labels:
+          bus.id: $1
+          type: $2
+          service: $3
+          port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumInvocations'
+    name: org.apache.cxf.NumInvocations
+    help: Number of invocations
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumInvocations'
+    name: org.apache.cxf.NumInvocations
+    help: Number of invocations
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>MaxResponseTime'
+    name: org.apache.cxf.MaxResponseTime
+    help: Maximum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>MaxResponseTime'
+    name: org.apache.cxf.MaxResponseTime
+    help: Maximum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>MinResponseTime'
+    name: org.apache.cxf.MinResponseTime
+    help: Minimum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>MinResponseTime'
+    name: org.apache.cxf.MinResponseTime
+    help: Minimum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>TotalHandlingTime'
+    name: org.apache.cxf.TotalHandlingTime
+    help: Total Handling Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>TotalHandlingTime'
+    name: org.apache.cxf.TotalHandlingTime
+    help: Total Handling Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumRuntimeFaults'
+    name: org.apache.cxf.NumRuntimeFaults
+    help: Number of runtime faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumRuntimeFaults'
+    name: org.apache.cxf.NumRuntimeFaults
+    help: Number of runtime faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumUnCheckedApplicationFaults'
+    name: org.apache.cxf.NumUnCheckedApplicationFaults
+    help: Number of unchecked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumUnCheckedApplicationFaults'
+    name: org.apache.cxf.NumUnCheckedApplicationFaults
+    help: Number of unchecked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumCheckedApplicationFaults'
+    name: org.apache.cxf.NumCheckedApplicationFaults
+    help: Number of checked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumCheckedApplicationFaults'
+    name: org.apache.cxf.NumCheckedApplicationFaults
+    help: Number of checked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
diff --git a/images/centos/openjdk11/jdk/prometheus-opts b/images/centos/openjdk11/jdk/prometheus-opts
new file mode 100644
index 0000000..3c43968
--- /dev/null
+++ b/images/centos/openjdk11/jdk/prometheus-opts
@@ -0,0 +1,23 @@
+#!/bin/sh
+# Scripted for getting Prometheus options
+# meant to be evaluated (not to be sourced)
+
+# Exit if switched off
+if [ -n "${AB_PROMETHEUS_OFF:-}" ] && [ "${AB_PROMETHEUS_OFF}" != "false" ]; then
+  exit 0
+fi
+
+# Global switch, turning of all agents
+if [ -n "${AB_OFF:-}" ] && [ "${AB_OFF}" != "false" ]; then
+  exit 0
+fi
+
+port=${AB_PROMETHEUS_PORT:-9779}
+config=${AB_PROMETHEUS_CONFIG:-/opt/prometheus/prometheus-config.yml}
+if [ -n "${AB_PROMETHEUS_HOST:-}" ]; then
+  hostPort="${AB_PROMETHEUS_HOST}:$port"
+else
+  hostPort="$port"
+fi
+
+echo "-javaagent:/opt/prometheus/jmx_prometheus_javaagent.jar=${hostPort}:$config"
diff --git a/images/centos/openjdk11/jdk/run-java-options b/images/centos/openjdk11/jdk/run-java-options
new file mode 100644
index 0000000..759dee7
--- /dev/null
+++ b/images/centos/openjdk11/jdk/run-java-options
@@ -0,0 +1,4 @@
+#!/bin/bash
+# Delegate to the individual agent options scripts which will
+# examine the environment for features to be enabled
+echo "$(/opt/jolokia/jolokia-opts) $(/opt/prometheus/prometheus-opts)"
diff --git a/images/centos/openjdk11/jre/Dockerfile b/images/centos/openjdk11/jre/Dockerfile
index f0cccfe..9aaaa81 100644
--- a/images/centos/openjdk11/jre/Dockerfile
+++ b/images/centos/openjdk11/jre/Dockerfile
@@ -13,31 +13,51 @@ ENV JAVA_APP_DIR=/deployments \
 # according to http://www.2uo.de/myths-about-urandom/
 RUN yum install -y \
        java-11-openjdk-11.0.5.10-0.el7_7 \ 
-    && echo "securerandom.source=file:/dev/urandom" >> /usr/lib/jvm/jre/lib/security/java.security \
-    && yum clean all
+       && echo "securerandom.source=file:/dev/urandom" >> /usr/lib/jvm/jre/lib/security/java.security \
+       && yum clean all
 
 ENV JAVA_HOME /etc/alternatives/jre
 
-# Agent bond including Jolokia and jmx_exporter
-ADD agent-bond-opts /opt/run-java-options
-RUN mkdir -p /opt/agent-bond \
- && curl http://central.maven.org/maven2/io/fabric8/agent-bond-agent/1.2.0/agent-bond-agent-1.2.0.jar \
-          -o /opt/agent-bond/agent-bond.jar \
- && chmod 444 /opt/agent-bond/agent-bond.jar \
- && chmod 755 /opt/run-java-options
-ADD jmx_exporter_config.yml /opt/agent-bond/
-EXPOSE 8778 9779
+# Prometheus JMX exporter agent
+RUN mkdir -p /opt/prometheus/etc \
+ && curl http://central.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/undefined/jmx_prometheus_javaagent-undefined.jar \
+          -o /opt/prometheus/jmx_prometheus_javaagent.jar
+ADD prometheus-opts /opt/prometheus/prometheus-opts
+ADD prometheus-config.yml /opt/prometheus/prometheus-config.yml
+RUN chmod 444 /opt/prometheus/jmx_prometheus_javaagent.jar \
+ && chmod 444 /opt/prometheus/prometheus-config.yml \
+ && chmod 755 /opt/prometheus/prometheus-opts \
+ && chmod 775 /opt/prometheus/etc \
+ && chgrp root /opt/prometheus/etc
+
+EXPOSE 9779
+
+
+# Jolokia agent
+RUN mkdir -p /opt/jolokia/etc \
+ && curl http://central.maven.org/maven2/org/jolokia/jolokia-jvm/1.6.2/jolokia-jvm-1.6.2-agent.jar \
+         -o /opt/jolokia/jolokia.jar
+ADD jolokia-opts /opt/jolokia/jolokia-opts
+RUN chmod 444 /opt/jolokia/jolokia.jar \
+ && chmod 755 /opt/jolokia/jolokia-opts \
+ && chmod 775 /opt/jolokia/etc \
+ && chgrp root /opt/jolokia/etc
+
+EXPOSE 8778
+
 
 # Add run script as /deployments/run-java.sh and make it executable
 COPY run-java.sh /deployments/
 RUN chmod 755 /deployments/run-java.sh
 
+COPY run-java-options /opt
 
 
 # Run under user "jboss" and prepare for be running
 # under OpenShift, too
 RUN groupadd -r jboss -g 1000 \
   && useradd -u 1000 -r -g jboss -m -d /opt/jboss -s /sbin/nologin jboss \
+  && chmod 755 /opt/run-java-options \
   && chmod 755 /opt/jboss \
   && chown -R jboss /deployments \
   && usermod -g root -G `id -g jboss` jboss \
diff --git a/images/centos/openjdk11/jre/README.md b/images/centos/openjdk11/jre/README.md
index 6e34511..122de05 100644
--- a/images/centos/openjdk11/jre/README.md
+++ b/images/centos/openjdk11/jre/README.md
@@ -1,72 +1,12 @@
 ## Fabric8 Java Base Image OpenJDK 11 (JRE)
 
-
-
 This image is based on CentOS and provides OpenJDK 11 (JRE)
 
 It includes:
 
-
-* An [Agent Bond](https://github.com/fabric8io/agent-bond) agent with [Jolokia](http://www.jolokia.org) and Prometheus' [jmx_exporter](https://github.com/prometheus/jmx_exporter). The agent is installed as `/opt/agent-bond/agent-bond.jar`. See below for configuration options.
-
-
 * A startup script [`/deployments/run-java.sh`](#startup-script-run-javash) for starting up Java applications.
-
-### Agent Bond
-
-In order to enable Jolokia for your application you should use this image as a base image (via `FROM`) and use the output of `agent-bond-opts` in your startup scripts to include it in for the Java startup options.
-
-For example, the following snippet can be added to a script starting up your Java application
-
-    # ...
-    export JAVA_OPTIONS="$JAVA_OPTIONS $(agent-bond-opts)"
-    # .... use JAVA_OPTIONS when starting your app, e.g. as Tomcat does
-
-The following versions and defaults are used:
-
-* [Jolokia](http://www.jolokia.org) : version **1.6.2** and port **8778**
-* [jmx_exporter](https://github.com/prometheus/jmx_exporter): version **0.3.1** and port **9779**
-
-You can influence the behaviour of `agent-bond-opts` by setting various environment variables:
-
-### Agent-Bond Options
-
-Agent bond itself can be influenced with the following environment variables: 
-
-* **AB_OFF** : If set disables activation of agent-bond (i.e. echos an empty value). By default, agent-bond is enabled.
-* **AB_ENABLED** : Comma separated list of sub-agents enabled. Currently allowed values are `jolokia` and `jmx_exporter`. 
-  By default both are enabled.
-
-
-#### Jolokia configuration
-
-* **AB_JOLOKIA_CONFIG** : If set uses this file (including path) as Jolokia JVM agent properties (as described 
-  in Jolokia's [reference manual](http://www.jolokia.org/reference/html/agents.html#agents-jvm)).
-  By default this is `/opt/jolokia/jolokia.properties`.
-* **AB_JOLOKIA_HOST** : Host address to bind to (Default: `0.0.0.0`)
-* **AB_JOLOKIA_PORT** : Port to use (Default: `8778`)
-* **AB_JOLOKIA_USER** : User for authentication. By default authentication is switched off.
-* **AB_JOLOKIA_HTTPS** : Switch on secure communication with https. By default self signed server certificates are generated
-  if no `serverCert` configuration is given in `AB_JOLOKIA_OPTS`
-* **AB_JOLOKIA_PASSWORD** : Password for authentication. By default authentication is switched off.
-* **AB_JOLOKIA_ID** : Agent ID to use (`$HOSTNAME` by default, which is the container id)
-* **AB_JOLOKIA_OPTS**  : Additional options to be appended to the agent opts. They should be given in the format 
-  "key=value,key=value,..."
-
-Some options for integration in various environments:
-
-* **AB_JOLOKIA_AUTH_OPENSHIFT** : Switch on client authentication for OpenShift TLS communication. The value of this 
-  parameter can be a relative distinguished name which must be contained in a presented client certificate. Enabling this
-  parameter will automatically switch Jolokia into https communication mode. The default CA cert is set to 
-  `/var/run/secrets/kubernetes.io/serviceaccount/ca.crt` 
-  
-#### jmx_exporter configuration
-
-* **AB_JMX_EXPORTER_OPTS** : Configuration to use for `jmx_exporter` (in the format `<port>:<path to config>`)
-* **AB_JMX_EXPORTER_PORT** : Port to use for the JMX Exporter. Default: `9779`
-* **AB_JMX_EXPORTER_CONFIG** : Path to configuration to use for `jmx_exporter`: Default: `/opt/agent-bond/jmx_exporter_config.json`
-
-
+* [Jolokia](http://www.jolokia.org) agent installed in `/opt/jolokia`
+* Prometheus [jmx_exporter](https://github.com/prometheus/jmx_exporter) agent installed in `/opt/jmx_exporter`.
 
 ### Startup Script run-java.sh
 
@@ -177,8 +117,55 @@ mvn clean install
 ```
 
 
+### Monitoring Agents
+
+In order to enable Jolokia and Prometheus exporter for your application you should use this image as a base image (via `FROM`) and use the output of `jolokia-opts` and `prometheus-opts` in your startup scripts to include it in for the Java startup options. You can also just use the provided startup script `/opt/run-java.sh` which does this automatically.
+
+For example, the following snippet can be added to a script starting up your Java application
+
+    # ...
+    export JAVA_OPTIONS="$JAVA_OPTIONS $(/opt/jolokia/jolokia-opts) $(/opt/prometheus/prometheus-opts)"
+    # .... use JAVA_OPTIONS when starting your app, e.g. as Tomcat does
+
+The following versions and defaults are used:
+
+* [Jolokia](http://www.jolokia.org) : version **1.6.2** and port **8778**
+* [jmx_exporter](https://github.com/prometheus/jmx_exporter): version **0.3.1** and port **9779**
+
+You can influence the behaviour of these config scripts by setting various environment variables.
+
+#### Jolokia Configuration
+
+* **AB_JOLOKIA_OFF** : If set disables activation of Jolokia (i.e. echos an empty value). By default, Jolokia is enabled.
+* **AB_JOLOKIA_CONFIG** : If set uses this file (including path) as Jolokia JVM agent properties (as described
+  in Jolokia's [reference manual](http://www.jolokia.org/reference/html/agents.html#agents-jvm)). If not set,
+  the `/opt/jolokia/etc/jolokia.properties` will be created using the settings as defined in this document, otherwise
+  the reset of the settings in this document are ignored.
+* **AB_JOLOKIA_HOST** : Host address to bind to (Default: `0.0.0.0`)
+* **AB_JOLOKIA_PORT** : Port to use (Default: `8778`)
+* **AB_JOLOKIA_USER** : User for basic authentication. Defaults to 'jolokia'
+* **AB_JOLOKIA_PASSWORD** : Password for basic authentication. By default authentication is switched off.
+* **AB_JOLOKIA_PASSWORD_RANDOM** : Should a random AB_JOLOKIA_PASSWORD be generated? Generated value will be written to `/opt/jolokia/etc/jolokia.pw`
+* **AB_JOLOKIA_HTTPS** : Switch on secure communication with https. By default self signed server certificates are generated
+  if no `serverCert` configuration is given in `AB_JOLOKIA_OPTS`
+* **AB_JOLOKIA_ID** : Agent ID to use (`$HOSTNAME` by default, which is the container id)
+* **AB_JOLOKIA_DISCOVERY_ENABLED** : Enable Jolokia discovery.  Defaults to false.
+* **AB_JOLOKIA_OPTS**  : Additional options to be appended to the agent configuration. They should be given in the format
+  "key=value,key=value,..."
+
+Some options for integration in various environments:
+
+* **AB_JOLOKIA_AUTH_OPENSHIFT** : Switch on client authentication for OpenShift TSL communication. The value of this
+  parameter can be a relative distinguished name which must be contained in a presented client certificate. Enabling this
+  parameter will automatically switch Jolokia into https communication mode. The default CA cert is set to
+  `/var/run/secrets/kubernetes.io/serviceaccount/ca.crt`
+
+
+undefined
+
 ### Versions:
 
 * Base-Image: **CentOS 7**
 * Java: **OpenJDK 11 11** (Java Runtime Environment (JRE))
-* Agent-Bond: **1.2.0** (Jolokia 1.6.2, jmx_exporter 0.3.1)
+* Jolokia: **1.6.2**
+* jmx_exporter: **undefined**
diff --git a/images/centos/openjdk11/jre/agent-bond-opts b/images/centos/openjdk11/jre/agent-bond-opts
deleted file mode 100644
index 280313b..0000000
--- a/images/centos/openjdk11/jre/agent-bond-opts
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/bin/sh
-
-# Parse options
-while [ $# -gt 0 ]
-do
-key="$1"
-case ${key} in
-    # Escape for scripts which eval the output of this script
-    -e|--escape)
-    escape_sep=1
-    ;;
-esac
-shift
-done
-
-# Check whether a given config is contained in AB_JOLOKIA_OPTS
-is_in_jolokia_opts() {
-  local prop=$1
-  if [ -n "${AB_JOLOKIA_OPTS:-}" ] && [ "${AB_JOLOKIA_OPTS}" != "${AB_JOLOKIA_OPTS/${prop}/}" ]; then
-     echo "yes"
-  else
-     echo "no"
-  fi
-}
-
-dir=${AB_DIR:-/opt/agent-bond}
-sep="="
-
-# Options separators defined to avoid clash with fish-pepper templating
-ab_open_del="{""{"
-ab_close_del="}""}"
-if [ -n "${escape_sep:-}" ]; then
-  ab_open_del='\{\{'
-  ab_close_del='\}\}'
-fi
-
-if [ -z "${AB_OFF:-}" ]; then
-   opts="-javaagent:$dir/agent-bond.jar"
-   config="${AB_CONFIG:-$dir/agent-bond.properties}"
-   if [ -f "$config" ]; then
-      # Configuration takes precedence
-      opts="${opts}${sep}config=${config}"
-      sep=","
-   fi
-   if [ -z "${AB_ENABLED:-}" ] || [ "${AB_ENABLED}" != "${AB_ENABLED/jolokia/}" ]; then
-     # Direct options only if no configuration is found
-     jsep=""
-     jolokia_opts=""
-     if [ -n "${AB_JOLOKIA_CONFIG:-}" ] && [ -f "${AB_JOLOKIA_CONFIG}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}config=${AB_JOLOKIA_CONFIG}"
-        jsep=","
-        grep -q -e '^host' ${AB_JOLOKIA_CONFIG} && host_in_config=1
-     fi
-     if [ -z "${AB_JOLOKIA_HOST:-}" ] && [ -z "${host_in_config:-}" ]; then
-        AB_JOLOKIA_HOST='0.0.0.0'
-     fi
-     if [ -n "${AB_JOLOKIA_HOST:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}host=${AB_JOLOKIA_HOST}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_PORT:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}port=${AB_JOLOKIA_PORT}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_USER:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}user=${AB_JOLOKIA_USER}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_PASSWORD:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}password=${AB_JOLOKIA_PASSWORD}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_HTTPS:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}protocol=https"
-        https_used=1
-        jsep=","
-     fi
-     # Integration with OpenShift client cert auth
-     if [ -n "${AB_JOLOKIA_AUTH_OPENSHIFT:-}" ]; then
-        auth_opts="useSslClientAuthentication=true,extraClientCheck=true"
-        if [ -z "${https_used+x}" ]; then
-          auth_opts="${auth_opts},protocol=https"
-        fi
-        if [ $(is_in_jolokia_opts "caCert") != "yes" ]; then
-           auth_opts="${auth_opts},caCert=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
-        fi
-        if [ $(is_in_jolokia_opts "clientPrincipal") != "yes" ]; then
-           if [  "${AB_JOLOKIA_AUTH_OPENSHIFT}" != "${AB_JOLOKIA_AUTH_OPENSHIFT/=/}" ]; then
-              # Supposed to contain a principal name to check
-              auth_opts="${auth_opts},clientPrincipal=$(echo ${AB_JOLOKIA_AUTH_OPENSHIFT} | sed -e 's/ /\\\\ /g')"
-           else
-              auth_opts="${auth_opts},clientPrincipal=cn=system:master-proxy"
-           fi
-        fi
-        jolokia_opts="${jolokia_opts}${jsep}${auth_opts}"
-        jsep=","
-     fi
-     # Add extra opts to the end
-     if [ -n "${AB_JOLOKIA_OPTS:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}${AB_JOLOKIA_OPTS}"
-        jsep=","
-     fi
-
-     opts="${opts}${sep}jolokia${ab_open_del}${jolokia_opts}${ab_close_del}"
-     sep=","
-   fi
-   if [ -z "${AB_ENABLED:-}" ] || [ "${AB_ENABLED}" != "${AB_ENABLED/jmx_exporter/}" ]; then
-     je_opts=""
-     jsep=""
-     if [ -n "${AB_JMX_EXPORTER_OPTS:-}" ]; then
-        opts="${opts}${sep}jmx_exporter${ab_open_del}${AB_JMX_EXPORTER_OPTS}${ab_close_del}"
-        sep=","
-     else
-        port=${AB_JMX_EXPORTER_PORT:-9779}
-        config=${AB_JMX_EXPORTER_CONFIG:-/opt/agent-bond/jmx_exporter_config.yml}
-        opts="${opts}${sep}jmx_exporter${ab_open_del}${port}:${config}${ab_close_del}"
-        sep=","
-     fi
-   fi
-   if [ "${sep:-}" != '=' ] ; then
-     echo ${opts}
-   fi
-fi
diff --git a/images/centos/openjdk11/jre/jmx_exporter_config.yml b/images/centos/openjdk11/jre/jmx_exporter_config.yml
deleted file mode 100644
index 620cd4a..0000000
--- a/images/centos/openjdk11/jre/jmx_exporter_config.yml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-lowercaseOutputName: true
-lowercaseOutputLabelNames: true
-whitelistObjectNames:
-  - 'org.apache.camel:*'
-rules:
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>((?:Min|Mean|Max|Last|Delta)(?:ProcessingTime)):'
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>(TotalProcessingTime):'
-    type: COUNTER
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>(ExchangesInflight|LastProcessingTime):'
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>((?:Exchanges(?:Completed|Failed|Total))|FailuresHandled):'
-    type: COUNTER
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
diff --git a/images/centos/openjdk11/jre/jolokia-opts b/images/centos/openjdk11/jre/jolokia-opts
new file mode 100644
index 0000000..1aa273e
--- /dev/null
+++ b/images/centos/openjdk11/jre/jolokia-opts
@@ -0,0 +1,103 @@
+#!/bin/sh
+
+
+# Exit if switched off
+if [ -n "${AB_JOLOKIA_OFF:-}" ] && [ "${AB_JOLOKIA_OFF}" != "false" ]; then
+  exit 0
+fi
+
+# Global switch, turning of all agents
+if [ -n "${AB_OFF:-}" ] && [ "${AB_OFF}" != "false" ]; then
+  exit 0
+fi
+
+# Check whether a given config is contained in AB_JOLOKIA_OPTS
+is_in_jolokia_opts() {
+  local prop=$1
+  if [ -n "${AB_JOLOKIA_OPTS:-}" ] && [ "${AB_JOLOKIA_OPTS}" != "${AB_JOLOKIA_OPTS/${prop}/}" ]; then
+     echo "yes"
+  else
+     echo "no"
+  fi
+}
+
+get_jolokia_properties() {
+
+  echo "host=${AB_JOLOKIA_HOST:-*}"
+  echo "port=${AB_JOLOKIA_PORT:-8778}"
+  echo "discoveryEnabled=${AB_JOLOKIA_DISCOVERY_ENABLED:-false}"
+
+  if [ -n "${AB_JOLOKIA_PASSWORD:-}" ]; then
+     echo "user=${AB_JOLOKIA_USER:-jolokia}"
+     echo "password=${AB_JOLOKIA_PASSWORD}"
+  fi
+  if [ -n "${AB_JOLOKIA_HTTPS:-}" ]; then
+     echo "protocol=https"
+     https_used=1
+  fi
+
+  # Integration with OpenShift client cert auth is enabled
+  # by default if not explicitly turned off by setting to 'false'
+  if [ "${AB_JOLOKIA_AUTH_OPENSHIFT:-}" != "false" ] && [ -f "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt" ]; then
+     echo "useSslClientAuthentication=true"
+     echo "extraClientCheck=true"
+
+     # Check if the 'protocol' property has already been set to 'https'
+     # If not, then defaults to using HTTPS
+     if [ -z ${https_used+x} ]; then
+       echo "protocol=https"
+     fi
+     if [ $(is_in_jolokia_opts "caCert") != "yes" ]; then
+        echo "caCert=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
+     fi
+
+     if [ $(is_in_jolokia_opts "clientPrincipal") != "yes" ]; then
+        if [  "${AB_JOLOKIA_AUTH_OPENSHIFT}" != "${AB_JOLOKIA_AUTH_OPENSHIFT/=/}" ]; then
+           # Supposed to contain a principal name to check
+           echo "clientPrincipal=$(echo ${AB_JOLOKIA_AUTH_OPENSHIFT} | sed -e 's/ /\\\\ /g')"
+        else
+           echo "clientPrincipal=cn=system:master-proxy"
+        fi
+     fi
+  fi
+
+  # Add extra opts
+  if [ -n "${AB_JOLOKIA_OPTS:-}" ]; then
+     echo "${AB_JOLOKIA_OPTS}" | tr "," "\n"
+  fi
+
+}
+
+write_jolokia_properties() {
+  local jolokia_property_file="$1"
+
+  # Setup Jolokia to accept basic auth, using a randomly generated password that is stored
+  # in the container in the ${DEPLOYMENTS_DIR}/jolokia.pw file.
+  if [ "${AB_JOLOKIA_PASSWORD_RANDOM:-}" == "true" ]; then
+    pw_file="/opt/jolokia/etc/jolokia.pw"
+    if [ -f "${pw_file}" ] ; then
+      AB_JOLOKIA_PASSWORD=$(cat "${pw_file}")
+    else
+      AB_JOLOKIA_PASSWORD=$(tr -cd '[:alnum:]' < /dev/urandom | fold -w30 | head -n1)
+      touch "${pw_file}"
+      chmod 660 "${pw_file}"
+      cat > "${pw_file}" <<EOF
+$AB_JOLOKIA_PASSWORD
+EOF
+    fi
+    export AB_JOLOKIA_PASSWORD
+  fi
+
+  touch "${jolokia_property_file}"
+  chmod 660 "${jolokia_property_file}"
+  cat > "${jolokia_property_file}" <<EOF
+$(get_jolokia_properties)
+EOF
+
+}
+
+if [ -z "${AB_JOLOKIA_CONFIG:-}" ]; then
+  AB_JOLOKIA_CONFIG="/opt/jolokia/etc/jolokia.properties"
+  write_jolokia_properties "$AB_JOLOKIA_CONFIG"
+fi
+echo "-javaagent:/opt/jolokia/jolokia.jar=config=${AB_JOLOKIA_CONFIG}"
diff --git a/images/centos/openjdk11/jre/prometheus-config.yml b/images/centos/openjdk11/jre/prometheus-config.yml
new file mode 100644
index 0000000..f6eaa2b
--- /dev/null
+++ b/images/centos/openjdk11/jre/prometheus-config.yml
@@ -0,0 +1,586 @@
+startDelaySecs: 5
+ssl: false
+blacklistObjectNames: ["java.lang:*"]
+rules:
+# Context level
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesCompleted'
+    name: org.apache.camel.ExchangesCompleted
+    help: Exchanges Completed
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesFailed'
+    name: org.apache.camel.ExchangesFailed
+    help: Exchanges Failed
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesInflight'
+    name: org.apache.camel.ExchangesInflight
+    help: Exchanges Inflight
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>FailuresHandled'
+    name: org.apache.camel.FailuresHandled
+    help: Failures Handled
+    labels:
+        context: $1
+        type: context
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExternalRedeliveries'
+    name: org.apache.camel.ExternalRedeliveries
+    help: External Redeliveries
+    labels:
+        context: $1
+        type: context
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>MaxProcessingTime'
+    name: org.apache.camel.MaxProcessingTime
+    help: Maximum Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>MeanProcessingTime'
+    name: org.apache.camel.MeanProcessingTime
+    help: Mean Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>MinProcessingTime'
+    name: org.apache.camel.MinProcessingTime
+    help: Minimum Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>LastProcessingTime'
+    name: org.apache.camel.LastProcessingTime
+    help: Last Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>DeltaProcessingTime'
+    name: org.apache.camel.DeltaProcessingTime
+    help: Delta Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>Redeliveries'
+    name: org.apache.camel.Redeliveries
+    help: Redeliveries
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>TotalProcessingTime'
+    name: org.apache.camel.TotalProcessingTime
+    help: Total Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=consumers, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+
+
+# Route level
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesCompleted'
+    name: org.apache.camel.ExchangesCompleted
+    help: Exchanges Completed
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesFailed'
+    name: org.apache.camel.ExchangesFailed
+    help: Exchanges Failed
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesInflight'
+    name: org.apache.camel.ExchangesInflight
+    help: Exchanges Inflight
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>FailuresHandled'
+    name: org.apache.camel.FailuresHandled
+    help: Failures Handled
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExternalRedeliveries'
+    name: org.apache.camel.ExternalRedeliveries
+    help: External Redeliveries
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>MaxProcessingTime'
+    name: org.apache.camel.MaxProcessingTime
+    help: Maximum Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>MeanProcessingTime'
+    name: org.apache.camel.MeanProcessingTime
+    help: Mean Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>MinProcessingTime'
+    name: org.apache.camel.MinProcessingTime
+    help: Minimum Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>LastProcessingTime'
+    name: org.apache.camel.LastProcessingTime
+    help: Last Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>DeltaProcessingTime'
+    name: org.apache.camel.DeltaProcessingTime
+    help: Delta Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>Redeliveries'
+    name: org.apache.camel.Redeliveries
+    help: Redeliveries
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>TotalProcessingTime'
+    name: org.apache.camel.TotalProcessingTime
+    help: Total Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+
+# Processor level
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesCompleted'
+    name: org.apache.camel.ExchangesCompleted
+    help: Exchanges Completed
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesFailed'
+    name: org.apache.camel.ExchangesFailed
+    help: Exchanges Failed
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesInflight'
+    name: org.apache.camel.ExchangesInflight
+    help: Exchanges Inflight
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>FailuresHandled'
+    name: org.apache.camel.FailuresHandled
+    help: Failures Handled
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExternalRedeliveries'
+    name: org.apache.camel.ExternalRedeliveries
+    help: External Redeliveries
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>MaxProcessingTime'
+    name: org.apache.camel.MaxProcessingTime
+    help: Maximum Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>MeanProcessingTime'
+    name: org.apache.camel.MeanProcessingTime
+    help: Mean Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>MinProcessingTime'
+    name: org.apache.camel.MinProcessingTime
+    help: Minimum Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>LastProcessingTime'
+    name: org.apache.camel.LastProcessingTime
+    help: Last Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>DeltaProcessingTime'
+    name: org.apache.camel.DeltaProcessingTime
+    help: Delta Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>Redeliveries'
+    name: org.apache.camel.Redeliveries
+    help: Redeliveries
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>TotalProcessingTime'
+    name: org.apache.camel.TotalProcessingTime
+    help: Total Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: COUNTER
+
+# Consumers
+  - pattern: 'org.apache.camel<context=([^,]+), type=consumers, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        consumer: $2
+        type: consumers
+    type: GAUGE
+
+# Services
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>MaxDuration'
+    name: org.apache.camel.MaxDuration
+    help: Maximum Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>MeanDuration'
+    name: org.apache.camel.MeanDuration
+    help: Mean Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>MinDuration'
+    name: org.apache.camel.MinDuration
+    help: Minimum Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>TotalDuration'
+    name: org.apache.camel.TotalDuration
+    help: Total Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>ThreadsBlocked'
+    name: org.apache.camel.ThreadsBlocked
+    help: Threads Blocked
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>ThreadsInterrupted'
+    name: org.apache.camel.ThreadsInterrupted
+    help: Threads Interrupted
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumLogicalRuntimeFaults'
+    name: org.apache.cxf.NumLogicalRuntimeFaults
+    help: Number of logical runtime faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumLogicalRuntimeFaults'
+    name: org.apache.cxf.NumLogicalRuntimeFaults
+    help: Number of logical runtime faults
+    type: GAUGE
+    labels:
+       bus.id: $1
+       type: $2
+       service: $3
+       port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>AvgResponseTime'
+    name: org.apache.cxf.AvgResponseTime
+    help: Average Response Time
+    type: GAUGE
+    labels:
+       bus.id: $1
+       type: $2
+       service: $3
+       port: $4
+       operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>AvgResponseTime'
+    name: org.apache.cxf.AvgResponseTime
+    help: Average Response Time
+    type: GAUGE
+    labels:
+          bus.id: $1
+          type: $2
+          service: $3
+          port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumInvocations'
+    name: org.apache.cxf.NumInvocations
+    help: Number of invocations
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumInvocations'
+    name: org.apache.cxf.NumInvocations
+    help: Number of invocations
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>MaxResponseTime'
+    name: org.apache.cxf.MaxResponseTime
+    help: Maximum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>MaxResponseTime'
+    name: org.apache.cxf.MaxResponseTime
+    help: Maximum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>MinResponseTime'
+    name: org.apache.cxf.MinResponseTime
+    help: Minimum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>MinResponseTime'
+    name: org.apache.cxf.MinResponseTime
+    help: Minimum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>TotalHandlingTime'
+    name: org.apache.cxf.TotalHandlingTime
+    help: Total Handling Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>TotalHandlingTime'
+    name: org.apache.cxf.TotalHandlingTime
+    help: Total Handling Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumRuntimeFaults'
+    name: org.apache.cxf.NumRuntimeFaults
+    help: Number of runtime faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumRuntimeFaults'
+    name: org.apache.cxf.NumRuntimeFaults
+    help: Number of runtime faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumUnCheckedApplicationFaults'
+    name: org.apache.cxf.NumUnCheckedApplicationFaults
+    help: Number of unchecked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumUnCheckedApplicationFaults'
+    name: org.apache.cxf.NumUnCheckedApplicationFaults
+    help: Number of unchecked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumCheckedApplicationFaults'
+    name: org.apache.cxf.NumCheckedApplicationFaults
+    help: Number of checked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumCheckedApplicationFaults'
+    name: org.apache.cxf.NumCheckedApplicationFaults
+    help: Number of checked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
diff --git a/images/centos/openjdk11/jre/prometheus-opts b/images/centos/openjdk11/jre/prometheus-opts
new file mode 100644
index 0000000..3c43968
--- /dev/null
+++ b/images/centos/openjdk11/jre/prometheus-opts
@@ -0,0 +1,23 @@
+#!/bin/sh
+# Scripted for getting Prometheus options
+# meant to be evaluated (not to be sourced)
+
+# Exit if switched off
+if [ -n "${AB_PROMETHEUS_OFF:-}" ] && [ "${AB_PROMETHEUS_OFF}" != "false" ]; then
+  exit 0
+fi
+
+# Global switch, turning of all agents
+if [ -n "${AB_OFF:-}" ] && [ "${AB_OFF}" != "false" ]; then
+  exit 0
+fi
+
+port=${AB_PROMETHEUS_PORT:-9779}
+config=${AB_PROMETHEUS_CONFIG:-/opt/prometheus/prometheus-config.yml}
+if [ -n "${AB_PROMETHEUS_HOST:-}" ]; then
+  hostPort="${AB_PROMETHEUS_HOST}:$port"
+else
+  hostPort="$port"
+fi
+
+echo "-javaagent:/opt/prometheus/jmx_prometheus_javaagent.jar=${hostPort}:$config"
diff --git a/images/centos/openjdk11/jre/run-java-options b/images/centos/openjdk11/jre/run-java-options
new file mode 100644
index 0000000..759dee7
--- /dev/null
+++ b/images/centos/openjdk11/jre/run-java-options
@@ -0,0 +1,4 @@
+#!/bin/bash
+# Delegate to the individual agent options scripts which will
+# examine the environment for features to be enabled
+echo "$(/opt/jolokia/jolokia-opts) $(/opt/prometheus/prometheus-opts)"
diff --git a/images/centos/openjdk7/jdk/Dockerfile b/images/centos/openjdk7/jdk/Dockerfile
index 8f171a6..697dc47 100644
--- a/images/centos/openjdk7/jdk/Dockerfile
+++ b/images/centos/openjdk7/jdk/Dockerfile
@@ -14,31 +14,51 @@ ENV JAVA_APP_DIR=/deployments \
 RUN yum install -y \
        java-1.7.0-openjdk-1.7.0.231-2.6.19.2.el7_7 \ 
        java-1.7.0-openjdk-devel-1.7.0.231-2.6.19.2.el7_7 \ 
-    && echo "securerandom.source=file:/dev/urandom" >> /usr/lib/jvm/jre/lib/security/java.security \
-    && yum clean all
+       && echo "securerandom.source=file:/dev/urandom" >> /usr/lib/jvm/jre/lib/security/java.security \
+       && yum clean all
 
 ENV JAVA_HOME /etc/alternatives/jre
 
-# Agent bond including Jolokia and jmx_exporter
-ADD agent-bond-opts /opt/run-java-options
-RUN mkdir -p /opt/agent-bond \
- && curl http://central.maven.org/maven2/io/fabric8/agent-bond-agent/1.2.0/agent-bond-agent-1.2.0.jar \
-          -o /opt/agent-bond/agent-bond.jar \
- && chmod 444 /opt/agent-bond/agent-bond.jar \
- && chmod 755 /opt/run-java-options
-ADD jmx_exporter_config.yml /opt/agent-bond/
-EXPOSE 8778 9779
+# Prometheus JMX exporter agent
+RUN mkdir -p /opt/prometheus/etc \
+ && curl http://central.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/undefined/jmx_prometheus_javaagent-undefined.jar \
+          -o /opt/prometheus/jmx_prometheus_javaagent.jar
+ADD prometheus-opts /opt/prometheus/prometheus-opts
+ADD prometheus-config.yml /opt/prometheus/prometheus-config.yml
+RUN chmod 444 /opt/prometheus/jmx_prometheus_javaagent.jar \
+ && chmod 444 /opt/prometheus/prometheus-config.yml \
+ && chmod 755 /opt/prometheus/prometheus-opts \
+ && chmod 775 /opt/prometheus/etc \
+ && chgrp root /opt/prometheus/etc
+
+EXPOSE 9779
+
+
+# Jolokia agent
+RUN mkdir -p /opt/jolokia/etc \
+ && curl http://central.maven.org/maven2/org/jolokia/jolokia-jvm/1.6.2/jolokia-jvm-1.6.2-agent.jar \
+         -o /opt/jolokia/jolokia.jar
+ADD jolokia-opts /opt/jolokia/jolokia-opts
+RUN chmod 444 /opt/jolokia/jolokia.jar \
+ && chmod 755 /opt/jolokia/jolokia-opts \
+ && chmod 775 /opt/jolokia/etc \
+ && chgrp root /opt/jolokia/etc
+
+EXPOSE 8778
+
 
 # Add run script as /deployments/run-java.sh and make it executable
 COPY run-java.sh /deployments/
 RUN chmod 755 /deployments/run-java.sh
 
+COPY run-java-options /opt
 
 
 # Run under user "jboss" and prepare for be running
 # under OpenShift, too
 RUN groupadd -r jboss -g 1000 \
   && useradd -u 1000 -r -g jboss -m -d /opt/jboss -s /sbin/nologin jboss \
+  && chmod 755 /opt/run-java-options \
   && chmod 755 /opt/jboss \
   && chown -R jboss /deployments \
   && usermod -g root -G `id -g jboss` jboss \
diff --git a/images/centos/openjdk7/jdk/README.md b/images/centos/openjdk7/jdk/README.md
index 7880749..71be160 100644
--- a/images/centos/openjdk7/jdk/README.md
+++ b/images/centos/openjdk7/jdk/README.md
@@ -1,72 +1,12 @@
 ## Fabric8 Java Base Image OpenJDK 7 (JDK)
 
-
-
 This image is based on CentOS and provides OpenJDK 7 (JDK)
 
 It includes:
 
-
-* An [Agent Bond](https://github.com/fabric8io/agent-bond) agent with [Jolokia](http://www.jolokia.org) and Prometheus' [jmx_exporter](https://github.com/prometheus/jmx_exporter). The agent is installed as `/opt/agent-bond/agent-bond.jar`. See below for configuration options.
-
-
 * A startup script [`/deployments/run-java.sh`](#startup-script-run-javash) for starting up Java applications.
-
-### Agent Bond
-
-In order to enable Jolokia for your application you should use this image as a base image (via `FROM`) and use the output of `agent-bond-opts` in your startup scripts to include it in for the Java startup options.
-
-For example, the following snippet can be added to a script starting up your Java application
-
-    # ...
-    export JAVA_OPTIONS="$JAVA_OPTIONS $(agent-bond-opts)"
-    # .... use JAVA_OPTIONS when starting your app, e.g. as Tomcat does
-
-The following versions and defaults are used:
-
-* [Jolokia](http://www.jolokia.org) : version **1.6.2** and port **8778**
-* [jmx_exporter](https://github.com/prometheus/jmx_exporter): version **0.3.1** and port **9779**
-
-You can influence the behaviour of `agent-bond-opts` by setting various environment variables:
-
-### Agent-Bond Options
-
-Agent bond itself can be influenced with the following environment variables: 
-
-* **AB_OFF** : If set disables activation of agent-bond (i.e. echos an empty value). By default, agent-bond is enabled.
-* **AB_ENABLED** : Comma separated list of sub-agents enabled. Currently allowed values are `jolokia` and `jmx_exporter`. 
-  By default both are enabled.
-
-
-#### Jolokia configuration
-
-* **AB_JOLOKIA_CONFIG** : If set uses this file (including path) as Jolokia JVM agent properties (as described 
-  in Jolokia's [reference manual](http://www.jolokia.org/reference/html/agents.html#agents-jvm)).
-  By default this is `/opt/jolokia/jolokia.properties`.
-* **AB_JOLOKIA_HOST** : Host address to bind to (Default: `0.0.0.0`)
-* **AB_JOLOKIA_PORT** : Port to use (Default: `8778`)
-* **AB_JOLOKIA_USER** : User for authentication. By default authentication is switched off.
-* **AB_JOLOKIA_HTTPS** : Switch on secure communication with https. By default self signed server certificates are generated
-  if no `serverCert` configuration is given in `AB_JOLOKIA_OPTS`
-* **AB_JOLOKIA_PASSWORD** : Password for authentication. By default authentication is switched off.
-* **AB_JOLOKIA_ID** : Agent ID to use (`$HOSTNAME` by default, which is the container id)
-* **AB_JOLOKIA_OPTS**  : Additional options to be appended to the agent opts. They should be given in the format 
-  "key=value,key=value,..."
-
-Some options for integration in various environments:
-
-* **AB_JOLOKIA_AUTH_OPENSHIFT** : Switch on client authentication for OpenShift TLS communication. The value of this 
-  parameter can be a relative distinguished name which must be contained in a presented client certificate. Enabling this
-  parameter will automatically switch Jolokia into https communication mode. The default CA cert is set to 
-  `/var/run/secrets/kubernetes.io/serviceaccount/ca.crt` 
-  
-#### jmx_exporter configuration
-
-* **AB_JMX_EXPORTER_OPTS** : Configuration to use for `jmx_exporter` (in the format `<port>:<path to config>`)
-* **AB_JMX_EXPORTER_PORT** : Port to use for the JMX Exporter. Default: `9779`
-* **AB_JMX_EXPORTER_CONFIG** : Path to configuration to use for `jmx_exporter`: Default: `/opt/agent-bond/jmx_exporter_config.json`
-
-
+* [Jolokia](http://www.jolokia.org) agent installed in `/opt/jolokia`
+* Prometheus [jmx_exporter](https://github.com/prometheus/jmx_exporter) agent installed in `/opt/jmx_exporter`.
 
 ### Startup Script run-java.sh
 
@@ -177,8 +117,55 @@ mvn clean install
 ```
 
 
+### Monitoring Agents
+
+In order to enable Jolokia and Prometheus exporter for your application you should use this image as a base image (via `FROM`) and use the output of `jolokia-opts` and `prometheus-opts` in your startup scripts to include it in for the Java startup options. You can also just use the provided startup script `/opt/run-java.sh` which does this automatically.
+
+For example, the following snippet can be added to a script starting up your Java application
+
+    # ...
+    export JAVA_OPTIONS="$JAVA_OPTIONS $(/opt/jolokia/jolokia-opts) $(/opt/prometheus/prometheus-opts)"
+    # .... use JAVA_OPTIONS when starting your app, e.g. as Tomcat does
+
+The following versions and defaults are used:
+
+* [Jolokia](http://www.jolokia.org) : version **1.6.2** and port **8778**
+* [jmx_exporter](https://github.com/prometheus/jmx_exporter): version **0.3.1** and port **9779**
+
+You can influence the behaviour of these config scripts by setting various environment variables.
+
+#### Jolokia Configuration
+
+* **AB_JOLOKIA_OFF** : If set disables activation of Jolokia (i.e. echos an empty value). By default, Jolokia is enabled.
+* **AB_JOLOKIA_CONFIG** : If set uses this file (including path) as Jolokia JVM agent properties (as described
+  in Jolokia's [reference manual](http://www.jolokia.org/reference/html/agents.html#agents-jvm)). If not set,
+  the `/opt/jolokia/etc/jolokia.properties` will be created using the settings as defined in this document, otherwise
+  the reset of the settings in this document are ignored.
+* **AB_JOLOKIA_HOST** : Host address to bind to (Default: `0.0.0.0`)
+* **AB_JOLOKIA_PORT** : Port to use (Default: `8778`)
+* **AB_JOLOKIA_USER** : User for basic authentication. Defaults to 'jolokia'
+* **AB_JOLOKIA_PASSWORD** : Password for basic authentication. By default authentication is switched off.
+* **AB_JOLOKIA_PASSWORD_RANDOM** : Should a random AB_JOLOKIA_PASSWORD be generated? Generated value will be written to `/opt/jolokia/etc/jolokia.pw`
+* **AB_JOLOKIA_HTTPS** : Switch on secure communication with https. By default self signed server certificates are generated
+  if no `serverCert` configuration is given in `AB_JOLOKIA_OPTS`
+* **AB_JOLOKIA_ID** : Agent ID to use (`$HOSTNAME` by default, which is the container id)
+* **AB_JOLOKIA_DISCOVERY_ENABLED** : Enable Jolokia discovery.  Defaults to false.
+* **AB_JOLOKIA_OPTS**  : Additional options to be appended to the agent configuration. They should be given in the format
+  "key=value,key=value,..."
+
+Some options for integration in various environments:
+
+* **AB_JOLOKIA_AUTH_OPENSHIFT** : Switch on client authentication for OpenShift TSL communication. The value of this
+  parameter can be a relative distinguished name which must be contained in a presented client certificate. Enabling this
+  parameter will automatically switch Jolokia into https communication mode. The default CA cert is set to
+  `/var/run/secrets/kubernetes.io/serviceaccount/ca.crt`
+
+
+undefined
+
 ### Versions:
 
 * Base-Image: **CentOS 7**
 * Java: **OpenJDK 7 1.7.0** (Java Development Kit (JDK))
-* Agent-Bond: **1.2.0** (Jolokia 1.6.2, jmx_exporter 0.3.1)
+* Jolokia: **1.6.2**
+* jmx_exporter: **undefined**
diff --git a/images/centos/openjdk7/jdk/agent-bond-opts b/images/centos/openjdk7/jdk/agent-bond-opts
deleted file mode 100644
index 280313b..0000000
--- a/images/centos/openjdk7/jdk/agent-bond-opts
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/bin/sh
-
-# Parse options
-while [ $# -gt 0 ]
-do
-key="$1"
-case ${key} in
-    # Escape for scripts which eval the output of this script
-    -e|--escape)
-    escape_sep=1
-    ;;
-esac
-shift
-done
-
-# Check whether a given config is contained in AB_JOLOKIA_OPTS
-is_in_jolokia_opts() {
-  local prop=$1
-  if [ -n "${AB_JOLOKIA_OPTS:-}" ] && [ "${AB_JOLOKIA_OPTS}" != "${AB_JOLOKIA_OPTS/${prop}/}" ]; then
-     echo "yes"
-  else
-     echo "no"
-  fi
-}
-
-dir=${AB_DIR:-/opt/agent-bond}
-sep="="
-
-# Options separators defined to avoid clash with fish-pepper templating
-ab_open_del="{""{"
-ab_close_del="}""}"
-if [ -n "${escape_sep:-}" ]; then
-  ab_open_del='\{\{'
-  ab_close_del='\}\}'
-fi
-
-if [ -z "${AB_OFF:-}" ]; then
-   opts="-javaagent:$dir/agent-bond.jar"
-   config="${AB_CONFIG:-$dir/agent-bond.properties}"
-   if [ -f "$config" ]; then
-      # Configuration takes precedence
-      opts="${opts}${sep}config=${config}"
-      sep=","
-   fi
-   if [ -z "${AB_ENABLED:-}" ] || [ "${AB_ENABLED}" != "${AB_ENABLED/jolokia/}" ]; then
-     # Direct options only if no configuration is found
-     jsep=""
-     jolokia_opts=""
-     if [ -n "${AB_JOLOKIA_CONFIG:-}" ] && [ -f "${AB_JOLOKIA_CONFIG}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}config=${AB_JOLOKIA_CONFIG}"
-        jsep=","
-        grep -q -e '^host' ${AB_JOLOKIA_CONFIG} && host_in_config=1
-     fi
-     if [ -z "${AB_JOLOKIA_HOST:-}" ] && [ -z "${host_in_config:-}" ]; then
-        AB_JOLOKIA_HOST='0.0.0.0'
-     fi
-     if [ -n "${AB_JOLOKIA_HOST:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}host=${AB_JOLOKIA_HOST}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_PORT:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}port=${AB_JOLOKIA_PORT}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_USER:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}user=${AB_JOLOKIA_USER}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_PASSWORD:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}password=${AB_JOLOKIA_PASSWORD}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_HTTPS:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}protocol=https"
-        https_used=1
-        jsep=","
-     fi
-     # Integration with OpenShift client cert auth
-     if [ -n "${AB_JOLOKIA_AUTH_OPENSHIFT:-}" ]; then
-        auth_opts="useSslClientAuthentication=true,extraClientCheck=true"
-        if [ -z "${https_used+x}" ]; then
-          auth_opts="${auth_opts},protocol=https"
-        fi
-        if [ $(is_in_jolokia_opts "caCert") != "yes" ]; then
-           auth_opts="${auth_opts},caCert=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
-        fi
-        if [ $(is_in_jolokia_opts "clientPrincipal") != "yes" ]; then
-           if [  "${AB_JOLOKIA_AUTH_OPENSHIFT}" != "${AB_JOLOKIA_AUTH_OPENSHIFT/=/}" ]; then
-              # Supposed to contain a principal name to check
-              auth_opts="${auth_opts},clientPrincipal=$(echo ${AB_JOLOKIA_AUTH_OPENSHIFT} | sed -e 's/ /\\\\ /g')"
-           else
-              auth_opts="${auth_opts},clientPrincipal=cn=system:master-proxy"
-           fi
-        fi
-        jolokia_opts="${jolokia_opts}${jsep}${auth_opts}"
-        jsep=","
-     fi
-     # Add extra opts to the end
-     if [ -n "${AB_JOLOKIA_OPTS:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}${AB_JOLOKIA_OPTS}"
-        jsep=","
-     fi
-
-     opts="${opts}${sep}jolokia${ab_open_del}${jolokia_opts}${ab_close_del}"
-     sep=","
-   fi
-   if [ -z "${AB_ENABLED:-}" ] || [ "${AB_ENABLED}" != "${AB_ENABLED/jmx_exporter/}" ]; then
-     je_opts=""
-     jsep=""
-     if [ -n "${AB_JMX_EXPORTER_OPTS:-}" ]; then
-        opts="${opts}${sep}jmx_exporter${ab_open_del}${AB_JMX_EXPORTER_OPTS}${ab_close_del}"
-        sep=","
-     else
-        port=${AB_JMX_EXPORTER_PORT:-9779}
-        config=${AB_JMX_EXPORTER_CONFIG:-/opt/agent-bond/jmx_exporter_config.yml}
-        opts="${opts}${sep}jmx_exporter${ab_open_del}${port}:${config}${ab_close_del}"
-        sep=","
-     fi
-   fi
-   if [ "${sep:-}" != '=' ] ; then
-     echo ${opts}
-   fi
-fi
diff --git a/images/centos/openjdk7/jdk/jmx_exporter_config.yml b/images/centos/openjdk7/jdk/jmx_exporter_config.yml
deleted file mode 100644
index 620cd4a..0000000
--- a/images/centos/openjdk7/jdk/jmx_exporter_config.yml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-lowercaseOutputName: true
-lowercaseOutputLabelNames: true
-whitelistObjectNames:
-  - 'org.apache.camel:*'
-rules:
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>((?:Min|Mean|Max|Last|Delta)(?:ProcessingTime)):'
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>(TotalProcessingTime):'
-    type: COUNTER
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>(ExchangesInflight|LastProcessingTime):'
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>((?:Exchanges(?:Completed|Failed|Total))|FailuresHandled):'
-    type: COUNTER
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
diff --git a/images/centos/openjdk7/jdk/jolokia-opts b/images/centos/openjdk7/jdk/jolokia-opts
new file mode 100644
index 0000000..1aa273e
--- /dev/null
+++ b/images/centos/openjdk7/jdk/jolokia-opts
@@ -0,0 +1,103 @@
+#!/bin/sh
+
+
+# Exit if switched off
+if [ -n "${AB_JOLOKIA_OFF:-}" ] && [ "${AB_JOLOKIA_OFF}" != "false" ]; then
+  exit 0
+fi
+
+# Global switch, turning of all agents
+if [ -n "${AB_OFF:-}" ] && [ "${AB_OFF}" != "false" ]; then
+  exit 0
+fi
+
+# Check whether a given config is contained in AB_JOLOKIA_OPTS
+is_in_jolokia_opts() {
+  local prop=$1
+  if [ -n "${AB_JOLOKIA_OPTS:-}" ] && [ "${AB_JOLOKIA_OPTS}" != "${AB_JOLOKIA_OPTS/${prop}/}" ]; then
+     echo "yes"
+  else
+     echo "no"
+  fi
+}
+
+get_jolokia_properties() {
+
+  echo "host=${AB_JOLOKIA_HOST:-*}"
+  echo "port=${AB_JOLOKIA_PORT:-8778}"
+  echo "discoveryEnabled=${AB_JOLOKIA_DISCOVERY_ENABLED:-false}"
+
+  if [ -n "${AB_JOLOKIA_PASSWORD:-}" ]; then
+     echo "user=${AB_JOLOKIA_USER:-jolokia}"
+     echo "password=${AB_JOLOKIA_PASSWORD}"
+  fi
+  if [ -n "${AB_JOLOKIA_HTTPS:-}" ]; then
+     echo "protocol=https"
+     https_used=1
+  fi
+
+  # Integration with OpenShift client cert auth is enabled
+  # by default if not explicitly turned off by setting to 'false'
+  if [ "${AB_JOLOKIA_AUTH_OPENSHIFT:-}" != "false" ] && [ -f "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt" ]; then
+     echo "useSslClientAuthentication=true"
+     echo "extraClientCheck=true"
+
+     # Check if the 'protocol' property has already been set to 'https'
+     # If not, then defaults to using HTTPS
+     if [ -z ${https_used+x} ]; then
+       echo "protocol=https"
+     fi
+     if [ $(is_in_jolokia_opts "caCert") != "yes" ]; then
+        echo "caCert=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
+     fi
+
+     if [ $(is_in_jolokia_opts "clientPrincipal") != "yes" ]; then
+        if [  "${AB_JOLOKIA_AUTH_OPENSHIFT}" != "${AB_JOLOKIA_AUTH_OPENSHIFT/=/}" ]; then
+           # Supposed to contain a principal name to check
+           echo "clientPrincipal=$(echo ${AB_JOLOKIA_AUTH_OPENSHIFT} | sed -e 's/ /\\\\ /g')"
+        else
+           echo "clientPrincipal=cn=system:master-proxy"
+        fi
+     fi
+  fi
+
+  # Add extra opts
+  if [ -n "${AB_JOLOKIA_OPTS:-}" ]; then
+     echo "${AB_JOLOKIA_OPTS}" | tr "," "\n"
+  fi
+
+}
+
+write_jolokia_properties() {
+  local jolokia_property_file="$1"
+
+  # Setup Jolokia to accept basic auth, using a randomly generated password that is stored
+  # in the container in the ${DEPLOYMENTS_DIR}/jolokia.pw file.
+  if [ "${AB_JOLOKIA_PASSWORD_RANDOM:-}" == "true" ]; then
+    pw_file="/opt/jolokia/etc/jolokia.pw"
+    if [ -f "${pw_file}" ] ; then
+      AB_JOLOKIA_PASSWORD=$(cat "${pw_file}")
+    else
+      AB_JOLOKIA_PASSWORD=$(tr -cd '[:alnum:]' < /dev/urandom | fold -w30 | head -n1)
+      touch "${pw_file}"
+      chmod 660 "${pw_file}"
+      cat > "${pw_file}" <<EOF
+$AB_JOLOKIA_PASSWORD
+EOF
+    fi
+    export AB_JOLOKIA_PASSWORD
+  fi
+
+  touch "${jolokia_property_file}"
+  chmod 660 "${jolokia_property_file}"
+  cat > "${jolokia_property_file}" <<EOF
+$(get_jolokia_properties)
+EOF
+
+}
+
+if [ -z "${AB_JOLOKIA_CONFIG:-}" ]; then
+  AB_JOLOKIA_CONFIG="/opt/jolokia/etc/jolokia.properties"
+  write_jolokia_properties "$AB_JOLOKIA_CONFIG"
+fi
+echo "-javaagent:/opt/jolokia/jolokia.jar=config=${AB_JOLOKIA_CONFIG}"
diff --git a/images/centos/openjdk7/jdk/prometheus-config.yml b/images/centos/openjdk7/jdk/prometheus-config.yml
new file mode 100644
index 0000000..f6eaa2b
--- /dev/null
+++ b/images/centos/openjdk7/jdk/prometheus-config.yml
@@ -0,0 +1,586 @@
+startDelaySecs: 5
+ssl: false
+blacklistObjectNames: ["java.lang:*"]
+rules:
+# Context level
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesCompleted'
+    name: org.apache.camel.ExchangesCompleted
+    help: Exchanges Completed
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesFailed'
+    name: org.apache.camel.ExchangesFailed
+    help: Exchanges Failed
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesInflight'
+    name: org.apache.camel.ExchangesInflight
+    help: Exchanges Inflight
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>FailuresHandled'
+    name: org.apache.camel.FailuresHandled
+    help: Failures Handled
+    labels:
+        context: $1
+        type: context
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExternalRedeliveries'
+    name: org.apache.camel.ExternalRedeliveries
+    help: External Redeliveries
+    labels:
+        context: $1
+        type: context
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>MaxProcessingTime'
+    name: org.apache.camel.MaxProcessingTime
+    help: Maximum Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>MeanProcessingTime'
+    name: org.apache.camel.MeanProcessingTime
+    help: Mean Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>MinProcessingTime'
+    name: org.apache.camel.MinProcessingTime
+    help: Minimum Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>LastProcessingTime'
+    name: org.apache.camel.LastProcessingTime
+    help: Last Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>DeltaProcessingTime'
+    name: org.apache.camel.DeltaProcessingTime
+    help: Delta Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>Redeliveries'
+    name: org.apache.camel.Redeliveries
+    help: Redeliveries
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>TotalProcessingTime'
+    name: org.apache.camel.TotalProcessingTime
+    help: Total Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=consumers, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+
+
+# Route level
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesCompleted'
+    name: org.apache.camel.ExchangesCompleted
+    help: Exchanges Completed
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesFailed'
+    name: org.apache.camel.ExchangesFailed
+    help: Exchanges Failed
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesInflight'
+    name: org.apache.camel.ExchangesInflight
+    help: Exchanges Inflight
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>FailuresHandled'
+    name: org.apache.camel.FailuresHandled
+    help: Failures Handled
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExternalRedeliveries'
+    name: org.apache.camel.ExternalRedeliveries
+    help: External Redeliveries
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>MaxProcessingTime'
+    name: org.apache.camel.MaxProcessingTime
+    help: Maximum Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>MeanProcessingTime'
+    name: org.apache.camel.MeanProcessingTime
+    help: Mean Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>MinProcessingTime'
+    name: org.apache.camel.MinProcessingTime
+    help: Minimum Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>LastProcessingTime'
+    name: org.apache.camel.LastProcessingTime
+    help: Last Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>DeltaProcessingTime'
+    name: org.apache.camel.DeltaProcessingTime
+    help: Delta Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>Redeliveries'
+    name: org.apache.camel.Redeliveries
+    help: Redeliveries
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>TotalProcessingTime'
+    name: org.apache.camel.TotalProcessingTime
+    help: Total Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+
+# Processor level
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesCompleted'
+    name: org.apache.camel.ExchangesCompleted
+    help: Exchanges Completed
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesFailed'
+    name: org.apache.camel.ExchangesFailed
+    help: Exchanges Failed
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesInflight'
+    name: org.apache.camel.ExchangesInflight
+    help: Exchanges Inflight
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>FailuresHandled'
+    name: org.apache.camel.FailuresHandled
+    help: Failures Handled
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExternalRedeliveries'
+    name: org.apache.camel.ExternalRedeliveries
+    help: External Redeliveries
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>MaxProcessingTime'
+    name: org.apache.camel.MaxProcessingTime
+    help: Maximum Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>MeanProcessingTime'
+    name: org.apache.camel.MeanProcessingTime
+    help: Mean Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>MinProcessingTime'
+    name: org.apache.camel.MinProcessingTime
+    help: Minimum Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>LastProcessingTime'
+    name: org.apache.camel.LastProcessingTime
+    help: Last Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>DeltaProcessingTime'
+    name: org.apache.camel.DeltaProcessingTime
+    help: Delta Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>Redeliveries'
+    name: org.apache.camel.Redeliveries
+    help: Redeliveries
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>TotalProcessingTime'
+    name: org.apache.camel.TotalProcessingTime
+    help: Total Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: COUNTER
+
+# Consumers
+  - pattern: 'org.apache.camel<context=([^,]+), type=consumers, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        consumer: $2
+        type: consumers
+    type: GAUGE
+
+# Services
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>MaxDuration'
+    name: org.apache.camel.MaxDuration
+    help: Maximum Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>MeanDuration'
+    name: org.apache.camel.MeanDuration
+    help: Mean Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>MinDuration'
+    name: org.apache.camel.MinDuration
+    help: Minimum Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>TotalDuration'
+    name: org.apache.camel.TotalDuration
+    help: Total Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>ThreadsBlocked'
+    name: org.apache.camel.ThreadsBlocked
+    help: Threads Blocked
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>ThreadsInterrupted'
+    name: org.apache.camel.ThreadsInterrupted
+    help: Threads Interrupted
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumLogicalRuntimeFaults'
+    name: org.apache.cxf.NumLogicalRuntimeFaults
+    help: Number of logical runtime faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumLogicalRuntimeFaults'
+    name: org.apache.cxf.NumLogicalRuntimeFaults
+    help: Number of logical runtime faults
+    type: GAUGE
+    labels:
+       bus.id: $1
+       type: $2
+       service: $3
+       port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>AvgResponseTime'
+    name: org.apache.cxf.AvgResponseTime
+    help: Average Response Time
+    type: GAUGE
+    labels:
+       bus.id: $1
+       type: $2
+       service: $3
+       port: $4
+       operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>AvgResponseTime'
+    name: org.apache.cxf.AvgResponseTime
+    help: Average Response Time
+    type: GAUGE
+    labels:
+          bus.id: $1
+          type: $2
+          service: $3
+          port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumInvocations'
+    name: org.apache.cxf.NumInvocations
+    help: Number of invocations
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumInvocations'
+    name: org.apache.cxf.NumInvocations
+    help: Number of invocations
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>MaxResponseTime'
+    name: org.apache.cxf.MaxResponseTime
+    help: Maximum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>MaxResponseTime'
+    name: org.apache.cxf.MaxResponseTime
+    help: Maximum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>MinResponseTime'
+    name: org.apache.cxf.MinResponseTime
+    help: Minimum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>MinResponseTime'
+    name: org.apache.cxf.MinResponseTime
+    help: Minimum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>TotalHandlingTime'
+    name: org.apache.cxf.TotalHandlingTime
+    help: Total Handling Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>TotalHandlingTime'
+    name: org.apache.cxf.TotalHandlingTime
+    help: Total Handling Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumRuntimeFaults'
+    name: org.apache.cxf.NumRuntimeFaults
+    help: Number of runtime faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumRuntimeFaults'
+    name: org.apache.cxf.NumRuntimeFaults
+    help: Number of runtime faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumUnCheckedApplicationFaults'
+    name: org.apache.cxf.NumUnCheckedApplicationFaults
+    help: Number of unchecked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumUnCheckedApplicationFaults'
+    name: org.apache.cxf.NumUnCheckedApplicationFaults
+    help: Number of unchecked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumCheckedApplicationFaults'
+    name: org.apache.cxf.NumCheckedApplicationFaults
+    help: Number of checked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumCheckedApplicationFaults'
+    name: org.apache.cxf.NumCheckedApplicationFaults
+    help: Number of checked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
diff --git a/images/centos/openjdk7/jdk/prometheus-opts b/images/centos/openjdk7/jdk/prometheus-opts
new file mode 100644
index 0000000..3c43968
--- /dev/null
+++ b/images/centos/openjdk7/jdk/prometheus-opts
@@ -0,0 +1,23 @@
+#!/bin/sh
+# Scripted for getting Prometheus options
+# meant to be evaluated (not to be sourced)
+
+# Exit if switched off
+if [ -n "${AB_PROMETHEUS_OFF:-}" ] && [ "${AB_PROMETHEUS_OFF}" != "false" ]; then
+  exit 0
+fi
+
+# Global switch, turning of all agents
+if [ -n "${AB_OFF:-}" ] && [ "${AB_OFF}" != "false" ]; then
+  exit 0
+fi
+
+port=${AB_PROMETHEUS_PORT:-9779}
+config=${AB_PROMETHEUS_CONFIG:-/opt/prometheus/prometheus-config.yml}
+if [ -n "${AB_PROMETHEUS_HOST:-}" ]; then
+  hostPort="${AB_PROMETHEUS_HOST}:$port"
+else
+  hostPort="$port"
+fi
+
+echo "-javaagent:/opt/prometheus/jmx_prometheus_javaagent.jar=${hostPort}:$config"
diff --git a/images/centos/openjdk7/jdk/run-java-options b/images/centos/openjdk7/jdk/run-java-options
new file mode 100644
index 0000000..759dee7
--- /dev/null
+++ b/images/centos/openjdk7/jdk/run-java-options
@@ -0,0 +1,4 @@
+#!/bin/bash
+# Delegate to the individual agent options scripts which will
+# examine the environment for features to be enabled
+echo "$(/opt/jolokia/jolokia-opts) $(/opt/prometheus/prometheus-opts)"
diff --git a/images/centos/openjdk7/jre/Dockerfile b/images/centos/openjdk7/jre/Dockerfile
index feccdc9..74d265c 100644
--- a/images/centos/openjdk7/jre/Dockerfile
+++ b/images/centos/openjdk7/jre/Dockerfile
@@ -13,31 +13,51 @@ ENV JAVA_APP_DIR=/deployments \
 # according to http://www.2uo.de/myths-about-urandom/
 RUN yum install -y \
        java-1.7.0-openjdk-1.7.0.231-2.6.19.2.el7_7 \ 
-    && echo "securerandom.source=file:/dev/urandom" >> /usr/lib/jvm/jre/lib/security/java.security \
-    && yum clean all
+       && echo "securerandom.source=file:/dev/urandom" >> /usr/lib/jvm/jre/lib/security/java.security \
+       && yum clean all
 
 ENV JAVA_HOME /etc/alternatives/jre
 
-# Agent bond including Jolokia and jmx_exporter
-ADD agent-bond-opts /opt/run-java-options
-RUN mkdir -p /opt/agent-bond \
- && curl http://central.maven.org/maven2/io/fabric8/agent-bond-agent/1.2.0/agent-bond-agent-1.2.0.jar \
-          -o /opt/agent-bond/agent-bond.jar \
- && chmod 444 /opt/agent-bond/agent-bond.jar \
- && chmod 755 /opt/run-java-options
-ADD jmx_exporter_config.yml /opt/agent-bond/
-EXPOSE 8778 9779
+# Prometheus JMX exporter agent
+RUN mkdir -p /opt/prometheus/etc \
+ && curl http://central.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/undefined/jmx_prometheus_javaagent-undefined.jar \
+          -o /opt/prometheus/jmx_prometheus_javaagent.jar
+ADD prometheus-opts /opt/prometheus/prometheus-opts
+ADD prometheus-config.yml /opt/prometheus/prometheus-config.yml
+RUN chmod 444 /opt/prometheus/jmx_prometheus_javaagent.jar \
+ && chmod 444 /opt/prometheus/prometheus-config.yml \
+ && chmod 755 /opt/prometheus/prometheus-opts \
+ && chmod 775 /opt/prometheus/etc \
+ && chgrp root /opt/prometheus/etc
+
+EXPOSE 9779
+
+
+# Jolokia agent
+RUN mkdir -p /opt/jolokia/etc \
+ && curl http://central.maven.org/maven2/org/jolokia/jolokia-jvm/1.6.2/jolokia-jvm-1.6.2-agent.jar \
+         -o /opt/jolokia/jolokia.jar
+ADD jolokia-opts /opt/jolokia/jolokia-opts
+RUN chmod 444 /opt/jolokia/jolokia.jar \
+ && chmod 755 /opt/jolokia/jolokia-opts \
+ && chmod 775 /opt/jolokia/etc \
+ && chgrp root /opt/jolokia/etc
+
+EXPOSE 8778
+
 
 # Add run script as /deployments/run-java.sh and make it executable
 COPY run-java.sh /deployments/
 RUN chmod 755 /deployments/run-java.sh
 
+COPY run-java-options /opt
 
 
 # Run under user "jboss" and prepare for be running
 # under OpenShift, too
 RUN groupadd -r jboss -g 1000 \
   && useradd -u 1000 -r -g jboss -m -d /opt/jboss -s /sbin/nologin jboss \
+  && chmod 755 /opt/run-java-options \
   && chmod 755 /opt/jboss \
   && chown -R jboss /deployments \
   && usermod -g root -G `id -g jboss` jboss \
diff --git a/images/centos/openjdk7/jre/README.md b/images/centos/openjdk7/jre/README.md
index 9e24d3f..d0e97e1 100644
--- a/images/centos/openjdk7/jre/README.md
+++ b/images/centos/openjdk7/jre/README.md
@@ -1,72 +1,12 @@
 ## Fabric8 Java Base Image OpenJDK 7 (JRE)
 
-
-
 This image is based on CentOS and provides OpenJDK 7 (JRE)
 
 It includes:
 
-
-* An [Agent Bond](https://github.com/fabric8io/agent-bond) agent with [Jolokia](http://www.jolokia.org) and Prometheus' [jmx_exporter](https://github.com/prometheus/jmx_exporter). The agent is installed as `/opt/agent-bond/agent-bond.jar`. See below for configuration options.
-
-
 * A startup script [`/deployments/run-java.sh`](#startup-script-run-javash) for starting up Java applications.
-
-### Agent Bond
-
-In order to enable Jolokia for your application you should use this image as a base image (via `FROM`) and use the output of `agent-bond-opts` in your startup scripts to include it in for the Java startup options.
-
-For example, the following snippet can be added to a script starting up your Java application
-
-    # ...
-    export JAVA_OPTIONS="$JAVA_OPTIONS $(agent-bond-opts)"
-    # .... use JAVA_OPTIONS when starting your app, e.g. as Tomcat does
-
-The following versions and defaults are used:
-
-* [Jolokia](http://www.jolokia.org) : version **1.6.2** and port **8778**
-* [jmx_exporter](https://github.com/prometheus/jmx_exporter): version **0.3.1** and port **9779**
-
-You can influence the behaviour of `agent-bond-opts` by setting various environment variables:
-
-### Agent-Bond Options
-
-Agent bond itself can be influenced with the following environment variables: 
-
-* **AB_OFF** : If set disables activation of agent-bond (i.e. echos an empty value). By default, agent-bond is enabled.
-* **AB_ENABLED** : Comma separated list of sub-agents enabled. Currently allowed values are `jolokia` and `jmx_exporter`. 
-  By default both are enabled.
-
-
-#### Jolokia configuration
-
-* **AB_JOLOKIA_CONFIG** : If set uses this file (including path) as Jolokia JVM agent properties (as described 
-  in Jolokia's [reference manual](http://www.jolokia.org/reference/html/agents.html#agents-jvm)).
-  By default this is `/opt/jolokia/jolokia.properties`.
-* **AB_JOLOKIA_HOST** : Host address to bind to (Default: `0.0.0.0`)
-* **AB_JOLOKIA_PORT** : Port to use (Default: `8778`)
-* **AB_JOLOKIA_USER** : User for authentication. By default authentication is switched off.
-* **AB_JOLOKIA_HTTPS** : Switch on secure communication with https. By default self signed server certificates are generated
-  if no `serverCert` configuration is given in `AB_JOLOKIA_OPTS`
-* **AB_JOLOKIA_PASSWORD** : Password for authentication. By default authentication is switched off.
-* **AB_JOLOKIA_ID** : Agent ID to use (`$HOSTNAME` by default, which is the container id)
-* **AB_JOLOKIA_OPTS**  : Additional options to be appended to the agent opts. They should be given in the format 
-  "key=value,key=value,..."
-
-Some options for integration in various environments:
-
-* **AB_JOLOKIA_AUTH_OPENSHIFT** : Switch on client authentication for OpenShift TLS communication. The value of this 
-  parameter can be a relative distinguished name which must be contained in a presented client certificate. Enabling this
-  parameter will automatically switch Jolokia into https communication mode. The default CA cert is set to 
-  `/var/run/secrets/kubernetes.io/serviceaccount/ca.crt` 
-  
-#### jmx_exporter configuration
-
-* **AB_JMX_EXPORTER_OPTS** : Configuration to use for `jmx_exporter` (in the format `<port>:<path to config>`)
-* **AB_JMX_EXPORTER_PORT** : Port to use for the JMX Exporter. Default: `9779`
-* **AB_JMX_EXPORTER_CONFIG** : Path to configuration to use for `jmx_exporter`: Default: `/opt/agent-bond/jmx_exporter_config.json`
-
-
+* [Jolokia](http://www.jolokia.org) agent installed in `/opt/jolokia`
+* Prometheus [jmx_exporter](https://github.com/prometheus/jmx_exporter) agent installed in `/opt/jmx_exporter`.
 
 ### Startup Script run-java.sh
 
@@ -177,8 +117,55 @@ mvn clean install
 ```
 
 
+### Monitoring Agents
+
+In order to enable Jolokia and Prometheus exporter for your application you should use this image as a base image (via `FROM`) and use the output of `jolokia-opts` and `prometheus-opts` in your startup scripts to include it in for the Java startup options. You can also just use the provided startup script `/opt/run-java.sh` which does this automatically.
+
+For example, the following snippet can be added to a script starting up your Java application
+
+    # ...
+    export JAVA_OPTIONS="$JAVA_OPTIONS $(/opt/jolokia/jolokia-opts) $(/opt/prometheus/prometheus-opts)"
+    # .... use JAVA_OPTIONS when starting your app, e.g. as Tomcat does
+
+The following versions and defaults are used:
+
+* [Jolokia](http://www.jolokia.org) : version **1.6.2** and port **8778**
+* [jmx_exporter](https://github.com/prometheus/jmx_exporter): version **0.3.1** and port **9779**
+
+You can influence the behaviour of these config scripts by setting various environment variables.
+
+#### Jolokia Configuration
+
+* **AB_JOLOKIA_OFF** : If set disables activation of Jolokia (i.e. echos an empty value). By default, Jolokia is enabled.
+* **AB_JOLOKIA_CONFIG** : If set uses this file (including path) as Jolokia JVM agent properties (as described
+  in Jolokia's [reference manual](http://www.jolokia.org/reference/html/agents.html#agents-jvm)). If not set,
+  the `/opt/jolokia/etc/jolokia.properties` will be created using the settings as defined in this document, otherwise
+  the reset of the settings in this document are ignored.
+* **AB_JOLOKIA_HOST** : Host address to bind to (Default: `0.0.0.0`)
+* **AB_JOLOKIA_PORT** : Port to use (Default: `8778`)
+* **AB_JOLOKIA_USER** : User for basic authentication. Defaults to 'jolokia'
+* **AB_JOLOKIA_PASSWORD** : Password for basic authentication. By default authentication is switched off.
+* **AB_JOLOKIA_PASSWORD_RANDOM** : Should a random AB_JOLOKIA_PASSWORD be generated? Generated value will be written to `/opt/jolokia/etc/jolokia.pw`
+* **AB_JOLOKIA_HTTPS** : Switch on secure communication with https. By default self signed server certificates are generated
+  if no `serverCert` configuration is given in `AB_JOLOKIA_OPTS`
+* **AB_JOLOKIA_ID** : Agent ID to use (`$HOSTNAME` by default, which is the container id)
+* **AB_JOLOKIA_DISCOVERY_ENABLED** : Enable Jolokia discovery.  Defaults to false.
+* **AB_JOLOKIA_OPTS**  : Additional options to be appended to the agent configuration. They should be given in the format
+  "key=value,key=value,..."
+
+Some options for integration in various environments:
+
+* **AB_JOLOKIA_AUTH_OPENSHIFT** : Switch on client authentication for OpenShift TSL communication. The value of this
+  parameter can be a relative distinguished name which must be contained in a presented client certificate. Enabling this
+  parameter will automatically switch Jolokia into https communication mode. The default CA cert is set to
+  `/var/run/secrets/kubernetes.io/serviceaccount/ca.crt`
+
+
+undefined
+
 ### Versions:
 
 * Base-Image: **CentOS 7**
 * Java: **OpenJDK 7 1.7.0** (Java Runtime Environment (JRE))
-* Agent-Bond: **1.2.0** (Jolokia 1.6.2, jmx_exporter 0.3.1)
+* Jolokia: **1.6.2**
+* jmx_exporter: **undefined**
diff --git a/images/centos/openjdk7/jre/agent-bond-opts b/images/centos/openjdk7/jre/agent-bond-opts
deleted file mode 100644
index 280313b..0000000
--- a/images/centos/openjdk7/jre/agent-bond-opts
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/bin/sh
-
-# Parse options
-while [ $# -gt 0 ]
-do
-key="$1"
-case ${key} in
-    # Escape for scripts which eval the output of this script
-    -e|--escape)
-    escape_sep=1
-    ;;
-esac
-shift
-done
-
-# Check whether a given config is contained in AB_JOLOKIA_OPTS
-is_in_jolokia_opts() {
-  local prop=$1
-  if [ -n "${AB_JOLOKIA_OPTS:-}" ] && [ "${AB_JOLOKIA_OPTS}" != "${AB_JOLOKIA_OPTS/${prop}/}" ]; then
-     echo "yes"
-  else
-     echo "no"
-  fi
-}
-
-dir=${AB_DIR:-/opt/agent-bond}
-sep="="
-
-# Options separators defined to avoid clash with fish-pepper templating
-ab_open_del="{""{"
-ab_close_del="}""}"
-if [ -n "${escape_sep:-}" ]; then
-  ab_open_del='\{\{'
-  ab_close_del='\}\}'
-fi
-
-if [ -z "${AB_OFF:-}" ]; then
-   opts="-javaagent:$dir/agent-bond.jar"
-   config="${AB_CONFIG:-$dir/agent-bond.properties}"
-   if [ -f "$config" ]; then
-      # Configuration takes precedence
-      opts="${opts}${sep}config=${config}"
-      sep=","
-   fi
-   if [ -z "${AB_ENABLED:-}" ] || [ "${AB_ENABLED}" != "${AB_ENABLED/jolokia/}" ]; then
-     # Direct options only if no configuration is found
-     jsep=""
-     jolokia_opts=""
-     if [ -n "${AB_JOLOKIA_CONFIG:-}" ] && [ -f "${AB_JOLOKIA_CONFIG}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}config=${AB_JOLOKIA_CONFIG}"
-        jsep=","
-        grep -q -e '^host' ${AB_JOLOKIA_CONFIG} && host_in_config=1
-     fi
-     if [ -z "${AB_JOLOKIA_HOST:-}" ] && [ -z "${host_in_config:-}" ]; then
-        AB_JOLOKIA_HOST='0.0.0.0'
-     fi
-     if [ -n "${AB_JOLOKIA_HOST:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}host=${AB_JOLOKIA_HOST}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_PORT:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}port=${AB_JOLOKIA_PORT}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_USER:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}user=${AB_JOLOKIA_USER}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_PASSWORD:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}password=${AB_JOLOKIA_PASSWORD}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_HTTPS:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}protocol=https"
-        https_used=1
-        jsep=","
-     fi
-     # Integration with OpenShift client cert auth
-     if [ -n "${AB_JOLOKIA_AUTH_OPENSHIFT:-}" ]; then
-        auth_opts="useSslClientAuthentication=true,extraClientCheck=true"
-        if [ -z "${https_used+x}" ]; then
-          auth_opts="${auth_opts},protocol=https"
-        fi
-        if [ $(is_in_jolokia_opts "caCert") != "yes" ]; then
-           auth_opts="${auth_opts},caCert=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
-        fi
-        if [ $(is_in_jolokia_opts "clientPrincipal") != "yes" ]; then
-           if [  "${AB_JOLOKIA_AUTH_OPENSHIFT}" != "${AB_JOLOKIA_AUTH_OPENSHIFT/=/}" ]; then
-              # Supposed to contain a principal name to check
-              auth_opts="${auth_opts},clientPrincipal=$(echo ${AB_JOLOKIA_AUTH_OPENSHIFT} | sed -e 's/ /\\\\ /g')"
-           else
-              auth_opts="${auth_opts},clientPrincipal=cn=system:master-proxy"
-           fi
-        fi
-        jolokia_opts="${jolokia_opts}${jsep}${auth_opts}"
-        jsep=","
-     fi
-     # Add extra opts to the end
-     if [ -n "${AB_JOLOKIA_OPTS:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}${AB_JOLOKIA_OPTS}"
-        jsep=","
-     fi
-
-     opts="${opts}${sep}jolokia${ab_open_del}${jolokia_opts}${ab_close_del}"
-     sep=","
-   fi
-   if [ -z "${AB_ENABLED:-}" ] || [ "${AB_ENABLED}" != "${AB_ENABLED/jmx_exporter/}" ]; then
-     je_opts=""
-     jsep=""
-     if [ -n "${AB_JMX_EXPORTER_OPTS:-}" ]; then
-        opts="${opts}${sep}jmx_exporter${ab_open_del}${AB_JMX_EXPORTER_OPTS}${ab_close_del}"
-        sep=","
-     else
-        port=${AB_JMX_EXPORTER_PORT:-9779}
-        config=${AB_JMX_EXPORTER_CONFIG:-/opt/agent-bond/jmx_exporter_config.yml}
-        opts="${opts}${sep}jmx_exporter${ab_open_del}${port}:${config}${ab_close_del}"
-        sep=","
-     fi
-   fi
-   if [ "${sep:-}" != '=' ] ; then
-     echo ${opts}
-   fi
-fi
diff --git a/images/centos/openjdk7/jre/jmx_exporter_config.yml b/images/centos/openjdk7/jre/jmx_exporter_config.yml
deleted file mode 100644
index 620cd4a..0000000
--- a/images/centos/openjdk7/jre/jmx_exporter_config.yml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-lowercaseOutputName: true
-lowercaseOutputLabelNames: true
-whitelistObjectNames:
-  - 'org.apache.camel:*'
-rules:
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>((?:Min|Mean|Max|Last|Delta)(?:ProcessingTime)):'
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>(TotalProcessingTime):'
-    type: COUNTER
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>(ExchangesInflight|LastProcessingTime):'
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>((?:Exchanges(?:Completed|Failed|Total))|FailuresHandled):'
-    type: COUNTER
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
diff --git a/images/centos/openjdk7/jre/jolokia-opts b/images/centos/openjdk7/jre/jolokia-opts
new file mode 100644
index 0000000..1aa273e
--- /dev/null
+++ b/images/centos/openjdk7/jre/jolokia-opts
@@ -0,0 +1,103 @@
+#!/bin/sh
+
+
+# Exit if switched off
+if [ -n "${AB_JOLOKIA_OFF:-}" ] && [ "${AB_JOLOKIA_OFF}" != "false" ]; then
+  exit 0
+fi
+
+# Global switch, turning of all agents
+if [ -n "${AB_OFF:-}" ] && [ "${AB_OFF}" != "false" ]; then
+  exit 0
+fi
+
+# Check whether a given config is contained in AB_JOLOKIA_OPTS
+is_in_jolokia_opts() {
+  local prop=$1
+  if [ -n "${AB_JOLOKIA_OPTS:-}" ] && [ "${AB_JOLOKIA_OPTS}" != "${AB_JOLOKIA_OPTS/${prop}/}" ]; then
+     echo "yes"
+  else
+     echo "no"
+  fi
+}
+
+get_jolokia_properties() {
+
+  echo "host=${AB_JOLOKIA_HOST:-*}"
+  echo "port=${AB_JOLOKIA_PORT:-8778}"
+  echo "discoveryEnabled=${AB_JOLOKIA_DISCOVERY_ENABLED:-false}"
+
+  if [ -n "${AB_JOLOKIA_PASSWORD:-}" ]; then
+     echo "user=${AB_JOLOKIA_USER:-jolokia}"
+     echo "password=${AB_JOLOKIA_PASSWORD}"
+  fi
+  if [ -n "${AB_JOLOKIA_HTTPS:-}" ]; then
+     echo "protocol=https"
+     https_used=1
+  fi
+
+  # Integration with OpenShift client cert auth is enabled
+  # by default if not explicitly turned off by setting to 'false'
+  if [ "${AB_JOLOKIA_AUTH_OPENSHIFT:-}" != "false" ] && [ -f "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt" ]; then
+     echo "useSslClientAuthentication=true"
+     echo "extraClientCheck=true"
+
+     # Check if the 'protocol' property has already been set to 'https'
+     # If not, then defaults to using HTTPS
+     if [ -z ${https_used+x} ]; then
+       echo "protocol=https"
+     fi
+     if [ $(is_in_jolokia_opts "caCert") != "yes" ]; then
+        echo "caCert=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
+     fi
+
+     if [ $(is_in_jolokia_opts "clientPrincipal") != "yes" ]; then
+        if [  "${AB_JOLOKIA_AUTH_OPENSHIFT}" != "${AB_JOLOKIA_AUTH_OPENSHIFT/=/}" ]; then
+           # Supposed to contain a principal name to check
+           echo "clientPrincipal=$(echo ${AB_JOLOKIA_AUTH_OPENSHIFT} | sed -e 's/ /\\\\ /g')"
+        else
+           echo "clientPrincipal=cn=system:master-proxy"
+        fi
+     fi
+  fi
+
+  # Add extra opts
+  if [ -n "${AB_JOLOKIA_OPTS:-}" ]; then
+     echo "${AB_JOLOKIA_OPTS}" | tr "," "\n"
+  fi
+
+}
+
+write_jolokia_properties() {
+  local jolokia_property_file="$1"
+
+  # Setup Jolokia to accept basic auth, using a randomly generated password that is stored
+  # in the container in the ${DEPLOYMENTS_DIR}/jolokia.pw file.
+  if [ "${AB_JOLOKIA_PASSWORD_RANDOM:-}" == "true" ]; then
+    pw_file="/opt/jolokia/etc/jolokia.pw"
+    if [ -f "${pw_file}" ] ; then
+      AB_JOLOKIA_PASSWORD=$(cat "${pw_file}")
+    else
+      AB_JOLOKIA_PASSWORD=$(tr -cd '[:alnum:]' < /dev/urandom | fold -w30 | head -n1)
+      touch "${pw_file}"
+      chmod 660 "${pw_file}"
+      cat > "${pw_file}" <<EOF
+$AB_JOLOKIA_PASSWORD
+EOF
+    fi
+    export AB_JOLOKIA_PASSWORD
+  fi
+
+  touch "${jolokia_property_file}"
+  chmod 660 "${jolokia_property_file}"
+  cat > "${jolokia_property_file}" <<EOF
+$(get_jolokia_properties)
+EOF
+
+}
+
+if [ -z "${AB_JOLOKIA_CONFIG:-}" ]; then
+  AB_JOLOKIA_CONFIG="/opt/jolokia/etc/jolokia.properties"
+  write_jolokia_properties "$AB_JOLOKIA_CONFIG"
+fi
+echo "-javaagent:/opt/jolokia/jolokia.jar=config=${AB_JOLOKIA_CONFIG}"
diff --git a/images/centos/openjdk7/jre/prometheus-config.yml b/images/centos/openjdk7/jre/prometheus-config.yml
new file mode 100644
index 0000000..f6eaa2b
--- /dev/null
+++ b/images/centos/openjdk7/jre/prometheus-config.yml
@@ -0,0 +1,586 @@
+startDelaySecs: 5
+ssl: false
+blacklistObjectNames: ["java.lang:*"]
+rules:
+# Context level
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesCompleted'
+    name: org.apache.camel.ExchangesCompleted
+    help: Exchanges Completed
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesFailed'
+    name: org.apache.camel.ExchangesFailed
+    help: Exchanges Failed
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesInflight'
+    name: org.apache.camel.ExchangesInflight
+    help: Exchanges Inflight
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>FailuresHandled'
+    name: org.apache.camel.FailuresHandled
+    help: Failures Handled
+    labels:
+        context: $1
+        type: context
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExternalRedeliveries'
+    name: org.apache.camel.ExternalRedeliveries
+    help: External Redeliveries
+    labels:
+        context: $1
+        type: context
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>MaxProcessingTime'
+    name: org.apache.camel.MaxProcessingTime
+    help: Maximum Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>MeanProcessingTime'
+    name: org.apache.camel.MeanProcessingTime
+    help: Mean Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>MinProcessingTime'
+    name: org.apache.camel.MinProcessingTime
+    help: Minimum Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>LastProcessingTime'
+    name: org.apache.camel.LastProcessingTime
+    help: Last Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>DeltaProcessingTime'
+    name: org.apache.camel.DeltaProcessingTime
+    help: Delta Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>Redeliveries'
+    name: org.apache.camel.Redeliveries
+    help: Redeliveries
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>TotalProcessingTime'
+    name: org.apache.camel.TotalProcessingTime
+    help: Total Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=consumers, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+
+
+# Route level
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesCompleted'
+    name: org.apache.camel.ExchangesCompleted
+    help: Exchanges Completed
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesFailed'
+    name: org.apache.camel.ExchangesFailed
+    help: Exchanges Failed
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesInflight'
+    name: org.apache.camel.ExchangesInflight
+    help: Exchanges Inflight
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>FailuresHandled'
+    name: org.apache.camel.FailuresHandled
+    help: Failures Handled
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExternalRedeliveries'
+    name: org.apache.camel.ExternalRedeliveries
+    help: External Redeliveries
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>MaxProcessingTime'
+    name: org.apache.camel.MaxProcessingTime
+    help: Maximum Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>MeanProcessingTime'
+    name: org.apache.camel.MeanProcessingTime
+    help: Mean Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>MinProcessingTime'
+    name: org.apache.camel.MinProcessingTime
+    help: Minimum Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>LastProcessingTime'
+    name: org.apache.camel.LastProcessingTime
+    help: Last Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>DeltaProcessingTime'
+    name: org.apache.camel.DeltaProcessingTime
+    help: Delta Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>Redeliveries'
+    name: org.apache.camel.Redeliveries
+    help: Redeliveries
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>TotalProcessingTime'
+    name: org.apache.camel.TotalProcessingTime
+    help: Total Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+
+# Processor level
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesCompleted'
+    name: org.apache.camel.ExchangesCompleted
+    help: Exchanges Completed
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesFailed'
+    name: org.apache.camel.ExchangesFailed
+    help: Exchanges Failed
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesInflight'
+    name: org.apache.camel.ExchangesInflight
+    help: Exchanges Inflight
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>FailuresHandled'
+    name: org.apache.camel.FailuresHandled
+    help: Failures Handled
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExternalRedeliveries'
+    name: org.apache.camel.ExternalRedeliveries
+    help: External Redeliveries
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>MaxProcessingTime'
+    name: org.apache.camel.MaxProcessingTime
+    help: Maximum Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>MeanProcessingTime'
+    name: org.apache.camel.MeanProcessingTime
+    help: Mean Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>MinProcessingTime'
+    name: org.apache.camel.MinProcessingTime
+    help: Minimum Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>LastProcessingTime'
+    name: org.apache.camel.LastProcessingTime
+    help: Last Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>DeltaProcessingTime'
+    name: org.apache.camel.DeltaProcessingTime
+    help: Delta Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>Redeliveries'
+    name: org.apache.camel.Redeliveries
+    help: Redeliveries
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>TotalProcessingTime'
+    name: org.apache.camel.TotalProcessingTime
+    help: Total Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: COUNTER
+
+# Consumers
+  - pattern: 'org.apache.camel<context=([^,]+), type=consumers, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        consumer: $2
+        type: consumers
+    type: GAUGE
+
+# Services
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>MaxDuration'
+    name: org.apache.camel.MaxDuration
+    help: Maximum Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>MeanDuration'
+    name: org.apache.camel.MeanDuration
+    help: Mean Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>MinDuration'
+    name: org.apache.camel.MinDuration
+    help: Minimum Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>TotalDuration'
+    name: org.apache.camel.TotalDuration
+    help: Total Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>ThreadsBlocked'
+    name: org.apache.camel.ThreadsBlocked
+    help: Threads Blocked
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>ThreadsInterrupted'
+    name: org.apache.camel.ThreadsInterrupted
+    help: Threads Interrupted
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumLogicalRuntimeFaults'
+    name: org.apache.cxf.NumLogicalRuntimeFaults
+    help: Number of logical runtime faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumLogicalRuntimeFaults'
+    name: org.apache.cxf.NumLogicalRuntimeFaults
+    help: Number of logical runtime faults
+    type: GAUGE
+    labels:
+       bus.id: $1
+       type: $2
+       service: $3
+       port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>AvgResponseTime'
+    name: org.apache.cxf.AvgResponseTime
+    help: Average Response Time
+    type: GAUGE
+    labels:
+       bus.id: $1
+       type: $2
+       service: $3
+       port: $4
+       operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>AvgResponseTime'
+    name: org.apache.cxf.AvgResponseTime
+    help: Average Response Time
+    type: GAUGE
+    labels:
+          bus.id: $1
+          type: $2
+          service: $3
+          port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumInvocations'
+    name: org.apache.cxf.NumInvocations
+    help: Number of invocations
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumInvocations'
+    name: org.apache.cxf.NumInvocations
+    help: Number of invocations
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>MaxResponseTime'
+    name: org.apache.cxf.MaxResponseTime
+    help: Maximum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>MaxResponseTime'
+    name: org.apache.cxf.MaxResponseTime
+    help: Maximum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>MinResponseTime'
+    name: org.apache.cxf.MinResponseTime
+    help: Minimum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>MinResponseTime'
+    name: org.apache.cxf.MinResponseTime
+    help: Minimum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>TotalHandlingTime'
+    name: org.apache.cxf.TotalHandlingTime
+    help: Total Handling Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>TotalHandlingTime'
+    name: org.apache.cxf.TotalHandlingTime
+    help: Total Handling Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumRuntimeFaults'
+    name: org.apache.cxf.NumRuntimeFaults
+    help: Number of runtime faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumRuntimeFaults'
+    name: org.apache.cxf.NumRuntimeFaults
+    help: Number of runtime faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumUnCheckedApplicationFaults'
+    name: org.apache.cxf.NumUnCheckedApplicationFaults
+    help: Number of unchecked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumUnCheckedApplicationFaults'
+    name: org.apache.cxf.NumUnCheckedApplicationFaults
+    help: Number of unchecked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumCheckedApplicationFaults'
+    name: org.apache.cxf.NumCheckedApplicationFaults
+    help: Number of checked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumCheckedApplicationFaults'
+    name: org.apache.cxf.NumCheckedApplicationFaults
+    help: Number of checked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
diff --git a/images/centos/openjdk7/jre/prometheus-opts b/images/centos/openjdk7/jre/prometheus-opts
new file mode 100644
index 0000000..3c43968
--- /dev/null
+++ b/images/centos/openjdk7/jre/prometheus-opts
@@ -0,0 +1,23 @@
+#!/bin/sh
+# Scripted for getting Prometheus options
+# meant to be evaluated (not to be sourced)
+
+# Exit if switched off
+if [ -n "${AB_PROMETHEUS_OFF:-}" ] && [ "${AB_PROMETHEUS_OFF}" != "false" ]; then
+  exit 0
+fi
+
+# Global switch, turning of all agents
+if [ -n "${AB_OFF:-}" ] && [ "${AB_OFF}" != "false" ]; then
+  exit 0
+fi
+
+port=${AB_PROMETHEUS_PORT:-9779}
+config=${AB_PROMETHEUS_CONFIG:-/opt/prometheus/prometheus-config.yml}
+if [ -n "${AB_PROMETHEUS_HOST:-}" ]; then
+  hostPort="${AB_PROMETHEUS_HOST}:$port"
+else
+  hostPort="$port"
+fi
+
+echo "-javaagent:/opt/prometheus/jmx_prometheus_javaagent.jar=${hostPort}:$config"
diff --git a/images/centos/openjdk7/jre/run-java-options b/images/centos/openjdk7/jre/run-java-options
new file mode 100644
index 0000000..759dee7
--- /dev/null
+++ b/images/centos/openjdk7/jre/run-java-options
@@ -0,0 +1,4 @@
+#!/bin/bash
+# Delegate to the individual agent options scripts which will
+# examine the environment for features to be enabled
+echo "$(/opt/jolokia/jolokia-opts) $(/opt/prometheus/prometheus-opts)"
diff --git a/images/centos/openjdk8/jdk/Dockerfile b/images/centos/openjdk8/jdk/Dockerfile
index 9a9be57..4e30a10 100644
--- a/images/centos/openjdk8/jdk/Dockerfile
+++ b/images/centos/openjdk8/jdk/Dockerfile
@@ -14,31 +14,51 @@ ENV JAVA_APP_DIR=/deployments \
 RUN yum install -y \
        java-1.8.0-openjdk-1.8.0.232.b09-0.el7_7 \ 
        java-1.8.0-openjdk-devel-1.8.0.232.b09-0.el7_7 \ 
-    && echo "securerandom.source=file:/dev/urandom" >> /usr/lib/jvm/jre/lib/security/java.security \
-    && yum clean all
+       && echo "securerandom.source=file:/dev/urandom" >> /usr/lib/jvm/jre/lib/security/java.security \
+       && yum clean all
 
 ENV JAVA_HOME /etc/alternatives/jre
 
-# Agent bond including Jolokia and jmx_exporter
-ADD agent-bond-opts /opt/run-java-options
-RUN mkdir -p /opt/agent-bond \
- && curl http://central.maven.org/maven2/io/fabric8/agent-bond-agent/1.2.0/agent-bond-agent-1.2.0.jar \
-          -o /opt/agent-bond/agent-bond.jar \
- && chmod 444 /opt/agent-bond/agent-bond.jar \
- && chmod 755 /opt/run-java-options
-ADD jmx_exporter_config.yml /opt/agent-bond/
-EXPOSE 8778 9779
+# Prometheus JMX exporter agent
+RUN mkdir -p /opt/prometheus/etc \
+ && curl http://central.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/undefined/jmx_prometheus_javaagent-undefined.jar \
+          -o /opt/prometheus/jmx_prometheus_javaagent.jar
+ADD prometheus-opts /opt/prometheus/prometheus-opts
+ADD prometheus-config.yml /opt/prometheus/prometheus-config.yml
+RUN chmod 444 /opt/prometheus/jmx_prometheus_javaagent.jar \
+ && chmod 444 /opt/prometheus/prometheus-config.yml \
+ && chmod 755 /opt/prometheus/prometheus-opts \
+ && chmod 775 /opt/prometheus/etc \
+ && chgrp root /opt/prometheus/etc
+
+EXPOSE 9779
+
+
+# Jolokia agent
+RUN mkdir -p /opt/jolokia/etc \
+ && curl http://central.maven.org/maven2/org/jolokia/jolokia-jvm/1.6.2/jolokia-jvm-1.6.2-agent.jar \
+         -o /opt/jolokia/jolokia.jar
+ADD jolokia-opts /opt/jolokia/jolokia-opts
+RUN chmod 444 /opt/jolokia/jolokia.jar \
+ && chmod 755 /opt/jolokia/jolokia-opts \
+ && chmod 775 /opt/jolokia/etc \
+ && chgrp root /opt/jolokia/etc
+
+EXPOSE 8778
+
 
 # Add run script as /deployments/run-java.sh and make it executable
 COPY run-java.sh /deployments/
 RUN chmod 755 /deployments/run-java.sh
 
+COPY run-java-options /opt
 
 
 # Run under user "jboss" and prepare for be running
 # under OpenShift, too
 RUN groupadd -r jboss -g 1000 \
   && useradd -u 1000 -r -g jboss -m -d /opt/jboss -s /sbin/nologin jboss \
+  && chmod 755 /opt/run-java-options \
   && chmod 755 /opt/jboss \
   && chown -R jboss /deployments \
   && usermod -g root -G `id -g jboss` jboss \
diff --git a/images/centos/openjdk8/jdk/README.md b/images/centos/openjdk8/jdk/README.md
index aec72bc..13df823 100644
--- a/images/centos/openjdk8/jdk/README.md
+++ b/images/centos/openjdk8/jdk/README.md
@@ -1,72 +1,12 @@
 ## Fabric8 Java Base Image OpenJDK 8 (JDK)
 
-
-
 This image is based on CentOS and provides OpenJDK 8 (JDK)
 
 It includes:
 
-
-* An [Agent Bond](https://github.com/fabric8io/agent-bond) agent with [Jolokia](http://www.jolokia.org) and Prometheus' [jmx_exporter](https://github.com/prometheus/jmx_exporter). The agent is installed as `/opt/agent-bond/agent-bond.jar`. See below for configuration options.
-
-
 * A startup script [`/deployments/run-java.sh`](#startup-script-run-javash) for starting up Java applications.
-
-### Agent Bond
-
-In order to enable Jolokia for your application you should use this image as a base image (via `FROM`) and use the output of `agent-bond-opts` in your startup scripts to include it in for the Java startup options.
-
-For example, the following snippet can be added to a script starting up your Java application
-
-    # ...
-    export JAVA_OPTIONS="$JAVA_OPTIONS $(agent-bond-opts)"
-    # .... use JAVA_OPTIONS when starting your app, e.g. as Tomcat does
-
-The following versions and defaults are used:
-
-* [Jolokia](http://www.jolokia.org) : version **1.6.2** and port **8778**
-* [jmx_exporter](https://github.com/prometheus/jmx_exporter): version **0.3.1** and port **9779**
-
-You can influence the behaviour of `agent-bond-opts` by setting various environment variables:
-
-### Agent-Bond Options
-
-Agent bond itself can be influenced with the following environment variables: 
-
-* **AB_OFF** : If set disables activation of agent-bond (i.e. echos an empty value). By default, agent-bond is enabled.
-* **AB_ENABLED** : Comma separated list of sub-agents enabled. Currently allowed values are `jolokia` and `jmx_exporter`. 
-  By default both are enabled.
-
-
-#### Jolokia configuration
-
-* **AB_JOLOKIA_CONFIG** : If set uses this file (including path) as Jolokia JVM agent properties (as described 
-  in Jolokia's [reference manual](http://www.jolokia.org/reference/html/agents.html#agents-jvm)).
-  By default this is `/opt/jolokia/jolokia.properties`.
-* **AB_JOLOKIA_HOST** : Host address to bind to (Default: `0.0.0.0`)
-* **AB_JOLOKIA_PORT** : Port to use (Default: `8778`)
-* **AB_JOLOKIA_USER** : User for authentication. By default authentication is switched off.
-* **AB_JOLOKIA_HTTPS** : Switch on secure communication with https. By default self signed server certificates are generated
-  if no `serverCert` configuration is given in `AB_JOLOKIA_OPTS`
-* **AB_JOLOKIA_PASSWORD** : Password for authentication. By default authentication is switched off.
-* **AB_JOLOKIA_ID** : Agent ID to use (`$HOSTNAME` by default, which is the container id)
-* **AB_JOLOKIA_OPTS**  : Additional options to be appended to the agent opts. They should be given in the format 
-  "key=value,key=value,..."
-
-Some options for integration in various environments:
-
-* **AB_JOLOKIA_AUTH_OPENSHIFT** : Switch on client authentication for OpenShift TLS communication. The value of this 
-  parameter can be a relative distinguished name which must be contained in a presented client certificate. Enabling this
-  parameter will automatically switch Jolokia into https communication mode. The default CA cert is set to 
-  `/var/run/secrets/kubernetes.io/serviceaccount/ca.crt` 
-  
-#### jmx_exporter configuration
-
-* **AB_JMX_EXPORTER_OPTS** : Configuration to use for `jmx_exporter` (in the format `<port>:<path to config>`)
-* **AB_JMX_EXPORTER_PORT** : Port to use for the JMX Exporter. Default: `9779`
-* **AB_JMX_EXPORTER_CONFIG** : Path to configuration to use for `jmx_exporter`: Default: `/opt/agent-bond/jmx_exporter_config.json`
-
-
+* [Jolokia](http://www.jolokia.org) agent installed in `/opt/jolokia`
+* Prometheus [jmx_exporter](https://github.com/prometheus/jmx_exporter) agent installed in `/opt/jmx_exporter`.
 
 ### Startup Script run-java.sh
 
@@ -177,8 +117,55 @@ mvn clean install
 ```
 
 
+### Monitoring Agents
+
+In order to enable Jolokia and Prometheus exporter for your application you should use this image as a base image (via `FROM`) and use the output of `jolokia-opts` and `prometheus-opts` in your startup scripts to include it in for the Java startup options. You can also just use the provided startup script `/opt/run-java.sh` which does this automatically.
+
+For example, the following snippet can be added to a script starting up your Java application
+
+    # ...
+    export JAVA_OPTIONS="$JAVA_OPTIONS $(/opt/jolokia/jolokia-opts) $(/opt/prometheus/prometheus-opts)"
+    # .... use JAVA_OPTIONS when starting your app, e.g. as Tomcat does
+
+The following versions and defaults are used:
+
+* [Jolokia](http://www.jolokia.org) : version **1.6.2** and port **8778**
+* [jmx_exporter](https://github.com/prometheus/jmx_exporter): version **0.3.1** and port **9779**
+
+You can influence the behaviour of these config scripts by setting various environment variables.
+
+#### Jolokia Configuration
+
+* **AB_JOLOKIA_OFF** : If set disables activation of Jolokia (i.e. echos an empty value). By default, Jolokia is enabled.
+* **AB_JOLOKIA_CONFIG** : If set uses this file (including path) as Jolokia JVM agent properties (as described
+  in Jolokia's [reference manual](http://www.jolokia.org/reference/html/agents.html#agents-jvm)). If not set,
+  the `/opt/jolokia/etc/jolokia.properties` will be created using the settings as defined in this document, otherwise
+  the reset of the settings in this document are ignored.
+* **AB_JOLOKIA_HOST** : Host address to bind to (Default: `0.0.0.0`)
+* **AB_JOLOKIA_PORT** : Port to use (Default: `8778`)
+* **AB_JOLOKIA_USER** : User for basic authentication. Defaults to 'jolokia'
+* **AB_JOLOKIA_PASSWORD** : Password for basic authentication. By default authentication is switched off.
+* **AB_JOLOKIA_PASSWORD_RANDOM** : Should a random AB_JOLOKIA_PASSWORD be generated? Generated value will be written to `/opt/jolokia/etc/jolokia.pw`
+* **AB_JOLOKIA_HTTPS** : Switch on secure communication with https. By default self signed server certificates are generated
+  if no `serverCert` configuration is given in `AB_JOLOKIA_OPTS`
+* **AB_JOLOKIA_ID** : Agent ID to use (`$HOSTNAME` by default, which is the container id)
+* **AB_JOLOKIA_DISCOVERY_ENABLED** : Enable Jolokia discovery.  Defaults to false.
+* **AB_JOLOKIA_OPTS**  : Additional options to be appended to the agent configuration. They should be given in the format
+  "key=value,key=value,..."
+
+Some options for integration in various environments:
+
+* **AB_JOLOKIA_AUTH_OPENSHIFT** : Switch on client authentication for OpenShift TSL communication. The value of this
+  parameter can be a relative distinguished name which must be contained in a presented client certificate. Enabling this
+  parameter will automatically switch Jolokia into https communication mode. The default CA cert is set to
+  `/var/run/secrets/kubernetes.io/serviceaccount/ca.crt`
+
+
+undefined
+
 ### Versions:
 
 * Base-Image: **CentOS 7**
 * Java: **OpenJDK 8 1.8.0** (Java Development Kit (JDK))
-* Agent-Bond: **1.2.0** (Jolokia 1.6.2, jmx_exporter 0.3.1)
+* Jolokia: **1.6.2**
+* jmx_exporter: **undefined**
diff --git a/images/centos/openjdk8/jdk/agent-bond-opts b/images/centos/openjdk8/jdk/agent-bond-opts
deleted file mode 100644
index 280313b..0000000
--- a/images/centos/openjdk8/jdk/agent-bond-opts
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/bin/sh
-
-# Parse options
-while [ $# -gt 0 ]
-do
-key="$1"
-case ${key} in
-    # Escape for scripts which eval the output of this script
-    -e|--escape)
-    escape_sep=1
-    ;;
-esac
-shift
-done
-
-# Check whether a given config is contained in AB_JOLOKIA_OPTS
-is_in_jolokia_opts() {
-  local prop=$1
-  if [ -n "${AB_JOLOKIA_OPTS:-}" ] && [ "${AB_JOLOKIA_OPTS}" != "${AB_JOLOKIA_OPTS/${prop}/}" ]; then
-     echo "yes"
-  else
-     echo "no"
-  fi
-}
-
-dir=${AB_DIR:-/opt/agent-bond}
-sep="="
-
-# Options separators defined to avoid clash with fish-pepper templating
-ab_open_del="{""{"
-ab_close_del="}""}"
-if [ -n "${escape_sep:-}" ]; then
-  ab_open_del='\{\{'
-  ab_close_del='\}\}'
-fi
-
-if [ -z "${AB_OFF:-}" ]; then
-   opts="-javaagent:$dir/agent-bond.jar"
-   config="${AB_CONFIG:-$dir/agent-bond.properties}"
-   if [ -f "$config" ]; then
-      # Configuration takes precedence
-      opts="${opts}${sep}config=${config}"
-      sep=","
-   fi
-   if [ -z "${AB_ENABLED:-}" ] || [ "${AB_ENABLED}" != "${AB_ENABLED/jolokia/}" ]; then
-     # Direct options only if no configuration is found
-     jsep=""
-     jolokia_opts=""
-     if [ -n "${AB_JOLOKIA_CONFIG:-}" ] && [ -f "${AB_JOLOKIA_CONFIG}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}config=${AB_JOLOKIA_CONFIG}"
-        jsep=","
-        grep -q -e '^host' ${AB_JOLOKIA_CONFIG} && host_in_config=1
-     fi
-     if [ -z "${AB_JOLOKIA_HOST:-}" ] && [ -z "${host_in_config:-}" ]; then
-        AB_JOLOKIA_HOST='0.0.0.0'
-     fi
-     if [ -n "${AB_JOLOKIA_HOST:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}host=${AB_JOLOKIA_HOST}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_PORT:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}port=${AB_JOLOKIA_PORT}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_USER:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}user=${AB_JOLOKIA_USER}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_PASSWORD:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}password=${AB_JOLOKIA_PASSWORD}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_HTTPS:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}protocol=https"
-        https_used=1
-        jsep=","
-     fi
-     # Integration with OpenShift client cert auth
-     if [ -n "${AB_JOLOKIA_AUTH_OPENSHIFT:-}" ]; then
-        auth_opts="useSslClientAuthentication=true,extraClientCheck=true"
-        if [ -z "${https_used+x}" ]; then
-          auth_opts="${auth_opts},protocol=https"
-        fi
-        if [ $(is_in_jolokia_opts "caCert") != "yes" ]; then
-           auth_opts="${auth_opts},caCert=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
-        fi
-        if [ $(is_in_jolokia_opts "clientPrincipal") != "yes" ]; then
-           if [  "${AB_JOLOKIA_AUTH_OPENSHIFT}" != "${AB_JOLOKIA_AUTH_OPENSHIFT/=/}" ]; then
-              # Supposed to contain a principal name to check
-              auth_opts="${auth_opts},clientPrincipal=$(echo ${AB_JOLOKIA_AUTH_OPENSHIFT} | sed -e 's/ /\\\\ /g')"
-           else
-              auth_opts="${auth_opts},clientPrincipal=cn=system:master-proxy"
-           fi
-        fi
-        jolokia_opts="${jolokia_opts}${jsep}${auth_opts}"
-        jsep=","
-     fi
-     # Add extra opts to the end
-     if [ -n "${AB_JOLOKIA_OPTS:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}${AB_JOLOKIA_OPTS}"
-        jsep=","
-     fi
-
-     opts="${opts}${sep}jolokia${ab_open_del}${jolokia_opts}${ab_close_del}"
-     sep=","
-   fi
-   if [ -z "${AB_ENABLED:-}" ] || [ "${AB_ENABLED}" != "${AB_ENABLED/jmx_exporter/}" ]; then
-     je_opts=""
-     jsep=""
-     if [ -n "${AB_JMX_EXPORTER_OPTS:-}" ]; then
-        opts="${opts}${sep}jmx_exporter${ab_open_del}${AB_JMX_EXPORTER_OPTS}${ab_close_del}"
-        sep=","
-     else
-        port=${AB_JMX_EXPORTER_PORT:-9779}
-        config=${AB_JMX_EXPORTER_CONFIG:-/opt/agent-bond/jmx_exporter_config.yml}
-        opts="${opts}${sep}jmx_exporter${ab_open_del}${port}:${config}${ab_close_del}"
-        sep=","
-     fi
-   fi
-   if [ "${sep:-}" != '=' ] ; then
-     echo ${opts}
-   fi
-fi
diff --git a/images/centos/openjdk8/jdk/jmx_exporter_config.yml b/images/centos/openjdk8/jdk/jmx_exporter_config.yml
deleted file mode 100644
index 620cd4a..0000000
--- a/images/centos/openjdk8/jdk/jmx_exporter_config.yml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-lowercaseOutputName: true
-lowercaseOutputLabelNames: true
-whitelistObjectNames:
-  - 'org.apache.camel:*'
-rules:
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>((?:Min|Mean|Max|Last|Delta)(?:ProcessingTime)):'
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>(TotalProcessingTime):'
-    type: COUNTER
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>(ExchangesInflight|LastProcessingTime):'
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>((?:Exchanges(?:Completed|Failed|Total))|FailuresHandled):'
-    type: COUNTER
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
diff --git a/images/centos/openjdk8/jdk/jolokia-opts b/images/centos/openjdk8/jdk/jolokia-opts
new file mode 100644
index 0000000..1aa273e
--- /dev/null
+++ b/images/centos/openjdk8/jdk/jolokia-opts
@@ -0,0 +1,103 @@
+#!/bin/sh
+
+
+# Exit if switched off
+if [ -n "${AB_JOLOKIA_OFF:-}" ] && [ "${AB_JOLOKIA_OFF}" != "false" ]; then
+  exit 0
+fi
+
+# Global switch, turning of all agents
+if [ -n "${AB_OFF:-}" ] && [ "${AB_OFF}" != "false" ]; then
+  exit 0
+fi
+
+# Check whether a given config is contained in AB_JOLOKIA_OPTS
+is_in_jolokia_opts() {
+  local prop=$1
+  if [ -n "${AB_JOLOKIA_OPTS:-}" ] && [ "${AB_JOLOKIA_OPTS}" != "${AB_JOLOKIA_OPTS/${prop}/}" ]; then
+     echo "yes"
+  else
+     echo "no"
+  fi
+}
+
+get_jolokia_properties() {
+
+  echo "host=${AB_JOLOKIA_HOST:-*}"
+  echo "port=${AB_JOLOKIA_PORT:-8778}"
+  echo "discoveryEnabled=${AB_JOLOKIA_DISCOVERY_ENABLED:-false}"
+
+  if [ -n "${AB_JOLOKIA_PASSWORD:-}" ]; then
+     echo "user=${AB_JOLOKIA_USER:-jolokia}"
+     echo "password=${AB_JOLOKIA_PASSWORD}"
+  fi
+  if [ -n "${AB_JOLOKIA_HTTPS:-}" ]; then
+     echo "protocol=https"
+     https_used=1
+  fi
+
+  # Integration with OpenShift client cert auth is enabled
+  # by default if not explicitly turned off by setting to 'false'
+  if [ "${AB_JOLOKIA_AUTH_OPENSHIFT:-}" != "false" ] && [ -f "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt" ]; then
+     echo "useSslClientAuthentication=true"
+     echo "extraClientCheck=true"
+
+     # Check if the 'protocol' property has already been set to 'https'
+     # If not, then defaults to using HTTPS
+     if [ -z ${https_used+x} ]; then
+       echo "protocol=https"
+     fi
+     if [ $(is_in_jolokia_opts "caCert") != "yes" ]; then
+        echo "caCert=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
+     fi
+
+     if [ $(is_in_jolokia_opts "clientPrincipal") != "yes" ]; then
+        if [  "${AB_JOLOKIA_AUTH_OPENSHIFT}" != "${AB_JOLOKIA_AUTH_OPENSHIFT/=/}" ]; then
+           # Supposed to contain a principal name to check
+           echo "clientPrincipal=$(echo ${AB_JOLOKIA_AUTH_OPENSHIFT} | sed -e 's/ /\\\\ /g')"
+        else
+           echo "clientPrincipal=cn=system:master-proxy"
+        fi
+     fi
+  fi
+
+  # Add extra opts
+  if [ -n "${AB_JOLOKIA_OPTS:-}" ]; then
+     echo "${AB_JOLOKIA_OPTS}" | tr "," "\n"
+  fi
+
+}
+
+write_jolokia_properties() {
+  local jolokia_property_file="$1"
+
+  # Setup Jolokia to accept basic auth, using a randomly generated password that is stored
+  # in the container in the ${DEPLOYMENTS_DIR}/jolokia.pw file.
+  if [ "${AB_JOLOKIA_PASSWORD_RANDOM:-}" == "true" ]; then
+    pw_file="/opt/jolokia/etc/jolokia.pw"
+    if [ -f "${pw_file}" ] ; then
+      AB_JOLOKIA_PASSWORD=$(cat "${pw_file}")
+    else
+      AB_JOLOKIA_PASSWORD=$(tr -cd '[:alnum:]' < /dev/urandom | fold -w30 | head -n1)
+      touch "${pw_file}"
+      chmod 660 "${pw_file}"
+      cat > "${pw_file}" <<EOF
+$AB_JOLOKIA_PASSWORD
+EOF
+    fi
+    export AB_JOLOKIA_PASSWORD
+  fi
+
+  touch "${jolokia_property_file}"
+  chmod 660 "${jolokia_property_file}"
+  cat > "${jolokia_property_file}" <<EOF
+$(get_jolokia_properties)
+EOF
+
+}
+
+if [ -z "${AB_JOLOKIA_CONFIG:-}" ]; then
+  AB_JOLOKIA_CONFIG="/opt/jolokia/etc/jolokia.properties"
+  write_jolokia_properties "$AB_JOLOKIA_CONFIG"
+fi
+echo "-javaagent:/opt/jolokia/jolokia.jar=config=${AB_JOLOKIA_CONFIG}"
diff --git a/images/centos/openjdk8/jdk/prometheus-config.yml b/images/centos/openjdk8/jdk/prometheus-config.yml
new file mode 100644
index 0000000..f6eaa2b
--- /dev/null
+++ b/images/centos/openjdk8/jdk/prometheus-config.yml
@@ -0,0 +1,586 @@
+startDelaySecs: 5
+ssl: false
+blacklistObjectNames: ["java.lang:*"]
+rules:
+# Context level
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesCompleted'
+    name: org.apache.camel.ExchangesCompleted
+    help: Exchanges Completed
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesFailed'
+    name: org.apache.camel.ExchangesFailed
+    help: Exchanges Failed
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesInflight'
+    name: org.apache.camel.ExchangesInflight
+    help: Exchanges Inflight
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>FailuresHandled'
+    name: org.apache.camel.FailuresHandled
+    help: Failures Handled
+    labels:
+        context: $1
+        type: context
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExternalRedeliveries'
+    name: org.apache.camel.ExternalRedeliveries
+    help: External Redeliveries
+    labels:
+        context: $1
+        type: context
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>MaxProcessingTime'
+    name: org.apache.camel.MaxProcessingTime
+    help: Maximum Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>MeanProcessingTime'
+    name: org.apache.camel.MeanProcessingTime
+    help: Mean Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>MinProcessingTime'
+    name: org.apache.camel.MinProcessingTime
+    help: Minimum Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>LastProcessingTime'
+    name: org.apache.camel.LastProcessingTime
+    help: Last Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>DeltaProcessingTime'
+    name: org.apache.camel.DeltaProcessingTime
+    help: Delta Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>Redeliveries'
+    name: org.apache.camel.Redeliveries
+    help: Redeliveries
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>TotalProcessingTime'
+    name: org.apache.camel.TotalProcessingTime
+    help: Total Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=consumers, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+
+
+# Route level
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesCompleted'
+    name: org.apache.camel.ExchangesCompleted
+    help: Exchanges Completed
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesFailed'
+    name: org.apache.camel.ExchangesFailed
+    help: Exchanges Failed
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesInflight'
+    name: org.apache.camel.ExchangesInflight
+    help: Exchanges Inflight
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>FailuresHandled'
+    name: org.apache.camel.FailuresHandled
+    help: Failures Handled
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExternalRedeliveries'
+    name: org.apache.camel.ExternalRedeliveries
+    help: External Redeliveries
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>MaxProcessingTime'
+    name: org.apache.camel.MaxProcessingTime
+    help: Maximum Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>MeanProcessingTime'
+    name: org.apache.camel.MeanProcessingTime
+    help: Mean Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>MinProcessingTime'
+    name: org.apache.camel.MinProcessingTime
+    help: Minimum Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>LastProcessingTime'
+    name: org.apache.camel.LastProcessingTime
+    help: Last Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>DeltaProcessingTime'
+    name: org.apache.camel.DeltaProcessingTime
+    help: Delta Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>Redeliveries'
+    name: org.apache.camel.Redeliveries
+    help: Redeliveries
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>TotalProcessingTime'
+    name: org.apache.camel.TotalProcessingTime
+    help: Total Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+
+# Processor level
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesCompleted'
+    name: org.apache.camel.ExchangesCompleted
+    help: Exchanges Completed
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesFailed'
+    name: org.apache.camel.ExchangesFailed
+    help: Exchanges Failed
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesInflight'
+    name: org.apache.camel.ExchangesInflight
+    help: Exchanges Inflight
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>FailuresHandled'
+    name: org.apache.camel.FailuresHandled
+    help: Failures Handled
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExternalRedeliveries'
+    name: org.apache.camel.ExternalRedeliveries
+    help: External Redeliveries
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>MaxProcessingTime'
+    name: org.apache.camel.MaxProcessingTime
+    help: Maximum Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>MeanProcessingTime'
+    name: org.apache.camel.MeanProcessingTime
+    help: Mean Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>MinProcessingTime'
+    name: org.apache.camel.MinProcessingTime
+    help: Minimum Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>LastProcessingTime'
+    name: org.apache.camel.LastProcessingTime
+    help: Last Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>DeltaProcessingTime'
+    name: org.apache.camel.DeltaProcessingTime
+    help: Delta Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>Redeliveries'
+    name: org.apache.camel.Redeliveries
+    help: Redeliveries
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>TotalProcessingTime'
+    name: org.apache.camel.TotalProcessingTime
+    help: Total Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: COUNTER
+
+# Consumers
+  - pattern: 'org.apache.camel<context=([^,]+), type=consumers, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        consumer: $2
+        type: consumers
+    type: GAUGE
+
+# Services
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>MaxDuration'
+    name: org.apache.camel.MaxDuration
+    help: Maximum Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>MeanDuration'
+    name: org.apache.camel.MeanDuration
+    help: Mean Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>MinDuration'
+    name: org.apache.camel.MinDuration
+    help: Minimum Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>TotalDuration'
+    name: org.apache.camel.TotalDuration
+    help: Total Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>ThreadsBlocked'
+    name: org.apache.camel.ThreadsBlocked
+    help: Threads Blocked
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>ThreadsInterrupted'
+    name: org.apache.camel.ThreadsInterrupted
+    help: Threads Interrupted
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumLogicalRuntimeFaults'
+    name: org.apache.cxf.NumLogicalRuntimeFaults
+    help: Number of logical runtime faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumLogicalRuntimeFaults'
+    name: org.apache.cxf.NumLogicalRuntimeFaults
+    help: Number of logical runtime faults
+    type: GAUGE
+    labels:
+       bus.id: $1
+       type: $2
+       service: $3
+       port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>AvgResponseTime'
+    name: org.apache.cxf.AvgResponseTime
+    help: Average Response Time
+    type: GAUGE
+    labels:
+       bus.id: $1
+       type: $2
+       service: $3
+       port: $4
+       operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>AvgResponseTime'
+    name: org.apache.cxf.AvgResponseTime
+    help: Average Response Time
+    type: GAUGE
+    labels:
+          bus.id: $1
+          type: $2
+          service: $3
+          port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumInvocations'
+    name: org.apache.cxf.NumInvocations
+    help: Number of invocations
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumInvocations'
+    name: org.apache.cxf.NumInvocations
+    help: Number of invocations
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>MaxResponseTime'
+    name: org.apache.cxf.MaxResponseTime
+    help: Maximum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>MaxResponseTime'
+    name: org.apache.cxf.MaxResponseTime
+    help: Maximum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>MinResponseTime'
+    name: org.apache.cxf.MinResponseTime
+    help: Minimum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>MinResponseTime'
+    name: org.apache.cxf.MinResponseTime
+    help: Minimum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>TotalHandlingTime'
+    name: org.apache.cxf.TotalHandlingTime
+    help: Total Handling Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>TotalHandlingTime'
+    name: org.apache.cxf.TotalHandlingTime
+    help: Total Handling Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumRuntimeFaults'
+    name: org.apache.cxf.NumRuntimeFaults
+    help: Number of runtime faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumRuntimeFaults'
+    name: org.apache.cxf.NumRuntimeFaults
+    help: Number of runtime faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumUnCheckedApplicationFaults'
+    name: org.apache.cxf.NumUnCheckedApplicationFaults
+    help: Number of unchecked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumUnCheckedApplicationFaults'
+    name: org.apache.cxf.NumUnCheckedApplicationFaults
+    help: Number of unchecked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumCheckedApplicationFaults'
+    name: org.apache.cxf.NumCheckedApplicationFaults
+    help: Number of checked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumCheckedApplicationFaults'
+    name: org.apache.cxf.NumCheckedApplicationFaults
+    help: Number of checked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
diff --git a/images/centos/openjdk8/jdk/prometheus-opts b/images/centos/openjdk8/jdk/prometheus-opts
new file mode 100644
index 0000000..3c43968
--- /dev/null
+++ b/images/centos/openjdk8/jdk/prometheus-opts
@@ -0,0 +1,23 @@
+#!/bin/sh
+# Scripted for getting Prometheus options
+# meant to be evaluated (not to be sourced)
+
+# Exit if switched off
+if [ -n "${AB_PROMETHEUS_OFF:-}" ] && [ "${AB_PROMETHEUS_OFF}" != "false" ]; then
+  exit 0
+fi
+
+# Global switch, turning of all agents
+if [ -n "${AB_OFF:-}" ] && [ "${AB_OFF}" != "false" ]; then
+  exit 0
+fi
+
+port=${AB_PROMETHEUS_PORT:-9779}
+config=${AB_PROMETHEUS_CONFIG:-/opt/prometheus/prometheus-config.yml}
+if [ -n "${AB_PROMETHEUS_HOST:-}" ]; then
+  hostPort="${AB_PROMETHEUS_HOST}:$port"
+else
+  hostPort="$port"
+fi
+
+echo "-javaagent:/opt/prometheus/jmx_prometheus_javaagent.jar=${hostPort}:$config"
diff --git a/images/centos/openjdk8/jdk/run-java-options b/images/centos/openjdk8/jdk/run-java-options
new file mode 100644
index 0000000..759dee7
--- /dev/null
+++ b/images/centos/openjdk8/jdk/run-java-options
@@ -0,0 +1,4 @@
+#!/bin/bash
+# Delegate to the individual agent options scripts which will
+# examine the environment for features to be enabled
+echo "$(/opt/jolokia/jolokia-opts) $(/opt/prometheus/prometheus-opts)"
diff --git a/images/centos/openjdk8/jre/Dockerfile b/images/centos/openjdk8/jre/Dockerfile
index 66bf9d0..4e6daae 100644
--- a/images/centos/openjdk8/jre/Dockerfile
+++ b/images/centos/openjdk8/jre/Dockerfile
@@ -13,31 +13,51 @@ ENV JAVA_APP_DIR=/deployments \
 # according to http://www.2uo.de/myths-about-urandom/
 RUN yum install -y \
        java-1.8.0-openjdk-1.8.0.232.b09-0.el7_7 \ 
-    && echo "securerandom.source=file:/dev/urandom" >> /usr/lib/jvm/jre/lib/security/java.security \
-    && yum clean all
+       && echo "securerandom.source=file:/dev/urandom" >> /usr/lib/jvm/jre/lib/security/java.security \
+       && yum clean all
 
 ENV JAVA_HOME /etc/alternatives/jre
 
-# Agent bond including Jolokia and jmx_exporter
-ADD agent-bond-opts /opt/run-java-options
-RUN mkdir -p /opt/agent-bond \
- && curl http://central.maven.org/maven2/io/fabric8/agent-bond-agent/1.2.0/agent-bond-agent-1.2.0.jar \
-          -o /opt/agent-bond/agent-bond.jar \
- && chmod 444 /opt/agent-bond/agent-bond.jar \
- && chmod 755 /opt/run-java-options
-ADD jmx_exporter_config.yml /opt/agent-bond/
-EXPOSE 8778 9779
+# Prometheus JMX exporter agent
+RUN mkdir -p /opt/prometheus/etc \
+ && curl http://central.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/undefined/jmx_prometheus_javaagent-undefined.jar \
+          -o /opt/prometheus/jmx_prometheus_javaagent.jar
+ADD prometheus-opts /opt/prometheus/prometheus-opts
+ADD prometheus-config.yml /opt/prometheus/prometheus-config.yml
+RUN chmod 444 /opt/prometheus/jmx_prometheus_javaagent.jar \
+ && chmod 444 /opt/prometheus/prometheus-config.yml \
+ && chmod 755 /opt/prometheus/prometheus-opts \
+ && chmod 775 /opt/prometheus/etc \
+ && chgrp root /opt/prometheus/etc
+
+EXPOSE 9779
+
+
+# Jolokia agent
+RUN mkdir -p /opt/jolokia/etc \
+ && curl http://central.maven.org/maven2/org/jolokia/jolokia-jvm/1.6.2/jolokia-jvm-1.6.2-agent.jar \
+         -o /opt/jolokia/jolokia.jar
+ADD jolokia-opts /opt/jolokia/jolokia-opts
+RUN chmod 444 /opt/jolokia/jolokia.jar \
+ && chmod 755 /opt/jolokia/jolokia-opts \
+ && chmod 775 /opt/jolokia/etc \
+ && chgrp root /opt/jolokia/etc
+
+EXPOSE 8778
+
 
 # Add run script as /deployments/run-java.sh and make it executable
 COPY run-java.sh /deployments/
 RUN chmod 755 /deployments/run-java.sh
 
+COPY run-java-options /opt
 
 
 # Run under user "jboss" and prepare for be running
 # under OpenShift, too
 RUN groupadd -r jboss -g 1000 \
   && useradd -u 1000 -r -g jboss -m -d /opt/jboss -s /sbin/nologin jboss \
+  && chmod 755 /opt/run-java-options \
   && chmod 755 /opt/jboss \
   && chown -R jboss /deployments \
   && usermod -g root -G `id -g jboss` jboss \
diff --git a/images/centos/openjdk8/jre/README.md b/images/centos/openjdk8/jre/README.md
index 5b21f72..34822b5 100644
--- a/images/centos/openjdk8/jre/README.md
+++ b/images/centos/openjdk8/jre/README.md
@@ -1,72 +1,12 @@
 ## Fabric8 Java Base Image OpenJDK 8 (JRE)
 
-
-
 This image is based on CentOS and provides OpenJDK 8 (JRE)
 
 It includes:
 
-
-* An [Agent Bond](https://github.com/fabric8io/agent-bond) agent with [Jolokia](http://www.jolokia.org) and Prometheus' [jmx_exporter](https://github.com/prometheus/jmx_exporter). The agent is installed as `/opt/agent-bond/agent-bond.jar`. See below for configuration options.
-
-
 * A startup script [`/deployments/run-java.sh`](#startup-script-run-javash) for starting up Java applications.
-
-### Agent Bond
-
-In order to enable Jolokia for your application you should use this image as a base image (via `FROM`) and use the output of `agent-bond-opts` in your startup scripts to include it in for the Java startup options.
-
-For example, the following snippet can be added to a script starting up your Java application
-
-    # ...
-    export JAVA_OPTIONS="$JAVA_OPTIONS $(agent-bond-opts)"
-    # .... use JAVA_OPTIONS when starting your app, e.g. as Tomcat does
-
-The following versions and defaults are used:
-
-* [Jolokia](http://www.jolokia.org) : version **1.6.2** and port **8778**
-* [jmx_exporter](https://github.com/prometheus/jmx_exporter): version **0.3.1** and port **9779**
-
-You can influence the behaviour of `agent-bond-opts` by setting various environment variables:
-
-### Agent-Bond Options
-
-Agent bond itself can be influenced with the following environment variables: 
-
-* **AB_OFF** : If set disables activation of agent-bond (i.e. echos an empty value). By default, agent-bond is enabled.
-* **AB_ENABLED** : Comma separated list of sub-agents enabled. Currently allowed values are `jolokia` and `jmx_exporter`. 
-  By default both are enabled.
-
-
-#### Jolokia configuration
-
-* **AB_JOLOKIA_CONFIG** : If set uses this file (including path) as Jolokia JVM agent properties (as described 
-  in Jolokia's [reference manual](http://www.jolokia.org/reference/html/agents.html#agents-jvm)).
-  By default this is `/opt/jolokia/jolokia.properties`.
-* **AB_JOLOKIA_HOST** : Host address to bind to (Default: `0.0.0.0`)
-* **AB_JOLOKIA_PORT** : Port to use (Default: `8778`)
-* **AB_JOLOKIA_USER** : User for authentication. By default authentication is switched off.
-* **AB_JOLOKIA_HTTPS** : Switch on secure communication with https. By default self signed server certificates are generated
-  if no `serverCert` configuration is given in `AB_JOLOKIA_OPTS`
-* **AB_JOLOKIA_PASSWORD** : Password for authentication. By default authentication is switched off.
-* **AB_JOLOKIA_ID** : Agent ID to use (`$HOSTNAME` by default, which is the container id)
-* **AB_JOLOKIA_OPTS**  : Additional options to be appended to the agent opts. They should be given in the format 
-  "key=value,key=value,..."
-
-Some options for integration in various environments:
-
-* **AB_JOLOKIA_AUTH_OPENSHIFT** : Switch on client authentication for OpenShift TLS communication. The value of this 
-  parameter can be a relative distinguished name which must be contained in a presented client certificate. Enabling this
-  parameter will automatically switch Jolokia into https communication mode. The default CA cert is set to 
-  `/var/run/secrets/kubernetes.io/serviceaccount/ca.crt` 
-  
-#### jmx_exporter configuration
-
-* **AB_JMX_EXPORTER_OPTS** : Configuration to use for `jmx_exporter` (in the format `<port>:<path to config>`)
-* **AB_JMX_EXPORTER_PORT** : Port to use for the JMX Exporter. Default: `9779`
-* **AB_JMX_EXPORTER_CONFIG** : Path to configuration to use for `jmx_exporter`: Default: `/opt/agent-bond/jmx_exporter_config.json`
-
-
+* [Jolokia](http://www.jolokia.org) agent installed in `/opt/jolokia`
+* Prometheus [jmx_exporter](https://github.com/prometheus/jmx_exporter) agent installed in `/opt/jmx_exporter`.
 
 ### Startup Script run-java.sh
 
@@ -177,8 +117,55 @@ mvn clean install
 ```
 
 
+### Monitoring Agents
+
+In order to enable Jolokia and Prometheus exporter for your application you should use this image as a base image (via `FROM`) and use the output of `jolokia-opts` and `prometheus-opts` in your startup scripts to include it in for the Java startup options. You can also just use the provided startup script `/opt/run-java.sh` which does this automatically.
+
+For example, the following snippet can be added to a script starting up your Java application
+
+    # ...
+    export JAVA_OPTIONS="$JAVA_OPTIONS $(/opt/jolokia/jolokia-opts) $(/opt/prometheus/prometheus-opts)"
+    # .... use JAVA_OPTIONS when starting your app, e.g. as Tomcat does
+
+The following versions and defaults are used:
+
+* [Jolokia](http://www.jolokia.org) : version **1.6.2** and port **8778**
+* [jmx_exporter](https://github.com/prometheus/jmx_exporter): version **0.3.1** and port **9779**
+
+You can influence the behaviour of these config scripts by setting various environment variables.
+
+#### Jolokia Configuration
+
+* **AB_JOLOKIA_OFF** : If set disables activation of Jolokia (i.e. echos an empty value). By default, Jolokia is enabled.
+* **AB_JOLOKIA_CONFIG** : If set uses this file (including path) as Jolokia JVM agent properties (as described
+  in Jolokia's [reference manual](http://www.jolokia.org/reference/html/agents.html#agents-jvm)). If not set,
+  the `/opt/jolokia/etc/jolokia.properties` will be created using the settings as defined in this document, otherwise
+  the reset of the settings in this document are ignored.
+* **AB_JOLOKIA_HOST** : Host address to bind to (Default: `0.0.0.0`)
+* **AB_JOLOKIA_PORT** : Port to use (Default: `8778`)
+* **AB_JOLOKIA_USER** : User for basic authentication. Defaults to 'jolokia'
+* **AB_JOLOKIA_PASSWORD** : Password for basic authentication. By default authentication is switched off.
+* **AB_JOLOKIA_PASSWORD_RANDOM** : Should a random AB_JOLOKIA_PASSWORD be generated? Generated value will be written to `/opt/jolokia/etc/jolokia.pw`
+* **AB_JOLOKIA_HTTPS** : Switch on secure communication with https. By default self signed server certificates are generated
+  if no `serverCert` configuration is given in `AB_JOLOKIA_OPTS`
+* **AB_JOLOKIA_ID** : Agent ID to use (`$HOSTNAME` by default, which is the container id)
+* **AB_JOLOKIA_DISCOVERY_ENABLED** : Enable Jolokia discovery.  Defaults to false.
+* **AB_JOLOKIA_OPTS**  : Additional options to be appended to the agent configuration. They should be given in the format
+  "key=value,key=value,..."
+
+Some options for integration in various environments:
+
+* **AB_JOLOKIA_AUTH_OPENSHIFT** : Switch on client authentication for OpenShift TSL communication. The value of this
+  parameter can be a relative distinguished name which must be contained in a presented client certificate. Enabling this
+  parameter will automatically switch Jolokia into https communication mode. The default CA cert is set to
+  `/var/run/secrets/kubernetes.io/serviceaccount/ca.crt`
+
+
+undefined
+
 ### Versions:
 
 * Base-Image: **CentOS 7**
 * Java: **OpenJDK 8 1.8.0** (Java Runtime Environment (JRE))
-* Agent-Bond: **1.2.0** (Jolokia 1.6.2, jmx_exporter 0.3.1)
+* Jolokia: **1.6.2**
+* jmx_exporter: **undefined**
diff --git a/images/centos/openjdk8/jre/agent-bond-opts b/images/centos/openjdk8/jre/agent-bond-opts
deleted file mode 100644
index 280313b..0000000
--- a/images/centos/openjdk8/jre/agent-bond-opts
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/bin/sh
-
-# Parse options
-while [ $# -gt 0 ]
-do
-key="$1"
-case ${key} in
-    # Escape for scripts which eval the output of this script
-    -e|--escape)
-    escape_sep=1
-    ;;
-esac
-shift
-done
-
-# Check whether a given config is contained in AB_JOLOKIA_OPTS
-is_in_jolokia_opts() {
-  local prop=$1
-  if [ -n "${AB_JOLOKIA_OPTS:-}" ] && [ "${AB_JOLOKIA_OPTS}" != "${AB_JOLOKIA_OPTS/${prop}/}" ]; then
-     echo "yes"
-  else
-     echo "no"
-  fi
-}
-
-dir=${AB_DIR:-/opt/agent-bond}
-sep="="
-
-# Options separators defined to avoid clash with fish-pepper templating
-ab_open_del="{""{"
-ab_close_del="}""}"
-if [ -n "${escape_sep:-}" ]; then
-  ab_open_del='\{\{'
-  ab_close_del='\}\}'
-fi
-
-if [ -z "${AB_OFF:-}" ]; then
-   opts="-javaagent:$dir/agent-bond.jar"
-   config="${AB_CONFIG:-$dir/agent-bond.properties}"
-   if [ -f "$config" ]; then
-      # Configuration takes precedence
-      opts="${opts}${sep}config=${config}"
-      sep=","
-   fi
-   if [ -z "${AB_ENABLED:-}" ] || [ "${AB_ENABLED}" != "${AB_ENABLED/jolokia/}" ]; then
-     # Direct options only if no configuration is found
-     jsep=""
-     jolokia_opts=""
-     if [ -n "${AB_JOLOKIA_CONFIG:-}" ] && [ -f "${AB_JOLOKIA_CONFIG}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}config=${AB_JOLOKIA_CONFIG}"
-        jsep=","
-        grep -q -e '^host' ${AB_JOLOKIA_CONFIG} && host_in_config=1
-     fi
-     if [ -z "${AB_JOLOKIA_HOST:-}" ] && [ -z "${host_in_config:-}" ]; then
-        AB_JOLOKIA_HOST='0.0.0.0'
-     fi
-     if [ -n "${AB_JOLOKIA_HOST:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}host=${AB_JOLOKIA_HOST}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_PORT:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}port=${AB_JOLOKIA_PORT}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_USER:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}user=${AB_JOLOKIA_USER}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_PASSWORD:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}password=${AB_JOLOKIA_PASSWORD}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_HTTPS:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}protocol=https"
-        https_used=1
-        jsep=","
-     fi
-     # Integration with OpenShift client cert auth
-     if [ -n "${AB_JOLOKIA_AUTH_OPENSHIFT:-}" ]; then
-        auth_opts="useSslClientAuthentication=true,extraClientCheck=true"
-        if [ -z "${https_used+x}" ]; then
-          auth_opts="${auth_opts},protocol=https"
-        fi
-        if [ $(is_in_jolokia_opts "caCert") != "yes" ]; then
-           auth_opts="${auth_opts},caCert=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
-        fi
-        if [ $(is_in_jolokia_opts "clientPrincipal") != "yes" ]; then
-           if [  "${AB_JOLOKIA_AUTH_OPENSHIFT}" != "${AB_JOLOKIA_AUTH_OPENSHIFT/=/}" ]; then
-              # Supposed to contain a principal name to check
-              auth_opts="${auth_opts},clientPrincipal=$(echo ${AB_JOLOKIA_AUTH_OPENSHIFT} | sed -e 's/ /\\\\ /g')"
-           else
-              auth_opts="${auth_opts},clientPrincipal=cn=system:master-proxy"
-           fi
-        fi
-        jolokia_opts="${jolokia_opts}${jsep}${auth_opts}"
-        jsep=","
-     fi
-     # Add extra opts to the end
-     if [ -n "${AB_JOLOKIA_OPTS:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}${AB_JOLOKIA_OPTS}"
-        jsep=","
-     fi
-
-     opts="${opts}${sep}jolokia${ab_open_del}${jolokia_opts}${ab_close_del}"
-     sep=","
-   fi
-   if [ -z "${AB_ENABLED:-}" ] || [ "${AB_ENABLED}" != "${AB_ENABLED/jmx_exporter/}" ]; then
-     je_opts=""
-     jsep=""
-     if [ -n "${AB_JMX_EXPORTER_OPTS:-}" ]; then
-        opts="${opts}${sep}jmx_exporter${ab_open_del}${AB_JMX_EXPORTER_OPTS}${ab_close_del}"
-        sep=","
-     else
-        port=${AB_JMX_EXPORTER_PORT:-9779}
-        config=${AB_JMX_EXPORTER_CONFIG:-/opt/agent-bond/jmx_exporter_config.yml}
-        opts="${opts}${sep}jmx_exporter${ab_open_del}${port}:${config}${ab_close_del}"
-        sep=","
-     fi
-   fi
-   if [ "${sep:-}" != '=' ] ; then
-     echo ${opts}
-   fi
-fi
diff --git a/images/centos/openjdk8/jre/jmx_exporter_config.yml b/images/centos/openjdk8/jre/jmx_exporter_config.yml
deleted file mode 100644
index 620cd4a..0000000
--- a/images/centos/openjdk8/jre/jmx_exporter_config.yml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-lowercaseOutputName: true
-lowercaseOutputLabelNames: true
-whitelistObjectNames:
-  - 'org.apache.camel:*'
-rules:
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>((?:Min|Mean|Max|Last|Delta)(?:ProcessingTime)):'
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>(TotalProcessingTime):'
-    type: COUNTER
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>(ExchangesInflight|LastProcessingTime):'
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>((?:Exchanges(?:Completed|Failed|Total))|FailuresHandled):'
-    type: COUNTER
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
diff --git a/images/centos/openjdk8/jre/jolokia-opts b/images/centos/openjdk8/jre/jolokia-opts
new file mode 100644
index 0000000..1aa273e
--- /dev/null
+++ b/images/centos/openjdk8/jre/jolokia-opts
@@ -0,0 +1,103 @@
+#!/bin/sh
+
+
+# Exit if switched off
+if [ -n "${AB_JOLOKIA_OFF:-}" ] && [ "${AB_JOLOKIA_OFF}" != "false" ]; then
+  exit 0
+fi
+
+# Global switch, turning of all agents
+if [ -n "${AB_OFF:-}" ] && [ "${AB_OFF}" != "false" ]; then
+  exit 0
+fi
+
+# Check whether a given config is contained in AB_JOLOKIA_OPTS
+is_in_jolokia_opts() {
+  local prop=$1
+  if [ -n "${AB_JOLOKIA_OPTS:-}" ] && [ "${AB_JOLOKIA_OPTS}" != "${AB_JOLOKIA_OPTS/${prop}/}" ]; then
+     echo "yes"
+  else
+     echo "no"
+  fi
+}
+
+get_jolokia_properties() {
+
+  echo "host=${AB_JOLOKIA_HOST:-*}"
+  echo "port=${AB_JOLOKIA_PORT:-8778}"
+  echo "discoveryEnabled=${AB_JOLOKIA_DISCOVERY_ENABLED:-false}"
+
+  if [ -n "${AB_JOLOKIA_PASSWORD:-}" ]; then
+     echo "user=${AB_JOLOKIA_USER:-jolokia}"
+     echo "password=${AB_JOLOKIA_PASSWORD}"
+  fi
+  if [ -n "${AB_JOLOKIA_HTTPS:-}" ]; then
+     echo "protocol=https"
+     https_used=1
+  fi
+
+  # Integration with OpenShift client cert auth is enabled
+  # by default if not explicitly turned off by setting to 'false'
+  if [ "${AB_JOLOKIA_AUTH_OPENSHIFT:-}" != "false" ] && [ -f "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt" ]; then
+     echo "useSslClientAuthentication=true"
+     echo "extraClientCheck=true"
+
+     # Check if the 'protocol' property has already been set to 'https'
+     # If not, then defaults to using HTTPS
+     if [ -z ${https_used+x} ]; then
+       echo "protocol=https"
+     fi
+     if [ $(is_in_jolokia_opts "caCert") != "yes" ]; then
+        echo "caCert=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
+     fi
+
+     if [ $(is_in_jolokia_opts "clientPrincipal") != "yes" ]; then
+        if [  "${AB_JOLOKIA_AUTH_OPENSHIFT}" != "${AB_JOLOKIA_AUTH_OPENSHIFT/=/}" ]; then
+           # Supposed to contain a principal name to check
+           echo "clientPrincipal=$(echo ${AB_JOLOKIA_AUTH_OPENSHIFT} | sed -e 's/ /\\\\ /g')"
+        else
+           echo "clientPrincipal=cn=system:master-proxy"
+        fi
+     fi
+  fi
+
+  # Add extra opts
+  if [ -n "${AB_JOLOKIA_OPTS:-}" ]; then
+     echo "${AB_JOLOKIA_OPTS}" | tr "," "\n"
+  fi
+
+}
+
+write_jolokia_properties() {
+  local jolokia_property_file="$1"
+
+  # Setup Jolokia to accept basic auth, using a randomly generated password that is stored
+  # in the container in the ${DEPLOYMENTS_DIR}/jolokia.pw file.
+  if [ "${AB_JOLOKIA_PASSWORD_RANDOM:-}" == "true" ]; then
+    pw_file="/opt/jolokia/etc/jolokia.pw"
+    if [ -f "${pw_file}" ] ; then
+      AB_JOLOKIA_PASSWORD=$(cat "${pw_file}")
+    else
+      AB_JOLOKIA_PASSWORD=$(tr -cd '[:alnum:]' < /dev/urandom | fold -w30 | head -n1)
+      touch "${pw_file}"
+      chmod 660 "${pw_file}"
+      cat > "${pw_file}" <<EOF
+$AB_JOLOKIA_PASSWORD
+EOF
+    fi
+    export AB_JOLOKIA_PASSWORD
+  fi
+
+  touch "${jolokia_property_file}"
+  chmod 660 "${jolokia_property_file}"
+  cat > "${jolokia_property_file}" <<EOF
+$(get_jolokia_properties)
+EOF
+
+}
+
+if [ -z "${AB_JOLOKIA_CONFIG:-}" ]; then
+  AB_JOLOKIA_CONFIG="/opt/jolokia/etc/jolokia.properties"
+  write_jolokia_properties "$AB_JOLOKIA_CONFIG"
+fi
+echo "-javaagent:/opt/jolokia/jolokia.jar=config=${AB_JOLOKIA_CONFIG}"
diff --git a/images/centos/openjdk8/jre/prometheus-config.yml b/images/centos/openjdk8/jre/prometheus-config.yml
new file mode 100644
index 0000000..f6eaa2b
--- /dev/null
+++ b/images/centos/openjdk8/jre/prometheus-config.yml
@@ -0,0 +1,586 @@
+startDelaySecs: 5
+ssl: false
+blacklistObjectNames: ["java.lang:*"]
+rules:
+# Context level
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesCompleted'
+    name: org.apache.camel.ExchangesCompleted
+    help: Exchanges Completed
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesFailed'
+    name: org.apache.camel.ExchangesFailed
+    help: Exchanges Failed
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesInflight'
+    name: org.apache.camel.ExchangesInflight
+    help: Exchanges Inflight
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>FailuresHandled'
+    name: org.apache.camel.FailuresHandled
+    help: Failures Handled
+    labels:
+        context: $1
+        type: context
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExternalRedeliveries'
+    name: org.apache.camel.ExternalRedeliveries
+    help: External Redeliveries
+    labels:
+        context: $1
+        type: context
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>MaxProcessingTime'
+    name: org.apache.camel.MaxProcessingTime
+    help: Maximum Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>MeanProcessingTime'
+    name: org.apache.camel.MeanProcessingTime
+    help: Mean Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>MinProcessingTime'
+    name: org.apache.camel.MinProcessingTime
+    help: Minimum Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>LastProcessingTime'
+    name: org.apache.camel.LastProcessingTime
+    help: Last Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>DeltaProcessingTime'
+    name: org.apache.camel.DeltaProcessingTime
+    help: Delta Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>Redeliveries'
+    name: org.apache.camel.Redeliveries
+    help: Redeliveries
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>TotalProcessingTime'
+    name: org.apache.camel.TotalProcessingTime
+    help: Total Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=consumers, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+
+
+# Route level
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesCompleted'
+    name: org.apache.camel.ExchangesCompleted
+    help: Exchanges Completed
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesFailed'
+    name: org.apache.camel.ExchangesFailed
+    help: Exchanges Failed
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesInflight'
+    name: org.apache.camel.ExchangesInflight
+    help: Exchanges Inflight
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>FailuresHandled'
+    name: org.apache.camel.FailuresHandled
+    help: Failures Handled
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExternalRedeliveries'
+    name: org.apache.camel.ExternalRedeliveries
+    help: External Redeliveries
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>MaxProcessingTime'
+    name: org.apache.camel.MaxProcessingTime
+    help: Maximum Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>MeanProcessingTime'
+    name: org.apache.camel.MeanProcessingTime
+    help: Mean Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>MinProcessingTime'
+    name: org.apache.camel.MinProcessingTime
+    help: Minimum Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>LastProcessingTime'
+    name: org.apache.camel.LastProcessingTime
+    help: Last Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>DeltaProcessingTime'
+    name: org.apache.camel.DeltaProcessingTime
+    help: Delta Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>Redeliveries'
+    name: org.apache.camel.Redeliveries
+    help: Redeliveries
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>TotalProcessingTime'
+    name: org.apache.camel.TotalProcessingTime
+    help: Total Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+
+# Processor level
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesCompleted'
+    name: org.apache.camel.ExchangesCompleted
+    help: Exchanges Completed
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesFailed'
+    name: org.apache.camel.ExchangesFailed
+    help: Exchanges Failed
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesInflight'
+    name: org.apache.camel.ExchangesInflight
+    help: Exchanges Inflight
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>FailuresHandled'
+    name: org.apache.camel.FailuresHandled
+    help: Failures Handled
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExternalRedeliveries'
+    name: org.apache.camel.ExternalRedeliveries
+    help: External Redeliveries
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>MaxProcessingTime'
+    name: org.apache.camel.MaxProcessingTime
+    help: Maximum Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>MeanProcessingTime'
+    name: org.apache.camel.MeanProcessingTime
+    help: Mean Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>MinProcessingTime'
+    name: org.apache.camel.MinProcessingTime
+    help: Minimum Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>LastProcessingTime'
+    name: org.apache.camel.LastProcessingTime
+    help: Last Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>DeltaProcessingTime'
+    name: org.apache.camel.DeltaProcessingTime
+    help: Delta Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>Redeliveries'
+    name: org.apache.camel.Redeliveries
+    help: Redeliveries
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>TotalProcessingTime'
+    name: org.apache.camel.TotalProcessingTime
+    help: Total Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: COUNTER
+
+# Consumers
+  - pattern: 'org.apache.camel<context=([^,]+), type=consumers, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        consumer: $2
+        type: consumers
+    type: GAUGE
+
+# Services
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>MaxDuration'
+    name: org.apache.camel.MaxDuration
+    help: Maximum Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>MeanDuration'
+    name: org.apache.camel.MeanDuration
+    help: Mean Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>MinDuration'
+    name: org.apache.camel.MinDuration
+    help: Minimum Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>TotalDuration'
+    name: org.apache.camel.TotalDuration
+    help: Total Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>ThreadsBlocked'
+    name: org.apache.camel.ThreadsBlocked
+    help: Threads Blocked
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>ThreadsInterrupted'
+    name: org.apache.camel.ThreadsInterrupted
+    help: Threads Interrupted
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumLogicalRuntimeFaults'
+    name: org.apache.cxf.NumLogicalRuntimeFaults
+    help: Number of logical runtime faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumLogicalRuntimeFaults'
+    name: org.apache.cxf.NumLogicalRuntimeFaults
+    help: Number of logical runtime faults
+    type: GAUGE
+    labels:
+       bus.id: $1
+       type: $2
+       service: $3
+       port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>AvgResponseTime'
+    name: org.apache.cxf.AvgResponseTime
+    help: Average Response Time
+    type: GAUGE
+    labels:
+       bus.id: $1
+       type: $2
+       service: $3
+       port: $4
+       operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>AvgResponseTime'
+    name: org.apache.cxf.AvgResponseTime
+    help: Average Response Time
+    type: GAUGE
+    labels:
+          bus.id: $1
+          type: $2
+          service: $3
+          port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumInvocations'
+    name: org.apache.cxf.NumInvocations
+    help: Number of invocations
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumInvocations'
+    name: org.apache.cxf.NumInvocations
+    help: Number of invocations
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>MaxResponseTime'
+    name: org.apache.cxf.MaxResponseTime
+    help: Maximum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>MaxResponseTime'
+    name: org.apache.cxf.MaxResponseTime
+    help: Maximum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>MinResponseTime'
+    name: org.apache.cxf.MinResponseTime
+    help: Minimum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>MinResponseTime'
+    name: org.apache.cxf.MinResponseTime
+    help: Minimum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>TotalHandlingTime'
+    name: org.apache.cxf.TotalHandlingTime
+    help: Total Handling Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>TotalHandlingTime'
+    name: org.apache.cxf.TotalHandlingTime
+    help: Total Handling Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumRuntimeFaults'
+    name: org.apache.cxf.NumRuntimeFaults
+    help: Number of runtime faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumRuntimeFaults'
+    name: org.apache.cxf.NumRuntimeFaults
+    help: Number of runtime faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumUnCheckedApplicationFaults'
+    name: org.apache.cxf.NumUnCheckedApplicationFaults
+    help: Number of unchecked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumUnCheckedApplicationFaults'
+    name: org.apache.cxf.NumUnCheckedApplicationFaults
+    help: Number of unchecked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumCheckedApplicationFaults'
+    name: org.apache.cxf.NumCheckedApplicationFaults
+    help: Number of checked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumCheckedApplicationFaults'
+    name: org.apache.cxf.NumCheckedApplicationFaults
+    help: Number of checked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
diff --git a/images/centos/openjdk8/jre/prometheus-opts b/images/centos/openjdk8/jre/prometheus-opts
new file mode 100644
index 0000000..3c43968
--- /dev/null
+++ b/images/centos/openjdk8/jre/prometheus-opts
@@ -0,0 +1,23 @@
+#!/bin/sh
+# Scripted for getting Prometheus options
+# meant to be evaluated (not to be sourced)
+
+# Exit if switched off
+if [ -n "${AB_PROMETHEUS_OFF:-}" ] && [ "${AB_PROMETHEUS_OFF}" != "false" ]; then
+  exit 0
+fi
+
+# Global switch, turning of all agents
+if [ -n "${AB_OFF:-}" ] && [ "${AB_OFF}" != "false" ]; then
+  exit 0
+fi
+
+port=${AB_PROMETHEUS_PORT:-9779}
+config=${AB_PROMETHEUS_CONFIG:-/opt/prometheus/prometheus-config.yml}
+if [ -n "${AB_PROMETHEUS_HOST:-}" ]; then
+  hostPort="${AB_PROMETHEUS_HOST}:$port"
+else
+  hostPort="$port"
+fi
+
+echo "-javaagent:/opt/prometheus/jmx_prometheus_javaagent.jar=${hostPort}:$config"
diff --git a/images/centos/openjdk8/jre/run-java-options b/images/centos/openjdk8/jre/run-java-options
new file mode 100644
index 0000000..759dee7
--- /dev/null
+++ b/images/centos/openjdk8/jre/run-java-options
@@ -0,0 +1,4 @@
+#!/bin/bash
+# Delegate to the individual agent options scripts which will
+# examine the environment for features to be enabled
+echo "$(/opt/jolokia/jolokia-opts) $(/opt/prometheus/prometheus-opts)"
diff --git a/images/jboss/openjdk7/jdk/Dockerfile b/images/jboss/openjdk7/jdk/Dockerfile
index 5743030..526b74e 100644
--- a/images/jboss/openjdk7/jdk/Dockerfile
+++ b/images/jboss/openjdk7/jdk/Dockerfile
@@ -9,20 +9,39 @@ ENV JAVA_APP_DIR=/deployments \
     JAVA_MAJOR_VERSION=7
 
 
-# Agent bond including Jolokia and jmx_exporter
-ADD agent-bond-opts /opt/run-java-options
-RUN mkdir -p /opt/agent-bond \
- && curl http://central.maven.org/maven2/io/fabric8/agent-bond-agent/1.2.0/agent-bond-agent-1.2.0.jar \
-          -o /opt/agent-bond/agent-bond.jar \
- && chmod 444 /opt/agent-bond/agent-bond.jar \
- && chmod 755 /opt/run-java-options
-ADD jmx_exporter_config.yml /opt/agent-bond/
-EXPOSE 8778 9779
+# Prometheus JMX exporter agent
+RUN mkdir -p /opt/prometheus/etc \
+ && curl http://central.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/undefined/jmx_prometheus_javaagent-undefined.jar \
+          -o /opt/prometheus/jmx_prometheus_javaagent.jar
+ADD prometheus-opts /opt/prometheus/prometheus-opts
+ADD prometheus-config.yml /opt/prometheus/prometheus-config.yml
+RUN chmod 444 /opt/prometheus/jmx_prometheus_javaagent.jar \
+ && chmod 444 /opt/prometheus/prometheus-config.yml \
+ && chmod 755 /opt/prometheus/prometheus-opts \
+ && chmod 775 /opt/prometheus/etc \
+ && chgrp root /opt/prometheus/etc
+
+EXPOSE 9779
+
+
+# Jolokia agent
+RUN mkdir -p /opt/jolokia/etc \
+ && curl http://central.maven.org/maven2/org/jolokia/jolokia-jvm/1.6.2/jolokia-jvm-1.6.2-agent.jar \
+         -o /opt/jolokia/jolokia.jar
+ADD jolokia-opts /opt/jolokia/jolokia-opts
+RUN chmod 444 /opt/jolokia/jolokia.jar \
+ && chmod 755 /opt/jolokia/jolokia-opts \
+ && chmod 775 /opt/jolokia/etc \
+ && chgrp root /opt/jolokia/etc
+
+EXPOSE 8778
+
 
 # Add run script as /deployments/run-java.sh and make it executable
 COPY run-java.sh /deployments/
 RUN chmod 755 /deployments/run-java.sh
 
+COPY run-java-options /opt
 
 
 # Run under user "jboss" and prepare for be running
diff --git a/images/jboss/openjdk7/jdk/README.md b/images/jboss/openjdk7/jdk/README.md
index f24bc05..c9ada89 100644
--- a/images/jboss/openjdk7/jdk/README.md
+++ b/images/jboss/openjdk7/jdk/README.md
@@ -1,75 +1,12 @@
 ## Fabric8 Java Base Image OpenJDK 7 (JDK)
 
-> ** This image is deprecated and not maintained anymore. Please select one of the other flavors (alpine, centos).**
-
------
-
-
 This image is based on JBoss with OpenJDK and provides OpenJDK 7 (JDK)
 
 It includes:
 
-
-* An [Agent Bond](https://github.com/fabric8io/agent-bond) agent with [Jolokia](http://www.jolokia.org) and Prometheus' [jmx_exporter](https://github.com/prometheus/jmx_exporter). The agent is installed as `/opt/agent-bond/agent-bond.jar`. See below for configuration options.
-
-
 * A startup script [`/deployments/run-java.sh`](#startup-script-run-javash) for starting up Java applications.
-
-### Agent Bond
-
-In order to enable Jolokia for your application you should use this image as a base image (via `FROM`) and use the output of `agent-bond-opts` in your startup scripts to include it in for the Java startup options.
-
-For example, the following snippet can be added to a script starting up your Java application
-
-    # ...
-    export JAVA_OPTIONS="$JAVA_OPTIONS $(agent-bond-opts)"
-    # .... use JAVA_OPTIONS when starting your app, e.g. as Tomcat does
-
-The following versions and defaults are used:
-
-* [Jolokia](http://www.jolokia.org) : version **1.6.2** and port **8778**
-* [jmx_exporter](https://github.com/prometheus/jmx_exporter): version **0.3.1** and port **9779**
-
-You can influence the behaviour of `agent-bond-opts` by setting various environment variables:
-
-### Agent-Bond Options
-
-Agent bond itself can be influenced with the following environment variables: 
-
-* **AB_OFF** : If set disables activation of agent-bond (i.e. echos an empty value). By default, agent-bond is enabled.
-* **AB_ENABLED** : Comma separated list of sub-agents enabled. Currently allowed values are `jolokia` and `jmx_exporter`. 
-  By default both are enabled.
-
-
-#### Jolokia configuration
-
-* **AB_JOLOKIA_CONFIG** : If set uses this file (including path) as Jolokia JVM agent properties (as described 
-  in Jolokia's [reference manual](http://www.jolokia.org/reference/html/agents.html#agents-jvm)).
-  By default this is `/opt/jolokia/jolokia.properties`.
-* **AB_JOLOKIA_HOST** : Host address to bind to (Default: `0.0.0.0`)
-* **AB_JOLOKIA_PORT** : Port to use (Default: `8778`)
-* **AB_JOLOKIA_USER** : User for authentication. By default authentication is switched off.
-* **AB_JOLOKIA_HTTPS** : Switch on secure communication with https. By default self signed server certificates are generated
-  if no `serverCert` configuration is given in `AB_JOLOKIA_OPTS`
-* **AB_JOLOKIA_PASSWORD** : Password for authentication. By default authentication is switched off.
-* **AB_JOLOKIA_ID** : Agent ID to use (`$HOSTNAME` by default, which is the container id)
-* **AB_JOLOKIA_OPTS**  : Additional options to be appended to the agent opts. They should be given in the format 
-  "key=value,key=value,..."
-
-Some options for integration in various environments:
-
-* **AB_JOLOKIA_AUTH_OPENSHIFT** : Switch on client authentication for OpenShift TLS communication. The value of this 
-  parameter can be a relative distinguished name which must be contained in a presented client certificate. Enabling this
-  parameter will automatically switch Jolokia into https communication mode. The default CA cert is set to 
-  `/var/run/secrets/kubernetes.io/serviceaccount/ca.crt` 
-  
-#### jmx_exporter configuration
-
-* **AB_JMX_EXPORTER_OPTS** : Configuration to use for `jmx_exporter` (in the format `<port>:<path to config>`)
-* **AB_JMX_EXPORTER_PORT** : Port to use for the JMX Exporter. Default: `9779`
-* **AB_JMX_EXPORTER_CONFIG** : Path to configuration to use for `jmx_exporter`: Default: `/opt/agent-bond/jmx_exporter_config.json`
-
-
+* [Jolokia](http://www.jolokia.org) agent installed in `/opt/jolokia`
+* Prometheus [jmx_exporter](https://github.com/prometheus/jmx_exporter) agent installed in `/opt/jmx_exporter`.
 
 ### Startup Script run-java.sh
 
@@ -180,8 +117,55 @@ mvn clean install
 ```
 
 
+### Monitoring Agents
+
+In order to enable Jolokia and Prometheus exporter for your application you should use this image as a base image (via `FROM`) and use the output of `jolokia-opts` and `prometheus-opts` in your startup scripts to include it in for the Java startup options. You can also just use the provided startup script `/opt/run-java.sh` which does this automatically.
+
+For example, the following snippet can be added to a script starting up your Java application
+
+    # ...
+    export JAVA_OPTIONS="$JAVA_OPTIONS $(/opt/jolokia/jolokia-opts) $(/opt/prometheus/prometheus-opts)"
+    # .... use JAVA_OPTIONS when starting your app, e.g. as Tomcat does
+
+The following versions and defaults are used:
+
+* [Jolokia](http://www.jolokia.org) : version **1.6.2** and port **8778**
+* [jmx_exporter](https://github.com/prometheus/jmx_exporter): version **0.3.1** and port **9779**
+
+You can influence the behaviour of these config scripts by setting various environment variables.
+
+#### Jolokia Configuration
+
+* **AB_JOLOKIA_OFF** : If set disables activation of Jolokia (i.e. echos an empty value). By default, Jolokia is enabled.
+* **AB_JOLOKIA_CONFIG** : If set uses this file (including path) as Jolokia JVM agent properties (as described
+  in Jolokia's [reference manual](http://www.jolokia.org/reference/html/agents.html#agents-jvm)). If not set,
+  the `/opt/jolokia/etc/jolokia.properties` will be created using the settings as defined in this document, otherwise
+  the reset of the settings in this document are ignored.
+* **AB_JOLOKIA_HOST** : Host address to bind to (Default: `0.0.0.0`)
+* **AB_JOLOKIA_PORT** : Port to use (Default: `8778`)
+* **AB_JOLOKIA_USER** : User for basic authentication. Defaults to 'jolokia'
+* **AB_JOLOKIA_PASSWORD** : Password for basic authentication. By default authentication is switched off.
+* **AB_JOLOKIA_PASSWORD_RANDOM** : Should a random AB_JOLOKIA_PASSWORD be generated? Generated value will be written to `/opt/jolokia/etc/jolokia.pw`
+* **AB_JOLOKIA_HTTPS** : Switch on secure communication with https. By default self signed server certificates are generated
+  if no `serverCert` configuration is given in `AB_JOLOKIA_OPTS`
+* **AB_JOLOKIA_ID** : Agent ID to use (`$HOSTNAME` by default, which is the container id)
+* **AB_JOLOKIA_DISCOVERY_ENABLED** : Enable Jolokia discovery.  Defaults to false.
+* **AB_JOLOKIA_OPTS**  : Additional options to be appended to the agent configuration. They should be given in the format
+  "key=value,key=value,..."
+
+Some options for integration in various environments:
+
+* **AB_JOLOKIA_AUTH_OPENSHIFT** : Switch on client authentication for OpenShift TSL communication. The value of this
+  parameter can be a relative distinguished name which must be contained in a presented client certificate. Enabling this
+  parameter will automatically switch Jolokia into https communication mode. The default CA cert is set to
+  `/var/run/secrets/kubernetes.io/serviceaccount/ca.crt`
+
+
+undefined
+
 ### Versions:
 
 * Base-Image: **JBoss with OpenJDK undefined**
 * Java: **OpenJDK 7 1.7.0** (Java Development Kit (JDK))
-* Agent-Bond: **1.2.0** (Jolokia 1.6.2, jmx_exporter 0.3.1)
+* Jolokia: **1.6.2**
+* jmx_exporter: **undefined**
diff --git a/images/jboss/openjdk7/jdk/agent-bond-opts b/images/jboss/openjdk7/jdk/agent-bond-opts
deleted file mode 100644
index 280313b..0000000
--- a/images/jboss/openjdk7/jdk/agent-bond-opts
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/bin/sh
-
-# Parse options
-while [ $# -gt 0 ]
-do
-key="$1"
-case ${key} in
-    # Escape for scripts which eval the output of this script
-    -e|--escape)
-    escape_sep=1
-    ;;
-esac
-shift
-done
-
-# Check whether a given config is contained in AB_JOLOKIA_OPTS
-is_in_jolokia_opts() {
-  local prop=$1
-  if [ -n "${AB_JOLOKIA_OPTS:-}" ] && [ "${AB_JOLOKIA_OPTS}" != "${AB_JOLOKIA_OPTS/${prop}/}" ]; then
-     echo "yes"
-  else
-     echo "no"
-  fi
-}
-
-dir=${AB_DIR:-/opt/agent-bond}
-sep="="
-
-# Options separators defined to avoid clash with fish-pepper templating
-ab_open_del="{""{"
-ab_close_del="}""}"
-if [ -n "${escape_sep:-}" ]; then
-  ab_open_del='\{\{'
-  ab_close_del='\}\}'
-fi
-
-if [ -z "${AB_OFF:-}" ]; then
-   opts="-javaagent:$dir/agent-bond.jar"
-   config="${AB_CONFIG:-$dir/agent-bond.properties}"
-   if [ -f "$config" ]; then
-      # Configuration takes precedence
-      opts="${opts}${sep}config=${config}"
-      sep=","
-   fi
-   if [ -z "${AB_ENABLED:-}" ] || [ "${AB_ENABLED}" != "${AB_ENABLED/jolokia/}" ]; then
-     # Direct options only if no configuration is found
-     jsep=""
-     jolokia_opts=""
-     if [ -n "${AB_JOLOKIA_CONFIG:-}" ] && [ -f "${AB_JOLOKIA_CONFIG}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}config=${AB_JOLOKIA_CONFIG}"
-        jsep=","
-        grep -q -e '^host' ${AB_JOLOKIA_CONFIG} && host_in_config=1
-     fi
-     if [ -z "${AB_JOLOKIA_HOST:-}" ] && [ -z "${host_in_config:-}" ]; then
-        AB_JOLOKIA_HOST='0.0.0.0'
-     fi
-     if [ -n "${AB_JOLOKIA_HOST:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}host=${AB_JOLOKIA_HOST}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_PORT:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}port=${AB_JOLOKIA_PORT}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_USER:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}user=${AB_JOLOKIA_USER}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_PASSWORD:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}password=${AB_JOLOKIA_PASSWORD}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_HTTPS:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}protocol=https"
-        https_used=1
-        jsep=","
-     fi
-     # Integration with OpenShift client cert auth
-     if [ -n "${AB_JOLOKIA_AUTH_OPENSHIFT:-}" ]; then
-        auth_opts="useSslClientAuthentication=true,extraClientCheck=true"
-        if [ -z "${https_used+x}" ]; then
-          auth_opts="${auth_opts},protocol=https"
-        fi
-        if [ $(is_in_jolokia_opts "caCert") != "yes" ]; then
-           auth_opts="${auth_opts},caCert=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
-        fi
-        if [ $(is_in_jolokia_opts "clientPrincipal") != "yes" ]; then
-           if [  "${AB_JOLOKIA_AUTH_OPENSHIFT}" != "${AB_JOLOKIA_AUTH_OPENSHIFT/=/}" ]; then
-              # Supposed to contain a principal name to check
-              auth_opts="${auth_opts},clientPrincipal=$(echo ${AB_JOLOKIA_AUTH_OPENSHIFT} | sed -e 's/ /\\\\ /g')"
-           else
-              auth_opts="${auth_opts},clientPrincipal=cn=system:master-proxy"
-           fi
-        fi
-        jolokia_opts="${jolokia_opts}${jsep}${auth_opts}"
-        jsep=","
-     fi
-     # Add extra opts to the end
-     if [ -n "${AB_JOLOKIA_OPTS:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}${AB_JOLOKIA_OPTS}"
-        jsep=","
-     fi
-
-     opts="${opts}${sep}jolokia${ab_open_del}${jolokia_opts}${ab_close_del}"
-     sep=","
-   fi
-   if [ -z "${AB_ENABLED:-}" ] || [ "${AB_ENABLED}" != "${AB_ENABLED/jmx_exporter/}" ]; then
-     je_opts=""
-     jsep=""
-     if [ -n "${AB_JMX_EXPORTER_OPTS:-}" ]; then
-        opts="${opts}${sep}jmx_exporter${ab_open_del}${AB_JMX_EXPORTER_OPTS}${ab_close_del}"
-        sep=","
-     else
-        port=${AB_JMX_EXPORTER_PORT:-9779}
-        config=${AB_JMX_EXPORTER_CONFIG:-/opt/agent-bond/jmx_exporter_config.yml}
-        opts="${opts}${sep}jmx_exporter${ab_open_del}${port}:${config}${ab_close_del}"
-        sep=","
-     fi
-   fi
-   if [ "${sep:-}" != '=' ] ; then
-     echo ${opts}
-   fi
-fi
diff --git a/images/jboss/openjdk7/jdk/jmx_exporter_config.yml b/images/jboss/openjdk7/jdk/jmx_exporter_config.yml
deleted file mode 100644
index 620cd4a..0000000
--- a/images/jboss/openjdk7/jdk/jmx_exporter_config.yml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-lowercaseOutputName: true
-lowercaseOutputLabelNames: true
-whitelistObjectNames:
-  - 'org.apache.camel:*'
-rules:
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>((?:Min|Mean|Max|Last|Delta)(?:ProcessingTime)):'
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>(TotalProcessingTime):'
-    type: COUNTER
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>(ExchangesInflight|LastProcessingTime):'
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>((?:Exchanges(?:Completed|Failed|Total))|FailuresHandled):'
-    type: COUNTER
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
diff --git a/images/jboss/openjdk7/jdk/jolokia-opts b/images/jboss/openjdk7/jdk/jolokia-opts
new file mode 100644
index 0000000..1aa273e
--- /dev/null
+++ b/images/jboss/openjdk7/jdk/jolokia-opts
@@ -0,0 +1,103 @@
+#!/bin/sh
+
+
+# Exit if switched off
+if [ -n "${AB_JOLOKIA_OFF:-}" ] && [ "${AB_JOLOKIA_OFF}" != "false" ]; then
+  exit 0
+fi
+
+# Global switch, turning of all agents
+if [ -n "${AB_OFF:-}" ] && [ "${AB_OFF}" != "false" ]; then
+  exit 0
+fi
+
+# Check whether a given config is contained in AB_JOLOKIA_OPTS
+is_in_jolokia_opts() {
+  local prop=$1
+  if [ -n "${AB_JOLOKIA_OPTS:-}" ] && [ "${AB_JOLOKIA_OPTS}" != "${AB_JOLOKIA_OPTS/${prop}/}" ]; then
+     echo "yes"
+  else
+     echo "no"
+  fi
+}
+
+get_jolokia_properties() {
+
+  echo "host=${AB_JOLOKIA_HOST:-*}"
+  echo "port=${AB_JOLOKIA_PORT:-8778}"
+  echo "discoveryEnabled=${AB_JOLOKIA_DISCOVERY_ENABLED:-false}"
+
+  if [ -n "${AB_JOLOKIA_PASSWORD:-}" ]; then
+     echo "user=${AB_JOLOKIA_USER:-jolokia}"
+     echo "password=${AB_JOLOKIA_PASSWORD}"
+  fi
+  if [ -n "${AB_JOLOKIA_HTTPS:-}" ]; then
+     echo "protocol=https"
+     https_used=1
+  fi
+
+  # Integration with OpenShift client cert auth is enabled
+  # by default if not explicitly turned off by setting to 'false'
+  if [ "${AB_JOLOKIA_AUTH_OPENSHIFT:-}" != "false" ] && [ -f "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt" ]; then
+     echo "useSslClientAuthentication=true"
+     echo "extraClientCheck=true"
+
+     # Check if the 'protocol' property has already been set to 'https'
+     # If not, then defaults to using HTTPS
+     if [ -z ${https_used+x} ]; then
+       echo "protocol=https"
+     fi
+     if [ $(is_in_jolokia_opts "caCert") != "yes" ]; then
+        echo "caCert=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
+     fi
+
+     if [ $(is_in_jolokia_opts "clientPrincipal") != "yes" ]; then
+        if [  "${AB_JOLOKIA_AUTH_OPENSHIFT}" != "${AB_JOLOKIA_AUTH_OPENSHIFT/=/}" ]; then
+           # Supposed to contain a principal name to check
+           echo "clientPrincipal=$(echo ${AB_JOLOKIA_AUTH_OPENSHIFT} | sed -e 's/ /\\\\ /g')"
+        else
+           echo "clientPrincipal=cn=system:master-proxy"
+        fi
+     fi
+  fi
+
+  # Add extra opts
+  if [ -n "${AB_JOLOKIA_OPTS:-}" ]; then
+     echo "${AB_JOLOKIA_OPTS}" | tr "," "\n"
+  fi
+
+}
+
+write_jolokia_properties() {
+  local jolokia_property_file="$1"
+
+  # Setup Jolokia to accept basic auth, using a randomly generated password that is stored
+  # in the container in the ${DEPLOYMENTS_DIR}/jolokia.pw file.
+  if [ "${AB_JOLOKIA_PASSWORD_RANDOM:-}" == "true" ]; then
+    pw_file="/opt/jolokia/etc/jolokia.pw"
+    if [ -f "${pw_file}" ] ; then
+      AB_JOLOKIA_PASSWORD=$(cat "${pw_file}")
+    else
+      AB_JOLOKIA_PASSWORD=$(tr -cd '[:alnum:]' < /dev/urandom | fold -w30 | head -n1)
+      touch "${pw_file}"
+      chmod 660 "${pw_file}"
+      cat > "${pw_file}" <<EOF
+$AB_JOLOKIA_PASSWORD
+EOF
+    fi
+    export AB_JOLOKIA_PASSWORD
+  fi
+
+  touch "${jolokia_property_file}"
+  chmod 660 "${jolokia_property_file}"
+  cat > "${jolokia_property_file}" <<EOF
+$(get_jolokia_properties)
+EOF
+
+}
+
+if [ -z "${AB_JOLOKIA_CONFIG:-}" ]; then
+  AB_JOLOKIA_CONFIG="/opt/jolokia/etc/jolokia.properties"
+  write_jolokia_properties "$AB_JOLOKIA_CONFIG"
+fi
+echo "-javaagent:/opt/jolokia/jolokia.jar=config=${AB_JOLOKIA_CONFIG}"
diff --git a/images/jboss/openjdk7/jdk/prometheus-config.yml b/images/jboss/openjdk7/jdk/prometheus-config.yml
new file mode 100644
index 0000000..f6eaa2b
--- /dev/null
+++ b/images/jboss/openjdk7/jdk/prometheus-config.yml
@@ -0,0 +1,586 @@
+startDelaySecs: 5
+ssl: false
+blacklistObjectNames: ["java.lang:*"]
+rules:
+# Context level
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesCompleted'
+    name: org.apache.camel.ExchangesCompleted
+    help: Exchanges Completed
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesFailed'
+    name: org.apache.camel.ExchangesFailed
+    help: Exchanges Failed
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesInflight'
+    name: org.apache.camel.ExchangesInflight
+    help: Exchanges Inflight
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>FailuresHandled'
+    name: org.apache.camel.FailuresHandled
+    help: Failures Handled
+    labels:
+        context: $1
+        type: context
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExternalRedeliveries'
+    name: org.apache.camel.ExternalRedeliveries
+    help: External Redeliveries
+    labels:
+        context: $1
+        type: context
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>MaxProcessingTime'
+    name: org.apache.camel.MaxProcessingTime
+    help: Maximum Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>MeanProcessingTime'
+    name: org.apache.camel.MeanProcessingTime
+    help: Mean Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>MinProcessingTime'
+    name: org.apache.camel.MinProcessingTime
+    help: Minimum Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>LastProcessingTime'
+    name: org.apache.camel.LastProcessingTime
+    help: Last Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>DeltaProcessingTime'
+    name: org.apache.camel.DeltaProcessingTime
+    help: Delta Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>Redeliveries'
+    name: org.apache.camel.Redeliveries
+    help: Redeliveries
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>TotalProcessingTime'
+    name: org.apache.camel.TotalProcessingTime
+    help: Total Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=consumers, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+
+
+# Route level
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesCompleted'
+    name: org.apache.camel.ExchangesCompleted
+    help: Exchanges Completed
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesFailed'
+    name: org.apache.camel.ExchangesFailed
+    help: Exchanges Failed
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesInflight'
+    name: org.apache.camel.ExchangesInflight
+    help: Exchanges Inflight
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>FailuresHandled'
+    name: org.apache.camel.FailuresHandled
+    help: Failures Handled
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExternalRedeliveries'
+    name: org.apache.camel.ExternalRedeliveries
+    help: External Redeliveries
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>MaxProcessingTime'
+    name: org.apache.camel.MaxProcessingTime
+    help: Maximum Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>MeanProcessingTime'
+    name: org.apache.camel.MeanProcessingTime
+    help: Mean Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>MinProcessingTime'
+    name: org.apache.camel.MinProcessingTime
+    help: Minimum Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>LastProcessingTime'
+    name: org.apache.camel.LastProcessingTime
+    help: Last Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>DeltaProcessingTime'
+    name: org.apache.camel.DeltaProcessingTime
+    help: Delta Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>Redeliveries'
+    name: org.apache.camel.Redeliveries
+    help: Redeliveries
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>TotalProcessingTime'
+    name: org.apache.camel.TotalProcessingTime
+    help: Total Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+
+# Processor level
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesCompleted'
+    name: org.apache.camel.ExchangesCompleted
+    help: Exchanges Completed
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesFailed'
+    name: org.apache.camel.ExchangesFailed
+    help: Exchanges Failed
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesInflight'
+    name: org.apache.camel.ExchangesInflight
+    help: Exchanges Inflight
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>FailuresHandled'
+    name: org.apache.camel.FailuresHandled
+    help: Failures Handled
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExternalRedeliveries'
+    name: org.apache.camel.ExternalRedeliveries
+    help: External Redeliveries
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>MaxProcessingTime'
+    name: org.apache.camel.MaxProcessingTime
+    help: Maximum Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>MeanProcessingTime'
+    name: org.apache.camel.MeanProcessingTime
+    help: Mean Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>MinProcessingTime'
+    name: org.apache.camel.MinProcessingTime
+    help: Minimum Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>LastProcessingTime'
+    name: org.apache.camel.LastProcessingTime
+    help: Last Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>DeltaProcessingTime'
+    name: org.apache.camel.DeltaProcessingTime
+    help: Delta Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>Redeliveries'
+    name: org.apache.camel.Redeliveries
+    help: Redeliveries
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>TotalProcessingTime'
+    name: org.apache.camel.TotalProcessingTime
+    help: Total Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: COUNTER
+
+# Consumers
+  - pattern: 'org.apache.camel<context=([^,]+), type=consumers, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        consumer: $2
+        type: consumers
+    type: GAUGE
+
+# Services
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>MaxDuration'
+    name: org.apache.camel.MaxDuration
+    help: Maximum Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>MeanDuration'
+    name: org.apache.camel.MeanDuration
+    help: Mean Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>MinDuration'
+    name: org.apache.camel.MinDuration
+    help: Minimum Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>TotalDuration'
+    name: org.apache.camel.TotalDuration
+    help: Total Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>ThreadsBlocked'
+    name: org.apache.camel.ThreadsBlocked
+    help: Threads Blocked
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>ThreadsInterrupted'
+    name: org.apache.camel.ThreadsInterrupted
+    help: Threads Interrupted
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumLogicalRuntimeFaults'
+    name: org.apache.cxf.NumLogicalRuntimeFaults
+    help: Number of logical runtime faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumLogicalRuntimeFaults'
+    name: org.apache.cxf.NumLogicalRuntimeFaults
+    help: Number of logical runtime faults
+    type: GAUGE
+    labels:
+       bus.id: $1
+       type: $2
+       service: $3
+       port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>AvgResponseTime'
+    name: org.apache.cxf.AvgResponseTime
+    help: Average Response Time
+    type: GAUGE
+    labels:
+       bus.id: $1
+       type: $2
+       service: $3
+       port: $4
+       operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>AvgResponseTime'
+    name: org.apache.cxf.AvgResponseTime
+    help: Average Response Time
+    type: GAUGE
+    labels:
+          bus.id: $1
+          type: $2
+          service: $3
+          port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumInvocations'
+    name: org.apache.cxf.NumInvocations
+    help: Number of invocations
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumInvocations'
+    name: org.apache.cxf.NumInvocations
+    help: Number of invocations
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>MaxResponseTime'
+    name: org.apache.cxf.MaxResponseTime
+    help: Maximum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>MaxResponseTime'
+    name: org.apache.cxf.MaxResponseTime
+    help: Maximum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>MinResponseTime'
+    name: org.apache.cxf.MinResponseTime
+    help: Minimum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>MinResponseTime'
+    name: org.apache.cxf.MinResponseTime
+    help: Minimum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>TotalHandlingTime'
+    name: org.apache.cxf.TotalHandlingTime
+    help: Total Handling Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>TotalHandlingTime'
+    name: org.apache.cxf.TotalHandlingTime
+    help: Total Handling Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumRuntimeFaults'
+    name: org.apache.cxf.NumRuntimeFaults
+    help: Number of runtime faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumRuntimeFaults'
+    name: org.apache.cxf.NumRuntimeFaults
+    help: Number of runtime faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumUnCheckedApplicationFaults'
+    name: org.apache.cxf.NumUnCheckedApplicationFaults
+    help: Number of unchecked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumUnCheckedApplicationFaults'
+    name: org.apache.cxf.NumUnCheckedApplicationFaults
+    help: Number of unchecked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumCheckedApplicationFaults'
+    name: org.apache.cxf.NumCheckedApplicationFaults
+    help: Number of checked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumCheckedApplicationFaults'
+    name: org.apache.cxf.NumCheckedApplicationFaults
+    help: Number of checked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
diff --git a/images/jboss/openjdk7/jdk/prometheus-opts b/images/jboss/openjdk7/jdk/prometheus-opts
new file mode 100644
index 0000000..3c43968
--- /dev/null
+++ b/images/jboss/openjdk7/jdk/prometheus-opts
@@ -0,0 +1,23 @@
+#!/bin/sh
+# Scripted for getting Prometheus options
+# meant to be evaluated (not to be sourced)
+
+# Exit if switched off
+if [ -n "${AB_PROMETHEUS_OFF:-}" ] && [ "${AB_PROMETHEUS_OFF}" != "false" ]; then
+  exit 0
+fi
+
+# Global switch, turning of all agents
+if [ -n "${AB_OFF:-}" ] && [ "${AB_OFF}" != "false" ]; then
+  exit 0
+fi
+
+port=${AB_PROMETHEUS_PORT:-9779}
+config=${AB_PROMETHEUS_CONFIG:-/opt/prometheus/prometheus-config.yml}
+if [ -n "${AB_PROMETHEUS_HOST:-}" ]; then
+  hostPort="${AB_PROMETHEUS_HOST}:$port"
+else
+  hostPort="$port"
+fi
+
+echo "-javaagent:/opt/prometheus/jmx_prometheus_javaagent.jar=${hostPort}:$config"
diff --git a/images/jboss/openjdk7/jdk/run-java-options b/images/jboss/openjdk7/jdk/run-java-options
new file mode 100644
index 0000000..759dee7
--- /dev/null
+++ b/images/jboss/openjdk7/jdk/run-java-options
@@ -0,0 +1,4 @@
+#!/bin/bash
+# Delegate to the individual agent options scripts which will
+# examine the environment for features to be enabled
+echo "$(/opt/jolokia/jolokia-opts) $(/opt/prometheus/prometheus-opts)"
diff --git a/images/jboss/openjdk7/jre/Dockerfile b/images/jboss/openjdk7/jre/Dockerfile
new file mode 100644
index 0000000..526b74e
--- /dev/null
+++ b/images/jboss/openjdk7/jre/Dockerfile
@@ -0,0 +1,57 @@
+FROM jboss/base-jdk:7
+
+USER root
+
+RUN mkdir -p /deployments
+
+# JAVA_APP_DIR is used by run-java.sh for finding the binaries
+ENV JAVA_APP_DIR=/deployments \
+    JAVA_MAJOR_VERSION=7
+
+
+# Prometheus JMX exporter agent
+RUN mkdir -p /opt/prometheus/etc \
+ && curl http://central.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/undefined/jmx_prometheus_javaagent-undefined.jar \
+          -o /opt/prometheus/jmx_prometheus_javaagent.jar
+ADD prometheus-opts /opt/prometheus/prometheus-opts
+ADD prometheus-config.yml /opt/prometheus/prometheus-config.yml
+RUN chmod 444 /opt/prometheus/jmx_prometheus_javaagent.jar \
+ && chmod 444 /opt/prometheus/prometheus-config.yml \
+ && chmod 755 /opt/prometheus/prometheus-opts \
+ && chmod 775 /opt/prometheus/etc \
+ && chgrp root /opt/prometheus/etc
+
+EXPOSE 9779
+
+
+# Jolokia agent
+RUN mkdir -p /opt/jolokia/etc \
+ && curl http://central.maven.org/maven2/org/jolokia/jolokia-jvm/1.6.2/jolokia-jvm-1.6.2-agent.jar \
+         -o /opt/jolokia/jolokia.jar
+ADD jolokia-opts /opt/jolokia/jolokia-opts
+RUN chmod 444 /opt/jolokia/jolokia.jar \
+ && chmod 755 /opt/jolokia/jolokia-opts \
+ && chmod 775 /opt/jolokia/etc \
+ && chgrp root /opt/jolokia/etc
+
+EXPOSE 8778
+
+
+# Add run script as /deployments/run-java.sh and make it executable
+COPY run-java.sh /deployments/
+RUN chmod 755 /deployments/run-java.sh
+
+COPY run-java-options /opt
+
+
+# Run under user "jboss" and prepare for be running
+# under OpenShift, too
+RUN chown -R jboss /deployments \
+  && usermod -g root -G `id -g jboss` jboss \
+  && chmod -R "g+rwX" /deployments \
+  && chown -R jboss:root /deployments
+
+USER jboss
+
+
+CMD [ "/deployments/run-java.sh" ]
diff --git a/images/jboss/openjdk7/jre/README.md b/images/jboss/openjdk7/jre/README.md
new file mode 100644
index 0000000..d224272
--- /dev/null
+++ b/images/jboss/openjdk7/jre/README.md
@@ -0,0 +1,171 @@
+## Fabric8 Java Base Image OpenJDK 7 (JRE)
+
+This image is based on JBoss with OpenJDK and provides OpenJDK 7 (JRE)
+
+It includes:
+
+* A startup script [`/deployments/run-java.sh`](#startup-script-run-javash) for starting up Java applications.
+* [Jolokia](http://www.jolokia.org) agent installed in `/opt/jolokia`
+* Prometheus [jmx_exporter](https://github.com/prometheus/jmx_exporter) agent installed in `/opt/jmx_exporter`.
+
+### Startup Script run-java.sh
+
+The default command for this image is [/deployments/run-java.sh](https://github.com/fabric8io/run-java-sh). Its purpose it to fire up Java applications which are provided as fat-jars, including all dependencies or more classical from a main class, where the classpath is build up from all jars within a directory.
+
+For these images the variable **JAVA_APP_DIR** has the default value `/deployments`
+
+
+### run-java.sh
+
+This general purpose startup script is optimized for running Java application from within containers. It is called like
+
+```
+./run-java.sh <sub-command> <options>
+```
+`run-java.sh` knows two sub-commands:
+
+* `options` to print out JVM option which can be used for own invocation of Java apps (like Maven or Tomcat). It respects container constraints and includes all magic which is used by this script
+* `run` executes a Java application as described below. This is also the default command so you can skip adding this command.
+
+### Running a Java application
+
+When no subcommand is given (or when you provide the default subcommand `run`), then by default this scripts starts up Java application.
+
+The startup process is configured mostly via environment variables:
+
+* **JAVA_APP_DIR** the directory where the application resides. All paths in your application are relative to this directory. By default it is the same directory where this startup script resides.
+* **JAVA_LIB_DIR** directory holding the Java jar files as well an optional `classpath` file which holds the classpath. Either as a single line classpath (colon separated) or with jar files listed line-by-line. If not set **JAVA_LIB_DIR** is the same as **JAVA_APP_DIR**.
+* **JAVA_OPTIONS** options to add when calling `java`
+* **JAVA_MAJOR_VERSION** a number >= 7. If the version is set then only options suitable for this version are used. When set to 7 options known only to Java > 8 will be removed. For versions >= 10 no explicit memory limit is calculated since Java >= 10 has support for container limits.
+* **JAVA_MAX_MEM_RATIO** is used when no `-Xmx` option is given in `JAVA_OPTIONS`. This is used to calculate a default maximal Heap Memory based on a containers restriction. If used in a Docker container without any memory constraints for the container then this option has no effect. If there is a memory constraint then `-Xmx` is set to a ratio of the container available memory as set here. The default is `25` when the maximum amount of memory available to the container is below 300M, `50` otherwise, which means in that case that 50% of the available memory is used as an upper boundary. You can skip this mechanism by setting this value to 0 in which case no `-Xmx` option is added.
+* **JAVA_INIT_MEM_RATIO** is used when no `-Xms` option is given in `JAVA_OPTIONS`. This is used to calculate a default initial Heap Memory based on a containers restriction. If used in a Docker container without any memory constraints for the container then this option has no effect. If there is a memory constraint then `-Xms` is set to a ratio of the container available memory as set here. By default this value is not set.
+* **JAVA_MAX_CORE** restrict manually the number of cores available which is used for calculating certain defaults like the number of garbage collector threads. If set to 0 no base JVM tuning based on the number of cores is performed.
+* **JAVA_DIAGNOSTICS** set this to get some diagnostics information to standard out when things are happening
+* **JAVA_MAIN_CLASS** A main class to use as argument for `java`. When this environment variable is given, all jar files in `$JAVA_APP_DIR` are added to the classpath as well as `$JAVA_LIB_DIR`.
+* **JAVA_APP_JAR** A jar file with an appropriate manifest so that it can be started with `java -jar` if no `$JAVA_MAIN_CLASS` is set. In all cases this jar file is added to the classpath, too.
+* **JAVA_APP_NAME** Name to use for the process
+* **JAVA_CLASSPATH** the classpath to use. If not given, the startup script checks for a file `${JAVA_APP_DIR}/classpath` and use its content literally as classpath. If this file doesn't exists all jars in the app dir are added (`classes:${JAVA_APP_DIR}/*`).
+* **JAVA_DEBUG** If set remote debugging will be switched on
+* **JAVA_DEBUG_SUSPEND** If set enables suspend mode in remote debugging
+* **JAVA_DEBUG_PORT** Port used for remote debugging. Default: 5005
+* **HTTP_PROXY** The URL of the proxy server that translates into the `http.proxyHost` and `http.proxyPort` system properties.
+* **HTTPS_PROXY** The URL of the proxy server that translates into the `https.proxyHost` and `https.proxyPort` system properties.
+* **no_proxy**, **NO_PROXY** The list of hosts that should be reached directly, bypassing the proxy, that translates into the `http.nonProxyHosts` system property.
+
+If neither `$JAVA_APP_JAR` nor `$JAVA_MAIN_CLASS` is given, `$JAVA_APP_DIR` is checked for a single JAR file which is taken as `$JAVA_APP_JAR`. If no or more then one jar file is found, an error is thrown.
+
+The classpath is build up with the following parts:
+
+* If `$JAVA_CLASSPATH` is set, this classpath is taken.
+* The current directory (".") is added first.
+* If the current directory is not the same as `$JAVA_APP_DIR`, `$JAVA_APP_DIR` is added.
+* If `$JAVA_MAIN_CLASS` is set, then
+  - A `$JAVA_APP_JAR` is added if set
+  - If a file `$JAVA_APP_DIR/classpath` exists, its content is appended to the classpath. This file
+    can be either a single line with the jar files colon separated or a multi-line file where each line
+    holds the path of the jar file relative to `$JAVA_LIB_DIR` (which by default is the `$JAVA_APP_DIR`)
+  - If this file is not set, a `${JAVA_APP_DIR}/*` is added which effectively adds all
+    jars in this directory in alphabetical order.
+
+These variables can be also set in a shell config file `run-env.sh`, which will be sourced by the startup script. This file can be located in the directory where the startup script is located and in `${JAVA_APP_DIR}`, whereas environment variables in the latter override the ones in `run-env.sh` from the script directory.
+
+This startup script also checks for a command `run-java-options`. If existent it will be called and the output is added to the environment variable `$JAVA_OPTIONS`.
+
+The startup script also exposes some environment variables describing container limits which can be used by applications:
+
+* **CONTAINER_CORE_LIMIT** a calculated core limit as described in https://www.kernel.org/doc/Documentation/scheduler/sched-bwc.txt
+* **CONTAINER_MAX_MEMORY** memory limit given to the container
+
+Any arguments given to the script are given through directly as argument to the Java application.
+
+Example:
+
+```
+# Set the application directory directly
+export JAVA_APP_DIR=/deployments
+# Set -Xmx based on container constraints
+export JAVA_MAX_MEM_RATIO=40
+# Start the jar in JAVA_APP_DIR with the given arguments
+./run-java.sh --user maxmorlock --password secret
+```
+
+### Options
+
+This script can also be used to calculate reasonable, best-practice options for starting Java apps in general. For example, when running Maven in a container it makes sense to respect  container Memory constraints.
+
+The subcommand `options` can be used to print options to standard output so that is can be easily used to feed it to another, Java based application.
+
+When no extra arguments are given, all defaults will be used, which can be influenced with the environment variables described above.
+
+You can select specific sets of options by providing additional arguments:
+
+* `--debug` : Java debug options if `JAVA_DEBUG` is set
+* `--memory` : Memory settings based on the environment variables given
+* `--proxy` : Evaluate proxy environments variables
+* `--cpu` : Tuning when the number of cores is limited
+* `--gc` : GC tuning parameters
+* `--jit` : JIT options
+* `--diagnostics` : Print diagnostics options when `JAVA_DIAGNOSTICS` is set
+* `--java-default` : Same as `--memory --jit --diagnostic --cpu --gc`
+
+Example:
+
+```
+# Call Maven with the proper memory settings when running in an container
+export MAVEN_OPTS="$(run-java.sh options --memory)"
+mvn clean install
+```
+
+
+### Monitoring Agents
+
+In order to enable Jolokia and Prometheus exporter for your application you should use this image as a base image (via `FROM`) and use the output of `jolokia-opts` and `prometheus-opts` in your startup scripts to include it in for the Java startup options. You can also just use the provided startup script `/opt/run-java.sh` which does this automatically.
+
+For example, the following snippet can be added to a script starting up your Java application
+
+    # ...
+    export JAVA_OPTIONS="$JAVA_OPTIONS $(/opt/jolokia/jolokia-opts) $(/opt/prometheus/prometheus-opts)"
+    # .... use JAVA_OPTIONS when starting your app, e.g. as Tomcat does
+
+The following versions and defaults are used:
+
+* [Jolokia](http://www.jolokia.org) : version **1.6.2** and port **8778**
+* [jmx_exporter](https://github.com/prometheus/jmx_exporter): version **0.3.1** and port **9779**
+
+You can influence the behaviour of these config scripts by setting various environment variables.
+
+#### Jolokia Configuration
+
+* **AB_JOLOKIA_OFF** : If set disables activation of Jolokia (i.e. echos an empty value). By default, Jolokia is enabled.
+* **AB_JOLOKIA_CONFIG** : If set uses this file (including path) as Jolokia JVM agent properties (as described
+  in Jolokia's [reference manual](http://www.jolokia.org/reference/html/agents.html#agents-jvm)). If not set,
+  the `/opt/jolokia/etc/jolokia.properties` will be created using the settings as defined in this document, otherwise
+  the reset of the settings in this document are ignored.
+* **AB_JOLOKIA_HOST** : Host address to bind to (Default: `0.0.0.0`)
+* **AB_JOLOKIA_PORT** : Port to use (Default: `8778`)
+* **AB_JOLOKIA_USER** : User for basic authentication. Defaults to 'jolokia'
+* **AB_JOLOKIA_PASSWORD** : Password for basic authentication. By default authentication is switched off.
+* **AB_JOLOKIA_PASSWORD_RANDOM** : Should a random AB_JOLOKIA_PASSWORD be generated? Generated value will be written to `/opt/jolokia/etc/jolokia.pw`
+* **AB_JOLOKIA_HTTPS** : Switch on secure communication with https. By default self signed server certificates are generated
+  if no `serverCert` configuration is given in `AB_JOLOKIA_OPTS`
+* **AB_JOLOKIA_ID** : Agent ID to use (`$HOSTNAME` by default, which is the container id)
+* **AB_JOLOKIA_DISCOVERY_ENABLED** : Enable Jolokia discovery.  Defaults to false.
+* **AB_JOLOKIA_OPTS**  : Additional options to be appended to the agent configuration. They should be given in the format
+  "key=value,key=value,..."
+
+Some options for integration in various environments:
+
+* **AB_JOLOKIA_AUTH_OPENSHIFT** : Switch on client authentication for OpenShift TSL communication. The value of this
+  parameter can be a relative distinguished name which must be contained in a presented client certificate. Enabling this
+  parameter will automatically switch Jolokia into https communication mode. The default CA cert is set to
+  `/var/run/secrets/kubernetes.io/serviceaccount/ca.crt`
+
+
+undefined
+
+### Versions:
+
+* Base-Image: **JBoss with OpenJDK undefined**
+* Java: **OpenJDK 7 1.7.0** (Java Runtime Environment (JRE))
+* Jolokia: **1.6.2**
+* jmx_exporter: **undefined**
diff --git a/images/jboss/openjdk7/jre/jolokia-opts b/images/jboss/openjdk7/jre/jolokia-opts
new file mode 100644
index 0000000..1aa273e
--- /dev/null
+++ b/images/jboss/openjdk7/jre/jolokia-opts
@@ -0,0 +1,103 @@
+#!/bin/sh
+
+
+# Exit if switched off
+if [ -n "${AB_JOLOKIA_OFF:-}" ] && [ "${AB_JOLOKIA_OFF}" != "false" ]; then
+  exit 0
+fi
+
+# Global switch, turning of all agents
+if [ -n "${AB_OFF:-}" ] && [ "${AB_OFF}" != "false" ]; then
+  exit 0
+fi
+
+# Check whether a given config is contained in AB_JOLOKIA_OPTS
+is_in_jolokia_opts() {
+  local prop=$1
+  if [ -n "${AB_JOLOKIA_OPTS:-}" ] && [ "${AB_JOLOKIA_OPTS}" != "${AB_JOLOKIA_OPTS/${prop}/}" ]; then
+     echo "yes"
+  else
+     echo "no"
+  fi
+}
+
+get_jolokia_properties() {
+
+  echo "host=${AB_JOLOKIA_HOST:-*}"
+  echo "port=${AB_JOLOKIA_PORT:-8778}"
+  echo "discoveryEnabled=${AB_JOLOKIA_DISCOVERY_ENABLED:-false}"
+
+  if [ -n "${AB_JOLOKIA_PASSWORD:-}" ]; then
+     echo "user=${AB_JOLOKIA_USER:-jolokia}"
+     echo "password=${AB_JOLOKIA_PASSWORD}"
+  fi
+  if [ -n "${AB_JOLOKIA_HTTPS:-}" ]; then
+     echo "protocol=https"
+     https_used=1
+  fi
+
+  # Integration with OpenShift client cert auth is enabled
+  # by default if not explicitly turned off by setting to 'false'
+  if [ "${AB_JOLOKIA_AUTH_OPENSHIFT:-}" != "false" ] && [ -f "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt" ]; then
+     echo "useSslClientAuthentication=true"
+     echo "extraClientCheck=true"
+
+     # Check if the 'protocol' property has already been set to 'https'
+     # If not, then defaults to using HTTPS
+     if [ -z ${https_used+x} ]; then
+       echo "protocol=https"
+     fi
+     if [ $(is_in_jolokia_opts "caCert") != "yes" ]; then
+        echo "caCert=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
+     fi
+
+     if [ $(is_in_jolokia_opts "clientPrincipal") != "yes" ]; then
+        if [  "${AB_JOLOKIA_AUTH_OPENSHIFT}" != "${AB_JOLOKIA_AUTH_OPENSHIFT/=/}" ]; then
+           # Supposed to contain a principal name to check
+           echo "clientPrincipal=$(echo ${AB_JOLOKIA_AUTH_OPENSHIFT} | sed -e 's/ /\\\\ /g')"
+        else
+           echo "clientPrincipal=cn=system:master-proxy"
+        fi
+     fi
+  fi
+
+  # Add extra opts
+  if [ -n "${AB_JOLOKIA_OPTS:-}" ]; then
+     echo "${AB_JOLOKIA_OPTS}" | tr "," "\n"
+  fi
+
+}
+
+write_jolokia_properties() {
+  local jolokia_property_file="$1"
+
+  # Setup Jolokia to accept basic auth, using a randomly generated password that is stored
+  # in the container in the ${DEPLOYMENTS_DIR}/jolokia.pw file.
+  if [ "${AB_JOLOKIA_PASSWORD_RANDOM:-}" == "true" ]; then
+    pw_file="/opt/jolokia/etc/jolokia.pw"
+    if [ -f "${pw_file}" ] ; then
+      AB_JOLOKIA_PASSWORD=$(cat "${pw_file}")
+    else
+      AB_JOLOKIA_PASSWORD=$(tr -cd '[:alnum:]' < /dev/urandom | fold -w30 | head -n1)
+      touch "${pw_file}"
+      chmod 660 "${pw_file}"
+      cat > "${pw_file}" <<EOF
+$AB_JOLOKIA_PASSWORD
+EOF
+    fi
+    export AB_JOLOKIA_PASSWORD
+  fi
+
+  touch "${jolokia_property_file}"
+  chmod 660 "${jolokia_property_file}"
+  cat > "${jolokia_property_file}" <<EOF
+$(get_jolokia_properties)
+EOF
+
+}
+
+if [ -z "${AB_JOLOKIA_CONFIG:-}" ]; then
+  AB_JOLOKIA_CONFIG="/opt/jolokia/etc/jolokia.properties"
+  write_jolokia_properties "$AB_JOLOKIA_CONFIG"
+fi
+echo "-javaagent:/opt/jolokia/jolokia.jar=config=${AB_JOLOKIA_CONFIG}"
diff --git a/images/jboss/openjdk7/jre/prometheus-config.yml b/images/jboss/openjdk7/jre/prometheus-config.yml
new file mode 100644
index 0000000..f6eaa2b
--- /dev/null
+++ b/images/jboss/openjdk7/jre/prometheus-config.yml
@@ -0,0 +1,586 @@
+startDelaySecs: 5
+ssl: false
+blacklistObjectNames: ["java.lang:*"]
+rules:
+# Context level
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesCompleted'
+    name: org.apache.camel.ExchangesCompleted
+    help: Exchanges Completed
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesFailed'
+    name: org.apache.camel.ExchangesFailed
+    help: Exchanges Failed
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesInflight'
+    name: org.apache.camel.ExchangesInflight
+    help: Exchanges Inflight
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>FailuresHandled'
+    name: org.apache.camel.FailuresHandled
+    help: Failures Handled
+    labels:
+        context: $1
+        type: context
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExternalRedeliveries'
+    name: org.apache.camel.ExternalRedeliveries
+    help: External Redeliveries
+    labels:
+        context: $1
+        type: context
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>MaxProcessingTime'
+    name: org.apache.camel.MaxProcessingTime
+    help: Maximum Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>MeanProcessingTime'
+    name: org.apache.camel.MeanProcessingTime
+    help: Mean Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>MinProcessingTime'
+    name: org.apache.camel.MinProcessingTime
+    help: Minimum Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>LastProcessingTime'
+    name: org.apache.camel.LastProcessingTime
+    help: Last Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>DeltaProcessingTime'
+    name: org.apache.camel.DeltaProcessingTime
+    help: Delta Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>Redeliveries'
+    name: org.apache.camel.Redeliveries
+    help: Redeliveries
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>TotalProcessingTime'
+    name: org.apache.camel.TotalProcessingTime
+    help: Total Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=consumers, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+
+
+# Route level
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesCompleted'
+    name: org.apache.camel.ExchangesCompleted
+    help: Exchanges Completed
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesFailed'
+    name: org.apache.camel.ExchangesFailed
+    help: Exchanges Failed
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesInflight'
+    name: org.apache.camel.ExchangesInflight
+    help: Exchanges Inflight
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>FailuresHandled'
+    name: org.apache.camel.FailuresHandled
+    help: Failures Handled
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExternalRedeliveries'
+    name: org.apache.camel.ExternalRedeliveries
+    help: External Redeliveries
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>MaxProcessingTime'
+    name: org.apache.camel.MaxProcessingTime
+    help: Maximum Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>MeanProcessingTime'
+    name: org.apache.camel.MeanProcessingTime
+    help: Mean Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>MinProcessingTime'
+    name: org.apache.camel.MinProcessingTime
+    help: Minimum Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>LastProcessingTime'
+    name: org.apache.camel.LastProcessingTime
+    help: Last Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>DeltaProcessingTime'
+    name: org.apache.camel.DeltaProcessingTime
+    help: Delta Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>Redeliveries'
+    name: org.apache.camel.Redeliveries
+    help: Redeliveries
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>TotalProcessingTime'
+    name: org.apache.camel.TotalProcessingTime
+    help: Total Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+
+# Processor level
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesCompleted'
+    name: org.apache.camel.ExchangesCompleted
+    help: Exchanges Completed
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesFailed'
+    name: org.apache.camel.ExchangesFailed
+    help: Exchanges Failed
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesInflight'
+    name: org.apache.camel.ExchangesInflight
+    help: Exchanges Inflight
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>FailuresHandled'
+    name: org.apache.camel.FailuresHandled
+    help: Failures Handled
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExternalRedeliveries'
+    name: org.apache.camel.ExternalRedeliveries
+    help: External Redeliveries
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>MaxProcessingTime'
+    name: org.apache.camel.MaxProcessingTime
+    help: Maximum Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>MeanProcessingTime'
+    name: org.apache.camel.MeanProcessingTime
+    help: Mean Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>MinProcessingTime'
+    name: org.apache.camel.MinProcessingTime
+    help: Minimum Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>LastProcessingTime'
+    name: org.apache.camel.LastProcessingTime
+    help: Last Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>DeltaProcessingTime'
+    name: org.apache.camel.DeltaProcessingTime
+    help: Delta Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>Redeliveries'
+    name: org.apache.camel.Redeliveries
+    help: Redeliveries
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>TotalProcessingTime'
+    name: org.apache.camel.TotalProcessingTime
+    help: Total Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: COUNTER
+
+# Consumers
+  - pattern: 'org.apache.camel<context=([^,]+), type=consumers, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        consumer: $2
+        type: consumers
+    type: GAUGE
+
+# Services
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>MaxDuration'
+    name: org.apache.camel.MaxDuration
+    help: Maximum Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>MeanDuration'
+    name: org.apache.camel.MeanDuration
+    help: Mean Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>MinDuration'
+    name: org.apache.camel.MinDuration
+    help: Minimum Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>TotalDuration'
+    name: org.apache.camel.TotalDuration
+    help: Total Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>ThreadsBlocked'
+    name: org.apache.camel.ThreadsBlocked
+    help: Threads Blocked
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>ThreadsInterrupted'
+    name: org.apache.camel.ThreadsInterrupted
+    help: Threads Interrupted
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumLogicalRuntimeFaults'
+    name: org.apache.cxf.NumLogicalRuntimeFaults
+    help: Number of logical runtime faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumLogicalRuntimeFaults'
+    name: org.apache.cxf.NumLogicalRuntimeFaults
+    help: Number of logical runtime faults
+    type: GAUGE
+    labels:
+       bus.id: $1
+       type: $2
+       service: $3
+       port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>AvgResponseTime'
+    name: org.apache.cxf.AvgResponseTime
+    help: Average Response Time
+    type: GAUGE
+    labels:
+       bus.id: $1
+       type: $2
+       service: $3
+       port: $4
+       operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>AvgResponseTime'
+    name: org.apache.cxf.AvgResponseTime
+    help: Average Response Time
+    type: GAUGE
+    labels:
+          bus.id: $1
+          type: $2
+          service: $3
+          port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumInvocations'
+    name: org.apache.cxf.NumInvocations
+    help: Number of invocations
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumInvocations'
+    name: org.apache.cxf.NumInvocations
+    help: Number of invocations
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>MaxResponseTime'
+    name: org.apache.cxf.MaxResponseTime
+    help: Maximum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>MaxResponseTime'
+    name: org.apache.cxf.MaxResponseTime
+    help: Maximum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>MinResponseTime'
+    name: org.apache.cxf.MinResponseTime
+    help: Minimum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>MinResponseTime'
+    name: org.apache.cxf.MinResponseTime
+    help: Minimum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>TotalHandlingTime'
+    name: org.apache.cxf.TotalHandlingTime
+    help: Total Handling Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>TotalHandlingTime'
+    name: org.apache.cxf.TotalHandlingTime
+    help: Total Handling Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumRuntimeFaults'
+    name: org.apache.cxf.NumRuntimeFaults
+    help: Number of runtime faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumRuntimeFaults'
+    name: org.apache.cxf.NumRuntimeFaults
+    help: Number of runtime faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumUnCheckedApplicationFaults'
+    name: org.apache.cxf.NumUnCheckedApplicationFaults
+    help: Number of unchecked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumUnCheckedApplicationFaults'
+    name: org.apache.cxf.NumUnCheckedApplicationFaults
+    help: Number of unchecked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumCheckedApplicationFaults'
+    name: org.apache.cxf.NumCheckedApplicationFaults
+    help: Number of checked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumCheckedApplicationFaults'
+    name: org.apache.cxf.NumCheckedApplicationFaults
+    help: Number of checked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
diff --git a/images/jboss/openjdk7/jre/prometheus-opts b/images/jboss/openjdk7/jre/prometheus-opts
new file mode 100644
index 0000000..3c43968
--- /dev/null
+++ b/images/jboss/openjdk7/jre/prometheus-opts
@@ -0,0 +1,23 @@
+#!/bin/sh
+# Scripted for getting Prometheus options
+# meant to be evaluated (not to be sourced)
+
+# Exit if switched off
+if [ -n "${AB_PROMETHEUS_OFF:-}" ] && [ "${AB_PROMETHEUS_OFF}" != "false" ]; then
+  exit 0
+fi
+
+# Global switch, turning of all agents
+if [ -n "${AB_OFF:-}" ] && [ "${AB_OFF}" != "false" ]; then
+  exit 0
+fi
+
+port=${AB_PROMETHEUS_PORT:-9779}
+config=${AB_PROMETHEUS_CONFIG:-/opt/prometheus/prometheus-config.yml}
+if [ -n "${AB_PROMETHEUS_HOST:-}" ]; then
+  hostPort="${AB_PROMETHEUS_HOST}:$port"
+else
+  hostPort="$port"
+fi
+
+echo "-javaagent:/opt/prometheus/jmx_prometheus_javaagent.jar=${hostPort}:$config"
diff --git a/images/jboss/openjdk7/jre/run-java-options b/images/jboss/openjdk7/jre/run-java-options
new file mode 100644
index 0000000..759dee7
--- /dev/null
+++ b/images/jboss/openjdk7/jre/run-java-options
@@ -0,0 +1,4 @@
+#!/bin/bash
+# Delegate to the individual agent options scripts which will
+# examine the environment for features to be enabled
+echo "$(/opt/jolokia/jolokia-opts) $(/opt/prometheus/prometheus-opts)"
diff --git a/images/jboss/openjdk7/jre/run-java.sh b/images/jboss/openjdk7/jre/run-java.sh
new file mode 100644
index 0000000..1ebd872
--- /dev/null
+++ b/images/jboss/openjdk7/jre/run-java.sh
@@ -0,0 +1,625 @@
+#!/bin/sh
+# ===================================================================================
+# Generic startup script for running arbitrary Java applications with
+# being optimized for running in containers
+#
+# Usage:
+#    # Execute a Java app:
+#    ./run-java.sh <args given to Java code>
+#
+#    # Get options which can be used for invoking Java apps like Maven or Tomcat
+#    ./run-java.sh options [....]
+#
+#
+# This script will pick up either a 'fat' jar which can be run with "-jar"
+# or you can sepcify a JAVA_MAIN_CLASS.
+#
+# Source and Documentation can be found
+# at https://github.com/fabric8io-images/run-java-sh
+#
+# Env-variables evaluated in this script:
+#
+# JAVA_OPTIONS: Checked for already set options
+# JAVA_MAX_MEM_RATIO: Ratio use to calculate a default maximum Memory, in percent.
+#                     E.g. the "50" value implies that 50% of the Memory
+#                     given to the container is used as the maximum heap memory with
+#                     '-Xmx'.
+#                     It defaults to "25" when the maximum amount of memory available
+#                     to the container is below 300M, otherwise defaults to "50".
+#                     It is a heuristic and should be better backed up with real
+#                     experiments and measurements.
+#                     For a good overviews what tuning options are available -->
+#                             https://youtu.be/Vt4G-pHXfs4
+#                             https://www.youtube.com/watch?v=w1rZOY5gbvk
+#                             https://vimeo.com/album/4133413/video/181900266
+# Also note that heap is only a small portion of the memory used by a JVM. There are lot
+# of other memory areas (metadata, thread, code cache, ...) which addes to the overall
+# size. When your container gets killed because of an OOM, then you should tune
+# the absolute values.
+# JAVA_INIT_MEM_RATIO: Ratio use to calculate a default intial heap memory, in percent.
+#                      By default this value is not set.
+#
+# The following variables are exposed to your Java application:
+#
+# CONTAINER_MAX_MEMORY: Max memory for the container (if running within a container)
+# MAX_CORE_LIMIT: Number of cores available for the container (if running within a container)
+
+
+# ==========================================================
+
+# Fail on a single failed command in a pipeline (if supported)
+(set -o | grep -q pipefail) && set -o pipefail
+
+# Fail on error and undefined vars
+set -eu
+
+# Save global script args
+ARGS="$@"
+
+# ksh is different for defining local vars
+if [ -n "${KSH_VERSION:-}" ]; then
+  alias local=typeset
+fi
+
+# Error is indicated with a prefix in the return value
+check_error() {
+  local error_msg="$1"
+  if echo "${error_msg}" | grep -q "^ERROR:"; then
+    echo "${error_msg}"
+    exit 1
+  fi
+}
+
+# The full qualified directory where this script is located in
+script_dir() {
+  # Default is current directory
+  local dir=$(dirname "$0")
+  local full_dir=$(cd "${dir}" && pwd)
+  echo ${full_dir}
+}
+
+# Try hard to find a sane default jar-file
+auto_detect_jar_file() {
+  local dir="$1"
+
+  # Filter out temporary jars from the shade plugin which start with 'original-'
+  local old_dir="$(pwd)"
+  cd ${dir}
+  if [ $? = 0 ]; then
+    # NB: Find both (single) JAR *or* WAR <https://github.com/fabric8io-images/run-java-sh/issues/79>
+    local nr_jars="$(ls 2>/dev/null | grep -e '.*\.jar$' -e '.*\.war$' | grep -v '^original-' | wc -l | awk '{print $1}')"
+    if [ "${nr_jars}" = 1 ]; then
+      ls 2>/dev/null | grep -e '.*\.jar$' -e '.*\.war$' | grep -v '^original-'
+      exit 0
+    fi
+    cd "${old_dir}"
+    echo "ERROR: Neither JAVA_MAIN_CLASS nor JAVA_APP_JAR is set and ${nr_jars} found in ${dir} (1 expected)"
+  else
+    echo "ERROR: No directory ${dir} found for auto detection"
+  fi
+}
+
+# Check directories (arg 2...n) for a jar file (arg 1)
+find_jar_file() {
+  local jar="$1"
+  shift;
+
+  # Absolute path check if jar specifies an absolute path
+  if [ "${jar}" != ${jar#/} ]; then
+    if [ -f "${jar}" ]; then
+      echo "${jar}"
+    else
+      echo "ERROR: No such file ${jar}"
+    fi
+  else
+    for dir in $*; do
+      if [ -f "${dir}/$jar" ]; then
+        echo "${dir}/$jar"
+        return
+      fi
+    done
+    echo "ERROR: No ${jar} found in $*"
+  fi
+}
+
+# Generic formula evaluation based on awk
+calc() {
+  local formula="$1"
+  shift
+  echo "$@" | awk '
+    function ceil(x) {
+      return x % 1 ? int(x) + 1 : x
+    }
+    function log2(x) {
+      return log(x)/log(2)
+    }
+    function max2(x, y) {
+      return x > y ? x : y
+    }
+    function round(x) {
+      return int(x + 0.5)
+    }
+    {print '"int(${formula})"'}
+  '
+}
+
+# Based on the cgroup limits, figure out the max number of core we should utilize
+core_limit() {
+  local cpu_period_file="/sys/fs/cgroup/cpu/cpu.cfs_period_us"
+  local cpu_quota_file="/sys/fs/cgroup/cpu/cpu.cfs_quota_us"
+  if [ -r "${cpu_period_file}" ]; then
+    local cpu_period="$(cat ${cpu_period_file})"
+
+    if [ -r "${cpu_quota_file}" ]; then
+      local cpu_quota="$(cat ${cpu_quota_file})"
+      # cfs_quota_us == -1 --> no restrictions
+      if [ ${cpu_quota:-0} -ne -1 ]; then
+        echo $(calc 'ceil($1/$2)' "${cpu_quota}" "${cpu_period}")
+      fi
+    fi
+  fi
+}
+
+max_memory() {
+  # High number which is the max limit until which memory is supposed to be
+  # unbounded.
+  local mem_file="/sys/fs/cgroup/memory/memory.limit_in_bytes"
+  if [ -r "${mem_file}" ]; then
+    local max_mem_cgroup="$(cat ${mem_file})"
+    local max_mem_meminfo_kb="$(cat /proc/meminfo | awk '/MemTotal/ {print $2}')"
+    local max_mem_meminfo="$(expr $max_mem_meminfo_kb \* 1024)"
+    if [ ${max_mem_cgroup:-0} != -1 ] && [ ${max_mem_cgroup:-0} -lt ${max_mem_meminfo:-0} ]
+    then
+      echo "${max_mem_cgroup}"
+    fi
+  fi
+}
+
+init_limit_env_vars() {
+  # Read in container limits and export the as environment variables
+  local core_limit="$(core_limit)"
+  if [ -n "${core_limit}" ]; then
+    export CONTAINER_CORE_LIMIT="${core_limit}"
+  fi
+
+  local mem_limit="$(max_memory)"
+  if [ -n "${mem_limit}" ]; then
+    export CONTAINER_MAX_MEMORY="${mem_limit}"
+  fi
+}
+
+load_env() {
+  local script_dir="$1"
+
+  # Configuration stuff is read from this file
+  local run_env_sh="run-env.sh"
+
+  # Load default default config
+  if [ -f "${script_dir}/${run_env_sh}" ]; then
+    . "${script_dir}/${run_env_sh}"
+  fi
+
+  # Check also $JAVA_APP_DIR. Overrides other defaults
+  # It's valid to set the app dir in the default script
+  JAVA_APP_DIR="${JAVA_APP_DIR:-${script_dir}}"
+  if [ -f "${JAVA_APP_DIR}/${run_env_sh}" ]; then
+    . "${JAVA_APP_DIR}/${run_env_sh}"
+  fi
+  export JAVA_APP_DIR
+
+  # JAVA_LIB_DIR defaults to JAVA_APP_DIR
+  export JAVA_LIB_DIR="${JAVA_LIB_DIR:-${JAVA_APP_DIR}}"
+  if [ -z "${JAVA_MAIN_CLASS:-}" ] && [ -z "${JAVA_APP_JAR:-}" ]; then
+    JAVA_APP_JAR="$(auto_detect_jar_file ${JAVA_APP_DIR})"
+    check_error "${JAVA_APP_JAR}"
+  fi
+
+  if [ -n "${JAVA_APP_JAR:-}" ]; then
+    local jar="$(find_jar_file ${JAVA_APP_JAR} ${JAVA_APP_DIR} ${JAVA_LIB_DIR})"
+    check_error "${jar}"
+    export JAVA_APP_JAR="${jar}"
+  else
+    export JAVA_MAIN_CLASS
+  fi
+}
+
+# Check for standard /opt/run-java-options first, fallback to run-java-options in the path if not existing
+run_java_options() {
+  if [ -f "/opt/run-java-options" ]; then
+    echo "$(. /opt/run-java-options)"
+  else
+    which run-java-options >/dev/null 2>&1
+    if [ $? = 0 ]; then
+      echo "$(run-java-options)"
+    fi
+  fi
+}
+
+debug_options() {
+  if [ -n "${JAVA_ENABLE_DEBUG:-}" ] || [ -n "${JAVA_DEBUG_ENABLE:-}" ] ||  [ -n "${JAVA_DEBUG:-}" ]; then
+    local debug_port="${JAVA_DEBUG_PORT:-5005}"
+    local suspend_mode="n"
+    if [ -n "${JAVA_DEBUG_SUSPEND:-}" ]; then
+      if ! echo "${JAVA_DEBUG_SUSPEND}" | grep -q -e '^\(false\|n\|no\|0\)$'; then
+        suspend_mode="y"
+      fi
+    fi
+    echo "-agentlib:jdwp=transport=dt_socket,server=y,suspend=${suspend_mode},address=${debug_port}"
+  fi
+}
+
+# Read in a classpath either from a file with a single line, colon separated
+# or given line-by-line in separate lines
+# Arg 1: path to claspath (must exist), optional arg2: application jar, which is stripped from the classpath in
+# multi line arrangements
+format_classpath() {
+  local cp_file="$1"
+  local app_jar="${2:-}"
+
+  local wc_out="$(wc -l $1 2>&1)"
+  if [ $? -ne 0 ]; then
+    echo "Cannot read lines in ${cp_file}: $wc_out"
+    exit 1
+  fi
+
+  local nr_lines=$(echo $wc_out | awk '{ print $1 }')
+  if [ ${nr_lines} -gt 1 ]; then
+    local sep=""
+    local classpath=""
+    while read file; do
+      local full_path="${JAVA_LIB_DIR}/${file}"
+      # Don't include app jar if include in list
+      if [ "${app_jar}" != "${full_path}" ]; then
+        classpath="${classpath}${sep}${full_path}"
+      fi
+      sep=":"
+    done < "${cp_file}"
+    echo "${classpath}"
+  else
+    # Supposed to be a single line, colon separated classpath file
+    cat "${cp_file}"
+  fi
+}
+
+# ==========================================================================
+
+memory_options() {
+  echo "$(calc_init_memory) $(calc_max_memory)"
+  return
+}
+
+# Check for memory options and set max heap size if needed
+calc_max_memory() {
+  # Check whether -Xmx is already given in JAVA_OPTIONS
+  if echo "${JAVA_OPTIONS:-}" | grep -q -- "-Xmx"; then
+    return
+  fi
+
+  if [ -z "${CONTAINER_MAX_MEMORY:-}" ]; then
+    return
+  fi
+
+  # Check for the 'real memory size' and calculate Xmx from the ratio
+  if [ -n "${JAVA_MAX_MEM_RATIO:-}" ]; then
+    if [ "${JAVA_MAX_MEM_RATIO}" -eq 0 ]; then
+      # Explicitely switched off
+      return
+    fi
+    calc_mem_opt "${CONTAINER_MAX_MEMORY}" "${JAVA_MAX_MEM_RATIO}" "mx"
+  # When JAVA_MAX_MEM_RATIO not set and JVM >= 10 no max_memory
+  elif [ "${JAVA_MAJOR_VERSION:-0}" -ge "10" ]; then
+    return
+  elif [ "${CONTAINER_MAX_MEMORY}" -le 314572800 ]; then
+    # Restore the one-fourth default heap size instead of the one-half below 300MB threshold
+    # See https://docs.oracle.com/javase/8/docs/technotes/guides/vm/gctuning/parallel.html#default_heap_size
+    calc_mem_opt "${CONTAINER_MAX_MEMORY}" "25" "mx"
+  else
+    calc_mem_opt "${CONTAINER_MAX_MEMORY}" "50" "mx"
+  fi
+}
+
+# Check for memory options and set initial heap size if requested
+calc_init_memory() {
+  # Check whether -Xms is already given in JAVA_OPTIONS.
+  if echo "${JAVA_OPTIONS:-}" | grep -q -- "-Xms"; then
+    return
+  fi
+
+  # Check if value set
+  if [ -z "${JAVA_INIT_MEM_RATIO:-}" ] || [ -z "${CONTAINER_MAX_MEMORY:-}" ] || [ "${JAVA_INIT_MEM_RATIO}" -eq 0 ]; then
+    return
+  fi
+
+  # Calculate Xms from the ratio given
+  calc_mem_opt "${CONTAINER_MAX_MEMORY}" "${JAVA_INIT_MEM_RATIO}" "ms"
+}
+
+calc_mem_opt() {
+  local max_mem="$1"
+  local fraction="$2"
+  local mem_opt="$3"
+
+  local val=$(calc 'round($1*$2/100/1048576)' "${max_mem}" "${fraction}")
+  echo "-X${mem_opt}${val}m"
+}
+
+c2_disabled() {
+  if [ -n "${CONTAINER_MAX_MEMORY:-}" ]; then
+    # Disable C2 compiler when container memory <=300MB
+    if [ "${CONTAINER_MAX_MEMORY}" -le 314572800 ]; then
+      echo true
+      return
+    fi
+  fi
+  echo false
+}
+
+jit_options() {
+  if [ "${JAVA_MAJOR_VERSION:-0}" -ge "10" ]; then
+    return
+  fi
+  # Check whether -XX:TieredStopAtLevel is already given in JAVA_OPTIONS
+  if echo "${JAVA_OPTIONS:-}" | grep -q -- "-XX:TieredStopAtLevel"; then
+    return
+  fi
+  if [ $(c2_disabled) = true ]; then
+    echo "-XX:TieredStopAtLevel=1"
+  fi
+}
+
+# Switch on diagnostics except when switched off
+diagnostics_options() {
+  if [ -n "${JAVA_DIAGNOSTICS:-}" ]; then
+    if [ "${JAVA_MAJOR_VERSION:-0}" -ge "11" ]; then
+      echo "-XX:NativeMemoryTracking=summary -Xlog:gc*:stdout:time -XX:+UnlockDiagnosticVMOptions"
+    else
+      echo "-XX:NativeMemoryTracking=summary -XX:+PrintGC -XX:+PrintGCDateStamps -XX:+PrintGCTimeStamps -XX:+UnlockDiagnosticVMOptions"
+    fi
+  fi
+}
+
+# Replicate thread ergonomics for tiered compilation.
+# This could ideally be skipped when tiered compilation is disabled.
+# The algorithm is taken from:
+# OpenJDK / jdk8u / jdk8u / hotspot
+# src/share/vm/runtime/advancedThresholdPolicy.cpp
+ci_compiler_count() {
+  local core_limit="$1"
+  local log_cpu=$(calc 'log2($1)' "$core_limit")
+  local loglog_cpu=$(calc 'log2(max2($1,1))' "$log_cpu")
+  local count=$(calc 'max2($1*$2,1)*3/2' "$log_cpu" "$loglog_cpu")
+  local c1_count=$(calc 'max2($1/3,1)' "$count")
+  local c2_count=$(calc 'max2($1-$2,1)' "$count" "$c1_count")
+  [ $(c2_disabled) = true ] && echo "$c1_count" || echo $(calc '$1+$2' "$c1_count" "$c2_count")
+}
+
+cpu_options() {
+  # JVMs >= 10 know about CPU limits
+  if [ "${JAVA_MAJOR_VERSION:-0}" -ge "10" ]; then
+    return
+  fi
+
+  local core_limit="${JAVA_CORE_LIMIT:-}"
+  if [ "$core_limit" = "0" ]; then
+    return
+  fi
+
+  if [ -n "${CONTAINER_CORE_LIMIT:-}" ]; then
+    if [ -z ${core_limit} ]; then
+      core_limit="${CONTAINER_CORE_LIMIT}"
+    fi
+    echo "-XX:ParallelGCThreads=${core_limit} " \
+         "-XX:ConcGCThreads=${core_limit} " \
+         "-Djava.util.concurrent.ForkJoinPool.common.parallelism=${core_limit} " \
+         "-XX:CICompilerCount=$(ci_compiler_count $core_limit)"
+  fi
+}
+
+#-XX:MinHeapFreeRatio=20  These parameters tell the heap to shrink aggressively and to grow conservatively.
+#-XX:MaxHeapFreeRatio=40  Thereby optimizing the amount of memory available to the operating system.
+heap_ratio() {
+  echo "-XX:MinHeapFreeRatio=20 -XX:MaxHeapFreeRatio=40"
+}
+
+# These parameters are necessary when running parallel GC if you want to use the Min and Max Heap Free ratios.
+# Skip setting gc_options if any other GC is set in JAVA_OPTIONS.
+# -XX:GCTimeRatio=4
+# -XX:AdaptiveSizePolicyWeight=90
+gc_options() {
+  if echo "${JAVA_OPTIONS:-}" | grep -q -- "-XX:.*Use.*GC"; then
+    return
+  fi
+
+  local opts=""
+  # for JVMs < 10 set GC settings
+  if [ -z "${JAVA_MAJOR_VERSION:-}" ] || [ "${JAVA_MAJOR_VERSION:-0}" -lt "10" ]; then
+    opts="${opts} -XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 $(heap_ratio)"
+  fi
+  if [ -z "${JAVA_MAJOR_VERSION:-}" ] || [ "${JAVA_MAJOR_VERSION:-}" != "7" ]; then
+    opts="${opts} -XX:+ExitOnOutOfMemoryError"
+  fi
+  echo $opts
+}
+
+java_default_options() {
+  # Echo options, trimming trailing and multiple spaces
+  echo "$(memory_options) $(jit_options) $(diagnostics_options) $(cpu_options) $(gc_options)" | awk '$1=$1'
+
+}
+
+# ==============================================================================
+
+# parse the URL
+parse_url() {
+  #[scheme://][user[:password]@]host[:port][/path][?params]
+  echo "$1" | sed -e "s+^\(\([^:]*\)://\)\?\(\([^:@]*\)\(:\([^@]*\)\)\?@\)\?\([^:/?]*\)\(:\([^/?]*\)\)\?.*$+ local scheme='\2' username='\4' password='\6' hostname='\7' port='\9'+"
+}
+
+java_proxy_options() {
+  local url="$1"
+  local transport="$2"
+  local ret=""
+
+  if [ -n "$url" ] ; then
+    eval $(parse_url "$url")
+    if [ -n "$hostname" ] ; then
+      ret="-D${transport}.proxyHost=${hostname}"
+    fi
+    if [ -n "$port" ] ; then
+      ret="$ret -D${transport}.proxyPort=${port}"
+    fi
+    if [ -n "$username" -o -n "$password" ] ; then
+      echo "WARNING: Proxy URL for ${transport} contains authentication credentials, these are not supported by java" >&2
+    fi
+  fi
+  echo "$ret"
+}
+
+# Check for proxy options and echo if enabled.
+proxy_options() {
+  local ret=""
+  ret="$(java_proxy_options "${https_proxy:-${HTTPS_PROXY:-}}" https)"
+  ret="$ret $(java_proxy_options "${http_proxy:-${HTTP_PROXY:-}}" http)"
+
+  local noProxy="${no_proxy:-${NO_PROXY:-}}"
+  if [ -n "$noProxy" ] ; then
+    ret="$ret -Dhttp.nonProxyHosts=$(echo "|$noProxy" | sed -e 's/,[[:space:]]*/|/g' | sed -e 's/[[:space:]]//g' | sed -e 's/|\./|\*\./g' | cut -c 2-)"
+  fi
+  echo "$ret"
+}
+
+# ==============================================================================
+
+# Set process name if possible
+exec_args() {
+  EXEC_ARGS=""
+  if [ -n "${JAVA_APP_NAME:-}" ]; then
+    # Not all shells support the 'exec -a newname' syntax..
+    if $(exec -a test true 2>/dev/null); then
+      echo "-a '${JAVA_APP_NAME}'"
+    fi
+  fi
+}
+
+# Combine all java options
+java_options() {
+  # Normalize spaces with awk (i.e. trim and elimate double spaces)
+  # See e.g. https://www.physicsforums.com/threads/awk-1-1-1-file-txt.658865/ for an explanation
+  # of this awk idiom
+  echo "${JAVA_OPTIONS:-} $(run_java_options) $(debug_options) $(proxy_options) $(java_default_options)" | awk '$1=$1'
+}
+
+# Fetch classpath from env or from a local "run-classpath" file
+classpath() {
+  local cp_path="."
+  if [ "${JAVA_LIB_DIR}" != "${JAVA_APP_DIR}" ]; then
+    cp_path="${cp_path}:${JAVA_LIB_DIR}"
+  fi
+  if [ -z "${JAVA_CLASSPATH:-}" ] && [ -n "${JAVA_MAIN_CLASS:-}" ]; then
+    if [ -n "${JAVA_APP_JAR:-}" ]; then
+      cp_path="${cp_path}:${JAVA_APP_JAR}"
+    fi
+    if [ -f "${JAVA_LIB_DIR}/classpath" ]; then
+      # Classpath is pre-created and stored in a 'run-classpath' file
+      cp_path="${cp_path}:$(format_classpath ${JAVA_LIB_DIR}/classpath ${JAVA_APP_JAR:-})"
+    else
+      # No order implied
+      cp_path="${cp_path}:${JAVA_APP_DIR}/*"
+    fi
+  elif [ -n "${JAVA_CLASSPATH:-}" ]; then
+    # Given from the outside
+    cp_path="${JAVA_CLASSPATH}"
+  fi
+  echo "${cp_path}"
+}
+
+# Checks if a flag is present in the arguments.
+hasflag() {
+    local filters="$@"
+    for var in $ARGS; do
+        for filter in $filters; do
+          if [ "$var" = "$filter" ]; then
+              echo 'true'
+              return
+          fi
+        done
+    done
+}
+
+# ==============================================================================
+
+options() {
+    if [ -z ${1:-} ]; then
+      java_options
+      return
+    fi
+
+    local ret=""
+    if [ $(hasflag --debug) ]; then
+      ret="$ret $(debug_options)"
+    fi
+    if [ $(hasflag --proxy) ]; then
+      ret="$ret $(proxy_options)"
+    fi
+    if [ $(hasflag --java-default) ]; then
+      ret="$ret $(java_default_options)"
+    fi
+    if [ $(hasflag --memory) ]; then
+      ret="$ret $(memory_options)"
+    fi
+    if [ $(hasflag --jit) ]; then
+      ret="$ret $(jit_options)"
+    fi
+    if [ $(hasflag --diagnostics) ]; then
+      ret="$ret $(diagnostics_options)"
+    fi
+    if [ $(hasflag --cpu) ]; then
+      ret="$ret $(cpu_options)"
+    fi
+    if [ $(hasflag --gc) ]; then
+      ret="$ret $(gc_options)"
+    fi
+
+    echo $ret | awk '$1=$1'
+}
+
+# Start JVM
+run() {
+  # Initialize environment
+  load_env $(script_dir)
+
+  local args
+  cd ${JAVA_APP_DIR}
+  if [ -n "${JAVA_MAIN_CLASS:-}" ] ; then
+     args="${JAVA_MAIN_CLASS}"
+  elif [ -n "${JAVA_APP_JAR:-}" ]; then
+     args="-jar ${JAVA_APP_JAR}"
+  else
+     echo "Either JAVA_MAIN_CLASS or JAVA_APP_JAR needs to be given"
+     exit 1
+  fi
+  # Don't put ${args} in quotes, otherwise it would be interpreted as a single arg.
+  # However it could be two args (see above). zsh doesn't like this btw, but zsh is not
+  # supported anyway.
+  echo exec $(exec_args) java $(java_options) -cp "$(classpath)" ${args} "$@"
+  exec $(exec_args) java $(java_options) -cp "$(classpath)" ${args} "$@"
+}
+
+# =============================================================================
+# Fire up
+
+# Set env vars reflecting limits
+init_limit_env_vars
+
+first_arg=${1:-}
+if [ "${first_arg}" = "options" ]; then
+  # Print out options only
+  shift
+  options $@
+  exit 0
+elif [ "${first_arg}" = "run" ]; then
+  # Run is the default command, but can be given to allow "options"
+  # as first argument to your
+  shift
+fi
+run "$@"
diff --git a/images/jboss/openjdk8/jdk/Dockerfile b/images/jboss/openjdk8/jdk/Dockerfile
index 0ea8bee..430b6c0 100644
--- a/images/jboss/openjdk8/jdk/Dockerfile
+++ b/images/jboss/openjdk8/jdk/Dockerfile
@@ -9,20 +9,39 @@ ENV JAVA_APP_DIR=/deployments \
     JAVA_MAJOR_VERSION=8
 
 
-# Agent bond including Jolokia and jmx_exporter
-ADD agent-bond-opts /opt/run-java-options
-RUN mkdir -p /opt/agent-bond \
- && curl http://central.maven.org/maven2/io/fabric8/agent-bond-agent/1.2.0/agent-bond-agent-1.2.0.jar \
-          -o /opt/agent-bond/agent-bond.jar \
- && chmod 444 /opt/agent-bond/agent-bond.jar \
- && chmod 755 /opt/run-java-options
-ADD jmx_exporter_config.yml /opt/agent-bond/
-EXPOSE 8778 9779
+# Prometheus JMX exporter agent
+RUN mkdir -p /opt/prometheus/etc \
+ && curl http://central.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/undefined/jmx_prometheus_javaagent-undefined.jar \
+          -o /opt/prometheus/jmx_prometheus_javaagent.jar
+ADD prometheus-opts /opt/prometheus/prometheus-opts
+ADD prometheus-config.yml /opt/prometheus/prometheus-config.yml
+RUN chmod 444 /opt/prometheus/jmx_prometheus_javaagent.jar \
+ && chmod 444 /opt/prometheus/prometheus-config.yml \
+ && chmod 755 /opt/prometheus/prometheus-opts \
+ && chmod 775 /opt/prometheus/etc \
+ && chgrp root /opt/prometheus/etc
+
+EXPOSE 9779
+
+
+# Jolokia agent
+RUN mkdir -p /opt/jolokia/etc \
+ && curl http://central.maven.org/maven2/org/jolokia/jolokia-jvm/1.6.2/jolokia-jvm-1.6.2-agent.jar \
+         -o /opt/jolokia/jolokia.jar
+ADD jolokia-opts /opt/jolokia/jolokia-opts
+RUN chmod 444 /opt/jolokia/jolokia.jar \
+ && chmod 755 /opt/jolokia/jolokia-opts \
+ && chmod 775 /opt/jolokia/etc \
+ && chgrp root /opt/jolokia/etc
+
+EXPOSE 8778
+
 
 # Add run script as /deployments/run-java.sh and make it executable
 COPY run-java.sh /deployments/
 RUN chmod 755 /deployments/run-java.sh
 
+COPY run-java-options /opt
 
 
 # Run under user "jboss" and prepare for be running
diff --git a/images/jboss/openjdk8/jdk/README.md b/images/jboss/openjdk8/jdk/README.md
index 0c69e81..883ef0d 100644
--- a/images/jboss/openjdk8/jdk/README.md
+++ b/images/jboss/openjdk8/jdk/README.md
@@ -1,75 +1,12 @@
 ## Fabric8 Java Base Image OpenJDK 8 (JDK)
 
-> ** This image is deprecated and not maintained anymore. Please select one of the other flavors (alpine, centos).**
-
------
-
-
 This image is based on JBoss with OpenJDK and provides OpenJDK 8 (JDK)
 
 It includes:
 
-
-* An [Agent Bond](https://github.com/fabric8io/agent-bond) agent with [Jolokia](http://www.jolokia.org) and Prometheus' [jmx_exporter](https://github.com/prometheus/jmx_exporter). The agent is installed as `/opt/agent-bond/agent-bond.jar`. See below for configuration options.
-
-
 * A startup script [`/deployments/run-java.sh`](#startup-script-run-javash) for starting up Java applications.
-
-### Agent Bond
-
-In order to enable Jolokia for your application you should use this image as a base image (via `FROM`) and use the output of `agent-bond-opts` in your startup scripts to include it in for the Java startup options.
-
-For example, the following snippet can be added to a script starting up your Java application
-
-    # ...
-    export JAVA_OPTIONS="$JAVA_OPTIONS $(agent-bond-opts)"
-    # .... use JAVA_OPTIONS when starting your app, e.g. as Tomcat does
-
-The following versions and defaults are used:
-
-* [Jolokia](http://www.jolokia.org) : version **1.6.2** and port **8778**
-* [jmx_exporter](https://github.com/prometheus/jmx_exporter): version **0.3.1** and port **9779**
-
-You can influence the behaviour of `agent-bond-opts` by setting various environment variables:
-
-### Agent-Bond Options
-
-Agent bond itself can be influenced with the following environment variables: 
-
-* **AB_OFF** : If set disables activation of agent-bond (i.e. echos an empty value). By default, agent-bond is enabled.
-* **AB_ENABLED** : Comma separated list of sub-agents enabled. Currently allowed values are `jolokia` and `jmx_exporter`. 
-  By default both are enabled.
-
-
-#### Jolokia configuration
-
-* **AB_JOLOKIA_CONFIG** : If set uses this file (including path) as Jolokia JVM agent properties (as described 
-  in Jolokia's [reference manual](http://www.jolokia.org/reference/html/agents.html#agents-jvm)).
-  By default this is `/opt/jolokia/jolokia.properties`.
-* **AB_JOLOKIA_HOST** : Host address to bind to (Default: `0.0.0.0`)
-* **AB_JOLOKIA_PORT** : Port to use (Default: `8778`)
-* **AB_JOLOKIA_USER** : User for authentication. By default authentication is switched off.
-* **AB_JOLOKIA_HTTPS** : Switch on secure communication with https. By default self signed server certificates are generated
-  if no `serverCert` configuration is given in `AB_JOLOKIA_OPTS`
-* **AB_JOLOKIA_PASSWORD** : Password for authentication. By default authentication is switched off.
-* **AB_JOLOKIA_ID** : Agent ID to use (`$HOSTNAME` by default, which is the container id)
-* **AB_JOLOKIA_OPTS**  : Additional options to be appended to the agent opts. They should be given in the format 
-  "key=value,key=value,..."
-
-Some options for integration in various environments:
-
-* **AB_JOLOKIA_AUTH_OPENSHIFT** : Switch on client authentication for OpenShift TLS communication. The value of this 
-  parameter can be a relative distinguished name which must be contained in a presented client certificate. Enabling this
-  parameter will automatically switch Jolokia into https communication mode. The default CA cert is set to 
-  `/var/run/secrets/kubernetes.io/serviceaccount/ca.crt` 
-  
-#### jmx_exporter configuration
-
-* **AB_JMX_EXPORTER_OPTS** : Configuration to use for `jmx_exporter` (in the format `<port>:<path to config>`)
-* **AB_JMX_EXPORTER_PORT** : Port to use for the JMX Exporter. Default: `9779`
-* **AB_JMX_EXPORTER_CONFIG** : Path to configuration to use for `jmx_exporter`: Default: `/opt/agent-bond/jmx_exporter_config.json`
-
-
+* [Jolokia](http://www.jolokia.org) agent installed in `/opt/jolokia`
+* Prometheus [jmx_exporter](https://github.com/prometheus/jmx_exporter) agent installed in `/opt/jmx_exporter`.
 
 ### Startup Script run-java.sh
 
@@ -180,8 +117,55 @@ mvn clean install
 ```
 
 
+### Monitoring Agents
+
+In order to enable Jolokia and Prometheus exporter for your application you should use this image as a base image (via `FROM`) and use the output of `jolokia-opts` and `prometheus-opts` in your startup scripts to include it in for the Java startup options. You can also just use the provided startup script `/opt/run-java.sh` which does this automatically.
+
+For example, the following snippet can be added to a script starting up your Java application
+
+    # ...
+    export JAVA_OPTIONS="$JAVA_OPTIONS $(/opt/jolokia/jolokia-opts) $(/opt/prometheus/prometheus-opts)"
+    # .... use JAVA_OPTIONS when starting your app, e.g. as Tomcat does
+
+The following versions and defaults are used:
+
+* [Jolokia](http://www.jolokia.org) : version **1.6.2** and port **8778**
+* [jmx_exporter](https://github.com/prometheus/jmx_exporter): version **0.3.1** and port **9779**
+
+You can influence the behaviour of these config scripts by setting various environment variables.
+
+#### Jolokia Configuration
+
+* **AB_JOLOKIA_OFF** : If set disables activation of Jolokia (i.e. echos an empty value). By default, Jolokia is enabled.
+* **AB_JOLOKIA_CONFIG** : If set uses this file (including path) as Jolokia JVM agent properties (as described
+  in Jolokia's [reference manual](http://www.jolokia.org/reference/html/agents.html#agents-jvm)). If not set,
+  the `/opt/jolokia/etc/jolokia.properties` will be created using the settings as defined in this document, otherwise
+  the reset of the settings in this document are ignored.
+* **AB_JOLOKIA_HOST** : Host address to bind to (Default: `0.0.0.0`)
+* **AB_JOLOKIA_PORT** : Port to use (Default: `8778`)
+* **AB_JOLOKIA_USER** : User for basic authentication. Defaults to 'jolokia'
+* **AB_JOLOKIA_PASSWORD** : Password for basic authentication. By default authentication is switched off.
+* **AB_JOLOKIA_PASSWORD_RANDOM** : Should a random AB_JOLOKIA_PASSWORD be generated? Generated value will be written to `/opt/jolokia/etc/jolokia.pw`
+* **AB_JOLOKIA_HTTPS** : Switch on secure communication with https. By default self signed server certificates are generated
+  if no `serverCert` configuration is given in `AB_JOLOKIA_OPTS`
+* **AB_JOLOKIA_ID** : Agent ID to use (`$HOSTNAME` by default, which is the container id)
+* **AB_JOLOKIA_DISCOVERY_ENABLED** : Enable Jolokia discovery.  Defaults to false.
+* **AB_JOLOKIA_OPTS**  : Additional options to be appended to the agent configuration. They should be given in the format
+  "key=value,key=value,..."
+
+Some options for integration in various environments:
+
+* **AB_JOLOKIA_AUTH_OPENSHIFT** : Switch on client authentication for OpenShift TSL communication. The value of this
+  parameter can be a relative distinguished name which must be contained in a presented client certificate. Enabling this
+  parameter will automatically switch Jolokia into https communication mode. The default CA cert is set to
+  `/var/run/secrets/kubernetes.io/serviceaccount/ca.crt`
+
+
+undefined
+
 ### Versions:
 
 * Base-Image: **JBoss with OpenJDK undefined**
 * Java: **OpenJDK 8 1.8.0** (Java Development Kit (JDK))
-* Agent-Bond: **1.2.0** (Jolokia 1.6.2, jmx_exporter 0.3.1)
+* Jolokia: **1.6.2**
+* jmx_exporter: **undefined**
diff --git a/images/jboss/openjdk8/jdk/agent-bond-opts b/images/jboss/openjdk8/jdk/agent-bond-opts
deleted file mode 100644
index 280313b..0000000
--- a/images/jboss/openjdk8/jdk/agent-bond-opts
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/bin/sh
-
-# Parse options
-while [ $# -gt 0 ]
-do
-key="$1"
-case ${key} in
-    # Escape for scripts which eval the output of this script
-    -e|--escape)
-    escape_sep=1
-    ;;
-esac
-shift
-done
-
-# Check whether a given config is contained in AB_JOLOKIA_OPTS
-is_in_jolokia_opts() {
-  local prop=$1
-  if [ -n "${AB_JOLOKIA_OPTS:-}" ] && [ "${AB_JOLOKIA_OPTS}" != "${AB_JOLOKIA_OPTS/${prop}/}" ]; then
-     echo "yes"
-  else
-     echo "no"
-  fi
-}
-
-dir=${AB_DIR:-/opt/agent-bond}
-sep="="
-
-# Options separators defined to avoid clash with fish-pepper templating
-ab_open_del="{""{"
-ab_close_del="}""}"
-if [ -n "${escape_sep:-}" ]; then
-  ab_open_del='\{\{'
-  ab_close_del='\}\}'
-fi
-
-if [ -z "${AB_OFF:-}" ]; then
-   opts="-javaagent:$dir/agent-bond.jar"
-   config="${AB_CONFIG:-$dir/agent-bond.properties}"
-   if [ -f "$config" ]; then
-      # Configuration takes precedence
-      opts="${opts}${sep}config=${config}"
-      sep=","
-   fi
-   if [ -z "${AB_ENABLED:-}" ] || [ "${AB_ENABLED}" != "${AB_ENABLED/jolokia/}" ]; then
-     # Direct options only if no configuration is found
-     jsep=""
-     jolokia_opts=""
-     if [ -n "${AB_JOLOKIA_CONFIG:-}" ] && [ -f "${AB_JOLOKIA_CONFIG}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}config=${AB_JOLOKIA_CONFIG}"
-        jsep=","
-        grep -q -e '^host' ${AB_JOLOKIA_CONFIG} && host_in_config=1
-     fi
-     if [ -z "${AB_JOLOKIA_HOST:-}" ] && [ -z "${host_in_config:-}" ]; then
-        AB_JOLOKIA_HOST='0.0.0.0'
-     fi
-     if [ -n "${AB_JOLOKIA_HOST:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}host=${AB_JOLOKIA_HOST}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_PORT:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}port=${AB_JOLOKIA_PORT}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_USER:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}user=${AB_JOLOKIA_USER}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_PASSWORD:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}password=${AB_JOLOKIA_PASSWORD}"
-        jsep=","
-     fi
-     if [ -n "${AB_JOLOKIA_HTTPS:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}protocol=https"
-        https_used=1
-        jsep=","
-     fi
-     # Integration with OpenShift client cert auth
-     if [ -n "${AB_JOLOKIA_AUTH_OPENSHIFT:-}" ]; then
-        auth_opts="useSslClientAuthentication=true,extraClientCheck=true"
-        if [ -z "${https_used+x}" ]; then
-          auth_opts="${auth_opts},protocol=https"
-        fi
-        if [ $(is_in_jolokia_opts "caCert") != "yes" ]; then
-           auth_opts="${auth_opts},caCert=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
-        fi
-        if [ $(is_in_jolokia_opts "clientPrincipal") != "yes" ]; then
-           if [  "${AB_JOLOKIA_AUTH_OPENSHIFT}" != "${AB_JOLOKIA_AUTH_OPENSHIFT/=/}" ]; then
-              # Supposed to contain a principal name to check
-              auth_opts="${auth_opts},clientPrincipal=$(echo ${AB_JOLOKIA_AUTH_OPENSHIFT} | sed -e 's/ /\\\\ /g')"
-           else
-              auth_opts="${auth_opts},clientPrincipal=cn=system:master-proxy"
-           fi
-        fi
-        jolokia_opts="${jolokia_opts}${jsep}${auth_opts}"
-        jsep=","
-     fi
-     # Add extra opts to the end
-     if [ -n "${AB_JOLOKIA_OPTS:-}" ]; then
-        jolokia_opts="${jolokia_opts}${jsep}${AB_JOLOKIA_OPTS}"
-        jsep=","
-     fi
-
-     opts="${opts}${sep}jolokia${ab_open_del}${jolokia_opts}${ab_close_del}"
-     sep=","
-   fi
-   if [ -z "${AB_ENABLED:-}" ] || [ "${AB_ENABLED}" != "${AB_ENABLED/jmx_exporter/}" ]; then
-     je_opts=""
-     jsep=""
-     if [ -n "${AB_JMX_EXPORTER_OPTS:-}" ]; then
-        opts="${opts}${sep}jmx_exporter${ab_open_del}${AB_JMX_EXPORTER_OPTS}${ab_close_del}"
-        sep=","
-     else
-        port=${AB_JMX_EXPORTER_PORT:-9779}
-        config=${AB_JMX_EXPORTER_CONFIG:-/opt/agent-bond/jmx_exporter_config.yml}
-        opts="${opts}${sep}jmx_exporter${ab_open_del}${port}:${config}${ab_close_del}"
-        sep=","
-     fi
-   fi
-   if [ "${sep:-}" != '=' ] ; then
-     echo ${opts}
-   fi
-fi
diff --git a/images/jboss/openjdk8/jdk/jmx_exporter_config.yml b/images/jboss/openjdk8/jdk/jmx_exporter_config.yml
deleted file mode 100644
index 620cd4a..0000000
--- a/images/jboss/openjdk8/jdk/jmx_exporter_config.yml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-lowercaseOutputName: true
-lowercaseOutputLabelNames: true
-whitelistObjectNames:
-  - 'org.apache.camel:*'
-rules:
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>((?:Min|Mean|Max|Last|Delta)(?:ProcessingTime)):'
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>(TotalProcessingTime):'
-    type: COUNTER
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>(ExchangesInflight|LastProcessingTime):'
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>((?:Exchanges(?:Completed|Failed|Total))|FailuresHandled):'
-    type: COUNTER
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
diff --git a/images/jboss/openjdk8/jdk/jolokia-opts b/images/jboss/openjdk8/jdk/jolokia-opts
new file mode 100644
index 0000000..1aa273e
--- /dev/null
+++ b/images/jboss/openjdk8/jdk/jolokia-opts
@@ -0,0 +1,103 @@
+#!/bin/sh
+
+
+# Exit if switched off
+if [ -n "${AB_JOLOKIA_OFF:-}" ] && [ "${AB_JOLOKIA_OFF}" != "false" ]; then
+  exit 0
+fi
+
+# Global switch, turning of all agents
+if [ -n "${AB_OFF:-}" ] && [ "${AB_OFF}" != "false" ]; then
+  exit 0
+fi
+
+# Check whether a given config is contained in AB_JOLOKIA_OPTS
+is_in_jolokia_opts() {
+  local prop=$1
+  if [ -n "${AB_JOLOKIA_OPTS:-}" ] && [ "${AB_JOLOKIA_OPTS}" != "${AB_JOLOKIA_OPTS/${prop}/}" ]; then
+     echo "yes"
+  else
+     echo "no"
+  fi
+}
+
+get_jolokia_properties() {
+
+  echo "host=${AB_JOLOKIA_HOST:-*}"
+  echo "port=${AB_JOLOKIA_PORT:-8778}"
+  echo "discoveryEnabled=${AB_JOLOKIA_DISCOVERY_ENABLED:-false}"
+
+  if [ -n "${AB_JOLOKIA_PASSWORD:-}" ]; then
+     echo "user=${AB_JOLOKIA_USER:-jolokia}"
+     echo "password=${AB_JOLOKIA_PASSWORD}"
+  fi
+  if [ -n "${AB_JOLOKIA_HTTPS:-}" ]; then
+     echo "protocol=https"
+     https_used=1
+  fi
+
+  # Integration with OpenShift client cert auth is enabled
+  # by default if not explicitly turned off by setting to 'false'
+  if [ "${AB_JOLOKIA_AUTH_OPENSHIFT:-}" != "false" ] && [ -f "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt" ]; then
+     echo "useSslClientAuthentication=true"
+     echo "extraClientCheck=true"
+
+     # Check if the 'protocol' property has already been set to 'https'
+     # If not, then defaults to using HTTPS
+     if [ -z ${https_used+x} ]; then
+       echo "protocol=https"
+     fi
+     if [ $(is_in_jolokia_opts "caCert") != "yes" ]; then
+        echo "caCert=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
+     fi
+
+     if [ $(is_in_jolokia_opts "clientPrincipal") != "yes" ]; then
+        if [  "${AB_JOLOKIA_AUTH_OPENSHIFT}" != "${AB_JOLOKIA_AUTH_OPENSHIFT/=/}" ]; then
+           # Supposed to contain a principal name to check
+           echo "clientPrincipal=$(echo ${AB_JOLOKIA_AUTH_OPENSHIFT} | sed -e 's/ /\\\\ /g')"
+        else
+           echo "clientPrincipal=cn=system:master-proxy"
+        fi
+     fi
+  fi
+
+  # Add extra opts
+  if [ -n "${AB_JOLOKIA_OPTS:-}" ]; then
+     echo "${AB_JOLOKIA_OPTS}" | tr "," "\n"
+  fi
+
+}
+
+write_jolokia_properties() {
+  local jolokia_property_file="$1"
+
+  # Setup Jolokia to accept basic auth, using a randomly generated password that is stored
+  # in the container in the ${DEPLOYMENTS_DIR}/jolokia.pw file.
+  if [ "${AB_JOLOKIA_PASSWORD_RANDOM:-}" == "true" ]; then
+    pw_file="/opt/jolokia/etc/jolokia.pw"
+    if [ -f "${pw_file}" ] ; then
+      AB_JOLOKIA_PASSWORD=$(cat "${pw_file}")
+    else
+      AB_JOLOKIA_PASSWORD=$(tr -cd '[:alnum:]' < /dev/urandom | fold -w30 | head -n1)
+      touch "${pw_file}"
+      chmod 660 "${pw_file}"
+      cat > "${pw_file}" <<EOF
+$AB_JOLOKIA_PASSWORD
+EOF
+    fi
+    export AB_JOLOKIA_PASSWORD
+  fi
+
+  touch "${jolokia_property_file}"
+  chmod 660 "${jolokia_property_file}"
+  cat > "${jolokia_property_file}" <<EOF
+$(get_jolokia_properties)
+EOF
+
+}
+
+if [ -z "${AB_JOLOKIA_CONFIG:-}" ]; then
+  AB_JOLOKIA_CONFIG="/opt/jolokia/etc/jolokia.properties"
+  write_jolokia_properties "$AB_JOLOKIA_CONFIG"
+fi
+echo "-javaagent:/opt/jolokia/jolokia.jar=config=${AB_JOLOKIA_CONFIG}"
diff --git a/images/jboss/openjdk8/jdk/prometheus-config.yml b/images/jboss/openjdk8/jdk/prometheus-config.yml
new file mode 100644
index 0000000..f6eaa2b
--- /dev/null
+++ b/images/jboss/openjdk8/jdk/prometheus-config.yml
@@ -0,0 +1,586 @@
+startDelaySecs: 5
+ssl: false
+blacklistObjectNames: ["java.lang:*"]
+rules:
+# Context level
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesCompleted'
+    name: org.apache.camel.ExchangesCompleted
+    help: Exchanges Completed
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesFailed'
+    name: org.apache.camel.ExchangesFailed
+    help: Exchanges Failed
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesInflight'
+    name: org.apache.camel.ExchangesInflight
+    help: Exchanges Inflight
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>FailuresHandled'
+    name: org.apache.camel.FailuresHandled
+    help: Failures Handled
+    labels:
+        context: $1
+        type: context
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExternalRedeliveries'
+    name: org.apache.camel.ExternalRedeliveries
+    help: External Redeliveries
+    labels:
+        context: $1
+        type: context
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>MaxProcessingTime'
+    name: org.apache.camel.MaxProcessingTime
+    help: Maximum Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>MeanProcessingTime'
+    name: org.apache.camel.MeanProcessingTime
+    help: Mean Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>MinProcessingTime'
+    name: org.apache.camel.MinProcessingTime
+    help: Minimum Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>LastProcessingTime'
+    name: org.apache.camel.LastProcessingTime
+    help: Last Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>DeltaProcessingTime'
+    name: org.apache.camel.DeltaProcessingTime
+    help: Delta Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>Redeliveries'
+    name: org.apache.camel.Redeliveries
+    help: Redeliveries
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>TotalProcessingTime'
+    name: org.apache.camel.TotalProcessingTime
+    help: Total Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=consumers, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+
+
+# Route level
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesCompleted'
+    name: org.apache.camel.ExchangesCompleted
+    help: Exchanges Completed
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesFailed'
+    name: org.apache.camel.ExchangesFailed
+    help: Exchanges Failed
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesInflight'
+    name: org.apache.camel.ExchangesInflight
+    help: Exchanges Inflight
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>FailuresHandled'
+    name: org.apache.camel.FailuresHandled
+    help: Failures Handled
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExternalRedeliveries'
+    name: org.apache.camel.ExternalRedeliveries
+    help: External Redeliveries
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>MaxProcessingTime'
+    name: org.apache.camel.MaxProcessingTime
+    help: Maximum Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>MeanProcessingTime'
+    name: org.apache.camel.MeanProcessingTime
+    help: Mean Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>MinProcessingTime'
+    name: org.apache.camel.MinProcessingTime
+    help: Minimum Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>LastProcessingTime'
+    name: org.apache.camel.LastProcessingTime
+    help: Last Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>DeltaProcessingTime'
+    name: org.apache.camel.DeltaProcessingTime
+    help: Delta Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>Redeliveries'
+    name: org.apache.camel.Redeliveries
+    help: Redeliveries
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>TotalProcessingTime'
+    name: org.apache.camel.TotalProcessingTime
+    help: Total Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+
+# Processor level
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesCompleted'
+    name: org.apache.camel.ExchangesCompleted
+    help: Exchanges Completed
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesFailed'
+    name: org.apache.camel.ExchangesFailed
+    help: Exchanges Failed
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesInflight'
+    name: org.apache.camel.ExchangesInflight
+    help: Exchanges Inflight
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>FailuresHandled'
+    name: org.apache.camel.FailuresHandled
+    help: Failures Handled
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExternalRedeliveries'
+    name: org.apache.camel.ExternalRedeliveries
+    help: External Redeliveries
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>MaxProcessingTime'
+    name: org.apache.camel.MaxProcessingTime
+    help: Maximum Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>MeanProcessingTime'
+    name: org.apache.camel.MeanProcessingTime
+    help: Mean Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>MinProcessingTime'
+    name: org.apache.camel.MinProcessingTime
+    help: Minimum Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>LastProcessingTime'
+    name: org.apache.camel.LastProcessingTime
+    help: Last Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>DeltaProcessingTime'
+    name: org.apache.camel.DeltaProcessingTime
+    help: Delta Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>Redeliveries'
+    name: org.apache.camel.Redeliveries
+    help: Redeliveries
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>TotalProcessingTime'
+    name: org.apache.camel.TotalProcessingTime
+    help: Total Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: COUNTER
+
+# Consumers
+  - pattern: 'org.apache.camel<context=([^,]+), type=consumers, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        consumer: $2
+        type: consumers
+    type: GAUGE
+
+# Services
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>MaxDuration'
+    name: org.apache.camel.MaxDuration
+    help: Maximum Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>MeanDuration'
+    name: org.apache.camel.MeanDuration
+    help: Mean Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>MinDuration'
+    name: org.apache.camel.MinDuration
+    help: Minimum Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>TotalDuration'
+    name: org.apache.camel.TotalDuration
+    help: Total Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>ThreadsBlocked'
+    name: org.apache.camel.ThreadsBlocked
+    help: Threads Blocked
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>ThreadsInterrupted'
+    name: org.apache.camel.ThreadsInterrupted
+    help: Threads Interrupted
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumLogicalRuntimeFaults'
+    name: org.apache.cxf.NumLogicalRuntimeFaults
+    help: Number of logical runtime faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumLogicalRuntimeFaults'
+    name: org.apache.cxf.NumLogicalRuntimeFaults
+    help: Number of logical runtime faults
+    type: GAUGE
+    labels:
+       bus.id: $1
+       type: $2
+       service: $3
+       port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>AvgResponseTime'
+    name: org.apache.cxf.AvgResponseTime
+    help: Average Response Time
+    type: GAUGE
+    labels:
+       bus.id: $1
+       type: $2
+       service: $3
+       port: $4
+       operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>AvgResponseTime'
+    name: org.apache.cxf.AvgResponseTime
+    help: Average Response Time
+    type: GAUGE
+    labels:
+          bus.id: $1
+          type: $2
+          service: $3
+          port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumInvocations'
+    name: org.apache.cxf.NumInvocations
+    help: Number of invocations
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumInvocations'
+    name: org.apache.cxf.NumInvocations
+    help: Number of invocations
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>MaxResponseTime'
+    name: org.apache.cxf.MaxResponseTime
+    help: Maximum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>MaxResponseTime'
+    name: org.apache.cxf.MaxResponseTime
+    help: Maximum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>MinResponseTime'
+    name: org.apache.cxf.MinResponseTime
+    help: Minimum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>MinResponseTime'
+    name: org.apache.cxf.MinResponseTime
+    help: Minimum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>TotalHandlingTime'
+    name: org.apache.cxf.TotalHandlingTime
+    help: Total Handling Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>TotalHandlingTime'
+    name: org.apache.cxf.TotalHandlingTime
+    help: Total Handling Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumRuntimeFaults'
+    name: org.apache.cxf.NumRuntimeFaults
+    help: Number of runtime faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumRuntimeFaults'
+    name: org.apache.cxf.NumRuntimeFaults
+    help: Number of runtime faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumUnCheckedApplicationFaults'
+    name: org.apache.cxf.NumUnCheckedApplicationFaults
+    help: Number of unchecked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumUnCheckedApplicationFaults'
+    name: org.apache.cxf.NumUnCheckedApplicationFaults
+    help: Number of unchecked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumCheckedApplicationFaults'
+    name: org.apache.cxf.NumCheckedApplicationFaults
+    help: Number of checked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumCheckedApplicationFaults'
+    name: org.apache.cxf.NumCheckedApplicationFaults
+    help: Number of checked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
diff --git a/images/jboss/openjdk8/jdk/prometheus-opts b/images/jboss/openjdk8/jdk/prometheus-opts
new file mode 100644
index 0000000..3c43968
--- /dev/null
+++ b/images/jboss/openjdk8/jdk/prometheus-opts
@@ -0,0 +1,23 @@
+#!/bin/sh
+# Scripted for getting Prometheus options
+# meant to be evaluated (not to be sourced)
+
+# Exit if switched off
+if [ -n "${AB_PROMETHEUS_OFF:-}" ] && [ "${AB_PROMETHEUS_OFF}" != "false" ]; then
+  exit 0
+fi
+
+# Global switch, turning of all agents
+if [ -n "${AB_OFF:-}" ] && [ "${AB_OFF}" != "false" ]; then
+  exit 0
+fi
+
+port=${AB_PROMETHEUS_PORT:-9779}
+config=${AB_PROMETHEUS_CONFIG:-/opt/prometheus/prometheus-config.yml}
+if [ -n "${AB_PROMETHEUS_HOST:-}" ]; then
+  hostPort="${AB_PROMETHEUS_HOST}:$port"
+else
+  hostPort="$port"
+fi
+
+echo "-javaagent:/opt/prometheus/jmx_prometheus_javaagent.jar=${hostPort}:$config"
diff --git a/images/jboss/openjdk8/jdk/run-java-options b/images/jboss/openjdk8/jdk/run-java-options
new file mode 100644
index 0000000..759dee7
--- /dev/null
+++ b/images/jboss/openjdk8/jdk/run-java-options
@@ -0,0 +1,4 @@
+#!/bin/bash
+# Delegate to the individual agent options scripts which will
+# examine the environment for features to be enabled
+echo "$(/opt/jolokia/jolokia-opts) $(/opt/prometheus/prometheus-opts)"
diff --git a/images/jboss/openjdk8/jre/Dockerfile b/images/jboss/openjdk8/jre/Dockerfile
new file mode 100644
index 0000000..430b6c0
--- /dev/null
+++ b/images/jboss/openjdk8/jre/Dockerfile
@@ -0,0 +1,57 @@
+FROM jboss/base-jdk:8
+
+USER root
+
+RUN mkdir -p /deployments
+
+# JAVA_APP_DIR is used by run-java.sh for finding the binaries
+ENV JAVA_APP_DIR=/deployments \
+    JAVA_MAJOR_VERSION=8
+
+
+# Prometheus JMX exporter agent
+RUN mkdir -p /opt/prometheus/etc \
+ && curl http://central.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/undefined/jmx_prometheus_javaagent-undefined.jar \
+          -o /opt/prometheus/jmx_prometheus_javaagent.jar
+ADD prometheus-opts /opt/prometheus/prometheus-opts
+ADD prometheus-config.yml /opt/prometheus/prometheus-config.yml
+RUN chmod 444 /opt/prometheus/jmx_prometheus_javaagent.jar \
+ && chmod 444 /opt/prometheus/prometheus-config.yml \
+ && chmod 755 /opt/prometheus/prometheus-opts \
+ && chmod 775 /opt/prometheus/etc \
+ && chgrp root /opt/prometheus/etc
+
+EXPOSE 9779
+
+
+# Jolokia agent
+RUN mkdir -p /opt/jolokia/etc \
+ && curl http://central.maven.org/maven2/org/jolokia/jolokia-jvm/1.6.2/jolokia-jvm-1.6.2-agent.jar \
+         -o /opt/jolokia/jolokia.jar
+ADD jolokia-opts /opt/jolokia/jolokia-opts
+RUN chmod 444 /opt/jolokia/jolokia.jar \
+ && chmod 755 /opt/jolokia/jolokia-opts \
+ && chmod 775 /opt/jolokia/etc \
+ && chgrp root /opt/jolokia/etc
+
+EXPOSE 8778
+
+
+# Add run script as /deployments/run-java.sh and make it executable
+COPY run-java.sh /deployments/
+RUN chmod 755 /deployments/run-java.sh
+
+COPY run-java-options /opt
+
+
+# Run under user "jboss" and prepare for be running
+# under OpenShift, too
+RUN chown -R jboss /deployments \
+  && usermod -g root -G `id -g jboss` jboss \
+  && chmod -R "g+rwX" /deployments \
+  && chown -R jboss:root /deployments
+
+USER jboss
+
+
+CMD [ "/deployments/run-java.sh" ]
diff --git a/images/jboss/openjdk8/jre/README.md b/images/jboss/openjdk8/jre/README.md
new file mode 100644
index 0000000..80d5f13
--- /dev/null
+++ b/images/jboss/openjdk8/jre/README.md
@@ -0,0 +1,171 @@
+## Fabric8 Java Base Image OpenJDK 8 (JRE)
+
+This image is based on JBoss with OpenJDK and provides OpenJDK 8 (JRE)
+
+It includes:
+
+* A startup script [`/deployments/run-java.sh`](#startup-script-run-javash) for starting up Java applications.
+* [Jolokia](http://www.jolokia.org) agent installed in `/opt/jolokia`
+* Prometheus [jmx_exporter](https://github.com/prometheus/jmx_exporter) agent installed in `/opt/jmx_exporter`.
+
+### Startup Script run-java.sh
+
+The default command for this image is [/deployments/run-java.sh](https://github.com/fabric8io/run-java-sh). Its purpose it to fire up Java applications which are provided as fat-jars, including all dependencies or more classical from a main class, where the classpath is build up from all jars within a directory.
+
+For these images the variable **JAVA_APP_DIR** has the default value `/deployments`
+
+
+### run-java.sh
+
+This general purpose startup script is optimized for running Java application from within containers. It is called like
+
+```
+./run-java.sh <sub-command> <options>
+```
+`run-java.sh` knows two sub-commands:
+
+* `options` to print out JVM option which can be used for own invocation of Java apps (like Maven or Tomcat). It respects container constraints and includes all magic which is used by this script
+* `run` executes a Java application as described below. This is also the default command so you can skip adding this command.
+
+### Running a Java application
+
+When no subcommand is given (or when you provide the default subcommand `run`), then by default this scripts starts up Java application.
+
+The startup process is configured mostly via environment variables:
+
+* **JAVA_APP_DIR** the directory where the application resides. All paths in your application are relative to this directory. By default it is the same directory where this startup script resides.
+* **JAVA_LIB_DIR** directory holding the Java jar files as well an optional `classpath` file which holds the classpath. Either as a single line classpath (colon separated) or with jar files listed line-by-line. If not set **JAVA_LIB_DIR** is the same as **JAVA_APP_DIR**.
+* **JAVA_OPTIONS** options to add when calling `java`
+* **JAVA_MAJOR_VERSION** a number >= 7. If the version is set then only options suitable for this version are used. When set to 7 options known only to Java > 8 will be removed. For versions >= 10 no explicit memory limit is calculated since Java >= 10 has support for container limits.
+* **JAVA_MAX_MEM_RATIO** is used when no `-Xmx` option is given in `JAVA_OPTIONS`. This is used to calculate a default maximal Heap Memory based on a containers restriction. If used in a Docker container without any memory constraints for the container then this option has no effect. If there is a memory constraint then `-Xmx` is set to a ratio of the container available memory as set here. The default is `25` when the maximum amount of memory available to the container is below 300M, `50` otherwise, which means in that case that 50% of the available memory is used as an upper boundary. You can skip this mechanism by setting this value to 0 in which case no `-Xmx` option is added.
+* **JAVA_INIT_MEM_RATIO** is used when no `-Xms` option is given in `JAVA_OPTIONS`. This is used to calculate a default initial Heap Memory based on a containers restriction. If used in a Docker container without any memory constraints for the container then this option has no effect. If there is a memory constraint then `-Xms` is set to a ratio of the container available memory as set here. By default this value is not set.
+* **JAVA_MAX_CORE** restrict manually the number of cores available which is used for calculating certain defaults like the number of garbage collector threads. If set to 0 no base JVM tuning based on the number of cores is performed.
+* **JAVA_DIAGNOSTICS** set this to get some diagnostics information to standard out when things are happening
+* **JAVA_MAIN_CLASS** A main class to use as argument for `java`. When this environment variable is given, all jar files in `$JAVA_APP_DIR` are added to the classpath as well as `$JAVA_LIB_DIR`.
+* **JAVA_APP_JAR** A jar file with an appropriate manifest so that it can be started with `java -jar` if no `$JAVA_MAIN_CLASS` is set. In all cases this jar file is added to the classpath, too.
+* **JAVA_APP_NAME** Name to use for the process
+* **JAVA_CLASSPATH** the classpath to use. If not given, the startup script checks for a file `${JAVA_APP_DIR}/classpath` and use its content literally as classpath. If this file doesn't exists all jars in the app dir are added (`classes:${JAVA_APP_DIR}/*`).
+* **JAVA_DEBUG** If set remote debugging will be switched on
+* **JAVA_DEBUG_SUSPEND** If set enables suspend mode in remote debugging
+* **JAVA_DEBUG_PORT** Port used for remote debugging. Default: 5005
+* **HTTP_PROXY** The URL of the proxy server that translates into the `http.proxyHost` and `http.proxyPort` system properties.
+* **HTTPS_PROXY** The URL of the proxy server that translates into the `https.proxyHost` and `https.proxyPort` system properties.
+* **no_proxy**, **NO_PROXY** The list of hosts that should be reached directly, bypassing the proxy, that translates into the `http.nonProxyHosts` system property.
+
+If neither `$JAVA_APP_JAR` nor `$JAVA_MAIN_CLASS` is given, `$JAVA_APP_DIR` is checked for a single JAR file which is taken as `$JAVA_APP_JAR`. If no or more then one jar file is found, an error is thrown.
+
+The classpath is build up with the following parts:
+
+* If `$JAVA_CLASSPATH` is set, this classpath is taken.
+* The current directory (".") is added first.
+* If the current directory is not the same as `$JAVA_APP_DIR`, `$JAVA_APP_DIR` is added.
+* If `$JAVA_MAIN_CLASS` is set, then
+  - A `$JAVA_APP_JAR` is added if set
+  - If a file `$JAVA_APP_DIR/classpath` exists, its content is appended to the classpath. This file
+    can be either a single line with the jar files colon separated or a multi-line file where each line
+    holds the path of the jar file relative to `$JAVA_LIB_DIR` (which by default is the `$JAVA_APP_DIR`)
+  - If this file is not set, a `${JAVA_APP_DIR}/*` is added which effectively adds all
+    jars in this directory in alphabetical order.
+
+These variables can be also set in a shell config file `run-env.sh`, which will be sourced by the startup script. This file can be located in the directory where the startup script is located and in `${JAVA_APP_DIR}`, whereas environment variables in the latter override the ones in `run-env.sh` from the script directory.
+
+This startup script also checks for a command `run-java-options`. If existent it will be called and the output is added to the environment variable `$JAVA_OPTIONS`.
+
+The startup script also exposes some environment variables describing container limits which can be used by applications:
+
+* **CONTAINER_CORE_LIMIT** a calculated core limit as described in https://www.kernel.org/doc/Documentation/scheduler/sched-bwc.txt
+* **CONTAINER_MAX_MEMORY** memory limit given to the container
+
+Any arguments given to the script are given through directly as argument to the Java application.
+
+Example:
+
+```
+# Set the application directory directly
+export JAVA_APP_DIR=/deployments
+# Set -Xmx based on container constraints
+export JAVA_MAX_MEM_RATIO=40
+# Start the jar in JAVA_APP_DIR with the given arguments
+./run-java.sh --user maxmorlock --password secret
+```
+
+### Options
+
+This script can also be used to calculate reasonable, best-practice options for starting Java apps in general. For example, when running Maven in a container it makes sense to respect  container Memory constraints.
+
+The subcommand `options` can be used to print options to standard output so that is can be easily used to feed it to another, Java based application.
+
+When no extra arguments are given, all defaults will be used, which can be influenced with the environment variables described above.
+
+You can select specific sets of options by providing additional arguments:
+
+* `--debug` : Java debug options if `JAVA_DEBUG` is set
+* `--memory` : Memory settings based on the environment variables given
+* `--proxy` : Evaluate proxy environments variables
+* `--cpu` : Tuning when the number of cores is limited
+* `--gc` : GC tuning parameters
+* `--jit` : JIT options
+* `--diagnostics` : Print diagnostics options when `JAVA_DIAGNOSTICS` is set
+* `--java-default` : Same as `--memory --jit --diagnostic --cpu --gc`
+
+Example:
+
+```
+# Call Maven with the proper memory settings when running in an container
+export MAVEN_OPTS="$(run-java.sh options --memory)"
+mvn clean install
+```
+
+
+### Monitoring Agents
+
+In order to enable Jolokia and Prometheus exporter for your application you should use this image as a base image (via `FROM`) and use the output of `jolokia-opts` and `prometheus-opts` in your startup scripts to include it in for the Java startup options. You can also just use the provided startup script `/opt/run-java.sh` which does this automatically.
+
+For example, the following snippet can be added to a script starting up your Java application
+
+    # ...
+    export JAVA_OPTIONS="$JAVA_OPTIONS $(/opt/jolokia/jolokia-opts) $(/opt/prometheus/prometheus-opts)"
+    # .... use JAVA_OPTIONS when starting your app, e.g. as Tomcat does
+
+The following versions and defaults are used:
+
+* [Jolokia](http://www.jolokia.org) : version **1.6.2** and port **8778**
+* [jmx_exporter](https://github.com/prometheus/jmx_exporter): version **0.3.1** and port **9779**
+
+You can influence the behaviour of these config scripts by setting various environment variables.
+
+#### Jolokia Configuration
+
+* **AB_JOLOKIA_OFF** : If set disables activation of Jolokia (i.e. echos an empty value). By default, Jolokia is enabled.
+* **AB_JOLOKIA_CONFIG** : If set uses this file (including path) as Jolokia JVM agent properties (as described
+  in Jolokia's [reference manual](http://www.jolokia.org/reference/html/agents.html#agents-jvm)). If not set,
+  the `/opt/jolokia/etc/jolokia.properties` will be created using the settings as defined in this document, otherwise
+  the reset of the settings in this document are ignored.
+* **AB_JOLOKIA_HOST** : Host address to bind to (Default: `0.0.0.0`)
+* **AB_JOLOKIA_PORT** : Port to use (Default: `8778`)
+* **AB_JOLOKIA_USER** : User for basic authentication. Defaults to 'jolokia'
+* **AB_JOLOKIA_PASSWORD** : Password for basic authentication. By default authentication is switched off.
+* **AB_JOLOKIA_PASSWORD_RANDOM** : Should a random AB_JOLOKIA_PASSWORD be generated? Generated value will be written to `/opt/jolokia/etc/jolokia.pw`
+* **AB_JOLOKIA_HTTPS** : Switch on secure communication with https. By default self signed server certificates are generated
+  if no `serverCert` configuration is given in `AB_JOLOKIA_OPTS`
+* **AB_JOLOKIA_ID** : Agent ID to use (`$HOSTNAME` by default, which is the container id)
+* **AB_JOLOKIA_DISCOVERY_ENABLED** : Enable Jolokia discovery.  Defaults to false.
+* **AB_JOLOKIA_OPTS**  : Additional options to be appended to the agent configuration. They should be given in the format
+  "key=value,key=value,..."
+
+Some options for integration in various environments:
+
+* **AB_JOLOKIA_AUTH_OPENSHIFT** : Switch on client authentication for OpenShift TSL communication. The value of this
+  parameter can be a relative distinguished name which must be contained in a presented client certificate. Enabling this
+  parameter will automatically switch Jolokia into https communication mode. The default CA cert is set to
+  `/var/run/secrets/kubernetes.io/serviceaccount/ca.crt`
+
+
+undefined
+
+### Versions:
+
+* Base-Image: **JBoss with OpenJDK undefined**
+* Java: **OpenJDK 8 1.8.0** (Java Runtime Environment (JRE))
+* Jolokia: **1.6.2**
+* jmx_exporter: **undefined**
diff --git a/images/jboss/openjdk8/jre/jolokia-opts b/images/jboss/openjdk8/jre/jolokia-opts
new file mode 100644
index 0000000..1aa273e
--- /dev/null
+++ b/images/jboss/openjdk8/jre/jolokia-opts
@@ -0,0 +1,103 @@
+#!/bin/sh
+
+
+# Exit if switched off
+if [ -n "${AB_JOLOKIA_OFF:-}" ] && [ "${AB_JOLOKIA_OFF}" != "false" ]; then
+  exit 0
+fi
+
+# Global switch, turning of all agents
+if [ -n "${AB_OFF:-}" ] && [ "${AB_OFF}" != "false" ]; then
+  exit 0
+fi
+
+# Check whether a given config is contained in AB_JOLOKIA_OPTS
+is_in_jolokia_opts() {
+  local prop=$1
+  if [ -n "${AB_JOLOKIA_OPTS:-}" ] && [ "${AB_JOLOKIA_OPTS}" != "${AB_JOLOKIA_OPTS/${prop}/}" ]; then
+     echo "yes"
+  else
+     echo "no"
+  fi
+}
+
+get_jolokia_properties() {
+
+  echo "host=${AB_JOLOKIA_HOST:-*}"
+  echo "port=${AB_JOLOKIA_PORT:-8778}"
+  echo "discoveryEnabled=${AB_JOLOKIA_DISCOVERY_ENABLED:-false}"
+
+  if [ -n "${AB_JOLOKIA_PASSWORD:-}" ]; then
+     echo "user=${AB_JOLOKIA_USER:-jolokia}"
+     echo "password=${AB_JOLOKIA_PASSWORD}"
+  fi
+  if [ -n "${AB_JOLOKIA_HTTPS:-}" ]; then
+     echo "protocol=https"
+     https_used=1
+  fi
+
+  # Integration with OpenShift client cert auth is enabled
+  # by default if not explicitly turned off by setting to 'false'
+  if [ "${AB_JOLOKIA_AUTH_OPENSHIFT:-}" != "false" ] && [ -f "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt" ]; then
+     echo "useSslClientAuthentication=true"
+     echo "extraClientCheck=true"
+
+     # Check if the 'protocol' property has already been set to 'https'
+     # If not, then defaults to using HTTPS
+     if [ -z ${https_used+x} ]; then
+       echo "protocol=https"
+     fi
+     if [ $(is_in_jolokia_opts "caCert") != "yes" ]; then
+        echo "caCert=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
+     fi
+
+     if [ $(is_in_jolokia_opts "clientPrincipal") != "yes" ]; then
+        if [  "${AB_JOLOKIA_AUTH_OPENSHIFT}" != "${AB_JOLOKIA_AUTH_OPENSHIFT/=/}" ]; then
+           # Supposed to contain a principal name to check
+           echo "clientPrincipal=$(echo ${AB_JOLOKIA_AUTH_OPENSHIFT} | sed -e 's/ /\\\\ /g')"
+        else
+           echo "clientPrincipal=cn=system:master-proxy"
+        fi
+     fi
+  fi
+
+  # Add extra opts
+  if [ -n "${AB_JOLOKIA_OPTS:-}" ]; then
+     echo "${AB_JOLOKIA_OPTS}" | tr "," "\n"
+  fi
+
+}
+
+write_jolokia_properties() {
+  local jolokia_property_file="$1"
+
+  # Setup Jolokia to accept basic auth, using a randomly generated password that is stored
+  # in the container in the ${DEPLOYMENTS_DIR}/jolokia.pw file.
+  if [ "${AB_JOLOKIA_PASSWORD_RANDOM:-}" == "true" ]; then
+    pw_file="/opt/jolokia/etc/jolokia.pw"
+    if [ -f "${pw_file}" ] ; then
+      AB_JOLOKIA_PASSWORD=$(cat "${pw_file}")
+    else
+      AB_JOLOKIA_PASSWORD=$(tr -cd '[:alnum:]' < /dev/urandom | fold -w30 | head -n1)
+      touch "${pw_file}"
+      chmod 660 "${pw_file}"
+      cat > "${pw_file}" <<EOF
+$AB_JOLOKIA_PASSWORD
+EOF
+    fi
+    export AB_JOLOKIA_PASSWORD
+  fi
+
+  touch "${jolokia_property_file}"
+  chmod 660 "${jolokia_property_file}"
+  cat > "${jolokia_property_file}" <<EOF
+$(get_jolokia_properties)
+EOF
+
+}
+
+if [ -z "${AB_JOLOKIA_CONFIG:-}" ]; then
+  AB_JOLOKIA_CONFIG="/opt/jolokia/etc/jolokia.properties"
+  write_jolokia_properties "$AB_JOLOKIA_CONFIG"
+fi
+echo "-javaagent:/opt/jolokia/jolokia.jar=config=${AB_JOLOKIA_CONFIG}"
diff --git a/images/jboss/openjdk8/jre/prometheus-config.yml b/images/jboss/openjdk8/jre/prometheus-config.yml
new file mode 100644
index 0000000..f6eaa2b
--- /dev/null
+++ b/images/jboss/openjdk8/jre/prometheus-config.yml
@@ -0,0 +1,586 @@
+startDelaySecs: 5
+ssl: false
+blacklistObjectNames: ["java.lang:*"]
+rules:
+# Context level
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesCompleted'
+    name: org.apache.camel.ExchangesCompleted
+    help: Exchanges Completed
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesFailed'
+    name: org.apache.camel.ExchangesFailed
+    help: Exchanges Failed
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesInflight'
+    name: org.apache.camel.ExchangesInflight
+    help: Exchanges Inflight
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      type: context
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>FailuresHandled'
+    name: org.apache.camel.FailuresHandled
+    help: Failures Handled
+    labels:
+        context: $1
+        type: context
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>ExternalRedeliveries'
+    name: org.apache.camel.ExternalRedeliveries
+    help: External Redeliveries
+    labels:
+        context: $1
+        type: context
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>MaxProcessingTime'
+    name: org.apache.camel.MaxProcessingTime
+    help: Maximum Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>MeanProcessingTime'
+    name: org.apache.camel.MeanProcessingTime
+    help: Mean Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>MinProcessingTime'
+    name: org.apache.camel.MinProcessingTime
+    help: Minimum Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>LastProcessingTime'
+    name: org.apache.camel.LastProcessingTime
+    help: Last Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>DeltaProcessingTime'
+    name: org.apache.camel.DeltaProcessingTime
+    help: Delta Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>Redeliveries'
+    name: org.apache.camel.Redeliveries
+    help: Redeliveries
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=context, name="([^"]+)"><>TotalProcessingTime'
+    name: org.apache.camel.TotalProcessingTime
+    help: Total Processing Time
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=consumers, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        type: context
+    type: GAUGE
+
+
+# Route level
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesCompleted'
+    name: org.apache.camel.ExchangesCompleted
+    help: Exchanges Completed
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesFailed'
+    name: org.apache.camel.ExchangesFailed
+    help: Exchanges Failed
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesInflight'
+    name: org.apache.camel.ExchangesInflight
+    help: Exchanges Inflight
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      route: $2
+      type: routes
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>FailuresHandled'
+    name: org.apache.camel.FailuresHandled
+    help: Failures Handled
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>ExternalRedeliveries'
+    name: org.apache.camel.ExternalRedeliveries
+    help: External Redeliveries
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>MaxProcessingTime'
+    name: org.apache.camel.MaxProcessingTime
+    help: Maximum Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>MeanProcessingTime'
+    name: org.apache.camel.MeanProcessingTime
+    help: Mean Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>MinProcessingTime'
+    name: org.apache.camel.MinProcessingTime
+    help: Minimum Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>LastProcessingTime'
+    name: org.apache.camel.LastProcessingTime
+    help: Last Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>DeltaProcessingTime'
+    name: org.apache.camel.DeltaProcessingTime
+    help: Delta Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>Redeliveries'
+    name: org.apache.camel.Redeliveries
+    help: Redeliveries
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>TotalProcessingTime'
+    name: org.apache.camel.TotalProcessingTime
+    help: Total Processing Time
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=routes, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        route: $2
+        type: routes
+    type: GAUGE
+
+# Processor level
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesCompleted'
+    name: org.apache.camel.ExchangesCompleted
+    help: Exchanges Completed
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesFailed'
+    name: org.apache.camel.ExchangesFailed
+    help: Exchanges Failed
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesInflight'
+    name: org.apache.camel.ExchangesInflight
+    help: Exchanges Inflight
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExchangesTotal'
+    name: org.apache.camel.ExchangesTotal
+    help: Exchanges Total
+    type: COUNTER
+    labels:
+      context: $1
+      processor: $2
+      type: processors
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>FailuresHandled'
+    name: org.apache.camel.FailuresHandled
+    help: Failures Handled
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>ExternalRedeliveries'
+    name: org.apache.camel.ExternalRedeliveries
+    help: External Redeliveries
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: COUNTER
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>MaxProcessingTime'
+    name: org.apache.camel.MaxProcessingTime
+    help: Maximum Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>MeanProcessingTime'
+    name: org.apache.camel.MeanProcessingTime
+    help: Mean Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>MinProcessingTime'
+    name: org.apache.camel.MinProcessingTime
+    help: Minimum Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>LastProcessingTime'
+    name: org.apache.camel.LastProcessingTime
+    help: Last Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>DeltaProcessingTime'
+    name: org.apache.camel.DeltaProcessingTime
+    help: Delta Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>Redeliveries'
+    name: org.apache.camel.Redeliveries
+    help: Redeliveries
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>TotalProcessingTime'
+    name: org.apache.camel.TotalProcessingTime
+    help: Total Processing Time
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=processors, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        processor: $2
+        type: processors
+    type: COUNTER
+
+# Consumers
+  - pattern: 'org.apache.camel<context=([^,]+), type=consumers, name="([^"]+)"><>InflightExchanges'
+    name: org.apache.camel.InflightExchanges
+    help: Inflight Exchanges
+    labels:
+        context: $1
+        consumer: $2
+        type: consumers
+    type: GAUGE
+
+# Services
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>MaxDuration'
+    name: org.apache.camel.MaxDuration
+    help: Maximum Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>MeanDuration'
+    name: org.apache.camel.MeanDuration
+    help: Mean Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>MinDuration'
+    name: org.apache.camel.MinDuration
+    help: Minimum Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>TotalDuration'
+    name: org.apache.camel.TotalDuration
+    help: Total Duration
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>ThreadsBlocked'
+    name: org.apache.camel.ThreadsBlocked
+    help: Threads Blocked
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.camel<context=([^,]+), type=services, name="([^"]+)"><>ThreadsInterrupted'
+    name: org.apache.camel.ThreadsInterrupted
+    help: Threads Interrupted
+    labels:
+        context: $1
+        service: $2
+        type: services
+    type: GAUGE
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumLogicalRuntimeFaults'
+    name: org.apache.cxf.NumLogicalRuntimeFaults
+    help: Number of logical runtime faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumLogicalRuntimeFaults'
+    name: org.apache.cxf.NumLogicalRuntimeFaults
+    help: Number of logical runtime faults
+    type: GAUGE
+    labels:
+       bus.id: $1
+       type: $2
+       service: $3
+       port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>AvgResponseTime'
+    name: org.apache.cxf.AvgResponseTime
+    help: Average Response Time
+    type: GAUGE
+    labels:
+       bus.id: $1
+       type: $2
+       service: $3
+       port: $4
+       operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>AvgResponseTime'
+    name: org.apache.cxf.AvgResponseTime
+    help: Average Response Time
+    type: GAUGE
+    labels:
+          bus.id: $1
+          type: $2
+          service: $3
+          port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumInvocations'
+    name: org.apache.cxf.NumInvocations
+    help: Number of invocations
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumInvocations'
+    name: org.apache.cxf.NumInvocations
+    help: Number of invocations
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>MaxResponseTime'
+    name: org.apache.cxf.MaxResponseTime
+    help: Maximum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>MaxResponseTime'
+    name: org.apache.cxf.MaxResponseTime
+    help: Maximum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>MinResponseTime'
+    name: org.apache.cxf.MinResponseTime
+    help: Minimum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>MinResponseTime'
+    name: org.apache.cxf.MinResponseTime
+    help: Minimum Response Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>TotalHandlingTime'
+    name: org.apache.cxf.TotalHandlingTime
+    help: Total Handling Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>TotalHandlingTime'
+    name: org.apache.cxf.TotalHandlingTime
+    help: Total Handling Time
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumRuntimeFaults'
+    name: org.apache.cxf.NumRuntimeFaults
+    help: Number of runtime faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumRuntimeFaults'
+    name: org.apache.cxf.NumRuntimeFaults
+    help: Number of runtime faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumUnCheckedApplicationFaults'
+    name: org.apache.cxf.NumUnCheckedApplicationFaults
+    help: Number of unchecked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumUnCheckedApplicationFaults'
+    name: org.apache.cxf.NumUnCheckedApplicationFaults
+    help: Number of unchecked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+), operation=([^,]+)><>NumCheckedApplicationFaults'
+    name: org.apache.cxf.NumCheckedApplicationFaults
+    help: Number of checked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
+        operation: $5
+  - pattern: 'org.apache.cxf<bus.id=([^,]+), type=([^,]+), service=([^,]+), port=([^,]+)><>NumCheckedApplicationFaults'
+    name: org.apache.cxf.NumCheckedApplicationFaults
+    help: Number of checked application faults
+    type: GAUGE
+    labels:
+        bus.id: $1
+        type: $2
+        service: $3
+        port: $4
diff --git a/images/jboss/openjdk8/jre/prometheus-opts b/images/jboss/openjdk8/jre/prometheus-opts
new file mode 100644
index 0000000..3c43968
--- /dev/null
+++ b/images/jboss/openjdk8/jre/prometheus-opts
@@ -0,0 +1,23 @@
+#!/bin/sh
+# Scripted for getting Prometheus options
+# meant to be evaluated (not to be sourced)
+
+# Exit if switched off
+if [ -n "${AB_PROMETHEUS_OFF:-}" ] && [ "${AB_PROMETHEUS_OFF}" != "false" ]; then
+  exit 0
+fi
+
+# Global switch, turning of all agents
+if [ -n "${AB_OFF:-}" ] && [ "${AB_OFF}" != "false" ]; then
+  exit 0
+fi
+
+port=${AB_PROMETHEUS_PORT:-9779}
+config=${AB_PROMETHEUS_CONFIG:-/opt/prometheus/prometheus-config.yml}
+if [ -n "${AB_PROMETHEUS_HOST:-}" ]; then
+  hostPort="${AB_PROMETHEUS_HOST}:$port"
+else
+  hostPort="$port"
+fi
+
+echo "-javaagent:/opt/prometheus/jmx_prometheus_javaagent.jar=${hostPort}:$config"
diff --git a/images/jboss/openjdk8/jre/run-java-options b/images/jboss/openjdk8/jre/run-java-options
new file mode 100644
index 0000000..759dee7
--- /dev/null
+++ b/images/jboss/openjdk8/jre/run-java-options
@@ -0,0 +1,4 @@
+#!/bin/bash
+# Delegate to the individual agent options scripts which will
+# examine the environment for features to be enabled
+echo "$(/opt/jolokia/jolokia-opts) $(/opt/prometheus/prometheus-opts)"
diff --git a/images/jboss/openjdk8/jre/run-java.sh b/images/jboss/openjdk8/jre/run-java.sh
new file mode 100644
index 0000000..1ebd872
--- /dev/null
+++ b/images/jboss/openjdk8/jre/run-java.sh
@@ -0,0 +1,625 @@
+#!/bin/sh
+# ===================================================================================
+# Generic startup script for running arbitrary Java applications with
+# being optimized for running in containers
+#
+# Usage:
+#    # Execute a Java app:
+#    ./run-java.sh <args given to Java code>
+#
+#    # Get options which can be used for invoking Java apps like Maven or Tomcat
+#    ./run-java.sh options [....]
+#
+#
+# This script will pick up either a 'fat' jar which can be run with "-jar"
+# or you can sepcify a JAVA_MAIN_CLASS.
+#
+# Source and Documentation can be found
+# at https://github.com/fabric8io-images/run-java-sh
+#
+# Env-variables evaluated in this script:
+#
+# JAVA_OPTIONS: Checked for already set options
+# JAVA_MAX_MEM_RATIO: Ratio use to calculate a default maximum Memory, in percent.
+#                     E.g. the "50" value implies that 50% of the Memory
+#                     given to the container is used as the maximum heap memory with
+#                     '-Xmx'.
+#                     It defaults to "25" when the maximum amount of memory available
+#                     to the container is below 300M, otherwise defaults to "50".
+#                     It is a heuristic and should be better backed up with real
+#                     experiments and measurements.
+#                     For a good overviews what tuning options are available -->
+#                             https://youtu.be/Vt4G-pHXfs4
+#                             https://www.youtube.com/watch?v=w1rZOY5gbvk
+#                             https://vimeo.com/album/4133413/video/181900266
+# Also note that heap is only a small portion of the memory used by a JVM. There are lot
+# of other memory areas (metadata, thread, code cache, ...) which addes to the overall
+# size. When your container gets killed because of an OOM, then you should tune
+# the absolute values.
+# JAVA_INIT_MEM_RATIO: Ratio use to calculate a default intial heap memory, in percent.
+#                      By default this value is not set.
+#
+# The following variables are exposed to your Java application:
+#
+# CONTAINER_MAX_MEMORY: Max memory for the container (if running within a container)
+# MAX_CORE_LIMIT: Number of cores available for the container (if running within a container)
+
+
+# ==========================================================
+
+# Fail on a single failed command in a pipeline (if supported)
+(set -o | grep -q pipefail) && set -o pipefail
+
+# Fail on error and undefined vars
+set -eu
+
+# Save global script args
+ARGS="$@"
+
+# ksh is different for defining local vars
+if [ -n "${KSH_VERSION:-}" ]; then
+  alias local=typeset
+fi
+
+# Error is indicated with a prefix in the return value
+check_error() {
+  local error_msg="$1"
+  if echo "${error_msg}" | grep -q "^ERROR:"; then
+    echo "${error_msg}"
+    exit 1
+  fi
+}
+
+# The full qualified directory where this script is located in
+script_dir() {
+  # Default is current directory
+  local dir=$(dirname "$0")
+  local full_dir=$(cd "${dir}" && pwd)
+  echo ${full_dir}
+}
+
+# Try hard to find a sane default jar-file
+auto_detect_jar_file() {
+  local dir="$1"
+
+  # Filter out temporary jars from the shade plugin which start with 'original-'
+  local old_dir="$(pwd)"
+  cd ${dir}
+  if [ $? = 0 ]; then
+    # NB: Find both (single) JAR *or* WAR <https://github.com/fabric8io-images/run-java-sh/issues/79>
+    local nr_jars="$(ls 2>/dev/null | grep -e '.*\.jar$' -e '.*\.war$' | grep -v '^original-' | wc -l | awk '{print $1}')"
+    if [ "${nr_jars}" = 1 ]; then
+      ls 2>/dev/null | grep -e '.*\.jar$' -e '.*\.war$' | grep -v '^original-'
+      exit 0
+    fi
+    cd "${old_dir}"
+    echo "ERROR: Neither JAVA_MAIN_CLASS nor JAVA_APP_JAR is set and ${nr_jars} found in ${dir} (1 expected)"
+  else
+    echo "ERROR: No directory ${dir} found for auto detection"
+  fi
+}
+
+# Check directories (arg 2...n) for a jar file (arg 1)
+find_jar_file() {
+  local jar="$1"
+  shift;
+
+  # Absolute path check if jar specifies an absolute path
+  if [ "${jar}" != ${jar#/} ]; then
+    if [ -f "${jar}" ]; then
+      echo "${jar}"
+    else
+      echo "ERROR: No such file ${jar}"
+    fi
+  else
+    for dir in $*; do
+      if [ -f "${dir}/$jar" ]; then
+        echo "${dir}/$jar"
+        return
+      fi
+    done
+    echo "ERROR: No ${jar} found in $*"
+  fi
+}
+
+# Generic formula evaluation based on awk
+calc() {
+  local formula="$1"
+  shift
+  echo "$@" | awk '
+    function ceil(x) {
+      return x % 1 ? int(x) + 1 : x
+    }
+    function log2(x) {
+      return log(x)/log(2)
+    }
+    function max2(x, y) {
+      return x > y ? x : y
+    }
+    function round(x) {
+      return int(x + 0.5)
+    }
+    {print '"int(${formula})"'}
+  '
+}
+
+# Based on the cgroup limits, figure out the max number of core we should utilize
+core_limit() {
+  local cpu_period_file="/sys/fs/cgroup/cpu/cpu.cfs_period_us"
+  local cpu_quota_file="/sys/fs/cgroup/cpu/cpu.cfs_quota_us"
+  if [ -r "${cpu_period_file}" ]; then
+    local cpu_period="$(cat ${cpu_period_file})"
+
+    if [ -r "${cpu_quota_file}" ]; then
+      local cpu_quota="$(cat ${cpu_quota_file})"
+      # cfs_quota_us == -1 --> no restrictions
+      if [ ${cpu_quota:-0} -ne -1 ]; then
+        echo $(calc 'ceil($1/$2)' "${cpu_quota}" "${cpu_period}")
+      fi
+    fi
+  fi
+}
+
+max_memory() {
+  # High number which is the max limit until which memory is supposed to be
+  # unbounded.
+  local mem_file="/sys/fs/cgroup/memory/memory.limit_in_bytes"
+  if [ -r "${mem_file}" ]; then
+    local max_mem_cgroup="$(cat ${mem_file})"
+    local max_mem_meminfo_kb="$(cat /proc/meminfo | awk '/MemTotal/ {print $2}')"
+    local max_mem_meminfo="$(expr $max_mem_meminfo_kb \* 1024)"
+    if [ ${max_mem_cgroup:-0} != -1 ] && [ ${max_mem_cgroup:-0} -lt ${max_mem_meminfo:-0} ]
+    then
+      echo "${max_mem_cgroup}"
+    fi
+  fi
+}
+
+init_limit_env_vars() {
+  # Read in container limits and export the as environment variables
+  local core_limit="$(core_limit)"
+  if [ -n "${core_limit}" ]; then
+    export CONTAINER_CORE_LIMIT="${core_limit}"
+  fi
+
+  local mem_limit="$(max_memory)"
+  if [ -n "${mem_limit}" ]; then
+    export CONTAINER_MAX_MEMORY="${mem_limit}"
+  fi
+}
+
+load_env() {
+  local script_dir="$1"
+
+  # Configuration stuff is read from this file
+  local run_env_sh="run-env.sh"
+
+  # Load default default config
+  if [ -f "${script_dir}/${run_env_sh}" ]; then
+    . "${script_dir}/${run_env_sh}"
+  fi
+
+  # Check also $JAVA_APP_DIR. Overrides other defaults
+  # It's valid to set the app dir in the default script
+  JAVA_APP_DIR="${JAVA_APP_DIR:-${script_dir}}"
+  if [ -f "${JAVA_APP_DIR}/${run_env_sh}" ]; then
+    . "${JAVA_APP_DIR}/${run_env_sh}"
+  fi
+  export JAVA_APP_DIR
+
+  # JAVA_LIB_DIR defaults to JAVA_APP_DIR
+  export JAVA_LIB_DIR="${JAVA_LIB_DIR:-${JAVA_APP_DIR}}"
+  if [ -z "${JAVA_MAIN_CLASS:-}" ] && [ -z "${JAVA_APP_JAR:-}" ]; then
+    JAVA_APP_JAR="$(auto_detect_jar_file ${JAVA_APP_DIR})"
+    check_error "${JAVA_APP_JAR}"
+  fi
+
+  if [ -n "${JAVA_APP_JAR:-}" ]; then
+    local jar="$(find_jar_file ${JAVA_APP_JAR} ${JAVA_APP_DIR} ${JAVA_LIB_DIR})"
+    check_error "${jar}"
+    export JAVA_APP_JAR="${jar}"
+  else
+    export JAVA_MAIN_CLASS
+  fi
+}
+
+# Check for standard /opt/run-java-options first, fallback to run-java-options in the path if not existing
+run_java_options() {
+  if [ -f "/opt/run-java-options" ]; then
+    echo "$(. /opt/run-java-options)"
+  else
+    which run-java-options >/dev/null 2>&1
+    if [ $? = 0 ]; then
+      echo "$(run-java-options)"
+    fi
+  fi
+}
+
+debug_options() {
+  if [ -n "${JAVA_ENABLE_DEBUG:-}" ] || [ -n "${JAVA_DEBUG_ENABLE:-}" ] ||  [ -n "${JAVA_DEBUG:-}" ]; then
+    local debug_port="${JAVA_DEBUG_PORT:-5005}"
+    local suspend_mode="n"
+    if [ -n "${JAVA_DEBUG_SUSPEND:-}" ]; then
+      if ! echo "${JAVA_DEBUG_SUSPEND}" | grep -q -e '^\(false\|n\|no\|0\)$'; then
+        suspend_mode="y"
+      fi
+    fi
+    echo "-agentlib:jdwp=transport=dt_socket,server=y,suspend=${suspend_mode},address=${debug_port}"
+  fi
+}
+
+# Read in a classpath either from a file with a single line, colon separated
+# or given line-by-line in separate lines
+# Arg 1: path to claspath (must exist), optional arg2: application jar, which is stripped from the classpath in
+# multi line arrangements
+format_classpath() {
+  local cp_file="$1"
+  local app_jar="${2:-}"
+
+  local wc_out="$(wc -l $1 2>&1)"
+  if [ $? -ne 0 ]; then
+    echo "Cannot read lines in ${cp_file}: $wc_out"
+    exit 1
+  fi
+
+  local nr_lines=$(echo $wc_out | awk '{ print $1 }')
+  if [ ${nr_lines} -gt 1 ]; then
+    local sep=""
+    local classpath=""
+    while read file; do
+      local full_path="${JAVA_LIB_DIR}/${file}"
+      # Don't include app jar if include in list
+      if [ "${app_jar}" != "${full_path}" ]; then
+        classpath="${classpath}${sep}${full_path}"
+      fi
+      sep=":"
+    done < "${cp_file}"
+    echo "${classpath}"
+  else
+    # Supposed to be a single line, colon separated classpath file
+    cat "${cp_file}"
+  fi
+}
+
+# ==========================================================================
+
+memory_options() {
+  echo "$(calc_init_memory) $(calc_max_memory)"
+  return
+}
+
+# Check for memory options and set max heap size if needed
+calc_max_memory() {
+  # Check whether -Xmx is already given in JAVA_OPTIONS
+  if echo "${JAVA_OPTIONS:-}" | grep -q -- "-Xmx"; then
+    return
+  fi
+
+  if [ -z "${CONTAINER_MAX_MEMORY:-}" ]; then
+    return
+  fi
+
+  # Check for the 'real memory size' and calculate Xmx from the ratio
+  if [ -n "${JAVA_MAX_MEM_RATIO:-}" ]; then
+    if [ "${JAVA_MAX_MEM_RATIO}" -eq 0 ]; then
+      # Explicitely switched off
+      return
+    fi
+    calc_mem_opt "${CONTAINER_MAX_MEMORY}" "${JAVA_MAX_MEM_RATIO}" "mx"
+  # When JAVA_MAX_MEM_RATIO not set and JVM >= 10 no max_memory
+  elif [ "${JAVA_MAJOR_VERSION:-0}" -ge "10" ]; then
+    return
+  elif [ "${CONTAINER_MAX_MEMORY}" -le 314572800 ]; then
+    # Restore the one-fourth default heap size instead of the one-half below 300MB threshold
+    # See https://docs.oracle.com/javase/8/docs/technotes/guides/vm/gctuning/parallel.html#default_heap_size
+    calc_mem_opt "${CONTAINER_MAX_MEMORY}" "25" "mx"
+  else
+    calc_mem_opt "${CONTAINER_MAX_MEMORY}" "50" "mx"
+  fi
+}
+
+# Check for memory options and set initial heap size if requested
+calc_init_memory() {
+  # Check whether -Xms is already given in JAVA_OPTIONS.
+  if echo "${JAVA_OPTIONS:-}" | grep -q -- "-Xms"; then
+    return
+  fi
+
+  # Check if value set
+  if [ -z "${JAVA_INIT_MEM_RATIO:-}" ] || [ -z "${CONTAINER_MAX_MEMORY:-}" ] || [ "${JAVA_INIT_MEM_RATIO}" -eq 0 ]; then
+    return
+  fi
+
+  # Calculate Xms from the ratio given
+  calc_mem_opt "${CONTAINER_MAX_MEMORY}" "${JAVA_INIT_MEM_RATIO}" "ms"
+}
+
+calc_mem_opt() {
+  local max_mem="$1"
+  local fraction="$2"
+  local mem_opt="$3"
+
+  local val=$(calc 'round($1*$2/100/1048576)' "${max_mem}" "${fraction}")
+  echo "-X${mem_opt}${val}m"
+}
+
+c2_disabled() {
+  if [ -n "${CONTAINER_MAX_MEMORY:-}" ]; then
+    # Disable C2 compiler when container memory <=300MB
+    if [ "${CONTAINER_MAX_MEMORY}" -le 314572800 ]; then
+      echo true
+      return
+    fi
+  fi
+  echo false
+}
+
+jit_options() {
+  if [ "${JAVA_MAJOR_VERSION:-0}" -ge "10" ]; then
+    return
+  fi
+  # Check whether -XX:TieredStopAtLevel is already given in JAVA_OPTIONS
+  if echo "${JAVA_OPTIONS:-}" | grep -q -- "-XX:TieredStopAtLevel"; then
+    return
+  fi
+  if [ $(c2_disabled) = true ]; then
+    echo "-XX:TieredStopAtLevel=1"
+  fi
+}
+
+# Switch on diagnostics except when switched off
+diagnostics_options() {
+  if [ -n "${JAVA_DIAGNOSTICS:-}" ]; then
+    if [ "${JAVA_MAJOR_VERSION:-0}" -ge "11" ]; then
+      echo "-XX:NativeMemoryTracking=summary -Xlog:gc*:stdout:time -XX:+UnlockDiagnosticVMOptions"
+    else
+      echo "-XX:NativeMemoryTracking=summary -XX:+PrintGC -XX:+PrintGCDateStamps -XX:+PrintGCTimeStamps -XX:+UnlockDiagnosticVMOptions"
+    fi
+  fi
+}
+
+# Replicate thread ergonomics for tiered compilation.
+# This could ideally be skipped when tiered compilation is disabled.
+# The algorithm is taken from:
+# OpenJDK / jdk8u / jdk8u / hotspot
+# src/share/vm/runtime/advancedThresholdPolicy.cpp
+ci_compiler_count() {
+  local core_limit="$1"
+  local log_cpu=$(calc 'log2($1)' "$core_limit")
+  local loglog_cpu=$(calc 'log2(max2($1,1))' "$log_cpu")
+  local count=$(calc 'max2($1*$2,1)*3/2' "$log_cpu" "$loglog_cpu")
+  local c1_count=$(calc 'max2($1/3,1)' "$count")
+  local c2_count=$(calc 'max2($1-$2,1)' "$count" "$c1_count")
+  [ $(c2_disabled) = true ] && echo "$c1_count" || echo $(calc '$1+$2' "$c1_count" "$c2_count")
+}
+
+cpu_options() {
+  # JVMs >= 10 know about CPU limits
+  if [ "${JAVA_MAJOR_VERSION:-0}" -ge "10" ]; then
+    return
+  fi
+
+  local core_limit="${JAVA_CORE_LIMIT:-}"
+  if [ "$core_limit" = "0" ]; then
+    return
+  fi
+
+  if [ -n "${CONTAINER_CORE_LIMIT:-}" ]; then
+    if [ -z ${core_limit} ]; then
+      core_limit="${CONTAINER_CORE_LIMIT}"
+    fi
+    echo "-XX:ParallelGCThreads=${core_limit} " \
+         "-XX:ConcGCThreads=${core_limit} " \
+         "-Djava.util.concurrent.ForkJoinPool.common.parallelism=${core_limit} " \
+         "-XX:CICompilerCount=$(ci_compiler_count $core_limit)"
+  fi
+}
+
+#-XX:MinHeapFreeRatio=20  These parameters tell the heap to shrink aggressively and to grow conservatively.
+#-XX:MaxHeapFreeRatio=40  Thereby optimizing the amount of memory available to the operating system.
+heap_ratio() {
+  echo "-XX:MinHeapFreeRatio=20 -XX:MaxHeapFreeRatio=40"
+}
+
+# These parameters are necessary when running parallel GC if you want to use the Min and Max Heap Free ratios.
+# Skip setting gc_options if any other GC is set in JAVA_OPTIONS.
+# -XX:GCTimeRatio=4
+# -XX:AdaptiveSizePolicyWeight=90
+gc_options() {
+  if echo "${JAVA_OPTIONS:-}" | grep -q -- "-XX:.*Use.*GC"; then
+    return
+  fi
+
+  local opts=""
+  # for JVMs < 10 set GC settings
+  if [ -z "${JAVA_MAJOR_VERSION:-}" ] || [ "${JAVA_MAJOR_VERSION:-0}" -lt "10" ]; then
+    opts="${opts} -XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 $(heap_ratio)"
+  fi
+  if [ -z "${JAVA_MAJOR_VERSION:-}" ] || [ "${JAVA_MAJOR_VERSION:-}" != "7" ]; then
+    opts="${opts} -XX:+ExitOnOutOfMemoryError"
+  fi
+  echo $opts
+}
+
+java_default_options() {
+  # Echo options, trimming trailing and multiple spaces
+  echo "$(memory_options) $(jit_options) $(diagnostics_options) $(cpu_options) $(gc_options)" | awk '$1=$1'
+
+}
+
+# ==============================================================================
+
+# parse the URL
+parse_url() {
+  #[scheme://][user[:password]@]host[:port][/path][?params]
+  echo "$1" | sed -e "s+^\(\([^:]*\)://\)\?\(\([^:@]*\)\(:\([^@]*\)\)\?@\)\?\([^:/?]*\)\(:\([^/?]*\)\)\?.*$+ local scheme='\2' username='\4' password='\6' hostname='\7' port='\9'+"
+}
+
+java_proxy_options() {
+  local url="$1"
+  local transport="$2"
+  local ret=""
+
+  if [ -n "$url" ] ; then
+    eval $(parse_url "$url")
+    if [ -n "$hostname" ] ; then
+      ret="-D${transport}.proxyHost=${hostname}"
+    fi
+    if [ -n "$port" ] ; then
+      ret="$ret -D${transport}.proxyPort=${port}"
+    fi
+    if [ -n "$username" -o -n "$password" ] ; then
+      echo "WARNING: Proxy URL for ${transport} contains authentication credentials, these are not supported by java" >&2
+    fi
+  fi
+  echo "$ret"
+}
+
+# Check for proxy options and echo if enabled.
+proxy_options() {
+  local ret=""
+  ret="$(java_proxy_options "${https_proxy:-${HTTPS_PROXY:-}}" https)"
+  ret="$ret $(java_proxy_options "${http_proxy:-${HTTP_PROXY:-}}" http)"
+
+  local noProxy="${no_proxy:-${NO_PROXY:-}}"
+  if [ -n "$noProxy" ] ; then
+    ret="$ret -Dhttp.nonProxyHosts=$(echo "|$noProxy" | sed -e 's/,[[:space:]]*/|/g' | sed -e 's/[[:space:]]//g' | sed -e 's/|\./|\*\./g' | cut -c 2-)"
+  fi
+  echo "$ret"
+}
+
+# ==============================================================================
+
+# Set process name if possible
+exec_args() {
+  EXEC_ARGS=""
+  if [ -n "${JAVA_APP_NAME:-}" ]; then
+    # Not all shells support the 'exec -a newname' syntax..
+    if $(exec -a test true 2>/dev/null); then
+      echo "-a '${JAVA_APP_NAME}'"
+    fi
+  fi
+}
+
+# Combine all java options
+java_options() {
+  # Normalize spaces with awk (i.e. trim and elimate double spaces)
+  # See e.g. https://www.physicsforums.com/threads/awk-1-1-1-file-txt.658865/ for an explanation
+  # of this awk idiom
+  echo "${JAVA_OPTIONS:-} $(run_java_options) $(debug_options) $(proxy_options) $(java_default_options)" | awk '$1=$1'
+}
+
+# Fetch classpath from env or from a local "run-classpath" file
+classpath() {
+  local cp_path="."
+  if [ "${JAVA_LIB_DIR}" != "${JAVA_APP_DIR}" ]; then
+    cp_path="${cp_path}:${JAVA_LIB_DIR}"
+  fi
+  if [ -z "${JAVA_CLASSPATH:-}" ] && [ -n "${JAVA_MAIN_CLASS:-}" ]; then
+    if [ -n "${JAVA_APP_JAR:-}" ]; then
+      cp_path="${cp_path}:${JAVA_APP_JAR}"
+    fi
+    if [ -f "${JAVA_LIB_DIR}/classpath" ]; then
+      # Classpath is pre-created and stored in a 'run-classpath' file
+      cp_path="${cp_path}:$(format_classpath ${JAVA_LIB_DIR}/classpath ${JAVA_APP_JAR:-})"
+    else
+      # No order implied
+      cp_path="${cp_path}:${JAVA_APP_DIR}/*"
+    fi
+  elif [ -n "${JAVA_CLASSPATH:-}" ]; then
+    # Given from the outside
+    cp_path="${JAVA_CLASSPATH}"
+  fi
+  echo "${cp_path}"
+}
+
+# Checks if a flag is present in the arguments.
+hasflag() {
+    local filters="$@"
+    for var in $ARGS; do
+        for filter in $filters; do
+          if [ "$var" = "$filter" ]; then
+              echo 'true'
+              return
+          fi
+        done
+    done
+}
+
+# ==============================================================================
+
+options() {
+    if [ -z ${1:-} ]; then
+      java_options
+      return
+    fi
+
+    local ret=""
+    if [ $(hasflag --debug) ]; then
+      ret="$ret $(debug_options)"
+    fi
+    if [ $(hasflag --proxy) ]; then
+      ret="$ret $(proxy_options)"
+    fi
+    if [ $(hasflag --java-default) ]; then
+      ret="$ret $(java_default_options)"
+    fi
+    if [ $(hasflag --memory) ]; then
+      ret="$ret $(memory_options)"
+    fi
+    if [ $(hasflag --jit) ]; then
+      ret="$ret $(jit_options)"
+    fi
+    if [ $(hasflag --diagnostics) ]; then
+      ret="$ret $(diagnostics_options)"
+    fi
+    if [ $(hasflag --cpu) ]; then
+      ret="$ret $(cpu_options)"
+    fi
+    if [ $(hasflag --gc) ]; then
+      ret="$ret $(gc_options)"
+    fi
+
+    echo $ret | awk '$1=$1'
+}
+
+# Start JVM
+run() {
+  # Initialize environment
+  load_env $(script_dir)
+
+  local args
+  cd ${JAVA_APP_DIR}
+  if [ -n "${JAVA_MAIN_CLASS:-}" ] ; then
+     args="${JAVA_MAIN_CLASS}"
+  elif [ -n "${JAVA_APP_JAR:-}" ]; then
+     args="-jar ${JAVA_APP_JAR}"
+  else
+     echo "Either JAVA_MAIN_CLASS or JAVA_APP_JAR needs to be given"
+     exit 1
+  fi
+  # Don't put ${args} in quotes, otherwise it would be interpreted as a single arg.
+  # However it could be two args (see above). zsh doesn't like this btw, but zsh is not
+  # supported anyway.
+  echo exec $(exec_args) java $(java_options) -cp "$(classpath)" ${args} "$@"
+  exec $(exec_args) java $(java_options) -cp "$(classpath)" ${args} "$@"
+}
+
+# =============================================================================
+# Fire up
+
+# Set env vars reflecting limits
+init_limit_env_vars
+
+first_arg=${1:-}
+if [ "${first_arg}" = "options" ]; then
+  # Print out options only
+  shift
+  options $@
+  exit 0
+elif [ "${first_arg}" = "run" ]; then
+  # Run is the default command, but can be given to allow "options"
+  # as first argument to your
+  shift
+fi
+run "$@"
diff --git a/templates/Dockerfile b/templates/Dockerfile
index a3e8cf6..f80ec45 100644
--- a/templates/Dockerfile
+++ b/templates/Dockerfile
@@ -9,14 +9,25 @@ ENV JAVA_APP_DIR={{= fp.config.base.baseDir }} \
     JAVA_MAJOR_VERSION={{= fp.config.version.major }}
 
 {{= fp.block("java-pkg-" + fp.param.base) || ''}}
-{{= fp.block(fp.config.base.agent, "install", { dest: "/opt/run-java-options" }) }}
+{{=
+  fp.block("jmx_exporter", "install",
+          { dest: "/opt/prometheus/prometheus-opts",
+            userGroupMode: "root" }) }}
+
+{{=
+  fp.block("jolokia", "install",
+          { dest: "/opt/jolokia/jolokia-opts",
+            userGroupMode: "root" }) }}
+
 {{= fp.block("run-java-sh","copy",{dest: fp.config.base.baseDir}) }}
+COPY run-java-options /opt
 
 {{? fp.config.base.user }}
 # Run under user "{{= fp.config.base.user}}" and prepare for be running
 # under OpenShift, too
 RUN {{? fp.config.base.createUser }}groupadd -r {{= fp.config.base.user }} -g 1000 \
   && useradd -u 1000 -r -g {{= fp.config.base.user }} -m -d /opt/{{= fp.config.base.user}} -s /sbin/nologin {{= fp.config.base.user }} \
+  && chmod 755 /opt/run-java-options \
   && chmod 755 /opt/{{= fp.config.base.user }} \
   && {{?}}chown -R {{= fp.config.base.user}} {{= fp.config.base.baseDir }} \
   && usermod -g root -G `id -g {{= fp.config.base.user }}` {{= fp.config.base.user }} \
diff --git a/templates/README.md b/templates/README.md
index 21c7c69..276250d 100644
--- a/templates/README.md
+++ b/templates/README.md
@@ -1,30 +1,29 @@
 ## Fabric8 Java Base Image {{= fp.config.version.description }} ({{= fp.param.type.toUpperCase() }})
 
-{{? fp.config.base.deprecated }}> ** This image is deprecated and not maintained anymore. Please select one of the other flavors (alpine, centos).**
-
------
-{{?}}
-
 This image is based on {{= fp.config.base.description }} and provides {{= fp.config.version.description }} ({{= fp.param.type.toUpperCase() }})
 
 It includes:
 
-{{? fp.config.base.agent == "agent-bond" }}
-* An [Agent Bond](https://github.com/fabric8io/agent-bond) agent with [Jolokia](http://www.jolokia.org) and Prometheus' [jmx_exporter](https://github.com/prometheus/jmx_exporter). The agent is installed as `/opt/agent-bond/agent-bond.jar`. See below for configuration options.
-{{?? fp.config.base.agent == "jolokia" }}
-*  A [Jolokia](http://www.jolokia.org) agent. See below how to configure this.
-{{?}}
-
 * A startup script [`{{= fp.config.base.baseDir }}/run-java.sh`](#startup-script-run-javash) for starting up Java applications.
+* [Jolokia](http://www.jolokia.org) agent installed in `/opt/jolokia`
+* Prometheus [jmx_exporter](https://github.com/prometheus/jmx_exporter) agent installed in `/opt/jmx_exporter`.
+
+### Startup Script run-java.sh
+
+The default command for this image is [{{= fp.config.base.baseDir }}/run-java.sh](https://github.com/fabric8io/run-java-sh). Its purpose it to fire up Java applications which are provided as fat-jars, including all dependencies or more classical from a main class, where the classpath is build up from all jars within a directory.
+
+For these images the variable **JAVA_APP_DIR** has the default value `{{= fp.config.base.baseDir }}`
 
-### Agent Bond
+{{= fp.block('run-java-sh','readme',{ 'fp-no-files' : true }) }}
+
+### Monitoring Agents
 
-In order to enable Jolokia for your application you should use this image as a base image (via `FROM`) and use the output of `agent-bond-opts` in your startup scripts to include it in for the Java startup options.
+In order to enable Jolokia and Prometheus exporter for your application you should use this image as a base image (via `FROM`) and use the output of `jolokia-opts` and `prometheus-opts` in your startup scripts to include it in for the Java startup options. You can also just use the provided startup script `/opt/run-java.sh` which does this automatically.
 
 For example, the following snippet can be added to a script starting up your Java application
 
     # ...
-    export JAVA_OPTIONS="$JAVA_OPTIONS $(agent-bond-opts)"
+    export JAVA_OPTIONS="$JAVA_OPTIONS $(/opt/jolokia/jolokia-opts) $(/opt/prometheus/prometheus-opts)"
     # .... use JAVA_OPTIONS when starting your app, e.g. as Tomcat does
 
 The following versions and defaults are used:
@@ -32,22 +31,15 @@ The following versions and defaults are used:
 * [Jolokia](http://www.jolokia.org) : version **{{= fp.version.jolokia }}** and port **8778**
 * [jmx_exporter](https://github.com/prometheus/jmx_exporter): version **{{= fp.version.jmxExporter }}** and port **9779**
 
-You can influence the behaviour of `agent-bond-opts` by setting various environment variables:
+You can influence the behaviour of these config scripts by setting various environment variables.
 
-{{= fp.block(fp.config.base.agent,'readme',{ 'fp-no-files' : true }) }}
+{{= fp.block('jolokia','readme',{ 'fp-no-files' : true }) }}
 
-### Startup Script run-java.sh
-
-The default command for this image is [{{= fp.config.base.baseDir }}/run-java.sh](https://github.com/fabric8io/run-java-sh). Its purpose it to fire up Java applications which are provided as fat-jars, including all dependencies or more classical from a main class, where the classpath is build up from all jars within a directory.
-
-For these images the variable **JAVA_APP_DIR** has the default value `{{= fp.config.base.baseDir }}`
-
-{{= fp.block('run-java-sh','readme',{ 'fp-no-files' : true }) }}
+{{= fp.block('jmxexporter','readme',{ 'fp-no-files' : true }) }}
 
 ### Versions:
 
 * Base-Image: **{{= fp.config.base.description + " " + fp.config.base.version }}**
-* Java: **{{= fp.config.version.description + " " + fp.config.version.version }}** ({{= fp.config.type.description }}){{? fp.config.base.agent == "agent-bond" }}
-* Agent-Bond: **{{= fp.version.agentBond }}** (Jolokia {{= fp.version.jolokia }}, jmx_exporter {{= fp.version.jmxExporter }}){{?? fp.config.base.agent == "jolokia" }}
+* Java: **{{= fp.config.version.description + " " + fp.config.version.version }}** ({{= fp.config.type.description }})
 * Jolokia: **{{= fp.version.jolokia }}**
-{{?}}
+* jmx_exporter: **{{= fp.version.jmx_exporter }}**
diff --git a/templates/jmx_exporter_config.yml b/templates/jmx_exporter_config.yml
deleted file mode 100644
index 620cd4a..0000000
--- a/templates/jmx_exporter_config.yml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-lowercaseOutputName: true
-lowercaseOutputLabelNames: true
-whitelistObjectNames:
-  - 'org.apache.camel:*'
-rules:
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>((?:Min|Mean|Max|Last|Delta)(?:ProcessingTime)):'
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>(TotalProcessingTime):'
-    type: COUNTER
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>(ExchangesInflight|LastProcessingTime):'
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
-  - pattern: '^org.apache.camel<context=(\w+), type=routes, name=\"(\S+)\"><>((?:Exchanges(?:Completed|Failed|Total))|FailuresHandled):'
-    type: COUNTER
-    name: camel_routes_$3
-    labels:
-      name: $2
-      context: $1
diff --git a/templates/run-java-options b/templates/run-java-options
new file mode 100644
index 0000000..759dee7
--- /dev/null
+++ b/templates/run-java-options
@@ -0,0 +1,4 @@
+#!/bin/bash
+# Delegate to the individual agent options scripts which will
+# examine the environment for features to be enabled
+echo "$(/opt/jolokia/jolokia-opts) $(/opt/prometheus/prometheus-opts)"