From 7b047c455285eea3a6df4fdf0766d04ed8382cbb Mon Sep 17 00:00:00 2001 From: Andrew Williams Date: Sat, 18 Dec 2021 13:46:55 +0000 Subject: [PATCH] [hg612-exporter] Improve dashboard to handle pod restarts better --- charts/hg612-exporter/Chart.yaml | 2 +- charts/hg612-exporter/README.md | 18 +++++++++-- .../hg612-exporter/README_CHANGELOG.md.gotmpl | 17 +++++++++- charts/hg612-exporter/dashboards/hg612.json | 31 +++++++++---------- 4 files changed, 48 insertions(+), 20 deletions(-) diff --git a/charts/hg612-exporter/Chart.yaml b/charts/hg612-exporter/Chart.yaml index afc4513..65ade27 100644 --- a/charts/hg612-exporter/Chart.yaml +++ b/charts/hg612-exporter/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: 0.1.2 description: A prometheus exporter for the HG612 modem name: hg612-exporter -version: 1.1.2 +version: 1.1.3 kubeVersion: ">=1.16.0-0" keywords: - hg612-exporter diff --git a/charts/hg612-exporter/README.md b/charts/hg612-exporter/README.md index 43a7214..9e28766 100644 --- a/charts/hg612-exporter/README.md +++ b/charts/hg612-exporter/README.md @@ -1,6 +1,6 @@ # hg612-exporter -![Version: 1.1.2](https://img.shields.io/badge/Version-1.1.2-informational?style=flat-square) ![AppVersion: 0.1.2](https://img.shields.io/badge/AppVersion-0.1.2-informational?style=flat-square) +![Version: 1.1.3](https://img.shields.io/badge/Version-1.1.3-informational?style=flat-square) ![AppVersion: 0.1.2](https://img.shields.io/badge/AppVersion-0.1.2-informational?style=flat-square) A prometheus exporter for the HG612 modem @@ -100,7 +100,21 @@ All notable changes to this application Helm chart will be documented in this fi The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -### [1.1.1] +### [1.1.3] + +#### Added + +- N/A + +#### Changed + +- Improve chart to handle exporter pod restarts better + +#### Removed + +- N/A + +### [1.1.2] #### Added diff --git a/charts/hg612-exporter/README_CHANGELOG.md.gotmpl b/charts/hg612-exporter/README_CHANGELOG.md.gotmpl index 3ee8c14..c867083 100644 --- a/charts/hg612-exporter/README_CHANGELOG.md.gotmpl +++ b/charts/hg612-exporter/README_CHANGELOG.md.gotmpl @@ -9,7 +9,22 @@ All notable changes to this application Helm chart will be documented in this fi The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -### [1.1.1] +### [1.1.3] + +#### Added + +- N/A + +#### Changed + +- Improve chart to handle exporter pod restarts better + +#### Removed + +- N/A + + +### [1.1.2] #### Added diff --git a/charts/hg612-exporter/dashboards/hg612.json b/charts/hg612-exporter/dashboards/hg612.json index 5bada63..642b9a5 100644 --- a/charts/hg612-exporter/dashboards/hg612.json +++ b/charts/hg612-exporter/dashboards/hg612.json @@ -21,8 +21,7 @@ "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 0, - "id": 34, - "iteration": 1639831202787, + "iteration": 1639834876425, "links": [], "liveNow": false, "panels": [ @@ -92,7 +91,7 @@ "uid": "PBFA97CFB590B2093" }, "exemplar": true, - "expr": "dsl_status{host=\"$host\"}", + "expr": "avg by (host) (dsl_status{host=\"$host\"})", "interval": "", "legendFormat": "", "refId": "A" @@ -151,7 +150,7 @@ "uid": "PBFA97CFB590B2093" }, "exemplar": true, - "expr": "dsl_down_current_rate", + "expr": "avg by (host) (dsl_down_current_rate{host=\"$host\"})", "interval": "", "legendFormat": "Downstream", "refId": "A" @@ -162,7 +161,7 @@ "uid": "PBFA97CFB590B2093" }, "exemplar": true, - "expr": "dsl_up_current_rate", + "expr": "avg by (host) (dsl_up_current_rate{host=\"$host\"})", "hide": false, "interval": "", "legendFormat": "Upstream", @@ -261,7 +260,7 @@ "uid": "PBFA97CFB590B2093" }, "exemplar": true, - "expr": "dsl_down_current_rate{host=\"$host\"}", + "expr": "avg by (host) (dsl_down_current_rate{host=\"$host\"})", "interval": "", "legendFormat": "Down", "refId": "A" @@ -272,7 +271,7 @@ "uid": "PBFA97CFB590B2093" }, "exemplar": true, - "expr": "dsl_down_max_rate{host=\"$host\"}", + "expr": "avg by (host) (dsl_down_max_rate{host=\"$host\"})", "hide": false, "interval": "", "legendFormat": "Max Attainable", @@ -284,7 +283,7 @@ "uid": "PBFA97CFB590B2093" }, "exemplar": true, - "expr": "dsl_up_current_rate{host=\"$host\"} * -1", + "expr": "avg by (host) (dsl_up_current_rate{host=\"$host\"}) * -1", "hide": false, "interval": "", "legendFormat": "Up", @@ -296,7 +295,7 @@ "uid": "PBFA97CFB590B2093" }, "exemplar": true, - "expr": "dsl_up_max_rate{host=\"$host\"} * -1", + "expr": "avg by (host) (dsl_up_max_rate{host=\"$host\"}) * -1", "hide": false, "interval": "", "legendFormat": "Max Attainable", @@ -381,7 +380,7 @@ "uid": "PBFA97CFB590B2093" }, "exemplar": true, - "expr": "increase(dsl_down_crc{host=\"$host\"}[$__rate_interval]) * -1", + "expr": "sum by (host) (increase(dsl_down_crc{host=\"$host\"}[$__rate_interval])) * -1", "interval": "", "legendFormat": "CRC Down", "refId": "A" @@ -392,7 +391,7 @@ "uid": "PBFA97CFB590B2093" }, "exemplar": true, - "expr": "increase(dsl_up_crc{host=\"$host\"}[$__rate_interval])", + "expr": "sum by (host) (increase(dsl_up_crc{host=\"$host\"}[$__rate_interval]))", "hide": false, "interval": "", "legendFormat": "CRC Up", @@ -404,7 +403,7 @@ "uid": "PBFA97CFB590B2093" }, "exemplar": true, - "expr": "increase(dsl_down_fec{host=\"$host\"}[$__rate_interval]) * -1", + "expr": "sum by (host) (increase(dsl_down_fec{host=\"$host\"}[$__rate_interval])) * -1", "hide": false, "interval": "", "legendFormat": "FEC Down", @@ -416,7 +415,7 @@ "uid": "PBFA97CFB590B2093" }, "exemplar": true, - "expr": "increase(dsl_up_fec{host=\"$host\"}[$__rate_interval])", + "expr": "sum by (host) (increase(dsl_up_fec{host=\"$host\"}[$__rate_interval]))", "hide": false, "interval": "", "legendFormat": "FEC Up", @@ -428,7 +427,7 @@ "uid": "PBFA97CFB590B2093" }, "exemplar": true, - "expr": "increase(dsl_down_hec{host=\"$host\"}[$__rate_interval]) * -1", + "expr": "sum by (host) (increase(dsl_down_hec{host=\"$host\"}[$__rate_interval])) * -1", "hide": false, "interval": "", "legendFormat": "HEC Down", @@ -440,7 +439,7 @@ "uid": "PBFA97CFB590B2093" }, "exemplar": true, - "expr": "increase(dsl_up_hec{host=\"$host\"}[$__rate_interval])", + "expr": "sum by (host) (increase(dsl_up_hec{host=\"$host\"}[$__rate_interval]))", "hide": false, "interval": "", "legendFormat": "HEC Up", @@ -491,6 +490,6 @@ "timezone": "", "title": "HG612", "uid": "42KBhvTnz", - "version": 8, + "version": 9, "weekStart": "" }