Rectify service_name in ceph monitor's hieradata

"ceph-mon.yaml" should populate collectd hieradata for "ceph_mon"
instead of "ceph_osd".

Add example mons and osds daemons for collectd to monitor in
CI environment files.

Depends-On: https://review.opendev.org/866817
Depends-On: https://review.opendev.org/866688

This change is wallaby-backport-potential.

Resolves: rhbz#2116340
Change-Id: I5d6626774de7aeac9bbc5d70d856eeaba987714b
This commit is contained in:
Yadnesh Kulkarni 2022-12-06 13:05:39 +05:30
parent 68560aa6d2
commit a7d94bb971
2 changed files with 7 additions and 1 deletions

View File

@ -44,6 +44,12 @@ parameter_defaults:
# in sync with the archive policy, 60s too.
ceilometer::agent::polling::polling_interval: 15
tripleo::profile::base::metrics::qdr::interior_mesh_nodes: ''
collectd::plugin::ceph::daemons:
- 'ceph-mon.controller-00'
- 'ceph-mon.controller-01'
- 'ceph-mon.controller-02'
- 'ceph-osd.01'
- 'ceph-osd.07'
NotificationDriver: 'messagingv2'
ManagePolling: true
HeatConfigureDelegatedRoles: true

View File

@ -69,7 +69,7 @@ outputs:
- - '9100'
service_config_settings:
collectd:
tripleo.collectd.plugins.ceph_osd:
tripleo.collectd.plugins.ceph_mon:
- ceph
collectd::plugin::ceph::daemons: []
upgrade_tasks: {get_attr: [CephBase, role_data, upgrade_tasks]}