Skip to content

Commit 7b6626f

Browse files
authored
🌱 observability: improvements to grafana and loki (#11685)
* observability: grafana: improve variable query and add min/max/mean to some tables * observability: tune loki to allow more data throughput
1 parent 526ea91 commit 7b6626f

File tree

2 files changed

+47
-30
lines changed

2 files changed

+47
-30
lines changed

hack/observability/grafana/dashboards/controller-runtime.json

Lines changed: 44 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -352,16 +352,20 @@
352352
"overrides": []
353353
},
354354
"gridPos": {
355-
"h": 6,
355+
"h": 8,
356356
"w": 12,
357357
"x": 0,
358358
"y": 6
359359
},
360360
"id": 13,
361361
"options": {
362362
"legend": {
363-
"calcs": [],
364-
"displayMode": "list",
363+
"calcs": [
364+
"min",
365+
"max",
366+
"mean"
367+
],
368+
"displayMode": "table",
365369
"placement": "bottom",
366370
"showLegend": true
367371
},
@@ -459,16 +463,20 @@
459463
"overrides": []
460464
},
461465
"gridPos": {
462-
"h": 6,
466+
"h": 9,
463467
"w": 12,
464468
"x": 0,
465-
"y": 7
469+
"y": 15
466470
},
467471
"id": 6,
468472
"options": {
469473
"legend": {
470-
"calcs": [],
471-
"displayMode": "list",
474+
"calcs": [
475+
"min",
476+
"max",
477+
"mean"
478+
],
479+
"displayMode": "table",
472480
"placement": "bottom",
473481
"showLegend": true
474482
},
@@ -552,16 +560,20 @@
552560
"overrides": []
553561
},
554562
"gridPos": {
555-
"h": 6,
563+
"h": 9,
556564
"w": 12,
557565
"x": 12,
558-
"y": 7
566+
"y": 15
559567
},
560568
"id": 7,
561569
"options": {
562570
"legend": {
563-
"calcs": [],
564-
"displayMode": "list",
571+
"calcs": [
572+
"min",
573+
"max",
574+
"mean"
575+
],
576+
"displayMode": "table",
565577
"placement": "bottom",
566578
"showLegend": true
567579
},
@@ -4980,19 +4992,19 @@
49804992
"type": "prometheus",
49814993
"uid": "prometheus"
49824994
},
4983-
"definition": "label_values(kubernetes_io_hostname)",
4995+
"definition": "kubernetes_io_hostname",
49844996
"hide": 0,
49854997
"includeAll": true,
49864998
"label": "Node",
49874999
"multi": true,
49885000
"name": "Node",
49895001
"options": [],
49905002
"query": {
4991-
"query": "label_values(kubernetes_io_hostname)",
5003+
"query": "kubernetes_io_hostname",
49925004
"refId": "PrometheusVariableQueryEditor-VariableQuery"
49935005
},
4994-
"refresh": 1,
4995-
"regex": "",
5006+
"refresh": 2,
5007+
"regex": "/.*node=\"([^\"]*).*/",
49965008
"skipUrlSync": false,
49975009
"sort": 1,
49985010
"type": "query"
@@ -5008,21 +5020,22 @@
50085020
"type": "prometheus",
50095021
"uid": "prometheus"
50105022
},
5011-
"definition": "label_values(kube_pod_info{node=~\"^$Node$\"},pod)",
5023+
"definition": "kube_pod_info{node=~\"^$Node$\"}",
50125024
"hide": 0,
5013-
"includeAll": false,
5025+
"includeAll": true,
50145026
"label": "Pod",
50155027
"multi": true,
50165028
"name": "Pod",
50175029
"options": [],
50185030
"query": {
5019-
"query": "label_values(kube_pod_info{node=~\"^$Node$\"},pod)",
5031+
"qryType": 4,
5032+
"query": "kube_pod_info{node=~\"^$Node$\"}",
50205033
"refId": "PrometheusVariableQueryEditor-VariableQuery"
50215034
},
5022-
"refresh": 1,
5023-
"regex": "",
5035+
"refresh": 2,
5036+
"regex": "/.*pod=\"([^\"]*).*/",
50245037
"skipUrlSync": false,
5025-
"sort": 0,
5038+
"sort": 1,
50265039
"type": "query"
50275040
},
50285041
{
@@ -5036,19 +5049,20 @@
50365049
"type": "prometheus",
50375050
"uid": "prometheus"
50385051
},
5039-
"definition": "label_values(kube_pod_container_info{node=~\"^$Node$\",pod=~\"^$Pod$\"},container)",
5052+
"definition": "kube_pod_container_info{node=~\"^$Node$\",pod=~\"^$Pod$\"}",
50405053
"hide": 0,
50415054
"includeAll": true,
50425055
"label": "Container",
50435056
"multi": true,
50445057
"name": "Container",
50455058
"options": [],
50465059
"query": {
5047-
"query": "label_values(kube_pod_container_info{node=~\"^$Node$\",pod=~\"^$Pod$\"},container)",
5060+
"qryType": 4,
5061+
"query": "kube_pod_container_info{node=~\"^$Node$\",pod=~\"^$Pod$\"}",
50485062
"refId": "PrometheusVariableQueryEditor-VariableQuery"
50495063
},
5050-
"refresh": 1,
5051-
"regex": "",
5064+
"refresh": 2,
5065+
"regex": "/.*container=\"([^\"]*).*/",
50525066
"skipUrlSync": false,
50535067
"sort": 1,
50545068
"type": "query"
@@ -5068,21 +5082,21 @@
50685082
"type": "prometheus",
50695083
"uid": "prometheus"
50705084
},
5071-
"definition": "label_values(controller_runtime_active_workers,controller)",
5085+
"definition": "controller_runtime_active_workers",
50725086
"hide": 0,
50735087
"includeAll": true,
50745088
"label": "Controller",
50755089
"multi": true,
50765090
"name": "Controller",
50775091
"options": [],
50785092
"query": {
5079-
"query": "label_values(controller_runtime_active_workers,controller)",
5093+
"query": "controller_runtime_active_workers",
50805094
"refId": "PrometheusVariableQueryEditor-VariableQuery"
50815095
},
5082-
"refresh": 1,
5083-
"regex": "",
5096+
"refresh": 2,
5097+
"regex": "/.*controller=\"([^\"]*).*/",
50845098
"skipUrlSync": false,
5085-
"sort": 0,
5099+
"sort": 1,
50865100
"type": "query"
50875101
},
50885102
{

hack/observability/loki/values.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ loki:
1616
limits_config:
1717
ingestion_rate_mb: 1024
1818
ingestion_burst_size_mb: 1024
19+
# disable limits per user as we only have one
20+
max_streams_per_user: 0
21+
max_global_streams_per_user: 0
1922
useTestSchema: true
2023

2124
deploymentMode: SingleBinary

0 commit comments

Comments
 (0)