apitech
/
loki
mirror of https://github.com/grafana/loki
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

operator: Adds structured metadata dashboards (#11473)

Browse Source
pull/11394/head
Joao Marcal 2 years ago committed by GitHub
parent f0ec743ba0
commit 9a3bcba174
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 253 additions and 57 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      operator/CHANGELOG.md
  2. 2
      operator/internal/manifests/openshift/internal/dashboards/static/grafana-dashboard-lokistack-chunks.json
  3. 68
      operator/internal/manifests/openshift/internal/dashboards/static/grafana-dashboard-lokistack-reads.json
  4. 50
      operator/internal/manifests/openshift/internal/dashboards/static/grafana-dashboard-lokistack-retention.json
  5. 172
      operator/internal/manifests/openshift/internal/dashboards/static/grafana-dashboard-lokistack-writes.json
  6. 11
      operator/jsonnet/config.libsonnet
  7. 2
      operator/jsonnet/jsonnetfile.json
  8. 4
      operator/jsonnet/jsonnetfile.lock.json

1
operator/CHANGELOG.md
Unescape View File

@ -1,5 +1,6 @@
## Main
- [11473](https://github.com/grafana/loki/pull/11473) **JoaoBraveCoding**: Adds structured metadata dashboards
- [11448](https://github.com/grafana/loki/pull/11448) **periklis**: Update Loki operand to v2.9.3
- [11357](https://github.com/grafana/loki/pull/11357) **periklis**: Fix storing authentication credentials in the Loki ConfigMap
- [11393](https://github.com/grafana/loki/pull/11393) **periklis**: Add infra annotations for OpenShift based deployments

2
operator/internal/manifests/openshift/internal/dashboards/static/grafana-dashboard-lokistack-chunks.json
Unescape View File

@ -598,7 +598,7 @@
"steppedLine": false,
"targets": [
{
"expr": "cortex_ingester_flush_queue_length{namespace=\"$namespace\", job=~\".+-ingester-http\"}",
"expr": "loki_ingester_flush_queue_length{namespace=\"$namespace\", job=~\".+-ingester-http\"} or cortex_ingester_flush_queue_length{namespace=\"$namespace\", job=~\".+-ingester-http\"}",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{pod}}",

68
operator/internal/manifests/openshift/internal/dashboards/static/grafana-dashboard-lokistack-reads.json
Unescape View File

@ -209,14 +209,17 @@
"dashes": false,
"datasource": "$datasource",
"fieldConfig": {
"custom": {
"fillOpacity": 50,
"showPoints": "never",
"stacking": {
"group": "A",
"mode": "normal"
"defaults": {
"custom": {
"fillOpacity": 50,
"showPoints": "never",
"stacking": {
"group": "A",
"mode": "normal"
}
}
}
},
"unit": "s"
},
"fill": 1,
"id": 3,
@ -482,14 +485,17 @@
"dashes": false,
"datasource": "$datasource",
"fieldConfig": {
"custom": {
"fillOpacity": 50,
"showPoints": "never",
"stacking": {
"group": "A",
"mode": "normal"
"defaults": {
"custom": {
"fillOpacity": 50,
"showPoints": "never",
"stacking": {
"group": "A",
"mode": "normal"
}
}
}
},
"unit": "s"
},
"fill": 1,
"id": 6,
@ -755,14 +761,17 @@
"dashes": false,
"datasource": "$datasource",
"fieldConfig": {
"custom": {
"fillOpacity": 50,
"showPoints": "never",
"stacking": {
"group": "A",
"mode": "normal"
"defaults": {
"custom": {
"fillOpacity": 50,
"showPoints": "never",
"stacking": {
"group": "A",
"mode": "normal"
}
}
}
},
"unit": "s"
},
"fill": 1,
"id": 9,
@ -1028,14 +1037,17 @@
"dashes": false,
"datasource": "$datasource",
"fieldConfig": {
"custom": {
"fillOpacity": 50,
"showPoints": "never",
"stacking": {
"group": "A",
"mode": "normal"
"defaults": {
"custom": {
"fillOpacity": 50,
"showPoints": "never",
"stacking": {
"group": "A",
"mode": "normal"
}
}
}
},
"unit": "s"
},
"fill": 1,
"id": 15,

50
operator/internal/manifests/openshift/internal/dashboards/static/grafana-dashboard-lokistack-retention.json
Unescape View File

@ -375,7 +375,7 @@
"renderer": "flot",
"seriesOverrides": [ ],
"spaceLength": 10,
"span": 4,
"span": 6,
"stack": false,
"steppedLine": false,
"targets": [
@ -389,7 +389,7 @@
"thresholds": [ ],
"timeFrom": null,
"timeShift": null,
"title": "Last Compact and Mark Operation Success",
"title": "Last Compact Tables Operation Success",
"tooltip": {
"shared": true,
"sort": 2,
@ -449,7 +449,7 @@
"renderer": "flot",
"seriesOverrides": [ ],
"spaceLength": 10,
"span": 4,
"span": 6,
"stack": false,
"steppedLine": false,
"targets": [
@ -465,7 +465,7 @@
"thresholds": [ ],
"timeFrom": null,
"timeShift": null,
"title": "Compact and Mark Operations Duration",
"title": "Compact Tables Operations Duration",
"tooltip": {
"shared": true,
"sort": 2,
@ -497,7 +497,19 @@
"show": false
}
]
},
}
],
"repeat": null,
"repeatIteration": null,
"repeatRowId": null,
"showTitle": true,
"title": "Compaction",
"titleSize": "h6"
},
{
"collapse": false,
"height": "250px",
"panels": [
{
"aliasColors": { },
"bars": false,
@ -505,7 +517,7 @@
"dashes": false,
"datasource": "$datasource",
"fill": 1,
"id": 6,
"id": 7,
"legend": {
"avg": false,
"current": false,
@ -525,7 +537,7 @@
"renderer": "flot",
"seriesOverrides": [ ],
"spaceLength": 10,
"span": 4,
"span": 6,
"stack": false,
"steppedLine": false,
"targets": [
@ -541,7 +553,7 @@
"thresholds": [ ],
"timeFrom": null,
"timeShift": null,
"title": "Compact and Mark Operations Per Status",
"title": "Compact Tables Operations Per Status",
"tooltip": {
"shared": true,
"sort": 2,
@ -579,7 +591,7 @@
"repeatIteration": null,
"repeatRowId": null,
"showTitle": true,
"title": "Compact and Mark",
"title": "",
"titleSize": "h6"
},
{
@ -593,7 +605,7 @@
"dashes": false,
"datasource": "$datasource",
"fill": 10,
"id": 7,
"id": 11,
"legend": {
"avg": false,
"current": false,
@ -669,7 +681,7 @@
"dashes": false,
"datasource": "$datasource",
"fill": 10,
"id": 8,
"id": 12,
"legend": {
"avg": false,
"current": false,
@ -745,7 +757,7 @@
"dashes": false,
"datasource": "$datasource",
"fill": 10,
"id": 9,
"id": 13,
"legend": {
"avg": false,
"current": false,
@ -834,7 +846,7 @@
"datasource": "$datasource",
"fill": 1,
"format": "short",
"id": 10,
"id": 14,
"legend": {
"avg": false,
"current": false,
@ -909,7 +921,7 @@
"dashes": false,
"datasource": "$datasource",
"fill": 1,
"id": 11,
"id": 15,
"legend": {
"avg": false,
"current": false,
@ -1014,7 +1026,7 @@
"datasource": "$datasource",
"fill": 1,
"format": "short",
"id": 12,
"id": 16,
"legend": {
"avg": false,
"current": false,
@ -1089,7 +1101,7 @@
"dashes": false,
"datasource": "$datasource",
"fill": 1,
"id": 13,
"id": 17,
"legend": {
"avg": false,
"current": false,
@ -1193,7 +1205,7 @@
"dashes": false,
"datasource": "$datasource",
"fill": 1,
"id": 14,
"id": 18,
"legend": {
"avg": false,
"current": false,
@ -1269,7 +1281,7 @@
"dashes": false,
"datasource": "$datasource",
"fill": 1,
"id": 15,
"id": 19,
"legend": {
"avg": false,
"current": false,
@ -1345,7 +1357,7 @@
"dashes": false,
"datasource": "$datasource",
"fill": 1,
"id": 16,
"id": 20,
"legend": {
"avg": false,
"current": false,

172
operator/internal/manifests/openshift/internal/dashboards/static/grafana-dashboard-lokistack-writes.json
Unescape View File

@ -210,6 +210,170 @@
"title": "Distributor",
"titleSize": "h6"
},
{
"collapse": false,
"height": "250px",
"panels": [
{
"aliasColors": { },
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "$datasource",
"fill": 1,
"id": 3,
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": true,
"total": false,
"values": false
},
"lines": true,
"linewidth": 1,
"links": [ ],
"nullPointMode": "null as zero",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [ ],
"spaceLength": 10,
"span": 6,
"stack": false,
"steppedLine": false,
"targets": [
{
"expr": "sum (rate(loki_distributor_structured_metadata_bytes_received_total{namespace=\"$namespace\",job=~\".+-distributor-http\",route=\"loki_api_v1_push\",}[$__rate_interval])) / sum(rate(loki_distributor_bytes_received_total{namespace=\"$namespace\",job=~\".+-distributor-http\",route=\"loki_api_v1_push\",}[$__rate_interval]))",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "bytes",
"legendLink": null,
"step": 10
}
],
"thresholds": [ ],
"timeFrom": null,
"timeShift": null,
"title": "Per Total Received Bytes",
"tooltip": {
"shared": true,
"sort": 2,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": [ ]
},
"yaxes": [
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": 0,
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": false
}
]
},
{
"aliasColors": { },
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "$datasource",
"fill": 1,
"id": 4,
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": true,
"total": false,
"values": false
},
"lines": true,
"linewidth": 1,
"links": [ ],
"nullPointMode": "null as zero",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [ ],
"spaceLength": 10,
"span": 6,
"stack": true,
"steppedLine": false,
"targets": [
{
"expr": "sum by (tenant) (rate(loki_distributor_structured_metadata_bytes_received_total{namespace=\"$namespace\",job=~\".+-distributor-http\",route=\"loki_api_v1_push\",}[$__rate_interval])) / ignoring(tenant) group_left sum(rate(loki_distributor_structured_metadata_bytes_received_total{namespace=\"$namespace\",job=~\".+-distributor-http\",route=\"loki_api_v1_push\",}[$__rate_interval]))",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{tenant}}",
"legendLink": null,
"step": 10
}
],
"thresholds": [ ],
"timeFrom": null,
"timeShift": null,
"title": "Per Tenant",
"tooltip": {
"shared": true,
"sort": 2,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": [ ]
},
"yaxes": [
{
"format": "short",
"label": null,
"logBase": 1,
"max": 1,
"min": 0,
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": 1,
"min": null,
"show": false
}
]
}
],
"repeat": null,
"repeatIteration": null,
"repeatRowId": null,
"showTitle": true,
"title": "Distributor - Structured Metadata",
"titleSize": "h6"
},
{
"collapse": false,
"height": "250px",
@ -229,7 +393,7 @@
"dashes": false,
"datasource": "$datasource",
"fill": 10,
"id": 5,
"id": 7,
"legend": {
"avg": false,
"current": false,
@ -305,7 +469,7 @@
"dashes": false,
"datasource": "$datasource",
"fill": 1,
"id": 6,
"id": 8,
"legend": {
"avg": false,
"current": false,
@ -417,7 +581,7 @@
"dashes": false,
"datasource": "$datasource",
"fill": 10,
"id": 7,
"id": 9,
"legend": {
"avg": false,
"current": false,
@ -493,7 +657,7 @@
"dashes": false,
"datasource": "$datasource",
"fill": 1,
"id": 8,
"id": 10,
"legend": {
"avg": false,
"current": false,

11
operator/jsonnet/config.libsonnet
Unescape View File

@ -144,7 +144,10 @@ local utils = (import 'github.com/grafana/jsonnet-libs/mixin-utils/utils.libsonn
grafanaDashboards+: {
'loki-retention.json'+: {
local dropList = ['Logs'],
// TODO (JoaoBraveCoding) Once we upgrade to 3.x we should be able to lift the drops on
// 'Number of times Tables were skipped during Compaction' and 'Retention' since Loki will then have the
// updated metrics
local dropList = ['Logs', 'Number of times Tables were skipped during Compaction', 'Retention'],
local replacements = [
{ from: 'cluster=~"$cluster",', to: '' },
{ from: 'container="compactor"', to: 'container=~".+-compactor"' },
@ -155,7 +158,7 @@ local utils = (import 'github.com/grafana/jsonnet-libs/mixin-utils/utils.libsonn
tags: defaultLokiTags(super.tags),
rows: [
r {
panels: mapPanels([replaceMatchers(replacements), replaceType('stat', 'singlestat')], r.panels),
panels: mapPanels([replaceMatchers(replacements), replaceType('stat', 'singlestat')], dropPanels(r.panels, dropList, function(p) true)),
}
for r in dropPanels(super.rows, dropList, function(p) true)
],
@ -242,6 +245,10 @@ local utils = (import 'github.com/grafana/jsonnet-libs/mixin-utils/utils.libsonn
utils.selector.re('job', '.+-ingester-http'),
],
ingester_zone:: [],
any_ingester:: [
utils.selector.eq('namespace', '$namespace'),
utils.selector.re('job', '.+-ingester-http'),
],
},
rows: dropPanels(super.rows, dropList, function(p) true),
templating+: {

2
operator/jsonnet/jsonnetfile.json
Unescape View File

@ -8,7 +8,7 @@
"subdir": "production/loki-mixin"
}
},
"version": "v2.9.3"
"version": "bd505f8e2d37172ff35a89f4ac42efec9566a263"
}
],
"legacyImports": true

4
operator/jsonnet/jsonnetfile.lock.json
Unescape View File

@ -38,8 +38,8 @@
"subdir": "production/loki-mixin"
}
},
"version": "567b0fb44b750ead8a22fbd0078940c14f559b79",
"sum": "a/71V1QzEB46ewPIE2nyNp2HlYFwmDqmSddNulZPP40="
"version": "bd505f8e2d37172ff35a89f4ac42efec9566a263",
"sum": "yiXXBAcWfMkYSJthU2OZSgHHmveWvmRT6aM1V0MaAjs="
},
{
"source": {

Write Preview
Loading…
Cancel
Save