Merge branches 'development/2.11' and 'bugfix/3474-lower-disk-alert-t…

…hresholds' into tmp/octopus/w/2.11/bugfix/3474-lower-disk-alert-thresholds
scality · Aug 5, 2021 · d2ab58e · d2ab58e
3 parents 3aabb30 + 4486c8b + e509c2b
commit d2ab58e
Show file tree

Hide file tree

Showing 21 changed files with 676 additions and 716 deletions.
diff --git a/eve/main.yml b/eve/main.yml
@@ -148,7 +148,7 @@ models:
         elif [ "$DEBUG_STEPS" = all ]; then
           RUN_STEP=1
           REASON="\"debug\" property set to \"all\""
-        elif [[ "$DEBUG_STEPS" =~ ^[a-z\-]+(~[a-z\-]+)*$ ]]; then
+        elif [[ "$DEBUG_STEPS" =~ ^[a-z0-9\-]+(~[a-z0-9\-]+)*$ ]]; then
           IFS="~" read -ra SELECTED <<< "$DEBUG_STEPS"
           for selected in "${SELECTED[@]}"; do
             if [ "$selected" = "$STEP_NAME" ]; then

diff --git a/shell-ui/package-lock.json b/shell-ui/package-lock.json
diff --git a/shell-ui/package.json b/shell-ui/package.json
@@ -46,7 +46,7 @@
     "webpack-dev-server": "^3.11.2"
   },
   "dependencies": {
-    "@scality/core-ui": "github:scality/core-ui.git#v0.19.2",
+    "@scality/core-ui": "github:scality/core-ui.git#v0.19.3",
     "@scality/module-federation": "github:scality/module-federation.git#1.0.0",
     "oidc-client": "^1.11.3",
     "oidc-react": "^1.1.5",

diff --git a/tools/rule_extractor/alerting_rules.csv b/tools/rule_extractor/alerting_rules.csv
@@ -80,12 +80,12 @@ KubeVersionMismatch,warning,Different semantic versions of Kubernetes components
 KubeClientErrors,warning,Kubernetes API server client is experiencing errors.
 NodeFilesystemSpaceFillingUp,warning,Filesystem is predicted to run out of space within the next 24 hours.
 NodeFilesystemSpaceFillingUp,critical,Filesystem is predicted to run out of space within the next 4 hours.
-NodeFilesystemAlmostOutOfSpace,warning,Filesystem has less than 5% space left.
-NodeFilesystemAlmostOutOfSpace,critical,Filesystem has less than 3% space left.
+NodeFilesystemAlmostOutOfSpace,warning,Filesystem has less than 20% space left.
+NodeFilesystemAlmostOutOfSpace,critical,Filesystem has less than 12% space left.
 NodeFilesystemFilesFillingUp,warning,Filesystem is predicted to run out of inodes within the next 24 hours.
 NodeFilesystemFilesFillingUp,critical,Filesystem is predicted to run out of inodes within the next 4 hours.
-NodeFilesystemAlmostOutOfFiles,warning,Filesystem has less than 5% inodes left.
-NodeFilesystemAlmostOutOfFiles,critical,Filesystem has less than 3% inodes left.
+NodeFilesystemAlmostOutOfFiles,warning,Filesystem has less than 15% inodes left.
+NodeFilesystemAlmostOutOfFiles,critical,Filesystem has less than 8% inodes left.
 NodeNetworkReceiveErrs,warning,Network interface is reporting many receive errors.
 NodeNetworkTransmitErrs,warning,Network interface is reporting many transmit errors.
 NodeHighNumberConntrackEntriesUsed,warning,Number of conntrack are getting close to the limit

diff --git a/tools/rule_extractor/alerting_rules.json b/tools/rule_extractor/alerting_rules.json
@@ -492,15 +492,15 @@
         "severity": "critical"
     },
     {
-        "message": "Filesystem has less than 5% space left.",
+        "message": "Filesystem has less than 20% space left.",
         "name": "NodeFilesystemAlmostOutOfSpace",
-        "query": "(node_filesystem_avail_bytes{fstype!=\"\",job=\"node-exporter\"} / node_filesystem_size_bytes{fstype!=\"\",job=\"node-exporter\"} * 100 < 5 and node_filesystem_readonly{fstype!=\"\",job=\"node-exporter\"} == 0)",
+        "query": "(node_filesystem_avail_bytes{fstype!=\"\",job=\"node-exporter\"} / node_filesystem_size_bytes{fstype!=\"\",job=\"node-exporter\"} * 100 < 20 and node_filesystem_readonly{fstype!=\"\",job=\"node-exporter\"} == 0)",
         "severity": "warning"
     },
     {
-        "message": "Filesystem has less than 3% space left.",
+        "message": "Filesystem has less than 12% space left.",
         "name": "NodeFilesystemAlmostOutOfSpace",
-        "query": "(node_filesystem_avail_bytes{fstype!=\"\",job=\"node-exporter\"} / node_filesystem_size_bytes{fstype!=\"\",job=\"node-exporter\"} * 100 < 3 and node_filesystem_readonly{fstype!=\"\",job=\"node-exporter\"} == 0)",
+        "query": "(node_filesystem_avail_bytes{fstype!=\"\",job=\"node-exporter\"} / node_filesystem_size_bytes{fstype!=\"\",job=\"node-exporter\"} * 100 < 12 and node_filesystem_readonly{fstype!=\"\",job=\"node-exporter\"} == 0)",
         "severity": "critical"
     },
     {
@@ -516,15 +516,15 @@
         "severity": "critical"
     },
     {
-        "message": "Filesystem has less than 5% inodes left.",
+        "message": "Filesystem has less than 15% inodes left.",
         "name": "NodeFilesystemAlmostOutOfFiles",
-        "query": "(node_filesystem_files_free{fstype!=\"\",job=\"node-exporter\"} / node_filesystem_files{fstype!=\"\",job=\"node-exporter\"} * 100 < 5 and node_filesystem_readonly{fstype!=\"\",job=\"node-exporter\"} == 0)",
+        "query": "(node_filesystem_files_free{fstype!=\"\",job=\"node-exporter\"} / node_filesystem_files{fstype!=\"\",job=\"node-exporter\"} * 100 < 15 and node_filesystem_readonly{fstype!=\"\",job=\"node-exporter\"} == 0)",
         "severity": "warning"
     },
     {
-        "message": "Filesystem has less than 3% inodes left.",
+        "message": "Filesystem has less than 8% inodes left.",
         "name": "NodeFilesystemAlmostOutOfFiles",
-        "query": "(node_filesystem_files_free{fstype!=\"\",job=\"node-exporter\"} / node_filesystem_files{fstype!=\"\",job=\"node-exporter\"} * 100 < 3 and node_filesystem_readonly{fstype!=\"\",job=\"node-exporter\"} == 0)",
+        "query": "(node_filesystem_files_free{fstype!=\"\",job=\"node-exporter\"} / node_filesystem_files{fstype!=\"\",job=\"node-exporter\"} * 100 < 8 and node_filesystem_readonly{fstype!=\"\",job=\"node-exporter\"} == 0)",
         "severity": "critical"
     },
     {