From 79a0844d7a2b7e1c89cab456ad486ba6a2830173 Mon Sep 17 00:00:00 2001
From: usbharu <i@usbharu.dev>
Date: Mon, 7 Jul 2025 16:02:48 +0900
Subject: [PATCH] fix dashboard

---
 dashboard.json | 73 ++++++++++++++++++++++++++++----------------------
 1 file changed, 41 insertions(+), 32 deletions(-)

diff --git a/dashboard.json b/dashboard.json
index 6d8ee24..f00647b 100644
--- a/dashboard.json
+++ b/dashboard.json
@@ -60,7 +60,8 @@
   "panels": [
     {
       "datasource": {
-        "uid": "${datasource}"
+        "type": "prometheus",
+        "uid": "${DS_PROMETHEUS}"
       },
       "fieldConfig": {
         "defaults": {
@@ -87,9 +88,10 @@
         "orientation": "auto",
         "percentChangeColorMode": "standard",
         "reduceOptions": {
-          "calcs": [],
+          "calcs": [
+            "lastNotNull"
+          ],
           "fields": "",
-          "limit": 1,
           "values": false
         },
         "showPercentChange": false,
@@ -99,18 +101,22 @@
       "pluginVersion": "11.6.0",
       "targets": [
         {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "misskey_meta",
+          "exemplar": false,
+          "expr": "sum by(job, version) (misskey_meta{misskey_instance=\"misskey.usbharu.dev\"})",
+          "format": "time_series",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
+          "instant": true,
           "legendFormat": "{{version}}",
-          "range": true,
+          "range": false,
           "refId": "A",
-          "useBackend": false,
-          "datasource": {
-            "uid": "${datasource}"
-          }
+          "useBackend": false
         }
       ],
       "title": "Misskey Version",
@@ -176,18 +182,18 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "${datasource}"
+            "uid": "${DS_PROMETHEUS}"
           },
           "disableTextWrap": false,
           "editorMode": "code",
           "exemplar": false,
-          "expr": "avg_over_time(clamp_max(count_over_time(misskey_ping_response_code{misskey_instance=\"$misskey_instance\"}[1m]), 1)[30d:1m]) * 100",
+          "expr": "avg_over_time(sum by(job) (misskey_ping_response_code{misskey_instance=\"$misskey_instance\"} == bool 200)[30d:]) * 100",
           "format": "time_series",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
-          "instant": false,
+          "instant": true,
           "legendFormat": "__auto",
-          "range": true,
+          "range": false,
           "refId": "A",
           "useBackend": false
         }
@@ -246,11 +252,11 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "${datasource}"
+            "uid": "${DS_PROMETHEUS}"
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "misskey_online_users{misskey_instance=\"$misskey_instance\"}",
+          "expr": "sum by(job) (misskey_online_users{misskey_instance=\"$misskey_instance\"})",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "legendFormat": "__auto",
@@ -315,7 +321,7 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "${datasource}"
+            "uid": "${DS_PROMETHEUS}"
           },
           "disableTextWrap": false,
           "editorMode": "builder",
@@ -353,7 +359,7 @@
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "${datasource}"
+        "uid": "${DS_PROMETHEUS}"
       },
       "fieldConfig": {
         "defaults": {
@@ -417,7 +423,7 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "${datasource}"
+            "uid": "${DS_PROMETHEUS}"
           },
           "disableTextWrap": false,
           "editorMode": "builder",
@@ -496,7 +502,7 @@
         "percentChangeColorMode": "standard",
         "reduceOptions": {
           "calcs": [
-            "last"
+            "lastNotNull"
           ],
           "fields": "",
           "values": false
@@ -510,15 +516,17 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "${datasource}"
+            "uid": "${DS_PROMETHEUS}"
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "clamp_max(count_over_time(misskey_ping_response_code{misskey_instance=\"$misskey_instance\"}[1m]), 1)",
+          "exemplar": false,
+          "expr": "sum by(job) (misskey_ping_response_code{misskey_instance=\"$misskey_instance\"}) == bool 200",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
+          "instant": true,
           "legendFormat": "__auto",
-          "range": true,
+          "range": false,
           "refId": "A",
           "useBackend": false
         }
@@ -601,11 +609,11 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "${datasource}"
+            "uid": "${DS_PROMETHEUS}"
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "up{misskey_instance=\"$misskey_instance\"}",
+          "expr": "sum by(job) (up{misskey_instance=\"$misskey_instance\"})",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "legendFormat": "__auto",
@@ -719,7 +727,7 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "${datasource}"
+            "uid": "${DS_PROMETHEUS}"
           },
           "disableTextWrap": false,
           "editorMode": "builder",
@@ -842,11 +850,11 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "${datasource}"
+            "uid": "${DS_PROMETHEUS}"
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "misskey_api_response_time_raw{misskey_instance=\"$misskey_instance\"}",
+          "expr": "sum by(job, api, type) (misskey_api_response_time_raw{misskey_instance=\"$misskey_instance\"})",
           "fullMetaSearch": false,
           "hide": false,
           "includeNullMetadata": false,
@@ -915,7 +923,7 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "${datasource}"
+            "uid": "${DS_PROMETHEUS}"
           },
           "disableTextWrap": false,
           "editorMode": "builder",
@@ -986,7 +994,7 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "${datasource}"
+            "uid": "${DS_PROMETHEUS}"
           },
           "disableTextWrap": false,
           "editorMode": "builder",
@@ -1090,7 +1098,7 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "${datasource}"
+            "uid": "${DS_PROMETHEUS}"
           },
           "disableTextWrap": false,
           "editorMode": "builder",
@@ -1115,7 +1123,8 @@
     "list": [
       {
         "current": {},
-        "name": "datasource",
+        "label": "Datasource",
+        "name": "DS_PROMETHEUS",
         "options": [],
         "query": "prometheus",
         "refresh": 1,
@@ -1151,6 +1160,6 @@
   "timezone": "browser",
   "title": "Misskey",
   "uid": "eej5avfu4yyo0f",
-  "version": 30,
+  "version": 50,
   "weekStart": ""
 }
\ No newline at end of file