-
Notifications
You must be signed in to change notification settings - Fork 4
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Team 02 - Pull Request - PM1 #1
Open
RyanHotton
wants to merge
73
commits into
NAG-DevOps:master
Choose a base branch
from
RyanHotton:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
73 commits
Select commit
Hold shift + click to select a range
c7507bf
Bootstrap mater template.
smokhov 8d86ff1
Sync bib.
smokhov c4f2bea
Sync bib fix.
smokhov 2e1aeee
updated gitignore
miqdadamirali 4dc1cbb
pm1 branch with pm1 folder
miqdadamirali 06ec047
added structure and project
miqdadamirali 6dc0744
Merge branch 'pm1' of https://bitbucket.org/soen487-w18-02/soen487-w1…
miqdadamirali cfa7647
created main
miqdadamirali 3bc0458
testing git commit
RyanHotton 86283ac
Created package structure for exercise 1 and put in a main.
AlexGenio 6f2d913
Implemented initial setup for the XML parsing.
AlexGenio e4b9dfb
Implemented inline comments made in PR.
AlexGenio a844100
Implemented inline comments made in PR (cont'd).
AlexGenio e15e269
Merged in pm1-setup (pull request #1)
c78461c
updated teh set up to include the interface and sub classes
miqdadamirali 4d80888
Merged in pm1-set-up-interface (pull request #2)
4d66dbb
worked on xpath
RyanHotton 6508c45
fixing merge issue
RyanHotton 5499ada
Implemented the SAX parser class to be used with or without a search …
AlexGenio b04f60e
added xpath parsing and adjusted class structure a bit
RyanHotton f409074
Moved calling SAX parser from RSS parser to MARFCATIN parser to avoid…
AlexGenio a0df8eb
removed redundancy, as requested
RyanHotton bf6177e
removed main from xpath parser
RyanHotton 4eb4b4b
non recursive dom parser that prints out nodes as well as attribute-v…
SophiaK4 c520a0b
Merged in pm1-xpath (pull request #4)
8e1676f
Resolving conflicts.
AlexGenio 98d1789
Merged in pm1-sax-parser (pull request #3)
cde05ec
Renamed the sax parser and updated the WSDL file link.
AlexGenio 465936f
minor clean ups
miqdadamirali d5d659c
fixed indentation
miqdadamirali 96ca0c3
Merged in minor-cleans (pull request #5)
5113adf
Added parser type enum and refactoring. Reduced the amount of parser …
AlexGenio da3f311
Resolving conflicts with dom parser merge.
AlexGenio ce93626
Merged in pm1-dom-parser (pull request #8)
AlexGenio d85012e
Merged Sophia's DOM parser code with my enum and refactoring modifica…
AlexGenio 208d5bf
Created an abstract parser class to remove redundant instances of log…
AlexGenio 96c058b
Fixed things that Miq commented on in the PR.
AlexGenio 48dc7a5
Added command line parsing. The way we process our command line needs…
AlexGenio 9b0103d
Merged in pm1-enums (pull request #9)
580336e
Created README for part1
georgegrafos 85917a1
updated README with references
RyanHotton cc556c1
Merged in pm1-readme (pull request #10)
5874e06
Consistency with DOM parser. Added semicolon to printout of elements.
AlexGenio 35763f9
made aprt one into a dynamic web project
miqdadamirali 804e774
Restructured repository and updated the README to contain detailed in…
AlexGenio 8976b1e
Updated README and gitignore.
AlexGenio bc47c3a
Created streamalert service wrapper that takes in data in kay-value f…
AlexGenio 2c4c2f6
Renamed project.
AlexGenio ad16151
Updated ReadMe for PM1 part 3 service creation.
a1a04ec
Made adjustments to the Part 3 of the readme. Forgot to mention chang…
0e5c0cb
Added dependency on preconfigured setup documentation
dc8363c
Updated xml parser to adhere to streamalert format. Generated client …
SophiaK4 f4418dc
Edited main README to explain our structure.
ef5ca44
Added the streamalert configs that were either added or modified duri…
AlexGenio ad3a9fa
Added description of the streamalert config files.
bbaded1
update read me with soph's changes
miqdadamirali 73cd7c9
update read me
miqdadamirali e612ed9
typos in read me
miqdadamirali 6d2e8bc
typos in read me
miqdadamirali bd3fb7d
Merged in update-read-me (pull request #13)
9e6f5db
README.md added notes that I forgot to mention before.
6e2e762
README.md fixed notes styling
6b711e6
README.md updated according to Miq's comments on my last commit.
a972bd3
README.md edited online with Bitbucket
15c8f41
Merged in miqdadamirali/readmemd-edited-online-with-bitbucket-1519590…
9919b46
README.md edited online with Bitbucket
f22c1cc
Merged in miqdadamirali/readmemd-edited-online-with-bitbucket-1519591…
ba5cdd3
Cleaned up a bit.
AlexGenio 313975d
Merged in pm1-streamalert-client (pull request #14)
3fd1cb0
README.md added notes in part 2 to explain what to do to run part 2 s…
4e0bdfc
README.md fixed typos and added section in the notes that mentions no…
46ca42e
Merge branch 'pm1' of bitbucket.org:soen487-w18-02/soen487-w18-team02
RyanHotton ba2e681
Fix conflicts
smokhov File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,24 @@ | ||
# streamalert-ws | ||
StreamAlert as a web service (REST and SOAP) with some test integrations and deployments | ||
|
||
## 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]) |
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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": [] | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will be fixed
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@smokhov just to clarify, you want us to now update the pull request with PM2.3 content instead of just PM1 content?
Thank you for your time.