Skip to content

Commit a41d243

Browse files
github-actions[bot]nlamirault
github-actions[bot]
and
nlamirault
authored
Update: monitoring mixins set to v1.12.0 for pyroscope-mixin (#934)
Signed-off-by: Nicolas Lamirault <nlamirault@users.noreply.github.com> Co-authored-by: Nicolas Lamirault <nlamirault@users.noreply.github.com>
1 parent 591387d commit a41d243

File tree

5 files changed

+41
-107
lines changed

5 files changed

+41
-107
lines changed

‎charts/pyroscope-mixin/Chart.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ keywords:
2828
- kubernetes
2929
- monitoring-mixin
3030
- portefaix
31-
version: 1.4.1
32-
appVersion: 1.2.0
31+
version: 1.5.0
32+
appVersion: 1.10.0
3333
maintainers:
3434
- name: nlamirault
3535
email: nicolas.lamirault@gmail.com
@@ -51,5 +51,5 @@ annotations:
5151
fingerprint: C39918B3EBDE35C23B8D0B8E5F99269A6FCA437C
5252
url: https://keybase.io/nlamirault/pgp_keys.asc
5353
artifacthub.io/changes: |
54-
- kind: fixed
55-
description: ConfigMap dashboards naming
54+
- kind: changed
55+
description: pyroscope-mixin v1.10.0

‎charts/pyroscope-mixin/dashboards/pyroscope-reads.json

Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"keepTime": true,
1515
"tags": [
1616
"pyroscope-mixin",
17-
"monitoring-mixins-v1.5.0"
17+
"monitoring-mixins-v1.12.0"
1818
],
1919
"targetBlank": false,
2020
"title": "Pyroscope Dashboards",
@@ -71,7 +71,6 @@
7171
{
7272
"expr": "sum by (status) (\n label_replace(label_replace(rate(pyroscope_request_duration_seconds_count{cluster=~\"$cluster\",job=~\"($namespace)/(pyroscope|querier)\", route=~\".*merge.*|.*series.*|.*type.*\"}[$__rate_interval]),\n \"status\", \"${1}xx\", \"status_code\", \"([0-9])..\"),\n \"status\", \"${1}\", \"status_code\", \"([a-zA-Z]+)\"))\n",
7373
"format": "time_series",
74-
"intervalFactor": 2,
7574
"legendFormat": "{{status}}",
7675
"refId": "A"
7776
}
@@ -146,26 +145,20 @@
146145
{
147146
"expr": "histogram_quantile(0.99, sum by (le,route) (job_route_cluster:pyroscope_request_duration_seconds_bucket:sum_rate{job=~\"($namespace)/(pyroscope|querier)\", route=~\".*merge.*|.*series.*|.*type.*\", cluster=~\"$cluster\"})) * 1e3",
148147
"format": "time_series",
149-
"intervalFactor": 2,
150148
"legendFormat": "{{ route }} 99th percentile",
151-
"refId": "A",
152-
"step": 10
149+
"refId": "A"
153150
},
154151
{
155152
"expr": "histogram_quantile(0.50, sum by (le,route) (job_route_cluster:pyroscope_request_duration_seconds_bucket:sum_rate{job=~\"($namespace)/(pyroscope|querier)\", route=~\".*merge.*|.*series.*|.*type.*\", cluster=~\"$cluster\"})) * 1e3",
156153
"format": "time_series",
157-
"intervalFactor": 2,
158154
"legendFormat": "{{ route }} 50th percentile",
159-
"refId": "B",
160-
"step": 10
155+
"refId": "B"
161156
},
162157
{
163158
"expr": "1e3 * sum(job_route_cluster:pyroscope_request_duration_seconds_sum:sum_rate{job=~\"($namespace)/(pyroscope|querier)\", route=~\".*merge.*|.*series.*|.*type.*\", cluster=~\"$cluster\"}) by (route) / sum(job_route_cluster:pyroscope_request_duration_seconds_count:sum_rate{job=~\"($namespace)/(pyroscope|querier)\", route=~\".*merge.*|.*series.*|.*type.*\", cluster=~\"$cluster\"}) by (route) ",
164159
"format": "time_series",
165-
"intervalFactor": 2,
166160
"legendFormat": "{{ route }} Average",
167-
"refId": "C",
168-
"step": 10
161+
"refId": "C"
169162
}
170163
],
171164
"thresholds": [ ],
@@ -260,7 +253,6 @@
260253
{
261254
"expr": "sum by (status) (\n label_replace(label_replace(rate(pyroscope_request_duration_seconds_count{cluster=~\"$cluster\",job=~\"($namespace)/(pyroscope|ingester)\", route=~\".*merge.*|.*series.*|.*type.*\"}[$__rate_interval]),\n \"status\", \"${1}xx\", \"status_code\", \"([0-9])..\"),\n \"status\", \"${1}\", \"status_code\", \"([a-zA-Z]+)\"))\n",
262255
"format": "time_series",
263-
"intervalFactor": 2,
264256
"legendFormat": "{{status}}",
265257
"refId": "A"
266258
}
@@ -335,26 +327,20 @@
335327
{
336328
"expr": "histogram_quantile(0.99, sum by (le,route) (job_route_cluster:pyroscope_request_duration_seconds_bucket:sum_rate{job=~\"($namespace)/(pyroscope|ingester)\", route=~\".*merge.*|.*series.*|.*type.*\", cluster=~\"$cluster\"})) * 1e3",
337329
"format": "time_series",
338-
"intervalFactor": 2,
339330
"legendFormat": "{{ route }} 99th percentile",
340-
"refId": "A",
341-
"step": 10
331+
"refId": "A"
342332
},
343333
{
344334
"expr": "histogram_quantile(0.50, sum by (le,route) (job_route_cluster:pyroscope_request_duration_seconds_bucket:sum_rate{job=~\"($namespace)/(pyroscope|ingester)\", route=~\".*merge.*|.*series.*|.*type.*\", cluster=~\"$cluster\"})) * 1e3",
345335
"format": "time_series",
346-
"intervalFactor": 2,
347336
"legendFormat": "{{ route }} 50th percentile",
348-
"refId": "B",
349-
"step": 10
337+
"refId": "B"
350338
},
351339
{
352340
"expr": "1e3 * sum(job_route_cluster:pyroscope_request_duration_seconds_sum:sum_rate{job=~\"($namespace)/(pyroscope|ingester)\", route=~\".*merge.*|.*series.*|.*type.*\", cluster=~\"$cluster\"}) by (route) / sum(job_route_cluster:pyroscope_request_duration_seconds_count:sum_rate{job=~\"($namespace)/(pyroscope|ingester)\", route=~\".*merge.*|.*series.*|.*type.*\", cluster=~\"$cluster\"}) by (route) ",
353341
"format": "time_series",
354-
"intervalFactor": 2,
355342
"legendFormat": "{{ route }} Average",
356-
"refId": "C",
357-
"step": 10
343+
"refId": "C"
358344
}
359345
],
360346
"thresholds": [ ],
@@ -406,7 +392,7 @@
406392
"style": "dark",
407393
"tags": [
408394
"pyroscope-mixin",
409-
"monitoring-mixins-v1.5.0"
395+
"monitoring-mixins-v1.12.0"
410396
],
411397
"templating": {
412398
"list": [
@@ -416,7 +402,7 @@
416402
"value": "default"
417403
},
418404
"hide": 0,
419-
"label": "Data Source",
405+
"label": "Data source",
420406
"name": "datasource",
421407
"options": [ ],
422408
"query": "prometheus",
@@ -505,4 +491,4 @@
505491
"title": "Pyroscope / Reads",
506492
"uid": "pyroscope-reads",
507493
"version": 0
508-
}
494+
}

‎charts/pyroscope-mixin/dashboards/pyroscope-writes.json

Lines changed: 16 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"keepTime": true,
1515
"tags": [
1616
"pyroscope-mixin",
17-
"monitoring-mixins-v1.5.0"
17+
"monitoring-mixins-v1.12.0"
1818
],
1919
"targetBlank": false,
2020
"title": "Pyroscope Dashboards",
@@ -61,26 +61,20 @@
6161
{
6262
"expr": "histogram_quantile(0.99, sum by (le,type) (job_type_cluster:pyroscope_distributor_received_compressed_bytes_bucket:sum_rate{job=~\"($namespace)/(pyroscope|distributor)\", type=~\".*\", cluster=~\"$cluster\"})) * 1",
6363
"format": "time_series",
64-
"intervalFactor": 2,
6564
"legendFormat": "{{ type }} 99th percentile",
66-
"refId": "A",
67-
"step": 10
65+
"refId": "A"
6866
},
6967
{
7068
"expr": "histogram_quantile(0.50, sum by (le,type) (job_type_cluster:pyroscope_distributor_received_compressed_bytes_bucket:sum_rate{job=~\"($namespace)/(pyroscope|distributor)\", type=~\".*\", cluster=~\"$cluster\"})) * 1",
7169
"format": "time_series",
72-
"intervalFactor": 2,
7370
"legendFormat": "{{ type }} 50th percentile",
74-
"refId": "B",
75-
"step": 10
71+
"refId": "B"
7672
},
7773
{
7874
"expr": "1 * sum(job_type_cluster:pyroscope_distributor_received_compressed_bytes_sum:sum_rate{job=~\"($namespace)/(pyroscope|distributor)\", type=~\".*\", cluster=~\"$cluster\"}) by (type) / sum(job_type_cluster:pyroscope_distributor_received_compressed_bytes_count:sum_rate{job=~\"($namespace)/(pyroscope|distributor)\", type=~\".*\", cluster=~\"$cluster\"}) by (type) ",
7975
"format": "time_series",
80-
"intervalFactor": 2,
8176
"legendFormat": "{{ type }} Average",
82-
"refId": "C",
83-
"step": 10
77+
"refId": "C"
8478
}
8579
],
8680
"thresholds": [ ],
@@ -153,26 +147,20 @@
153147
{
154148
"expr": "histogram_quantile(0.99, sum by (le,type) (job_type_cluster:pyroscope_distributor_received_samples_bucket:sum_rate{job=~\"($namespace)/(pyroscope|distributor)\", type=~\".*\", cluster=~\"$cluster\"})) * 1",
155149
"format": "time_series",
156-
"intervalFactor": 2,
157150
"legendFormat": "{{ type }} 99th percentile",
158-
"refId": "A",
159-
"step": 10
151+
"refId": "A"
160152
},
161153
{
162154
"expr": "histogram_quantile(0.50, sum by (le,type) (job_type_cluster:pyroscope_distributor_received_samples_bucket:sum_rate{job=~\"($namespace)/(pyroscope|distributor)\", type=~\".*\", cluster=~\"$cluster\"})) * 1",
163155
"format": "time_series",
164-
"intervalFactor": 2,
165156
"legendFormat": "{{ type }} 50th percentile",
166-
"refId": "B",
167-
"step": 10
157+
"refId": "B"
168158
},
169159
{
170160
"expr": "1 * sum(job_type_cluster:pyroscope_distributor_received_samples_sum:sum_rate{job=~\"($namespace)/(pyroscope|distributor)\", type=~\".*\", cluster=~\"$cluster\"}) by (type) / sum(job_type_cluster:pyroscope_distributor_received_samples_count:sum_rate{job=~\"($namespace)/(pyroscope|distributor)\", type=~\".*\", cluster=~\"$cluster\"}) by (type) ",
171161
"format": "time_series",
172-
"intervalFactor": 2,
173162
"legendFormat": "{{ type }} Average",
174-
"refId": "C",
175-
"step": 10
163+
"refId": "C"
176164
}
177165
],
178166
"thresholds": [ ],
@@ -267,7 +255,6 @@
267255
{
268256
"expr": "sum by (status) (\n label_replace(label_replace(rate(pyroscope_request_duration_seconds_count{cluster=~\"$cluster\",job=~\"($namespace)/(pyroscope|distributor)\", route=~\".*push.*|.*ingest.*\"}[$__rate_interval]),\n \"status\", \"${1}xx\", \"status_code\", \"([0-9])..\"),\n \"status\", \"${1}\", \"status_code\", \"([a-zA-Z]+)\"))\n",
269257
"format": "time_series",
270-
"intervalFactor": 2,
271258
"legendFormat": "{{status}}",
272259
"refId": "A"
273260
}
@@ -342,26 +329,20 @@
342329
{
343330
"expr": "histogram_quantile(0.99, sum by (le) (job_route_cluster:pyroscope_request_duration_seconds_bucket:sum_rate{job=~\"($namespace)/(pyroscope|distributor)\", route=~\".*push.*\", cluster=~\"$cluster\"})) * 1e3",
344331
"format": "time_series",
345-
"intervalFactor": 2,
346332
"legendFormat": "99th percentile",
347-
"refId": "A",
348-
"step": 10
333+
"refId": "A"
349334
},
350335
{
351336
"expr": "histogram_quantile(0.50, sum by (le) (job_route_cluster:pyroscope_request_duration_seconds_bucket:sum_rate{job=~\"($namespace)/(pyroscope|distributor)\", route=~\".*push.*\", cluster=~\"$cluster\"})) * 1e3",
352337
"format": "time_series",
353-
"intervalFactor": 2,
354338
"legendFormat": "50th percentile",
355-
"refId": "B",
356-
"step": 10
339+
"refId": "B"
357340
},
358341
{
359342
"expr": "1e3 * sum(job_route_cluster:pyroscope_request_duration_seconds_sum:sum_rate{job=~\"($namespace)/(pyroscope|distributor)\", route=~\".*push.*\", cluster=~\"$cluster\"}) / sum(job_route_cluster:pyroscope_request_duration_seconds_count:sum_rate{job=~\"($namespace)/(pyroscope|distributor)\", route=~\".*push.*\", cluster=~\"$cluster\"})",
360343
"format": "time_series",
361-
"intervalFactor": 2,
362344
"legendFormat": "Average",
363-
"refId": "C",
364-
"step": 10
345+
"refId": "C"
365346
}
366347
],
367348
"thresholds": [ ],
@@ -456,7 +437,6 @@
456437
{
457438
"expr": "sum by (status) (\n label_replace(label_replace(rate(pyroscope_request_duration_seconds_count{cluster=~\"$cluster\",job=~\"($namespace)/(pyroscope|ingester)\", route=~\".*push.*|.*ingest.*\"}[$__rate_interval]),\n \"status\", \"${1}xx\", \"status_code\", \"([0-9])..\"),\n \"status\", \"${1}\", \"status_code\", \"([a-zA-Z]+)\"))\n",
458439
"format": "time_series",
459-
"intervalFactor": 2,
460440
"legendFormat": "{{status}}",
461441
"refId": "A"
462442
}
@@ -531,26 +511,20 @@
531511
{
532512
"expr": "histogram_quantile(0.99, sum by (le) (job_route_cluster:pyroscope_request_duration_seconds_bucket:sum_rate{job=~\"($namespace)/(pyroscope|ingester)\", route=~\".*push.*|.*ingest.*\", cluster=~\"$cluster\"})) * 1e3",
533513
"format": "time_series",
534-
"intervalFactor": 2,
535514
"legendFormat": "99th percentile",
536-
"refId": "A",
537-
"step": 10
515+
"refId": "A"
538516
},
539517
{
540518
"expr": "histogram_quantile(0.50, sum by (le) (job_route_cluster:pyroscope_request_duration_seconds_bucket:sum_rate{job=~\"($namespace)/(pyroscope|ingester)\", route=~\".*push.*|.*ingest.*\", cluster=~\"$cluster\"})) * 1e3",
541519
"format": "time_series",
542-
"intervalFactor": 2,
543520
"legendFormat": "50th percentile",
544-
"refId": "B",
545-
"step": 10
521+
"refId": "B"
546522
},
547523
{
548524
"expr": "1e3 * sum(job_route_cluster:pyroscope_request_duration_seconds_sum:sum_rate{job=~\"($namespace)/(pyroscope|ingester)\", route=~\".*push.*|.*ingest.*\", cluster=~\"$cluster\"}) / sum(job_route_cluster:pyroscope_request_duration_seconds_count:sum_rate{job=~\"($namespace)/(pyroscope|ingester)\", route=~\".*push.*|.*ingest.*\", cluster=~\"$cluster\"})",
549525
"format": "time_series",
550-
"intervalFactor": 2,
551526
"legendFormat": "Average",
552-
"refId": "C",
553-
"step": 10
527+
"refId": "C"
554528
}
555529
],
556530
"thresholds": [ ],
@@ -636,7 +610,6 @@
636610
{
637611
"expr": "sum(pyroscope_head_size_bytes{cluster=~\"$cluster\",job=~\"($namespace)/(pyroscope|ingester)\",}) by (type)",
638612
"format": "time_series",
639-
"intervalFactor": 2,
640613
"legendFormat": "{{type}}",
641614
"legendLink": null
642615
}
@@ -712,7 +685,6 @@
712685
{
713686
"expr": "sum(pyroscope_head_size_bytes{cluster=~\"$cluster\",job=~\"($namespace)/(pyroscope|ingester)\",}) by (instance)",
714687
"format": "time_series",
715-
"intervalFactor": 2,
716688
"legendFormat": "{{instance}}",
717689
"legendLink": null
718690
}
@@ -766,7 +738,7 @@
766738
"style": "dark",
767739
"tags": [
768740
"pyroscope-mixin",
769-
"monitoring-mixins-v1.5.0"
741+
"monitoring-mixins-v1.12.0"
770742
],
771743
"templating": {
772744
"list": [
@@ -776,7 +748,7 @@
776748
"value": "default"
777749
},
778750
"hide": 0,
779-
"label": "Data Source",
751+
"label": "Data source",
780752
"name": "datasource",
781753
"options": [ ],
782754
"query": "prometheus",
@@ -865,4 +837,4 @@
865837
"title": "Pyroscope / Writes",
866838
"uid": "pyroscope-writes",
867839
"version": 0
868-
}
840+
}

‎charts/pyroscope-mixin/templates/configmap-dashboards.yaml

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,3 @@
1-
# Copyright (C) Nicolas Lamirault <nicolas.lamirault@gmail.com>
2-
#
3-
# Licensed under the Apache License, Version 2.0 (the "License");
4-
# you may not use this file except in compliance with the License.
5-
# You may obtain a copy of the License at
6-
#
7-
# http://www.apache.org/licenses/LICENSE-2.0
8-
#
9-
# Unless required by applicable law or agreed to in writing, software
10-
# distributed under the License is distributed on an "AS IS" BASIS,
11-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
# See the License for the specific language governing permissions and
13-
# limitations under the License.
14-
#
15-
# SPDX-License-Identifier: Apache-2.0
16-
171
{{ if .Values.grafanaDashboard.enabled -}}
182
{{- $files := .Files.Glob "dashboards/*.json" }}
193
{{- if $files }}
@@ -22,15 +6,17 @@ apiVersion: v1
226
kind: ConfigMapList
237
items:
248
{{- range $path, $fileContents := $files }}
25-
{{- $dashboardName := regexReplaceAll "(^.*/)(.*)\\.json$" $path "${2}" }}
9+
{{- $dashboardName := regexReplaceAll "(^.*/)(.*)\\.json$" $path "${2}" | lower }}
2610
- apiVersion: v1
2711
kind: ConfigMap
2812
metadata:
2913
annotations:
3014
grafana-folder: {{ $.Values.grafanaDashboard.folder }}
15+
{{- include "pyroscope-mixin.annotations" $ | indent 6 }}
3116
labels:
3217
grafana-dashboard: {{ $dashboardName }}
3318
{{- include "pyroscope-mixin.labels" $ | indent 6 }}
19+
app.kubernetes.io/component: dashboard
3420
name: {{ printf "dashboard-%s" $dashboardName | trunc 63 | trimSuffix "-" }}
3521
namespace: {{ include "pyroscope-mixin.namespace" $ }}
3622
data:
@@ -46,6 +32,7 @@ kind: GrafanaDashboard
4632
metadata:
4733
labels:
4834
{{- include "pyroscope-mixin.labels" $ | indent 4 }}
35+
app.kubernetes.io/component: dashboard
4936
name: {{ printf "%s" $dashboardName | trunc 63 | trimSuffix "-" | lower }}
5037
namespace: {{ $.Release.Namespace }}
5138
spec:

0 commit comments

Comments
 (0)