Fix merge issue

molecule/default/molecule.yml

@@ -39,10 +39,19 @@ provisioner:
   inventory:
     group_vars:
       all:
+        telegraf_plugins_extra:
+          percpu-usage:
+            plugin: cpu
+            config:
+              - percpu = true
+              - totalcpu = false
+              - name_override = "percpu_usage"
+              - fielddrop = ["cpu_time*"]
+
         telegraf_plugins_default:
           - plugin: cpu
             config:
-            - percpu = true
+              - percpu = true
           - plugin: disk
           - plugin: io
           - plugin: mem
@@ -54,14 +63,7 @@ provisioner:
           - plugin: kernel
           - plugin: nginx
             config:
-            - urls = ["http://localhost/nginx_status"]
-          - plugin: logparser
-            config:
-              - files = ["/var/log/nginx/access.log"]
-              - from_beginning = true
-              - name_override = "nginx_access_log"
-              - \[logparser.grok\]
-              -   patterns = ["%{COMBINED_LOG_FORMAT}"]
+              - urls = ["http://localhost/nginx_status"]
 
 scenario:
   name: default

molecule/default/playbook.yml

@@ -1,22 +1,4 @@
 ---
 - hosts: all
-  pre_tasks:
-    - name: "Installing which on CentOS"
-      yum:
-        name: which
-        state: present
-      when:
-        - ansible_os_family == 'RedHat'
-
-    - name: "Installing wget on Debian"
-      apt:
-        name: "{{ item }}"
-        state: present
-      when:
-        - ansible_os_family == 'Debian'
-      with_items:
-        - wget
-        - gpg
-
   roles:
     - role: ansible-telegraf

molecule/default/prepare.yml

@@ -0,0 +1,19 @@
+---
+
+- hosts: all
+  tasks:
+    - name: "Installing which on CentOS"
+      yum:
+        name: which
+        state: present
+      when:
+        - ansible_os_family == 'RedHat'
+
+    - name: "Installing wget on Debian"
+      apt:
+        name:
+          - wget
+          - gpg
+        state: present
+      when:
+        - ansible_os_family == 'Debian'

molecule/default/tests/test_default.py

@@ -21,6 +21,15 @@ def test_telegraf_dot_conf(File):
     assert telegraf.contains('[[inputs.cpu]]')
 
 
+def test_telegraf_dot_d(File):
+    telegraf = File("/etc/telegraf/telegraf.d/percpu-usage.conf")
+    assert telegraf.user == "telegraf"
+    assert telegraf.group == "telegraf"
+    assert telegraf.mode == 0o640
+    assert telegraf.contains('[[inputs.cpu]]')
+    assert telegraf.contains('totalcpu = false')
+
+
 def test_telegraf_package(Package):
     telegraf = Package('telegraf')
     assert telegraf.is_installed