Skip to content

Updating cleanup lambda to work with OpenSearch #45

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updating cleanup lambda to work with OpenSearch #45

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
7 changes: 5 additions & 2 deletions es_cleanup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ def __init__(self, event, context):
self.cfg["es_endpoint"] = self.get_parameter("es_endpoint")
self.cfg["index"] = self.get_parameter("index", ".*")
self.cfg["skip_index"] = self.get_parameter("skip_index", ".kibana*")
self.cfg["skip_security_index"] = self.get_parameter("skip_security_index", ".opendistro_security*")

self.cfg["delete_after"] = int(self.get_parameter("delete_after", 15))
self.cfg["es_max_retry"] = int(self.get_parameter("es_max_retry", 3))
Expand Down Expand Up @@ -154,11 +155,12 @@ def get_indices(self):


class DeleteDecider(object):
def __init__(self, delete_after, idx_format, idx_regex, skip_idx_regex, today):
def __init__(self, delete_after, idx_format, idx_regex, skip_idx_regex, skip_security_idx_regex, today):
self.delete_after = delete_after
self.idx_format = idx_format
self.idx_regex = idx_regex
self.skip_idx_regex = skip_idx_regex
self.skip_security_idx_regex = skip_security_idx_regex
self.today = today

def should_delete(self, index):
Expand All @@ -172,7 +174,7 @@ def should_delete(self, index):
self.idx_regex)

earliest_to_keep = self.today - datetime.timedelta(days=self.delete_after)
if re.search(self.skip_idx_regex, index["index"]):
if re.search(self.skip_idx_regex, index["index"]) or re.search(self.skip_security_idx_regex, index["index"]):
return False, "index matches skip condition"

try:
Expand Down Expand Up @@ -202,6 +204,7 @@ def lambda_handler(event, context):
idx_regex=es.cfg["index"],
idx_format=es.cfg["index_format"],
skip_idx_regex=es.cfg["skip_index"],
skip_security_idx_regex=es.cfg["skip_security_index"],
today=datetime.date.today())

for index in es.get_indices():
Expand Down
11 changes: 3 additions & 8 deletions terraform/lambda.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,12 @@ data "archive_file" "es_cleanup_lambda" {
}

locals {
sg_ids = [element(concat(aws_security_group.lambda.*.id, [""]), 0)]
}

data "null_data_source" "lambda_file" {
inputs = {
filename = "${path.module}/es_cleanup.zip"
}
sg_ids = [element(concat(aws_security_group.lambda.*.id, [""]), 0)]
lambda_filename = "${path.module}/es_cleanup.zip"
}

resource "aws_lambda_function" "es_cleanup" {
filename = data.null_data_source.lambda_file.outputs.filename
filename = local.lambda_filename
function_name = "${var.prefix}es-cleanup${var.suffix}"
description = "${var.prefix}es-cleanup${var.suffix}"
timeout = var.timeout
Expand Down