Merge pull request #298 from jmtd/OPENJDK-777-take-2

[OPENJDK-777] Adjust Prometheus modules for 8.6 RPM scheme

Author: jmtd

modules/prometheus/8.2/artifacts/opt/jboss/container/prometheus/etc/jmx-exporter-config.yaml renamed to modules/prometheus/8.6.11/artifacts/opt/jboss/container/prometheus/etc/jmx-exporter-config.yaml

@@ -0,0 +1,28 @@
+schema_version: 1
+
+name: jboss.container.prometheus
+version: '8.6.11'
+description: ^
+  Provides support for configuring Prometheus.  Basic usage is
+  JAVA_OPTS="$JAVA_OPTS $(source $JBOSS_CONTAINER_PROMETHEUS_MODULE/prometheus-opts; get_prometheus_opts)"
+
+envs:
+- name: JBOSS_CONTAINER_PROMETHEUS_MODULE
+  value: /opt/jboss/container/prometheus
+- name: AB_PROMETHEUS_ENABLE
+  description: Enable the use of the Prometheus agent
+  example: true
+- name: AB_PROMETHEUS_JMX_EXPORTER_PORT
+  description: Port to use for the Prometheus JMX Exporter.
+  example: 9799
+- name: AB_PROMETHEUS_JMX_EXPORTER_CONFIG
+  value: /opt/jboss/container/prometheus/etc/jmx-exporter-config.yaml
+  description: Path to configuration to use for the Prometheus JMX Exporter
+
+execute:
+- script: configure.sh
+- script: backwards_compatibility.sh
+
+packages:
+  install:
+    - prometheus-jmx-exporter-openjdk11

modules/prometheus/8.2/artifacts/opt/jboss/container/prometheus/prometheus-opts renamed to modules/prometheus/8.6.11/artifacts/opt/jboss/container/prometheus/prometheus-opts

@@ -0,0 +1,22 @@
+#
+# Copyright 2018 Red Hat, Inc. and/or its affiliates
+# and other contributors as indicated by the @author tags.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+---
+lowercaseOutputName: true
+lowercaseOutputLabelNames: true
+blacklistObjectNames:
+# handled by agent's default exporter
+- "java.lang:*"

modules/prometheus/8.2/backwards_compatibility.sh renamed to modules/prometheus/8.6.11/backwards_compatibility.sh

@@ -0,0 +1,25 @@
+#!/bin/sh
+# ==============================================================================
+# Configure JVM options for Prometheus Agent
+#
+# Usage: JAVA_OPTS="$JAVA_OPTS $(source ${JBOSS_CONTAINER_PROMETHEUS_MODULE}/prometheus-opts && get_prometheus_opts)"
+#
+# Env Vars respected:
+#
+# AB_PROMETHEUS_ENABLE: Enable the use of the Prometheus agent.
+#
+# AB_PROMETHEUS_JMX_EXPORTER_PORT: Port to use for the Prometheus JMX Exporter.
+#   Defaults to 9799.
+#
+# AB_PROMETHEUS_JMX_EXPORTER_CONFIG: Path to configuration to use for the
+#   Prometheus JMX Exporter.  Defaults to:
+#   /opt/jboss/container/prometheus/etc/jmx-exporter-config.yaml
+#
+
+# echo's a complete -javaagent option based on the above variables.
+function get_prometheus_opts() {
+    if [ "${AB_PROMETHEUS_ENABLE^^}" = "TRUE" ]; then
+        echo "-javaagent:/usr/share/java/prometheus-jmx-exporter/jmx_prometheus_javaagent.jar=${AB_PROMETHEUS_JMX_EXPORTER_PORT:-9799}:${AB_PROMETHEUS_JMX_EXPORTER_CONFIG:-/opt/jboss/container/prometheus/etc/jmx-exporter-config.yaml}"
+    fi
+    echo ""
+}

modules/prometheus/8.2/configure.sh renamed to modules/prometheus/8.6.11/configure.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+set -ueo pipefail
+
+# Legacy location
+ln -s /usr/share/java/prometheus-jmx-exporter/jmx_prometheus_javaagent.jar \
+	$JBOSS_CONTAINER_PROMETHEUS_MODULE/jmx_prometheus_javaagent.jar

modules/prometheus/8.6.11/module.yaml

@@ -0,0 +1,15 @@
+#!/bin/sh
+# Configure module
+set -e
+
+SCRIPT_DIR=$(dirname $0)
+ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
+
+chown -R jboss:root ${ARTIFACTS_DIR}
+chmod 755 ${ARTIFACTS_DIR}/opt/jboss/container/prometheus/prometheus-opts
+chmod 775 ${ARTIFACTS_DIR}/opt/jboss/container/prometheus/etc
+chmod 775 ${ARTIFACTS_DIR}/opt/jboss/container/prometheus/etc/jmx-exporter-config.yaml
+
+pushd ${ARTIFACTS_DIR}
+cp -pr * /
+popd

modules/prometheus/8.6.17/artifacts/opt/jboss/container/prometheus/etc/jmx-exporter-config.yaml

@@ -0,0 +1,28 @@
+schema_version: 1
+
+name: jboss.container.prometheus
+version: '8.6.17'
+description: ^
+  Provides support for configuring Prometheus.  Basic usage is
+  JAVA_OPTS="$JAVA_OPTS $(source $JBOSS_CONTAINER_PROMETHEUS_MODULE/prometheus-opts; get_prometheus_opts)"
+
+envs:
+- name: JBOSS_CONTAINER_PROMETHEUS_MODULE
+  value: /opt/jboss/container/prometheus
+- name: AB_PROMETHEUS_ENABLE
+  description: Enable the use of the Prometheus agent
+  example: true
+- name: AB_PROMETHEUS_JMX_EXPORTER_PORT
+  description: Port to use for the Prometheus JMX Exporter.
+  example: 9799
+- name: AB_PROMETHEUS_JMX_EXPORTER_CONFIG
+  value: /opt/jboss/container/prometheus/etc/jmx-exporter-config.yaml
+  description: Path to configuration to use for the Prometheus JMX Exporter
+
+execute:
+- script: configure.sh
+- script: backwards_compatibility.sh
+
+packages:
+  install:
+    - prometheus-jmx-exporter-openjdk17