Merge pull request #56 from ModusCreateOrg/more-docs

Add gauntlt to readme. Also fixes #38

Author: obscurerichard

README.md

@@ -56,7 +56,7 @@ You will need to create an application in the Google developer console, create a
 
 ### Packer
 
-Run `packer/bin/pack.sh` to initiate a Packer run. This will provision a machine on EC2, configure it using Ansible, and scan it using OpenSCAP. The results from the scan will end up in `packer/build`.
+Run `packer/bin/pack.sh` to initiate a Packer run. This will provision a machine on EC2, configure it using Ansible, and scan it using [OpenSCAP](https://www.open-scap.org/) and [Gauntlt](http://gauntlt.org/). The results from the scan will end up in `packer/build`.
 
 Optionally, you can use Vagrant to test ansible playbooks locally and Jenkins to orchestrate creation of AMIs in conjunction with GitHub branches and pull requests.
 
@@ -136,6 +136,8 @@ The scripts here assume that Jenkins is running on EC2 and uses instance data fr
 
 This script relies on Jenkins having a secret file containing the Google application credentials in JSON with the id `terraform-demo.json`. You will need to add that to your Jenkins server's credentials.
 
+After a sucessful build, Jenkins will archive the artifacts from the OpenSCAP and Gauntlt scans (if a Packer run has completed) and JMeter (if a JMeter run has completed).
+
 # Modus Create
 
 [Modus Create](https://moduscreate.com) is a digital product consultancy. We use a distributed team of the best talent in the world to offer a full suite of digital product design-build services; ranging from consumer facing apps, to digital migration, to agile development training, and business transformation.

ansible/roles/cloudwatch-agent/README.md

@@ -1,38 +1,44 @@
 Role Name
 =========
 
-A brief description of the role goes here.
+Set up the AWS CloudWatch agent and capture some basic log files.
 
 Requirements
 ------------
 
-Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required.
+A working AWS account. The config file included is suitable for CentOS 7 and an instance running on EC2.
 
 Role Variables
 --------------
 
-A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well.
+N/A
 
 Dependencies
 ------------
 
-A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles.
+This role stands alone and has no dependencies.
 
 Example Playbook
 ----------------
 
-Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too:
+Here is an example playbook:
 
     - hosts: servers
+      become: yes
       roles:
-         - { role: username.rolename, x: 42 }
+        - cloudwatch-agent
 
 License
 -------
 
-BSD
+MIT
 
 Author Information
 ------------------
 
-An optional section for the role authors to include contact information, or a website (HTML is not allowed).
+Copyright © 2019 Modus Create, Inc.
+
+* Madalin Borodi (@MadalinBorodi)
+* Richard Bullington-McGuire (@obscurerichard) <richard@moduscreate.com>
+
+

ansible/roles/cloudwatch-agent/meta/main.yml

@@ -1,7 +1,7 @@
 galaxy_info:
-  author: your name
-  description: your description
-  company: your company (optional)
+  author: Richard Bullington-McGuire (@obscurerichard) <richard@moduscreate.com>
+  description: CloudWatch agent role
+  company: Modus Create, Inc.
 
   # If the issue tracker for your role is not on github, uncomment the
   # next line and provide a value
@@ -14,30 +14,17 @@ galaxy_info:
   # - GPL-3.0-only
   # - Apache-2.0
   # - CC-BY-4.0
-  license: license (GPL-2.0-or-later, MIT, etc)
+  license: MIT
 
   min_ansible_version: 2.4
 
-  # If this a Container Enabled role, provide the minimum Ansible Container version.
-  # min_ansible_container_version:
-
-  #
-  # Provide a list of supported platforms, and for each platform a list of versions.
-  # If you don't wish to enumerate all versions for a particular platform, use 'all'.
-  # To view available platforms and versions (or releases), visit:
-  # https://galaxy.ansible.com/api/v1/platforms/
-  #
-  # platforms:
-  # - name: Fedora
-  #   versions:
-  #   - all
-  #   - 25
-  # - name: SomePlatform
-  #   versions:
-  #   - all
-  #   - 1.0
-  #   - 7
-  #   - 99.99
+  platforms:
+   - name: CentOs
+     versions:
+     - 7
+   - name: RHEL
+     versions:
+     - 7
 
   galaxy_tags: []
     # List tags for your role here, one per line. A tag is a keyword that describes