don't return available_processors by default

Author: piotrsulkowski-elastic

distribution/docker/src/yamlRestTest/resources/rest-api-spec/test/11_nodes.yml

@@ -1,41 +1,5 @@
 ---
-"Test cat nodes output for all fields with available_processors":
-  - requires:
-      capabilities:
-        - method: GET
-          path: /_cat/nodes
-          capabilities: [ available_processors_availability ]
-      test_runner_features: [ capabilities ]
-      reason: available_processors capability required to run test
-
-  - do:
-      cat.nodes: {}
-
-  - match:
-      $body: |
-        /  #ip                          heap.percent        ram.percent     cpu         load_1m                load_5m                load_15m               available_processors     node.role                   master          name
-        ^  ((\d{1,3}\.){3}\d{1,3}  \s+  \d+            \s+  \d*         \s+ (-)?\d* \s+ ((-)?\d*(\.\d+)?)? \s+ ((-)?\d*(\.\d+)?)?\s+  ((-)?\d*(\.\d+)?)? \s+ (\d+)?               \s+ (-|[cdfhilmrstvw]{1,11}) \s+ [-*x]     \s+   .*     \n)+  $/
-
-  - do:
-      cat.nodes:
-        v: true
-
-  - match:
-      $body: |
-        /^  ip                     \s+  heap\.percent   \s+  ram\.percent \s+ cpu      \s+ load_1m            \s+ load_5m            \s+ load_15m           \s+ available_processors  \s+  node\.role               \s+  master   \s+   name  \n
-           ((\d{1,3}\.){3}\d{1,3}  \s+  \d+             \s+  \d*          \s+ (-)?\d*  \s+ ((-)?\d*(\.\d+)?)? \s+ ((-)?\d*(\.\d+)?)? \s+ ((-)?\d*(\.\d+)?)? \s+ (\d+)?                \s+  (-|[cdfhilmrstvw]{1,11}) \s+  [-*x]    \s+   .*     \n)+  $/
-
----
-"Test cat nodes output for all fields before available_processors was added":
-  - requires:
-      test_runner_features: [ capabilities ]
-
-  - skip:
-      capabilities:
-        - method: GET
-          path: /_cat/nodes
-          capabilities: [ available_processors_availability ]
-      reason: available_processors capability must be missing to run this test
+"Test cat nodes output":
 
   - do:
       cat.nodes: {}
@@ -51,11 +15,9 @@
 
   - match:
       $body: |
-        /^  ip                     \s+  heap\.percent   \s+  ram\.percent \s+ cpu      \s+ load_1m            \s+ load_5m            \s+ load_15m           \s+ node\.role               \s+  master   \s+   name  \n
-           ((\d{1,3}\.){3}\d{1,3}  \s+  \d+             \s+  \d*          \s+ (-)?\d*  \s+ ((-)?\d*(\.\d+)?)? \s+ ((-)?\d*(\.\d+)?)? \s+ ((-)?\d*(\.\d+)?)? \s+ (-|[cdfhilmrstvw]{1,11}) \s+  [-*x]    \s+   .*     \n)+  $/
+        /^  ip                     \s+  heap\.percent   \s+  ram\.percent \s+ cpu      \s+ load_1m            \s+ load_5m            \s+ load_15m           \s+ node\.role              \s+  master   \s+   name  \n
+           ((\d{1,3}\.){3}\d{1,3}  \s+  \d+             \s+  \d*          \s+ (-)?\d* \s+  ((-)?\d*(\.\d+)?)? \s+ ((-)?\d*(\.\d+)?)? \s+ ((-)?\d*(\.\d+)?)? \s+ (-|[cdfhilmrstvw]{1,11}) \s+  [-*x]    \s+   .*     \n)+  $/
 
----
-"Test cat nodes output for selected fields":
   - do:
       cat.nodes:
         h: heap.current,heap.percent,heap.max

rest-api-spec/build.gradle

@@ -103,7 +103,6 @@ tasks.named("yamlRestCompatTestTransform").configure ({ task ->
   task.skipTest("logsdb/10_settings/override sort order settings", "we changed the error message")
   task.skipTest("tsdb/10_settings/set start_time and end_time without timeseries mode", "we don't validate for index_mode=tsdb when setting start_date/end_date anymore")
   task.skipTest("tsdb/10_settings/set start_time, end_time and routing_path via put settings api without time_series mode", "we don't validate for index_mode=tsdb when setting start_date/end_date anymore")
-  task.skipTest("cat.nodes/10_basic/Test cat nodes output", "a new field 'available_processors' was added")
   // Expected deprecation warning to compat yaml tests:
   task.addAllowedWarningRegex("Use of the \\[max_size\\] rollover condition has been deprecated in favour of the \\[max_primary_shard_size\\] condition and will be removed in a later version")
 })

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cat.nodes/10_basic.yml

@@ -1,43 +1,5 @@
 ---
-"Test cat nodes output for all fields with available_processors":
-  - requires:
-      capabilities:
-        - method: GET
-          path: /_cat/nodes
-          capabilities: [ available_processors_availability ]
-      test_runner_features: [ capabilities ]
-      reason: available_processors capability required to run test
-
-  - do:
-      cat.nodes: {}
-
-  - match:
-      $body: |
-               /  #ip                          heap.percent        ram.percent     cpu         load_1m                load_5m                load_15m                available_processors     node.role                   master          name
-               ^  ((\d{1,3}\.){3}\d{1,3}  \s+  \d+            \s+  \d*         \s+ (-)?\d* \s+ ((-)?\d*(\.\d+)?)? \s+ ((-)?\d*(\.\d+)?)?\s+  ((-)?\d*(\.\d+)?)? \s+  (\d+)?               \s+ (-|[cdfhilmrstvwIS]{1,11}) \s+ [-*x]     \s+   .*     \n)+  $/
-
-  - do:
-      cat.nodes:
-          v: true
-
-  - match:
-      $body: |
-               /^  ip                     \s+  heap\.percent   \s+  ram\.percent \s+ cpu      \s+ load_1m            \s+ load_5m            \s+ load_15m            \s+ available_processors  \s+ node\.role                 \s+  master   \s+   name  \n
-                  ((\d{1,3}\.){3}\d{1,3}  \s+  \d+             \s+  \d*          \s+ (-)?\d*  \s+ ((-)?\d*(\.\d+)?)? \s+ ((-)?\d*(\.\d+)?)? \s+ ((-)?\d*(\.\d+)?)?  \s+ (\d+)?                \s+ (-|[cdfhilmrstvwIS]{1,11}) \s+  [-*x]    \s+   .*    \n)+  $/
-
----
-"Test cat nodes output for all fields before available_processors was added":
-
-  - requires:
-      test_runner_features: [ capabilities ]
-
-  - skip:
-      capabilities:
-        - method: GET
-          path: /_cat/nodes
-          capabilities: [ available_processors_availability ]
-      reason: available_processors capability must be missing to run this test
-
+"Test cat nodes output":
   - do:
       cat.nodes: {}
 
@@ -48,15 +10,13 @@
 
   - do:
       cat.nodes:
-        v: true
+          v: true
 
   - match:
       $body: |
         /^  ip                     \s+  heap\.percent   \s+  ram\.percent \s+ cpu      \s+ load_1m            \s+ load_5m            \s+ load_15m            \s+ node\.role                 \s+  master   \s+   name  \n
            ((\d{1,3}\.){3}\d{1,3}  \s+  \d+             \s+  \d*          \s+ (-)?\d*  \s+ ((-)?\d*(\.\d+)?)? \s+ ((-)?\d*(\.\d+)?)? \s+ ((-)?\d*(\.\d+)?)?  \s+ (-|[cdfhilmrstvwIS]{1,11}) \s+  [-*x]    \s+   .*    \n)+  $/
 
----
-"Test cat nodes output for selected fields":
   - do:
       cat.nodes:
           h: heap.current,heap.percent,heap.max
@@ -97,6 +57,26 @@
       $body: |
                /^      http \n ((\d{1,3}\.){3}\d{1,3}:\d{1,5}\n)+  $/
 
+---
+"Test cat nodes output for all fields with available_processors":
+  - requires:
+      capabilities:
+        - method: GET
+          path: /_cat/nodes
+          capabilities: [ available_processors_availability ]
+      test_runner_features: [ capabilities ]
+      reason: available_processors capability required to run test
+
+  - do:
+      cat.nodes:
+        h: ap,available_processors
+        v: true
+
+  - match:
+      $body: |
+        /^         ap       \s+  available_processors   \n
+           (  \s+  \d+      \s+  \d+                    \n )+    $/
+
 ---
 "Additional disk information":
   - do:

server/src/main/java/org/elasticsearch/rest/action/cat/RestNodesAction.java

@@ -172,7 +172,7 @@ protected Table getTableWithHeader(final RestRequest request) {
         table.addCell("load_1m", "alias:l;text-align:right;desc:1m load avg");
         table.addCell("load_5m", "alias:l;text-align:right;desc:5m load avg");
         table.addCell("load_15m", "alias:l;text-align:right;desc:15m load avg");
-        table.addCell("available_processors", "alias:ap;text-align:right;desc:available processors");
+        table.addCell("available_processors", "default:false;alias:ap;text-align:right;desc:available processors");
         table.addCell("uptime", "default:false;alias:u;text-align:right;desc:node uptime");
         table.addCell(
             "node.role",

server/src/main/resources/transport/definitions/referable/available_processors_in_os_stats.csv

@@ -1 +1 @@
-9190000
+9191000