Update promtail-mixin to monitoring-mixins-v1.6.0 (#625)

Signed-off-by: Nicolas Lamirault <nlamirault@users.noreply.github.com> Co-authored-by: Nicolas Lamirault <nlamirault@users.noreply.github.com>
portefaix · Nov 19, 2023 · fac5c72 · fac5c72
1 parent 5dcfd92
commit fac5c72
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 21 deletions.
diff --git a/charts/promtail-mixin/Chart.yaml b/charts/promtail-mixin/Chart.yaml
@@ -27,8 +27,8 @@ keywords:
   - promtail
   - monitoring-mixin
   - portefaix
-version: 1.5.0
-appVersion: 2.3.0
+version: 1.6.0
+appVersion: 2.9.2
 
 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.8.0
+      description: promtail-mixin v2.9.2
diff --git a/charts/promtail-mixin/dashboards/promtail.json b/charts/promtail-mixin/dashboards/promtail.json
@@ -62,8 +62,7 @@
                             "format": "time_series",
                             "intervalFactor": 2,
                             "legendFormat": "Active Targets",
-                            "legendLink": null,
-                            "step": 10
+                            "legendLink": null
                         }
                     ],
                     "thresholds": [],
@@ -138,8 +137,7 @@
                             "format": "time_series",
                             "intervalFactor": 2,
                             "legendFormat": "Active Targets",
-                            "legendLink": null,
-                            "step": 10
+                            "legendLink": null
                         }
                     ],
                     "thresholds": [],
@@ -226,8 +224,7 @@
                             "format": "time_series",
                             "intervalFactor": 2,
                             "legendFormat": "logs read",
-                            "legendLink": null,
-                            "step": 10
+                            "legendLink": null
                         }
                     ],
                     "thresholds": [],
@@ -302,8 +299,7 @@
                             "format": "time_series",
                             "intervalFactor": 2,
                             "legendFormat": "lines read",
-                            "legendLink": null,
-                            "step": 10
+                            "legendLink": null
                         }
                     ],
                     "thresholds": [],
@@ -361,6 +357,8 @@
                         "3xx": "#6ED0E0",
                         "4xx": "#EF843C",
                         "5xx": "#E24D42",
+                        "OK": "#7EB26D",
+                        "cancel": "#A9A9A9",
                         "error": "#E24D42",
                         "success": "#7EB26D"
                     },
@@ -394,12 +392,11 @@
                     "steppedLine": false,
                     "targets": [
                         {
-                            "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-z]+)\"))\n",
+                            "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",
-                            "step": 10
+                            "refId": "A"
                         }
                     ],
                     "thresholds": [],
@@ -474,24 +471,21 @@
                             "format": "time_series",
                             "intervalFactor": 2,
                             "legendFormat": "p99",
-                            "legendLink": null,
-                            "step": 10
+                            "legendLink": null
                         },
                         {
                             "expr": "job:promtail_request_duration_seconds:50quantile{cluster=~\"$cluster\", job=~\"$namespace/promtail\"}",
                             "format": "time_series",
                             "intervalFactor": 2,
                             "legendFormat": "p50",
-                            "legendLink": null,
-                            "step": 10
+                            "legendLink": null
                         },
                         {
                             "expr": "job:promtail_request_duration_seconds:avg{cluster=~\"$cluster\", job=~\"$namespace/promtail\"}",
                             "format": "time_series",
                             "intervalFactor": 2,
                             "legendFormat": "avg",
-                            "legendLink": null,
-                            "step": 10
+                            "legendLink": null
                         }
                     ],
                     "thresholds": [],
@@ -574,7 +568,7 @@
                 "multi": false,
                 "name": "cluster",
                 "options": [],
-                "query": "label_values(loki_build_info, cluster)",
+                "query": "label_values(promtail_build_info, cluster)",
                 "refresh": 1,
                 "regex": "",
                 "sort": 2,