Merge branch 'master' of https://github.com/vmware/dod-compliance-and…

…-automation

aria/automation/8.x/inspec/vmware-vra-8x-stig-baseline/README.md

@@ -41,32 +41,32 @@ Example folder structure:
 
 It is recommended to utilize an inputs file for specifying environment specific variables such as NTP, Syslog, etc. An example is provided for you to begin with.  
 
-Run all profiles against a target vRA appliance and output results to CLI
+### Run all profiles against a target vRA appliance and output results to CLI
 ```
 inspec exec C:\Inspec\Profiles\vmware-stig-baseline\vmware-vra-8x-stig-baseline -t ssh://root@vra IP or FQDN --password 'password'
 ```
 
-Or if currently in the base directory ('vmware-vra-8x-stig-baseline')
+### Or if currently in the base directory ('vmware-vra-8x-stig-baseline')
 ```
 inspec exec . -t ssh://root@vra IP or FQDN --password 'password'
 ```
-
-Run all profiles against a target vRA appliance with needed inputs and output results to CLI
+### Run all profiles against a target vRA appliance with needed inputs and output results to CLI
 ```
 inspec exec C:\Inspec\Profiles\vmware-stig-baseline\vmware-vra-8x-stig-baseline -t ssh://root@vra IP or FQDN --password 'password' --input [nputname]=[inputvalue] [inputname]=[inputvalue]
 ```
-
-Run all profiles against a target vRA, show progress, and output results to CLI and JSON
+### Run all profiles against a target appliance with example inputs, show progress, and output results to CLI and JSON
+```
+inspec exec . -t ssh://root@IP or FQDN --password 'password' --input-file=inputs-example.yml --show-progress --reporter=cli json:path\to\report\report.json
+```
+### Run all profiles against a target vRA, show progress, and output results to CLI and JSON
 ```
 inspec exec C:\Inspec\Profiles\vmware-stig-baseline\vmware-vra-8x-stig-baseline -t ssh://root@vra IP or FQDN --password 'password' --show-progress --reporter=cli json:C:\Inspec\Reports\vra.json
 ```
-
-Run a specific profile (Docker in this case, using a Regex) against a target vRA appliance, show progress, and output results to CLI and JSON using the wrapper profile
+### Run a specific profile (Docker in this case, using a Regex) against a target vRA appliance, show progress, and output results to CLI and JSON using the wrapper profile
 ```
 inspec exec C:\Inspec\Profiles\vmware-stig-baseline\vmware-vra-8x-stig-baseline -t ssh://root@vra IP or FQDN --password 'password' --show-progress --reporter=cli json:C:\Inspec\Reports\vra.json --controls=/DKER/
 ```
-
-Run a single STIG Control against a target vRA appliance from a specific profile
+### Run a single STIG Control against a target vRA appliance from a specific profile
 ```
 inspec exec C:\Inspec\Profiles\vmware-stig-baseline\vmware-vra-8x-stig-baseline -t ssh://root@vra IP or FQDN --password 'password' --controls=VRAA-8X-000008
 ```

aria/automation/8.x/inspec/vmware-vra-8x-stig-baseline/inputs-example.yml

@@ -0,0 +1,22 @@
+# VMware Aria Automation - Application
+syslogHost: "log.test.local"
+syslogPort: "514"
+syslogProtocol: "tcp"
+syslogSslVerify: "true"
+syslogUseSsl: "false"
+ntpServers: "['time.google.com']"
+maxAuthTries: "2"
+verbose: True
+allowedCipherSuites: ["TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384","TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256","TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384","TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256"]
+
+# VMware Aria Automation - Kubernetes
+manifests_path: '/etc/kubernetes/manifests'
+pki_path: '/etc/kubernetes/pki'
+kubeadm_conf_path: '/etc/systemd/system/kubelet.service.d/10-kubeadm.conf'
+kubectl_path: '/usr/local/bin/kubectl'
+kubectl_minversion: 'v1.12.9'
+kubernetes_conf_files: ["/etc/kubernetes/admin.conf","/etc/kubernetes/scheduler.conf","/etc/kubernetes/controller-manager.conf"]
+kubectl_conf_path: '/etc/kubernetes/admin.conf'
+kubelet_conf_path: '/var/lib/kubelet/config.yaml'
+kubelet_kubeconf_path: ''
+k8s_min_supported_version: 'v1.20.13'