Merge branch 'develop' into dateNote

docs/User Guide/!!!meta.json

@@ -10734,11 +10734,65 @@
                                     "value": "bx bxs-data",
                                     "isInheritable": false,
                                     "position": 10
+                                },
+                                {
+                                    "type": "relation",
+                                    "name": "internalLink",
+                                    "value": "bOP3TB56fL1V",
+                                    "isInheritable": false,
+                                    "position": 20
                                 }
                             ],
                             "format": "markdown",
                             "dataFileName": "Metrics.md",
-                            "attachments": []
+                            "attachments": [
+                                {
+                                    "attachmentId": "6FcnvEg39b88",
+                                    "title": "image.png",
+                                    "role": "image",
+                                    "mime": "image/png",
+                                    "position": 10,
+                                    "dataFileName": "Metrics_image.png"
+                                },
+                                {
+                                    "attachmentId": "amOIi8fzVhSM",
+                                    "title": "image.png",
+                                    "role": "image",
+                                    "mime": "image/png",
+                                    "position": 10,
+                                    "dataFileName": "1_Metrics_image.png"
+                                },
+                                {
+                                    "attachmentId": "Ojj9cAXPbxJO",
+                                    "title": "image.png",
+                                    "role": "image",
+                                    "mime": "image/png",
+                                    "position": 10,
+                                    "dataFileName": "2_Metrics_image.png"
+                                }
+                            ],
+                            "dirFileName": "Metrics",
+                            "children": [
+                                {
+                                    "isClone": false,
+                                    "noteId": "bOP3TB56fL1V",
+                                    "notePath": [
+                                        "pOsGYCXsbNQG",
+                                        "tC7s2alapj8V",
+                                        "uYF7pmepw27K",
+                                        "bOP3TB56fL1V"
+                                    ],
+                                    "title": "grafana-dashboard.json",
+                                    "notePosition": 10,
+                                    "prefix": null,
+                                    "isExpanded": false,
+                                    "type": "code",
+                                    "mime": "application/json",
+                                    "attributes": [],
+                                    "dataFileName": "grafana-dashboard.json",
+                                    "attachments": []
+                                }
+                            ]
                         }
                     ]
                 },

docs/User Guide/User Guide/Advanced Usage/Metrics.md

@@ -105,4 +105,16 @@ scrape_configs:
 
 *   `400` - Invalid format parameter
 *   `401` - Missing or invalid ETAPI token
-*   `500` - Internal server error
+*   `500` - Internal server error
+
+## **Grafana Dashboard**
+
+<figure class="image"><img style="aspect-ratio:2594/1568;" src="1_Metrics_image.png" width="2594" height="1568"></figure>
+
+You can also use the Grafana Dashboard that has been created for TriliumNext - just take the JSON from <a class="reference-link" href="Metrics/grafana-dashboard.json">grafana-dashboard.json</a> and then import the dashboard, following these screenshots:
+
+<figure class="image"><img style="aspect-ratio:1881/282;" src="2_Metrics_image.png" width="1881" height="282"></figure>
+
+Then paste the JSON, and hit load:
+
+<figure class="image"><img style="aspect-ratio:1055/830;" src="Metrics_image.png" width="1055" height="830"></figure>