Compare commits

...

20 Commits

Author SHA1 Message Date
MichelHollands
7e38d19814 Update Tempo Distributed 2024-05-08 07:03:26 +00:00
Michel Hollands
3879207e05 Merge pull request #101 from grafana/fix_minio_secret_name
Fix secret name
2024-05-07 14:40:52 +01:00
Michel Hollands
cd42da2197 Fix secret name
Signed-off-by: Michel Hollands <michel.hollands@gmail.com>
2024-05-07 14:39:20 +01:00
Michel Hollands
56cab04af8 Merge pull request #92 from grafana/use_secret_for_minio
Use a secret for the Minio access
2024-05-07 12:37:07 +01:00
Michel Hollands
b99140d3f4 Merge pull request #97 from grafana/chore/update-tempo-distributed
[dependency] Update the Tempo Distributed subchart
2024-05-07 11:00:53 +01:00
MichelHollands
749e271455 Update Tempo Distributed 2024-05-07 09:22:20 +00:00
Michel Hollands
de91b4dac7 Merge pull request #96 from grafana/chore/update-tempo-distributed
[dependency] Update the Tempo Distributed subchart
2024-05-07 09:22:43 +01:00
MichelHollands
9f6e52d7a1 Update Tempo Distributed 2024-05-07 08:22:14 +00:00
Michel Hollands
025bb5b0c3 Merge pull request #94 from grafana/chore/update-loki
[dependency] Update the Loki subchart
2024-05-07 08:51:44 +01:00
MichelHollands
0b31eae425 Update loki 2024-05-07 07:02:51 +00:00
Michel Hollands
ab42a96949 Update installation instructions
Signed-off-by: Michel Hollands <michel.hollands@gmail.com>
2024-05-06 16:29:33 +01:00
Michel Hollands
386ff25fca Use the secret in the ruler for the dashboards
Signed-off-by: Michel Hollands <michel.hollands@gmail.com>
2024-05-06 16:18:44 +01:00
Michel Hollands
c6889131a7 Use structuredConfig correctly
Signed-off-by: Michel Hollands <michel.hollands@gmail.com>
2024-05-06 16:12:48 +01:00
Michel Hollands
2739bae0c0 Use correct variables
Signed-off-by: Michel Hollands <michel.hollands@gmail.com>
2024-05-03 15:40:36 +01:00
Michel Hollands
cea8076b75 Start using a secret
Signed-off-by: Michel Hollands <michel.hollands@gmail.com>
2024-05-03 15:38:07 +01:00
Michel Hollands
29b831ca00 Merge pull request #91 from grafana/set_step_time_to_1_minute_in_dashboards
Set the interval to 1m to match the scrape interval
2024-05-03 09:58:40 +01:00
Michel Hollands
09cf8f812c Merge pull request #90 from grafana/chore/update-tempo-distributed
[dependency] Update the Tempo Distributed subchart
2024-05-03 09:58:25 +01:00
Michel Hollands
f8436a8e44 Set the interval to 1m to match the scrape interval
Signed-off-by: Michel Hollands <michel.hollands@gmail.com>
2024-05-03 09:28:26 +01:00
MichelHollands
2b26abedbb Update Tempo Distributed 2024-05-03 07:02:32 +00:00
Michel Hollands
017c041007 Merge pull request #89 from grafana/add_extra_metrics
Add way to gather extra metrics and logs
2024-05-02 17:15:18 +01:00
18 changed files with 273 additions and 51 deletions

View File

@@ -1,7 +1,7 @@
dependencies: dependencies:
- name: loki - name: loki
repository: https://grafana.github.io/helm-charts repository: https://grafana.github.io/helm-charts
version: 6.4.2 version: 6.5.0
- name: alloy - name: alloy
repository: https://grafana.github.io/helm-charts repository: https://grafana.github.io/helm-charts
version: 0.1.1 version: 0.1.1
@@ -10,9 +10,9 @@ dependencies:
version: 5.3.0 version: 5.3.0
- name: tempo-distributed - name: tempo-distributed
repository: https://grafana.github.io/helm-charts repository: https://grafana.github.io/helm-charts
version: 1.9.4 version: 1.9.9
- name: minio - name: minio
repository: https://charts.min.io repository: https://charts.min.io
version: 5.2.0 version: 5.2.0
digest: sha256:62e737c64e180822d737a94514acee68d3c58c2cfb3e741be2f707a5d3588004 digest: sha256:5328702b5f6b0487aba8f7bc77d6abfcd5e094569e9205cd725971e3e31255dd
generated: "2024-05-02T07:02:31.487968368Z" generated: "2024-05-08T07:03:21.797461955Z"

View File

@@ -22,7 +22,7 @@ appVersion: "0.0.1"
dependencies: dependencies:
- name: loki - name: loki
repository: https://grafana.github.io/helm-charts repository: https://grafana.github.io/helm-charts
version: 6.4.2 version: 6.5.0
condition: local.logs.enabled condition: local.logs.enabled
- name: alloy - name: alloy
repository: https://grafana.github.io/helm-charts repository: https://grafana.github.io/helm-charts
@@ -33,7 +33,7 @@ dependencies:
condition: local.metrics.enabled condition: local.metrics.enabled
- name: tempo-distributed - name: tempo-distributed
repository: https://grafana.github.io/helm-charts repository: https://grafana.github.io/helm-charts
version: 1.9.4 version: 1.9.9
condition: local.traces.enabled condition: local.traces.enabled
- name: minio - name: minio
repository: https://charts.min.io repository: https://charts.min.io

Binary file not shown.

View File

@@ -51,6 +51,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 1, "id": 1,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -98,6 +99,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 2, "id": 2,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -157,6 +159,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 3, "id": 3,
"interval": "1m",
"links": [ ], "links": [ ],
"nullPointMode": "null as zero", "nullPointMode": "null as zero",
"options": { "options": {
@@ -235,6 +238,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 4, "id": 4,
"interval": "1m",
"links": [ ], "links": [ ],
"nullPointMode": "null as zero", "nullPointMode": "null as zero",
"options": { "options": {
@@ -325,6 +329,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 5, "id": 5,
"interval": "1m",
"links": [ ], "links": [ ],
"nullPointMode": "null as zero", "nullPointMode": "null as zero",
"options": { "options": {
@@ -403,6 +408,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 6, "id": 6,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -462,6 +468,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 7, "id": 7,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -658,6 +665,7 @@
}, },
"fill": 10, "fill": 10,
"id": 8, "id": 8,
"interval": "1m",
"linewidth": 0, "linewidth": 0,
"links": [ ], "links": [ ],
"options": { "options": {
@@ -719,6 +727,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 9, "id": 9,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -766,6 +775,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 10, "id": 10,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -837,6 +847,7 @@
"hideZeroBuckets": false, "hideZeroBuckets": false,
"highlightCards": true, "highlightCards": true,
"id": 11, "id": 11,
"interval": "1m",
"legend": { "legend": {
"show": true "show": true
}, },
@@ -899,6 +910,7 @@
"hideZeroBuckets": false, "hideZeroBuckets": false,
"highlightCards": true, "highlightCards": true,
"id": 12, "id": 12,
"interval": "1m",
"legend": { "legend": {
"show": true "show": true
}, },
@@ -968,6 +980,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 13, "id": 13,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -1039,6 +1052,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 14, "id": 14,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {

View File

@@ -35,6 +35,7 @@
"fill": 1, "fill": 1,
"format": "none", "format": "none",
"id": 1, "id": 1,
"interval": "1m",
"legend": { "legend": {
"avg": false, "avg": false,
"current": false, "current": false,
@@ -110,6 +111,7 @@
"fill": 1, "fill": 1,
"format": "dtdurations", "format": "dtdurations",
"id": 2, "id": 2,
"interval": "1m",
"legend": { "legend": {
"avg": false, "avg": false,
"current": false, "current": false,
@@ -213,6 +215,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 3, "id": 3,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -260,6 +263,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 4, "id": 4,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -307,6 +311,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 5, "id": 5,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -366,6 +371,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 6, "id": 6,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -413,6 +419,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 7, "id": 7,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -460,6 +467,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 8, "id": 8,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -519,6 +527,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 9, "id": 9,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -566,6 +575,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 10, "id": 10,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -603,6 +613,7 @@
{ {
"datasource": "$loki_datasource", "datasource": "$loki_datasource",
"id": 11, "id": 11,
"interval": "1m",
"span": 6, "span": 6,
"targets": [ "targets": [
{ {
@@ -616,6 +627,7 @@
{ {
"datasource": "$loki_datasource", "datasource": "$loki_datasource",
"id": 12, "id": 12,
"interval": "1m",
"span": 6, "span": 6,
"targets": [ "targets": [
{ {

View File

@@ -38,6 +38,7 @@
}, },
"hiddenSeries": false, "hiddenSeries": false,
"id": 35, "id": 35,
"interval": "1m",
"legend": { "legend": {
"avg": false, "avg": false,
"current": false, "current": false,
@@ -129,6 +130,7 @@
}, },
"hiddenSeries": false, "hiddenSeries": false,
"id": 41, "id": 41,
"interval": "1m",
"legend": { "legend": {
"avg": false, "avg": false,
"current": false, "current": false,
@@ -216,6 +218,7 @@
}, },
"hiddenSeries": false, "hiddenSeries": false,
"id": 36, "id": 36,
"interval": "1m",
"legend": { "legend": {
"avg": false, "avg": false,
"current": false, "current": false,
@@ -307,6 +310,7 @@
}, },
"hiddenSeries": false, "hiddenSeries": false,
"id": 40, "id": 40,
"interval": "1m",
"legend": { "legend": {
"avg": false, "avg": false,
"current": false, "current": false,
@@ -398,6 +402,7 @@
}, },
"hiddenSeries": false, "hiddenSeries": false,
"id": 38, "id": 38,
"interval": "1m",
"legend": { "legend": {
"avg": false, "avg": false,
"current": false, "current": false,
@@ -489,6 +494,7 @@
}, },
"hiddenSeries": false, "hiddenSeries": false,
"id": 39, "id": 39,
"interval": "1m",
"legend": { "legend": {
"avg": false, "avg": false,
"current": false, "current": false,
@@ -575,6 +581,7 @@
}, },
"hiddenSeries": false, "hiddenSeries": false,
"id": 37, "id": 37,
"interval": "1m",
"legend": { "legend": {
"avg": false, "avg": false,
"current": false, "current": false,
@@ -667,6 +674,7 @@
}, },
"hiddenSeries": false, "hiddenSeries": false,
"id": 42, "id": 42,
"interval": "1m",
"legend": { "legend": {
"avg": false, "avg": false,
"current": false, "current": false,
@@ -759,6 +767,7 @@
}, },
"hiddenSeries": false, "hiddenSeries": false,
"id": 31, "id": 31,
"interval": "1m",
"legend": { "legend": {
"avg": false, "avg": false,
"current": false, "current": false,
@@ -857,6 +866,7 @@
"y": 6 "y": 6
}, },
"id": 29, "id": 29,
"interval": "1m",
"maxDataPoints": "", "maxDataPoints": "",
"options": { "options": {
"showLabels": false, "showLabels": false,

View File

@@ -32,6 +32,7 @@
"y": 0 "y": 0
}, },
"id": 17, "id": 17,
"interval": "1m",
"panels": [ ], "panels": [ ],
"targets": [ ], "targets": [ ],
"title": "Main", "title": "Main",
@@ -61,6 +62,7 @@
}, },
"hiddenSeries": false, "hiddenSeries": false,
"id": 6, "id": 6,
"interval": "1m",
"legend": { "legend": {
"avg": false, "avg": false,
"current": false, "current": false,
@@ -157,6 +159,7 @@
}, },
"hiddenSeries": false, "hiddenSeries": false,
"id": 7, "id": 7,
"interval": "1m",
"legend": { "legend": {
"avg": false, "avg": false,
"current": false, "current": false,
@@ -251,7 +254,7 @@
}, },
"hiddenSeries": false, "hiddenSeries": false,
"id": 2, "id": 2,
"interval": "", "interval": "1m",
"legend": { "legend": {
"avg": false, "avg": false,
"current": false, "current": false,
@@ -347,6 +350,7 @@
}, },
"hiddenSeries": false, "hiddenSeries": false,
"id": 4, "id": 4,
"interval": "1m",
"legend": { "legend": {
"avg": false, "avg": false,
"current": false, "current": false,
@@ -443,6 +447,7 @@
}, },
"hiddenSeries": false, "hiddenSeries": false,
"id": 24, "id": 24,
"interval": "1m",
"legend": { "legend": {
"avg": false, "avg": false,
"current": false, "current": false,
@@ -540,6 +545,7 @@
}, },
"hiddenSeries": false, "hiddenSeries": false,
"id": 9, "id": 9,
"interval": "1m",
"legend": { "legend": {
"alignAsTable": true, "alignAsTable": true,
"avg": false, "avg": false,
@@ -647,6 +653,7 @@
}, },
"hiddenSeries": false, "hiddenSeries": false,
"id": 12, "id": 12,
"interval": "1m",
"legend": { "legend": {
"alignAsTable": true, "alignAsTable": true,
"avg": false, "avg": false,
@@ -753,6 +760,7 @@
}, },
"hiddenSeries": false, "hiddenSeries": false,
"id": 71, "id": 71,
"interval": "1m",
"legend": { "legend": {
"alignAsTable": true, "alignAsTable": true,
"avg": false, "avg": false,
@@ -852,6 +860,7 @@
}, },
"hiddenSeries": false, "hiddenSeries": false,
"id": 13, "id": 13,
"interval": "1m",
"legend": { "legend": {
"alignAsTable": true, "alignAsTable": true,
"avg": false, "avg": false,
@@ -960,6 +969,7 @@
}, },
"hiddenSeries": false, "hiddenSeries": false,
"id": 72, "id": 72,
"interval": "1m",
"legend": { "legend": {
"alignAsTable": true, "alignAsTable": true,
"avg": false, "avg": false,
@@ -1059,6 +1069,7 @@
}, },
"hiddenSeries": false, "hiddenSeries": false,
"id": 10, "id": 10,
"interval": "1m",
"legend": { "legend": {
"alignAsTable": true, "alignAsTable": true,
"avg": false, "avg": false,
@@ -1168,6 +1179,7 @@
}, },
"hiddenSeries": false, "hiddenSeries": false,
"id": 14, "id": 14,
"interval": "1m",
"legend": { "legend": {
"alignAsTable": true, "alignAsTable": true,
"avg": false, "avg": false,
@@ -1274,6 +1286,7 @@
}, },
"hiddenSeries": false, "hiddenSeries": false,
"id": 73, "id": 73,
"interval": "1m",
"legend": { "legend": {
"alignAsTable": true, "alignAsTable": true,
"avg": false, "avg": false,
@@ -1374,6 +1387,7 @@
}, },
"hiddenSeries": false, "hiddenSeries": false,
"id": 15, "id": 15,
"interval": "1m",
"legend": { "legend": {
"alignAsTable": true, "alignAsTable": true,
"avg": false, "avg": false,
@@ -1480,6 +1494,7 @@
}, },
"hiddenSeries": false, "hiddenSeries": false,
"id": 74, "id": 74,
"interval": "1m",
"legend": { "legend": {
"alignAsTable": true, "alignAsTable": true,
"avg": false, "avg": false,
@@ -1583,6 +1598,7 @@
}, },
"hiddenSeries": false, "hiddenSeries": false,
"id": 112, "id": 112,
"interval": "1m",
"legend": { "legend": {
"avg": false, "avg": false,
"current": false, "current": false,
@@ -1667,6 +1683,7 @@
"y": 27 "y": 27
}, },
"id": 113, "id": 113,
"interval": "1m",
"pageSize": null, "pageSize": null,
"panels": [ ], "panels": [ ],
"showHeader": true, "showHeader": true,
@@ -1780,6 +1797,7 @@
}, },
"hiddenSeries": false, "hiddenSeries": false,
"id": 26, "id": 26,
"interval": "1m",
"legend": { "legend": {
"avg": false, "avg": false,
"current": false, "current": false,
@@ -1874,6 +1892,7 @@
}, },
"hiddenSeries": false, "hiddenSeries": false,
"id": 27, "id": 27,
"interval": "1m",
"legend": { "legend": {
"avg": false, "avg": false,
"current": false, "current": false,
@@ -1966,6 +1985,7 @@
}, },
"hiddenSeries": false, "hiddenSeries": false,
"id": 31, "id": 31,
"interval": "1m",
"legend": { "legend": {
"avg": false, "avg": false,
"current": false, "current": false,
@@ -2051,6 +2071,7 @@
"y": 32 "y": 32
}, },
"id": 29, "id": 29,
"interval": "1m",
"options": { "options": {
"showLabels": false, "showLabels": false,
"showTime": false, "showTime": false,
@@ -2085,6 +2106,7 @@
}, },
"hiddenSeries": false, "hiddenSeries": false,
"id": 33, "id": 33,
"interval": "1m",
"legend": { "legend": {
"avg": false, "avg": false,
"current": false, "current": false,
@@ -2180,6 +2202,7 @@
}, },
"hiddenSeries": false, "hiddenSeries": false,
"id": 32, "id": 32,
"interval": "1m",
"legend": { "legend": {
"avg": false, "avg": false,
"current": false, "current": false,
@@ -2274,6 +2297,7 @@
}, },
"hiddenSeries": false, "hiddenSeries": false,
"id": 34, "id": 34,
"interval": "1m",
"legend": { "legend": {
"avg": false, "avg": false,
"current": false, "current": false,
@@ -2368,6 +2392,7 @@
}, },
"hiddenSeries": false, "hiddenSeries": false,
"id": 35, "id": 35,
"interval": "1m",
"legend": { "legend": {
"avg": false, "avg": false,
"current": false, "current": false,
@@ -2473,6 +2498,7 @@
}, },
"hiddenSeries": false, "hiddenSeries": false,
"id": 36, "id": 36,
"interval": "1m",
"legend": { "legend": {
"avg": false, "avg": false,
"current": false, "current": false,
@@ -2567,6 +2593,7 @@
}, },
"hiddenSeries": false, "hiddenSeries": false,
"id": 37, "id": 37,
"interval": "1m",
"legend": { "legend": {
"avg": false, "avg": false,
"current": false, "current": false,
@@ -2659,6 +2686,7 @@
}, },
"hiddenSeries": false, "hiddenSeries": false,
"id": 38, "id": 38,
"interval": "1m",
"legend": { "legend": {
"avg": false, "avg": false,
"current": false, "current": false,
@@ -2744,6 +2772,7 @@
"y": 32 "y": 32
}, },
"id": 39, "id": 39,
"interval": "1m",
"options": { "options": {
"showLabels": false, "showLabels": false,
"showTime": false, "showTime": false,
@@ -2778,6 +2807,7 @@
}, },
"hiddenSeries": false, "hiddenSeries": false,
"id": 67, "id": 67,
"interval": "1m",
"legend": { "legend": {
"avg": false, "avg": false,
"current": false, "current": false,
@@ -2884,6 +2914,7 @@
}, },
"hiddenSeries": false, "hiddenSeries": false,
"id": 106, "id": 106,
"interval": "1m",
"legend": { "legend": {
"avg": false, "avg": false,
"current": false, "current": false,
@@ -2975,6 +3006,7 @@
}, },
"hiddenSeries": false, "hiddenSeries": false,
"id": 108, "id": 108,
"interval": "1m",
"legend": { "legend": {
"avg": false, "avg": false,
"current": false, "current": false,
@@ -3082,6 +3114,7 @@
}, },
"hiddenSeries": false, "hiddenSeries": false,
"id": 102, "id": 102,
"interval": "1m",
"legend": { "legend": {
"avg": false, "avg": false,
"current": false, "current": false,
@@ -3190,6 +3223,7 @@
"hideZeroBuckets": false, "hideZeroBuckets": false,
"highlightCards": true, "highlightCards": true,
"id": 100, "id": 100,
"interval": "1m",
"legend": { "legend": {
"show": true "show": true
}, },
@@ -3247,6 +3281,7 @@
}, },
"hiddenSeries": false, "hiddenSeries": false,
"id": 96, "id": 96,
"interval": "1m",
"legend": { "legend": {
"avg": false, "avg": false,
"current": false, "current": false,
@@ -3345,6 +3380,7 @@
"hideZeroBuckets": true, "hideZeroBuckets": true,
"highlightCards": true, "highlightCards": true,
"id": 98, "id": 98,
"interval": "1m",
"legend": { "legend": {
"show": true "show": true
}, },
@@ -3418,6 +3454,7 @@
}, },
"hiddenSeries": false, "hiddenSeries": false,
"id": 68, "id": 68,
"interval": "1m",
"legend": { "legend": {
"avg": false, "avg": false,
"current": false, "current": false,
@@ -3512,6 +3549,7 @@
}, },
"hiddenSeries": false, "hiddenSeries": false,
"id": 69, "id": 69,
"interval": "1m",
"legend": { "legend": {
"avg": false, "avg": false,
"current": false, "current": false,
@@ -3604,6 +3642,7 @@
}, },
"hiddenSeries": false, "hiddenSeries": false,
"id": 65, "id": 65,
"interval": "1m",
"legend": { "legend": {
"avg": false, "avg": false,
"current": false, "current": false,
@@ -3723,6 +3762,7 @@
}, },
"hiddenSeries": false, "hiddenSeries": false,
"id": 70, "id": 70,
"interval": "1m",
"legend": { "legend": {
"avg": false, "avg": false,
"current": false, "current": false,
@@ -3834,7 +3874,7 @@
}, },
"hiddenSeries": false, "hiddenSeries": false,
"id": 53, "id": 53,
"interval": "", "interval": "1m",
"legend": { "legend": {
"alignAsTable": true, "alignAsTable": true,
"avg": false, "avg": false,
@@ -3938,7 +3978,7 @@
}, },
"hiddenSeries": false, "hiddenSeries": false,
"id": 54, "id": 54,
"interval": "", "interval": "1m",
"legend": { "legend": {
"alignAsTable": true, "alignAsTable": true,
"avg": false, "avg": false,
@@ -4051,7 +4091,7 @@
}, },
"hiddenSeries": false, "hiddenSeries": false,
"id": 55, "id": 55,
"interval": "", "interval": "1m",
"legend": { "legend": {
"alignAsTable": true, "alignAsTable": true,
"avg": false, "avg": false,
@@ -4160,7 +4200,7 @@
}, },
"hiddenSeries": false, "hiddenSeries": false,
"id": 58, "id": 58,
"interval": "", "interval": "1m",
"legend": { "legend": {
"alignAsTable": true, "alignAsTable": true,
"avg": false, "avg": false,
@@ -4273,7 +4313,7 @@
}, },
"hiddenSeries": false, "hiddenSeries": false,
"id": 61, "id": 61,
"interval": "", "interval": "1m",
"legend": { "legend": {
"alignAsTable": true, "alignAsTable": true,
"avg": false, "avg": false,
@@ -4377,7 +4417,7 @@
}, },
"hiddenSeries": false, "hiddenSeries": false,
"id": 62, "id": 62,
"interval": "", "interval": "1m",
"legend": { "legend": {
"alignAsTable": true, "alignAsTable": true,
"avg": false, "avg": false,
@@ -4489,7 +4529,7 @@
"y": 10 "y": 10
}, },
"id": 79, "id": 79,
"interval": "", "interval": "1m",
"legend": { "legend": {
"alignAsTable": true, "alignAsTable": true,
"avg": false, "avg": false,
@@ -4592,7 +4632,7 @@
"y": 18 "y": 18
}, },
"id": 80, "id": 80,
"interval": "", "interval": "1m",
"legend": { "legend": {
"alignAsTable": true, "alignAsTable": true,
"avg": false, "avg": false,
@@ -4704,7 +4744,7 @@
"y": 10 "y": 10
}, },
"id": 79, "id": 79,
"interval": "", "interval": "1m",
"legend": { "legend": {
"alignAsTable": true, "alignAsTable": true,
"avg": false, "avg": false,
@@ -4807,7 +4847,7 @@
"y": 18 "y": 18
}, },
"id": 80, "id": 80,
"interval": "", "interval": "1m",
"legend": { "legend": {
"alignAsTable": true, "alignAsTable": true,
"avg": false, "avg": false,
@@ -4919,7 +4959,7 @@
"y": 10 "y": 10
}, },
"id": 115, "id": 115,
"interval": "", "interval": "1m",
"legend": { "legend": {
"alignAsTable": true, "alignAsTable": true,
"avg": false, "avg": false,
@@ -5022,7 +5062,7 @@
"y": 18 "y": 18
}, },
"id": 116, "id": 116,
"interval": "", "interval": "1m",
"legend": { "legend": {
"alignAsTable": true, "alignAsTable": true,
"avg": false, "avg": false,

View File

@@ -90,6 +90,7 @@
] ]
}, },
"id": 1, "id": 1,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -191,6 +192,7 @@
] ]
}, },
"id": 2, "id": 2,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -253,6 +255,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 3, "id": 3,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -354,6 +357,7 @@
] ]
}, },
"id": 4, "id": 4,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -455,6 +459,7 @@
] ]
}, },
"id": 5, "id": 5,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -517,6 +522,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 6, "id": 6,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -619,6 +625,7 @@
}, },
"gridPos": { }, "gridPos": { },
"id": 7, "id": 7,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -720,6 +727,7 @@
}, },
"gridPos": { }, "gridPos": { },
"id": 8, "id": 8,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -782,6 +790,7 @@
}, },
"gridPos": { }, "gridPos": { },
"id": 9, "id": 9,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -832,6 +841,7 @@
}, },
"gridPos": { }, "gridPos": { },
"id": 10, "id": 10,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -879,6 +889,7 @@
}, },
"gridPos": { }, "gridPos": { },
"id": 11, "id": 11,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -926,6 +937,7 @@
}, },
"gridPos": { }, "gridPos": { },
"id": 12, "id": 12,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -1025,6 +1037,7 @@
}, },
"gridPos": { }, "gridPos": { },
"id": 13, "id": 13,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -1126,6 +1139,7 @@
}, },
"gridPos": { }, "gridPos": { },
"id": 14, "id": 14,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -1188,6 +1202,7 @@
}, },
"gridPos": { }, "gridPos": { },
"id": 15, "id": 15,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -1238,6 +1253,7 @@
}, },
"gridPos": { }, "gridPos": { },
"id": 16, "id": 16,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -1285,6 +1301,7 @@
}, },
"gridPos": { }, "gridPos": { },
"id": 17, "id": 17,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -1332,6 +1349,7 @@
}, },
"gridPos": { }, "gridPos": { },
"id": 18, "id": 18,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -1431,6 +1449,7 @@
}, },
"gridPos": { }, "gridPos": { },
"id": 19, "id": 19,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -1532,6 +1551,7 @@
}, },
"gridPos": { }, "gridPos": { },
"id": 20, "id": 20,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -1594,6 +1614,7 @@
}, },
"gridPos": { }, "gridPos": { },
"id": 21, "id": 21,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -1644,6 +1665,7 @@
}, },
"gridPos": { }, "gridPos": { },
"id": 22, "id": 22,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -1691,6 +1713,7 @@
}, },
"gridPos": { }, "gridPos": { },
"id": 23, "id": 23,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -1738,6 +1761,7 @@
}, },
"gridPos": { }, "gridPos": { },
"id": 24, "id": 24,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -1836,6 +1860,7 @@
] ]
}, },
"id": 25, "id": 25,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -1937,6 +1962,7 @@
] ]
}, },
"id": 26, "id": 26,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -1999,6 +2025,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 27, "id": 27,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -2062,6 +2089,7 @@
}, },
"gridPos": { }, "gridPos": { },
"id": 28, "id": 28,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -2148,6 +2176,7 @@
}, },
"gridPos": { }, "gridPos": { },
"id": 29, "id": 29,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -2249,6 +2278,7 @@
}, },
"gridPos": { }, "gridPos": { },
"id": 30, "id": 30,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -2311,6 +2341,7 @@
}, },
"gridPos": { }, "gridPos": { },
"id": 31, "id": 31,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {

View File

@@ -200,6 +200,7 @@
}, },
"fill": 10, "fill": 10,
"id": 1, "id": 1,
"interval": "1m",
"linewidth": 0, "linewidth": 0,
"links": [ ], "links": [ ],
"options": { "options": {
@@ -249,6 +250,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 2, "id": 2,
"interval": "1m",
"links": [ ], "links": [ ],
"nullPointMode": "null as zero", "nullPointMode": "null as zero",
"options": { "options": {
@@ -333,6 +335,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 3, "id": 3,
"interval": "1m",
"links": [ ], "links": [ ],
"nullPointMode": "null as zero", "nullPointMode": "null as zero",
"options": { "options": {
@@ -545,6 +548,7 @@
}, },
"fill": 10, "fill": 10,
"id": 4, "id": 4,
"interval": "1m",
"linewidth": 0, "linewidth": 0,
"links": [ ], "links": [ ],
"options": { "options": {
@@ -594,6 +598,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 5, "id": 5,
"interval": "1m",
"links": [ ], "links": [ ],
"nullPointMode": "null as zero", "nullPointMode": "null as zero",
"options": { "options": {
@@ -678,6 +683,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 6, "id": 6,
"interval": "1m",
"links": [ ], "links": [ ],
"nullPointMode": "null as zero", "nullPointMode": "null as zero",
"options": { "options": {
@@ -890,6 +896,7 @@
}, },
"fill": 10, "fill": 10,
"id": 7, "id": 7,
"interval": "1m",
"linewidth": 0, "linewidth": 0,
"links": [ ], "links": [ ],
"options": { "options": {
@@ -939,6 +946,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 8, "id": 8,
"interval": "1m",
"links": [ ], "links": [ ],
"nullPointMode": "null as zero", "nullPointMode": "null as zero",
"options": { "options": {
@@ -1023,6 +1031,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 9, "id": 9,
"interval": "1m",
"links": [ ], "links": [ ],
"nullPointMode": "null as zero", "nullPointMode": "null as zero",
"options": { "options": {
@@ -1235,6 +1244,7 @@
}, },
"fill": 10, "fill": 10,
"id": 10, "id": 10,
"interval": "1m",
"linewidth": 0, "linewidth": 0,
"links": [ ], "links": [ ],
"options": { "options": {
@@ -1284,6 +1294,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 11, "id": 11,
"interval": "1m",
"links": [ ], "links": [ ],
"nullPointMode": "null as zero", "nullPointMode": "null as zero",
"options": { "options": {
@@ -1368,6 +1379,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 12, "id": 12,
"interval": "1m",
"links": [ ], "links": [ ],
"nullPointMode": "null as zero", "nullPointMode": "null as zero",
"options": { "options": {
@@ -1580,6 +1592,7 @@
}, },
"fill": 10, "fill": 10,
"id": 13, "id": 13,
"interval": "1m",
"linewidth": 0, "linewidth": 0,
"links": [ ], "links": [ ],
"options": { "options": {
@@ -1629,6 +1642,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 14, "id": 14,
"interval": "1m",
"links": [ ], "links": [ ],
"nullPointMode": "null as zero", "nullPointMode": "null as zero",
"options": { "options": {
@@ -1713,6 +1727,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 15, "id": 15,
"interval": "1m",
"links": [ ], "links": [ ],
"nullPointMode": "null as zero", "nullPointMode": "null as zero",
"options": { "options": {
@@ -1925,6 +1940,7 @@
}, },
"fill": 10, "fill": 10,
"id": 16, "id": 16,
"interval": "1m",
"linewidth": 0, "linewidth": 0,
"links": [ ], "links": [ ],
"options": { "options": {
@@ -1974,6 +1990,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 17, "id": 17,
"interval": "1m",
"links": [ ], "links": [ ],
"nullPointMode": "null as zero", "nullPointMode": "null as zero",
"options": { "options": {
@@ -2058,6 +2075,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 18, "id": 18,
"interval": "1m",
"links": [ ], "links": [ ],
"nullPointMode": "null as zero", "nullPointMode": "null as zero",
"options": { "options": {
@@ -2270,6 +2288,7 @@
}, },
"fill": 10, "fill": 10,
"id": 19, "id": 19,
"interval": "1m",
"linewidth": 0, "linewidth": 0,
"links": [ ], "links": [ ],
"options": { "options": {
@@ -2319,6 +2338,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 20, "id": 20,
"interval": "1m",
"links": [ ], "links": [ ],
"nullPointMode": "null as zero", "nullPointMode": "null as zero",
"options": { "options": {
@@ -2397,6 +2417,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 21, "id": 21,
"interval": "1m",
"links": [ ], "links": [ ],
"nullPointMode": "null as zero", "nullPointMode": "null as zero",
"options": { "options": {
@@ -2609,6 +2630,7 @@
}, },
"fill": 10, "fill": 10,
"id": 22, "id": 22,
"interval": "1m",
"linewidth": 0, "linewidth": 0,
"links": [ ], "links": [ ],
"options": { "options": {
@@ -2658,6 +2680,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 23, "id": 23,
"interval": "1m",
"links": [ ], "links": [ ],
"nullPointMode": "null as zero", "nullPointMode": "null as zero",
"options": { "options": {
@@ -2736,6 +2759,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 24, "id": 24,
"interval": "1m",
"links": [ ], "links": [ ],
"nullPointMode": "null as zero", "nullPointMode": "null as zero",
"options": { "options": {

View File

@@ -90,6 +90,7 @@
] ]
}, },
"id": 1, "id": 1,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -191,6 +192,7 @@
] ]
}, },
"id": 2, "id": 2,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -253,6 +255,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 3, "id": 3,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -317,6 +320,7 @@
}, },
"fill": 1, "fill": 1,
"id": 4, "id": 4,
"interval": "1m",
"legend": { "legend": {
"avg": false, "avg": false,
"current": false, "current": false,
@@ -423,6 +427,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 5, "id": 5,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -482,6 +487,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 6, "id": 6,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -529,6 +535,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 7, "id": 7,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -590,6 +597,7 @@
}, },
"fill": 1, "fill": 1,
"id": 8, "id": 8,
"interval": "1m",
"legend": { "legend": {
"avg": false, "avg": false,
"current": false, "current": false,
@@ -696,6 +704,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 9, "id": 9,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -743,6 +752,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 10, "id": 10,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -802,6 +812,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 11, "id": 11,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -849,6 +860,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 12, "id": 12,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -896,6 +908,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 13, "id": 13,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -956,6 +969,7 @@
}, },
"format": "short", "format": "short",
"id": 14, "id": 14,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -1004,6 +1018,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 15, "id": 15,
"interval": "1m",
"links": [ ], "links": [ ],
"nullPointMode": "null as zero", "nullPointMode": "null as zero",
"options": { "options": {
@@ -1095,6 +1110,7 @@
}, },
"format": "short", "format": "short",
"id": 16, "id": 16,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -1143,6 +1159,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 17, "id": 17,
"interval": "1m",
"links": [ ], "links": [ ],
"nullPointMode": "null as zero", "nullPointMode": "null as zero",
"options": { "options": {
@@ -1233,6 +1250,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 18, "id": 18,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -1280,6 +1298,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 19, "id": 19,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -1327,6 +1346,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 20, "id": 20,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {

View File

@@ -90,6 +90,7 @@
] ]
}, },
"id": 1, "id": 1,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -191,6 +192,7 @@
] ]
}, },
"id": 2, "id": 2,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -253,6 +255,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 3, "id": 3,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -316,6 +319,7 @@
}, },
"gridPos": { }, "gridPos": { },
"id": 4, "id": 4,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -405,6 +409,7 @@
}, },
"gridPos": { }, "gridPos": { },
"id": 5, "id": 5,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -506,6 +511,7 @@
}, },
"gridPos": { }, "gridPos": { },
"id": 6, "id": 6,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -568,6 +574,7 @@
}, },
"gridPos": { }, "gridPos": { },
"id": 7, "id": 7,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -618,6 +625,7 @@
}, },
"gridPos": { }, "gridPos": { },
"id": 8, "id": 8,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -665,6 +673,7 @@
}, },
"gridPos": { }, "gridPos": { },
"id": 9, "id": 9,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -712,6 +721,7 @@
}, },
"gridPos": { }, "gridPos": { },
"id": 10, "id": 10,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {

View File

@@ -200,6 +200,7 @@
}, },
"fill": 10, "fill": 10,
"id": 1, "id": 1,
"interval": "1m",
"linewidth": 0, "linewidth": 0,
"links": [ ], "links": [ ],
"options": { "options": {
@@ -249,6 +250,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 2, "id": 2,
"interval": "1m",
"links": [ ], "links": [ ],
"nullPointMode": "null as zero", "nullPointMode": "null as zero",
"options": { "options": {
@@ -345,6 +347,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 3, "id": 3,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -392,6 +395,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 4, "id": 4,
"interval": "1m",
"links": [ ], "links": [ ],
"options": { "options": {
"legend": { "legend": {
@@ -619,6 +623,7 @@
}, },
"fill": 10, "fill": 10,
"id": 5, "id": 5,
"interval": "1m",
"linewidth": 0, "linewidth": 0,
"links": [ ], "links": [ ],
"options": { "options": {
@@ -668,6 +673,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 6, "id": 6,
"interval": "1m",
"links": [ ], "links": [ ],
"nullPointMode": "null as zero", "nullPointMode": "null as zero",
"options": { "options": {
@@ -913,6 +919,7 @@
}, },
"fill": 10, "fill": 10,
"id": 7, "id": 7,
"interval": "1m",
"linewidth": 0, "linewidth": 0,
"links": [ ], "links": [ ],
"options": { "options": {
@@ -962,6 +969,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 8, "id": 8,
"interval": "1m",
"links": [ ], "links": [ ],
"nullPointMode": "null as zero", "nullPointMode": "null as zero",
"options": { "options": {
@@ -1207,6 +1215,7 @@
}, },
"fill": 10, "fill": 10,
"id": 9, "id": 9,
"interval": "1m",
"linewidth": 0, "linewidth": 0,
"links": [ ], "links": [ ],
"options": { "options": {
@@ -1256,6 +1265,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 10, "id": 10,
"interval": "1m",
"links": [ ], "links": [ ],
"nullPointMode": "null as zero", "nullPointMode": "null as zero",
"options": { "options": {
@@ -1495,6 +1505,7 @@
}, },
"fill": 10, "fill": 10,
"id": 11, "id": 11,
"interval": "1m",
"linewidth": 0, "linewidth": 0,
"links": [ ], "links": [ ],
"options": { "options": {
@@ -1544,6 +1555,7 @@
"overrides": [ ] "overrides": [ ]
}, },
"id": 12, "id": 12,
"interval": "1m",
"links": [ ], "links": [ ],
"nullPointMode": "null as zero", "nullPointMode": "null as zero",
"options": { "options": {

View File

@@ -49,6 +49,9 @@ spec:
- containerPort: 7946 - containerPort: 7946
name: memberlist name: memberlist
protocol: TCP protocol: TCP
envFrom:
- secretRef:
name: minio
readinessProbe: readinessProbe:
failureThreshold: 3 failureThreshold: 3
httpGet: httpGet:

View File

@@ -180,7 +180,7 @@ metrics:
# Additional metrics to retain # Additional metrics to retain
extraMetrics: [] extraMetrics: []
# Set enabled = true to add the default logs/metrics/traces dashboards to the local Grafana # Set enabled = true to add the default logs dashboards to the local Grafana
dashboards: dashboards:
logs: logs:
enabled: true enabled: true
@@ -189,11 +189,6 @@ dashboards:
traces: traces:
enabled: true enabled: true
global:
minio:
rootUser: "rootuser"
rootPassword: "rootpassword"
kubeStateMetrics: kubeStateMetrics:
# Scrape https://github.com/kubernetes/kube-state-metrics by default # Scrape https://github.com/kubernetes/kube-state-metrics by default
enabled: true enabled: true
@@ -229,9 +224,9 @@ loki:
common: common:
storage: storage:
s3: s3:
access_key_id: "{{ .Values.global.minio.rootUser }}" access_key_id: "${rootUser}"
endpoint: "{{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc:9000" endpoint: "{{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc:9000"
secret_access_key: "{{ .Values.global.minio.rootPassword }}" secret_access_key: "${rootPassword}"
compactor: compactor:
retention_enabled: true retention_enabled: true
delete_request_store: s3 delete_request_store: s3
@@ -254,8 +249,24 @@ loki:
installOperator: false installOperator: false
lokiCanary: lokiCanary:
enabled: false enabled: false
test: write:
enabled: false extraArgs:
- "-config.expand-env=true"
extraEnvFrom:
- secretRef:
name: "minio"
read:
extraArgs:
- "-config.expand-env=true"
extraEnvFrom:
- secretRef:
name: "minio"
backend:
extraArgs:
- "-config.expand-env=true"
extraEnvFrom:
- secretRef:
name: "minio"
alloy: alloy:
alloy: alloy:
@@ -292,30 +303,31 @@ alloy:
mimir-distributed: mimir-distributed:
minio: minio:
enabled: false enabled: false
global:
extraEnvFrom:
- secretRef:
name: "minio"
mimir: mimir:
structuredConfig: structuredConfig:
alertmanager_storage: alertmanager_storage:
s3: s3:
bucket_name: mimir-ruler bucket_name: mimir-ruler
access_key_id: "{{ .Values.global.minio.rootUser }}"
endpoint: "{{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc:9000"
secret_access_key: "{{ .Values.global.minio.rootPassword }}"
insecure: true
blocks_storage: blocks_storage:
backend: s3 backend: s3
s3: s3:
bucket_name: mimir-tsdb bucket_name: mimir-tsdb
access_key_id: "{{ .Values.global.minio.rootUser }}"
endpoint: "{{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc:9000"
secret_access_key: "{{ .Values.global.minio.rootPassword }}"
insecure: true
ruler_storage: ruler_storage:
s3: s3:
bucket_name: mimir-ruler bucket_name: mimir-ruler
access_key_id: "{{ .Values.global.minio.rootUser }}" common:
endpoint: "{{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc:9000" storage:
secret_access_key: "{{ .Values.global.minio.rootPassword }}" backend: s3
insecure: true s3:
bucket_name: mimir-ruler
access_key_id: "${rootUser}"
endpoint: "{{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc:9000"
secret_access_key: "${rootPassword}"
insecure: true
limits: limits:
compactor_blocks_retention_period: 30d compactor_blocks_retention_period: 30d
@@ -328,12 +340,39 @@ tempo-distributed:
s3: s3:
bucket: tempo bucket: tempo
endpoint: "{{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc:9000" endpoint: "{{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc:9000"
access_key: "{{ .Values.global.minio.rootUser }}" access_key: "${rootUser}"
secret_key: "{{ .Values.global.minio.rootPassword }}" secret_key: "${rootPassword}"
insecure: true insecure: true
compactor: distributor:
compaction: extraArgs:
block_retention: 30d - "-config.expand-env=true"
extraEnvFrom:
- secretRef:
name: "minio"
ingester:
extraArgs:
- "-config.expand-env=true"
extraEnvFrom:
- secretRef:
name: "minio"
compactor:
extraArgs:
- "-config.expand-env=true"
extraEnvFrom:
- secretRef:
name: "minio"
querier:
extraArgs:
- "-config.expand-env=true"
extraEnvFrom:
- secretRef:
name: "minio"
queryFrontend:
extraArgs:
- "-config.expand-env=true"
extraEnvFrom:
- secretRef:
name: "minio"
traces: traces:
otlp: otlp:
http: http:
@@ -342,8 +381,7 @@ tempo-distributed:
enabled: true enabled: true
minio: minio:
rootUser: rootuser existingSecret: "minio"
rootPassword: rootpassword
buckets: buckets:
- name: loki-chunks - name: loki-chunks
policy: none policy: none

View File

@@ -25,17 +25,17 @@
``` ```
kubectl create secret generic logs -n meta \ kubectl create secret generic logs -n meta \
--from-literal=username=<logs username> \ --from-literal=username=<logs username> \
--from-literal=password=<token> --from-literal=password=<token> \
--from-literal=endpoint='https://logs-prod-us-central1.grafana.net/loki/api/v1/push' --from-literal=endpoint='https://logs-prod-us-central1.grafana.net/loki/api/v1/push'
kubectl create secret generic metrics -n meta \ kubectl create secret generic metrics -n meta \
--from-literal=username=<metrics username> \ --from-literal=username=<metrics username> \
--from-literal=password=<token> --from-literal=password=<token> \
--from-literal=endpoint='https://prometheus-us-central1.grafana.net/api/prom/push' --from-literal=endpoint='https://prometheus-us-central1.grafana.net/api/prom/push'
kubectl create secret generic traces -n meta \ kubectl create secret generic traces -n meta \
--from-literal=username=<OTLP instance ID> \ --from-literal=username=<OTLP instance ID> \
--from-literal=password=<token> --from-literal=password=<token> \
--from-literal=endpoint='https://otlp-gateway-prod-us-east-0.grafana.net/otlp' --from-literal=endpoint='https://otlp-gateway-prod-us-east-0.grafana.net/otlp'
``` ```
@@ -67,6 +67,14 @@
kubectl create namespace meta kubectl create namespace meta
``` ```
1. Create a secret named `minio` with the user and password for the local Minio:
```
kubectl create secret generic minio -n meta \
--from-literal=rootPassword=<password> \
--from-literal=rootUser=<user>
```
1. Create a values.yaml file based on the [default one](../charts/meta-monitoring/values.yaml). An example minimal values.yaml looks like this: 1. Create a values.yaml file based on the [default one](../charts/meta-monitoring/values.yaml). An example minimal values.yaml looks like this:
``` ```