diff --git a/README.rst b/README.rst index 568dda6d5a4805dc87be3e10fd43558e4486546f..391ec8842c104adf024aa694652d3cef1fe7e51e 100644 --- a/README.rst +++ b/README.rst @@ -21,10 +21,6 @@ Role Variables backports: False # To enable Debian backports repos. ssh_ca: # TBD. syslog_server: # The address of syslog server to forward. - collectd_graphite_server: - collectd_riemann_server: - collectd_collectd_server: - collectd_statsd_server: tls_cert: # Filename of the TLS cert for that host. tls_key: # Filename of the TLS key for that host. tls_ca_cert: #Filename of the TLS CA cert for that host. diff --git a/defaults/main.yml b/defaults/main.yml index 4c0528b6e1e44700aafae2a8d07ad90a144c0041..fa7308e2743441317a9701909228d9c18c894de4 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,4 +1,2 @@ --- # defaults file for ansible-common - -extra_tls_certs: [] diff --git a/files/collectd.conf b/files/collectd.conf deleted file mode 100644 index 1c5eb8e184b1083e8be54964d1fa246c6f0f4aa4..0000000000000000000000000000000000000000 --- a/files/collectd.conf +++ /dev/null @@ -1,8 +0,0 @@ -AutoLoadPlugin true -FQDNLookup false -<Plugin syslog> - LogLevel info -</Plugin> -<Include "/etc/collectd/collectd.conf.d"> - Filter "*.conf" -</Include> diff --git a/handlers/main.yml b/handlers/main.yml index b3cd640beafc7492d67f4242e6e6aeb23158d155..57565ed6da713bec92f3246454ad2be587f458a3 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -13,8 +13,3 @@ service: name: syslogd state: restarted - -- name: Restart Collectd - service: - name: collectd - state: restarted diff --git a/tasks/add_tls_cert.yml b/tasks/add_tls_cert.yml deleted file mode 100644 index a559cab453b4537f436170e167e7f75a11f63174..0000000000000000000000000000000000000000 --- a/tasks/add_tls_cert.yml +++ /dev/null @@ -1,27 +0,0 @@ ---- - -- name: Assert - assert: - that: - - "ansible_os_family in [ 'Debian', 'OpenBSD' ]" - - "extra_tls_certs is defined" - -- name: apt install CA certificates - when: ansible_pkg_mgr == 'apt' - apt: - name: ca-certificates - state: present - update_cache: yes - cache_valid_time: 3600 - -- name: Add TLS cert - with_items: extra_tls_certs - when: ansible_os_family == 'Debian' - copy: - src: '{{ item }}' - dest: '{{ cert_dir[ansible_os_family] }}/{{ item|basename }}.crt' - owner: root - group: 0 - mode: 0o0644 - notify: - - Update CA store diff --git a/tasks/collectd_agent.yml b/tasks/collectd_agent.yml deleted file mode 100644 index 34ace24392bb006796cb4b28b7f454cd6afe2a10..0000000000000000000000000000000000000000 --- a/tasks/collectd_agent.yml +++ /dev/null @@ -1,59 +0,0 @@ ---- - -- name: Assert - assert: - that: ansible_os_family in [ 'Debian', 'OpenBSD' ] - -- name: apt install Collectd - when: ansible_pkg_mgr == 'apt' - apt: - name: collectd - install_recommends: no - state: present - update_cache: yes - cache_valid_time: 3600 - -- name: pkg install Collectd - when: ansible_pkg_mgr == 'openbsd_pkg' - openbsd_pkg: - name: '{{ openbsd_collectd_version[ansible_distribution_release] }}' - state: present - -- name: Create configuration directory - file: - path: /etc/collectd/collectd.conf.d/ - owner: root - group: 0 - mode: 0o0755 - state: directory - -- name: Gather Collectd facts - collectd_facts: - -- name: Base Collectd configuration - copy: - src: collectd.conf - dest: /etc/collectd/collectd.conf - owner: root - group: 0 - mode: 0o0644 - notify: - - Restart Collectd - -- name: Default Collectd configuration - with_fileglob: - - template/collectd/*.j2 - template: - src: '{{ item }}' - dest: /etc/collectd/collectd.conf.d/ - owner: root - group: 0 - mode: 0o0644 - notify: - - Restart Collectd - -- name: Enabled Collectd service - service: - name: collectd - state: started - enabled: yes diff --git a/tasks/main.yml b/tasks/main.yml index 95c20ef6d68116997c48b4b0fdcb59dee9f4887d..c0001f391a918b8d41c24abefd8249f7ea658fd8 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -11,14 +11,8 @@ - include: tls_cert.yml when: tls_cert|default(True) and not common_role_finished is defined -- include: add_tls_cert.yml - when: not common_role_finished is defined - - include: syslog_forward.yml when: syslog_server is defined and not common_role_finished is defined -- include: collectd_agent.yml - when: (collectd_graphite_server is defined or collectd_riemann_server is defined or collectd_collectd_server is defined or collectd_statsd_server is defined) and not common_role_finished is defined - - set_fact: common_role_finished: True diff --git a/templates/collectd/write.conf.j2 b/templates/collectd/write.conf.j2 deleted file mode 100644 index a232ac8f54b447ac9c92676ca65449aef528b587..0000000000000000000000000000000000000000 --- a/templates/collectd/write.conf.j2 +++ /dev/null @@ -1,9 +0,0 @@ -{% if collectd_collectd_server is defined %} - -{% elif collectd_riemann_server is defined and (collectd['major'] > 5 or -(collectd['major'] == 5 and collectd['minor'] >= 3)) %} - -{% elif collectd_graphite_server is defined and (collectd['major'] > 5 or -(collectd['major'] == 5 and collectd['minor'] >= 1)) %} - -{% endif %} diff --git a/vars/main.yml b/vars/main.yml index a417483acce90ce0d73c83f269071742b3a6ef35..d6069519b05101f36345894413566ba71adc13b8 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -15,12 +15,6 @@ backports_repo: precise: http://archive.ubuntu.com/ubuntu precise-backports main universe multiverse trusty: http://archive.ubuntu.com/ubuntu trusty-backports main universe multiverse -openbsd_collectd_version: - '5.5': 'collectd-4.10.2p4' - '5.6': 'collectd-4.10.2p4' - '5.7': 'collectd-5.4.1p1' - '5.8': 'collectd-5.5.0p1' - ca_store: OpenBSD: /etc/ssl/cert.pem Debian: /etc/ssl/certs/ca-certificates.crt