diff --git a/monitoring/prometheus/README.md b/monitoring/prometheus/README.md new file mode 100644 index 00000000..adef8846 --- /dev/null +++ b/monitoring/prometheus/README.md @@ -0,0 +1,36 @@ +# Prometheus Monitoring for PVC + +This example contains a Prometheus config snippit, an example `file_sd_configs` file, and a Grafana dashboard for monitoring a PVC cluster using the inbuilt metrics (`/api/v1/metrics`). + +## `prometheus.yml` + +This snippit shows how to set up a scrape config leveraging the `file_sd_configs` file. + +This example uses `http` transport; if you use HTTPS for PVC API traffic (e.g. if it traverses the Internet), use `https` here. You can optionally disable certificate checking like so: + +``` +[...] +scheme: "https" +tls_config: + insecure_skip_verify: true +file_sd_configs: +[...] +``` + +## `targets-pvc_cluster.json` + +This JSON-based config shows two example clusters as two discrete entries. This is required for proper labeling. + +Each entry must contain: + +* A single `targets` entry, pointing at the API address and port of the PVC cluster. + +* Two `labels` which are leveraged by the Grafana dashboard: + + * `pvc_cluster_id`: An identifier for the cluster. Likely, the `Name` in your `pvc connection list` entry for the cluster. + + * `pvc_cluster_name`: A nicer, more human-readable description of the cluster. Likely, the `Description` in your `pvc connection list` entry for the cluster. + +## `grafana-pvc-cluster-dashboard.json` + +This JSON-based Grafana dashboard allows for a nice presentation of the metrics collected by the above Prometheus pollers. The cluster can be selected (based on the `pvc_cluster_name` value) and useful information about the cluster is then displayed. diff --git a/monitoring/prometheus/grafana-pvc-cluster-dashboard.json b/monitoring/prometheus/grafana-pvc-cluster-dashboard.json index f4c9e002..8e007fd3 100644 --- a/monitoring/prometheus/grafana-pvc-cluster-dashboard.json +++ b/monitoring/prometheus/grafana-pvc-cluster-dashboard.json @@ -128,7 +128,7 @@ "calcs": [ "lastNotNull" ], - "fields": "/^cluster$/", + "fields": "/^pvc_cluster_id$/", "values": false }, "textMode": "auto", @@ -144,7 +144,7 @@ "disableTextWrap": false, "editorMode": "code", "exemplar": false, - "expr": "pvc_info{cluster=\"$cluster\"}", + "expr": "pvc_info{pvc_cluster_id=\"$cluster_id\"}", "format": "table", "fullMetaSearch": false, "includeNullMetadata": true, @@ -214,7 +214,7 @@ "disableTextWrap": false, "editorMode": "builder", "exemplar": false, - "expr": "pvc_nodes{cluster=\"$cluster\"}", + "expr": "pvc_nodes{pvc_cluster_id=\"$cluster_id\"}", "format": "table", "fullMetaSearch": false, "includeNullMetadata": true, @@ -284,7 +284,7 @@ "disableTextWrap": false, "editorMode": "builder", "exemplar": false, - "expr": "pvc_osds{cluster=\"$cluster\"}", + "expr": "pvc_osds{pvc_cluster_id=\"$cluster_id\"}", "format": "table", "fullMetaSearch": false, "includeNullMetadata": true, @@ -393,7 +393,7 @@ "disableTextWrap": false, "editorMode": "builder", "exemplar": false, - "expr": "pvc_cluster_faults{cluster=\"$cluster\"}", + "expr": "pvc_cluster_faults{pvc_cluster_id=\"$cluster_id\"}", "format": "table", "fullMetaSearch": false, "includeNullMetadata": true, @@ -499,7 +499,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_cluster_health{cluster=\"$cluster\"}", + "expr": "pvc_cluster_health{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -608,7 +608,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_cluster_health{cluster=\"$cluster\"}", + "expr": "pvc_cluster_health{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -680,7 +680,7 @@ "disableTextWrap": false, "editorMode": "code", "exemplar": false, - "expr": "pvc_info{cluster=\"$cluster\"}", + "expr": "pvc_info{pvc_cluster_id=\"$cluster_id\"}", "format": "table", "fullMetaSearch": false, "includeNullMetadata": true, @@ -749,7 +749,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_vm_states{cluster=\"$cluster\"}", + "expr": "pvc_vm_states{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -836,7 +836,7 @@ "disableTextWrap": false, "editorMode": "builder", "exemplar": false, - "expr": "pvc_pools{cluster=\"$cluster\"}", + "expr": "pvc_pools{pvc_cluster_id=\"$cluster_id\"}", "format": "table", "fullMetaSearch": false, "includeNullMetadata": true, @@ -938,7 +938,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_cluster_maintenance{cluster=\"$cluster\"}", + "expr": "pvc_cluster_maintenance{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -1005,7 +1005,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_vm_states{cluster=\"$cluster\"}", + "expr": "pvc_vm_states{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -1093,7 +1093,7 @@ "disableTextWrap": false, "editorMode": "builder", "exemplar": false, - "expr": "pvc_volumes{cluster=\"$cluster\"}", + "expr": "pvc_volumes{pvc_cluster_id=\"$cluster_id\"}", "format": "table", "fullMetaSearch": false, "includeNullMetadata": true, @@ -1173,7 +1173,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_node_health{cluster=\"$cluster\"}", + "expr": "pvc_node_health{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -1284,7 +1284,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_node_health{cluster=\"$cluster\"}", + "expr": "pvc_node_health{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -1356,7 +1356,7 @@ "disableTextWrap": false, "editorMode": "code", "exemplar": false, - "expr": "pvc_info{cluster=\"$cluster\"}", + "expr": "pvc_info{pvc_cluster_id=\"$cluster_id\"}", "format": "table", "fullMetaSearch": false, "includeNullMetadata": true, @@ -1426,7 +1426,7 @@ "disableTextWrap": false, "editorMode": "builder", "exemplar": false, - "expr": "pvc_networks{cluster=\"$cluster\"}", + "expr": "pvc_networks{pvc_cluster_id=\"$cluster_id\"}", "format": "table", "fullMetaSearch": false, "includeNullMetadata": true, @@ -1496,7 +1496,7 @@ "disableTextWrap": false, "editorMode": "builder", "exemplar": false, - "expr": "pvc_snapshots{cluster=\"$cluster\"}", + "expr": "pvc_snapshots{pvc_cluster_id=\"$cluster_id\"}", "format": "table", "fullMetaSearch": false, "includeNullMetadata": true, @@ -1726,7 +1726,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_nodes{cluster=\"$cluster\"}", + "expr": "pvc_nodes{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, @@ -1743,7 +1743,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_node_daemon_states{cluster=\"$cluster\"}", + "expr": "pvc_node_daemon_states{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, @@ -1984,7 +1984,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_nodes{cluster=\"$cluster\"}", + "expr": "pvc_nodes{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, @@ -2001,7 +2001,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_node_domain_states{cluster=\"$cluster\"}", + "expr": "pvc_node_domain_states{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, @@ -2346,7 +2346,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_vms{cluster=\"$cluster\"}", + "expr": "pvc_vms{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, @@ -2363,7 +2363,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_vm_states{cluster=\"$cluster\"}", + "expr": "pvc_vm_states{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -2650,7 +2650,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_osds{cluster=\"$cluster\"}", + "expr": "pvc_osds{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, @@ -2667,7 +2667,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_ceph_osd_up_states{cluster=\"$cluster\"}", + "expr": "pvc_ceph_osd_up_states{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -2683,7 +2683,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_ceph_osd_in_states{cluster=\"$cluster\"}", + "expr": "pvc_ceph_osd_in_states{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, @@ -2839,7 +2839,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_cluster_cpu_utilization{cluster=\"$cluster\"}", + "expr": "pvc_cluster_cpu_utilization{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -2948,7 +2948,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_cluster_cpu_utilization{cluster=\"$cluster\"}", + "expr": "pvc_cluster_cpu_utilization{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -3027,7 +3027,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_cluster_network_utilization{cluster=\"$cluster\"}", + "expr": "pvc_cluster_network_utilization{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -3136,7 +3136,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_cluster_network_utilization{cluster=\"$cluster\"}", + "expr": "pvc_cluster_network_utilization{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -3214,7 +3214,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_cluster_disk_utilization{cluster=\"$cluster\"}", + "expr": "pvc_cluster_disk_utilization{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -3322,7 +3322,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_cluster_disk_utilization{cluster=\"$cluster\"}", + "expr": "pvc_cluster_disk_utilization{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -3400,7 +3400,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_cluster_memory_real_utilization{cluster=\"$cluster\"}", + "expr": "pvc_cluster_memory_real_utilization{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -3508,7 +3508,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_cluster_memory_real_utilization{cluster=\"$cluster\"}", + "expr": "pvc_cluster_memory_real_utilization{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -3586,7 +3586,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_cluster_memory_allocated_utilization{cluster=\"$cluster\"}", + "expr": "pvc_cluster_memory_allocated_utilization{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -3694,7 +3694,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_cluster_memory_allocated_utilization{cluster=\"$cluster\"}", + "expr": "pvc_cluster_memory_allocated_utilization{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -3772,7 +3772,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_cluster_memory_provisioned_utilization{cluster=\"$cluster\"}", + "expr": "pvc_cluster_memory_provisioned_utilization{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -3880,7 +3880,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_cluster_memory_provisioned_utilization{cluster=\"$cluster\"}", + "expr": "pvc_cluster_memory_provisioned_utilization{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -3971,7 +3971,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_node_cpu_utilization{cluster=\"$cluster\"}", + "expr": "pvc_node_cpu_utilization{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -4083,7 +4083,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_node_cpu_utilization{cluster=\"$cluster\"}", + "expr": "pvc_node_cpu_utilization{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -4200,7 +4200,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_node_load_average{cluster=\"$cluster\"}", + "expr": "pvc_node_load_average{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -4298,7 +4298,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_node_network_utilization{cluster=\"$cluster\"}", + "expr": "pvc_node_network_utilization{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -4412,7 +4412,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_node_network_utilization{cluster=\"$cluster\"}", + "expr": "pvc_node_network_utilization{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -4543,7 +4543,7 @@ "disableTextWrap": false, "editorMode": "builder", "exemplar": false, - "expr": "pvc_node_network_traffic_rx{cluster=\"$cluster\"}", + "expr": "pvc_node_network_traffic_rx{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -4559,7 +4559,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_node_network_traffic_tx{cluster=\"$cluster\"}", + "expr": "pvc_node_network_traffic_tx{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, @@ -4640,7 +4640,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_node_used_memory_utilization{cluster=\"$cluster\"}", + "expr": "pvc_node_used_memory_utilization{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -4752,7 +4752,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_node_used_memory_utilization{cluster=\"$cluster\"}", + "expr": "pvc_node_used_memory_utilization{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -4869,7 +4869,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_node_used_memory{cluster=\"$cluster\"}", + "expr": "pvc_node_used_memory{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -4968,7 +4968,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_node_allocated_memory_utilization{cluster=\"$cluster\"}", + "expr": "pvc_node_allocated_memory_utilization{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -5081,7 +5081,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_node_allocated_memory_utilization{cluster=\"$cluster\"}", + "expr": "pvc_node_allocated_memory_utilization{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -5198,7 +5198,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_node_allocated_memory{cluster=\"$cluster\"}", + "expr": "pvc_node_allocated_memory{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -5297,7 +5297,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_node_provisioned_memory_utilization{cluster=\"$cluster\"}", + "expr": "pvc_node_provisioned_memory_utilization{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -5410,7 +5410,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_node_provisioned_memory_utilization{cluster=\"$cluster\"}", + "expr": "pvc_node_provisioned_memory_utilization{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -5528,7 +5528,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_node_provisioned_memory{cluster=\"$cluster\"}", + "expr": "pvc_node_provisioned_memory{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -5641,7 +5641,7 @@ "disableTextWrap": false, "editorMode": "builder", "exemplar": false, - "expr": "pvc_ceph_pool_used_percent{cluster=\"$cluster\"}", + "expr": "pvc_ceph_pool_used_percent{pvc_cluster_id=\"$cluster_id\"}", "format": "time_series", "fullMetaSearch": false, "includeNullMetadata": true, @@ -5754,7 +5754,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_ceph_pool_used_percent{cluster=\"$cluster\"}", + "expr": "pvc_ceph_pool_used_percent{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -5859,7 +5859,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_ceph_pool_used_bytes{cluster=\"$cluster\"}", + "expr": "pvc_ceph_pool_used_bytes{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -6052,7 +6052,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_ceph_pool_num_objects{cluster=\"$cluster\"}", + "expr": "pvc_ceph_pool_num_objects{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -6068,7 +6068,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_ceph_pool_num_objects_copies{cluster=\"$cluster\"}", + "expr": "pvc_ceph_pool_num_objects_copies{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, @@ -6085,7 +6085,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_ceph_pool_num_objects_clones{cluster=\"$cluster\"}", + "expr": "pvc_ceph_pool_num_objects_clones{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, @@ -6102,7 +6102,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_ceph_pool_num_objects_missing_on_primary{cluster=\"$cluster\"}", + "expr": "pvc_ceph_pool_num_objects_missing_on_primary{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, @@ -6119,7 +6119,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_ceph_pool_num_objects_unfound{cluster=\"$cluster\"}", + "expr": "pvc_ceph_pool_num_objects_unfound{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, @@ -6136,7 +6136,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_ceph_pool_num_objects_degraded{cluster=\"$cluster\"}", + "expr": "pvc_ceph_pool_num_objects_degraded{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, @@ -6247,7 +6247,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "rate(pvc_ceph_pool_read_ops{cluster=\"$cluster\"}[1m])", + "expr": "rate(pvc_ceph_pool_read_ops{pvc_cluster_id=\"$cluster_id\"}[1m])", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, @@ -6264,7 +6264,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "rate(pvc_ceph_pool_write_ops{cluster=\"$cluster\"}[1m])", + "expr": "rate(pvc_ceph_pool_write_ops{pvc_cluster_id=\"$cluster_id\"}[1m])", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, @@ -6377,7 +6377,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "rate(pvc_ceph_pool_read_bytes{cluster=\"$cluster\"}[1m])", + "expr": "rate(pvc_ceph_pool_read_bytes{pvc_cluster_id=\"$cluster_id\"}[1m])", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, @@ -6394,7 +6394,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "rate(pvc_ceph_pool_write_bytes{cluster=\"$cluster\"}[1m])", + "expr": "rate(pvc_ceph_pool_write_bytes{pvc_cluster_id=\"$cluster_id\"}[1m])", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, @@ -6487,7 +6487,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_ceph_osd_util{cluster=\"$cluster\"}", + "expr": "pvc_ceph_osd_util{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -6599,7 +6599,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_ceph_osd_util{cluster=\"$cluster\"}", + "expr": "pvc_ceph_osd_util{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -6703,7 +6703,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_ceph_osd_used{cluster=\"$cluster\"}", + "expr": "pvc_ceph_osd_used{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -6813,7 +6813,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_ceph_osd_rd_ops{cluster=\"$cluster\"}", + "expr": "pvc_ceph_osd_rd_ops{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, @@ -6830,7 +6830,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_ceph_osd_wr_ops{cluster=\"$cluster\"}", + "expr": "pvc_ceph_osd_wr_ops{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, @@ -6943,7 +6943,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_ceph_osd_rd_data{cluster=\"$cluster\"}", + "expr": "pvc_ceph_osd_rd_data{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, @@ -6960,7 +6960,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "pvc_ceph_osd_wr_data{cluster=\"$cluster\"}", + "expr": "pvc_ceph_osd_wr_data{pvc_cluster_id=\"$cluster_id\"}", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, @@ -6983,22 +6983,43 @@ ], "templating": { "list": [ + { + "current": {}, + "definition": "label_values(pvc_cluster_name)", + "description": "Select the desired cluster", + "hide": 0, + "includeAll": false, + "label": "Cluster", + "multi": false, + "name": "cluster_name", + "options": [], + "query": { + "qryType": 1, + "query": "label_values(pvc_cluster_name)", + "refId": "PrometheusVariableQueryEditor-VariableQuery" + }, + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "sort": 0, + "type": "query" + }, { "current": {}, "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "definition": "label_values(cluster)", - "hide": 1, + "definition": "label_values({pvc_cluster_name=\"$cluster_name\"},pvc_cluster_id)", + "hide": 2, "includeAll": false, - "label": "Cluster", + "label": "", "multi": false, - "name": "cluster", + "name": "cluster_id", "options": [], "query": { "qryType": 1, - "query": "label_values(cluster)", + "query": "label_values({pvc_cluster_name=\"$cluster_name\"},pvc_cluster_id)", "refId": "PrometheusVariableQueryEditor-VariableQuery" }, "refresh": 1, diff --git a/monitoring/prometheus/targets-pvc_cluster.json b/monitoring/prometheus/targets-pvc_cluster.json index 694fda59..4a8919f1 100644 --- a/monitoring/prometheus/targets-pvc_cluster.json +++ b/monitoring/prometheus/targets-pvc_cluster.json @@ -1,10 +1,20 @@ [ { "targets": [ - "pvc.upstream.floating.address.tld:7370" + "pvc.upstream.floating.address.1.tld:7370" ], "labels": { - "cluster": "cluster1" + "pvc_cluster_id": "cluster1", + "pvc_cluster_name": "cluster1: My First Cluster" + } + }, + { + "targets": [ + "pvc.upstream.floating.address.2.tld:7370" + ], + "labels": { + "pvc_cluster_id": "cluster2", + "pvc_cluster_name": "cluster2: My Second Cluster" } } ]