From 0305e09368aaf2f2e8352d6b3abdc98a0f2dcbe2 Mon Sep 17 00:00:00 2001 From: "R.I.Pienaar" Date: Mon, 27 May 2019 10:15:56 +0200 Subject: [PATCH] (misc) Release 0.15.0 --- CHANGELOG.md | 4 + lib/mcollective/agent/bolt_tasks.ddl | 2 +- lib/mcollective/agent/choria_util.ddl | 2 +- lib/mcollective/agent/choria_util.json | 91 +++++++++++++++++++ lib/mcollective/agent/rpcutil.ddl | 2 +- lib/mcollective/connector/nats.ddl | 2 +- lib/mcollective/data/bolt_task_data.ddl | 2 +- lib/mcollective/discovery/choria.ddl | 2 +- lib/mcollective/util/choria.rb | 2 +- .../validator/bolt_task_name_validator.ddl | 2 +- module/choria/metadata.json | 2 +- module/tasks/metadata.json | 4 +- 12 files changed, 106 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 72fe384..05aac0b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ |Date |Issue |Description | |----------|------|---------------------------------------------------------------------------------------------------------| +|2019/05/27| |Release 0.15.0 | +|2019/05/27| |Release 0.15.0 | +|2019/05/02|585 |Add support for Choria Autonomous Agents | +|2019/03/19|583 |Fix path expansion for token locations with `~` in them | |2019/03/04| |Release 0.14.1 | |2019/03/04| |Require the latest choria-mcorpc-support gem | |2019/03/04| |Release 0.14.0 | diff --git a/lib/mcollective/agent/bolt_tasks.ddl b/lib/mcollective/agent/bolt_tasks.ddl index 9bd5fbf..364db15 100644 --- a/lib/mcollective/agent/bolt_tasks.ddl +++ b/lib/mcollective/agent/bolt_tasks.ddl @@ -2,7 +2,7 @@ metadata :name => "bolt_tasks", :description => "Downloads and runs Puppet Tasks", :author => "R.I.Pienaar ", :license => "Apache-2.0", - :version => "0.14.1", + :version => "0.15.0", :url => "https://choria.io", :timeout => 60 diff --git a/lib/mcollective/agent/choria_util.ddl b/lib/mcollective/agent/choria_util.ddl index 480d01d..2af453b 100644 --- a/lib/mcollective/agent/choria_util.ddl +++ b/lib/mcollective/agent/choria_util.ddl @@ -2,7 +2,7 @@ metadata :name => "choria_util", :description => "Choria Utilities", :author => "R.I.Pienaar ", :license => "Apache-2.0", - :version => "0.14.1", + :version => "0.15.0", :url => "https://choria.io", :timeout => 20 diff --git a/lib/mcollective/agent/choria_util.json b/lib/mcollective/agent/choria_util.json index a6a23e2..665d3a6 100644 --- a/lib/mcollective/agent/choria_util.json +++ b/lib/mcollective/agent/choria_util.json @@ -148,6 +148,97 @@ ] } ] + }, + { + "action": "machine_states", + "input": { + }, + "output": { + "machine_names": { + "description": "List of running machine names", + "display_as": "Machine Names", + "default": null + }, + "machine_ids": { + "description": "List of running machine IDs", + "display_as": "Machine IDs", + "default": null + }, + "states": { + "description": "Hash map of machine statusses indexed by machine ID", + "display_as": "Machine States", + "default": null + } + }, + "display": "always", + "description": "States of the hosted Choria Autonomous Agents", + "aggregate": [ + { + "function": "summary", + "args": [ + "machine_names" + ] + } + ] + }, + { + "action": "machine_transition", + "input": { + "instance": { + "prompt": "Instance ID", + "description": "Machine Instance ID", + "type": "string", + "default": null, + "optional": true, + "validation": "^.+-.+-.+-.+-.+$", + "maxlength": 36 + }, + "version": { + "prompt": "Version", + "description": "Machine Version", + "type": "string", + "default": null, + "optional": true, + "validation": "^\\d+\\.\\d+\\.\\d+$", + "maxlength": 20 + }, + "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 + }, + "transition": { + "prompt": "Transition Name", + "description": "The transition event to send to the machine", + "type": "string", + "default": null, + "optional": false, + "validation": "^[a-zA-Z][a-zA-Z0-9_-]+$", + "maxlength": 128 + } + }, + "output": { + "success": { + "description": "Indicates if the transition was succesfully accepted", + "display_as": "Accepted", + "default": null + } + }, + "display": "failed", + "description": "Attempts to force a transition in a hosted Choria Autonomous Agent" } ] } \ No newline at end of file diff --git a/lib/mcollective/agent/rpcutil.ddl b/lib/mcollective/agent/rpcutil.ddl index 09c5616..e534e95 100644 --- a/lib/mcollective/agent/rpcutil.ddl +++ b/lib/mcollective/agent/rpcutil.ddl @@ -2,7 +2,7 @@ metadata :name => "rpcutil", :description => "General helpful actions that expose stats and internals to SimpleRPC clients", :author => "R.I.Pienaar ", :license => "Apache License, Version 2.0", - :version => "0.14.1", + :version => "0.15.0", :url => "https://docs.puppetlabs.com/mcollective/", :timeout => 10 diff --git a/lib/mcollective/connector/nats.ddl b/lib/mcollective/connector/nats.ddl index c1fb781..0c61007 100644 --- a/lib/mcollective/connector/nats.ddl +++ b/lib/mcollective/connector/nats.ddl @@ -2,7 +2,7 @@ metadata :name => "nats", :description => "Connector plugin for NATS.io middleware", :author => "R.I.Pienaar ", :license => "Apache-2.0", - :version => "0.14.1", + :version => "0.15.0", :url => "https://github.com/choria-io", :timeout => 60 diff --git a/lib/mcollective/data/bolt_task_data.ddl b/lib/mcollective/data/bolt_task_data.ddl index ab74350..ae25cca 100644 --- a/lib/mcollective/data/bolt_task_data.ddl +++ b/lib/mcollective/data/bolt_task_data.ddl @@ -2,7 +2,7 @@ metadata :name => "bolt_task", :description => "Information about past Bolt Task", :author => "R.I.Pienaar ", :license => "Apache-2.0", - :version => "0.14.1", + :version => "0.15.0", :url => "https://choria.io", :timeout => 1 diff --git a/lib/mcollective/discovery/choria.ddl b/lib/mcollective/discovery/choria.ddl index 76fd9e2..f0df2db 100644 --- a/lib/mcollective/discovery/choria.ddl +++ b/lib/mcollective/discovery/choria.ddl @@ -2,7 +2,7 @@ metadata :name => "choria", :description => "PuppetDB based discovery for the Choria plugin suite", :author => "R.I.Pienaar ", :license => "Apache-2.0", - :version => "0.14.1", + :version => "0.15.0", :url => "https://github.com/choria-io", :timeout => 0 diff --git a/lib/mcollective/util/choria.rb b/lib/mcollective/util/choria.rb index bf133c1..5d88c71 100644 --- a/lib/mcollective/util/choria.rb +++ b/lib/mcollective/util/choria.rb @@ -8,7 +8,7 @@ class UserError < StandardError; end class Abort < StandardError; end unless defined?(Choria::VERSION) # rubocop:disable Style/IfUnlessModifier - VERSION = "0.14.1".freeze + VERSION = "0.15.0".freeze end attr_writer :ca diff --git a/lib/mcollective/validator/bolt_task_name_validator.ddl b/lib/mcollective/validator/bolt_task_name_validator.ddl index 6a14ffb..cc66442 100644 --- a/lib/mcollective/validator/bolt_task_name_validator.ddl +++ b/lib/mcollective/validator/bolt_task_name_validator.ddl @@ -2,6 +2,6 @@ metadata :name => "bolt_task_name", :description => "Validates that a string matches Bolt Task Name", :author => "R.I.Pienaar ", :license => "Apache-2.0", - :version => "0.14.1", + :version => "0.15.0", :url => "https://choria.io", :timeout => 1 diff --git a/module/choria/metadata.json b/module/choria/metadata.json index 44be151..4993a6e 100644 --- a/module/choria/metadata.json +++ b/module/choria/metadata.json @@ -1,6 +1,6 @@ { "name": "choria-mcollective_choria", - "version": "0.14.1", + "version": "0.15.0", "author": "R.I.Pienaar ", "summary": "A suite of MCollective Plugins for AIO Puppet", "license": "Apache-2.0", diff --git a/module/tasks/metadata.json b/module/tasks/metadata.json index 9482cd4..46e0254 100644 --- a/module/tasks/metadata.json +++ b/module/tasks/metadata.json @@ -1,6 +1,6 @@ { "name": "choria-mcollective_agent_bolt_tasks", - "version": "0.14.1", + "version": "0.15.0", "author": "R.I.Pienaar ", "summary": "Puppet Tasks integration for Choria", "license": "Apache-2.0", @@ -9,7 +9,7 @@ "issues_url": "https://github.com/choria-io/mcollective-choria/issues", "dependencies": [ { "name": "choria/mcollective","version_requirement":">= 0.9.0 < 2.0.0"}, - { "name": "choria/mcollective_choria","version_requirement":"0.14.1"} + { "name": "choria/mcollective_choria","version_requirement":"0.15.0"} ], "requirements": [ {