From 4dde96830bce49449d0d632f4967e8a3fe4cab00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Vl=C4=8Dek?= <lukas.vlcek@gmail.com>
Date: Tue, 13 Oct 2020 16:10:05 +0200
Subject: [PATCH] Bug 1883719: Bulk statistics are recorded under write
 threadpool

Bulk threadpool was renamed to index. See elastic/elasticsearch#29593
---
 files/prometheus_alerts.yml |  8 ++++----
 files/prometheus_rules.yml  | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/files/prometheus_alerts.yml b/files/prometheus_alerts.yml
index b21a8fea4..3f1788227 100644
--- a/files/prometheus_alerts.yml
+++ b/files/prometheus_alerts.yml
@@ -22,12 +22,12 @@
     "labels":
       "severity": "warning"
 
-  - "alert": "ElasticsearchIndexingRequestsRejectionJumps"
+  - "alert": "ElasticsearchWriteRequestsRejectionJumps"
     "annotations":
-      "message": "High Indexing Rejection Ratio at {{ $labels.node }} node in {{ $labels.cluster }} cluster. This node may not be keeping up with the indexing speed."
-      "summary": "High Indexing Rejection Ratio - {{ $value }}%"
+      "message": "High Write Rejection Ratio at {{ $labels.node }} node in {{ $labels.cluster }} cluster. This node may not be keeping up with the indexing speed."
+      "summary": "High Write Rejection Ratio - {{ $value }}%"
     "expr": |
-      round( indexing:reject_ratio:rate2m * 100, 0.001 ) > 5
+      round( writing:reject_ratio:rate2m * 100, 0.001 ) > 5
     "for": "10m"
     "labels":
       "severity": "warning"
diff --git a/files/prometheus_rules.yml b/files/prometheus_rules.yml
index e43ce3830..b9ee2be75 100644
--- a/files/prometheus_rules.yml
+++ b/files/prometheus_rules.yml
@@ -3,11 +3,11 @@
 - "name": "logging_elasticsearch.rules"
   "rules":
   - "expr": |
-      rate(es_threadpool_threads_count{name="index", type="rejected"}[2m])
-    "record": "indexing:rejected_requests:rate2m"
+      rate(es_threadpool_threads_count{name="write", type="rejected"}[2m])
+    "record": "writing:rejected_requests:rate2m"
   - "expr": |
-      rate(es_threadpool_threads_count{name="index", type="completed"}[2m])
-    "record": "indexing:completed_requests:rate2m"
+      rate(es_threadpool_threads_count{name="write", type="completed"}[2m])
+    "record": "writing:completed_requests:rate2m"
   - "expr": |
-      sum by (cluster, instance, node) (indexing:rejected_requests:rate2m) / on (cluster, instance, node) (indexing:completed_requests:rate2m)
-    "record": "indexing:reject_ratio:rate2m"
+      sum by (cluster, instance, node) (writing:rejected_requests:rate2m) / on (cluster, instance, node) (writing:completed_requests:rate2m)
+    "record": "writing:reject_ratio:rate2m"