Merge pull request Netflix#286 from robfletcher/master

Prevent bad reads from Edda marking ELBs as failing cross-zone balancing

Merge pull request Netflix#272 from ebukoski/master

Changes for Netflix environment compatibility

Merge pull request Netflix#261 from tmack8001/content-type

updating Resources to have application/json content-type

Merge pull request Netflix#261 from tmack8001/content-type

updating Resources to have application/json content-type

Release of 2.5.0

- 4513deb: Merge pull request Netflix#235 from ebukoski/master
- 346528c: Update tests for AWS 17 character instance IDs, volume IDs, and snapshot IDs
- 6347c9c: Merge pull request Netflix#233 from Ten48BASE/master
- 450fc0a: Adding AWS region detection.
- 6c6adff: Merge pull request Netflix#232 from Ten48BASE/master
- 4aefd5f: Fixing error in building of the termination reason string.
- 298d455: Merge pull request Netflix#231 from rmurphy-stelligent/ses-proxy-support
- 6691c5c: Added the awsClientConfig to the SES instantiation to ensure proxy configurations are used
- df95a7a: Added some tests to verify proxy configurations
- ac11698: Corrected a miss-spelling of a clas property
- 0617247: Merge pull request Netflix#230 from ebukoski/master
- e604bc6: Merge pull request Netflix#228 from jeffggardner/master
- 84c5e13: Fixed typo in class name and changed double comparison
- e6f3b8c: Fixed typo in class name and changed double comparison
- da5fe71: Fixed typo in class name and changed double comparison
- d340ebc: Add a prepareToRun() method to Janitor Monkey so that the internal resource lists can be reset between Monkey runs.
- b6aab93: Added the ability to fine-tune the probability on a per-ASG basis.
- 6feadee: adding OSSMETADATA for NetflixOSS tracking
- 50ec002: Merge pull request Netflix#227 from ebukoski/master
- f8c743e: NoGeneratedAMIRule: Add a property to override owner email
- 2469f40: Merge pull request Netflix#226 from ebukoski/master
- 11cfa2e: Render a simple HTML response for opting in/out of Janitor resources when using the HTTP GET interface
- 8848082: Merge pull request Netflix#225 from ebukoski/master
- aa7f32c: Fix parenthesis in wrong place
- 86e0ce4: Merge pull request Netflix#224 from ebukoski/master
- 7ccc312: BasicCalendar: isMonkeyTime=false should execute normal MonkeyCalendar logic.
- 2b16f66: Merge pull request Netflix#223 from ebukoski/master
- dde65ef: BasicJanitorMonkey: add servo metrics for monkeyErrors and monkeyRunning.  Add try-catch in janitor loop so one janitor failure doesn't stop the whole monkey run.  AbstractJanitor: add checkedResourcesCount as a servo metric.  Fix wrong resource passed into addFieldsandTagsToEvent() method.
- 1f0ed65: Add URL target to allow adding events with a GET call
- 1e5de1c: MonkeyCalendar: new constructor and better logging.  Add a constructor to pass in configuration along with open/close/timezone.  More logging in isMonkeyTime so it clearer why Monkey is taking time off.
- cd68af3: Merge pull request Netflix#222 from ebukoski/master
- 706e443: Janitor Monkey recorder changes: add additional resource fields and resource tags to Janitor Monkey cleaning events.  Change processing order to generate event after cleanup instead of before.
- 13705cb: Merge pull request Netflix#220 from ebukoski/master
- e93a6a6: EddaInstanceJanitorCrawler: breakup edda queries for image ids into batches to avoid hitting query string limits
- 95a8803: Merge pull request Netflix#218 from ebukoski/master
- cce0ed0: Change janitor metrics from counter to gauge.  Use resource arrays to track marks, cleans, etc. instead of using separate counter
- 1cb9805: Merge pull request Netflix#217 from dx-pbuckley/dev-minor-comment-nitpick
- ab954a2: since will number -> since should be number
- 01d745b: Merge pull request Netflix#216 from ebukoski/master
- e0ac212: Return long instead of AtomicLong
- 0cca531: Janitor getters for metrics should be public
- 4a7b70b: Merge pull request Netflix#215 from ebukoski/master
- 992a449: Add Servo dependency.  Add JMX/Servo metrics monitoring for monkey runs, marked resources, unmarked resources, cleaned resources, and failed to clean resources.
- c211731: Merge pull request Netflix#213 from dx-pbuckley/dev-get-janitor-route
- 257dbe2: add GET route v1/api/janitor for ELB healthcheck
- 09cb41e: Merge pull request Netflix#212 from dx-pbuckley/dev-key-owner
- e0d83f4: replace hardcoded "owner" with property
- ae4ed80: fix publishing error with core jar
- 5426b75: Merge pull request Netflix#211 from ebukoski/master
- 5b97688: Fix NPE with Edda ASG Janitor crawler
- f9d58f3: publish jars
- 580bb6a: Merge pull request Netflix#210 from ebukoski/master
- 47668bc: publish jars also
- 3ece75c: Merge pull request Netflix#208 from ebukoski/master
- 878f6b5: Set gradle version to 2.2.1 for compatibility with Nebula NetflixOSS
- 3beaf91: Merge pull request Netflix#205 from ebukoski/master
- d5bddfd: Merge pull request Netflix#204 from dx-pbuckley/dev-fix-my-bad-double-copyrights
- 55ff083: remove duplicate copyright notices
- 70abc6c: Fix warnings with gradle license plug-in
- 9fa545d: Merge branch 'master' of github.com:ebukoski/SimianArmy
- 3076285: Correct javadoc warnings
- 517c6c9: Merge pull request Netflix#1 from Netflix/master
- 623067f: Merge pull request Netflix#203 from dx-pbuckley/dev-add-missing-headers
- 35066be: these files were missing copyright headers
- 4f22e38: Set retry for SimpleDB. Minor logging change.
- b28ed7a: Fix race condition when running unit tests on Windows. Without this fix, unit tests occassionally fail on Windows.
- bb01310: Default simianarmy.janitor.rule.untaggedRule.enabled = false for safety
- 345ad95: Merge pull request Netflix#195 from koendc/untagged
- 82773f0: Merge pull request Netflix#202 from ebukoski/master
- 22e0577: Override SES client region with an optional property and a SimpleDB fix for dashes in name.
- 7152073: Manual merge PR Netflix#191.
- 1146b19: Merge pull request Netflix#201 from adm-github/email_regex_fix
- 3d2974e: Added testing for isValidEmail
- bffa7a4: Email regex fix
- a788e71: Merge pull request Netflix#185 from gnethercutt/opsworks_parentage
- 82cb011: Fix compile error after merge PR Netflix#174
- 13eb82b: Manual merge of PR Netflix#174 Closes Netflix#174
- 6e1c739: Merge pull request Netflix#140 from gnethercutt/cloudformation_asg_termination_naming
- c39c19b: Merge pull request Netflix#149 from ImmobilienScout24/fix/log_safe_props_only
- b9e7b1f: Merge pull request Netflix#151 from socrata-platform/proxy-support
- e5bd3ef: Merge pull request Netflix#198 from tusharm/aws-sdk-upgrade
- daf8425: Upgraded AWS SDK to 1.10.5.1
- 7c05ddc: Merge pull request Netflix#193 from tusharm/calendar-text-fix
- 1f0f595: New rule: UntaggedRule
- d6c391b: Fix test - use calendar with correct timezones
- 1ebd3e6: Merge pull request Netflix#187 from hlta/master
- 358411c: change to use osgi component
- 8acb35a: add ec2 dependency
- 24a6e47: update to use jcloud latested
- b93ea1b: Update Jcloud and use authentication agent
- 5f94e55: Optionally consider membership in an OpsWorks stack when evaluating the orphaned instance rule for termination
- a499d80: Merge pull request Netflix#183 from pebo/update-pr170
- 3b8944c: Added cobertura plugin
- c8c587a: Switched back to mavenCentral and update netflixoss to 2.2.9
- b9c5464: Merge remote-tracking branch 'denner/netflixossbuild' into fix-pr170
- 54b964c: Merge pull request Netflix#148 from ImmobilienScout24/fix/use_https_for_gradle
- 491cdbc: Remove unneeded properties
- 2dc17b1: Build upgrade to new netflixoss
- 297c7fd: Merge branch 'master' into cloudformation_asg_termination_naming
- ae06300: Fixing comment
- 3da3045: Adding proxy connection support for AWSClient(s)
- 24b39bc: only log properties that are safe to log
- 33cd5e1: switch gradle download to https
- f7b8d89: Merge pull request Netflix#147 from radonsky/remove_dynamic_versions
- 25da04e: Dynamic versions in the build.gradle file replaced by specific versions
- a152d42: Merge pull request Netflix#145 from radonsky/fix_httpclient_config
- 5c04896: Changed httpclient and httpcode dependencies to 4.3+
- 35a3b5b: Removes deprecated configuration classes for HttpClient library
- dc201fb: Conversion to the noSuffixInstance group name now happens in terminateInstance, so remove it from sendTerminationNotification. Otherwise, we perform the conversion twice.
- 1b47aa8: Make terminateInstance() protected to support overriding by the subclass(es)
- bc964a4: Record the suffix-stripped version of termination events by the CloudFormationChaosMonkey to correctly respect maxTerminationsPerDay
- 011d467: Merge pull request Netflix#138 from radonsky/add_cross_zone_lb_conformity_rule
- 0de2936: Merge branch 'master' into add_cross_zone_lb_conformity_rule
- ad8b8d5: Added a new CrossZoneLoadBalancing conformity rule and a test
- 7742002: Merge pull request Netflix#136 from Netflix/fix-maxKills-chaos-bug
- 4a948c1: The original condition should be returned in addition to the new one since unit-test will otherwise fail: the reason for that is that the unit-test checks two things: 1. selected instances 2. terminated
- 122e074: maxTerminationsPerDay was checked only once for the group before the iteration over the instances while ee should check if maxTerminationsPerDay was exceeded before trying to terminate *any* instance.
- dfef846: Merge pull request Netflix#135 from Netflix/fix-maxKills-chaos-bug
- 1f1a4ce: Merge pull request Netflix#133 from radonsky/master
- 4ac9a55: Merge branch 'fix_cobertura'
- 248b176: Merge pull request Netflix#134 from radonsky/fix_cobertura
- 4a563db: Fixed cobertura reports
- 38df4d1: Upgrade gradle to 1.12
- 6a3cfb8: Making the code more resilient: if the configuration is messed up (empty string or spaces) or simply doesn’t exist, return the default value (and log the error)
- c278846: The suspicion is that the combination of the latest Java 7 patch doesn’t play along with the old gradle-cobertura plugin (it works fine with Java 6). Updating cobertura to a newer version fixes the build issues.
- 553e158: upgrade vijava to latest to solve the following bug: Vim 3.0 through 7.x before 7.2.010 does not properly escape characters, which allows user-assisted attackers to (1) execute arbitrary shell commands by entering a K keystroke on a line that contains a ";" (semicolon) followed by a command, or execute arbitrary Ex commands by entering an argument after a (2) "Ctrl-]" (control close-square-bracket) or (3) "g]" (g close-square-bracket) keystroke sequence, a different issue than CVE-2008-2712.
- 0100228: Merge pull request Netflix#129 from manheim/addEc2Dependency
- 0863785: PZ add org.jclouds.api:ec2:1.6.0 dependency to fix chaos type issue: key [ec2] not found org.jclouds.ContextBuilder.newBuilder
- 2aca162: Merge pull request Netflix#128 from Netflix/fix-volume-attachment-bug
- 27a4b29: We don’t want JM to crash over an empty attachment.
- 4bbfe0d: We don’t want JM to crash over an empty attachment.
- 2a698e7: Merge pull request Netflix#122 from mgeis/quiet-dst-check
- 6a8b799: Merge pull request Netflix#124 from Netflix/assets
- 1b471af: Update version
- be41727: Simian Army Logos
- 7bd7b8b: commenting out part of test that verifies DST cutover

Release of 2.5.0-rc.1

- 4513deb: Merge pull request Netflix#235 from ebukoski/master
- 346528c: Update tests for AWS 17 character instance IDs, volume IDs, and snapshot IDs
- 6347c9c: Merge pull request Netflix#233 from Ten48BASE/master
- 450fc0a: Adding AWS region detection.
- 6c6adff: Merge pull request Netflix#232 from Ten48BASE/master
- 4aefd5f: Fixing error in building of the termination reason string.
- 298d455: Merge pull request Netflix#231 from rmurphy-stelligent/ses-proxy-support
- 6691c5c: Added the awsClientConfig to the SES instantiation to ensure proxy configurations are used
- df95a7a: Added some tests to verify proxy configurations
- ac11698: Corrected a miss-spelling of a clas property
- 0617247: Merge pull request Netflix#230 from ebukoski/master
- e604bc6: Merge pull request Netflix#228 from jeffggardner/master
- 84c5e13: Fixed typo in class name and changed double comparison
- e6f3b8c: Fixed typo in class name and changed double comparison
- da5fe71: Fixed typo in class name and changed double comparison
- d340ebc: Add a prepareToRun() method to Janitor Monkey so that the internal resource lists can be reset between Monkey runs.
- b6aab93: Added the ability to fine-tune the probability on a per-ASG basis.
- 6feadee: adding OSSMETADATA for NetflixOSS tracking
- 50ec002: Merge pull request Netflix#227 from ebukoski/master
- f8c743e: NoGeneratedAMIRule: Add a property to override owner email
- 2469f40: Merge pull request Netflix#226 from ebukoski/master
- 11cfa2e: Render a simple HTML response for opting in/out of Janitor resources when using the HTTP GET interface
- 8848082: Merge pull request Netflix#225 from ebukoski/master
- aa7f32c: Fix parenthesis in wrong place
- 86e0ce4: Merge pull request Netflix#224 from ebukoski/master
- 7ccc312: BasicCalendar: isMonkeyTime=false should execute normal MonkeyCalendar logic.
- 2b16f66: Merge pull request Netflix#223 from ebukoski/master
- dde65ef: BasicJanitorMonkey: add servo metrics for monkeyErrors and monkeyRunning.  Add try-catch in janitor loop so one janitor failure doesn't stop the whole monkey run.  AbstractJanitor: add checkedResourcesCount as a servo metric.  Fix wrong resource passed into addFieldsandTagsToEvent() method.
- 1f0ed65: Add URL target to allow adding events with a GET call
- 1e5de1c: MonkeyCalendar: new constructor and better logging.  Add a constructor to pass in configuration along with open/close/timezone.  More logging in isMonkeyTime so it clearer why Monkey is taking time off.
- cd68af3: Merge pull request Netflix#222 from ebukoski/master
- 706e443: Janitor Monkey recorder changes: add additional resource fields and resource tags to Janitor Monkey cleaning events.  Change processing order to generate event after cleanup instead of before.
- 13705cb: Merge pull request Netflix#220 from ebukoski/master
- e93a6a6: EddaInstanceJanitorCrawler: breakup edda queries for image ids into batches to avoid hitting query string limits
- 95a8803: Merge pull request Netflix#218 from ebukoski/master
- cce0ed0: Change janitor metrics from counter to gauge.  Use resource arrays to track marks, cleans, etc. instead of using separate counter
- 1cb9805: Merge pull request Netflix#217 from dx-pbuckley/dev-minor-comment-nitpick
- ab954a2: since will number -> since should be number
- 01d745b: Merge pull request Netflix#216 from ebukoski/master
- e0ac212: Return long instead of AtomicLong
- 0cca531: Janitor getters for metrics should be public
- 4a7b70b: Merge pull request Netflix#215 from ebukoski/master
- 992a449: Add Servo dependency.  Add JMX/Servo metrics monitoring for monkey runs, marked resources, unmarked resources, cleaned resources, and failed to clean resources.
- c211731: Merge pull request Netflix#213 from dx-pbuckley/dev-get-janitor-route
- 257dbe2: add GET route v1/api/janitor for ELB healthcheck
- 09cb41e: Merge pull request Netflix#212 from dx-pbuckley/dev-key-owner
- e0d83f4: replace hardcoded "owner" with property
- ae4ed80: fix publishing error with core jar
- 5426b75: Merge pull request Netflix#211 from ebukoski/master
- 5b97688: Fix NPE with Edda ASG Janitor crawler
- f9d58f3: publish jars
- 580bb6a: Merge pull request Netflix#210 from ebukoski/master
- 47668bc: publish jars also
- 3ece75c: Merge pull request Netflix#208 from ebukoski/master
- 878f6b5: Set gradle version to 2.2.1 for compatibility with Nebula NetflixOSS
- 3beaf91: Merge pull request Netflix#205 from ebukoski/master
- d5bddfd: Merge pull request Netflix#204 from dx-pbuckley/dev-fix-my-bad-double-copyrights
- 55ff083: remove duplicate copyright notices
- 70abc6c: Fix warnings with gradle license plug-in
- 9fa545d: Merge branch 'master' of github.com:ebukoski/SimianArmy
- 3076285: Correct javadoc warnings
- 517c6c9: Merge pull request Netflix#1 from Netflix/master
- 623067f: Merge pull request Netflix#203 from dx-pbuckley/dev-add-missing-headers
- 35066be: these files were missing copyright headers
- 4f22e38: Set retry for SimpleDB. Minor logging change.
- b28ed7a: Fix race condition when running unit tests on Windows. Without this fix, unit tests occassionally fail on Windows.
- bb01310: Default simianarmy.janitor.rule.untaggedRule.enabled = false for safety
- 345ad95: Merge pull request Netflix#195 from koendc/untagged
- 82773f0: Merge pull request Netflix#202 from ebukoski/master
- 22e0577: Override SES client region with an optional property and a SimpleDB fix for dashes in name.
- 7152073: Manual merge PR Netflix#191.
- 1146b19: Merge pull request Netflix#201 from adm-github/email_regex_fix
- 3d2974e: Added testing for isValidEmail
- bffa7a4: Email regex fix
- a788e71: Merge pull request Netflix#185 from gnethercutt/opsworks_parentage
- 82cb011: Fix compile error after merge PR Netflix#174
- 13eb82b: Manual merge of PR Netflix#174 Closes Netflix#174
- 6e1c739: Merge pull request Netflix#140 from gnethercutt/cloudformation_asg_termination_naming
- c39c19b: Merge pull request Netflix#149 from ImmobilienScout24/fix/log_safe_props_only
- b9e7b1f: Merge pull request Netflix#151 from socrata-platform/proxy-support
- e5bd3ef: Merge pull request Netflix#198 from tusharm/aws-sdk-upgrade
- daf8425: Upgraded AWS SDK to 1.10.5.1
- 7c05ddc: Merge pull request Netflix#193 from tusharm/calendar-text-fix
- 1f0f595: New rule: UntaggedRule
- d6c391b: Fix test - use calendar with correct timezones
- 1ebd3e6: Merge pull request Netflix#187 from hlta/master
- 358411c: change to use osgi component
- 8acb35a: add ec2 dependency
- 24a6e47: update to use jcloud latested
- b93ea1b: Update Jcloud and use authentication agent
- 5f94e55: Optionally consider membership in an OpsWorks stack when evaluating the orphaned instance rule for termination
- a499d80: Merge pull request Netflix#183 from pebo/update-pr170
- 3b8944c: Added cobertura plugin
- c8c587a: Switched back to mavenCentral and update netflixoss to 2.2.9
- b9c5464: Merge remote-tracking branch 'denner/netflixossbuild' into fix-pr170
- 54b964c: Merge pull request Netflix#148 from ImmobilienScout24/fix/use_https_for_gradle
- 491cdbc: Remove unneeded properties
- 2dc17b1: Build upgrade to new netflixoss
- 297c7fd: Merge branch 'master' into cloudformation_asg_termination_naming
- ae06300: Fixing comment
- 3da3045: Adding proxy connection support for AWSClient(s)
- 24b39bc: only log properties that are safe to log
- 33cd5e1: switch gradle download to https
- f7b8d89: Merge pull request Netflix#147 from radonsky/remove_dynamic_versions
- 25da04e: Dynamic versions in the build.gradle file replaced by specific versions
- a152d42: Merge pull request Netflix#145 from radonsky/fix_httpclient_config
- 5c04896: Changed httpclient and httpcode dependencies to 4.3+
- 35a3b5b: Removes deprecated configuration classes for HttpClient library
- dc201fb: Conversion to the noSuffixInstance group name now happens in terminateInstance, so remove it from sendTerminationNotification. Otherwise, we perform the conversion twice.
- 1b47aa8: Make terminateInstance() protected to support overriding by the subclass(es)
- bc964a4: Record the suffix-stripped version of termination events by the CloudFormationChaosMonkey to correctly respect maxTerminationsPerDay
- 011d467: Merge pull request Netflix#138 from radonsky/add_cross_zone_lb_conformity_rule
- 0de2936: Merge branch 'master' into add_cross_zone_lb_conformity_rule
- ad8b8d5: Added a new CrossZoneLoadBalancing conformity rule and a test
- 7742002: Merge pull request Netflix#136 from Netflix/fix-maxKills-chaos-bug
- 4a948c1: The original condition should be returned in addition to the new one since unit-test will otherwise fail: the reason for that is that the unit-test checks two things: 1. selected instances 2. terminated
- 122e074: maxTerminationsPerDay was checked only once for the group before the iteration over the instances while ee should check if maxTerminationsPerDay was exceeded before trying to terminate *any* instance.
- dfef846: Merge pull request Netflix#135 from Netflix/fix-maxKills-chaos-bug
- 1f1a4ce: Merge pull request Netflix#133 from radonsky/master
- 4ac9a55: Merge branch 'fix_cobertura'
- 248b176: Merge pull request Netflix#134 from radonsky/fix_cobertura
- 4a563db: Fixed cobertura reports
- 38df4d1: Upgrade gradle to 1.12
- 6a3cfb8: Making the code more resilient: if the configuration is messed up (empty string or spaces) or simply doesn’t exist, return the default value (and log the error)
- c278846: The suspicion is that the combination of the latest Java 7 patch doesn’t play along with the old gradle-cobertura plugin (it works fine with Java 6). Updating cobertura to a newer version fixes the build issues.
- 553e158: upgrade vijava to latest to solve the following bug: Vim 3.0 through 7.x before 7.2.010 does not properly escape characters, which allows user-assisted attackers to (1) execute arbitrary shell commands by entering a K keystroke on a line that contains a ";" (semicolon) followed by a command, or execute arbitrary Ex commands by entering an argument after a (2) "Ctrl-]" (control close-square-bracket) or (3) "g]" (g close-square-bracket) keystroke sequence, a different issue than CVE-2008-2712.
- 0100228: Merge pull request Netflix#129 from manheim/addEc2Dependency
- 0863785: PZ add org.jclouds.api:ec2:1.6.0 dependency to fix chaos type issue: key [ec2] not found org.jclouds.ContextBuilder.newBuilder
- 2aca162: Merge pull request Netflix#128 from Netflix/fix-volume-attachment-bug
- 27a4b29: We don’t want JM to crash over an empty attachment.
- 4bbfe0d: We don’t want JM to crash over an empty attachment.
- 2a698e7: Merge pull request Netflix#122 from mgeis/quiet-dst-check
- 6a8b799: Merge pull request Netflix#124 from Netflix/assets
- 1b471af: Update version
- be41727: Simian Army Logos
- 7bd7b8b: commenting out part of test that verifies DST cutover

Merge pull request Netflix#125 from abasiri/improvement/refactor-basi…

…c-chaos-monkey-configuration-read

Refactor reading of chaos monkey properties and defaults values