diff --git a/core/src/main/resources/jmx/rules/broker.yaml b/core/src/main/resources/jmx/rules/broker.yaml index 87a43a8ff5..54758f143f 100644 --- a/core/src/main/resources/jmx/rules/broker.yaml +++ b/core/src/main/resources/jmx/rules/broker.yaml @@ -102,7 +102,7 @@ rules: type: param(request) mapping: Count: - metric: kafka.request.size.total + metric: kafka.request.size type: counter desc: The total size of requests received by the broker unit: By @@ -133,7 +133,7 @@ rules: unit: ms mapping: Count: - metric: kafka.request.time.total + metric: kafka.request.time type: counter desc: The total time the broker has taken to service requests Mean: @@ -159,7 +159,7 @@ rules: unit: ms mapping: Count: - metric: kafka.request.queue.time.total + metric: kafka.request.queue.time type: counter desc: The total time the broker has taken to dequeue requests Mean: @@ -181,7 +181,7 @@ rules: unit: ms mapping: Count: - metric: kafka.response.queue.time.total + metric: kafka.response.queue.time type: counter desc: The total time the broker has taken to dequeue responses Mean: diff --git a/core/src/main/resources/jmx/rules/common.yaml b/core/src/main/resources/jmx/rules/common.yaml index 2684e341c3..8e75c9e177 100644 --- a/core/src/main/resources/jmx/rules/common.yaml +++ b/core/src/main/resources/jmx/rules/common.yaml @@ -25,7 +25,7 @@ rules: - bean: kafka.server:type=KafkaRequestHandlerPool,name=RequestHandlerAvgIdlePercent mapping: Count: - metric: kafka.io.threads.idle.time.total + metric: kafka.io.threads.idle.time type: counter desc: The total time the io threads are idle unit: ns diff --git a/core/src/main/scala/kafka/log/stream/s3/telemetry/TelemetryManager.java b/core/src/main/scala/kafka/log/stream/s3/telemetry/TelemetryManager.java index 56e5768c96..993a451627 100644 --- a/core/src/main/scala/kafka/log/stream/s3/telemetry/TelemetryManager.java +++ b/core/src/main/scala/kafka/log/stream/s3/telemetry/TelemetryManager.java @@ -100,12 +100,10 @@ public static boolean isTraceEnable() { } private void init() { - String nodeType = getNodeType(); - Attributes baseAttributes = Attributes.builder() - .put(ResourceAttributes.SERVICE_NAMESPACE, clusterId) - .put(ResourceAttributes.SERVICE_NAME, nodeType) + .put(ResourceAttributes.SERVICE_NAME, clusterId) .put(ResourceAttributes.SERVICE_INSTANCE_ID, String.valueOf(kafkaConfig.nodeId())) + .put("instance", String.valueOf(kafkaConfig.nodeId())) // for Aliyun Prometheus compatibility .build(); Resource resource = Resource.empty().toBuilder() diff --git a/docker/telemetry/grafana/provisioning/dashboards/Developer/detailed.json b/docker/telemetry/grafana/provisioning/dashboards/Developer/detailed.json index 1e929e1c81..a73b3a3576 100644 --- a/docker/telemetry/grafana/provisioning/dashboards/Developer/detailed.json +++ b/docker/telemetry/grafana/provisioning/dashboards/Developer/detailed.json @@ -122,7 +122,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "jvm_cpu_recent_utilization_ratio{job=~\"$cluster_id/$node_type\", instance=~\"$node_id\"}", + "expr": "jvm_cpu_recent_utilization_ratio{job=\"$cluster_id\", instance=~\"$node_id\"}", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, @@ -277,7 +277,7 @@ }, "disableTextWrap": false, "editorMode": "code", - "expr": "histogram_quantile(0.99, sum by(le, jvm_gc_action, instance) (rate(jvm_gc_duration_seconds_bucket{job=~\"$cluster_id/.*\", instance=~\"$node_id\"}[$__rate_interval])))", + "expr": "histogram_quantile(0.99, sum by(le, jvm_gc_action, instance) (rate(jvm_gc_duration_seconds_bucket{job=\"$cluster_id\", instance=~\"$node_id\"}[$__rate_interval])))", "fullMetaSearch": false, "hide": false, "includeNullMetadata": false, @@ -294,7 +294,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(jvm_gc_action, instance) (rate(jvm_gc_duration_seconds_count{job=~\"$cluster_id/.*\", instance=~\"$node_id\"}[$__rate_interval]))", + "expr": "sum by(jvm_gc_action, instance) (rate(jvm_gc_duration_seconds_count{job=\"$cluster_id\", instance=~\"$node_id\"}[$__rate_interval]))", "fullMetaSearch": false, "hide": false, "includeNullMetadata": false, @@ -404,7 +404,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(jvm_memory_type, instance) (jvm_memory_used_bytes{job=~\"$cluster_id/$node_type\", instance=~\"$node_id\", jvm_memory_type=\"heap\"})", + "expr": "sum by(jvm_memory_type, instance) (jvm_memory_used_bytes{job=\"$cluster_id\", instance=~\"$node_id\", jvm_memory_type=\"heap\"})", "fullMetaSearch": false, "hide": true, "includeNullMetadata": true, @@ -421,7 +421,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(jvm_memory_type, instance) (jvm_memory_limit_bytes{job=~\"$cluster_id/$node_type\", instance=~\"$node_id\", jvm_memory_type=\"heap\"})", + "expr": "sum by(jvm_memory_type, instance) (jvm_memory_limit_bytes{job=\"$cluster_id\", instance=~\"$node_id\", jvm_memory_type=\"heap\"})", "fullMetaSearch": false, "hide": true, "includeNullMetadata": true, @@ -546,7 +546,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(instance, job, type) (rate(kafka_request_count_total{job=~\"$cluster_id/$node_type\", instance=~\"$node_id\", type=~\"$request_type\"}[$__rate_interval]))", + "expr": "sum by(instance, job, type) (rate(kafka_request_count_total{job=\"$cluster_id\", instance=~\"$node_id\", type=~\"$request_type\"}[$__rate_interval]))", "fullMetaSearch": false, "hide": false, "includeNullMetadata": false, @@ -647,7 +647,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(instance, job, type) (rate(kafka_request_time_99p_milliseconds{job=~\"$cluster_id/$node_type\", instance=~\"$node_id\", type=~\"$request_type\"}[$__rate_interval]))", + "expr": "sum by(instance, job, type) (rate(kafka_request_time_99p_milliseconds{job=\"$cluster_id\", instance=~\"$node_id\", type=~\"$request_type\"}[$__rate_interval]))", "fullMetaSearch": false, "hide": false, "includeNullMetadata": false, @@ -664,7 +664,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(instance, job, type) (rate(kafka_request_time_50p_milliseconds{job=~\"$cluster_id/$node_type\", instance=~\"$node_id\", type=~\"$request_type\"}[$__rate_interval]))", + "expr": "sum by(instance, job, type) (rate(kafka_request_time_50p_milliseconds{job=\"$cluster_id\", instance=~\"$node_id\", type=~\"$request_type\"}[$__rate_interval]))", "fullMetaSearch": false, "hide": false, "includeNullMetadata": false, @@ -681,7 +681,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(instance, job, type) (rate(kafka_request_time_mean_milliseconds{job=~\"$cluster_id/$node_type\", instance=~\"$node_id\", type=~\"$request_type\"}[$__rate_interval]))", + "expr": "sum by(instance, job, type) (rate(kafka_request_time_mean_milliseconds{job=\"$cluster_id\", instance=~\"$node_id\", type=~\"$request_type\"}[$__rate_interval]))", "fullMetaSearch": false, "hide": false, "includeNullMetadata": false, @@ -782,7 +782,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(instance, job) (rate(kafka_io_threads_idle_time_nanoseconds_total{job=~\"$cluster_id/$node_type\", instance=~\"$node_id\"}[$__rate_interval])) / 1000000000", + "expr": "sum by(instance, job) (rate(kafka_io_threads_idle_time_nanoseconds_total{job=\"$cluster_id\", instance=~\"$node_id\"}[$__rate_interval])) / 1000000000", "fullMetaSearch": false, "hide": false, "includeNullMetadata": false, @@ -883,7 +883,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(instance, job) (kafka_network_threads_idle_rate{job=~\"$cluster_id/$node_type\", instance=~\"$node_id\"})", + "expr": "sum by(instance, job) (kafka_network_threads_idle_rate{job=\"$cluster_id\", instance=~\"$node_id\"})", "fullMetaSearch": false, "hide": false, "includeNullMetadata": false, @@ -997,7 +997,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(job, instance, operation_name) (rate(kafka_stream_operation_latency_nanoseconds_count{job=~\"$cluster_id/.*\", instance=~\"$node_id\", operation_name=~\"$s3stream_request\", operation_type=\"S3Stream\"}[$__rate_interval]))", + "expr": "sum by(job, instance, operation_name) (rate(kafka_stream_operation_latency_nanoseconds_count{job=\"$cluster_id\", instance=~\"$node_id\", operation_name=~\"$s3stream_request\", operation_type=\"S3Stream\"}[$__rate_interval]))", "fullMetaSearch": false, "includeNullMetadata": false, "instant": false, @@ -1097,7 +1097,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "histogram_quantile(0.99, sum by(job, instance, operation_name, le) (rate(kafka_stream_operation_latency_nanoseconds_bucket{job=~\"$cluster_id/.*\", instance=~\"$node_id\", operation_name=~\"$s3stream_request\", operation_type=\"S3Stream\"}[$__rate_interval])))", + "expr": "histogram_quantile(0.99, sum by(job, instance, operation_name, le) (rate(kafka_stream_operation_latency_nanoseconds_bucket{job=\"$cluster_id\", instance=~\"$node_id\", operation_name=~\"$s3stream_request\", operation_type=\"S3Stream\"}[$__rate_interval])))", "fullMetaSearch": false, "includeNullMetadata": false, "instant": false, @@ -1113,7 +1113,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "histogram_quantile(0.5, sum by(job, instance, operation_name, le) (rate(kafka_stream_operation_latency_nanoseconds_bucket{job=~\"$cluster_id/.*\", instance=~\"$node_id\", operation_name=~\"$s3stream_request\", operation_type=\"S3Stream\"}[$__rate_interval])))", + "expr": "histogram_quantile(0.5, sum by(job, instance, operation_name, le) (rate(kafka_stream_operation_latency_nanoseconds_bucket{job=\"$cluster_id\", instance=~\"$node_id\", operation_name=~\"$s3stream_request\", operation_type=\"S3Stream\"}[$__rate_interval])))", "fullMetaSearch": false, "hide": false, "includeNullMetadata": false, @@ -1228,7 +1228,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(operation_name, instance) (rate(kafka_stream_operation_latency_nanoseconds_count{job=~\"$cluster_id/.*\", instance=~\"$node_id\", operation_type=\"S3Request\", status=\"failed\"}[$__rate_interval]))", + "expr": "sum by(operation_name, instance) (rate(kafka_stream_operation_latency_nanoseconds_count{job=\"$cluster_id\", instance=~\"$node_id\", operation_type=\"S3Request\", status=\"failed\"}[$__rate_interval]))", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, @@ -1329,7 +1329,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(job, instance, operation_name) (rate(kafka_stream_operation_latency_nanoseconds_count{job=~\"$cluster_id/.*\", instance=~\"$node_id\", operation_name=~\"$s3request\", operation_type=\"S3Request\"}[$__rate_interval]))", + "expr": "sum by(job, instance, operation_name) (rate(kafka_stream_operation_latency_nanoseconds_count{job=\"$cluster_id\", instance=~\"$node_id\", operation_name=~\"$s3request\", operation_type=\"S3Request\"}[$__rate_interval]))", "fullMetaSearch": false, "includeNullMetadata": false, "instant": false, @@ -1432,7 +1432,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "histogram_quantile(0.99, sum by(job, instance, operation_name, le) (rate(kafka_stream_operation_latency_nanoseconds_bucket{job=~\"$cluster_id/.*\", instance=~\"$node_id\", operation_name=~\"$s3request\", operation_type=\"S3Request\"}[$__rate_interval])))", + "expr": "histogram_quantile(0.99, sum by(job, instance, operation_name, le) (rate(kafka_stream_operation_latency_nanoseconds_bucket{job=\"$cluster_id\", instance=~\"$node_id\", operation_name=~\"$s3request\", operation_type=\"S3Request\"}[$__rate_interval])))", "fullMetaSearch": false, "includeNullMetadata": false, "instant": false, @@ -1448,7 +1448,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "histogram_quantile(0.5, sum by(job, instance, operation_name, le) (rate(kafka_stream_operation_latency_nanoseconds_bucket{job=~\"$cluster_id/.*\", instance=~\"$node_id\", operation_name=~\"$s3request\", operation_type=\"S3Request\"}[$__rate_interval])))", + "expr": "histogram_quantile(0.5, sum by(job, instance, operation_name, le) (rate(kafka_stream_operation_latency_nanoseconds_bucket{job=\"$cluster_id\", instance=~\"$node_id\", operation_name=~\"$s3request\", operation_type=\"S3Request\"}[$__rate_interval])))", "fullMetaSearch": false, "hide": false, "includeNullMetadata": false, @@ -1562,7 +1562,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(job, instance, operation_name) (rate(kafka_stream_operation_latency_nanoseconds_count{job=~\"$cluster_id/.*\", instance=~\"$node_id\", operation_name=~\"append_wal|append_wal_full\", operation_type=\"S3Storage\"}[$__rate_interval]))", + "expr": "sum by(job, instance, operation_name) (rate(kafka_stream_operation_latency_nanoseconds_count{job=\"$cluster_id\", instance=~\"$node_id\", operation_name=~\"append_wal|append_wal_full\", operation_type=\"S3Storage\"}[$__rate_interval]))", "fullMetaSearch": false, "includeNullMetadata": false, "instant": false, @@ -1662,7 +1662,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "histogram_quantile(0.99, sum by(job, instance, operation_name, le, stage) (rate(kafka_stream_operation_latency_nanoseconds_bucket{job=~\"$cluster_id/.*\", instance=~\"$node_id\", operation_name=~\"append_wal\", operation_type=\"S3Storage\"}[$__rate_interval])))", + "expr": "histogram_quantile(0.99, sum by(job, instance, operation_name, le, stage) (rate(kafka_stream_operation_latency_nanoseconds_bucket{job=\"$cluster_id\", instance=~\"$node_id\", operation_name=~\"append_wal\", operation_type=\"S3Storage\"}[$__rate_interval])))", "fullMetaSearch": false, "includeNullMetadata": false, "instant": false, @@ -1775,7 +1775,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(job, instance, operation_name) (rate(kafka_stream_operation_latency_nanoseconds_count{job=~\"$cluster_id/.*\", instance=~\"$node_id\", operation_name=~\"append_log_cache|append_log_cache_full\", operation_type=\"S3Storage\"}[$__rate_interval]))", + "expr": "sum by(job, instance, operation_name) (rate(kafka_stream_operation_latency_nanoseconds_count{job=\"$cluster_id\", instance=~\"$node_id\", operation_name=~\"append_log_cache|append_log_cache_full\", operation_type=\"S3Storage\"}[$__rate_interval]))", "fullMetaSearch": false, "includeNullMetadata": false, "instant": false, @@ -1791,7 +1791,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(job, instance, operation_name, status) (rate(kafka_stream_operation_latency_nanoseconds_count{job=~\"$cluster_id/.*\", instance=~\"$node_id\", operation_type=\"S3Storage\", operation_name=\"read_log_cache\"}[$__rate_interval]))", + "expr": "sum by(job, instance, operation_name, status) (rate(kafka_stream_operation_latency_nanoseconds_count{job=\"$cluster_id\", instance=~\"$node_id\", operation_type=\"S3Storage\", operation_name=\"read_log_cache\"}[$__rate_interval]))", "fullMetaSearch": false, "hide": false, "includeNullMetadata": false, @@ -1892,7 +1892,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "histogram_quantile(0.99, sum by(job, instance, operation_name, le) (rate(kafka_stream_operation_latency_nanoseconds_bucket{job=~\"$cluster_id/.*\", instance=~\"$node_id\", operation_name=~\"append_log_cache\", operation_type=\"S3Storage\"}[$__rate_interval])))", + "expr": "histogram_quantile(0.99, sum by(job, instance, operation_name, le) (rate(kafka_stream_operation_latency_nanoseconds_bucket{job=\"$cluster_id\", instance=~\"$node_id\", operation_name=~\"append_log_cache\", operation_type=\"S3Storage\"}[$__rate_interval])))", "fullMetaSearch": false, "includeNullMetadata": false, "instant": false, @@ -1908,7 +1908,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "histogram_quantile(0.99, sum by(job, instance, operation_name, le, status) (rate(kafka_stream_operation_latency_nanoseconds_bucket{job=~\"$cluster_id/.*\", instance=~\"$node_id\", operation_name=\"read_log_cache\", operation_type=\"S3Storage\"}[$__rate_interval])))", + "expr": "histogram_quantile(0.99, sum by(job, instance, operation_name, le, status) (rate(kafka_stream_operation_latency_nanoseconds_bucket{job=\"$cluster_id\", instance=~\"$node_id\", operation_name=\"read_log_cache\", operation_type=\"S3Storage\"}[$__rate_interval])))", "fullMetaSearch": false, "hide": false, "includeNullMetadata": false, @@ -1969,7 +1969,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2008,7 +2009,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(job, instance, operation_name) (rate(kafka_stream_operation_latency_nanoseconds_count{job=~\"$cluster_id/.*\", instance=~\"$node_id\", operation_name=~\"upload_wal|force_upload_wal\", operation_type=\"S3Storage\"}[$__rate_interval]))", + "expr": "sum by(job, instance, operation_name) (rate(kafka_stream_operation_latency_nanoseconds_count{job=\"$cluster_id\", instance=~\"$node_id\", operation_name=~\"upload_wal|force_upload_wal\", operation_type=\"S3Storage\"}[$__rate_interval]))", "fullMetaSearch": false, "includeNullMetadata": false, "instant": false, @@ -2068,7 +2069,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2107,7 +2109,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "histogram_quantile(0.99, sum by(job, instance, operation_name, le, stage) (rate(kafka_stream_operation_latency_nanoseconds_bucket{job=~\"$cluster_id/.*\", instance=~\"$node_id\", operation_name=~\"upload_wal|force_upload_wal\", operation_type=\"S3Storage\"}[$__rate_interval])))", + "expr": "histogram_quantile(0.99, sum by(job, instance, operation_name, le, stage) (rate(kafka_stream_operation_latency_nanoseconds_bucket{job=\"$cluster_id\", instance=~\"$node_id\", operation_name=~\"upload_wal|force_upload_wal\", operation_type=\"S3Storage\"}[$__rate_interval])))", "fullMetaSearch": false, "includeNullMetadata": false, "instant": false, @@ -2180,7 +2182,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2219,7 +2222,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(job, instance, operation_name, status) (rate(kafka_stream_operation_latency_nanoseconds_count{job=~\"$cluster_id/.*\", instance=~\"$node_id\", operation_name=~\"read_block_cache\", operation_type=\"S3Storage\"}[$__rate_interval]))", + "expr": "sum by(job, instance, operation_name, status) (rate(kafka_stream_operation_latency_nanoseconds_count{job=\"$cluster_id\", instance=~\"$node_id\", operation_name=~\"read_block_cache\", operation_type=\"S3Storage\"}[$__rate_interval]))", "fullMetaSearch": false, "includeNullMetadata": false, "instant": false, @@ -2279,7 +2282,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2318,7 +2322,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "histogram_quantile(0.99, sum by(job, instance, operation_name, le, status) (rate(kafka_stream_operation_latency_nanoseconds_bucket{job=~\"$cluster_id/.*\", instance=~\"$node_id\", operation_name=~\"read_block_cache\", operation_type=\"S3Storage\"}[$__rate_interval])))", + "expr": "histogram_quantile(0.99, sum by(job, instance, operation_name, le, status) (rate(kafka_stream_operation_latency_nanoseconds_bucket{job=\"$cluster_id\", instance=~\"$node_id\", operation_name=~\"read_block_cache\", operation_type=\"S3Storage\"}[$__rate_interval])))", "fullMetaSearch": false, "includeNullMetadata": false, "instant": false, @@ -2378,7 +2382,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2417,7 +2422,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(job, instance, operation_name, status) (rate(kafka_stream_operation_latency_nanoseconds_count{job=~\"$cluster_id/.*\", instance=~\"$node_id\", operation_name=\"read_ahead\", operation_type=\"S3Storage\"}[$__rate_interval]))", + "expr": "sum by(job, instance, operation_name, status) (rate(kafka_stream_operation_latency_nanoseconds_count{job=\"$cluster_id\", instance=~\"$node_id\", operation_name=\"read_ahead\", operation_type=\"S3Storage\"}[$__rate_interval]))", "fullMetaSearch": false, "includeNullMetadata": false, "instant": false, @@ -2477,7 +2482,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2516,7 +2522,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(job, instance) (rate(kafka_stream_read_ahead_size_bytes_sum{job=~\"$cluster_id/.*\", instance=~\"$node_id\"}[$__rate_interval]))", + "expr": "sum by(job, instance) (rate(kafka_stream_read_ahead_size_bytes_sum{job=\"$cluster_id\", instance=~\"$node_id\"}[$__rate_interval]))", "fullMetaSearch": false, "includeNullMetadata": false, "instant": false, @@ -2576,7 +2582,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2615,7 +2622,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "histogram_quantile(0.99, sum by(job, instance, operation_name, le, status) (rate(kafka_stream_operation_latency_nanoseconds_bucket{job=~\"$cluster_id/.*\", instance=~\"$node_id\", operation_name=\"read_ahead\", operation_type=\"S3Storage\"}[$__rate_interval])))", + "expr": "histogram_quantile(0.99, sum by(job, instance, operation_name, le, status) (rate(kafka_stream_operation_latency_nanoseconds_bucket{job=\"$cluster_id\", instance=~\"$node_id\", operation_name=\"read_ahead\", operation_type=\"S3Storage\"}[$__rate_interval])))", "fullMetaSearch": false, "includeNullMetadata": false, "instant": false, @@ -2675,7 +2682,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2714,7 +2722,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(job, instance) (kafka_stream_available_inflight_read_ahead_size_bytes{job=~\"$cluster_id/.*\", instance=~\"$node_id\"})", + "expr": "sum by(job, instance) (kafka_stream_available_inflight_read_ahead_size_bytes{job=\"$cluster_id\", instance=~\"$node_id\"})", "fullMetaSearch": false, "includeNullMetadata": false, "instant": false, @@ -2775,7 +2783,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2814,7 +2823,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "histogram_quantile(0.99, sum by(job, instance, le) (rate(kafka_stream_read_ahead_limiter_queue_time{job=~\"$cluster_id/.*\", instance=~\"$node_id\"}[$__rate_interval])))", + "expr": "histogram_quantile(0.99, sum by(job, instance, le) (rate(kafka_stream_read_ahead_limiter_queue_time{job=\"$cluster_id\", instance=~\"$node_id\"}[$__rate_interval])))", "fullMetaSearch": false, "includeNullMetadata": false, "instant": false, @@ -2891,7 +2900,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2930,7 +2940,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(instance, job) (rate(kafka_stream_network_inbound_usage_bytes_total{job=~\"$cluster_id/.*\", instance=~\"$node_id\"}[$__rate_interval]))", + "expr": "sum by(instance, job) (rate(kafka_stream_network_inbound_usage_bytes_total{job=\"$cluster_id\", instance=~\"$node_id\"}[$__rate_interval]))", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -2946,7 +2956,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(instance, job) (rate(kafka_stream_network_outbound_usage_bytes_total{job=~\"$cluster_id/.*\", instance=~\"$node_id\"}[$__rate_interval])) * -1", + "expr": "sum by(instance, job) (rate(kafka_stream_network_outbound_usage_bytes_total{job=\"$cluster_id\", instance=~\"$node_id\"}[$__rate_interval])) * -1", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, @@ -3011,7 +3021,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -3050,7 +3061,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(instance, job) (rate(kafka_stream_download_size_bytes_total{job=~\"$cluster_id/.*\", instance=~\"$node_id\"}[$__rate_interval]))", + "expr": "sum by(instance, job) (rate(kafka_stream_download_size_bytes_total{job=\"$cluster_id\", instance=~\"$node_id\"}[$__rate_interval]))", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, @@ -3067,7 +3078,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(instance, job) (rate(kafka_stream_upload_size_bytes_total{job=~\"$cluster_id/.*\", instance=~\"$node_id\"}[$__rate_interval])) * -1", + "expr": "sum by(instance, job) (rate(kafka_stream_upload_size_bytes_total{job=\"$cluster_id\", instance=~\"$node_id\"}[$__rate_interval])) * -1", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, @@ -3084,7 +3095,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(instance, job, direction) (rate(kafka_network_io_bytes_total{job=~\"$cluster_id/.*\", instance=~\"$node_id\", direction=\"in\"}[$__rate_interval]))", + "expr": "sum by(instance, job, direction) (rate(kafka_network_io_bytes_total{job=\"$cluster_id\", instance=~\"$node_id\", direction=\"in\"}[$__rate_interval]))", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, @@ -3101,7 +3112,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(instance, job, direction) (rate(kafka_network_io_bytes_total{job=~\"$cluster_id/.*\", instance=~\"$node_id\", direction=\"out\"}[$__rate_interval])) * -1", + "expr": "sum by(instance, job, direction) (rate(kafka_network_io_bytes_total{job=\"$cluster_id\", instance=~\"$node_id\", direction=\"out\"}[$__rate_interval])) * -1", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, @@ -3166,7 +3177,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -3205,7 +3217,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(instance, job) (kafka_stream_network_inbound_available_bandwidth_bytes{job=~\"$cluster_id/.*\", instance=~\"$node_id\"})", + "expr": "sum by(instance, job) (kafka_stream_network_inbound_available_bandwidth_bytes{job=\"$cluster_id\", instance=~\"$node_id\"})", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -3221,7 +3233,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(instance, job) (kafka_stream_network_outbound_available_bandwidth_bytes{job=~\"$cluster_id/.*\", instance=~\"$node_id\"})", + "expr": "sum by(instance, job) (kafka_stream_network_outbound_available_bandwidth_bytes{job=\"$cluster_id\", instance=~\"$node_id\"})", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, @@ -3286,7 +3298,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -3325,7 +3338,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "histogram_quantile(0.99, sum by(instance, job, le) (rate(kafka_stream_network_inbound_limiter_queue_time_nanoseconds_bucket{job=~\"$cluster_id/.*\", instance=~\"$node_id\"}[$__rate_interval])))", + "expr": "histogram_quantile(0.99, sum by(instance, job, le) (rate(kafka_stream_network_inbound_limiter_queue_time_nanoseconds_bucket{job=\"$cluster_id\", instance=~\"$node_id\"}[$__rate_interval])))", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -3341,7 +3354,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "histogram_quantile(0.99, sum by(instance, job, le) (rate(kafka_stream_network_outbound_limiter_queue_time_nanoseconds_bucket{job=~\"$cluster_id/.*\", instance=~\"$node_id\"}[$__rate_interval])))", + "expr": "histogram_quantile(0.99, sum by(instance, job, le) (rate(kafka_stream_network_outbound_limiter_queue_time_nanoseconds_bucket{job=\"$cluster_id\", instance=~\"$node_id\"}[$__rate_interval])))", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, @@ -3428,7 +3441,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(size) (kafka_stream_operation_latency_nanoseconds_count{operation_type=\"S3Request\", operation_name=\"get_object\", job=~\"$cluster_id/.*\", instance=~\"$node_id\"})", + "expr": "sum by(size) (kafka_stream_operation_latency_nanoseconds_count{operation_type=\"S3Request\", operation_name=\"get_object\", job=\"$cluster_id\", instance=~\"$node_id\"})", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -3488,7 +3501,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -3527,7 +3541,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "histogram_quantile(0.99, sum by(job, instance, operation_name, le, size) (rate(kafka_stream_operation_latency_nanoseconds_bucket{job=~\"$cluster_id/.*\", instance=~\"$node_id\", operation_type=\"S3Request\", operation_name=\"get_object\"}[$__rate_interval])))", + "expr": "histogram_quantile(0.99, sum by(job, instance, operation_name, le, size) (rate(kafka_stream_operation_latency_nanoseconds_bucket{job=\"$cluster_id\", instance=~\"$node_id\", operation_type=\"S3Request\", operation_name=\"get_object\"}[$__rate_interval])))", "fullMetaSearch": false, "includeNullMetadata": false, "instant": false, @@ -3600,7 +3614,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(size) (kafka_stream_operation_latency_nanoseconds_count{operation_type=\"S3Request\", operation_name=~\"put_object|upload_part\", job=~\"$cluster_id/.*\", instance=~\"$node_id\"})", + "expr": "sum by(size) (kafka_stream_operation_latency_nanoseconds_count{operation_type=\"S3Request\", operation_name=~\"put_object|upload_part\", job=\"$cluster_id\", instance=~\"$node_id\"})", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -3660,7 +3674,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -3699,7 +3714,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "histogram_quantile(0.99, sum by(job, instance, operation_name, le, size) (rate(kafka_stream_operation_latency_nanoseconds_bucket{job=~\"$cluster_id/.*\", instance=~\"$node_id\", operation_type=\"S3Request\", operation_name=~\"put_object|upload_part\"}[$__rate_interval])))", + "expr": "histogram_quantile(0.99, sum by(job, instance, operation_name, le, size) (rate(kafka_stream_operation_latency_nanoseconds_bucket{job=\"$cluster_id\", instance=~\"$node_id\", operation_type=\"S3Request\", operation_name=~\"put_object|upload_part\"}[$__rate_interval])))", "fullMetaSearch": false, "includeNullMetadata": false, "instant": false, @@ -3772,7 +3787,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null } ] }, @@ -3807,7 +3823,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "rate(kafka_stream_compaction_read_size_bytes_total{job=~\"$cluster_id/.*\", instance=~\"$node_id\"}[$__rate_interval])", + "expr": "rate(kafka_stream_compaction_read_size_bytes_total{job=\"$cluster_id\", instance=~\"$node_id\"}[$__rate_interval])", "fullMetaSearch": false, "includeNullMetadata": false, "instant": false, @@ -3823,7 +3839,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "rate(kafka_stream_compaction_write_size_bytes_total{job=~\"$cluster_id/.*\", instance=~\"$node_id\"}[$__rate_interval]) * -1", + "expr": "rate(kafka_stream_compaction_write_size_bytes_total{job=\"$cluster_id\", instance=~\"$node_id\"}[$__rate_interval]) * -1", "fullMetaSearch": false, "hide": false, "includeNullMetadata": false, @@ -3871,7 +3887,7 @@ "type": "prometheus", "uid": "${datasource}" }, - "definition": "label_values(job)", + "definition": "label_values(jvm_cpu_count,job)", "hide": 0, "includeAll": false, "label": "Cluster Id", @@ -3880,18 +3896,18 @@ "options": [], "query": { "qryType": 1, - "query": "label_values(job)", + "query": "label_values(jvm_cpu_count,job)", "refId": "PrometheusVariableQueryEditor-VariableQuery" }, "refresh": 1, - "regex": "/(?[^\"]+)\\//", + "regex": "", "skipUrlSync": false, "sort": 0, "type": "query" }, { "current": { - "selected": false, + "selected": true, "text": [ "All" ], @@ -3903,39 +3919,7 @@ "type": "prometheus", "uid": "${datasource}" }, - "definition": "label_values(job)", - "hide": 0, - "includeAll": true, - "label": "Node Type", - "multi": true, - "name": "node_type", - "options": [], - "query": { - "qryType": 1, - "query": "label_values(job)", - "refId": "PrometheusVariableQueryEditor-VariableQuery" - }, - "refresh": 1, - "regex": "/\\/(?[^\"]+)/", - "skipUrlSync": false, - "sort": 0, - "type": "query" - }, - { - "current": { - "selected": false, - "text": [ - "0" - ], - "value": [ - "0" - ] - }, - "datasource": { - "type": "prometheus", - "uid": "${datasource}" - }, - "definition": "label_values(instance)", + "definition": "label_values(jvm_cpu_count,instance)", "hide": 0, "includeAll": true, "label": "Node Id", @@ -3944,23 +3928,23 @@ "options": [], "query": { "qryType": 1, - "query": "label_values(instance)", + "query": "label_values(jvm_cpu_count,instance)", "refId": "PrometheusVariableQueryEditor-VariableQuery" }, "refresh": 1, - "regex": "/(?\\b\\d\\b)/", + "regex": "", "skipUrlSync": false, "sort": 0, "type": "query" }, { "current": { - "selected": false, + "selected": true, "text": [ - "Fetch" + "Produce" ], "value": [ - "Fetch" + "Produce" ] }, "datasource": { @@ -3987,7 +3971,7 @@ }, { "current": { - "selected": false, + "selected": true, "text": [ "append" ], @@ -4019,12 +4003,12 @@ }, { "current": { - "selected": false, + "selected": true, "text": [ - "All" + "put_object" ], "value": [ - "$__all" + "put_object" ] }, "datasource": { @@ -4052,13 +4036,13 @@ ] }, "time": { - "from": "now-1h", + "from": "now-30m", "to": "now" }, "timepicker": {}, "timezone": "", "title": "Detailed Metrics", "uid": "d8550a59-02cf-4749-8c16-b32e370ba280", - "version": 11, + "version": 23, "weekStart": "" } \ No newline at end of file diff --git a/docker/telemetry/grafana/provisioning/dashboards/User/broker.json b/docker/telemetry/grafana/provisioning/dashboards/User/broker.json index 46bc103a11..600771f181 100644 --- a/docker/telemetry/grafana/provisioning/dashboards/User/broker.json +++ b/docker/telemetry/grafana/provisioning/dashboards/User/broker.json @@ -110,7 +110,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(instance, error) (rate(kafka_request_error_count_total{job=~\"$cluster_id/$node_type\", instance=~\"$node_id\", error!=\"NONE\"}[$__rate_interval]))", + "expr": "sum by(instance, error) (rate(kafka_request_error_count_total{job=\"$cluster_id\", instance=~\"$node_id\", error!=\"NONE\"}[$__rate_interval]))", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -210,7 +210,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(instance, listener) (kafka_server_connection_count{job=~\"$cluster_id/$node_type\", instance=~\"$node_id\"})", + "expr": "sum by(instance, listener) (kafka_server_connection_count{job=\"$cluster_id\", instance=~\"$node_id\"})", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -309,7 +309,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "kafka_partition_count{job=~\"$cluster_id/$node_type\", instance=~\"$node_id\"}", + "expr": "kafka_partition_count{job=\"$cluster_id\", instance=~\"$node_id\"}", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -409,7 +409,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(instance) (rate(kafka_message_count_total{job=~\"$cluster_id/$node_type\", instance=~\"$node_id\"}[$__rate_interval]))", + "expr": "sum by(instance) (rate(kafka_message_count_total{job=\"$cluster_id\", instance=~\"$node_id\"}[$__rate_interval]))", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -513,7 +513,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(instance) (rate(kafka_network_io_bytes_total{job=~\"$cluster_id/.*\", direction=\"in\", instance=~\"$node_id\"}[$__rate_interval]))", + "expr": "sum by(instance) (rate(kafka_network_io_bytes_total{job=\"$cluster_id\", direction=\"in\", instance=~\"$node_id\"}[$__rate_interval]))", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -617,7 +617,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(instance) (rate(kafka_network_io_bytes_total{job=~\"$cluster_id/.*\", direction=\"out\", instance=~\"$node_id\"}[$__rate_interval]))", + "expr": "sum by(instance) (rate(kafka_network_io_bytes_total{job=\"$cluster_id\", direction=\"out\", instance=~\"$node_id\"}[$__rate_interval]))", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -717,7 +717,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(topic, instance) (rate(kafka_message_count_total{job=~\"$cluster_id/$node_type\", instance=~\"$node_id\"}[$__rate_interval]))", + "expr": "sum by(topic, instance) (rate(kafka_message_count_total{job=\"$cluster_id\", instance=~\"$node_id\"}[$__rate_interval]))", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -821,7 +821,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(topic, instance) (rate(kafka_network_io_bytes_total{job=~\"$cluster_id/.*\", direction=\"in\", instance=~\"$node_id\"}[$__rate_interval]))", + "expr": "sum by(topic, instance) (rate(kafka_network_io_bytes_total{job=\"$cluster_id\", direction=\"in\", instance=~\"$node_id\"}[$__rate_interval]))", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -925,7 +925,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(topic, instance) (rate(kafka_network_io_bytes_total{job=~\"$cluster_id/.*\", direction=\"out\", instance=~\"$node_id\"}[$__rate_interval]))", + "expr": "sum by(topic, instance) (rate(kafka_network_io_bytes_total{job=\"$cluster_id\", direction=\"out\", instance=~\"$node_id\"}[$__rate_interval]))", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -1029,7 +1029,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(instance, topic) (rate(kafka_request_count_total{job=~\"$cluster_id/.*\", instance=~\"$node_id\", type=\"Produce\"}[$__rate_interval]))", + "expr": "sum by(instance, topic) (rate(kafka_request_count_total{job=\"$cluster_id\", instance=~\"$node_id\", type=\"Produce\"}[$__rate_interval]))", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -1133,7 +1133,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(instance, topic) (rate(kafka_request_count_total{job=~\"$cluster_id/.*\", instance=~\"$node_id\", type=\"Fetch\"}[$__rate_interval]))", + "expr": "sum by(instance, topic) (rate(kafka_request_count_total{job=\"$cluster_id\", instance=~\"$node_id\", type=\"Fetch\"}[$__rate_interval]))", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -1233,7 +1233,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(instance) (kafka_request_time_99p_milliseconds{job=~\"$cluster_id/.*\", instance=~\"$node_id\", type=\"Produce\"})", + "expr": "sum by(instance) (kafka_request_time_99p_milliseconds{job=\"$cluster_id\", instance=~\"$node_id\", type=\"Produce\"})", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, @@ -1250,7 +1250,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(instance) (kafka_request_time_mean_milliseconds{job=~\"$cluster_id/.*\", instance=~\"$node_id\", type=\"Produce\"})", + "expr": "sum by(instance) (kafka_request_time_mean_milliseconds{job=\"$cluster_id\", instance=~\"$node_id\", type=\"Produce\"})", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, @@ -1267,7 +1267,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(instance) (kafka_request_time_50p_milliseconds{job=~\"$cluster_id/.*\", instance=~\"$node_id\", type=\"Produce\"})", + "expr": "sum by(instance) (kafka_request_time_50p_milliseconds{job=\"$cluster_id\", instance=~\"$node_id\", type=\"Produce\"})", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, @@ -1284,7 +1284,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(instance) (kafka_request_time_max_milliseconds{job=~\"$cluster_id/.*\", instance=~\"$node_id\", type=\"Produce\"})", + "expr": "sum by(instance) (kafka_request_time_max_milliseconds{job=\"$cluster_id\", instance=~\"$node_id\", type=\"Produce\"})", "fullMetaSearch": false, "hide": true, "includeNullMetadata": true, @@ -1389,7 +1389,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(instance) (kafka_request_time_99p_milliseconds{job=~\"$cluster_id/.*\", instance=~\"$node_id\", type=\"Fetch\"})", + "expr": "sum by(instance) (kafka_request_time_99p_milliseconds{job=\"$cluster_id\", instance=~\"$node_id\", type=\"Fetch\"})", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, @@ -1406,7 +1406,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(instance) (kafka_request_time_mean_milliseconds{job=~\"$cluster_id/.*\", instance=~\"$node_id\", type=\"Fetch\"})", + "expr": "sum by(instance) (kafka_request_time_mean_milliseconds{job=\"$cluster_id\", instance=~\"$node_id\", type=\"Fetch\"})", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, @@ -1423,7 +1423,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(instance) (kafka_request_time_50p_milliseconds{job=~\"$cluster_id/.*\", instance=~\"$node_id\", type=\"Fetch\"})", + "expr": "sum by(instance) (kafka_request_time_50p_milliseconds{job=\"$cluster_id\", instance=~\"$node_id\", type=\"Fetch\"})", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, @@ -1440,7 +1440,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(instance) (kafka_request_time_max_milliseconds{job=~\"$cluster_id/.*\", instance=~\"$node_id\", type=\"Fetch\"})", + "expr": "sum by(instance) (kafka_request_time_max_milliseconds{job=\"$cluster_id\", instance=~\"$node_id\", type=\"Fetch\"})", "fullMetaSearch": false, "hide": true, "includeNullMetadata": true, @@ -1473,6 +1473,7 @@ "name": "datasource", "options": [], "query": "prometheus", + "queryValue": "", "refresh": 1, "regex": "", "skipUrlSync": false, @@ -1488,7 +1489,7 @@ "type": "prometheus", "uid": "${datasource}" }, - "definition": "label_values(job)", + "definition": "label_values(jvm_cpu_count,job)", "hide": 0, "includeAll": false, "label": "Cluster Id", @@ -1497,43 +1498,11 @@ "options": [], "query": { "qryType": 1, - "query": "label_values(job)", + "query": "label_values(jvm_cpu_count,job)", "refId": "PrometheusVariableQueryEditor-VariableQuery" }, "refresh": 2, - "regex": "/(?[^\"]+)\\//", - "skipUrlSync": false, - "sort": 0, - "type": "query" - }, - { - "current": { - "selected": true, - "text": [ - "All" - ], - "value": [ - "$__all" - ] - }, - "datasource": { - "type": "prometheus", - "uid": "${datasource}" - }, - "definition": "label_values(job)", - "hide": 0, - "includeAll": true, - "label": "Node Type", - "multi": true, - "name": "node_type", - "options": [], - "query": { - "qryType": 1, - "query": "label_values(job)", - "refId": "PrometheusVariableQueryEditor-VariableQuery" - }, - "refresh": 2, - "regex": "/\\/(?[^\"]+)/", + "regex": "", "skipUrlSync": false, "sort": 0, "type": "query" @@ -1552,7 +1521,7 @@ "type": "prometheus", "uid": "${datasource}" }, - "definition": "label_values(instance)", + "definition": "label_values(jvm_cpu_count,instance)", "hide": 0, "includeAll": true, "label": "Node Id", @@ -1561,7 +1530,7 @@ "options": [], "query": { "qryType": 1, - "query": "label_values(instance)", + "query": "label_values(jvm_cpu_count,instance)", "refId": "PrometheusVariableQueryEditor-VariableQuery" }, "refresh": 2, @@ -1580,6 +1549,6 @@ "timezone": "", "title": "Broker Metrics", "uid": "e97dc219-c0c7-4bbe-9616-cdafb3451a3b", - "version": 5, + "version": 11, "weekStart": "" } \ No newline at end of file diff --git a/docker/telemetry/grafana/provisioning/dashboards/User/cluster.json b/docker/telemetry/grafana/provisioning/dashboards/User/cluster.json index 4ab0322ab6..9d22b14e49 100644 --- a/docker/telemetry/grafana/provisioning/dashboards/User/cluster.json +++ b/docker/telemetry/grafana/provisioning/dashboards/User/cluster.json @@ -78,7 +78,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "kafka_controller_active_count{job=~\"$cluster_id/.*\"}", + "expr": "kafka_controller_active_count{job=\"$cluster_id\"}", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -146,7 +146,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "kafka_broker_fenced_count{job=~\"$cluster_id/.*\"}", + "expr": "kafka_broker_fenced_count{job=\"$cluster_id\"}", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -210,7 +210,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "kafka_topic_count{job=~\"$cluster_id/.*\"}", + "expr": "kafka_topic_count{job=\"$cluster_id\"}", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -225,7 +225,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "${datasource}" }, "fieldConfig": { "defaults": { @@ -277,11 +277,11 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "${datasource}" }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum(rate(kafka_request_error_count_total{job=~\"$cluster_id/.*\", error!=\"NONE\"}[$__rate_interval]))", + "expr": "sum(rate(kafka_request_error_count_total{job=\"$cluster_id\", error!=\"NONE\"}[$__rate_interval]))", "fullMetaSearch": false, "includeNullMetadata": false, "instant": false, @@ -419,7 +419,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum(rate(kafka_network_io_bytes_total{job=~\"$cluster_id/.*\", direction=\"in\"}[$__rate_interval]))", + "expr": "sum(rate(kafka_network_io_bytes_total{job=\"$cluster_id\", direction=\"in\"}[$__rate_interval]))", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -435,7 +435,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "-sum(rate(kafka_network_io_bytes_total{job=~\"$cluster_id/.*\", direction=\"out\"}[$__rate_interval]))", + "expr": "-sum(rate(kafka_network_io_bytes_total{job=\"$cluster_id\", direction=\"out\"}[$__rate_interval]))", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, @@ -505,7 +505,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "kafka_broker_active_count{job=~\"$cluster_id/.*\"}", + "expr": "kafka_broker_active_count{job=\"$cluster_id\"}", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -569,7 +569,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "kafka_partition_total_count{job=~\"$cluster_id/.*\"}", + "expr": "kafka_partition_total_count{job=\"$cluster_id\"}", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -633,7 +633,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum(kafka_log_size{job=~\"$cluster_id/.*\"})", + "expr": "sum(kafka_log_size{job=\"$cluster_id\"})", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -701,7 +701,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum(kafka_group_count{job=~\"$cluster_id/.*\"})", + "expr": "sum(kafka_group_count{job=\"$cluster_id\"})", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -717,7 +717,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum(kafka_group_stable_count{job=~\"$cluster_id/.*\"})", + "expr": "sum(kafka_group_stable_count{job=\"$cluster_id\"})", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, @@ -734,7 +734,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum(kafka_group_dead_count{job=~\"$cluster_id/.*\"})", + "expr": "sum(kafka_group_dead_count{job=\"$cluster_id\"})", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, @@ -751,7 +751,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum(kafka_group_empty_count{job=~\"$cluster_id/.*\"})", + "expr": "sum(kafka_group_empty_count{job=\"$cluster_id\"})", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, @@ -768,7 +768,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum(kafka_group_preparing_rebalance_count{job=~\"$cluster_id/.*\"})", + "expr": "sum(kafka_group_preparing_rebalance_count{job=\"$cluster_id\"})", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, @@ -785,7 +785,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum(kafka_group_completing_rebalance_count{job=~\"$cluster_id/.*\"})", + "expr": "sum(kafka_group_completing_rebalance_count{job=\"$cluster_id\"})", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, @@ -937,7 +937,7 @@ "disableTextWrap": false, "editorMode": "builder", "exemplar": false, - "expr": "sum by(consumer_group, topic) (kafka_group_commit_offset{job=~\"$cluster_id/.*\"})", + "expr": "sum by(consumer_group, topic) (kafka_group_commit_offset{job=\"$cluster_id\"})", "format": "table", "fullMetaSearch": false, "hide": false, @@ -956,7 +956,7 @@ "disableTextWrap": false, "editorMode": "builder", "exemplar": false, - "expr": "sum by(topic) (kafka_log_end_offset{job=~\"$cluster_id/.*\"})", + "expr": "sum by(topic) (kafka_log_end_offset{job=\"$cluster_id\"})", "format": "table", "fullMetaSearch": false, "hide": false, @@ -1201,7 +1201,7 @@ "disableTextWrap": false, "editorMode": "builder", "exemplar": false, - "expr": "sum by(topic) (rate(kafka_network_io_bytes_total{job=~\"$cluster_id/.*\", direction=\"in\"}[$__rate_interval]))", + "expr": "sum by(topic) (rate(kafka_network_io_bytes_total{job=\"$cluster_id\", direction=\"in\"}[$__rate_interval]))", "format": "table", "fullMetaSearch": false, "includeNullMetadata": false, @@ -1219,7 +1219,7 @@ "disableTextWrap": false, "editorMode": "builder", "exemplar": false, - "expr": "sum by(topic) (rate(kafka_network_io_bytes_total{job=~\"$cluster_id/.*\", direction=\"out\"}[$__rate_interval]))", + "expr": "sum by(topic) (rate(kafka_network_io_bytes_total{job=\"$cluster_id\", direction=\"out\"}[$__rate_interval]))", "format": "table", "fullMetaSearch": false, "hide": false, @@ -1238,7 +1238,7 @@ "disableTextWrap": false, "editorMode": "builder", "exemplar": false, - "expr": "sum by(topic) (rate(kafka_message_count_total{job=~\"$cluster_id/.*\", direction=\"in\"}[$__rate_interval]))", + "expr": "sum by(topic) (rate(kafka_message_count_total{job=\"$cluster_id\", direction=\"in\"}[$__rate_interval]))", "format": "table", "fullMetaSearch": false, "hide": false, @@ -1257,7 +1257,7 @@ "disableTextWrap": false, "editorMode": "builder", "exemplar": false, - "expr": "sum by(topic) (kafka_log_size{job=~\"$cluster_id/.*\"})", + "expr": "sum by(topic) (kafka_log_size{job=\"$cluster_id\"})", "format": "table", "fullMetaSearch": false, "hide": false, @@ -1323,8 +1323,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" } ] } @@ -1520,8 +1519,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -1548,8 +1546,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -1611,7 +1608,7 @@ "disableTextWrap": false, "editorMode": "builder", "exemplar": false, - "expr": "sum by(instance) (kafka_partition_count{job=~\"$cluster_id/.*\"})", + "expr": "sum by(instance) (kafka_partition_count{job=\"$cluster_id\"})", "format": "table", "fullMetaSearch": false, "hide": false, @@ -1630,7 +1627,7 @@ "disableTextWrap": false, "editorMode": "builder", "exemplar": false, - "expr": "sum by(instance) (kafka_server_connection_count{job=~\"$cluster_id/.*\"})", + "expr": "sum by(instance) (kafka_server_connection_count{job=\"$cluster_id\"})", "format": "table", "fullMetaSearch": false, "hide": false, @@ -1649,7 +1646,7 @@ "disableTextWrap": false, "editorMode": "builder", "exemplar": false, - "expr": "sum by(instance) (rate(kafka_network_io_bytes_total{job=~\"$cluster_id/.*\", direction=\"in\"}[$__rate_interval]))", + "expr": "sum by(instance) (rate(kafka_network_io_bytes_total{job=\"$cluster_id\", direction=\"in\"}[$__rate_interval]))", "format": "table", "fullMetaSearch": false, "hide": false, @@ -1668,7 +1665,7 @@ "disableTextWrap": false, "editorMode": "builder", "exemplar": false, - "expr": "sum by(instance) (rate(kafka_network_io_bytes_total{job=~\"$cluster_id/.*\", direction=\"out\"}[$__rate_interval]))", + "expr": "sum by(instance) (rate(kafka_network_io_bytes_total{job=\"$cluster_id\", direction=\"out\"}[$__rate_interval]))", "format": "table", "fullMetaSearch": false, "hide": false, @@ -1687,7 +1684,7 @@ "disableTextWrap": false, "editorMode": "builder", "exemplar": false, - "expr": "sum by(instance) (rate(kafka_message_count_total{job=~\"$cluster_id/.*\", direction=\"in\"}[$__rate_interval]))", + "expr": "sum by(instance) (rate(kafka_message_count_total{job=\"$cluster_id\", direction=\"in\"}[$__rate_interval]))", "format": "table", "fullMetaSearch": false, "hide": false, @@ -1706,7 +1703,7 @@ "disableTextWrap": false, "editorMode": "builder", "exemplar": false, - "expr": "sum by(instance) (rate(kafka_request_count_total{job=~\"$cluster_id/.*\", type=\"Produce\"}[$__rate_interval]))", + "expr": "sum by(instance) (rate(kafka_request_count_total{job=\"$cluster_id\", type=\"Produce\"}[$__rate_interval]))", "format": "table", "fullMetaSearch": false, "hide": false, @@ -1725,7 +1722,7 @@ "disableTextWrap": false, "editorMode": "builder", "exemplar": false, - "expr": "sum by(instance) (rate(kafka_request_count_total{job=~\"$cluster_id/.*\", type=\"Fetch\"}[$__rate_interval]))", + "expr": "sum by(instance) (rate(kafka_request_count_total{job=\"$cluster_id\", type=\"Fetch\"}[$__rate_interval]))", "format": "table", "fullMetaSearch": false, "hide": false, @@ -1744,7 +1741,7 @@ "disableTextWrap": false, "editorMode": "builder", "exemplar": false, - "expr": "sum by(instance) (kafka_request_time_99p_milliseconds{job=~\"$cluster_id/.*\", type=\"Produce\"})", + "expr": "sum by(instance) (kafka_request_time_99p_milliseconds{job=\"$cluster_id\", type=\"Produce\"})", "format": "table", "fullMetaSearch": false, "hide": false, @@ -1763,7 +1760,7 @@ "disableTextWrap": false, "editorMode": "builder", "exemplar": false, - "expr": "sum by(instance) (kafka_request_time_99p_milliseconds{job=~\"$cluster_id/.*\", type=\"Fetch\"})", + "expr": "sum by(instance) (kafka_request_time_99p_milliseconds{job=\"$cluster_id\", type=\"Fetch\"})", "format": "table", "fullMetaSearch": false, "hide": false, @@ -1782,7 +1779,7 @@ "disableTextWrap": false, "editorMode": "builder", "exemplar": false, - "expr": "sum by(instance) (rate(kafka_topic_request_failed_total{job=~\"$cluster_id/.*\", type=\"produce\"}[$__rate_interval]))", + "expr": "sum by(instance) (rate(kafka_topic_request_failed_total{job=\"$cluster_id\", type=\"produce\"}[$__rate_interval]))", "format": "table", "fullMetaSearch": false, "hide": false, @@ -1801,7 +1798,7 @@ "disableTextWrap": false, "editorMode": "builder", "exemplar": false, - "expr": "sum by(instance) (rate(kafka_topic_request_failed_total{job=~\"$cluster_id/.*\", type=\"fetch\"}[$__rate_interval]))", + "expr": "sum by(instance) (rate(kafka_topic_request_failed_total{job=\"$cluster_id\", type=\"fetch\"}[$__rate_interval]))", "format": "table", "fullMetaSearch": false, "hide": false, @@ -1820,7 +1817,7 @@ "disableTextWrap": false, "editorMode": "builder", "exemplar": false, - "expr": "sum by(instance) (rate(kafka_request_error_count_total{job=~\"$cluster_id/.*\", error!=\"NONE\"}[$__rate_interval]))", + "expr": "sum by(instance) (rate(kafka_request_error_count_total{job=\"$cluster_id\", error!=\"NONE\"}[$__rate_interval]))", "format": "table", "fullMetaSearch": false, "hide": false, @@ -1886,7 +1883,7 @@ "type": "prometheus", "uid": "${datasource}" }, - "definition": "label_values(job)", + "definition": "label_values(jvm_cpu_count,job)", "description": "The cluster id of a Kafka cluster", "hide": 0, "includeAll": false, @@ -1896,11 +1893,11 @@ "options": [], "query": { "qryType": 1, - "query": "label_values(job)", + "query": "label_values(jvm_cpu_count,job)", "refId": "PrometheusVariableQueryEditor-VariableQuery" }, "refresh": 2, - "regex": "/(?[^\"]+)\\//", + "regex": "", "skipUrlSync": false, "sort": 0, "type": "query" @@ -1944,6 +1941,6 @@ "timezone": "", "title": "Cluster Overview", "uid": "f719833b-0a35-4fb3-9b84-3815726006e7", - "version": 7, + "version": 13, "weekStart": "" } \ No newline at end of file diff --git a/docker/telemetry/grafana/provisioning/dashboards/User/group.json b/docker/telemetry/grafana/provisioning/dashboards/User/group.json index 8a34110f7e..6cb16007bc 100644 --- a/docker/telemetry/grafana/provisioning/dashboards/User/group.json +++ b/docker/telemetry/grafana/provisioning/dashboards/User/group.json @@ -18,7 +18,7 @@ "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 0, - "id": 17, + "id": 4, "links": [], "liveNow": false, "panels": [ @@ -109,7 +109,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(consumer_group, topic, partition) (rate(kafka_group_commit_offset{job=~\"$cluster_id/.*\", consumer_group=~\"$group_id\", topic=~\"$topic\"}[$__rate_interval]))", + "expr": "sum by(consumer_group, topic, partition) (rate(kafka_group_commit_offset{job=\"$cluster_id\", consumer_group=~\"$group_id\", topic=~\"$topic\"}[$__rate_interval]))", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, @@ -226,7 +226,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(consumer_group, topic, partition) (kafka_group_commit_offset{job=~\"$cluster_id/.*\", consumer_group=~\"$group_id\", topic=~\"$topic\"})", + "expr": "sum by(consumer_group, topic, partition) (kafka_group_commit_offset{job=\"$cluster_id\", consumer_group=~\"$group_id\", topic=~\"$topic\"})", "fullMetaSearch": false, "hide": true, "includeNullMetadata": true, @@ -243,7 +243,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(topic, partition) (kafka_log_end_offset{job=~\"$cluster_id/.*\", topic=~\"$topic\"})", + "expr": "sum by(topic, partition) (kafka_log_end_offset{job=\"$cluster_id\", topic=~\"$topic\"})", "fullMetaSearch": false, "hide": true, "includeNullMetadata": true, @@ -303,7 +303,7 @@ "type": "prometheus", "uid": "${datasource}" }, - "definition": "label_values(job)", + "definition": "label_values(jvm_cpu_count,job)", "hide": 0, "includeAll": false, "label": "Cluster Id", @@ -312,20 +312,24 @@ "options": [], "query": { "qryType": 1, - "query": "label_values(job)", + "query": "label_values(jvm_cpu_count,job)", "refId": "PrometheusVariableQueryEditor-VariableQuery" }, "refresh": 1, - "regex": "/(?[^\"]+)\\//", + "regex": "", "skipUrlSync": false, "sort": 0, "type": "query" }, { "current": { - "selected": false, - "text": "All", - "value": "$__all" + "selected": true, + "text": [ + "perf-group" + ], + "value": [ + "perf-group" + ] }, "datasource": { "type": "prometheus", @@ -351,9 +355,13 @@ }, { "current": { - "selected": false, - "text": "All", - "value": "$__all" + "selected": true, + "text": [ + "test-topic" + ], + "value": [ + "test-topic" + ] }, "datasource": { "type": "prometheus", @@ -387,6 +395,6 @@ "timezone": "", "title": "Group Metrics", "uid": "d90be32f-7d32-488a-b99c-3e21529790e4", - "version": 2, + "version": 3, "weekStart": "" } \ No newline at end of file diff --git a/docker/telemetry/grafana/provisioning/dashboards/User/topic.json b/docker/telemetry/grafana/provisioning/dashboards/User/topic.json index 7ef48db5e9..40efdfabc0 100644 --- a/docker/telemetry/grafana/provisioning/dashboards/User/topic.json +++ b/docker/telemetry/grafana/provisioning/dashboards/User/topic.json @@ -109,7 +109,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(topic) (rate(kafka_message_count_total{job=~\"$cluster_id/.*\", topic=~\"$topic\", direction=\"in\"}[$__rate_interval]))", + "expr": "sum by(topic) (rate(kafka_message_count_total{job=\"$cluster_id\", topic=~\"$topic\", direction=\"in\"}[$__rate_interval]))", "fullMetaSearch": false, "includeNullMetadata": false, "instant": false, @@ -209,7 +209,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(topic, partition) (rate(kafka_network_io_bytes_total{job=~\"$cluster_id/.*\", topic=~\"$topic\", direction=\"in\"}[$__rate_interval]))", + "expr": "sum by(topic, partition) (rate(kafka_network_io_bytes_total{job=\"$cluster_id\", topic=~\"$topic\", direction=\"in\"}[$__rate_interval]))", "fullMetaSearch": false, "includeNullMetadata": false, "instant": false, @@ -309,7 +309,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(topic, partition) (rate(kafka_network_io_bytes_total{job=~\"$cluster_id/.*\", topic=~\"$topic\", direction=\"out\"}[$__rate_interval]))", + "expr": "sum by(topic, partition) (rate(kafka_network_io_bytes_total{job=\"$cluster_id\", topic=~\"$topic\", direction=\"out\"}[$__rate_interval]))", "fullMetaSearch": false, "includeNullMetadata": false, "instant": false, @@ -409,7 +409,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(topic) (kafka_log_size{job=~\"$cluster_id/.*\", topic=~\"$topic\"})", + "expr": "sum by(topic) (kafka_log_size{job=\"$cluster_id\", topic=~\"$topic\"})", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -575,7 +575,7 @@ "disableTextWrap": false, "editorMode": "builder", "exemplar": false, - "expr": "sum by(topic, partition, consumer_group) (kafka_group_commit_offset{job=~\"$cluster_id/.*\", topic=~\"$topic\"})", + "expr": "sum by(topic, partition, consumer_group) (kafka_group_commit_offset{job=\"$cluster_id\", topic=~\"$topic\"})", "format": "table", "fullMetaSearch": false, "includeNullMetadata": true, @@ -593,7 +593,7 @@ "disableTextWrap": false, "editorMode": "builder", "exemplar": false, - "expr": "sum by(topic, partition) (kafka_log_end_offset{job=~\"$cluster_id/.*\", topic=~\"$topic\"})", + "expr": "sum by(topic, partition) (kafka_log_end_offset{job=\"$cluster_id\", topic=~\"$topic\"})", "format": "table", "fullMetaSearch": false, "hide": false, @@ -679,7 +679,7 @@ "type": "prometheus", "uid": "${datasource}" }, - "definition": "label_values(job)", + "definition": "label_values(jvm_cpu_count,job)", "hide": 0, "includeAll": false, "label": "Cluster Id", @@ -688,11 +688,11 @@ "options": [], "query": { "qryType": 1, - "query": "label_values(job)", + "query": "label_values(jvm_cpu_count,job)", "refId": "PrometheusVariableQueryEditor-VariableQuery" }, "refresh": 1, - "regex": "/(?[^\"]+)\\//", + "regex": "", "skipUrlSync": false, "sort": 0, "type": "query" @@ -701,10 +701,10 @@ "current": { "selected": true, "text": [ - "test-topic" + "__auto_balancer_metrics" ], "value": [ - "test-topic" + "__auto_balancer_metrics" ] }, "datasource": { @@ -739,6 +739,6 @@ "timezone": "", "title": "Topic Metrics", "uid": "b908cc7a-3592-405d-aafb-fc9225219b0a", - "version": 4, + "version": 8, "weekStart": "" } \ No newline at end of file