Browse Source

improve deployments on 14.04

Change-Id: Ic2c335d8c3ede9dad2edb86a76139bdb71bdb6f7
Signed-off-by: cloudnull <kevin@cloudnull.com>
changes/01/641901/2
cloudnull 9 months ago
parent
commit
28cb67cf33
No account linked to committer's email address
5 changed files with 23 additions and 10 deletions
  1. +1
    -0
      elk_metrics_6x/roles/elastic_curator/handlers/main.yml
  2. +4
    -4
      elk_metrics_6x/roles/elastic_curator/tasks/curator_upstart.yml
  3. +0
    -5
      elk_metrics_6x/roles/elastic_curator/tasks/main.yml
  4. +17
    -0
      elk_metrics_6x/roles/elastic_curator/vars/ubuntu-14.04.yml
  5. +1
    -1
      elk_metrics_6x/roles/elastic_metricbeat/templates/metricbeat.yml.j2

+ 1
- 0
elk_metrics_6x/roles/elastic_curator/handlers/main.yml View File

@@ -20,5 +20,6 @@
state: restarted
when:
- (elk_package_state | default('present')) != 'absent'
- ansible_service_mgr == 'systemd'
tags:
- config

+ 4
- 4
elk_metrics_6x/roles/elastic_curator/tasks/curator_upstart.yml View File

@@ -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"

+ 0
- 5
elk_metrics_6x/roles/elastic_curator/tasks/main.yml View File

@@ -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

+ 17
- 0
elk_metrics_6x/roles/elastic_curator/vars/ubuntu-14.04.yml View File

@@ -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

+ 1
- 1
elk_metrics_6x/roles/elastic_metricbeat/templates/metricbeat.yml.j2 View File

@@ -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.

Loading…
Cancel
Save