(misc) ddl updates

Signed-off-by: R.I.Pienaar <rip@devco.net>
choria-legacy · Dec 26, 2020 · c8cf82f · c8cf82f
1 parent 55b79d1
commit c8cf82f
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 16 deletions.
diff --git a/lib/mcollective/agent/rpcutil.ddl b/lib/mcollective/agent/rpcutil.ddl
@@ -52,6 +52,10 @@ action "inventory", :description => "System Inventory" do
     output :data_plugins,
            :description => "List of data plugin names",
            :display_as => "Data Plugins"
+
+    output :machines,
+           :description => "Autonomous Agents",
+           :display_as => "Machines"
 end
 
 action "get_fact", :description => "Retrieve a single fact from the fact store" do

diff --git a/lib/mcollective/agent/rpcutil.json b/lib/mcollective/agent/rpcutil.json
@@ -305,6 +305,11 @@
           "description": "List of data plugin names",
           "display_as": "Data Plugins",
           "default": null
+        },
+        "machines": {
+          "description": "Autonomous Agents",
+          "display_as": "Machines",
+          "default": null
         }
       },
       "display": "always",

diff --git a/lib/mcollective/agent/scout.json b/lib/mcollective/agent/scout.json
@@ -19,7 +19,8 @@
         "checks": {
           "description": "Details about each check",
           "display_as": "Checks",
-          "default": null
+          "default": null,
+          "type": "array"
         }
       },
       "display": "ok",
@@ -51,32 +52,38 @@
         "failures": {
           "description": "The number of tests that failed",
           "display_as": "Failed Tests",
-          "default": null
+          "default": null,
+          "type": "integer"
         },
         "results": {
           "description": "The full test results",
           "display_as": "Results",
-          "default": null
+          "default": null,
+          "type": "array"
         },
         "runtime": {
           "description": "The time it took to run the tests, in seconds",
           "display_as": "Runtime",
-          "default": null
+          "default": null,
+          "type": "integer"
         },
         "success": {
           "description": "Indicates if the test passed",
           "display_as": "Success",
-          "default": null
+          "default": null,
+          "type": "string"
         },
         "summary": {
           "description": "A human friendly test result",
           "display_as": "Summary",
-          "default": null
+          "default": null,
+          "type": "string"
         },
         "tests": {
           "description": "The number of tests that were run",
           "display_as": "Tests",
-          "default": null
+          "default": null,
+          "type": "integer"
         }
       },
       "display": "failed",
@@ -126,17 +133,20 @@
         "failed": {
           "description": "List of checks that could not be paused",
           "display_as": "Failed",
-          "default": null
+          "default": null,
+          "type": "array"
         },
         "skipped": {
           "description": "List of checks that was skipped",
           "display_as": "Skipped",
-          "default": null
+          "default": null,
+          "type": "array"
         },
         "transitioned": {
           "description": "List of checks that were paused",
           "display_as": "Triggered",
-          "default": null
+          "default": null,
+          "type": "array"
         }
       },
       "display": "failed",
@@ -157,17 +167,20 @@
         "failed": {
           "description": "List of checks that could not be resumed",
           "display_as": "Failed",
-          "default": null
+          "default": null,
+          "type": "array"
         },
         "skipped": {
           "description": "List of checks that was skipped",
           "display_as": "Skipped",
-          "default": null
+          "default": null,
+          "type": "array"
         },
         "transitioned": {
           "description": "List of checks that were resumed",
           "display_as": "Triggered",
-          "default": null
+          "default": null,
+          "type": "array"
         }
       },
       "display": "failed",
@@ -188,17 +201,20 @@
         "failed": {
           "description": "List of checks that could not be triggered",
           "display_as": "Failed",
-          "default": null
+          "default": null,
+          "type": "array"
         },
         "skipped": {
           "description": "List of checks that was skipped",
           "display_as": "Skipped",
-          "default": null
+          "default": null,
+          "type": "array"
         },
         "transitioned": {
           "description": "List of checks that were triggered",
           "display_as": "Triggered",
-          "default": null
+          "default": null,
+          "type": "array"
         }
       },
       "display": "failed",