From 7c5627e28a28e4416f0032700e058a2a680ed9c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Boudereau?= Date: Tue, 2 Apr 2024 12:34:01 +0200 Subject: [PATCH] grafanacon/oteljava: move logs panel upper --- .../Apps/OpenTelemetry JVM Micrometer.json | 208 ++++++++++-------- 1 file changed, 114 insertions(+), 94 deletions(-) diff --git a/2024-01-31_OpenTelemetry_Looks_Good_To_Me/demo/grafana/provisioning/dashboards/Apps/OpenTelemetry JVM Micrometer.json b/2024-01-31_OpenTelemetry_Looks_Good_To_Me/demo/grafana/provisioning/dashboards/Apps/OpenTelemetry JVM Micrometer.json index da03141d..0f88cce6 100644 --- a/2024-01-31_OpenTelemetry_Looks_Good_To_Me/demo/grafana/provisioning/dashboards/Apps/OpenTelemetry JVM Micrometer.json +++ b/2024-01-31_OpenTelemetry_Looks_Good_To_Me/demo/grafana/provisioning/dashboards/Apps/OpenTelemetry JVM Micrometer.json @@ -790,6 +790,55 @@ "x": 0, "y": 17 }, + "id": 67, + "panels": [], + "title": "Logs", + "type": "row" + }, + { + "datasource": { + "type": "loki", + "uid": "${loki_ds}" + }, + "gridPos": { + "h": 6, + "w": 24, + "x": 0, + "y": 18 + }, + "id": 68, + "options": { + "dedupStrategy": "none", + "enableLogDetails": true, + "prettifyLogMessage": true, + "showCommonLabels": true, + "showLabels": false, + "showTime": true, + "sortOrder": "Descending", + "wrapLogMessage": true + }, + "targets": [ + { + "datasource": { + "type": "loki", + "uid": "${loki_ds}" + }, + "editorMode": "builder", + "expr": "{service_name=\"$service_name\", deployment_environment=\"$deployment_environment\", service_instance_id=~\"$host_name\"} |= ``", + "queryType": "range", + "refId": "A" + } + ], + "type": "logs" + }, + { + "collapsed": false, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 24 + }, "id": 6, "panels": [], "title": "Saturation", @@ -851,7 +900,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -868,7 +918,7 @@ "h": 8, "w": 6, "x": 0, - "y": 18 + "y": 25 }, "id": 13, "options": { @@ -960,7 +1010,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -977,7 +1028,7 @@ "h": 8, "w": 6, "x": 6, - "y": 18 + "y": 25 }, "id": 11, "options": { @@ -1069,7 +1120,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1086,7 +1138,7 @@ "h": 8, "w": 6, "x": 12, - "y": 18 + "y": 25 }, "id": 19, "options": { @@ -1179,7 +1231,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1196,7 +1249,7 @@ "h": 8, "w": 6, "x": 18, - "y": 18 + "y": 25 }, "id": 25, "options": { @@ -1239,7 +1292,7 @@ "h": 1, "w": 24, "x": 0, - "y": 26 + "y": 33 }, "id": 5, "panels": [], @@ -1300,7 +1353,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1333,7 +1387,7 @@ "h": 8, "w": 8, "x": 0, - "y": 27 + "y": 34 }, "id": 17, "options": { @@ -1450,7 +1504,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1467,7 +1522,7 @@ "h": 8, "w": 8, "x": 8, - "y": 27 + "y": 34 }, "id": 12, "options": { @@ -1558,7 +1613,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1575,7 +1631,7 @@ "h": 8, "w": 8, "x": 16, - "y": 27 + "y": 34 }, "id": 15, "options": { @@ -1667,7 +1723,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1700,7 +1757,7 @@ "h": 8, "w": 8, "x": 0, - "y": 35 + "y": 42 }, "id": 18, "options": { @@ -1791,7 +1848,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1824,7 +1882,7 @@ "h": 8, "w": 8, "x": 8, - "y": 35 + "y": 42 }, "id": 16, "options": { @@ -1942,7 +2000,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1975,7 +2034,7 @@ "h": 8, "w": 8, "x": 16, - "y": 35 + "y": 42 }, "id": 20, "options": { @@ -2068,7 +2127,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2101,7 +2161,7 @@ "h": 8, "w": 8, "x": 0, - "y": 43 + "y": 50 }, "id": 21, "options": { @@ -2220,7 +2280,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2253,7 +2314,7 @@ "h": 8, "w": 8, "x": 8, - "y": 43 + "y": 50 }, "id": 22, "options": { @@ -2372,7 +2433,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2405,7 +2467,7 @@ "h": 8, "w": 8, "x": 16, - "y": 43 + "y": 50 }, "id": 24, "options": { @@ -2498,7 +2560,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2591,7 +2654,7 @@ "h": 8, "w": 8, "x": 0, - "y": 51 + "y": 58 }, "id": 23, "options": { @@ -2684,7 +2747,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2717,7 +2781,7 @@ "h": 8, "w": 8, "x": 8, - "y": 51 + "y": 58 }, "id": 64, "options": { @@ -2761,7 +2825,7 @@ "h": 1, "w": 24, "x": 0, - "y": 59 + "y": 66 }, "id": 35, "panels": [], @@ -2822,7 +2886,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2855,7 +2920,7 @@ "h": 8, "w": 8, "x": 0, - "y": 60 + "y": 67 }, "id": 43, "options": { @@ -2947,7 +3012,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2980,7 +3046,7 @@ "h": 8, "w": 8, "x": 8, - "y": 60 + "y": 67 }, "id": 45, "options": { @@ -3072,7 +3138,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -3089,7 +3156,7 @@ "h": 8, "w": 8, "x": 16, - "y": 60 + "y": 67 }, "id": 44, "options": { @@ -3146,7 +3213,7 @@ "h": 1, "w": 24, "x": 0, - "y": 68 + "y": 75 }, "id": 27, "panels": [], @@ -3207,7 +3274,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -3240,7 +3308,7 @@ "h": 8, "w": 6, "x": 0, - "y": 69 + "y": 76 }, "id": 26, "options": { @@ -3333,7 +3401,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -3366,7 +3435,7 @@ "h": 8, "w": 8, "x": 0, - "y": 85 + "y": 92 }, "id": 53, "options": { @@ -3404,58 +3473,9 @@ ], "title": "JVM Buffer Memory (${jvm_buffer_memory_used_id})", "type": "timeseries" - }, - { - "collapsed": false, - "gridPos": { - "h": 1, - "w": 24, - "x": 0, - "y": 93 - }, - "id": 67, - "panels": [], - "title": "Logs", - "type": "row" - }, - { - "datasource": { - "type": "loki", - "uid": "${loki_ds}" - }, - "gridPos": { - "h": 6, - "w": 24, - "x": 0, - "y": 94 - }, - "id": 68, - "options": { - "dedupStrategy": "none", - "enableLogDetails": true, - "prettifyLogMessage": true, - "showCommonLabels": true, - "showLabels": false, - "showTime": true, - "sortOrder": "Descending", - "wrapLogMessage": true - }, - "targets": [ - { - "datasource": { - "type": "loki", - "uid": "${loki_ds}" - }, - "editorMode": "builder", - "expr": "{service_name=\"$service_name\", deployment_environment=\"$deployment_environment\", service_instance_id=~\"$host_name\"} |= ``", - "queryType": "range", - "refId": "A" - } - ], - "type": "logs" } ], - "refresh": "5s", + "refresh": "", "schemaVersion": 39, "tags": [ "loki", @@ -3786,6 +3806,6 @@ "timezone": "", "title": "OpenTelemetry JVM Micrometer", "uid": "otel-jvm-micrometer", - "version": 15, + "version": 1, "weekStart": "" } \ No newline at end of file