Skip to content
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.

Sign up for GitHub

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

Add support for region eu-central-1 #640

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Add support for region eu-central-1 #640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b1c020a
Add support for region eu-central-1
jmanero-r7 Feb 18, 2015
9b0a8b5
Remove commented version of aws-java-sdk
jmanero-r7 Feb 18, 2015
394c7d1
CORE-1580 First pass at making M4's work
Feb 2, 2016
f57bd16
CORE-1580: Added M4, C4, and T2 instance type families.
dgreene-r7 Feb 4, 2016
47cef9c
Merge pull request #1 from rapid7/CORE-1580
dgreene-r7 Feb 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions grails-app/conf/BuildConfig.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,13 @@ grails.project.dependency.resolution = {

compile(
// Amazon Web Services programmatic interface. Transitive dependency of glisten, but also used directly.
'com.amazonaws:aws-java-sdk:1.7.5',
//'com.amazonaws:aws-java-sdk:1.8.11',
'com.amazonaws:aws-java-sdk:1.10.0',

// Enables publication of a health check URL for deploying Asgard, and an on/off switch for activities.
// Transitive dependencies include:
// rxjava, archaius, ribbon, servo, netflix-commons, netflix-statistics, jersey, guava
'com.netflix.eureka:eureka-client:1.1.127',
'com.netflix.eureka:eureka-client:1.3.4',

// Transitive dependencies of eureka and aws-java-sdk, but also used for REST calls, e.g., HttpClient
'org.apache.httpcomponents:httpcore:4.2',
Expand Down
7 changes: 7 additions & 0 deletions grails-app/services/com/netflix/asgard/AwsSimpleDbService.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@ class AwsSimpleDbService implements InitializingBean {

private List<Item> runQuery(String domainName, String queryString, Region region) {
List<Item> appItems = []
if (!region.simpledb) return appItems

try {
appItems = itemRetriever.retrieve(region, new SelectRequest(queryString, true))
} catch (AmazonServiceException ase) {
Expand All @@ -118,6 +120,8 @@ class AwsSimpleDbService implements InitializingBean {
*/
void save(String domainName, String itemName, Collection<ReplaceableAttribute> attributes,
Region region = Region.defaultRegion()) {
if (!region.simpledb) return

try {
awsClient.by(region).putAttributes(new PutAttributesRequest().withDomainName(domainName).
withItemName(itemName).withAttributes(attributes))
Expand All @@ -143,6 +147,8 @@ class AwsSimpleDbService implements InitializingBean {
*/
void delete(String domainName, String itemName, List<Attribute> attributes = null,
Region region = Region.defaultRegion()) {
if (!region.simpledb) return

try {
awsClient.by(region).deleteAttributes(new DeleteAttributesRequest(domainName, itemName,
attributes))
Expand All @@ -159,6 +165,7 @@ class AwsSimpleDbService implements InitializingBean {

List<String> listDomains(Region region) {
List<String> domains = []
if (!region.simpledb) return domains

ListDomainsResult result = listDomainsWithToken(region, null)
while (true) {
Expand Down
46 changes: 46 additions & 0 deletions grails-app/services/com/netflix/asgard/InstanceTypeService.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,12 +145,14 @@ class InstanceTypeService implements CacheInitializer {
String xxl = 'Double Extra Large'
String xxxxl = 'Quadruple Extra Large'
String xxxxxxxxl = 'Eight Extra Large'
String decaxl = 'Deca Extra Large'
String gen = 'General purpose'
String second = 'Second Generation Standard'
String cc = 'Cluster Compute'
String memOpt = 'Memory optimized'
String hiMem = 'High-Memory'
String compOpt = 'Compute optimized'
String bInst = 'Burstable Performance Instances'
String six4 = '64-bit'
String three2OrSix4 = '32-bit or 64-bit'
String hcpu = 'High-CPU'
Expand All @@ -159,6 +161,22 @@ class InstanceTypeService implements CacheInitializer {
arch: three2OrSix4, vCpu: '1', ecu: 'Variable', mem: '0.615', storage: 'EBS only',
ebsOptim: '-', netPerf: 'Very Low'),

new HardwareProfile(instanceType: 't2.nano', family: bInst, group: gen, size: 'Nano',
arch: six4, vCpu: '1', ecu: 'Variable', mem: '0.5', storage: 'EBS only', ebsOptim: '-',
netPerf: 'Low'),
new HardwareProfile(instanceType: 't2.micro', family: bInst, group: gen, size: 'Micro',
arch: three2OrSix4, vCpu: '1', ecu: 'Variable', mem: '1', storage: 'EBS only', ebsOptim: '-',
netPerf: 'Low to Moderate'),
new HardwareProfile(instanceType: 't2.small', family: bInst, group: gen, size: 'Small',
arch: three2OrSix4, vCpu: '1', ecu: 'Variable', mem: '2', storage: 'EBS only', ebsOptim: '-',
netPerf: 'Low to Moderate'),
new HardwareProfile(instanceType: 't2.medium', family: bInst, group: gen, size: 'Medium',
arch: six4, vCpu: '2', ecu: 'Variable', mem: '4', storage: 'EBS only', ebsOptim: '-',
netPerf: 'Low to Moderate'),
new HardwareProfile(instanceType: 't2.large', family: bInst, group: gen, size: 'Large',
arch: six4, vCpu: '2', ecu: 'Variable', mem: '8', storage: 'EBS only', ebsOptim: '-',
netPerf: 'Low to Moderate'),

new HardwareProfile(instanceType: 'm1.small', family: gen, group: 'Standard', size: 'Small (Default)',
arch: three2OrSix4, vCpu: '1', ecu: '1', mem: '1.7', storage: '1 x 160', ebsOptim: '-',
netPerf: 'Low'),
Expand All @@ -180,6 +198,17 @@ class InstanceTypeService implements CacheInitializer {
new HardwareProfile(instanceType: 'm3.2xlarge', family: gen, group: second, size: xxl, arch: six4,
vCpu: '8', ecu: '26', mem: '30', storage: 'EBS only', ebsOptim: 'Yes', netPerf: 'High'),

new HardwareProfile(instanceType: 'm4.large', family: gen, group: gen, size: 'Large', arch: six4,
vCpu: '2', ecu: '6.5', mem: '8', storage: 'EBS only', ebsOptim: 'Yes', netPerf: 'Moderate'),
new HardwareProfile(instanceType: 'm4.xlarge', family: gen, group: gen, size: xl, arch: six4,
vCpu: '4', ecu: '13', mem: '16', storage: 'EBS only', ebsOptim: 'Yes', netPerf: 'High'),
new HardwareProfile(instanceType: 'm4.2xlarge', family: gen, group: gen, size: xxl, arch: six4,
vCpu: '8', ecu: '26', mem: '32', storage: 'EBS only', ebsOptim: 'Yes', netPerf: 'High'),
new HardwareProfile(instanceType: 'm4.4xlarge', family: gen, group: gen, size: xxxxl, arch: six4,
vCpu: '16', ecu: '53.5', mem: '64', storage: 'EBS only', ebsOptim: 'Yes', netPerf: 'High'),
new HardwareProfile(instanceType: 'm4.10xlarge', family: gen, group: gen, size: decaxl, arch: six4,
vCpu: '40', ecu: '124.5', mem: '160', storage: 'EBS only', ebsOptim: 'Yes', netPerf: '10 Gigabit'),

new HardwareProfile(instanceType: 'c1.medium', family: compOpt, group: hcpu, size: 'Medium',
arch: three2OrSix4, vCpu: '2', ecu: '5', mem: '1.7', storage: '1 x 350', ebsOptim: '-',
netPerf: 'Moderate'),
Expand All @@ -193,6 +222,23 @@ class InstanceTypeService implements CacheInitializer {
arch: six4, vCpu: '32', ecu: '88', mem: '60.5', storage: '4 x 840', ebsOptim: '-',
netPerf: '10 Gigabit'),

new HardwareProfile(instanceType: 'c4.large', family: compOpt, group: hcpu, size: 'Large',
arch: six4, vCpu: '2', ecu: '8', mem: '3.75', storage: 'EBS Only', ebsOptim: 'Yes',
netPerf: 'Moderate'),
new HardwareProfile(instanceType: 'c4.xlarge', family: compOpt, group: hcpu, size: xl,
arch: six4, vCpu: '4', ecu: '16', mem: '7.5', storage: 'EBS Only', ebsOptim: 'Yes',
netPerf: 'High'),
new HardwareProfile(instanceType: 'c4.2xlarge', family: compOpt, group: hcpu, size: xxl,
arch: six4, vCpu: '8', ecu: '31', mem: '15', storage: 'EBS Only', ebsOptim: 'Yes',
netPerf: 'High'),
new HardwareProfile(instanceType: 'c4.4xlarge', family: compOpt, group: hcpu, size: xxxxl,
arch: six4, vCpu: '16', ecu: '62', mem: '30', storage: 'EBS Only', ebsOptim: 'Yes',
netPerf: 'High'),
new HardwareProfile(instanceType: 'c4.8xlarge', family: compOpt, group: hcpu, size: xxxxxxxxl,
arch: six4, vCpu: '36', ecu: '132', mem: '60', storage: 'EBS Only', ebsOptim: 'Yes',
netPerf: '10 Gigabit'),

// M2 INSTANCE TYPES
new HardwareProfile(instanceType: 'm2.xlarge', family: memOpt, group: hiMem, size: xl, arch: six4,
vCpu: '2', ecu: '6.5', mem: '17.1', storage: '1 x 420', ebsOptim: '-', netPerf: 'Moderate'),
new HardwareProfile(instanceType: 'm2.2xlarge', family: memOpt, group: hiMem, size: xxl, arch: six4,
Expand Down
Loading