From b4611f818421d5c782df6e70e61d074642cf5984 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Tue, 11 Jun 2019 18:36:04 +0200
Subject: [PATCH] ansible-playbooks/general#85 Linting
---
meta/main.yml | 2 +-
tasks/config.yml | 2 +-
tasks/install.yml | 4 +-
tasks/main.yml | 4 +-
templates/heartbeat.yml | 82 +++++++++++++++++++++--------------------
5 files changed, 48 insertions(+), 46 deletions(-)
diff --git a/meta/main.yml b/meta/main.yml
index 08947d7..55ae93d 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -1,4 +1,4 @@
---
dependencies:
-- { role: kibana }
+ - { role: kibana }
diff --git a/tasks/config.yml b/tasks/config.yml
index 6864c99..d53bcd4 100644
--- a/tasks/config.yml
+++ b/tasks/config.yml
@@ -14,7 +14,7 @@
group: root
mode: 0600
notify:
- - Restart Heartbeat
+ - Restart Heartbeat
- name: Copy all monitor configurations
copy:
diff --git a/tasks/install.yml b/tasks/install.yml
index 542c7d2..6a09228 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -18,5 +18,5 @@
state: present
update_cache: yes
notify:
- - Add Heartbeat to Boot-List
- - Start Heartbeat
+ - Add Heartbeat to Boot-List
+ - Start Heartbeat
diff --git a/tasks/main.yml b/tasks/main.yml
index 538ad1e..1f3e924 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -9,8 +9,8 @@
- block:
- - include_tasks: install.yml
+ - include_tasks: install.yml
- - include_tasks: config.yml
+ - include_tasks: config.yml
when: not excluded_roles or "heartbeat" not in excluded_roles
diff --git a/templates/heartbeat.yml b/templates/heartbeat.yml
index 7f9b3a7..54fd0ca 100644
--- a/templates/heartbeat.yml
+++ b/templates/heartbeat.yml
@@ -7,56 +7,58 @@
# You can find the full configuration reference here:
# https://www.elastic.co/guide/en/beats/heartbeat/index.html
+---
+
############################# Heartbeat ######################################
# Configure monitors
heartbeat.config.monitors:
path: /etc/heartbeat/monitors.d/*.yml
- reload.enabled: true
+ reload.enabled: yes
reload.period: 5s
# Configure monitors inline
heartbeat.monitors:
-- type: http
- urls: ["http://localhost:9200"]
- schedule: @every 10s
+ - type: http
+ urls: ["http://localhost:9200"]
+ schedule: '@every 10s'
-#==================== Elasticsearch template setting ==========================
+# ==================== Elasticsearch template setting ==========================
setup.template.settings:
index.number_of_shards: 1
index.codec: best_compression
- #_source.enabled: false
+ # _source.enabled: false
-#================================ General =====================================
+# ================================ General =====================================
# The name of the shipper that publishes the network data. It can be used to group
# all the transactions sent by a single shipper in the web interface.
-#name:
+# name:
# The tags of the shipper are included in their own field with each
# transaction published.
-#tags: ["service-X", "web-tier"]
+# tags: ["service-X", "web-tier"]
# Optional fields that you can specify to add additional information to the
# output.
-#fields:
-# env: staging
+# fields:
+# env: staging
-#============================== Dashboards =====================================
+# ============================== Dashboards =====================================
# These settings control loading the sample dashboards to the Kibana index. Loading
# the dashboards is disabled by default and can be enabled either by setting the
# options here, or by using the `-setup` CLI flag or the `setup` command.
-#setup.dashboards.enabled: false
+# setup.dashboards.enabled: false
# The URL from where to download the dashboards archive. By default this URL
# has a value which is computed based on the Beat name and version. For released
# versions, this URL points to the dashboard archive on the artifacts.elastic.co
# website.
-#setup.dashboards.url:
+# setup.dashboards.url:
-#============================== Kibana =====================================
+# ============================== Kibana =====================================
# Starting with Beats version 6.0.0, the dashboards are loaded via the Kibana API.
# This requires a Kibana endpoint configuration.
@@ -66,85 +68,85 @@ setup.kibana:
# Scheme and port can be left out and will be set to the default (http and 5601)
# In case you specify and additional path, the scheme is required: http://localhost:5601/path
# IPv6 addresses should always be defined as: https://[2001:db8::1]:5601
-#host: "localhost:5601"
+# host: "localhost:5601"
# Kibana Space ID
# ID of the Kibana Space into which the dashboards should be loaded. By default,
# the Default Space will be used.
-#space.id:
+# space.id:
-#============================= Elastic Cloud ==================================
+# ============================= Elastic Cloud ==================================
# These settings simplify using heartbeat with the Elastic Cloud (https://cloud.elastic.co/).
# The cloud.id setting overwrites the `output.elasticsearch.hosts` and
# `setup.kibana.host` options.
# You can find the `cloud.id` in the Elastic Cloud web UI.
-#cloud.id:
+# cloud.id:
# The cloud.auth setting overwrites the `output.elasticsearch.username` and
# `output.elasticsearch.password` settings. The format is `<user>:<pass>`.
-#cloud.auth:
+# cloud.auth:
-#================================ Outputs =====================================
+# ================================ Outputs =====================================
# Configure what output to use when sending the data collected by the beat.
-#-------------------------- Elasticsearch output ------------------------------
+# -------------------------- Elasticsearch output ------------------------------
output.elasticsearch:
# Array of hosts to connect to.
hosts: ["localhost:9200"]
# Optional protocol and basic auth credentials.
- #protocol: "https"
- #username: "elastic"
- #password: "changeme"
+ # protocol: "https"
+ # username: "elastic"
+ # password: "changeme"
- #----------------------------- Logstash output --------------------------------
- #output.logstash:
+ # ----------------------------- Logstash output --------------------------------
+ # output.logstash:
# The Logstash hosts
- #hosts: ["localhost:5044"]
+ # hosts: ["localhost:5044"]
# Optional SSL. By default is off.
# List of root certificates for HTTPS server verifications
- #ssl.certificate_authorities: ["/etc/pki/root/ca.pem"]
+ # ssl.certificate_authorities: ["/etc/pki/root/ca.pem"]
# Certificate for SSL client authentication
- #ssl.certificate: "/etc/pki/client/cert.pem"
+ # ssl.certificate: "/etc/pki/client/cert.pem"
# Client Certificate Key
- #ssl.key: "/etc/pki/client/cert.key"
+ # ssl.key: "/etc/pki/client/cert.key"
-#================================ Procesors =====================================
+# ================================ Procesors =====================================
# Configure processors to enhance or manipulate events generated by the beat.
processors:
-- add_host_metadata: ~
-- add_cloud_metadata: ~
+ - add_host_metadata: ~
+ - add_cloud_metadata: ~
-#================================ Logging =====================================
+# ================================ Logging =====================================
# Sets log level. The default log level is info.
# Available log levels are: error, warning, info, debug
-#logging.level: debug
+# logging.level: debug
# At debug level, you can selectively enable logging only for some components.
# To enable all selectors use ["*"]. Examples of other selectors are "beat",
# "publish", "service".
-#logging.selectors: ["*"]
+# logging.selectors: ["*"]
-#============================== Xpack Monitoring ===============================
+# ============================== Xpack Monitoring ===============================
# heartbeat can export internal metrics to a central Elasticsearch monitoring
# cluster. This requires xpack monitoring to be enabled in Elasticsearch. The
# reporting is disabled by default.
# Set to true to enable the monitoring reporter.
-#xpack.monitoring.enabled: false
+# xpack.monitoring.enabled: false
# Uncomment to send the metrics to Elasticsearch. Most settings from the
# Elasticsearch output are accepted here as well. Any setting that is not set is
# automatically inherited from the Elasticsearch output configuration, so if you
# have the Elasticsearch output configured, you can simply uncomment the
# following line.
-#xpack.monitoring.elasticsearch:
+# xpack.monitoring.elasticsearch:
--
GitLab