Add actions to Elastic Curator configuration

This ps updates Curator with reference actions for deleting and
snapshotting Elasticsearch indices and also modifies Curator
to account for Elasticsearch auth and hostname configuration via
endpoint lookup

Change-Id: Ic68a2506c2ea96fc7269a7bb639ebba9c9b1ef20

elasticsearch/templates/cron-job-curator.yaml

@@ -17,6 +17,8 @@ limitations under the License.
 {{- if .Values.manifests.cron_curator }}
 {{- $envAll := . }}
 
+{{- $esUserSecret := .Values.secrets.elasticsearch.user }}
+
 {{- $serviceAccountName := "elastic-curator"}}
 {{ tuple $envAll "curator" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
 ---
@@ -43,6 +45,19 @@ spec:
               command:
                 - /tmp/curator.sh
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.curator | include "helm-toolkit.snippets.kubernetes_resources" | indent 14 }}
+              env:
+                - name: ELASTICSEARCH_HOST
+                  value: {{ tuple "elasticsearch" "internal" "http" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" }}
+                - name: ELASTICSEARCH_USERNAME
+                  valueFrom:
+                    secretKeyRef:
+                      name: {{ $esUserSecret }}
+                      key: ELASTICSEARCH_USERNAME
+                - name: ELASTICSEARCH_PASSWORD
+                  valueFrom:
+                    secretKeyRef:
+                      name: {{ $esUserSecret }}
+                      key: ELASTICSEARCH_PASSWORD
               volumeMounts:
                 - name: pod-etc-curator
                   mountPath: /etc/config

elasticsearch/values.yaml

@@ -171,8 +171,8 @@ conf:
   init:
     max_map_count: 262144
   curator:
-    #runs weekly
+    #run every 6th hour
-    schedule:  "0 0 * * 0"
+    schedule:  "0 */6 * * *"
     action_file:
       # Remember, leave a key empty if there is no value.  None will be a string,
       # not a Python "NoneType"
@@ -183,7 +183,8 @@ conf:
       actions:
         1:
           action: delete_indices
-          description: "Clean up ES by deleting old indices"
+          description: >-
+            "Delete indices older than 7 days"
           options:
             timeout_override:
             continue_if_exception: False
@@ -195,14 +196,31 @@ conf:
             direction: older
             timestring: '%Y.%m.%d'
             unit: days
-            unit_count: 30
+            unit_count: 7
-            field:
+            exclude: True
-            stats_result:
-            epoch:
-            exclude: False
         2:
+          action: delete_indices
+          description: >-
+            "Delete indices by age if available disk space is
+             less than 80% total disk"
+          options:
+            timeout_override: 600
+            continue_if_exception: False
+            ignore_empty_list: True
+            disable_action: True
+          filters:
+          - filtertype: space
+            source: creation_date
+            use_age: True
+            # This space assumes the default PVC size of 5Gi times three data
+            # replicas. This must be adjusted if changed due to Curator being
+            # unable to calculate percentages of total disk space
+            disk_space: 12
+            exclude: False
+        3:
           action: snapshot
-          description: "Snapshot indices and send to configured repository"
+          description: >-
+            "Snapshot indices older than one day"
           options:
             repository: default_repo
             # Leaving this blank results in the default name format
@@ -210,7 +228,7 @@ conf:
             wait_for_completion: True
             max_wait: 3600
             wait_interval: 10
-            timeout_override:
+            timeout_override: 600
             ignore_empty_list: True
             continue_if_exception: False
             disable_action: True
@@ -220,31 +238,40 @@ conf:
             direction: older
             timestring: '%Y.%m.%d'
             unit: days
-            unit_count: 30
+            unit_count: 1
-            field:
-            stats_result:
-            epoch:
             exclude: False
+        4:
+          action: delete_snapshots
+          description: >-
+            "Delete snapshots older than 30 days"
+          options:
+            repository: default_repo
+            disable_action: True
+            timeout_override: 600
+            ignore_empty_list: True
+          filters:
+          - filtertype: pattern
+            kind: prefix
+            value: curator-
+            exclude:
+          - filtertype: age
+            source: creation_date
+            direction: older
+            unit: days
+            unit_count: 30
     config:
       # Remember, leave a key empty if there is no value.  None will be a string,
       # not a Python "NoneType"
       client:
         hosts:
-          - elasticsearch-logging
+          - ${ELASTICSEARCH_HOST}
-        port: 9200
-        url_prefix:
         use_ssl: False
-        certificate:
-        client_cert:
-        client_key:
         ssl_no_validate: False
-        http_auth:
+        http_auth: ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD}
-        timeout: 30
+        timeout: 60
-        master_only: False
       logging:
         loglevel: INFO
-        logfile:
+        logformat: logstash
-        logformat: default
         blacklist: ['elasticsearch', 'urllib3']
   elasticsearch:
     config: