Преглед на файлове

Merge branch 'master' into feature/fixup-deprecation-rabbitmq-warning

Jared преди 7 години
родител
ревизия
63b7da1331
променени са 5 файла, в които са добавени 30 реда и са изтрити 2 реда
  1. 6 0
      .gitattributes
  2. 2 0
      CHANGELOG.md
  3. 1 0
      defaults/main.yml
  4. 16 2
      tasks/server.yml
  5. 5 0
      templates/sensu-tessen.json.j2

+ 6 - 0
.gitattributes

@@ -0,0 +1,6 @@
+Pipfile export-ignore
+Pipfile.lock export-ignore
+.travis.yml export-ignore
+docs/ export-ignore
+mkdocs.yml export-ignore
+molecule/ export-ignore

+ 2 - 0
CHANGELOG.md

@@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
 ## [Unreleased]
 ### Changed
+- Add support for configuring [Tessen](https://docs.sensu.io/sensu-core/1.4/reference/tessen/) via `sensu_enable_tessen` (@jaredledvina)
+- Stop publishing development/testing files to Ansible Galaxy (@jaredledvina)
 
 ## [2.5.0] - 2018-06-16
 ### Changed

+ 1 - 0
defaults/main.yml

@@ -87,6 +87,7 @@ sensu_client_safe_mode: false
 sensu_deploy_rabbitmq_config: true
 sensu_deploy_redis_config: true
 sensu_deploy_transport_config: true
+sensu_enable_tessen: false
 
 # Sensu/RabbitMQ SSL certificate properties
 sensu_ssl_gen_certs: true

+ 16 - 2
tasks/server.yml

@@ -11,13 +11,27 @@
     src: sensu-api.json.j2
   notify: restart sensu-api service
 
+- name: Deploy Tessen server configuratiuon
+  template:
+    dest: "{{ sensu_config_path }}/conf.d/tessen.json"
+    owner: "{{ sensu_user_name }}"
+    group: "{{ sensu_group_name }}"
+    src: sensu-tessen.json.j2
+  notify: restart sensu-server service
+
 - include: "{{ role_path }}/tasks/SmartOS/server.yml"
   when: ansible_distribution == "SmartOS"
   static: false
 
 - name: Ensure Sensu server service is running
-  service: name={{ sensu_server_service_name if not se_enterprise else sensu_enterprise_service_name }} state=started enabled=yes
+  service:
+    name: "{{ sensu_server_service_name if not se_enterprise else sensu_enterprise_service_name }}"
+    state: started
+    enabled: yes
 
 - name: Ensure Sensu API service is running
-  service: name=sensu-api state=started enabled=yes
+  service:
+    name: sensu-api
+    state: started
+    enabled: yes
   when: not se_enterprise

+ 5 - 0
templates/sensu-tessen.json.j2

@@ -0,0 +1,5 @@
+{
+  "tessen": {
+    "enabled": {{ sensu_enable_tessen | bool | lower }}
+  }
+}