From 26352765e4a498a1c911b54e4ea0cbd12d0e0906 Mon Sep 17 00:00:00 2001
From: aviv <guetaaviv@gmail.com>
Date: Tue, 9 Jun 2020 14:53:32 +0300
Subject: [PATCH 1/2] added Elesticsearch resource

---
 terraform/es.tf | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 terraform/es.tf

diff --git a/terraform/es.tf b/terraform/es.tf
new file mode 100644
index 0000000000..bd3c42d67b
--- /dev/null
+++ b/terraform/es.tf
@@ -0,0 +1,35 @@
+resource "aws_elasticsearch_domain" "monitoring-framework" {
+  domain_name           = "tg-${var.environment}-es"
+  elasticsearch_version = "2.3"
+
+  cluster_config {
+    instance_type            = "m4.large.elasticsearch"
+    instance_count           = 1
+    dedicated_master_enabled = false
+    dedicated_master_type    = "m4.large.elasticsearch"
+    dedicated_master_count   = 1
+  }
+
+  ebs_options {
+    ebs_enabled = true
+    volume_size = 50
+  }
+
+}
+
+resource "aws_elasticsearch_domain_policy" "monitoring-framework-policy" {
+  domain_name = aws_elasticsearch_domain.monitoring-framework.domain_name
+  access_policies = <<POLICIES
+  {
+    "Version": "2012-10-17",
+    "Statement": [
+        {
+            "Action": "es:*",
+            "Principal": "*",
+            "Effect": "Allow",
+            "Resource": "*"
+        }
+    ]
+}
+POLICIES
+}

From 4d579c0d2e5fd64431dc9adbef512d9740bfa650 Mon Sep 17 00:00:00 2001
From: aviv <guetaaviv@gmail.com>
Date: Tue, 9 Jun 2020 15:52:30 +0300
Subject: [PATCH 2/2] edited Elesticsearch policy and instance_type

---
 terraform/es.tf | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/terraform/es.tf b/terraform/es.tf
index bd3c42d67b..463db52423 100644
--- a/terraform/es.tf
+++ b/terraform/es.tf
@@ -3,7 +3,7 @@ resource "aws_elasticsearch_domain" "monitoring-framework" {
   elasticsearch_version = "2.3"
 
   cluster_config {
-    instance_type            = "m4.large.elasticsearch"
+    instance_type            = "t2.small.elasticsearch"
     instance_count           = 1
     dedicated_master_enabled = false
     dedicated_master_type    = "m4.large.elasticsearch"
@@ -12,24 +12,22 @@ resource "aws_elasticsearch_domain" "monitoring-framework" {
 
   ebs_options {
     ebs_enabled = true
-    volume_size = 50
+    volume_size = 30
   }
+}
 
+data aws_iam_policy_document "policy" {
+  statement {
+    actions   = ["es:*"]
+    principals {
+      type        = "AWS"
+      identifiers = ["*"]
+    }
+    resources = ["*"]
+  }
 }
 
 resource "aws_elasticsearch_domain_policy" "monitoring-framework-policy" {
   domain_name = aws_elasticsearch_domain.monitoring-framework.domain_name
-  access_policies = <<POLICIES
-  {
-    "Version": "2012-10-17",
-    "Statement": [
-        {
-            "Action": "es:*",
-            "Principal": "*",
-            "Effect": "Allow",
-            "Resource": "*"
-        }
-    ]
-}
-POLICIES
+  access_policies = data.aws_iam_policy_document.policy.json
 }