Skip to content

Commit

Permalink
make metrics endpoint configurable with sysprops/envs
Browse files Browse the repository at this point in the history
  • Loading branch information
jmazzitelli authored and jshaughn committed Dec 18, 2017
1 parent fec9c8b commit ac2034b
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 19 deletions.
2 changes: 1 addition & 1 deletion README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ You attach the Hawkular Java Agent to your own application, so running your appl
If you want to test the Hawkular Java Agent, you can run it standalone and just point it to a remote Java application to manage (you do this by addinga remote-dmr or remote-jmx managed server definition to its configuration file). You can run it like this:

```
java -Dhawkular.rest.user=jdoe -Dhawkular.rest.password=password -Dhawkular.rest.host=http://localhost:8080 -jar hawkular-javaagent/target/hawkular-javaagent-*-shaded.jar config=hawkular-javaagent-wildfly-feature-pack/src/main/resources/featurepack/content/standalone/configuration/hawkular-javaagent-config.yaml
java -Dhawkular.rest.user=jdoe -Dhawkular.rest.password=password -Dhawkular.rest.url=http://localhost:8080 -jar hawkular-javaagent/target/hawkular-javaagent-*-shaded.jar config=hawkular-javaagent-wildfly-feature-pack/src/main/resources/featurepack/content/standalone/configuration/hawkular-javaagent-config.yaml
```
28 changes: 10 additions & 18 deletions docker-dist/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,33 +20,25 @@ FROM jboss/wildfly:11.0.0.Final
MAINTAINER Hawkular project <[email protected]>

# ADD test-simple.war /opt/jboss/wildfly/standalone/deployments/
COPY target/hawkular-javaagent.jar $JBOSS_HOME/bin/
COPY target/hawkular-javaagent-config.yaml /opt/hawkular/configuration/

ADD src/main/resources/run_hawkular_javaagent.sh /opt/hawkular/bin/run_hawkular_agent.sh
COPY target/hawkular $JBOSS_HOME/
COPY src/main/resources/run_hawkular_javaagent.sh /opt/hawkular/bin/run_hawkular_agent.sh

ENV HAWKULAR_URL=http://hawkular:8080 \
HAWKULAR_AGENT_USER=jdoe \
HAWKULAR_AGENT_PASSWORD=password \
HAWKULAR_IMMUTABLE=true \
HAWKULAR_MODE=standalone
HAWKULAR_USER=jdoe \
HAWKULAR_PASSWORD=password \
HAWKULAR_AGENT_IMMUTABLE=true \
HAWKULAR_AGENT_METRICS_PORT=9779 \
HAWKULAR_AGENT_MODE=standalone

EXPOSE 8080 9090
EXPOSE 8080 9090 9779

USER root
RUN printf 'JAVA_OPTS="$JAVA_OPTS' >> $JBOSS_HOME/bin/standalone.conf
RUN printf 'HOST_CONTROLLER_JAVA_OPTS="$HOST_CONTROLLER_JAVA_OPTS' >> $JBOSS_HOME/bin/domain.conf
RUN printf ' -Djboss.modules.system.pkgs=org.jboss.byteman,org.jboss.logmanager -Djava.util.logging.manager=org.jboss.logmanager.LogManager -javaagent:$JBOSS_HOME/bin/hawkular-javaagent.jar=config=/opt/hawkular/configuration/hawkular-javaagent-config.yaml,delay=10' \
| tee -a $JBOSS_HOME/bin/standalone.conf $JBOSS_HOME/bin/domain.conf > /dev/null
RUN printf ' -Djboss.host.server-excluded-properties=jboss.modules.system.pkgs,java.util.logging.manager' >> $JBOSS_HOME/bin/domain.conf
RUN printf ' -Dhawkular.rest.host=${HAWKULAR_URL} -Dhawkular.agent.immutable=${HAWKULAR_IMMUTABLE} -Dhawkular.agent.in-container=${HAWKULAR_IMMUTABLE}"\n' \
| tee -a $JBOSS_HOME/bin/standalone.conf $JBOSS_HOME/bin/domain.conf > /dev/null


RUN yum install --quiet -y openssl && \
rm -rf /var/cache/yum && \
chown -RH jboss:0 $JBOSS_HOME/standalone $JAVA_HOME/jre/lib/security/cacerts /opt/hawkular && \
chmod -R ug+rw $JBOSS_HOME/standalone $JAVA_HOME/jre/lib/security/cacerts /opt/hawkular && \
chown -RH jboss:0 $JBOSS_HOME $JAVA_HOME/jre/lib/security/cacerts /opt/hawkular && \
chmod -R ug+rw $JBOSS_HOME $JAVA_HOME/jre/lib/security/cacerts /opt/hawkular && \
chmod -R a+rw /opt/hawkular/ && \
chmod -R a+x $JBOSS_HOME

Expand Down

0 comments on commit ac2034b

Please sign in to comment.