From: Ildar Svetlov <isvetlov@mirantis.com>
Date: Wed, 27 May 2020 10:40:35 +0000 (+0400)
Subject: Raise ES disk space alert thresholds
X-Git-Url: https://gerrit.mcp.mirantis.com/gitweb?p=salt-formulas%2Felasticsearch.git;a=commitdiff_plain;h=1657066a170832505ff127e26384feba4ddbe476;hp=f2a9d51664e767df998a5659822abfa6c8ec544f

Raise ES disk space alert thresholds

the real cluster watermarks are the following:
  "cluster.routing.allocation.disk.watermark.high": "90%"
  "cluster.routing.allocation.disk.watermark.low": "85%"

set the alerts' thresholds to 85% and 80% (5% behind the real watermark)

Related-PROD: PROD-33841

Change-Id: I95ab8752fd60f8d698ee04386e296d42892b376f
---

diff --git a/elasticsearch/map.jinja b/elasticsearch/map.jinja
index 09d76d5..6bfb50d 100644
--- a/elasticsearch/map.jinja
+++ b/elasticsearch/map.jinja
@@ -45,7 +45,7 @@ RedHat:
     'default': {
         'service_failed_warning_threshold_percent': 0.3,
         'service_failed_critical_threshold_percent': 0.6,
-        'service_disk_space_watermark_minor_threshold_percent': 0.6,
-        'service_disk_space_watermark_major_threshold_percent': 0.75,
+        'service_disk_space_watermark_minor_threshold_percent': 0.8,
+        'service_disk_space_watermark_major_threshold_percent': 0.85,
     },
 }, grain='os_family', merge=salt['pillar.get']('elasticsearch:monitoring')) %}
diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index 9761585..0ab7d81 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -39,7 +39,7 @@ setup_virtualenv() {
     log_info "Setting up Python virtualenv"
     virtualenv $VENV_DIR
     source ${VENV_DIR}/bin/activate
-    python -m pip install salt${PIP_SALT_VERSION}
+    python -m pip install salt${PIP_SALT_VERSION} 'msgpack<1'
 }
 
 setup_mock_bin() {