opendev/system-config
Code Issues Proposed changes

Fix the constant failure of puppet on cacti

Browse Source 
First of all, the apache config file goes in a different direcetory.
Secondly, the graph creation is trying to make graphs for disks that
are hardcoded and don't exist for a given host.

Change-Id: Ie277f3959b7a01e71ed437582b0155e5fc5bef02
This commit is contained in:
Monty Taylor 2014-07-05 12:18:57 -07:00
parent e8fee5ca6d
commit ac8412d34d
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/openstack_project/files/cacti/create_graphs.sh
View File

@ -72,12 +72,9 @@ add_ds_graph "Interface - Non-Unicast Packets" "In/Out Non-Unicast Packets" \
SNMP_QUERY_ID=`php -q add_graphs.php --host-id=$HOST_ID --list-snmp-queries | \ SNMP_QUERY_ID=`php -q add_graphs.php --host-id=$HOST_ID --list-snmp-queries | \
grep "ucd/net - Get IO Devices"|cut -f 1` grep "ucd/net - Get IO Devices"|cut -f 1`
add_ds_graph "ucd/net - Device IO - Operations" "IO Operations" \ for disk in $(php -q add_graphs.php --host-id=$HOST_ID --snmp-field=diskIODevice --list-snmp-values | grep xvd[a-z]$) ; do
"diskIODevice" "xvda" add_ds_graph "ucd/net - Device IO - Operations" "IO Operations" \
add_ds_graph "ucd/net - Device IO - Throughput" "IO Throughput" \ "diskIODevice" "$disk"
"diskIODevice" "xvda" add_ds_graph "ucd/net - Device IO - Throughput" "IO Throughput" \
"diskIODevice" "$disk"
add_ds_graph "ucd/net - Device IO - Operations" "IO Operations" \ done
"diskIODevice" "xvdc"
add_ds_graph "ucd/net - Device IO - Throughput" "IO Throughput" \
"diskIODevice" "xvdc"

2
modules/openstack_project/manifests/cacti.pp
View File

@ -19,7 +19,7 @@ class openstack_project::cacti (
ensure => present, ensure => present,
} }
file { '/etc/apache2/conf-available/cacti.conf': file { '/etc/apache2/conf.d/cacti.conf':
ensure => present, ensure => present,
source => 'puppet:///modules/openstack_project/cacti/apache.conf', source => 'puppet:///modules/openstack_project/cacti/apache.conf',
mode => '0644', mode => '0644',