You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ja...@apache.org on 2020/10/20 07:50:51 UTC
[lucene-solr] branch branch_8_7 updated: SOLR-14936: Fixed Grafana
dashboard filters for collection, shard, replica and core (#1986)
This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a commit to branch branch_8_7
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/branch_8_7 by this push:
new 72d8528 SOLR-14936: Fixed Grafana dashboard filters for collection, shard, replica and core (#1986)
72d8528 is described below
commit 72d8528c3a68a6fc6d4344c8bba0277d9238a741
Author: Jan Høydahl <ja...@apache.org>
AuthorDate: Mon Oct 19 14:49:02 2020 +0200
SOLR-14936: Fixed Grafana dashboard filters for collection, shard, replica and core (#1986)
(cherry picked from commit 3bc873e6d403ad2ebd69a3050712cc8cac967241)
---
solr/CHANGES.txt | 6 +-
.../conf/grafana-solr-dashboard.json | 87 +++++++++++++---------
2 files changed, 55 insertions(+), 38 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 15d61ba..28ae39b 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -110,7 +110,7 @@ Other Changes
* SOLR-14654: Remove plugin loading from .system collection (for 9.0) (noble)
-* SOLR-14702: All references to "master" and "slave" replaced with "leader" and "follower" (MarcusSorealheis,
+* SOLR-14702: All references to "master" and "slave" replaced with "leader" and "follower" (MarcusSorealheis,
Erick Erickson, Tomás Fernández Löbbe)
Bug Fixes
@@ -205,7 +205,7 @@ Optimizations
* SOLR-14819: Fix inefficient iterator pattern in JsonSchemaValidator. (Thomas DuBuisson via Bruno Roustant)
-* SOLR-14658: SolrJ's CollectionAdminRequest.collectionStatus(collection) would internally get
+* SOLR-14658: SolrJ's CollectionAdminRequest.collectionStatus(collection) would internally get
all collection statuses instead of just the specified collection. (Andy Vuong)
* SOLR-14576 : Do not use SolrCore as keys in a WeakHashMap (noble)
@@ -266,6 +266,8 @@ Bug Fixes
* SOLR-14898: Stop returning duplicate HTTP response headers when requests are forward to another node. (hossman)
+* SOLR-14936: Fixed Grafana dashboard filters for collection, shard, replica and core (janhoy)
+
* SOLR-14924: Some ReplicationHandler metrics are reported using incorrect types. (ab)
* SOLR-14483: Fix empty drop down for adding replica in Admin UI (Sayan Das via Eric Pugh)
diff --git a/solr/contrib/prometheus-exporter/conf/grafana-solr-dashboard.json b/solr/contrib/prometheus-exporter/conf/grafana-solr-dashboard.json
index 96fb818..53a463f 100644
--- a/solr/contrib/prometheus-exporter/conf/grafana-solr-dashboard.json
+++ b/solr/contrib/prometheus-exporter/conf/grafana-solr-dashboard.json
@@ -48,7 +48,22 @@
"graphTooltip": 0,
"hideControls": false,
"id": null,
- "links": [],
+ "links": [
+ {
+ "icon": "external link",
+ "tags": [],
+ "title": "Solr project",
+ "type": "link",
+ "url": "https://lucene.apache.org/solr/"
+ },
+ {
+ "icon": "external link",
+ "tags": [],
+ "title": "Solr Prometheus documentation",
+ "type": "link",
+ "url": "https://lucene.apache.org/solr/guide/monitoring-solr-with-prometheus-and-grafana.html"
+ }
+ ],
"refresh": "1m",
"rows": [
{
@@ -2348,7 +2363,7 @@
"steppedLine": false,
"targets": [
{
- "expr": "increase(solr_metrics_core_requests_total{base_url=~\"$base_url\"}[1m])",
+ "expr": "increase(solr_metrics_core_requests_total{base_url=~\"$base_url\",collection=~\"$collection\",shard=~\"$shard\",replica=~\"$replica\",core=~\"$core\"}[1m])",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{base_url}}/{{core}}{{handler}}",
@@ -2424,7 +2439,7 @@
"steppedLine": false,
"targets": [
{
- "expr": "increase(solr_metrics_core_time_seconds_total{base_url=~\"$base_url\"}[1m])",
+ "expr": "increase(solr_metrics_core_time_seconds_total{base_url=~\"$base_url\",collection=~\"$collection\",shard=~\"$shard\",replica=~\"$replica\",core=~\"$core\"}[1m])",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{base_url}}/{{core}}{{handler}}",
@@ -2500,7 +2515,7 @@
"steppedLine": false,
"targets": [
{
- "expr": "increase(solr_metrics_core_client_errors_total{base_url=~\"$base_url\"}[1m])",
+ "expr": "increase(solr_metrics_core_client_errors_total{base_url=~\"$base_url\",collection=~\"$collection\",shard=~\"$shard\",replica=~\"$replica\",core=~\"$core\"}[1m])",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{base_url}}/{{core}}{{handler}}",
@@ -2576,7 +2591,7 @@
"steppedLine": false,
"targets": [
{
- "expr": "increase(solr_metrics_core_server_errors_total{base_url=~\"$base_url\"}[1m])",
+ "expr": "increase(solr_metrics_core_server_errors_total{base_url=~\"$base_url\",collection=~\"$collection\",shard=~\"$shard\",replica=~\"$replica\",core=~\"$core\"}[1m])",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{base_url}}/{{core}}{{handler}}",
@@ -2652,7 +2667,7 @@
"steppedLine": false,
"targets": [
{
- "expr": "increase(solr_metrics_core_errors_total{base_url=~\"$base_url\"}[1m])",
+ "expr": "increase(solr_metrics_core_errors_total{base_url=~\"$base_url\",collection=~\"$collection\",shard=~\"$shard\",replica=~\"$replica\",core=~\"$core\"}[1m])",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{base_url}}/{{core}}{{handler}}",
@@ -2728,7 +2743,7 @@
"steppedLine": false,
"targets": [
{
- "expr": "increase(solr_metrics_core_timeouts_total{base_url=~\"$base_url\"}[1m])",
+ "expr": "increase(solr_metrics_core_timeouts_total{base_url=~\"$base_url\",collection=~\"$collection\",shard=~\"$shard\",replica=~\"$replica\",core=~\"$core\"}[1m])",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{base_url}}/{{core}}{{handler}}",
@@ -2804,7 +2819,7 @@
"steppedLine": false,
"targets": [
{
- "expr": "increase(solr_metrics_core_field_cache_total{base_url=~\"$base_url\"}[1m])",
+ "expr": "increase(solr_metrics_core_field_cache_total{base_url=~\"$base_url\",collection=~\"$collection\",shard=~\"$shard\",replica=~\"$replica\",core=~\"$core\"}[1m])",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{base_url}}/{{core}}",
@@ -2880,7 +2895,7 @@
"steppedLine": false,
"targets": [
{
- "expr": "solr_metrics_core_searcher_cache{base_url=~\"$base_url\"}",
+ "expr": "solr_metrics_core_searcher_cache{base_url=~\"$base_url\",collection=~\"$collection\",shard=~\"$shard\",replica=~\"$replica\",core=~\"$core\"}",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{base_url}}/{{core}} {{type}} {{item}}",
@@ -2956,7 +2971,7 @@
"steppedLine": false,
"targets": [
{
- "expr": "solr_metrics_core_searcher_warmup_time_seconds{base_url=~\"$base_url\"}",
+ "expr": "solr_metrics_core_searcher_warmup_time_seconds{base_url=~\"$base_url\",collection=~\"$collection\",shard=~\"$shard\",replica=~\"$replica\",core=~\"$core\"}",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{base_url}}/{{core}} {{type}}",
@@ -3032,7 +3047,7 @@
"steppedLine": false,
"targets": [
{
- "expr": "increase(solr_metrics_core_searcher_cumulative_cache_total{base_url=~\"$base_url\"}[1m])",
+ "expr": "increase(solr_metrics_core_searcher_cumulative_cache_total{base_url=~\"$base_url\",collection=~\"$collection\",shard=~\"$shard\",replica=~\"$replica\",core=~\"$core\"}[1m])",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{base_url}}/{{core}} {{type}} {{item}}",
@@ -3108,7 +3123,7 @@
"steppedLine": false,
"targets": [
{
- "expr": "solr_metrics_core_fs_bytes{base_url=~\"$base_url\"}",
+ "expr": "solr_metrics_core_fs_bytes{base_url=~\"$base_url\",collection=~\"$collection\",shard=~\"$shard\",replica=~\"$replica\",core=~\"$core\"}",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{base_url}}/{{core}}",
@@ -3184,7 +3199,7 @@
"steppedLine": false,
"targets": [
{
- "expr": "solr_metrics_core_index_size_bytes{base_url=~\"$base_url\"}",
+ "expr": "solr_metrics_core_index_size_bytes{base_url=~\"$base_url\",collection=~\"$collection\",shard=~\"$shard\",replica=~\"$replica\",core=~\"$core\"}",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{base_url}}/{{core}}",
@@ -3261,7 +3276,7 @@
"steppedLine": false,
"targets": [
{
- "expr": "solr_metrics_core_searcher_documents{base_url=~\"$base_url\"}",
+ "expr": "solr_metrics_core_searcher_documents{base_url=~\"$base_url\",collection=~\"$collection\",shard=~\"$shard\",replica=~\"$replica\",core=~\"$core\"}",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{base_url}}/{{core}} {{item}}",
@@ -3338,7 +3353,7 @@
"steppedLine": false,
"targets": [
{
- "expr": "increase(solr_metrics_core_update_handler_adds_total{base_url=~\"$base_url\"}[1m])",
+ "expr": "increase(solr_metrics_core_update_handler_adds_total{base_url=~\"$base_url\",collection=~\"$collection\",shard=~\"$shard\",replica=~\"$replica\",core=~\"$core\"}[1m])",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{base_url}}/{{core}}",
@@ -3414,7 +3429,7 @@
"steppedLine": false,
"targets": [
{
- "expr": "solr_metrics_core_update_handler_pending_docs{base_url=~\"$base_url\"}",
+ "expr": "solr_metrics_core_update_handler_pending_docs{base_url=~\"$base_url\",collection=~\"$collection\",shard=~\"$shard\",replica=~\"$replica\",core=~\"$core\"}",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{base_url}}/{{core}}",
@@ -3490,7 +3505,7 @@
"steppedLine": false,
"targets": [
{
- "expr": "increase(solr_metrics_core_update_handler_deletes_by_id_total{base_url=~\"$base_url\"}[1m])",
+ "expr": "increase(solr_metrics_core_update_handler_deletes_by_id_total{base_url=~\"$base_url\",collection=~\"$collection\",shard=~\"$shard\",replica=~\"$replica\",core=~\"$core\"}[1m])",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{base_url}}/{{core}}",
@@ -3566,7 +3581,7 @@
"steppedLine": false,
"targets": [
{
- "expr": "increase(solr_metrics_core_update_handler_deletes_by_query_total{base_url=~\"$base_url\"}[1m])",
+ "expr": "increase(solr_metrics_core_update_handler_deletes_by_query_total{base_url=~\"$base_url\",collection=~\"$collection\",shard=~\"$shard\",replica=~\"$replica\",core=~\"$core\"}[1m])",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{base_url}}/{{core}}",
@@ -3642,7 +3657,7 @@
"steppedLine": false,
"targets": [
{
- "expr": "increase(solr_metrics_core_update_handler_expunge_deletes_total{base_url=~\"$base_url\"}[1m])",
+ "expr": "increase(solr_metrics_core_update_handler_expunge_deletes_total{base_url=~\"$base_url\",collection=~\"$collection\",shard=~\"$shard\",replica=~\"$replica\",core=~\"$core\"}[1m])",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{base_url}}/{{core}}",
@@ -3718,7 +3733,7 @@
"steppedLine": false,
"targets": [
{
- "expr": "increase(solr_metrics_core_update_handler_merges_total{base_url=~\"$base_url\"}[1m])",
+ "expr": "increase(solr_metrics_core_update_handler_merges_total{base_url=~\"$base_url\",collection=~\"$collection\",shard=~\"$shard\",replica=~\"$replica\",core=~\"$core\"}[1m])",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{base_url}}/{{core}}",
@@ -3794,7 +3809,7 @@
"steppedLine": false,
"targets": [
{
- "expr": "increase(solr_metrics_core_update_handler_splits_total{base_url=~\"$base_url\"}[1m])",
+ "expr": "increase(solr_metrics_core_update_handler_splits_total{base_url=~\"$base_url\",collection=~\"$collection\",shard=~\"$shard\",replica=~\"$replica\",core=~\"$core\"}[1m])",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{base_url}}/{{core}}",
@@ -3870,7 +3885,7 @@
"steppedLine": false,
"targets": [
{
- "expr": "increase(solr_metrics_core_update_handler_optimizes_total{base_url=~\"$base_url\"}[1m])",
+ "expr": "increase(solr_metrics_core_update_handler_optimizes_total{base_url=~\"$base_url\",collection=~\"$collection\",shard=~\"$shard\",replica=~\"$replica\",core=~\"$core\"}[1m])",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{base_url}}/{{core}}",
@@ -3946,7 +3961,7 @@
"steppedLine": false,
"targets": [
{
- "expr": "increase(solr_metrics_core_update_handler_rollbacks_total{base_url=~\"$base_url\"}[1m])",
+ "expr": "increase(solr_metrics_core_update_handler_rollbacks_total{base_url=~\"$base_url\",collection=~\"$collection\",shard=~\"$shard\",replica=~\"$replica\",core=~\"$core\"}[1m])",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{base_url}}/{{core}}",
@@ -4022,7 +4037,7 @@
"steppedLine": false,
"targets": [
{
- "expr": "increase(solr_metrics_core_update_handler_soft_auto_commits_total{base_url=~\"$base_url\"}[1m])",
+ "expr": "increase(solr_metrics_core_update_handler_soft_auto_commits_total{base_url=~\"$base_url\",collection=~\"$collection\",shard=~\"$shard\",replica=~\"$replica\",core=~\"$core\"}[1m])",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{base_url}}/{{core}}",
@@ -4098,7 +4113,7 @@
"steppedLine": false,
"targets": [
{
- "expr": "increase(solr_metrics_core_update_handler_auto_commits_total{base_url=~\"$base_url\"}[1m])",
+ "expr": "increase(solr_metrics_core_update_handler_auto_commits_total{base_url=~\"$base_url\",collection=~\"$collection\",shard=~\"$shard\",replica=~\"$replica\",core=~\"$core\"}[1m])",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{base_url}}/{{core}}",
@@ -4174,7 +4189,7 @@
"steppedLine": false,
"targets": [
{
- "expr": "increase(solr_metrics_core_update_handler_commits_total{base_url=~\"$base_url\"}[1m])",
+ "expr": "increase(solr_metrics_core_update_handler_commits_total{base_url=~\"$base_url\",collection=~\"$collection\",shard=~\"$shard\",replica=~\"$replica\",core=~\"$core\"}[1m])",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{base_url}}/{{core}}",
@@ -4251,7 +4266,7 @@
"steppedLine": false,
"targets": [
{
- "expr": "increase(solr_metrics_core_update_handler_errors_total{base_url=~\"$base_url\"}[1m])",
+ "expr": "increase(solr_metrics_core_update_handler_errors_total{base_url=~\"$base_url\",collection=~\"$collection\",shard=~\"$shard\",replica=~\"$replica\",core=~\"$core\"}[1m])",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{base_url}}/{{core}}",
@@ -4336,9 +4351,9 @@
"includeAll": true,
"label": null,
"multi": true,
- "name": "collection",
+ "name": "base_url",
"options": [],
- "query": "label_values(solr_ping{zk_host=\"$zk_host\",collection=~\".+\"},collection)",
+ "query": "label_values(solr_ping{base_url=~\".+\"},base_url)",
"refresh": 1,
"regex": "/(.+)/",
"sort": 1,
@@ -4356,9 +4371,9 @@
"includeAll": true,
"label": null,
"multi": true,
- "name": "shard",
+ "name": "collection",
"options": [],
- "query": "label_values(solr_collections_shard_state{zk_host=\"$zk_host\",collection=\"$collection\",shard=~\".+\"},shard)",
+ "query": "label_values(solr_collections_shard_state{zk_host=~\"$zk_host\",collection=~\".+\"},collection)",
"refresh": 1,
"regex": "/(.+)/",
"sort": 1,
@@ -4376,9 +4391,9 @@
"includeAll": true,
"label": null,
"multi": true,
- "name": "replica",
+ "name": "shard",
"options": [],
- "query": "label_values(solr_collections_replica_state{zk_host=\"$zk_host\",collection=\"$collection\",shard=\"$shard\",replica=\".+\"},replica)",
+ "query": "label_values(solr_collections_shard_state{zk_host=~\"$zk_host\",collection=~\"$collection\",shard=~\".+\"},shard)",
"refresh": 1,
"regex": "/(.+)/",
"sort": 1,
@@ -4396,9 +4411,9 @@
"includeAll": true,
"label": null,
"multi": true,
- "name": "base_url",
+ "name": "replica",
"options": [],
- "query": "label_values(solr_ping{base_url=~\".+\"},base_url)",
+ "query": "label_values(solr_collections_replica_state{zk_host=~\"$zk_host\",collection=~\"$collection\",shard=~\"$shard\",replica=~\".+\"},replica)",
"refresh": 1,
"regex": "/(.+)/",
"sort": 1,
@@ -4418,7 +4433,7 @@
"multi": true,
"name": "core",
"options": [],
- "query": "label_values(solr_ping{base_url=~\"$base_url\"},core)",
+ "query": "label_values(solr_collections_replica_state{zk_host=~\"$zk_host\",collection=~\"$collection\",shard=~\"$shard\",replica=~\"$replica\"},core)",
"refresh": 1,
"regex": "/(.+)/",
"sort": 1,