这是indexloc提供的服务，不要输入任何密码
Skip to content
This repository was archived by the owner on Mar 4, 2021. It is now read-only.

Adding feature to specifiy resource types for untaggedResourceRule #234

Closed
wants to merge 1 commit into from
Closed

Adding feature to specifiy resource types for untaggedResourceRule #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 25 additions & 6 deletions src/main/java/com/netflix/simianarmy/basic/janitor/BasicJanitorMonkeyContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,8 @@ private ASGJanitor getASGJanitor() {
instanceValidator
));
}
if (configuration().getBoolOrElse("simianarmy.janitor.rule.untaggedRule.enabled", false)) {
if (configuration().getBoolOrElse("simianarmy.janitor.rule.untaggedRule.enabled", false)
&& getUntaggedRuleResourceSet().contains("ASG")) {
ruleEngine.addRule(new UntaggedRule(monkeyCalendar, getPropertySet("simianarmy.janitor.rule.untaggedRule.requiredTags"),
(int) configuration().getNumOrElse(
"simianarmy.janitor.rule.untaggedRule.retentionDaysWithOwner", 3),
Expand Down Expand Up @@ -229,7 +230,8 @@ private InstanceJanitor getInstanceJanitor() {
"simianarmy.janitor.rule.orphanedInstanceRule.opsworks.parentage",
false)));
}
if (configuration().getBoolOrElse("simianarmy.janitor.rule.untaggedRule.enabled", false)) {
if (configuration().getBoolOrElse("simianarmy.janitor.rule.untaggedRule.enabled", false)
&& getUntaggedRuleResourceSet().contains("INSTANCE")) {
ruleEngine.addRule(new UntaggedRule(monkeyCalendar, getPropertySet("simianarmy.janitor.rule.untaggedRule.requiredTags"),
(int) configuration().getNumOrElse(
"simianarmy.janitor.rule.untaggedRule.retentionDaysWithOwner", 3),
Expand Down Expand Up @@ -265,7 +267,8 @@ && configuration().getBoolOrElse("simianarmy.janitor.rule.deleteOnTerminationRul
"simianarmy.janitor.rule.deleteOnTerminationRule.retentionDays", 3)));
}
}
if (configuration().getBoolOrElse("simianarmy.janitor.rule.untaggedRule.enabled", false)) {
if (configuration().getBoolOrElse("simianarmy.janitor.rule.untaggedRule.enabled", false)
&& getUntaggedRuleResourceSet().contains("EBS_VOLUME")) {
ruleEngine.addRule(new UntaggedRule(monkeyCalendar, getPropertySet("simianarmy.janitor.rule.untaggedRule.requiredTags"),
(int) configuration().getNumOrElse(
"simianarmy.janitor.rule.untaggedRule.retentionDaysWithOwner", 3),
Expand Down Expand Up @@ -297,7 +300,8 @@ private EBSSnapshotJanitor getEBSSnapshotJanitor() {
configuration().getStrOrElse(
"simianarmy.janitor.rule.noGeneratedAMIRule.ownerEmail", null)));
}
if (configuration().getBoolOrElse("simianarmy.janitor.rule.untaggedRule.enabled", false)) {
if (configuration().getBoolOrElse("simianarmy.janitor.rule.untaggedRule.enabled", false)
&& getUntaggedRuleResourceSet().contains("EBS_SNAPSHOT")) {
ruleEngine.addRule(new UntaggedRule(monkeyCalendar, getPropertySet("simianarmy.janitor.rule.untaggedRule.requiredTags"),
(int) configuration().getNumOrElse(
"simianarmy.janitor.rule.untaggedRule.retentionDaysWithOwner", 3),
Expand Down Expand Up @@ -329,7 +333,8 @@ private LaunchConfigJanitor getLaunchConfigJanitor() {
(int) configuration().getNumOrElse(
"simianarmy.janitor.rule.oldUnusedLaunchConfigRule.retentionDays", 3)));
}
if (configuration().getBoolOrElse("simianarmy.janitor.rule.untaggedRule.enabled", false)) {
if (configuration().getBoolOrElse("simianarmy.janitor.rule.untaggedRule.enabled", false)
&& getUntaggedRuleResourceSet().contains("LAUNCH_CONFIG")) {
ruleEngine.addRule(new UntaggedRule(monkeyCalendar, getPropertySet("simianarmy.janitor.rule.untaggedRule.requiredTags"),
(int) configuration().getNumOrElse(
"simianarmy.janitor.rule.untaggedRule.retentionDaysWithOwner", 3),
Expand Down Expand Up @@ -370,7 +375,8 @@ private ImageJanitor getImageJanitor() {
(int) configuration().getNumOrElse(
"simianarmy.janitor.rule.unusedImageRule.lastReferenceDaysThreshold", 45)));
}
if (configuration().getBoolOrElse("simianarmy.janitor.rule.untaggedRule.enabled", false)) {
if (configuration().getBoolOrElse("simianarmy.janitor.rule.untaggedRule.enabled", false)
&& getUntaggedRuleResourceSet().contains("IMAGE")) {
ruleEngine.addRule(new UntaggedRule(monkeyCalendar, getPropertySet("simianarmy.janitor.rule.untaggedRule.requiredTags"),
(int) configuration().getNumOrElse(
"simianarmy.janitor.rule.untaggedRule.retentionDaysWithOwner", 3),
Expand Down Expand Up @@ -402,6 +408,19 @@ private Set<String> getEnabledResourceSet() {
}
return enabledResourceSet;
}

private Set<String> getUntaggedRuleResourceSet() {
Set<String> untaggedRuleResourceSet = new HashSet<String>();
if (configuration().getBoolOrElse("simianarmy.janitor.rule.untaggedRule.enabled", false)) {
String untaggedRuleResources = configuration().getStr("simianarmy.janitor.rule.untaggedRule.resources");
if (StringUtils.isNotBlank(untaggedRuleResources)) {
for (String resourceType : untaggedRuleResources.split(",")) {
untaggedRuleResourceSet.add(resourceType.trim().toUpperCase());
}
}
}
return untaggedRuleResourceSet;
}

private Set<String> getPropertySet(String property) {
Set<String> propertyValueSet = new HashSet<String>();
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/janitor.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ simianarmy.janitor.rule.orphanedInstanceRule.opsworks.parentage = false
simianarmy.janitor.rule.untaggedRule.enabled = false
# List of tags that are required for each resource
simianarmy.janitor.rule.untaggedRule.requiredTags = owner, purpose, project
# List of resource types that require tags
simianarmy.janitor.rule.untaggedRule.resources = Instance, ASG, EBS_Volume, EBS_Snapshot, Launch_Config
# The number of business days the resource is kept after a notification is sent for the deletion
# when the resource has an owner.
simianarmy.janitor.rule.untaggedRule.retentionDaysWithOwner = 2
Expand Down