From 28cb67cf3313a1ee4c25b1b2a3b7e8a5caeec90e Mon Sep 17 00:00:00 2001
From: cloudnull <kevin@cloudnull.com>
Date: Thu, 7 Mar 2019 20:04:54 -0600
Subject: [PATCH] improve deployments on 14.04

Change-Id: Ic2c335d8c3ede9dad2edb86a76139bdb71bdb6f7
Signed-off-by: cloudnull <kevin@cloudnull.com>
---
 .../roles/elastic_curator/handlers/main.yml     |  1 +
 .../elastic_curator/tasks/curator_upstart.yml   |  8 ++++----
 .../roles/elastic_curator/tasks/main.yml        |  5 -----
 .../roles/elastic_curator/vars/ubuntu-14.04.yml | 17 +++++++++++++++++
 .../templates/metricbeat.yml.j2                 |  2 +-
 5 files changed, 23 insertions(+), 10 deletions(-)
 create mode 100644 elk_metrics_6x/roles/elastic_curator/vars/ubuntu-14.04.yml

diff --git a/elk_metrics_6x/roles/elastic_curator/handlers/main.yml b/elk_metrics_6x/roles/elastic_curator/handlers/main.yml
index 93f43ac3..ef153bdc 100644
--- a/elk_metrics_6x/roles/elastic_curator/handlers/main.yml
+++ b/elk_metrics_6x/roles/elastic_curator/handlers/main.yml
@@ -20,5 +20,6 @@
     state: restarted
   when:
     - (elk_package_state | default('present')) != 'absent'
+    - ansible_service_mgr == 'systemd'
   tags:
     - config
diff --git a/elk_metrics_6x/roles/elastic_curator/tasks/curator_upstart.yml b/elk_metrics_6x/roles/elastic_curator/tasks/curator_upstart.yml
index 66c660fc..3a3d1d49 100644
--- a/elk_metrics_6x/roles/elastic_curator/tasks/curator_upstart.yml
+++ b/elk_metrics_6x/roles/elastic_curator/tasks/curator_upstart.yml
@@ -16,8 +16,8 @@
 - name: Create cron job for curator (age)
   cron:
     name: "Run curator"
-    minute: 0
-    hour: 1
+    minute: "0"
+    hour: "1"
     user: "curator"
     job: "/opt/elasticsearch-curator/bin/curator --config /var/lib/curator/curator.yml /var/lib/curator/actions-age.yml"
     cron_file: "elasticsearch-curator"
@@ -25,8 +25,8 @@
 - name: Create cron job for curator (size)
   cron:
     name: "Run curator"
-    minute: 0
-    hour: */5
+    minute: "0"
+    hour: "*/5"
     user: "curator"
     job: "/opt/elasticsearch-curator/bin/curator --config /var/lib/curator/curator.yml /var/lib/curator/actions-size.yml"
     cron_file: "elasticsearch-curator"
diff --git a/elk_metrics_6x/roles/elastic_curator/tasks/main.yml b/elk_metrics_6x/roles/elastic_curator/tasks/main.yml
index 9aa6681c..1c014d3e 100644
--- a/elk_metrics_6x/roles/elastic_curator/tasks/main.yml
+++ b/elk_metrics_6x/roles/elastic_curator/tasks/main.yml
@@ -25,11 +25,6 @@
   tags:
     - always
 
-- name: exit playbook after uninstall
-  meta: end_play
-  when:
-      ansible_service_mgr != 'systemd'
-
 - name: Refresh local facts
   setup:
     filter: ansible_local
diff --git a/elk_metrics_6x/roles/elastic_curator/vars/ubuntu-14.04.yml b/elk_metrics_6x/roles/elastic_curator/vars/ubuntu-14.04.yml
new file mode 100644
index 00000000..a3eb703e
--- /dev/null
+++ b/elk_metrics_6x/roles/elastic_curator/vars/ubuntu-14.04.yml
@@ -0,0 +1,17 @@
+---
+# Copyright 2018, Rackspace US, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+curator_distro_packages:
+  - python-virtualenv
diff --git a/elk_metrics_6x/roles/elastic_metricbeat/templates/metricbeat.yml.j2 b/elk_metrics_6x/roles/elastic_metricbeat/templates/metricbeat.yml.j2
index 6e31c05c..1f9d9eff 100644
--- a/elk_metrics_6x/roles/elastic_metricbeat/templates/metricbeat.yml.j2
+++ b/elk_metrics_6x/roles/elastic_metricbeat/templates/metricbeat.yml.j2
@@ -109,7 +109,7 @@ metricbeat.modules:
   process.cmdline.cache.enabled: true
 
   # Enable collection of cgroup metrics from processes on Linux.
-  process.cgroups.enabled: true
+  process.cgroups.enabled: {{ ansible_service_mgr == 'systemd' }}
 
   # A list of regular expressions used to whitelist environment variables
   # reported with the process metricset's events. Defaults to empty.