This is an automated email from the ASF dual-hosted git repository. sijie pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push: new c3c7f0d Collect metrics on number of logs lines printed (#2735) c3c7f0d is described below commit c3c7f0d219dc0f6ab6f9968ae045c21bb9afbd1a Author: Matteo Merli <mme...@apache.org> AuthorDate: Fri Oct 5 20:04:04 2018 -0700 Collect metrics on number of logs lines printed (#2735) ### Motivation Expose metrics in Prometheus regarding the number of log messages printed by each process. This will add metrics like: ``` # TYPE log4j2_appender_total counter log4j2_appender_total{cluster="standalone",level="debug"} 0.0 log4j2_appender_total{cluster="standalone",level="warn"} 1.0 log4j2_appender_total{cluster="standalone",level="trace"} 0.0 log4j2_appender_total{cluster="standalone",level="error"} 0.0 log4j2_appender_total{cluster="standalone",level="fatal"} 0.0 log4j2_appender_total{cluster="standalone",level="info"} 181.0 ``` --- conf/log4j2.yaml | 14 ++++++++++---- distribution/server/pom.xml | 5 +++++ distribution/server/src/assemble/LICENSE.bin.txt | 1 + pom.xml | 6 ++++++ 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/conf/log4j2.yaml b/conf/log4j2.yaml index 45ed5d9..2ecfd19 100644 --- a/conf/log4j2.yaml +++ b/conf/log4j2.yaml @@ -22,6 +22,7 @@ Configuration: status: INFO monitorInterval: 30 name: pulsar + packages: io.prometheus.client.log4j2 Properties: Property: @@ -43,7 +44,7 @@ Configuration: language: JavaScript path: ./conf/log4j2-scripts/filter.js charset: UTF-8 - + Appenders: # Console @@ -81,6 +82,9 @@ Configuration: IfLastModified: age: 30d + Prometheus: + name: Prometheus + # Routing Routing: name: RoutingAppender @@ -129,10 +133,12 @@ Configuration: # Default root logger configuration Root: level: info - additivity: false + additivity: true AppenderRef: - ref: "${sys:pulsar.log.appender}" level: "${sys:pulsar.log.level}" + - ref: Prometheus + level: info Logger: - name: org.apache.bookkeeper.bookie.BookieShell @@ -146,7 +152,7 @@ Configuration: additivity: false AppenderRef: - ref: Console - + # Logger to inject filter script # - name: org.apache.bookkeeper.mledger.impl.ManagedLedgerImpl # level: debug @@ -158,4 +164,4 @@ Configuration: # onMisMatch: DENY # ScriptRef: # ref: filter.js - + diff --git a/distribution/server/pom.xml b/distribution/server/pom.xml index 6a16d62..72af9a2 100644 --- a/distribution/server/pom.xml +++ b/distribution/server/pom.xml @@ -100,6 +100,11 @@ </dependency> <dependency> + <groupId>io.prometheus</groupId> + <artifactId>simpleclient_log4j2</artifactId> + </dependency> + + <dependency> <groupId>${project.groupId}</groupId> <artifactId>pulsar-zookeeper</artifactId> <version>${project.version}</version> diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index 66a0576..970808c 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -357,6 +357,7 @@ The Apache Software License, Version 2.0 - io.prometheus-simpleclient_common-0.0.23.jar - io.prometheus-simpleclient_hotspot-0.0.23.jar - io.prometheus-simpleclient_servlet-0.0.23.jar + - io.prometheus-simpleclient_log4j2-0.0.23.jar * Bean Validation API -- javax.validation-validation-api-1.1.0.Final.jar * Log4J - log4j-log4j-1.2.17.jar diff --git a/pom.xml b/pom.xml index ff78b65..90818d4 100644 --- a/pom.xml +++ b/pom.xml @@ -676,6 +676,12 @@ flexible messaging model and an intuitive client API.</description> <dependency> <groupId>io.prometheus</groupId> + <artifactId>simpleclient_log4j2</artifactId> + <version>${prometheus.version}</version> + </dependency> + + <dependency> + <groupId>io.prometheus</groupId> <artifactId>simpleclient_servlet</artifactId> <version>${prometheus.version}</version> </dependency>