966106905e
Collectd Configs:
+ Improvements to the maintainability of these config files
+ Versions appended to end of each per-process captured that
the specific process was used in OpenStack
+ Collect on for Gnocchi, Aodh, and Sahara
+ Remove Satellite6 and OSE collectd configurations
+ Cleaned up Undercloud, Controller, Compute and Ceph Collectd
Configurations to contain "mostly" processes that exist on
machines of that type
Dashboards:
+ Add Gnocchi, Aodh, and Sahara per-process graphs
+ s/glance-agent/glance-api/ "bug"
+ Remove non-OpenStack Dashboards (OSE, Satellite 6) from Repo
+ Consolidate Guest, Baremetal, and Graphite Dashboards with OpenStack
Dashboards in single playbook grafana-dashboards.yml
+ Update the Cloud System Performance Dashboard to allow comparsion
with timeshifting
+ Add several comments to clarify the three types of dashboards
+ Removed DivideSeries from Graphite, Baremetal, and Guest Dashboards
to match behavior of the OpenStack Dashboards for per-process
graphs
Change-Id: I0c5c994324bd202b02a6175b261b84b183499d0e
139 lines
3.4 KiB
Django/Jinja
139 lines
3.4 KiB
Django/Jinja
# Installed by Browbeat Ansible Installer
|
|
# Config type: {{config_type}}
|
|
|
|
# Interval default is 10s
|
|
Interval {{collectd_interval}}
|
|
|
|
# Hostname for this machine, if not defined, use gethostname(2) system call
|
|
Hostname "{{inventory_hostname}}"
|
|
|
|
# Allow collectd to log
|
|
LoadPlugin syslog
|
|
|
|
# Loaded Plugins:
|
|
LoadPlugin write_graphite
|
|
LoadPlugin cpu
|
|
LoadPlugin conntrack
|
|
LoadPlugin df
|
|
LoadPlugin disk
|
|
LoadPlugin exec
|
|
LoadPlugin interface
|
|
LoadPlugin irq
|
|
LoadPlugin load
|
|
LoadPlugin match_regex
|
|
LoadPlugin memory
|
|
LoadPlugin numa
|
|
LoadPlugin processes
|
|
LoadPlugin swap
|
|
LoadPlugin tail
|
|
LoadPlugin turbostat
|
|
LoadPlugin unixsock
|
|
LoadPlugin uptime
|
|
|
|
# Open unix domain socket for collectdctl
|
|
<Plugin unixsock>
|
|
SocketFile "/var/run/collectd-unixsock"
|
|
SocketGroup "collectd"
|
|
SocketPerms "0770"
|
|
DeleteSocket true
|
|
</Plugin>
|
|
|
|
PreCacheChain "PreCache"
|
|
<Chain "PreCache">
|
|
<Rule "ignore_tap">
|
|
<Match "regex">
|
|
Plugin "^interface$"
|
|
PluginInstance "^tap*"
|
|
</Match>
|
|
Target "stop"
|
|
</Rule>
|
|
<Rule "ignore_interfaces_q">
|
|
<Match "regex">
|
|
Plugin "^interface$"
|
|
PluginInstance "^q.*"
|
|
</Match>
|
|
Target "stop"
|
|
</Rule>
|
|
Target "return"
|
|
</Chain>
|
|
|
|
# Graphite Host Configuration
|
|
<Plugin write_graphite>
|
|
<Carbon>
|
|
Host "{{graphite_host}}"
|
|
Port "2003"
|
|
Prefix "{{graphite_prefix}}."
|
|
Protocol "tcp"
|
|
LogSendErrors true
|
|
StoreRates true
|
|
AlwaysAppendDS false
|
|
EscapeCharacter "_"
|
|
</Carbon>
|
|
</Plugin>
|
|
|
|
<Plugin df>
|
|
ValuesPercentage true
|
|
</Plugin>
|
|
|
|
<Plugin disk>
|
|
Disk "/^[hsv]d[a-z]+[0-9]?$/"
|
|
IgnoreSelected false
|
|
</Plugin>
|
|
|
|
# (akrzos) Including the version of OpenStack that the process was verified as running after
|
|
# OpenStack Installation with a comment at the end of each Process/ProcessMath statement.
|
|
# A Minus before the version means the process was not found in that version. (Ex -9)
|
|
<Plugin processes>
|
|
# Ceilometer (OpenStack Installed)
|
|
ProcessMatch "ceilometer-agent-compute" "python.+ceilometer-agent-compute" # -9
|
|
ProcessMatch "ceilometer-polling" "python.+ceilometer-polling" # 9
|
|
|
|
# Collectd (Browbeat Installed)
|
|
ProcessMatch "collectd" "/usr/sbin/collectd.+-C.+/etc/collectd.conf"
|
|
|
|
# Neutron (OpenStack Installed)
|
|
ProcessMatch "neutron-openvswitch-agent" "python.+neutron-openvswitch-agent" # 9
|
|
|
|
# Nova (OpenStack Installed)
|
|
ProcessMatch "nova-compute" "python.+nova-compute" # 9
|
|
|
|
# OVS (OpenStack Installed)
|
|
ProcessMatch "ovs-vswitchd" "ovs-vswitchd.+openvswitch" # 9
|
|
ProcessMatch "ovsdb-client" "/bin/ovsdb-client" # 9
|
|
ProcessMatch "ovsdb-server" "ovsdb-server.+openvswitch" # 9
|
|
|
|
# QEMU (OpenStack Installed)
|
|
ProcessMatch "qemu-kvm" "/usr/libexec/qemu-kvm" # 9
|
|
</Plugin>
|
|
|
|
<Plugin swap>
|
|
ReportBytes true
|
|
ValuesPercentage true
|
|
</Plugin>
|
|
|
|
# Tail plugin configuration
|
|
<Plugin "tail">
|
|
<File "/var/log/nova/nova-compute.log">
|
|
Instance "nova-compute"
|
|
<Match>
|
|
Regex " ERROR "
|
|
DSType "CounterInc"
|
|
Type "counter"
|
|
Instance "total"
|
|
</Match>
|
|
</File>
|
|
|
|
<File "/var/log/neutron/openvswitch-agent.log">
|
|
Instance "neutron-openvswitch-agent"
|
|
<Match>
|
|
Regex " ERROR "
|
|
DSType "CounterInc"
|
|
Type "counter"
|
|
Instance "total"
|
|
</Match>
|
|
</File>
|
|
</Plugin>
|
|
|
|
# Include other collectd configuration files
|
|
Include "/etc/collectd.d"
|