Merge pull request #4 from infrawatch/import-templates-defaults

Import template and defaults changes

.ansible-lint

@@ -0,0 +1,3 @@
+skip_list:
+   - '701'  # Role info should contain platforms
+   - '703'  # Should change default metadata

.travis.yml

@@ -1,19 +1,26 @@
----
+os: linux
 language: python
 python: "2.7"
 
-# Use the new container infrastructure
-sudo: false
+git:
+  depth: false
 
 # Install ansible
 addons:
   apt:
+    update: true
     packages:
-    - python-pip
+      - python-pip
+
+services:
+  - docker
+
+before_install:
+  - sudo docker pull docker.io/tripleomaster/centos-binary-collectd:current-tripleo-rdo
 
 install:
   # Install ansible
-  - pip install ansible
+  - pip install ansible ansible-lint
 
   # Check ansible version
   - ansible --version
@@ -24,6 +31,12 @@ install:
 script:
   # Basic role syntax check
   - ansible-playbook tests/test.yml -i tests/inventory --syntax-check
+  - ansible-lint
+  # Run the role
+  - ansible-playbook tests/test.yml -i tests/inventory --extra-vars "collectd_conf_output_dir=$HOME/collectd.conf.d" && cat $HOME/collectd.conf.d/*
+  - sudo docker run -dti --name collectd-test --net=host -v $HOME/collectd.conf.d:/opt/collectd/etc/collectd.conf.d -v /var/run:/var/run -v /tmp:/tmp -v `pwd`/tests/kolla_config_files/:/var/lib/kolla/config_files/ -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS --privileged tripleomaster/centos-binary-collectd:current-tripleo-rdo
+  - sudo docker logs collectd-test
+  - sudo docker exec collectd-test collectdctl -s /var/run/collectd-socket listval
 
 notifications:
-  webhooks: https://galaxy.ansible.com/api/v1/notifications/
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/

defaults/main/cpu.yml

@@ -1,4 +1,9 @@
+---
+# Ansible managed
+# Defaults for cpu plugin
 collectd_plugin_cpu_reportbycpu: true
 collectd_plugin_cpu_reportbystate: true
 collectd_plugin_cpu_reportnumcpu: false
 collectd_plugin_cpu_valuespercentage: true
+# collectd_plugin_cpu_reportgueststate: true
+# collectd_plugin_cpu_subtractgueststate: true

defaults/main/csv.yml

@@ -0,0 +1,5 @@
+---
+# Ansible managed
+# Defaults for csv plugin
+collectd_plugin_csv_datadir: /var/log/collectd/csv/
+collectd_plugin_csv_storerates: false

defaults/main/df.yml

@@ -1,7 +1,11 @@
 ---
-# defaults for configuring the df plugin
+# Ansible managed
+# Defaults for df plugin
+# collectd_plugin_df_device: nil
+# collectd_plugin_df_mountpoint: nil
+# collectd_plugin_df_fstype: nil
+collectd_plugin_df_ignoreselected: true
 collectd_plugin_df_reportbydevice: true
-#TODO: make this do something useful
-collectd_plugin_df_fstypes: ['xfs']
-
-#TODO: Add if def in templates for non-required plugin options
+collectd_plugin_df_reportinodes: true
+collectd_plugin_df_valuesabsolute: true
+collectd_plugin_df_valuespercentage: true

defaults/main/disk.yml

@@ -1,3 +1,5 @@
 ---
-# defaults for disk plugin
-collectd_plugin_disk_ignoreselected: false
+# Ansible managed
+# Defaults for disk plugin
+# collectd_plugin_disk_disk: []
+collectd_plugin_disk_ignoreselected: False

defaults/main/load.yml

@@ -1,3 +1,4 @@
 ---
-# defaults for load plugin
-collectd_plugin_load_reportrelative: true
+# Ansible managed
+# Defaults for load plugin
+collectd_plugin_load_reportrelative: True

defaults/main/memory.yml

@@ -0,0 +1,5 @@
+---
+# Ansible managed
+# Defaults for memory plugin
+collectd_plugin_memory_valuesabsolute: True
+collectd_plugin_memory_valuespercentage: True

defaults/main/unixsock.yml

@@ -1,5 +1,7 @@
 ---
-# defaults for unixsock plugin
-collectd_plugin_unixsock_socketgroup: "root"
-collectd_plugin_unixsock_socketfile: "/var/run/collectd-socket"
-collectd_plugin_unixsock_deletesocket: true
+# Ansible managed
+# Defaults for unixsock plugin
+collectd_plugin_unixsock_socketfile: /var/run/collectd-socket
+collectd_plugin_unixsock_socketgroup: root
+# collectd_plugin_unixsock_socketperms: nil
+collectd_plugin_unixsock_deletesocket: True

defaults/main/virt.yml

@@ -1,7 +1,8 @@
 ---
-# default values for configuring the virt plugin
-collectd_plugin_virt_connection: "qemu:///system"
-collectd_plugin_virt_refresh_interval: 10
-collectd_plugin_virt_hostname_format: "hostname"
-collectd_plugin_virt_plugininstanceformat: "hostname uuid"
-collectd_plugin_virt_extra_stats: "cpu_util disk disk_err pcpu job_stats_background perf vcpupin"
+# Ansible managed
+# Defaults for virt plugin
+collectd_plugin_virt_connection: qemu:///system
+collectd_plugin_virt_refreshinterval: 10
+collectd_plugin_virt_hostnameformat: hostname
+collectd_plugin_virt_plugininstanceformat: name
+collectd_plugin_virt_extrastats: cpu_util disk disk_err pcpu job_stats_background perf vcpupin

templates/cpu.conf.j2

@@ -1,10 +1,15 @@
+# Ansible managed
 LoadPlugin cpu
 
-<Plugin cpu>
-  ReportByState {{ collectd_plugin_cpu_reportbystate }}
-  ReportByCpu {{ collectd_plugin_cpu_reportbystate }}
-  ValuesPercentage {{ collectd_plugin_cpu_valuespercentage }}
-  ReportNumCpu {{ collectd_plugin_cpu_reportnumcpu }}
-  ReportGuestState true
-  SubtractGuestState true
+<Plugin "cpu">
+  ReportByCpu "{{ collectd_plugin_cpu_reportbycpu }}"
+  ReportByState "{{ collectd_plugin_cpu_reportbystate }}"
+  ReportNumCpu "{{ collectd_plugin_cpu_reportnumcpu }}"
+  ValuesPercentage "{{ collectd_plugin_cpu_valuespercentage }}"
+{% if collectd_plugin_cpu_reportgueststate is defined %}
+  ReportGuestState "{{ collectd_plugin_cpu_reportgueststate }}"
+{% endif %}
+{% if collectd_plugin_cpu_subtractgueststate is defined %}
+  SubtractGuestState "{{ collectd_plugin_cpu_subtractgueststate }}"
+{% endif %}
 </Plugin>

templates/cpufreq.conf.j2

@@ -0,0 +1,5 @@
+# Ansible managed
+LoadPlugin cpufreq
+
+<Plugin "cpufreq">
+</Plugin>

templates/cpusleep.conf.j2

@@ -0,0 +1,5 @@
+# Ansible managed
+LoadPlugin cpusleep
+
+<Plugin "cpusleep">
+</Plugin>

templates/csv.conf.j2

@@ -0,0 +1,7 @@
+# Ansible managed
+LoadPlugin csv
+
+<Plugin "csv">
+  DataDir "{{ collectd_plugin_csv_datadir }}"
+  StoreRates "{{ collectd_plugin_csv_storerates }}"
+</Plugin>

templates/df.conf.j2

@@ -1,9 +1,19 @@
+# Ansible managed
 LoadPlugin df
 
-<Plugin df>
-  IgnoreSelected true
-  ReportByDevice {{ collectd_plugin_df_reportbydevice }}
-  ReportInodes true
-  ValuesAbsolute true
-  ValuesPercentage true
+<Plugin "df">
+{% if collectd_plugin_df_device is defined %}
+  Device "{{ collectd_plugin_df_device }}"
+{% endif %}
+{% if collectd_plugin_df_mountpoint is defined %}
+  MountPoint "{{ collectd_plugin_df_mountpoint }}"
+{% endif %}
+{% if collectd_plugin_df_fstype is defined %}
+  FSType "{{ collectd_plugin_df_fstype }}"
+{% endif %}
+  IgnoreSelected "{{ collectd_plugin_df_ignoreselected }}"
+  ReportByDevice "{{ collectd_plugin_df_reportbydevice }}"
+  ReportInodes "{{ collectd_plugin_df_reportinodes }}"
+  ValuesAbsolute "{{ collectd_plugin_df_valuesabsolute }}"
+  ValuesPercentage "{{ collectd_plugin_df_valuespercentage }}"
 </Plugin>

templates/disk.conf.j2

@@ -1,5 +1,11 @@
+# Ansible managed
 LoadPlugin disk
 
-<Plugin disk>
-  IgnoreSelected {{ collectd_plugin_disk_ignoreselected }}
+<Plugin "disk">
+{% if collectd_plugin_disk_disk is defined %}
+  {% for disk in collectd_plugin_disk_disk %}
+  Disk "{{ disk }}"
+  {% endfor %}
+{% endif %}
+  IgnoreSelected {{ collectd_plugin_disk_ignoreselected| string | lower }}
 </Plugin>

templates/load.conf.j2

@@ -1,5 +1,8 @@
+# Ansible managed
 LoadPlugin load
 
-<Plugin load>
-  ReportRelative true
+<Plugin "load">
+{% if collectd_plugin_load_reportrelative is defined %}
+  ReportRelative {{ collectd_plugin_load_reportrelative| string | lower }}
+{% endif %}
 </Plugin>

templates/memory.conf.j2

@@ -1,6 +1,11 @@
+# Ansible managed
 LoadPlugin memory
 
-<Plugin memory>
-  ValuesAbsolute true
-  ValuesPercentage true
+<Plugin "memory">
+{% if collectd_plugin_memory_valuesabsolute is defined %}
+  ValuesAbsolute {{ collectd_plugin_memory_valuesabsolute| string | lower }}
+{% endif %}
+{% if collectd_plugin_memory_valuespercentage is defined %}
+  ValuesPercentage {{ collectd_plugin_memory_valuespercentage| string | lower }}
+{% endif %}
 </Plugin>

templates/unixsock.conf.j2

@@ -1,4 +1,15 @@
+# Ansible managed
 LoadPlugin unixsock
 
-<Plugin unixsock>
+<Plugin "unixsock">
+  SocketFile "{{ collectd_plugin_unixsock_socketfile }}"
+{% if collectd_plugin_unixsock_socketgroup is defined %}
+  SocketGroup "{{ collectd_plugin_unixsock_socketgroup }}"
+{% endif %}
+{% if collectd_plugin_unixsock_socketperms is defined %}
+  SocketPerms "{{ collectd_plugin_unixsock_socketperms }}"
+{% endif %}
+{% if collectd_plugin_unixsock_deletesocket is defined %}
+  DeleteSocket {{ collectd_plugin_unixsock_deletesocket| string | lower }}
+{% endif %}
 </Plugin>

templates/uptime.conf.j2

@@ -1 +1,5 @@
+# Ansible managed
 LoadPlugin uptime
+
+<Plugin "uptime">
+</Plugin>

templates/uuid.conf.j2

@@ -0,0 +1,8 @@
+# Ansible managed
+LoadPlugin uuid
+
+<Plugin "uuid">
+{% if collectd_plugin_uuid_uuidfile is defined %}
+  UUIDFile "{{ collectd_plugin_uuid_uuidfile }}"
+{% endif %}
+</Plugin>

templates/virt.conf.j2

@@ -1,9 +1,18 @@
+# Ansible managed
 LoadPlugin virt
 
-<Plugin virt>
-   Connection {{ collectd_plugin_virt_connection }}
-   RefreshInterval {{ collectd_plugin_virt_refreshinterval }}
-   HostnameFormat {{ collectd_plugin_virt_hostnameformat }}
-   PluginInstanceFormat {{ collectd_plugin_virt_plugininstanceformat }}
-   ExtraStats "{{ collectd_plugin_extrastats }}"
+<Plugin "virt">
+  Connection "{{ collectd_plugin_virt_connection }}"
+{% if collectd_plugin_virt_refreshinterval is defined %}
+  RefreshInterval {{ collectd_plugin_virt_refreshinterval| string | lower }}
+{% endif %}
+{% if collectd_plugin_virt_hostnameformat is defined %}
+  HostnameFormat "{{ collectd_plugin_virt_hostnameformat }}"
+{% endif %}
+{% if collectd_plugin_virt_plugininstanceformat is defined %}
+  PluginInstanceFormat "{{ collectd_plugin_virt_plugininstanceformat }}"
+{% endif %}
+{% if collectd_plugin_virt_extrastats is defined %}
+  ExtraStats "{{ collectd_plugin_virt_extrastats }}"
+{% endif %}
 </Plugin>

tests/inventory

@@ -1,2 +1,2 @@
-localhost
+localhost ansible_connection=local
 

tests/kolla_config_files/config.json

@@ -0,0 +1,10 @@
+{
+    "command": "/usr/sbin/collectd -f -C /opt/collectd/etc/collectd.conf.d",
+    "permissions": [
+        {
+             "owner": "collectd:collectd",
+             "path": "/var/log/collectd",
+             "recurse": true
+        }
+    ]
+}

tests/test.yml

@@ -2,4 +2,29 @@
 - hosts: localhost
   remote_user: root
   roles:
-    - test-role
+    - '../../collectd-config-ansible-role'
+  vars:
+      collectd_plugins:
+        # - amqp1
+        # - ceph
+        - connectivity
+        - cpu
+        - csv
+        - df
+        - disk
+        - hugepages
+        - intel_rdt
+        - interface
+        # TODO: reenable this when there are reasonable defaults or the template has been updated
+        # - ipmi
+        - load
+        # - logfile
+        - memory
+        - network
+        - ovs_stats
+        - processes
+        - procevent
+        # - python
+        - unixsock
+        - uptime
+        # - virt