Skip to content

Merges release-3-0-0 into release-3-1-0#1136

Merged
Ryxias merged 16 commits into
release-3-1-0from
dw--merge-300-into-310
Feb 19, 2020
Merged

Merges release-3-0-0 into release-3-1-0#1136
Ryxias merged 16 commits into
release-3-1-0from
dw--merge-300-into-310

Conversation

@Ryxias

@Ryxias Ryxias commented Feb 19, 2020

Copy link
Copy Markdown
Collaborator

to: @ryandeivert @jack1902
cc: @airbnb/streamalert-maintainers

Merges release-3-0-0 intorelease-3-1-0, bringing in all changes.

A rebase is cleaner, but will not work without a force push. This is the easiest way of doing it

jack1902 and others added 16 commits January 9, 2020 21:19
* Updated terraform version and git branch

Signed-off-by: jack1902 <39212456+jack1902@users.noreply.github.com>

* removed step no longer required, as the choices are dynamically created based on the @StreamAlertOutput class decorator

Signed-off-by: jack1902 <39212456+jack1902@users.noreply.github.com>

* reset to stable and changed note

Signed-off-by: jack1902 <39212456+jack1902@users.noreply.github.com>
#1081)

Signed-off-by: jack1902 <39212456+jack1902@users.noreply.github.com>
…tring (#1085)

see issue: #1084 for more information

Signed-off-by: jack1902 <39212456+jack1902@users.noreply.github.com>
[testing] Added trendmicro schema and rule test
Signed-off-by: jack1902 <39212456+jack1902@users.noreply.github.com>
[testing] fixed test for rules_engine assertion

Signed-off-by: jack1902 <39212456+jack1902@users.noreply.github.com>
This in-turn re-introduced #1047. I fixed this by ensuring that the
cleanup function removes the metric_filters.tf.json file, otherwise
terraform reads this in as part of its deployment.

Signed-off-by: jack1902 <39212456+jack1902@users.noreply.github.com>
Signed-off-by: jack1902 <39212456+jack1902@users.noreply.github.com>
Signed-off-by: jack1902 <39212456+jack1902@users.noreply.github.com>
Updated the optional_top_level_keys for cloudtrail:events

Signed-off-by: jack1902 <39212456+jack1902@users.noreply.github.com>
Signed-off-by: jack1902 <39212456+jack1902@users.noreply.github.com>
…eriods from bucket names (#1114)

* updating secrets bucket name to remove periods

* updating s3-logging bucket name to remove periods

* updating athena-results bucket name to remove periods

* updating streamalerts bucket name to remove periods

* updating terraform-state bucket name to remove periods

* updating streamalert-data bucket name to remove periods

* fixing misc places that were missed regarding periods in bucket names

* making data and alerts bucket names configurable

* restructuring docs to allow for highlighting global settings

* doc updates for alerts_table config

* updating documentation, round 1

* moving clusters and global docs to new file

* trailing space removal

* Update to commands for consistency

* misc formatting fixes, migrating rule-staging config to global

* updating cluster config docs

* massive updates to docs

* adding other changes related to doc updates and config changes

* adding prefix validation for periods

* removing prefix setting trash

* updates to remove need for setting terraform config

* removing nonsense for athena bucket configuration

* addressing PR comments

* removing kinesis region setting since it would break things

* addressing chunyong PR feedback

* adding new streamalert images and updating doc references

@ryandeivert ryandeivert left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

STRAMPARMPARMPA

@Ryxias Ryxias merged commit 3f1bfaf into release-3-1-0 Feb 19, 2020
@coveralls

Copy link
Copy Markdown

Coverage Status

Coverage decreased (-0.02%) to 96.178% when pulling 35980ca on dw--merge-300-into-310 into e500e1d on release-3-1-0.

@Ryxias Ryxias deleted the dw--merge-300-into-310 branch February 19, 2020 22:07
@Ryxias Ryxias restored the dw--merge-300-into-310 branch February 19, 2020 22:09
@Ryxias Ryxias deleted the dw--merge-300-into-310 branch February 19, 2020 22:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants