diff --git a/charts/loki-mixin/Chart.yaml b/charts/loki-mixin/Chart.yaml index b838a449..cf1d9846 100644 --- a/charts/loki-mixin/Chart.yaml +++ b/charts/loki-mixin/Chart.yaml @@ -28,12 +28,12 @@ keywords: # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.0 +version: 0.2.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 2.1.0 +appVersion: 2.2.0 maintainers: - name: nlamirault diff --git a/charts/loki-mixin/README.md b/charts/loki-mixin/README.md index 1bc5ecba..9d3fd1fc 100644 --- a/charts/loki-mixin/README.md +++ b/charts/loki-mixin/README.md @@ -1,6 +1,6 @@ # loki-mixin -![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.0](https://img.shields.io/badge/AppVersion-2.1.0-informational?style=flat-square) +![Version: 0.2.0](https://img.shields.io/badge/Version-0.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.2.0](https://img.shields.io/badge/AppVersion-2.2.0-informational?style=flat-square) A Helm chart for loki Mixin diff --git a/charts/promtail-mixin/Chart.yaml b/charts/promtail-mixin/Chart.yaml index 0f2ac2b4..cefba261 100644 --- a/charts/promtail-mixin/Chart.yaml +++ b/charts/promtail-mixin/Chart.yaml @@ -28,12 +28,12 @@ keywords: # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.0 +version: 0.2.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 2.1.0 +appVersion: 2.2.0 maintainers: - name: nlamirault diff --git a/charts/promtail-mixin/README.md b/charts/promtail-mixin/README.md index c92bad33..dc436b99 100644 --- a/charts/promtail-mixin/README.md +++ b/charts/promtail-mixin/README.md @@ -1,6 +1,6 @@ # promtail-mixin -![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.0](https://img.shields.io/badge/AppVersion-2.1.0-informational?style=flat-square) +![Version: 0.2.0](https://img.shields.io/badge/Version-0.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.2.0](https://img.shields.io/badge/AppVersion-2.2.0-informational?style=flat-square) A Helm chart for Promtail Mixin diff --git a/charts/promtail-mixin/templates/rules.yaml b/charts/promtail-mixin/templates/rules.yaml index 7ac81a15..b6928663 100644 --- a/charts/promtail-mixin/templates/rules.yaml +++ b/charts/promtail-mixin/templates/rules.yaml @@ -17,6 +17,18 @@ spec: groups: - name: promtail_rules rules: + - expr: histogram_quantile(0.99, sum(rate(promtail_request_duration_seconds_bucket[1m])) by (le, job)) + record: job:promtail_request_duration_seconds:99quantile + - expr: histogram_quantile(0.50, sum(rate(promtail_request_duration_seconds_bucket[1m])) by (le, job)) + record: job:promtail_request_duration_seconds:50quantile + - expr: sum(rate(promtail_request_duration_seconds_sum[1m])) by (job) / sum(rate(promtail_request_duration_seconds_count[1m])) by (job) + record: job:promtail_request_duration_seconds:avg + - expr: sum(rate(promtail_request_duration_seconds_bucket[1m])) by (le, job) + record: job:promtail_request_duration_seconds_bucket:sum_rate + - expr: sum(rate(promtail_request_duration_seconds_sum[1m])) by (job) + record: job:promtail_request_duration_seconds_sum:sum_rate + - expr: sum(rate(promtail_request_duration_seconds_count[1m])) by (job) + record: job:promtail_request_duration_seconds_count:sum_rate - expr: histogram_quantile(0.99, sum(rate(promtail_request_duration_seconds_bucket[1m])) by (le, job, namespace)) record: job_namespace:promtail_request_duration_seconds:99quantile - expr: histogram_quantile(0.50, sum(rate(promtail_request_duration_seconds_bucket[1m])) by (le, job, namespace)) diff --git a/hack/mixins.py b/hack/mixins.py index 5a140ea2..3c36bbed 100755 --- a/hack/mixins.py +++ b/hack/mixins.py @@ -26,7 +26,7 @@ import requests -MIXINS_VERSION = "v0.2.0" +MIXINS_VERSION = "v0.3.0" MIXIN_ARCHIVE = "monitoring-mixins-%s.zip" % MIXINS_VERSION MIXIN_URL = ( "https://github.com/nlamirault/monitoring-mixins/releases/download/%s/%s"