ENTMQBR-2557 Enable new metrics plugin for broker in container image

also fixed a typo in amq-broker-74-persistence-clustered.yaml (cherry picked from commit d3843cd)
honghuac · Aug 22, 2019 · 3139fb7 · 3139fb7
1 parent fffc184
commit 3139fb7
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 2 deletions.
diff --git a/modules/amq-launch/added/launch.sh b/modules/amq-launch/added/launch.sh
@@ -244,6 +244,11 @@ function configureJAVA_ARGSMemory() {
   sed -i "s/\-Xms[0-9]*[mMgG] \-Xmx[0-9]*[mMgG] \-Dhawtio/\ -Dhawtio/g" ${instanceDir}/etc/artemis.profile
 }
 
+function injectMetricsPlugin() {
+  instanceDir=$1
+  echo "Adding artemis metrics plugin"
+  sed -i "s/^\([[:blank:]]*\)<\\/core>/\1\1<metrics-plugin class-name=\"org.apache.activemq.artemis.core.server.metrics.plugins.ArtemisPrometheusMetricsPlugin\"\\/>\\n\1<\\/core>/" $instanceDir/etc/broker.xml
+}
 
 function configure() {
   instanceDir=$1
@@ -317,6 +322,12 @@ function configure() {
     configureLogging ${instanceDir}
     configureJAVA_ARGSMemory ${instanceDir}
 
+    if [ "$AMQ_ENABLE_METRICS_PLUGIN" = "true" ]; then
+      echo "Enable artemis metrics plugin"
+      injectMetricsPlugin ${instanceDir}
+      injectMetricsWar ${instanceDir}
+    fi
+
     $AMQ_HOME/bin/configure_s2i_files.sh ${instanceDir}
     $AMQ_HOME/bin/configure_custom_config.sh ${instanceDir}
   fi

diff --git a/templates/amq-broker-75-basic.yaml b/templates/amq-broker-75-basic.yaml
@@ -154,6 +154,8 @@ objects:
             value: ${AMQ_ANYCAST_PREFIX}
           - name: AMQ_MULTICAST_PREFIX
             value: ${AMQ_MULTICAST_PREFIX}
+          - name: AMQ_ENABLE_METRICS_PLUGIN
+            value: ${AMQ_ENABLE_METRICS_PLUGIN}
           image: ${IMAGE}
           imagePullPolicy: Always
           readinessProbe:
@@ -259,3 +261,7 @@ parameters:
   name: AMQ_CREDENTIAL_SECRET
   required: true
   value: amq-credential-secret
+- description: Whether to enable artemis metrics plugin
+  displayName: Enable Metrics Plugin
+  name: AMQ_ENABLE_METRICS_PLUGIN
+  required: false
diff --git a/templates/amq-broker-75-persistence-clustered-ssl.yaml b/templates/amq-broker-75-persistence-clustered-ssl.yaml
@@ -382,13 +382,15 @@ objects:
             valueFrom:
               fieldRef:
                 fieldPath: metadata.namespace
+          - name: AMQ_ENABLE_METRICS_PLUGIN
+            value: ${AMQ_ENABLE_METRICS_PLUGIN}
           readinessProbe:
             exec:
               command:
               - "/bin/bash"
               - "-c"
               - "/opt/amq/bin/readinessProbe.sh"
-          image: ${IMAGE}              
+          image: ${IMAGE}
           name: ${APPLICATION_NAME}-amq
           ports:
           - containerPort: 8161
@@ -567,3 +569,7 @@ parameters:
   name: IMAGE
   required: true
   value: registry.redhat.io/amq7/amq-broker:7.5
+- description: Whether to enable artemis metrics plugin
+  displayName: Enable Metrics Plugin
+  name: AMQ_ENABLE_METRICS_PLUGIN
+  required: false
diff --git a/templates/amq-broker-75-persistence-clustered.yaml b/templates/amq-broker-75-persistence-clustered.yaml
@@ -302,7 +302,7 @@ objects:
           - name: AMQ_PASSWORD
             valueFrom:
               secretKeyRef:
-                name: ${}AMQ_CREDENTIAL_SECRET
+                name: ${AMQ_CREDENTIAL_SECRET}
                 key: ${AMQ_PASSWORD}
           - name: AMQ_ROLE
             value: ${AMQ_ROLE}
@@ -346,6 +346,8 @@ objects:
             valueFrom:
               fieldRef:
                 fieldPath: metadata.namespace
+          - name: AMQ_ENABLE_METRICS_PLUGIN
+            value: ${AMQ_ENABLE_METRICS_PLUGIN}
           readinessProbe:
             exec:
               command:
@@ -485,3 +487,7 @@ parameters:
   name: AMQ_CREDENTIAL_SECRET
   required: true
   value: amq-credential-secret
+- description: Whether to enable artemis metrics plugin
+  displayName: Enable Metrics Plugin
+  name: AMQ_ENABLE_METRICS_PLUGIN
+  required: false
diff --git a/templates/amq-broker-75-persistence-ssl.yaml b/templates/amq-broker-75-persistence-ssl.yaml
@@ -164,6 +164,8 @@ objects:
             valueFrom:
               fieldRef:
                 fieldPath: metadata.namespace
+          - name: AMQ_ENABLE_METRICS_PLUGIN
+            value: ${AMQ_ENABLE_METRICS_PLUGIN}
           image: ${IMAGE}
           readinessProbe:
             exec:
@@ -341,3 +343,7 @@ parameters:
   name: IMAGE
   required: true
   value: registry.redhat.io/amq7/amq-broker:7.5
+- description: Whether to enable artemis metrics plugin
+  displayName: Enable Metrics Plugin
+  name: AMQ_ENABLE_METRICS_PLUGIN
+  required: false
diff --git a/templates/amq-broker-75-persistence.yaml b/templates/amq-broker-75-persistence.yaml
@@ -124,6 +124,8 @@ objects:
             value: ${AMQ_ANYCAST_PREFIX}
           - name: AMQ_MULTICAST_PREFIX
             value: ${AMQ_MULTICAST_PREFIX}
+          - name: AMQ_ENABLE_METRICS_PLUGIN
+            value: ${AMQ_ENABLE_METRICS_PLUGIN}
           image: ${IMAGE}
           readinessProbe:
             exec:
@@ -253,3 +255,7 @@ parameters:
   name: AMQ_CREDENTIAL_SECRET
   required: true
   value: amq-credential-secret
+- description: Whether to enable artemis metrics plugin
+  displayName: Enable Metrics Plugin
+  name: AMQ_ENABLE_METRICS_PLUGIN
+  required: false
diff --git a/templates/amq-broker-75-ssl.yaml b/templates/amq-broker-75-ssl.yaml
@@ -237,6 +237,8 @@ objects:
               value: ${AMQ_ANYCAST_PREFIX}
             - name: AMQ_MULTICAST_PREFIX
               value: ${AMQ_MULTICAST_PREFIX}
+            - name: AMQ_ENABLE_METRICS_PLUGIN
+              value: ${AMQ_ENABLE_METRICS_PLUGIN}
             image: ${IMAGE}
             imagePullPolicy: Always
             readinessProbe:
@@ -391,3 +393,7 @@ parameters:
   name: IMAGE
   required: true
   value: registry.redhat.io/amq7/amq-broker:7.5
+- description: Whether to enable artemis metrics plugin
+  displayName: Enable Metrics Plugin
+  name: AMQ_ENABLE_METRICS_PLUGIN
+  required: false