diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c1f205..91e86c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,13 @@ This file only calls out major changes. Please see [the list of Git commits]( https://github.com/api7/nginx-lua-prometheus/commits/main) for the full list of changes. +## 1.2.0 + +- Accept an optional `error_metric_labels` map in `metric_data()` and + `collect()` to label the built-in error metric on output. Errors are still + counted under the bare name; an invalid map is logged, counted as an error, + and the bare metric is output (#30). + ## 1.1.1 - Update a metric's pending increment in place instead of allocating a new diff --git a/dist.ini b/dist.ini index 4bfd9b4..aedc8f6 100644 --- a/dist.ini +++ b/dist.ini @@ -1,6 +1,6 @@ name = nginx-lua-prometheus-api7 abstract = Prometheus metric library for Nginx -version = 1.1.1 +version = 1.2.0 author = Anton Tolchanov is_original = no license = mit diff --git a/rockspec/nginx-lua-prometheus-api7-1.1.1-1.rockspec b/rockspec/nginx-lua-prometheus-api7-1.2.0-1.rockspec similarity index 94% rename from rockspec/nginx-lua-prometheus-api7-1.1.1-1.rockspec rename to rockspec/nginx-lua-prometheus-api7-1.2.0-1.rockspec index 3fbc842..da83029 100644 --- a/rockspec/nginx-lua-prometheus-api7-1.1.1-1.rockspec +++ b/rockspec/nginx-lua-prometheus-api7-1.2.0-1.rockspec @@ -1,11 +1,11 @@ -- Note, this file must have version in its name -- (see https://github.com/knyar/nginx-lua-prometheus/issues/27) package = "nginx-lua-prometheus-api7" -version = "1.1.1-1" +version = "1.2.0-1" source = { url = "git+https://github.com/api7/nginx-lua-prometheus.git", - tag = "1.1.1", + tag = "1.2.0", } description = {