Merge f54c395 into 9b19510

README.md

@@ -28,3 +28,9 @@ Project resources
 - [Gitter.im Chat Room](https://gitter.im/Netflix/security_monkey)
 - [CloudAux](https://github.com/Netflix-Skunkworks/cloudaux)
 - [PolicyUniverse](https://github.com/Netflix-Skunkworks/policyuniverse)
+
+
+Instance Diagram
+---------------
+The components that make up Security Monkey are as follows (not AWS specific):
+![diagram](docs/images/sm_instance_diagram.png)

docs/autostarting.md

@@ -6,7 +6,7 @@ This document outlines how to configure Security Monkey to:
 1. Automatically run the API
 1. Automatically scan for changes in your environment.
 
-Each section is important, please read them thoroughly. 
+Each section is important, please read them thoroughly.
 
 Celery and The Supervisor
 ------------
@@ -38,6 +38,9 @@ to make an image of your instance/container and clone new ones to provide the se
 For AWS, you can make an AMI off of your Security Monkey instance, and even create separate launch
 configurations and auto-scaling groups.
 
+Below is a diagram of the components required by Security Monkey (these are not AWS specific):
+![diagram](images/sm_instance_diagram.png)
+
 Autostarting the API and UI
 --------------------
 

docs/quickstart.md

@@ -8,6 +8,12 @@ but then "reaches into" other accounts to describe and collect details.
 
 More details on this is outlined in the IAM section below for each respective infrastructure.
 
+Below is a diagram of the instance layout:
+![diagram](images/sm_instance_diagram.png)
+
+And for IAM:
+(TODO ADD HERE)
+
 Setup on AWS, GCP, or OpenStack
 -------------------------------
 

security_monkey/watchers/github/repo.py

@@ -52,7 +52,7 @@ def __init__(self, accounts=None, debug=False):
             "forks_count",
             "open_issues",
             "open_issues_count",
-            "webhooks$*$last_response"
+            "webhooks$*last_response"
         ]
         self.batched_size = 20
         self.done_slurping = False

security_monkey/watchers/iam/iam_user.py

@@ -14,9 +14,9 @@ def __init__(self, *args, **kwargs):
         self.honor_ephemerals = True
         self.ephemeral_paths = [
             "PasswordLastUsed",
-            "AccessKeys$*$LastUsedDate",
-            "AccessKeys$*$Region",
-            "AccessKeys$*$ServiceName",
+            "AccessKeys$*LastUsedDate",
+            "AccessKeys$*Region",
+            "AccessKeys$*ServiceName",
             "_version"]
         self.override_region = 'universal'
 

security_monkey/watchers/sqs.py

@@ -37,10 +37,10 @@ def __init__(self, **kwargs):
         self.honor_ephemerals = True
         self.ephemeral_paths = [
             '_version',
-            'Attributes$*$LastModifiedTimestamp',
-            'Attributes$*$ApproximateNumberOfMessagesNotVisible',
-            'Attributes$*$ApproximateNumberOfMessages',
-            'Attributes$*$ApproximateNumberOfMessagesDelayed'
+            'Attributes$LastModifiedTimestamp',
+            'Attributes$ApproximateNumberOfMessagesNotVisible',
+            'Attributes$ApproximateNumberOfMessages',
+            'Attributes$ApproximateNumberOfMessagesDelayed'
         ]
         self.batched_size = 200
 

security_monkey/watchers/vpc/vpn.py

@@ -32,7 +32,7 @@ class VPN(Watcher):
 
     def __init__(self, accounts=None, debug=False):
         super(VPN, self).__init__(accounts=accounts, debug=debug)
-        self.ephemeral_paths = ['tunnels$*$last_status_change']
+        self.ephemeral_paths = ['tunnels$*last_status_change']
 
     @record_exception()
     def describe_vpns(self, **kwargs):