From 700f19e62656139335421ee634632acdede6d4f8 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 22 Jan 2024 14:05:16 +0100
Subject: [PATCH] Update promtail-mixin to monitoring-mixins-v1.7.0 (#660)

Signed-off-by: Nicolas Lamirault <nlamirault@users.noreply.github.com>
Co-authored-by: Nicolas Lamirault <nlamirault@users.noreply.github.com>
---
 charts/promtail-mixin/Chart.yaml               |  6 +++---
 charts/promtail-mixin/dashboards/promtail.json | 10 +---------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/charts/promtail-mixin/Chart.yaml b/charts/promtail-mixin/Chart.yaml
index 6c88d113..720fef89 100644
--- a/charts/promtail-mixin/Chart.yaml
+++ b/charts/promtail-mixin/Chart.yaml
@@ -27,8 +27,8 @@ keywords:
   - promtail
   - monitoring-mixin
   - portefaix
-version: 1.6.0
-appVersion: 2.9.2
+version: 1.7.0
+appVersion: 2.9.3
 
 maintainers:
   - name: nlamirault
@@ -50,4 +50,4 @@ annotations:
     url: https://keybase.io/nlamirault/pgp_keys.asc
   artifacthub.io/changes: |
     - kind: changed
-      description: promtail-mixin v2.9.2
+      description: promtail-mixin v2.9.3
diff --git a/charts/promtail-mixin/dashboards/promtail.json b/charts/promtail-mixin/dashboards/promtail.json
index c3148f59..d5aa43e6 100644
--- a/charts/promtail-mixin/dashboards/promtail.json
+++ b/charts/promtail-mixin/dashboards/promtail.json
@@ -60,7 +60,6 @@
                         {
                             "expr": "sum(promtail_targets_active_total{cluster=~\"$cluster\", namespace=~\"$namespace\"})",
                             "format": "time_series",
-                            "intervalFactor": 2,
                             "legendFormat": "Active Targets",
                             "legendLink": null
                         }
@@ -135,7 +134,6 @@
                         {
                             "expr": "sum(promtail_files_active_total{cluster=~\"$cluster\", namespace=~\"$namespace\"})",
                             "format": "time_series",
-                            "intervalFactor": 2,
                             "legendFormat": "Active Targets",
                             "legendLink": null
                         }
@@ -222,7 +220,6 @@
                         {
                             "expr": "sum(rate(promtail_read_bytes_total{cluster=~\"$cluster\", namespace=~\"$namespace\"}[1m]))",
                             "format": "time_series",
-                            "intervalFactor": 2,
                             "legendFormat": "logs read",
                             "legendLink": null
                         }
@@ -297,7 +294,6 @@
                         {
                             "expr": "sum(rate(promtail_read_lines_total{cluster=~\"$cluster\", namespace=~\"$namespace\"}[1m]))",
                             "format": "time_series",
-                            "intervalFactor": 2,
                             "legendFormat": "lines read",
                             "legendLink": null
                         }
@@ -394,7 +390,6 @@
                         {
                             "expr": "sum by (status) (\n  label_replace(label_replace(rate(promtail_request_duration_seconds_count{cluster=~\"$cluster\", namespace=~\"$namespace\"}[$__rate_interval]),\n  \"status\", \"${1}xx\", \"status_code\", \"([0-9])..\"),\n  \"status\", \"${1}\", \"status_code\", \"([a-zA-Z]+)\"))\n",
                             "format": "time_series",
-                            "intervalFactor": 2,
                             "legendFormat": "{{status}}",
                             "refId": "A"
                         }
@@ -469,21 +464,18 @@
                         {
                             "expr": "job:promtail_request_duration_seconds:99quantile{cluster=~\"$cluster\", job=~\"$namespace/promtail\"}",
                             "format": "time_series",
-                            "intervalFactor": 2,
                             "legendFormat": "p99",
                             "legendLink": null
                         },
                         {
                             "expr": "job:promtail_request_duration_seconds:50quantile{cluster=~\"$cluster\", job=~\"$namespace/promtail\"}",
                             "format": "time_series",
-                            "intervalFactor": 2,
                             "legendFormat": "p50",
                             "legendLink": null
                         },
                         {
                             "expr": "job:promtail_request_duration_seconds:avg{cluster=~\"$cluster\", job=~\"$namespace/promtail\"}",
                             "format": "time_series",
-                            "intervalFactor": 2,
                             "legendFormat": "avg",
                             "legendLink": null
                         }
@@ -547,7 +539,7 @@
                     "value": "default"
                 },
                 "hide": 0,
-                "label": "Data Source",
+                "label": "Data source",
                 "name": "datasource",
                 "options": [],
                 "query": "prometheus",