choria-mcorpc-support 2.23.2 → 2.24.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: eec95c87d792aa11ef19070212ddb9c9a049b958
-  data.tar.gz: 6773d4503a617ffe984e536f789d8057f99794db
+SHA256:
+  metadata.gz: cda09be3dbdb88b142247d02b8ee0f03d8198a1b4138b3b4d77b1143f692400a
+  data.tar.gz: c86ce219df50736213dd3da1915869c2971316f454f1377564c3147a48670c55
 SHA512:
-  metadata.gz: 9795fbdcaf8a5d765186a73b9fd7a6e015faea9738340a0e86b31bf199ef865d38b8e95fea9c3398da0ff6ba69ff11cef5480fa28a48639ed41074f9aea75c7e
-  data.tar.gz: 719dc3e9eb808fb6cd13b4b43124b9d83bcc15569b061c92f64b1905c639b37d0f86a2b56fa6f074671a3aaec647c995089d5bca26bce433ce93c5bd78dfeddb
+  metadata.gz: a799daf56ba217197c4e3b66ae81e583eb4f5e88229b3f9e0b3e99ae4b666eb29388f7fa21c7cc8f9dbd5731c78016277978d1ed084c02593ae120694877a40d
+  data.tar.gz: 1bd34b265c722b9170d8a530caab0581809dbd812fae49bfa1337ee5e06eda441b22a0dcc67dd8b4341963ec85890d2442a5432bb34278cd0813f3ab5642b5e9

data/lib/mcollective.rb

@@ -15,6 +15,7 @@ require "mcollective/monkey_patches"
 require "mcollective/cache"
 require "mcollective/exceptions"
 require "systemu"
+require "open3"
 
 # == The Marionette Collective
 #
@@ -34,15 +35,14 @@ module MCollective
   require "mcollective/client"
   require "mcollective/config"
   require "mcollective/connector"
-  require "mcollective/data"
   require "mcollective/ddl"
   require "mcollective/discovery"
+  require "mcollective/discovery/delegate"
   require "mcollective/facts"
   require "mcollective/logger"
   require "mcollective/log"
   require "mcollective/message"
   require "mcollective/optionparser"
-  require "mcollective/generators"
   require "mcollective/pluginmanager"
   require "mcollective/pluginpackager"
   require "mcollective/rpc"
@@ -53,7 +53,7 @@ module MCollective
   require "mcollective/util"
   require "mcollective/validator"
 
-  VERSION = "2.23.2".freeze
+  VERSION = "2.24.1".freeze
 
   def self.version
     VERSION

data/lib/mcollective/agent/choria_util.ddl

@@ -1,152 +1,251 @@
-metadata    :name        => "choria_util",
-            :description => "Choria Utilities",
-            :author      => "R.I.Pienaar <rip@devco.net>",
-            :license     => "Apache-2.0",
-            :version     => "0.19.0",
-            :url         => "https://choria.io",
-            :timeout     => 2
+metadata :name        => "choria_util",
+         :description => "Choria Utilities",
+         :author      => "R.I.Pienaar <rip@devco.net>",
+         :license     => "Apache-2.0",
+         :version     => "0.19.0",
+         :url         => "https://choria.io",
+         :timeout     => 2
 
-requires :mcollective => "2.9.0"
 
-action "machine_transition", :description => "Attempts to force a transition in a hosted Choria Autonomous Agent" do
+action "info", :description => "Choria related information from the running Daemon and Middleware" do
+  display :failed
+
+
+
+  output :choria_version,
+         :description => "Choria version",
+         :display_as  => "Choria Version"
+
+  output :client_flavour,
+         :description => "Middleware client gem flavour",
+         :display_as  => "Middleware Client Flavour"
+
+  output :client_options,
+         :description => "Active Middleware client gem options",
+         :display_as  => "Middleware Client Options"
+
+  output :client_stats,
+         :description => "Middleware client gem statistics",
+         :display_as  => "Middleware Client Stats"
+
+  output :client_version,
+         :description => "Middleware client library version",
+         :display_as  => "Middleware Client Library Version"
+
+  output :connected_server,
+         :description => "Connected middleware server",
+         :display_as  => "Connected Broker"
+
+  output :connector,
+         :description => "Connector plugin",
+         :display_as  => "Connector"
+
+  output :connector_tls,
+         :description => "If the connector is running with TLS security enabled",
+         :display_as  => "Connector TLS"
+
+  output :facter_command,
+         :description => "Command used for Facter",
+         :display_as  => "Facter"
+
+  output :facter_domain,
+         :description => "Facter domain",
+         :display_as  => "Facter Domain"
+
+  output :middleware_servers,
+         :description => "Middleware Servers configured or discovered",
+         :display_as  => "Middleware"
+
+  output :path,
+         :description => "Active OS PATH",
+         :display_as  => "Path"
+
+  output :secure_protocol,
+         :description => "If the protocol is running with PKI security enabled",
+         :display_as  => "Protocol Secure"
+
+  output :security,
+         :description => "Security Provider plugin",
+         :display_as  => "Security Provider"
+
+  output :srv_domain,
+         :description => "Configured SRV domain",
+         :display_as  => "SRV Domain"
+
+  output :using_srv,
+         :description => "Indicates if SRV records are considered",
+         :display_as  => "SRV Used"
+
+  summarize do
+    aggregate summary(:choria_version)
+    aggregate summary(:client_version)
+    aggregate summary(:client_flavour)
+    aggregate summary(:connected_server)
+    aggregate summary(:srv_domain)
+    aggregate summary(:using_srv)
+    aggregate summary(:secure_protocol)
+    aggregate summary(:connector_tls)
+  end
+end
+
+action "machine_state", :description => "Retrieves the current state of a specific Choria Autonomous Agent" do
+  display :ok
+
   input :instance,
-        :prompt => "Instance ID",
+        :prompt      => "Instance ID",
         :description => "Machine Instance ID",
-        :type => :string,
-        :validation => '^.+-.+-.+-.+-.+$',
-        :maxlength => 36,
-        :optional => true
+        :type        => :string,
+        :validation  => '^.+-.+-.+-.+-.+$',
+        :maxlength   => 36,
+        :optional    => true
 
-  input :version,
-        :prompt => "Version",
-        :description => "Machine Version",
-        :type => :string,
-        :validation => '^\d+\.\d+\.\d+$',
-        :maxlength => 20,
-        :optional => true
 
   input :name,
-        :prompt => "Name",
+        :prompt      => "Name",
         :description => "Machine Name",
-        :type => :string,
-        :validation => '^[a-zA-Z][a-zA-Z0-9_-]+',
-        :maxlength => 128,
-        :optional => true
+        :type        => :string,
+        :validation  => '^[a-zA-Z][a-zA-Z0-9_-]+',
+        :maxlength   => 128,
+        :optional    => true
+
 
   input :path,
-        :prompt => "Path",
+        :prompt      => "Path",
         :description => "Machine Path",
-        :type => :string,
-        :validation => '.+',
-        :maxlength => 512,
-        :optional => true
+        :type        => :string,
+        :validation  => '.+',
+        :maxlength   => 512,
+        :optional    => true
 
-  input :transition,
-        :prompt => "Transition Name",
-        :description => "The transition event to send to the machine",
-        :type => :string,
-        :validation => '^[a-zA-Z][a-zA-Z0-9_-]+$',
-        :maxlength => 128,
-        :optional => false
 
-  output :success,
-         :description => "Indicates if the transition was successfully accepted",
-         :display_as => "Accepted"
+
+
+  output :available_transitions,
+         :description => "The list of available transitions this autonomous agent can make",
+         :type        => "array",
+         :display_as  => "Available Transitions"
+
+  output :current_state,
+         :description => "The Choria Scout specific state for Scout checks",
+         :display_as  => "Scout State"
+
+  output :id,
+         :description => "The unique running ID of the autonomous agent",
+         :type        => "string",
+         :display_as  => "ID"
+
+  output :name,
+         :description => "The name of the autonomous agent",
+         :type        => "string",
+         :display_as  => "Name"
+
+  output :path,
+         :description => "The location on disk where the autonomous agent is stored",
+         :type        => "string",
+         :display_as  => "Path"
+
+  output :scout,
+         :description => "True when this autonomous agent represents a Choria Scout Check",
+         :type        => "boolean",
+         :display_as  => "Scout Check"
+
+  output :start_time,
+         :description => "The time the autonomous agent was started in unix seconds",
+         :type        => "string",
+         :display_as  => "Started"
+
+  output :state,
+         :description => "The current state the agent is in",
+         :type        => "string",
+         :display_as  => "State"
+
+  output :version,
+         :description => "The version of the autonomous agent",
+         :type        => "string",
+         :display_as  => "Version"
+
+  summarize do
+    aggregate summary(:state)
+    aggregate summary(:name)
+    aggregate summary(:version)
+  end
 end
 
 action "machine_states", :description => "States of the hosted Choria Autonomous Agents" do
   display :always
 
-  output :machine_names,
-         :description => "List of running machine names",
-         :display_as => "Machine Names"
+
 
   output :machine_ids,
          :description => "List of running machine IDs",
-         :display_as => "Machine IDs"
+         :display_as  => "Machine IDs"
+
+  output :machine_names,
+         :description => "List of running machine names",
+         :display_as  => "Machine Names"
 
   output :states,
          :description => "Hash map of machine statusses indexed by machine ID",
-         :display_as => "Machine States"
+         :display_as  => "Machine States"
 
   summarize do
     aggregate summary(:machine_names)
   end
 end
 
-action "info", :description => "Choria related information from the running Daemon and Middleware" do
-  output :security,
-         :description => "Security Provider plugin",
-         :display_as => "Security Provider"
-
-  output :secure_protocol,
-         :description => "If the protocol is running with PKI security enabled",
-         :display_as => "Protocol Secure"
-
-  output :connector,
-         :description => "Connector plugin",
-         :display_as => "Connector"
+action "machine_transition", :description => "Attempts to force a transition in a hosted Choria Autonomous Agent" do
+  display :failed
 
-  output :connector_tls,
-         :description => "If the connector is running with TLS security enabled",
-         :display_as => "Connector TLS"
+  input :instance,
+        :prompt      => "Instance ID",
+        :description => "Machine Instance ID",
+        :type        => :string,
+        :validation  => '^.+-.+-.+-.+-.+$',
+        :maxlength   => 36,
+        :optional    => true
 
-  output :path,
-         :description => "Active OS PATH",
-         :display_as => "Path"
 
-  output :choria_version,
-         :description => "Choria version",
-         :display_as => "Choria Version"
+  input :name,
+        :prompt      => "Name",
+        :description => "Machine Name",
+        :type        => :string,
+        :validation  => '^[a-zA-Z][a-zA-Z0-9_-]+',
+        :maxlength   => 128,
+        :optional    => true
 
-  output :client_version,
-         :description => "Middleware client library version",
-         :display_as => "Middleware Client Library Version"
 
-  output :client_flavour,
-         :description => "Middleware client gem flavour",
-         :display_as => "Middleware Client Flavour"
+  input :path,
+        :prompt      => "Path",
+        :description => "Machine Path",
+        :type        => :string,
+        :validation  => '.+',
+        :maxlength   => 512,
+        :optional    => true
 
-  output :client_options,
-         :description => "Active Middleware client gem options",
-         :display_as => "Middleware Client Options"
 
-  output :connected_server,
-         :description => "Connected middleware server",
-         :display_as => "Connected Broker"
+  input :transition,
+        :prompt      => "Transition Name",
+        :description => "The transition event to send to the machine",
+        :type        => :string,
+        :validation  => '^[a-zA-Z][a-zA-Z0-9_-]+$',
+        :maxlength   => 128,
+        :optional    => false
 
-  output :client_stats,
-         :description => "Middleware client gem statistics",
-         :display_as => "Middleware Client Stats"
 
-  output :facter_domain,
-         :description => "Facter domain",
-         :display_as => "Facter Domain"
+  input :version,
+        :prompt      => "Version",
+        :description => "Machine Version",
+        :type        => :string,
+        :validation  => '^\d+\.\d+\.\d+$',
+        :maxlength   => 20,
+        :optional    => true
 
-  output :facter_command,
-         :description => "Command used for Facter",
-         :display_as => "Facter"
 
-  output :srv_domain,
-         :description => "Configured SRV domain",
-         :display_as => "SRV Domain"
 
-  output :using_srv,
-         :description => "Indicates if SRV records are considered",
-         :display_as => "SRV Used"
 
-  output :middleware_servers,
-         :description => "Middleware Servers configured or discovered",
-         :display_as => "Middleware"
+  output :success,
+         :description => "Indicates if the transition was successfully accepted",
+         :display_as  => "Accepted"
 
-  summarize do
-    aggregate summary(:choria_version)
-    aggregate summary(:client_version)
-    aggregate summary(:client_flavour)
-    aggregate summary(:connected_server)
-    aggregate summary(:srv_domain)
-    aggregate summary(:using_srv)
-    aggregate summary(:secure_protocol)
-    aggregate summary(:connector_tls)
-  end
 end
+

data/lib/mcollective/agent/choria_util.json

@@ -149,6 +149,106 @@
         }
       ]
     },
+    {
+      "action": "machine_state",
+      "description": "Retrieves the current state of a specific Choria Autonomous Agent",
+      "display": "ok",
+      "input": {
+        "instance": {
+          "prompt": "Instance ID",
+          "description": "Machine Instance ID",
+          "type": "string",
+          "default": null,
+          "optional": true,
+          "validation": "^.+-.+-.+-.+-.+$",
+          "maxlength": 36
+        },
+        "name": {
+          "prompt": "Name",
+          "description": "Machine Name",
+          "type": "string",
+          "default": null,
+          "optional": true,
+          "validation": "^[a-zA-Z][a-zA-Z0-9_-]+",
+          "maxlength": 128
+        },
+        "path": {
+          "prompt": "Path",
+          "description": "Machine Path",
+          "type": "string",
+          "default": null,
+          "optional": true,
+          "validation": ".+",
+          "maxlength": 512
+        }
+      },
+      "aggregate": [
+        {
+          "function": "summary",
+          "args": [
+            "state"
+          ]
+        },
+        {
+          "function": "summary",
+          "args": [
+            "name"
+          ]
+        },
+        {
+          "function": "summary",
+          "args": [
+            "version"
+          ]
+        }
+      ],
+      "output": {
+        "name": {
+          "type": "string",
+          "description": "The name of the autonomous agent",
+          "display_as": "Name"
+        },
+        "version": {
+          "type": "string",
+          "description": "The version of the autonomous agent",
+          "display_as": "Version"
+        },
+        "state": {
+          "type": "string",
+          "description": "The current state the agent is in",
+          "display_as": "State"
+        },
+        "path": {
+          "type": "string",
+          "description": "The location on disk where the autonomous agent is stored",
+          "display_as": "Path"
+        },
+        "id": {
+          "type": "string",
+          "description": "The unique running ID of the autonomous agent",
+          "display_as": "ID"
+        },
+        "start_time": {
+          "type": "string",
+          "description": "The time the autonomous agent was started in unix seconds",
+          "display_as": "Started"
+        },
+        "available_transitions": {
+          "type": "array",
+          "description": "The list of available transitions this autonomous agent can make",
+          "display_as": "Available Transitions"
+        },
+        "scout": {
+          "type": "boolean",
+          "description": "True when this autonomous agent represents a Choria Scout Check",
+          "display_as": "Scout Check"
+        },
+        "current_state": {
+          "description": "The Choria Scout specific state for Scout checks",
+          "display_as": "Scout State"
+        }
+      }
+    },
     {
       "action": "machine_states",
       "input": {
@@ -241,4 +341,4 @@
       "description": "Attempts to force a transition in a hosted Choria Autonomous Agent"
     }
   ]
-}
+}