diff --git a/nixos/modules/monitoring/server/grafana-dashboards/services-overview.json b/nixos/modules/monitoring/server/grafana-dashboards/services-overview.json index fb812227083697bdf60192e9fc63c0a124b27750..3c785964e74a6a7b901fbfe8ec4454ec8b27a0e2 100644 --- a/nixos/modules/monitoring/server/grafana-dashboards/services-overview.json +++ b/nixos/modules/monitoring/server/grafana-dashboards/services-overview.json @@ -39,7 +39,7 @@ }, "id": 39, "panels": [], - "title": "Tahoe-LAFS Overview (WIP)", + "title": "Tahoe-LAFS Overview", "type": "row" }, { @@ -47,7 +47,7 @@ "type": "prometheus", "uid": "LocalPrometheus" }, - "description": "Positive values are read & get queries (== server sending over the network)", + "description": "", "fieldConfig": { "defaults": { "color": { @@ -129,7 +129,7 @@ "uid": "LocalPrometheus" }, "editorMode": "code", - "expr": "-sum(irate(tahoe_counters_storage_server_allocate[$__range]))", + "expr": "sum(irate(tahoe_counters_storage_server_allocate[$__range]))", "instant": false, "legendFormat": "allocate", "range": true, @@ -141,7 +141,7 @@ "uid": "LocalPrometheus" }, "editorMode": "code", - "expr": "-sum(irate(tahoe_counters_storage_server_writev[$__range]))", + "expr": "sum(irate(tahoe_counters_storage_server_writev[$__range]))", "hide": false, "instant": false, "legendFormat": "writev", @@ -154,7 +154,7 @@ "uid": "LocalPrometheus" }, "editorMode": "code", - "expr": "-sum(irate(tahoe_counters_storage_server_write[$__range]))", + "expr": "sum(irate(tahoe_counters_storage_server_write[$__range]))", "hide": false, "instant": false, "legendFormat": "write", @@ -167,7 +167,7 @@ "uid": "LocalPrometheus" }, "editorMode": "code", - "expr": "-sum(irate(tahoe_counters_storage_server_close[$__range]))", + "expr": "sum(irate(tahoe_counters_storage_server_close[$__range]))", "hide": false, "instant": false, "legendFormat": "close", @@ -180,7 +180,7 @@ "uid": "LocalPrometheus" }, "editorMode": "code", - "expr": "sum(irate(tahoe_counters_storage_server_get[$__range]))", + "expr": "-sum(irate(tahoe_counters_storage_server_get[$__range]))", "hide": false, "instant": false, "legendFormat": "get", @@ -193,7 +193,7 @@ "uid": "LocalPrometheus" }, "editorMode": "code", - "expr": "sum(irate(tahoe_counters_storage_server_read[$__range]))", + "expr": "-sum(irate(tahoe_counters_storage_server_read[$__range]))", "hide": false, "instant": false, "legendFormat": "read", @@ -206,7 +206,7 @@ "uid": "LocalPrometheus" }, "editorMode": "code", - "expr": "sum(irate(tahoe_counters_storage_server_readv[$__range]))", + "expr": "-sum(irate(tahoe_counters_storage_server_readv[$__range]))", "hide": false, "instant": false, "legendFormat": "readv", @@ -318,6 +318,7 @@ "type": "prometheus", "uid": "LocalPrometheus" }, + "description": "Sum of all latency means.", "fieldConfig": { "defaults": { "color": { @@ -368,7 +369,8 @@ "value": 80 } ] - } + }, + "unit": "s" }, "overrides": [] }, @@ -398,29 +400,17 @@ "uid": "LocalPrometheus" }, "editorMode": "code", - "expr": "tahoe_stats_storage_server_latencies_read_mean + tahoe_stats_storage_server_latencies_readv_mean", + "exemplar": false, + "expr": "(tahoe_stats_storage_server_latencies_allocate_mean or vector(0) +\r\ntahoe_stats_storage_server_latencies_close_mean or vector(0) +\r\ntahoe_stats_storage_server_latencies_get_mean or vector(0) +\r\ntahoe_stats_storage_server_latencies_read_mean or vector(0) +\r\ntahoe_stats_storage_server_latencies_readv_mean or vector(0) +\r\ntahoe_stats_storage_server_latencies_write_mean or vector(0) +\r\ntahoe_stats_storage_server_latencies_writev_mean or vector(0)) != 0\r\n", "hide": false, "instant": false, "interval": "", "legendFormat": "{{instance}}", "range": true, "refId": "A" - }, - { - "datasource": { - "type": "prometheus", - "uid": "LocalPrometheus" - }, - "editorMode": "code", - "expr": "tahoe_stats_storage_server_latencies_readv{quantile=\"0.990\"}", - "hide": true, - "instant": false, - "legendFormat": "{{instance}}", - "range": true, - "refId": "B" } ], - "title": "Latencies (WIP)", + "title": "Latencies", "type": "timeseries" }, { @@ -856,13 +846,13 @@ "list": [] }, "time": { - "from": "now-12h", + "from": "now-7d", "to": "now" }, "timepicker": {}, "timezone": "", "title": "Services overview", "uid": "ServicesOverview", - "version": 3, + "version": 6, "weekStart": "" }