forked from infra/ansible
Collectd: cleanup collectd everywhere except FMN
Signed-off-by: Greg Sutcliffe <fedora@emeraldreverie.org>
This commit is contained in:
parent
1529684dc1
commit
c51e04de81
93 changed files with 16 additions and 481 deletions
|
|
@ -11,9 +11,6 @@
|
|||
- name: Reload apache
|
||||
action: service name=httpd state=reloaded
|
||||
|
||||
- name: Restart collectd
|
||||
action: service name=collectd state=restarted
|
||||
|
||||
- name: Restart crond
|
||||
action: service name=crond state=restarted
|
||||
|
||||
|
|
|
|||
|
|
@ -36,8 +36,6 @@ baseiptables: True
|
|||
become: false
|
||||
br0_nm: 255.255.255.0
|
||||
br1_nm: 255.255.255.0
|
||||
# assume collectd apache
|
||||
collectd_apache: true
|
||||
# communishift project resource overrides
|
||||
communishift_projects:
|
||||
# please keep these sorted alphabetically for readability
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
---
|
||||
collectd_apache: false
|
||||
freezes: false
|
||||
nagios_Check_Services:
|
||||
nrpe: true
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
# Define resources for this group of hosts here.
|
||||
blocked_ip_v6: []
|
||||
blocked_ips: ['14.102.69.78', '104.219.54.236', '103.38.177.2', '110.172.140.98', '183.80.131.253', '113.190.178.137', '115.76.39.108', '116.109.31.204', '209.64.155.56']
|
||||
collectd_apache: true
|
||||
# For the MOTD
|
||||
custom_rules: [
|
||||
# Need for rsync from log01 for logs.
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
---
|
||||
# Define resources for this group of hosts here.
|
||||
collectd_apache: true
|
||||
# For the MOTD
|
||||
custom_rules: [
|
||||
# Need for rsync from log01 for logs.
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
---
|
||||
# This is a generic list, monitored by collectd
|
||||
# This is a generic list
|
||||
databases:
|
||||
- datanommer
|
||||
datacenter: rdu3
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
---
|
||||
# This is a generic list, monitored by collectd
|
||||
# This is a generic list
|
||||
databases:
|
||||
- datanommer
|
||||
datacenter: rdu3
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ nft_custom_rules:
|
|||
- 'add rule {{nft_table_filter}} INPUT ip saddr 10.16.163.105 tcp dport 5432 counter accept'
|
||||
- 'add rule {{nft_table_filter}} INPUT ip saddr 10.16.163.106 tcp dport 5432 counter accept'
|
||||
- 'add rule {{nft_table_filter}} INPUT ip saddr 10.16.163.117 tcp dport 5432 counter accept'
|
||||
# This is a generic list, monitored by collectd
|
||||
# This is a generic list
|
||||
databases:
|
||||
- fas2
|
||||
- ipsilon
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
# TODO: lock it down more
|
||||
nft_custom_rules:
|
||||
- 'add rule {{nft_table_filter}} INPUT ip saddr 10.16.166.0/24 tcp dport 5432 counter accept'
|
||||
# This is a generic list, monitored by collectd
|
||||
# This is a generic list
|
||||
databases:
|
||||
- fas2
|
||||
datacenter: rdu3
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ nft_custom_rules:
|
|||
- 'add rule {{nft_table_filter}} INPUT ip saddr 10.16.169.105 tcp dport 5432 counter accept'
|
||||
- 'add rule {{nft_table_filter}} INPUT ip saddr 10.16.169.10 tcp dport 5432 counter accept'
|
||||
- 'add rule {{nft_table_filter}} INPUT ip saddr 10.16.163.10 tcp dport 5432 counter accept'
|
||||
# This is a generic list, monitored by collectd
|
||||
# This is a generic list
|
||||
databases:
|
||||
- koji
|
||||
datacenter: rdu3
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
# Only allow postgresql access from the frontend node.
|
||||
#
|
||||
nft_custom_rules: ['add rule {{nft_table_filter}} INPUT ip saddr 10.16.167.64 tcp dport 5432 counter accept']
|
||||
# This is a generic list, monitored by collectd
|
||||
# This is a generic list
|
||||
databases:
|
||||
- koji
|
||||
datacenter: rdu3
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
---
|
||||
# This is a generic list, monitored by collectd
|
||||
# This is a generic list
|
||||
databases:
|
||||
- postgres
|
||||
- openqa
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
---
|
||||
# This is a generic list, monitored by collectd
|
||||
# This is a generic list
|
||||
custom_rules: ['-A INPUT -p tcp -m tcp -s 10.16.172.21 --dport 5432 -j ACCEPT']
|
||||
nft_custom_rules:
|
||||
- 'add rule {{nft_table_filter}} INPUT ip saddr 10.16.172.21 tcp dport 5432 counter accept'
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ ansible_become: yes
|
|||
ansible_become_user: root
|
||||
ansible_user: ec2-user
|
||||
root_auth_users: msuchy
|
||||
# This is a generic list, monitored by collectd
|
||||
# This is a generic list
|
||||
databases:
|
||||
- coprdb
|
||||
db_backup_dir: ['/backups']
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
# We should narrow this down at some point
|
||||
#
|
||||
nft_custom_rules: ['add rule {{nft_table_filter}} INPUT tcp dport 5432 counter accept']
|
||||
# This is a generic list, monitored by collectd
|
||||
# This is a generic list
|
||||
databases:
|
||||
- anitya
|
||||
- blockerbugs
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
# We should narrow this down at some point
|
||||
#
|
||||
nft_custom_rules: ['add rule {{nft_table_filter}} INPUT tcp dport 5432 counter accept']
|
||||
# This is a generic list, monitored by collectd
|
||||
# This is a generic list
|
||||
databases:
|
||||
- askfedora
|
||||
- blockerbugs
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
---
|
||||
# This is a generic list, monitored by collectd
|
||||
# This is a generic list
|
||||
databases:
|
||||
- mysql
|
||||
- fpo-mediawiki
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
---
|
||||
# This is a generic list, monitored by collectd
|
||||
# This is a generic list
|
||||
databases:
|
||||
- postgres
|
||||
datacenter: rdu3
|
||||
|
|
|
|||
|
|
@ -663,7 +663,7 @@ zabbix01.stg.rdu3.fedoraproject.org
|
|||
|
||||
# This is a list of hosts that are a little "friendly" with staging.
|
||||
# They are exempted from the iptables wall between staging and prod.
|
||||
# For instance, staging needs to send collectd logs to log01 and smtp mail data
|
||||
# For instance, staging needs to send smtp mail data
|
||||
# to bastion (both of which are prod boxen).
|
||||
[staging_friendly]
|
||||
noc01.rdu3.fedoraproject.org
|
||||
|
|
|
|||
|
|
@ -73,16 +73,6 @@
|
|||
- /etc/dracut.conf.d/sgdisk.conf
|
||||
- /etc/dracut.conf.d/xen.conf
|
||||
|
||||
# CollectD files:
|
||||
- /etc/collectd.d/bind.conf
|
||||
- /etc/collectd.d/fmn.conf
|
||||
- /etc/collectd.d/memcached.conf
|
||||
- /etc/collectd.d/network.conf
|
||||
- /etc/collectd.d/nfs.conf
|
||||
- /etc/collectd.d/postgres.conf
|
||||
- /etc/collectd.d/unixsock.conf
|
||||
- /etc/collectd.d/vfive-upgrade.conf
|
||||
|
||||
# Our crond conf files:
|
||||
- /etc/cron.daily/cleanup-stage-users
|
||||
- /etc/cron.daily/data-only-backup.sh
|
||||
|
|
@ -265,7 +255,6 @@
|
|||
- /etc/httpd/conf.d/admin.fedoraproject.org/admin-rewrite.conf
|
||||
- /etc/httpd/conf.d/admin.fedoraproject.org/apache-status-rewrite.conf
|
||||
- /etc/httpd/conf.d/admin.fedoraproject.org/awstats.conf
|
||||
- /etc/httpd/conf.d/admin.fedoraproject.org/collectd.conf
|
||||
- /etc/httpd/conf.d/admin.fedoraproject.org/community-redirect.conf
|
||||
- /etc/httpd/conf.d/admin.fedoraproject.org.conf
|
||||
- /etc/httpd/conf.d/admin.fedoraproject.org/elections-redirectmatch.conf
|
||||
|
|
@ -1607,7 +1596,6 @@
|
|||
- /etc/systemd/system/anubis.service
|
||||
- /etc/systemd/system/bodhi-celery.service
|
||||
- /etc/systemd/system/btrfs-balance.timer.d/schedule.conf
|
||||
- /etc/systemd/system/collectd.service.d/timeout.conf
|
||||
- /etc/systemd/system/debuginfod.service.d/override.conf
|
||||
- /etc/systemd/system/dirsrv@FEDORAPROJECT-ORG.service.d/ipa-env.conf
|
||||
- /etc/systemd/system/dirsrv@STG-FEDORAPROJECT-ORG.service.d/ipa-env.conf
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@
|
|||
- zabbix/zabbix_agent
|
||||
- ipa/client
|
||||
- sudo
|
||||
- collectd/base
|
||||
- { role: nfs/client,
|
||||
mnt_dir: '/fedora_backups',
|
||||
nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=3",
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@
|
|||
- ipa/client
|
||||
- hosts
|
||||
- sudo
|
||||
- collectd/base
|
||||
- packager_alias
|
||||
- opendkim
|
||||
- fasjson
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@
|
|||
- ipa/client
|
||||
- ansible-server
|
||||
- sudo
|
||||
- collectd/base
|
||||
- role: git/hooks
|
||||
- rsyncd
|
||||
- apache
|
||||
|
|
|
|||
|
|
@ -36,7 +36,6 @@
|
|||
roles:
|
||||
- base
|
||||
- zabbix/zabbix_agent
|
||||
- collectd/base
|
||||
- hosts
|
||||
- ipa/client
|
||||
- sudo
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@
|
|||
- rkhunter
|
||||
- hosts
|
||||
- ipa/client
|
||||
- collectd/base
|
||||
- sudo
|
||||
|
||||
handlers:
|
||||
|
|
|
|||
|
|
@ -67,8 +67,6 @@
|
|||
# - zabbix/zabbix_agent
|
||||
- hosts
|
||||
- postgresql_server
|
||||
# - collectd/base
|
||||
# - collectd/postgres # This requires a 'databases' var to be set in host_vars
|
||||
- sudo
|
||||
|
||||
handlers:
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@
|
|||
- zabbix/zabbix_agent
|
||||
- hosts
|
||||
- ipa/client
|
||||
- collectd/base
|
||||
|
||||
- role: nfs/client
|
||||
mount_stg: true
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@
|
|||
when: datacenter != 'rdu3' }
|
||||
- zabbix/zabbix_agent
|
||||
- ipa/client
|
||||
- collectd/base
|
||||
- rsyncd
|
||||
- sudo
|
||||
- dns
|
||||
|
|
|
|||
|
|
@ -36,7 +36,6 @@
|
|||
- { role: openvpn/client, when: vpn == True }
|
||||
- zabbix/zabbix_agent
|
||||
- ipa/client
|
||||
- collectd/base
|
||||
- apache
|
||||
- download
|
||||
- role: anubis-el
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@
|
|||
- rkhunter
|
||||
- zabbix/zabbix_agent
|
||||
- ipa/client
|
||||
- collectd/base
|
||||
- sudo
|
||||
- flatpak-cache
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@
|
|||
- base
|
||||
- rkhunter
|
||||
- zabbix/zabbix_agent
|
||||
- collectd/base
|
||||
- hosts
|
||||
- {role: openvpn/client,
|
||||
when: env != "staging"}
|
||||
|
|
|
|||
|
|
@ -43,7 +43,6 @@
|
|||
- hosts
|
||||
- rsyncd
|
||||
- sudo
|
||||
- collectd/base
|
||||
- {role: openvpn/client,
|
||||
when: env != "staging"}
|
||||
- mod_wsgi
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@
|
|||
- hosts
|
||||
- rsyncd
|
||||
- sudo
|
||||
- collectd/base
|
||||
- {role: openvpn/client,
|
||||
when: env != "staging"}
|
||||
- mod_wsgi
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@
|
|||
- zabbix/zabbix_agent
|
||||
- hosts
|
||||
- ipa/client
|
||||
- collectd/base
|
||||
- apache
|
||||
- mod_wsgi
|
||||
- role: keytab/service
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@
|
|||
- zabbix/zabbix_agent
|
||||
- ipa/client
|
||||
- sudo
|
||||
- collectd/base
|
||||
- apache
|
||||
- rsyncd
|
||||
- role: nfs/client
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@
|
|||
- openvpn/client
|
||||
- ipa/client
|
||||
- apache
|
||||
- collectd/base
|
||||
- sudo
|
||||
- web-data-analysis
|
||||
- role: keytab/service
|
||||
|
|
@ -101,6 +100,3 @@
|
|||
- bc
|
||||
- gnuplot
|
||||
- mod_auth_gssapi
|
||||
|
||||
- name: Set domain_can_mmap_files so collectd works
|
||||
seboolean: name=domain_can_mmap_files state=yes persistent=yes
|
||||
|
|
|
|||
|
|
@ -25,7 +25,6 @@
|
|||
- {role: openvpn/client,
|
||||
when: env != "staging"}
|
||||
- ipa/client
|
||||
- collectd/base
|
||||
- sudo
|
||||
- spamassassin
|
||||
- mod_wsgi
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@
|
|||
- zabbix/zabbix_agent
|
||||
- hosts
|
||||
- mariadb_server
|
||||
- collectd/base
|
||||
- sudo
|
||||
|
||||
pre_tasks:
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@
|
|||
- zabbix/zabbix_agent
|
||||
- hosts
|
||||
- ipa/client
|
||||
- collectd/base
|
||||
- sudo
|
||||
- memcached
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@
|
|||
- rkhunter
|
||||
- hosts
|
||||
- ipa/client
|
||||
- collectd/base
|
||||
- sudo
|
||||
- openvpn/client
|
||||
- zabbix/zabbix_agent
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@
|
|||
- { role: openvpn/client, when: env != "staging" }
|
||||
- zabbix/zabbix_agent
|
||||
- ipa/client
|
||||
- collectd/base
|
||||
- { role: rsyncd, when: datacenter == 'rdu3' }
|
||||
- sudo
|
||||
- apache
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@
|
|||
- { role: openvpn/client,
|
||||
when: env != "staging" }
|
||||
- ipa/client
|
||||
- collectd/base
|
||||
- rsyncd
|
||||
- sudo
|
||||
- role: nfs/client
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@
|
|||
- { role: rkhunter, tags: ['rkhunter'] }
|
||||
- { role: hosts, tags: ['hosts']}
|
||||
- ipa/client
|
||||
- { role: collectd/base, tags: ['collectd_base'] }
|
||||
- { role: sudo, tags: ['sudo'] }
|
||||
- apache
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@
|
|||
- { role: hosts, tags: ['hosts']}
|
||||
- zabbix/zabbix_agent
|
||||
- { role: ipa/client, tags: ['ipa_client']}
|
||||
- { role: collectd/base, tags: ['collectd_base'] }
|
||||
- { role: sudo, tags: ['sudo'] }
|
||||
- { role: openqa/worker, tags: ['openqa_worker'] }
|
||||
- { role: linux-system-roles.nbde_client, tags: ['nbde_client'], when: openqa_nbde|bool }
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@
|
|||
- { role: hosts, tags: ['hosts']}
|
||||
- zabbix/zabbix_agent
|
||||
- ipa/client
|
||||
- { role: collectd/base, tags: ['collectd_base'] }
|
||||
- { role: sudo, tags: ['sudo'] }
|
||||
- apache
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@
|
|||
- openvpn/client
|
||||
- ipa/client
|
||||
- sudo
|
||||
- collectd/base
|
||||
|
||||
pre_tasks:
|
||||
- import_tasks: "{{ tasks_path }}/yumrepos.yml"
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@
|
|||
- openvpn/client
|
||||
- ipa/client
|
||||
- sudo
|
||||
- collectd/base
|
||||
- postgresql_server
|
||||
|
||||
pre_tasks:
|
||||
|
|
|
|||
|
|
@ -61,7 +61,6 @@
|
|||
|
||||
roles:
|
||||
- base
|
||||
- collectd/base
|
||||
- role: openvpn/client
|
||||
when: env != "staging"
|
||||
- ipa/client
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@
|
|||
- rkhunter
|
||||
- zabbix/zabbix_agent
|
||||
- ipa/client
|
||||
- collectd/base
|
||||
- sudo
|
||||
- apache
|
||||
|
||||
|
|
|
|||
|
|
@ -49,7 +49,6 @@
|
|||
- zabbix/zabbix_agent
|
||||
- hosts
|
||||
- postgresql_server
|
||||
- collectd/base
|
||||
- sudo
|
||||
|
||||
# TODO: add iscsi task
|
||||
|
|
|
|||
|
|
@ -26,7 +26,6 @@
|
|||
- ipa/client
|
||||
- rkhunter
|
||||
- zabbix/zabbix_agent
|
||||
- collectd/base
|
||||
- sudo
|
||||
- rsyncd
|
||||
- {role: mirrormanager/mirrorlist_proxy,
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@
|
|||
- zabbix/zabbix_agent
|
||||
- hosts
|
||||
- ipa/client
|
||||
- collectd/base
|
||||
- rsyncd
|
||||
- sudo
|
||||
- rabbitmq_cluster
|
||||
|
|
|
|||
|
|
@ -36,7 +36,6 @@
|
|||
- ipa/client
|
||||
- rkhunter
|
||||
- zabbix/zabbix_agent
|
||||
- collectd/base
|
||||
- sudo
|
||||
- role: keytab/service
|
||||
service: compose
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@
|
|||
- hosts
|
||||
- zabbix/zabbix_agent
|
||||
- ipa/client
|
||||
- collectd/base
|
||||
- download
|
||||
- rsyncd
|
||||
- sudo
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@
|
|||
when: env != "staging" }
|
||||
- zabbix/zabbix_agent
|
||||
- ipa/client
|
||||
- collectd/base
|
||||
- sudo
|
||||
|
||||
pre_tasks:
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@
|
|||
when: env != "staging" }
|
||||
- zabbix/zabbix_agent
|
||||
- ipa/client
|
||||
- collectd/base
|
||||
- sudo
|
||||
|
||||
pre_tasks:
|
||||
|
|
|
|||
|
|
@ -27,7 +27,6 @@
|
|||
when: env != "staging"
|
||||
}
|
||||
- ipa/client
|
||||
- collectd/base
|
||||
- mod_wsgi
|
||||
- geoip
|
||||
- geoip-city-wsgi/app
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@
|
|||
- openvpn/client
|
||||
- zabbix/zabbix_agent
|
||||
- ipa/client
|
||||
- collectd/base
|
||||
- rsyncd
|
||||
- sudo
|
||||
- torrent
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@
|
|||
service: zodbot,
|
||||
when: env == "production"
|
||||
}
|
||||
- collectd/base
|
||||
- apache
|
||||
- supybot
|
||||
- sudo
|
||||
|
|
|
|||
|
|
@ -44,7 +44,6 @@
|
|||
- hosts
|
||||
- {role: openvpn/client, when: vpn|bool}
|
||||
- ipa/client
|
||||
- {role: collectd/base, when: ansible_distribution_major_version|int != 10}
|
||||
- sudo
|
||||
- virthost
|
||||
- {role: linux-system-roles.nbde_client, tags: ['nbde_client'], when: (nbde|bool) }
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@
|
|||
- { role: openvpn/client,
|
||||
when: env != "staging" }
|
||||
- ipa/client
|
||||
- collectd/base
|
||||
- apache
|
||||
# Set up for fedora-messaging
|
||||
- role: rabbit/user
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@
|
|||
- rkhunter
|
||||
- hosts
|
||||
- ipa/client
|
||||
- collectd/base
|
||||
- sudo
|
||||
- { role: zabbix/zabbix_server, tags: zabbix_server }
|
||||
- { role: zabbix/zabbix_agent, tags: zabbix_agent }
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@
|
|||
- base
|
||||
- rkhunter
|
||||
- hosts
|
||||
- collectd/base
|
||||
- sudo
|
||||
- dhcp_server
|
||||
- tftp_server
|
||||
|
|
|
|||
|
|
@ -27,7 +27,6 @@
|
|||
- zabbix/zabbix_agent
|
||||
- hosts
|
||||
- ipa/client
|
||||
- collectd/base
|
||||
- sudo
|
||||
- role: nfs/client
|
||||
mnt_dir: '/mnt/fedora_koji'
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@
|
|||
roles:
|
||||
- base
|
||||
- rkhunter
|
||||
- collectd/base
|
||||
- sudo
|
||||
|
||||
pre_tasks:
|
||||
|
|
|
|||
|
|
@ -1,2 +1 @@
|
|||
---
|
||||
collectd_apache: true
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@
|
|||
- apache
|
||||
- h2
|
||||
|
||||
- name: Add apache_status location for collectd
|
||||
- name: Add apache_status location
|
||||
ansible.builtin.template: src="{{ files }}/httpd/apachestatus.conf" dest=/etc/httpd/conf.d/apachestatus.conf
|
||||
notify:
|
||||
- Reload apache
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
collectd takes conf files in /etc/collect.d/somefile.conf
|
||||
|
||||
and if you add a type you will need to add it to a types.db for that file
|
||||
|
||||
see any of the examples
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
LoadPlugin apache
|
||||
|
||||
<Plugin apache>
|
||||
<Instance "apache">
|
||||
URL "http://localhost/apache-status?auto"
|
||||
</Instance>
|
||||
</Plugin>
|
||||
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
sock='/var/run/haproxy-stat'
|
||||
host="$(hostname -s)"
|
||||
pause=10
|
||||
|
||||
while getopts "h:p:s:" c; do
|
||||
case $c in
|
||||
h) host=$OPTARG;;
|
||||
p) pause=$OPTARG;;
|
||||
s) sock=$OPTARG;;
|
||||
*) echo "Usage: $0 [-h <hostname>] [-p <seconds>] [-s <sockfile>]";;
|
||||
esac
|
||||
done
|
||||
|
||||
while [ $? -eq 0 ]; do
|
||||
time="$(date +%s)"
|
||||
echo 'show stat' | socat - UNIX-CLIENT:$sock \
|
||||
|while IFS=',' read pxname svname qcur qmax scur smax slim stot bin bout dreq dresp ereq econ eresp wretr wredis status weight act bck chkfail chdown lastchg downtime qlimit pid iid sid throttle lbtot tracked type; do
|
||||
[ "$svname" != 'BACKEND' ] && continue
|
||||
echo "PUTVAL $host/haproxy/haproxy_backend-$pxname $time:$stot:$econ:$eresp"
|
||||
done
|
||||
sleep $pause
|
||||
done
|
||||
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
#!/bin/bash
|
||||
export PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin
|
||||
|
||||
host=$(hostname -s)
|
||||
pause=10
|
||||
|
||||
while getopts "h:p:s:" opt; do
|
||||
case "$opt" in
|
||||
h)
|
||||
host=$OPTARG
|
||||
;;
|
||||
p)
|
||||
pause=$OPTARG
|
||||
;;
|
||||
*)
|
||||
echo "Usage: $0 [-h <hostname>] [-p <seconds>]" >&2;
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
while [ $? -eq 0 ]; do
|
||||
ts=$(date +%s)
|
||||
queue_size=$(mailq | awk 'END { print (/Mail queue is empty/ ? 0 : $5) }')
|
||||
echo "PUTVAL \"$host/mail_queue/email_count\" $ts:$queue_size";
|
||||
sleep $pause
|
||||
done
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
haproxy_backend stot:COUNTER:0:U econ:COUNTER:0:U eresp:COUNTER:0:U
|
||||
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
<Plugin exec>
|
||||
Exec "haproxy" "/usr/local/bin/collectd_haproxy.sh" "-h" "haproxy" "-s" "/var/run/haproxy-stat" "-p" "10"
|
||||
</Plugin>
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
LoadPlugin exec
|
||||
<Plugin exec>
|
||||
Exec "nobody" "/usr/local/bin/collectd_mailq.sh"
|
||||
</Plugin>
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
LoadPlugin network
|
||||
|
||||
<Plugin "network">
|
||||
Listen "0.0.0.0"
|
||||
</Plugin>
|
||||
|
|
@ -1 +0,0 @@
|
|||
LoadPlugin nfs
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
pg_conns value:GAUGE:0:U
|
||||
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
detected_mods := $(wildcard *.te)
|
||||
detected_fcs := $(detected_mods:.te=.fc)
|
||||
all_packages := $(notdir $(detected_mods:.te=.pp))
|
||||
|
||||
.PHONY: all
|
||||
.SUFFIXES: .pp
|
||||
|
||||
all: $(all_packages)
|
||||
|
||||
%.mod: %.te
|
||||
checkmodule -m $^ -o $@
|
||||
|
||||
# If we have file contexts one day:
|
||||
# %.pp: %.mod %.fc
|
||||
# semodule_package -o $@ -m $< -f $(<:.mod=.fc)
|
||||
|
||||
%.pp: %.mod
|
||||
semodule_package -o $@ -m $<
|
||||
|
||||
# so users dont have to make empty .fc and .if files
|
||||
$(detected_fcs):
|
||||
touch $@
|
||||
Binary file not shown.
Binary file not shown.
|
|
@ -1,54 +0,0 @@
|
|||
module fi-collectd 1.11.3;
|
||||
|
||||
require {
|
||||
type shell_exec_t;
|
||||
type bin_t;
|
||||
type collectd_t;
|
||||
type collectd_script_t;
|
||||
type collectd_var_run_t;
|
||||
type configfs_t;
|
||||
type hostname_exec_t;
|
||||
type init_t;
|
||||
type postfix_postqueue_exec_t;
|
||||
type postfix_public_t;
|
||||
type sendmail_exec_t;
|
||||
type tmp_t;
|
||||
type var_run_t;
|
||||
type anon_inodefs_t;
|
||||
type initrc_t;
|
||||
type proc_net_t;
|
||||
|
||||
class capability { kill setuid dac_read_search sys_ptrace setgid dac_override chown };
|
||||
class dir { getattr read };
|
||||
class file { execute read write getattr execute_no_trans ioctl open };
|
||||
class lnk_file read;
|
||||
class sock_file { read write getattr };
|
||||
class unix_stream_socket connectto;
|
||||
class netlink_generic_socket { create bind getattr };
|
||||
}
|
||||
|
||||
#============= collectd_t ==============
|
||||
allow collectd_t bin_t:file { read getattr open execute execute_no_trans ioctl };
|
||||
allow collectd_t bin_t:lnk_file read;
|
||||
allow collectd_t configfs_t:dir getattr;
|
||||
allow collectd_t hostname_exec_t:file {getattr execute read open ioctl execute_no_trans};
|
||||
allow collectd_t init_t:unix_stream_socket connectto;
|
||||
allow collectd_t postfix_postqueue_exec_t:file { read execute open execute_no_trans };
|
||||
allow collectd_t postfix_public_t:sock_file write;
|
||||
allow collectd_t self:capability { kill setuid dac_read_search sys_ptrace setgid dac_override };
|
||||
allow collectd_t sendmail_exec_t:file { read getattr open execute execute_no_trans };
|
||||
allow collectd_t shell_exec_t:file { read open execute };
|
||||
allow collectd_t tmp_t:dir read;
|
||||
allow collectd_t var_run_t:sock_file { read write getattr };
|
||||
allow collectd_t anon_inodefs_t:file { write read };
|
||||
allow collectd_t initrc_t:unix_stream_socket connectto;
|
||||
allow collectd_t proc_net_t:lnk_file read;
|
||||
allow collectd_t self:netlink_generic_socket { create bind getattr };
|
||||
# allow chown for the unix socket
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1304029#c9
|
||||
allow collectd_t self:capability chown;
|
||||
|
||||
# Allow the CGI to request a flush of the RRDs through collectd's unix socket
|
||||
#============= collectd_script_t ==============
|
||||
allow collectd_script_t collectd_var_run_t:sock_file write;
|
||||
allow collectd_script_t collectd_t:unix_stream_socket connectto;
|
||||
Binary file not shown.
Binary file not shown.
|
|
@ -1,11 +0,0 @@
|
|||
|
||||
module fi-pstorefs 1.0;
|
||||
|
||||
require {
|
||||
type pstorefs_t;
|
||||
type collectd_t;
|
||||
class dir getattr;
|
||||
}
|
||||
|
||||
#============= collectd_t ==============
|
||||
allow collectd_t pstorefs_t:dir getattr;
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
# collectd client setup
|
||||
|
||||
# install pkg
|
||||
---
|
||||
- name: Remove collectd server packages
|
||||
ansible.builtin.package: name={{ item }} state=absent
|
||||
with_items:
|
||||
- collectd
|
||||
- collectd-apache
|
||||
- collectd-bind
|
||||
- collectd-disk
|
||||
- collectd-python
|
||||
- collectd-rabbitmq-data
|
||||
- collectd-rrdtool
|
||||
- collectd-web
|
||||
- python3-collectd-rabbitmq
|
||||
tags:
|
||||
- collectd
|
||||
|
||||
- name: Remove files and directories for Collectd
|
||||
ansible.builtin.file: dest={{item}} state=absent
|
||||
with_items:
|
||||
- /etc/collectd.conf
|
||||
- /etc/collectd.d
|
||||
- /etc/collection.conf
|
||||
- /etc/httpd/conf.d/collectd.conf
|
||||
- /etc/systemd/system/collectd.service.d
|
||||
- /usr/local/bin/collectd-postgres.sh
|
||||
- /usr/share/collectd
|
||||
- /var/log/collectd
|
||||
tags:
|
||||
- collectd
|
||||
|
||||
# disable collectd - already run in d13496b
|
||||
#- name: Enable collectd svc
|
||||
# service: state=stopped enabled=false name=collectd
|
||||
# tags:
|
||||
# - collectd
|
||||
|
|
@ -1,74 +0,0 @@
|
|||
#
|
||||
# Config file for collectd(1).
|
||||
# Please read collectd.conf(5) for a list of options.
|
||||
# http://collectd.org/
|
||||
#
|
||||
|
||||
Hostname "{{ inventory_hostname }}"
|
||||
FQDNLookup true
|
||||
#BaseDir "/usr/var/lib/collectd"
|
||||
#PIDFile "/usr/var/run/collectd.pid"
|
||||
#PluginDir "/usr/lib/collectd"
|
||||
#Interval 10
|
||||
#ReadThreads 5
|
||||
|
||||
# This is the default but it needs to be defined so we can add more DB files later.
|
||||
TypesDB "/usr/share/collectd/types.db"
|
||||
|
||||
LoadPlugin syslog
|
||||
|
||||
<Plugin syslog>
|
||||
LogLevel err
|
||||
</Plugin>
|
||||
|
||||
LoadPlugin cpu
|
||||
LoadPlugin df
|
||||
LoadPlugin disk
|
||||
LoadPlugin exec
|
||||
LoadPlugin interface
|
||||
LoadPlugin load
|
||||
LoadPlugin memory
|
||||
LoadPlugin processes
|
||||
LoadPlugin swap
|
||||
LoadPlugin tail
|
||||
LoadPlugin users
|
||||
LoadPlugin vmem
|
||||
|
||||
<Plugin disk>
|
||||
Disk "/^[hs]d[a-f]?$/"
|
||||
Disk "/^xvd[a-f]?$/"
|
||||
Disk "/dev/xvdb1"
|
||||
IgnoreSelected false
|
||||
</Plugin>
|
||||
|
||||
<Plugin "interface">
|
||||
Interface "/^veth.*"
|
||||
Interface "/^vnet.*"
|
||||
IgnoreSelected true
|
||||
</Plugin>
|
||||
|
||||
<Plugin "df">
|
||||
MountPoint "^/.*/.snapshot/"
|
||||
MountPoint "^/run/containers/storage/overlay-containers/.*"
|
||||
MountPoint "^/tmp/iso/mount/.*"
|
||||
MountPoint "^/var/lib/containers/.*"
|
||||
MountPoint "^/var/lib/docker/.*"
|
||||
MountPoint "^/var/lib/origin.*"
|
||||
FSType "shm"
|
||||
FSType "tmpfs"
|
||||
FSType "overlay"
|
||||
IgnoreSelected true
|
||||
</Plugin>
|
||||
|
||||
|
||||
{% if ansible_distribution_major_version|default(0)|int == 6 and ansible_distribution == "RedHat" %}
|
||||
<Plugin hddtemp>
|
||||
TranslateDevicename false
|
||||
|
||||
</Plugin>
|
||||
|
||||
{% endif %}
|
||||
|
||||
<Include "/etc/collectd.d">
|
||||
Filter "*.conf"
|
||||
</Include>
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
LoadPlugin "write_graphite"
|
||||
|
||||
<Plugin "write_graphite">
|
||||
<Node "laptop">
|
||||
Host "graphite.fedorainfracloud.org"
|
||||
Port "2003"
|
||||
Prefix "collectd.{{ env }}."
|
||||
#Postfix ""
|
||||
#Protocol "udp"
|
||||
#LogSendErrors false
|
||||
EscapeCharacter "_"
|
||||
SeparateInstances true
|
||||
StoreRates false
|
||||
AlwaysAppendDS false
|
||||
</Node>
|
||||
</Plugin>
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
LoadPlugin network
|
||||
|
||||
<Plugin "network">
|
||||
{% if ansible_distribution_major_version != '6' %}
|
||||
Server "log01"
|
||||
{% else %}
|
||||
<Server "log01">
|
||||
ResolveInterval 14400
|
||||
</Server>
|
||||
{% endif %}
|
||||
</Plugin>
|
||||
|
|
@ -1,4 +1,3 @@
|
|||
---
|
||||
dependencies:
|
||||
- { role: copr/base }
|
||||
# - { role: collectd/base }
|
||||
|
|
|
|||
|
|
@ -571,7 +571,7 @@ view "DEFAULT" {
|
|||
include "/etc/named/zones.conf";
|
||||
};
|
||||
|
||||
// Enabling bind9 statistics on localhost for collectd
|
||||
// Enabling bind9 statistics on localhost
|
||||
statistics-channels {
|
||||
inet 127.0.0.1 port 8053;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -73,47 +73,6 @@
|
|||
- ipa/server
|
||||
- otp_script
|
||||
|
||||
|
||||
#
|
||||
# Collectd statistics plugin
|
||||
# Requires the stage-users service to have been defined (above) with the
|
||||
# corresponding permissions. That's why I'm keeping this block here and not as
|
||||
# a subrole of the collectd role.
|
||||
#
|
||||
- name: Install and setup collectd-ipa
|
||||
# Only collect stats on one server
|
||||
run_once: yes
|
||||
delegate_to: "{{ ipa_server }}"
|
||||
block:
|
||||
- name: Install collectd-ipa
|
||||
ansible.builtin.package:
|
||||
state: present
|
||||
name: python3-collectd-ipa
|
||||
tags:
|
||||
- packages
|
||||
- collectd
|
||||
|
||||
- name: Install collectd ipa config
|
||||
ansible.builtin.template:
|
||||
src: "ipa.collectd.conf.j2"
|
||||
dest: "/etc/collectd.d/ipa.conf"
|
||||
owner: root
|
||||
group: root
|
||||
mode: "0640"
|
||||
tags:
|
||||
- collectd
|
||||
- config
|
||||
notify: Restart collectd
|
||||
|
||||
- name: Let collectd talk to the REST API
|
||||
ansible.posix.seboolean:
|
||||
name: collectd_tcp_network_connect
|
||||
state: yes
|
||||
persistent: yes
|
||||
tags:
|
||||
- collectd
|
||||
|
||||
|
||||
#
|
||||
# Nagios monitoring
|
||||
#
|
||||
|
|
|
|||
|
|
@ -1,42 +0,0 @@
|
|||
# IPA plugin
|
||||
|
||||
<LoadPlugin python>
|
||||
Globals true
|
||||
</LoadPlugin>
|
||||
|
||||
<Plugin python>
|
||||
LogTraces true
|
||||
Interactive false
|
||||
Import "collectd_ipa"
|
||||
|
||||
<Module collectd_ipa>
|
||||
## Interval between two collections. The collectd default of 10 seconds is
|
||||
## way too short, this plugin sets the default to 1h (3600s). Adjust
|
||||
## depending on the number of users you have and how long it takes to
|
||||
## collect this data. Remember that if you change the interval, you'll have
|
||||
## to recreate your RRD files.
|
||||
# Interval 3600
|
||||
|
||||
## To accomodate clusters, all the metrics will be attached to a virtual
|
||||
## host named after your domain in IPA. The `domain_prefix` value allows you
|
||||
## to add a prefix to this domain.
|
||||
# DomainPrefix "ipa."
|
||||
|
||||
## Path to the IPA configuration file, where the domain will be read from.
|
||||
# IpaConf "/etc/ipa/default.conf"
|
||||
|
||||
## Path to the LDAP configuration file, where the default directory base DN
|
||||
## will be read from.
|
||||
# LdapConf "/etc/openldap/ldap.conf"
|
||||
|
||||
## Set environment variables for Kerberos authentication. The client keytab
|
||||
## should be linked to an account (user or service) that has the
|
||||
## permissions to read stage users. In IPA, this means that it must have a
|
||||
## role that has a privilege granting the "System: Read Stage Users"
|
||||
## permission.
|
||||
SetEnv KRB5_CLIENT_KTNAME "/etc/krb5.stage-users_{{ ipa_server }}.keytab"
|
||||
|
||||
## Directory where the Kerberos credential caches will be created.
|
||||
# CredCacheDir "/var/lib/collectd"
|
||||
</Module>
|
||||
</Plugin>
|
||||
|
|
@ -65,9 +65,6 @@
|
|||
- cron
|
||||
- mariadb-server
|
||||
|
||||
- name: Set domain_can_mmap_files so collectd and nagios work
|
||||
seboolean: name=domain_can_mmap_files state=yes persistent=yes
|
||||
|
||||
- name: Zabbix API Block
|
||||
vars:
|
||||
ansible_zabbix_auth_key: "{{ zabbix_auth_key }}"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue