From ae4b58b763a2e5003d94b7807f528ac8d75f8ab3 Mon Sep 17 00:00:00 2001 From: jarvis Date: Wed, 18 Nov 2026 16:49:19 +0800 Subject: [PATCH 1/2] feat: release v1.1.2 --- CHANGELOG.md | 7 +++++++ dist.ini | 2 +- ...rockspec => nginx-lua-prometheus-api7-1.1.2-1.rockspec} | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) rename rockspec/{nginx-lua-prometheus-api7-1.1.1-1.rockspec => nginx-lua-prometheus-api7-1.1.2-1.rockspec} (94%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c1f205..08764c6 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.1.2 + +- 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..91475bb 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.1.2 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.1.2-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.1.2-1.rockspec index 3fbc842..7bf03c5 100644 --- a/rockspec/nginx-lua-prometheus-api7-1.1.1-1.rockspec +++ b/rockspec/nginx-lua-prometheus-api7-1.1.2-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.1.2-1" source = { url = "git+https://github.com/api7/nginx-lua-prometheus.git", - tag = "1.1.1", + tag = "1.1.2", } description = { From 808c6e8742068b078fc6cfa5595ded331e6c60f5 Mon Sep 17 00:00:00 2001 From: jarvis Date: Wed, 18 Nov 2026 17:01:26 +0800 Subject: [PATCH 2/2] chore: release as v1.2.0, as #30 adds an API --- CHANGELOG.md | 2 +- dist.ini | 2 +- ...-1.rockspec => nginx-lua-prometheus-api7-1.2.0-1.rockspec} | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) rename rockspec/{nginx-lua-prometheus-api7-1.1.2-1.rockspec => nginx-lua-prometheus-api7-1.2.0-1.rockspec} (94%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 08764c6..91e86c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ 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.1.2 +## 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 diff --git a/dist.ini b/dist.ini index 91475bb..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.2 +version = 1.2.0 author = Anton Tolchanov is_original = no license = mit diff --git a/rockspec/nginx-lua-prometheus-api7-1.1.2-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.2-1.rockspec rename to rockspec/nginx-lua-prometheus-api7-1.2.0-1.rockspec index 7bf03c5..da83029 100644 --- a/rockspec/nginx-lua-prometheus-api7-1.1.2-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.2-1" +version = "1.2.0-1" source = { url = "git+https://github.com/api7/nginx-lua-prometheus.git", - tag = "1.1.2", + tag = "1.2.0", } description = {