Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[CLOUD-3074] Expose Subsystem metrics #60

Merged
merged 4 commits into from
Mar 26, 2019
Merged

[CLOUD-3074] Expose Subsystem metrics #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
78b293a
[CLOUD-3097] Add jboss.eap.cd16.openshift module
jmesnil Feb 12, 2019
2c25f2a
[CLOUD-3074] Expose Subsystem metrics
jmesnil Feb 12, 2019
03ae801
Merge branch 'master' into CLOUD-3074_metrics_subsystem
luck3y Mar 26, 2019
46bb9f6
Update standalone-openshift.xml
luck3y Mar 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions jboss-eap-cd16-openshift/added/standalone-openshift.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
<extension module="org.wildfly.extension.messaging-activemq"/>
<extension module="org.wildfly.extension.microprofile.config-smallrye"/>
<extension module="org.wildfly.extension.microprofile.health-smallrye"/>
<extension module="org.wildfly.extension.microprofile.metrics-smallrye"/>
<!-- ##TRACING_EXTENSION## -->
<extension module="org.wildfly.extension.request-controller"/>
<extension module="org.wildfly.extension.security.manager"/>
Expand Down Expand Up @@ -480,6 +481,10 @@
<!-- ##MICROPROFILE_CONFIG_SOURCE## -->
</subsystem>
<subsystem xmlns="urn:wildfly:microprofile-health-smallrye:1.0"/>
<subsystem xmlns="urn:wildfly:microprofile-metrics-smallrye:2.0"
security-enabled="false"
exposed-subsystems="*"
prefix="${wildfly.metrics.prefix:jboss}"/>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should it be jboss-eap instead of jboss ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Metrics that are exposed by EAP (using Prometheus JMX agent) already use the jboss prefix. https://github.com/jboss-container-images/jboss-eap-modules/blob/master/jboss/container/eap/prometheus/config/7.2/artifacts/opt/jboss/container/prometheus/etc/jmx-exporter-config.yaml#L43

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That something is already done does not mean it is correct

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there is no product jboss only jboss-eap

<!-- ##TRACING_SUBSYSTEM## -->
<subsystem xmlns="urn:jboss:domain:modcluster:5.0">
<proxy name="default" advertise-socket="modcluster" listener="ajp">
Expand Down
4 changes: 2 additions & 2 deletions os-eap7-launch/added/openshift-launch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ function runServer() {
log_info "Using CLI Graceful Shutdown instead of TERM signal"
fi

$JBOSS_HOME/bin/standalone.sh -c standalone-openshift.xml -bmanagement 127.0.0.1 -Djboss.server.data.dir="$instanceDir" ${JAVA_PROXY_OPTIONS} ${JBOSS_HA_ARGS} ${JBOSS_MESSAGING_ARGS} &
$JBOSS_HOME/bin/standalone.sh -c standalone-openshift.xml -bmanagement 127.0.0.1 -Djboss.server.data.dir="$instanceDir" -Dwildfly.statistics-enabled=true ${JAVA_PROXY_OPTIONS} ${JBOSS_HA_ARGS} ${JBOSS_MESSAGING_ARGS} &

PID=$!
wait $PID 2>/dev/null
Expand Down Expand Up @@ -71,7 +71,7 @@ else
log_info "Using CLI Graceful Shutdown instead of TERM signal"
fi

$JBOSS_HOME/bin/standalone.sh -c standalone-openshift.xml -bmanagement 127.0.0.1 ${JAVA_PROXY_OPTIONS} ${JBOSS_HA_ARGS} ${JBOSS_MESSAGING_ARGS} &
$JBOSS_HOME/bin/standalone.sh -c standalone-openshift.xml -bmanagement 127.0.0.1 -Dwildfly.statistics-enabled=true ${JAVA_PROXY_OPTIONS} ${JBOSS_HA_ARGS} ${JBOSS_MESSAGING_ARGS} &

PID=$!
wait $PID 2>/dev/null
Expand Down