diff --git a/CHANGELOG.md b/CHANGELOG.md index b21326dd..32240b82 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,11 @@ of [keepachangelog.com](http://keepachangelog.com/). ## 4.10.0 - Adds Native Prometheus client integration + - Prometheus is enabled by default. To set it to false, add the below lines in config under :ziggurat section + ```clojure + :prometheus {:port 8002 + :enabled [true :bool]} + ``` ## 4.9.1 diff --git a/doc/configuration.md b/doc/configuration.md index a7565167..0e9fc61a 100644 --- a/doc/configuration.md +++ b/doc/configuration.md @@ -20,6 +20,7 @@ All Ziggurat configs should be in your `clonfig` `config.edn` under the `:ziggur 10. [Jobs](#jobs) 11. [HTTP Server](#http-server) 12. [New Relic](#new-relic) +13. ```clojure {:ziggurat {:app-name "application_name" @@ -87,7 +88,9 @@ All Ziggurat configs should be in your `clonfig` `config.edn` under the `:ziggur :prefetch-count [4 :int]}} :http-server {:port [8010 :int] :graceful-shutdown-timeout-ms [30000 :int] - :new-relic {:report-errors [false :bool]}}}} + :new-relic {:report-errors [false :bool]}} + :prometheus {:port 8002 + :enabled [true :bool]}}} ``` @@ -204,3 +207,11 @@ All Ziggurat configs should be in your `clonfig` `config.edn` under the `:ziggur | Configuration | Data Type | Mandatory | Description | |------------------------------------|------------|-----------|---------------------------------------------------------------------------------------------| | **new-relic** | `Object` | No | If `report-errors` is true, reports an error to New Relic whenever a `:failure` keyword is returned from the mapper-function or an exception is raised. Can be disabled. | + + +## Prometheus + +| Configuration | Data Type | Mandatory | Description | +|----------------|------------|-----------|---------------------------------------------------------------------------------------------------------------| +| **prometheus** | `Object` | No | Prometheus configuration. By default set to ON. Set the port that prometheus server runs on and enabled flag. | +