Team 02 - Pull Request - PM1

.gitignore

@@ -1,3 +1,84 @@
+<<<<<<< HEAD
+=======
+*.aux
+*.bbl
+*.blg
+*.idx
+*.ilg
+*.ind
+*.log
+*.out
+.DS_Store
+doc/report/project-report.pdf
+*.tps
+Thumbs.db
+
+# Created by https://www.gitignore.io/api/git,java,eclipse,java-web
+
+### Eclipse ###
+
+.metadata
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+.recommenders
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# PyDev specific (Python IDE for Eclipse)
+*.pydevproject
+
+# CDT-specific (C/C++ Development Tooling)
+.cproject
+
+# Java annotation processor (APT)
+.factorypath
+
+# PDT-specific (PHP Development Tools)
+.buildpath
+
+# sbteclipse plugin
+.target
+
+# Tern plugin
+.tern-project
+
+# TeXlipse plugin
+.texlipse
+
+# STS (Spring Tool Suite)
+.springBeans
+
+# Code Recommenders
+.recommenders/
+
+# Scala IDE specific (Scala & Java development for Eclipse)
+.cache-main
+.scala_dependencies
+.worksheet
+
+### Eclipse Patch ###
+# Eclipse Core		
+.project
+
+# JDT-specific (Eclipse Java Development Tools)		
+.classpath
+
+### Git ###
+*.orig
+
+### Java ###
+>>>>>>> 4e0bdfc52ad037ddb4cf5b2f40693627e3bd7390
 # Compiled class file
 *.class
 
@@ -11,7 +92,11 @@
 .mtj.tmp/
 
 # Package Files #
+<<<<<<< HEAD
 *.jar
+=======
+#*.jar
+>>>>>>> 4e0bdfc52ad037ddb4cf5b2f40693627e3bd7390
 *.war
 *.ear
 *.zip
@@ -20,3 +105,15 @@
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
+<<<<<<< HEAD
+=======
+
+### Java-Web ###
+## ignoring target file
+target/
+
+# Report generated files #
+*.synctex.gz
+
+# End of https://www.gitignore.io/api/git,java,eclipse,java-web
+>>>>>>> 4e0bdfc52ad037ddb4cf5b2f40693627e3bd7390

README.md

@@ -1,2 +1,28 @@
+<<<<<<< HEAD
 # streamalert-ws
 StreamAlert as a web service (REST and SOAP) with some test integrations and deployments
+=======
+# README #
+
+## General structure ##
+
+* `doc/team2/pm1/README.md` outlines how to set up and run each part of PM1.
+* Under `src` we have all the client and service related classes and generated files, as well as general utility classes.
+* Under `config` we have the StreamAlert configuration files that have been created/modified.
+    * `/config/streamalert/conf/clusters` contains the clusters we have defined for deployment.
+	* `/config/streamalert/conf` contains files specifying the source buckets, logs, outputs, etc.
+	* `/config/streamalert/rules` contains the rules we have created.
+	* `/config/streamalert/tests` contains the test scripts we made that send test data to the rules we made.
+
+## Documentation ##
+
+* We are building our report document using Wikis. Please visit the [Wiki Home](https://bitbucket.org/soen487-w18-02/soen487-w18-team02/wiki/Home) page.
+
+## Downloads ##
+
+* For a preconfigured setup of StreamAlert, please visit the `Downloads` tab and download the [pm1_streamalert.zip](https://bitbucket.org/soen487-w18-02/soen487-w18-team02/downloads/pm1_streamalert.zip).
+
+### Who do I talk to? ###
+
+* [Alex Genio - Team Leader](mailto:[email protected])
+>>>>>>> 4e0bdfc52ad037ddb4cf5b2f40693627e3bd7390

config/streamalert/conf/clusters/prod.json

@@ -0,0 +1,45 @@
+{
+  "id": "soen487-s3",
+  "modules": {
+    "cloudtrail": {
+      "enable_kinesis": false,
+      "enable_logging": false
+    },
+    "cloudwatch_monitoring": {
+      "enabled": true,
+      "kinesis_alarms_enabled": false
+    },
+    "s3_events": [
+      {
+        "bucket_id": "soen487g2.s3.streamalert.cloudtrail",
+        "enable_events": true
+      },
+      {
+        "bucket_id": "soen487g2.s3.streamalert.soap",
+        "enable_events": true
+      }
+    ],
+    "stream_alert": {
+      "alert_processor": {
+        "current_version": 5,
+        "log_level": "info",
+        "memory": 128,
+        "outputs": {
+          "aws-lambda": [],
+          "aws-s3": [],
+          "slack": [
+            "pm1-notifications"
+          ]
+        },
+        "timeout": 25
+      },
+      "rule_processor": {
+        "current_version": 6,
+        "log_level": "debug",
+        "memory": 256,
+        "timeout": 10
+      }
+    }
+  },
+  "region": "us-east-1"
+}

config/streamalert/conf/global.json

@@ -0,0 +1,18 @@
+{
+  "account": {
+    "aws_account_id": "561020731041",
+    "kms_key_alias": "stream_alert_secrets_miq",
+    "prefix": "soen487g2",
+    "region": "us-east-1"
+  },
+  "infrastructure": {
+    "monitoring": {
+      "create_sns_topic": true
+    }
+  },
+  "terraform": {
+    "tfstate_bucket": "soen487g2.streamalert.terraform.state",
+    "tfstate_s3_key": "stream_alert_state/terraform.tfstate",
+    "tfvars": "terraform.tfvars"
+  }
+}

config/streamalert/conf/lambda.json

@@ -0,0 +1,25 @@
+{
+  "alert_processor_config": {
+    "handler": "stream_alert.alert_processor.main.handler",
+    "source_bucket": "soen487g2.streamalert.source",
+    "source_current_hash": "ry0SlICLxzPE4jRlm8oYr2QfycwVS0kSOAGbeCBbVKU=",
+    "source_object_key": "alert_processor/alert_processor_1.6.0_20180221_T062045.zip",
+    "third_party_libraries": []
+  },
+  "rule_processor_config": {
+    "handler": "stream_alert.rule_processor.main.handler",
+    "source_bucket": "soen487g2.streamalert.source",
+    "source_current_hash": "IIbkLXfGNnYdE0Or6KKJHAroUJM0D6UxZnu+OPVZAKA=",
+    "source_object_key": "rule_processor/rule_processor_1.6.0_20180221_T211052.zip",
+    "third_party_libraries": [
+      "netaddr"
+    ]
+  },
+  "stream_alert_apps_config": {
+    "handler": "app_integrations.main.handler",
+    "source_bucket": "soen487g2.streamalert.source",
+    "source_current_hash": "eTmKyRJofdn6k6bAblKhlwfO3hHBq0vystXpXOFRkFw=",
+    "source_object_key": "stream_alert_app/stream_alert_app_1.0.0_20180221_T062052.zip",
+    "third_party_libraries": []
+  }
+}