Skip to content

Commit 7861b1c

Browse files
paulfantompaulfantom
authored
Merge pull request #666 from paulfantom/promscale-mixin-bump
synchronize promscale mixin
2 parents d53ce33 + dc8d539 commit 7861b1c

File tree

2 files changed

+46
-29
lines changed

2 files changed

+46
-29
lines changed

‎chart/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ keywords:
1212
- monitoring
1313
- tracing
1414
- opentelemetry
15-
version: 18.2.0
15+
version: 18.3.0
1616
# TODO(paulfantom): Enable after kubernetes 1.22 reaches EOL (2022-10-28)
1717
# kubeVersion: ">= 1.23.0"
1818
dependencies:
@@ -22,7 +22,7 @@ dependencies:
2222
repository: https://charts.timescale.com
2323
- name: promscale
2424
condition: promscale.enabled
25-
version: 14.5.0
25+
version: 14.6.0
2626
repository: https://charts.timescale.com
2727
- name: kube-prometheus-stack
2828
condition: kube-prometheus-stack.enabled

‎chart/dashboards/promscale.json‎

Lines changed: 44 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@
267267
"editorMode": "code",
268268
"exemplar": true,
269269
"expr": "sum by (kind) (rate(promscale_ingest_items_total{namespace=~\"$namespace\",type=~\"$datatype\"}[$__rate_interval]))",
270-
"interval": "",
270+
"interval": "2m",
271271
"legendFormat": "{{ kind }}",
272272
"range": true,
273273
"refId": "A"
@@ -466,8 +466,9 @@
466466
},
467467
"exemplar": true,
468468
"expr": "sum by (type) (rate(promscale_ingest_requests_total{namespace=~\"$namespace\"}[$__rate_interval]))",
469-
"interval": "",
469+
"interval": "2m",
470470
"legendFormat": "{{ type }}",
471+
"range": true,
471472
"refId": "A"
472473
}
473474
],
@@ -561,7 +562,7 @@
561562
"editorMode": "code",
562563
"exemplar": true,
563564
"expr": "sum by (type) (rate(promscale_ingest_requests_total{code=~\"5..\",namespace=~\"$namespace\"}[$__rate_interval]))",
564-
"interval": "",
565+
"interval": "2m",
565566
"legendFormat": "{{ type }}",
566567
"range": true,
567568
"refId": "A"
@@ -657,8 +658,9 @@
657658
},
658659
"exemplar": true,
659660
"expr": "histogram_quantile(0.5, rate(promscale_ingest_duration_seconds_bucket{namespace=~\"$namespace\"}[$__rate_interval]))",
660-
"interval": "",
661+
"interval": "2m",
661662
"legendFormat": "p50",
663+
"range": true,
662664
"refId": "A"
663665
},
664666
{
@@ -669,8 +671,9 @@
669671
"exemplar": true,
670672
"expr": "histogram_quantile(0.90, rate(promscale_ingest_duration_seconds_bucket{namespace=~\"$namespace\"}[$__rate_interval]))",
671673
"hide": false,
672-
"interval": "",
674+
"interval": "2m",
673675
"legendFormat": "p90",
676+
"range": true,
674677
"refId": "B"
675678
},
676679
{
@@ -681,8 +684,9 @@
681684
"exemplar": true,
682685
"expr": "histogram_quantile(0.95, rate(promscale_ingest_duration_seconds_bucket{namespace=~\"$namespace\"}[$__rate_interval]))",
683686
"hide": false,
684-
"interval": "",
687+
"interval": "2m",
685688
"legendFormat": "p95",
689+
"range": true,
686690
"refId": "C"
687691
}
688692
],
@@ -791,7 +795,7 @@
791795
"editorMode": "code",
792796
"exemplar": true,
793797
"expr": "rate(grpc_server_msg_received_total{grpc_method=~\"(WriteSpan|WriteSpanStream|Export)\",namespace=~\"$namespace\"}[$__rate_interval])",
794-
"interval": "",
798+
"interval": "2m",
795799
"legendFormat": "{{ grpc_service }}",
796800
"range": true,
797801
"refId": "A"
@@ -887,8 +891,9 @@
887891
},
888892
"exemplar": true,
889893
"expr": "rate(grpc_server_handled_total{grpc_service=~\"opentelemetry.proto.collector.trace.v1.TraceService\",grpc_code=~\"Aborted|Unavailable|Internal|Unknown|Unimplemented|DataLoss\",grpc_method=~\"Export\",namespace=~\"$namespace\"}[$__rate_interval])",
890-
"interval": "",
894+
"interval": "2m",
891895
"legendFormat": "{{ grpc_code }}",
896+
"range": true,
892897
"refId": "A"
893898
}
894899
],
@@ -982,8 +987,9 @@
982987
},
983988
"exemplar": true,
984989
"expr": "histogram_quantile(0.5, rate(grpc_server_handling_seconds_bucket{grpc_service=\"opentelemetry.proto.collector.trace.v1.TraceService\",grpc_method=~\"Export\",namespace=~\"$namespace\"}[$__rate_interval]))",
985-
"interval": "",
990+
"interval": "2m",
986991
"legendFormat": "p50 {{ type }}",
992+
"range": true,
987993
"refId": "A"
988994
},
989995
{
@@ -994,8 +1000,9 @@
9941000
"exemplar": true,
9951001
"expr": "histogram_quantile(0.9, rate(grpc_server_handling_seconds_bucket{grpc_service=\"opentelemetry.proto.collector.trace.v1.TraceService\",grpc_method=~\"Export\",namespace=~\"$namespace\"}[$__rate_interval]))",
9961002
"hide": false,
997-
"interval": "",
1003+
"interval": "2m",
9981004
"legendFormat": "p90 {{ type }}",
1005+
"range": true,
9991006
"refId": "B"
10001007
},
10011008
{
@@ -1006,8 +1013,9 @@
10061013
"exemplar": true,
10071014
"expr": "histogram_quantile(0.95, rate(grpc_server_handling_seconds_bucket{grpc_service=\"opentelemetry.proto.collector.trace.v1.TraceService\",grpc_method=~\"Export\",namespace=~\"$namespace\"}[$__rate_interval]))",
10081015
"hide": false,
1009-
"interval": "",
1016+
"interval": "2m",
10101017
"legendFormat": "p95 {{ type }}",
1018+
"range": true,
10111019
"refId": "C"
10121020
}
10131021
],
@@ -1118,8 +1126,9 @@
11181126
},
11191127
"exemplar": true,
11201128
"expr": "sum by (type) (rate(promscale_query_requests_total{namespace=~\"$namespace\"}[$__rate_interval]))",
1121-
"interval": "",
1129+
"interval": "2m",
11221130
"legendFormat": "{{ type }}",
1131+
"range": true,
11231132
"refId": "A"
11241133
}
11251134
],
@@ -1212,8 +1221,9 @@
12121221
},
12131222
"exemplar": true,
12141223
"expr": "sum by (type) (rate(promscale_query_requests_total{code=~\"5..\",namespace=~\"$namespace\"}[$__rate_interval]))",
1215-
"interval": "",
1224+
"interval": "2m",
12161225
"legendFormat": "{{ type }}",
1226+
"range": true,
12171227
"refId": "A"
12181228
}
12191229
],
@@ -1307,8 +1317,9 @@
13071317
},
13081318
"exemplar": true,
13091319
"expr": "histogram_quantile(0.5, sum by (le, instance, job) (rate(promscale_query_duration_seconds_bucket{namespace=~\"$namespace\"}[$__rate_interval])))",
1310-
"interval": "",
1320+
"interval": "2m",
13111321
"legendFormat": "p50",
1322+
"range": true,
13121323
"refId": "A"
13131324
},
13141325
{
@@ -1319,8 +1330,9 @@
13191330
"exemplar": true,
13201331
"expr": "histogram_quantile(0.90, sum by (le, instance, job) (rate(promscale_query_duration_seconds_bucket{namespace=~\"$namespace\"}[$__rate_interval])))",
13211332
"hide": false,
1322-
"interval": "",
1333+
"interval": "2m",
13231334
"legendFormat": "p90",
1335+
"range": true,
13241336
"refId": "B"
13251337
},
13261338
{
@@ -1331,8 +1343,9 @@
13311343
"exemplar": true,
13321344
"expr": "histogram_quantile(0.95, sum by (le, instance, job) (rate(promscale_query_duration_seconds_bucket{namespace=~\"$namespace\"}[$__rate_interval])))",
13331345
"hide": false,
1334-
"interval": "",
1346+
"interval": "2m",
13351347
"legendFormat": "p95",
1348+
"range": true,
13361349
"refId": "C"
13371350
}
13381351
],
@@ -1937,8 +1950,9 @@
19371950
},
19381951
"exemplar": true,
19391952
"expr": "histogram_quantile(0.5, rate(promscale_database_requests_duration_seconds_bucket{method=~\"query.*\",namespace=~\"$namespace\"}[$__rate_interval]))",
1940-
"interval": "",
1953+
"interval": "2m",
19411954
"legendFormat": "p50 - {{ method }}",
1955+
"range": true,
19421956
"refId": "A"
19431957
},
19441958
{
@@ -1949,8 +1963,9 @@
19491963
"exemplar": true,
19501964
"expr": "histogram_quantile(0.9, rate(promscale_database_requests_duration_seconds_bucket{method=~\"query.*\",namespace=~\"$namespace\"}[$__rate_interval]))",
19511965
"hide": false,
1952-
"interval": "",
1966+
"interval": "2m",
19531967
"legendFormat": "p90 - {{ method }}",
1968+
"range": true,
19541969
"refId": "B"
19551970
},
19561971
{
@@ -1961,8 +1976,9 @@
19611976
"exemplar": true,
19621977
"expr": "histogram_quantile(0.95, rate(promscale_database_requests_duration_seconds_bucket{method=~\"query.*\",namespace=~\"$namespace\"}[$__rate_interval]))",
19631978
"hide": false,
1964-
"interval": "",
1979+
"interval": "2m",
19651980
"legendFormat": "p95 - {{ method }}",
1981+
"range": true,
19661982
"refId": "C"
19671983
}
19681984
],
@@ -2173,8 +2189,9 @@
21732189
},
21742190
"exemplar": true,
21752191
"expr": "rate(promscale_database_requests_total{namespace=~\"$namespace\"}[$__rate_interval])",
2176-
"interval": "",
2192+
"interval": "2m",
21772193
"legendFormat": "{{ method }}",
2194+
"range": true,
21782195
"refId": "A"
21792196
}
21802197
],
@@ -2370,7 +2387,7 @@
23702387
},
23712388
"editorMode": "code",
23722389
"exemplar": false,
2373-
"expr": "max(promscale_sql_database_worker_maintenance_job_long_running_total{namespace=~\"$namespace\"})",
2390+
"expr": "max(promscale_sql_database_worker_maintenance_job_long_running{namespace=~\"$namespace\"})",
23742391
"interval": "",
23752392
"legendFormat": "total",
23762393
"range": true,
@@ -2918,7 +2935,7 @@
29182935
},
29192936
"editorMode": "code",
29202937
"exemplar": false,
2921-
"expr": "max(promscale_sql_database_worker_maintenance_job_long_running_total{namespace=~\"$namespace\"})",
2938+
"expr": "max(promscale_sql_database_worker_maintenance_job_long_running{namespace=~\"$namespace\"})",
29222939
"interval": "",
29232940
"legendFormat": "total",
29242941
"range": true,
@@ -3094,7 +3111,7 @@
30943111
},
30953112
"editorMode": "code",
30963113
"exemplar": false,
3097-
"expr": "max(promscale_sql_database_worker_maintenance_job_locks_total{namespace=~\"$namespace\"})",
3114+
"expr": "max(promscale_sql_database_worker_maintenance_job_locks{namespace=~\"$namespace\"})",
30983115
"interval": "",
30993116
"legendFormat": "total",
31003117
"range": true,
@@ -3321,7 +3338,7 @@
33213338
"editorMode": "code",
33223339
"exemplar": true,
33233340
"expr": "rate(promscale_cache_query_hits_total{type=~\"$datatype\",namespace=~\"$namespace\"}[$__rate_interval]) / rate(promscale_cache_queries_total{type=~\"$datatype\",namespace=~\"$namespace\"}[$__rate_interval])",
3324-
"interval": "",
3341+
"interval": "2m",
33253342
"legendFormat": "{{ name }}",
33263343
"range": true,
33273344
"refId": "A"
@@ -3418,7 +3435,7 @@
34183435
"editorMode": "code",
34193436
"exemplar": true,
34203437
"expr": "histogram_quantile(0.5, rate(promscale_cache_query_latency_microseconds_bucket{type=~\"$datatype\",namespace=~\"$namespace\"}[$__rate_interval]))",
3421-
"interval": "",
3438+
"interval": "2m",
34223439
"legendFormat": "p50 - {{ name }}",
34233440
"range": true,
34243441
"refId": "A"
@@ -3432,7 +3449,7 @@
34323449
"exemplar": true,
34333450
"expr": "histogram_quantile(0.90, rate(promscale_cache_query_latency_microseconds_bucket{type=~\"$datatype\",namespace=~\"$namespace\"}[$__rate_interval]))",
34343451
"hide": false,
3435-
"interval": "",
3452+
"interval": "2m",
34363453
"legendFormat": "p90 - {{ name }}",
34373454
"range": true,
34383455
"refId": "B"
@@ -3527,7 +3544,7 @@
35273544
"editorMode": "code",
35283545
"exemplar": true,
35293546
"expr": "sum by (type, name) (rate(promscale_cache_evictions_total{namespace=~\"$namespace\",type=~\"$datatype\"}[$__rate_interval]))",
3530-
"interval": "",
3547+
"interval": "2m",
35313548
"legendFormat": "{{ name }}",
35323549
"range": true,
35333550
"refId": "A"

0 commit comments

Comments
 (0)