update dashboard

docker/playground/.env

@@ -28,5 +28,5 @@ SPARK_VERSION=3.4.3
 SPARK_BINARY_VERSION=3.4
 SPARK_HADOOP_VERSION=3.3.4
 ZOOKEEPER_VERSION=3.6.3
-PROMETHEUS_VERSION=2.45.2
-GRAFANA_VERSION=10.0.10
+PROMETHEUS_VERSION=2.53.3
+GRAFANA_VERSION=11.4.0

docs/monitor/metrics.md

@@ -101,3 +101,58 @@ Since v1.5.0, you can use the following metrics to replace:
 - `kyuubi.operation.total.ExecuteStatement`
 - `kyuubi.operation.opened.ExecuteStatement`
 - `kyuubi.operation.failed.ExecuteStatement.${errorType}`
+
+## Grafana and Prometheus
+
+[Grafana](https://grafana.com/) is a popular open and composable observability platform. Kyuubi provides
+a Grafana Dashboard template at `<KYUUBI_HOME>/grafana/dashboard-template.json` to help users to monitor
+the Kyuubi server.
+
+To use the provided Grafana Dashboard, [Prometheus](https://prometheus.io/) must be used to collect Kyuubi
+server's metrics.
+
+By default, Kyuubi server exposes Prometheus metrics at `http://<host>:10019/metrics`, you can also modify
+the relative configurations in `kyuubi-defaults.conf`.
+```
+kyuubi.metrics.enabled          true
+kyuubi.metrics.reporters        PROMETHEUS
+kyuubi.metrics.prometheus.port  10019
+kyuubi.metrics.prometheus.path  /metrics
+```
+
+To verify Prometheus metrics endpoint, run `curl http://<host>:10019/metrics`, and the output should look like
+```
+# HELP kyuubi_buffer_pool_mapped_count Generated from Dropwizard metric import (metric=kyuubi.buffer_pool.mapped.count, type=com.codahale.metrics.jvm.JmxAttributeGauge)
+# TYPE kyuubi_buffer_pool_mapped_count gauge
+kyuubi_buffer_pool_mapped_count 0.0
+# HELP kyuubi_memory_usage_pools_PS_Eden_Space_max Generated from Dropwizard metric import (metric=kyuubi.memory_usage.pools.PS-Eden-Space.max, type=com.codahale.metrics.jvm.MemoryUsageGaugeSet$$Lambda$231/207471778)
+# TYPE kyuubi_memory_usage_pools_PS_Eden_Space_max gauge
+kyuubi_memory_usage_pools_PS_Eden_Space_max 2.064646144E9
+# HELP kyuubi_gc_PS_MarkSweep_time Generated from Dropwizard metric import (metric=kyuubi.gc.PS-MarkSweep.time, type=com.codahale.metrics.jvm.GarbageCollectorMetricSet$$Lambda$218/811207775)
+# TYPE kyuubi_gc_PS_MarkSweep_time gauge
+kyuubi_gc_PS_MarkSweep_time 831.0
+...
+```
+
+Set Prometheus's scraper to target the Kyuubi server cluster endpoints, for example,
+```
+cat > /etc/prometheus/prometheus.yml <<EOF
+global:
+scrape_interval: 10s
+scrape_configs:
+  - job_name: "kyuubi-server"
+    scheme: "http"
+    metrics_path: "/metrics"
+    static_configs:
+      - targets:
+          - "kyuubi-server-1:10019"
+          - "kyuubi-server-2:10019"
+EOF
+```
+
+Grafana has built-in support for Prometheus, add the Prometheus data source, and then import the
+`<KYUUBI_HOME>/grafana/dashboard-template.json` into Grafana and customize.
+
+If you have good ideas to improve the dashboard, please don't hesitate to reach out to us by opening
+GitHub [Issues](https://github.com/apache/kyuubi/issues)/[PRs](https://github.com/apache/kyuubi/pulls)
+or sending an email to `[email protected]`.

grafana/REAMDE.md

@@ -1,40 +1,31 @@
-# How to enable a grafana dashboard for Kyuubi
+# Kyuubi Grafana Dashboard
 
-## Overview
+[Grafana](https://grafana.com/) is a popular open and composable observability platform. Kyuubi provides
+a Grafana Dashboard template `dashboard-template.json` to help users to monitor the Kyuubi server.
 
-Grafana is introduced to visualize and monitor metrics from Kyuubi service collected by Prometheus.
+## For Users
 
-There are two ways for users to make grafana dashboard available.
+By default, Kyuubi server enables metrics system and exposes Prometheus endpoints at `http://<host>:10019/metrics`,
+to use the Kyuubi Grafana Dashboard, you are supposed to have an available Prometheus and Grafana service, then
+configure Prometheus to scrape Kyuubi metrics, add the Prometheus data source into Grafana, and then import the
+`dashboard-template.json` into Grafana and customize. For more details, please read the
+[Kyuubi Docs](https://kyuubi.readthedocs.io/en/master/monitor/metrics.html#grafana-and-prometheus) 
 
-## for environment that has grafana installed
+## For Developers
 
-1. Click on the import button on the left side of grafana home page
-2. Import the dashboard json file named dashboard_template under grafana folder
+If you have good ideas to improve the dashboard, please don't hesitate to reach out to us by opening
+GitHub [Issues](https://github.com/apache/kyuubi/issues)/[PRs](https://github.com/apache/kyuubi/pulls)
+or sending an email to `[email protected]`.
 
-## for environment without grafana built
+### Export Grafana Dashboard template
 
-Here we provide a solution for users to easily build a grafana image with desired dashboards.
+Depends on your Grafana version, the exporting steps might be a little different.
 
-Data sources and dashboards both are defined and managed via yml files. user can add or remove data sources and
-dashboards based on their needs.
+Use Grafana 11.4 as an example, after modifying the dashboard, save your changes and click the "Share" button
+on the top-right corner, then choose the "Export" tab and enable the "Export for sharing externally", finally,
+click the "View JSON" button and update the `dashboard-template.json` with that JSON content.
 
-The default data source is prometheus and its corresponding dashboard is predefined in dashboard_template json file.
-
-Below is the command to build a grafana image with grafana dashboards(json format files) that are predefined under the
-grafana folder.
-
-Once the grafana starts up, it will load all datasource and dashboards as per two config files(dashboard.yml and
-datasource.yml)
-
-```
-1. docker build --build-arg PROMETHEUS_URL_ARG="127.0.0.1:8080" -t grafana:kyuubi -f Dockerfile .
-
-Options:
-
---build-arg PROMETHEUS_URL_ARG: the url to access promethues datasource
-
--t: the target repo and tag name for image
-
--f: this docker file
-
-```
+We encourage the developers to use a similar version of Grafana to the existing `dashboard-template.json`,
+and focus on one topic in each PR, to avoid introducing unnecessary and huge diff of `dashboard-template.json`.
+Additionally, to make the reviewers easy to understand your changes, don't forget to attach the current and
+updated dashboard screenshots in your PR description.