]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commit
Fix units and add ability to have a dedicated instance
authorfmount <fpantano@redhat.com>
Thu, 23 May 2019 14:21:08 +0000 (16:21 +0200)
committerGuillaume Abrioux <gabrioux@redhat.com>
Wed, 12 Jun 2019 09:48:12 +0000 (11:48 +0200)
commit138fa19ccf6c8e336c918413da56189877363cc9
tree256275df62765602da967a2058b9284537ae5fc6
parentd36bab5557e9fc9c50c5db29d1331f90e9285ced
Fix units and add ability to have a dedicated instance

Few fixes on systemd unit templates for node_exporter and
alertmanager container parameters.
Added the ability to use a dedicated instance to deploy the
dashboard components (prometheus and grafana).
This commit also introduces the grafana_group_name variable
to refer grafana group and keep consistency with the other
groups.
During the integration with TripleO some grafana/prometheus
template variables resulted undefined. This commit adds the
ability to check if the group exist and create, accordingly,
different job groups in prometheus template.

Signed-off-by: fmount <fpantano@redhat.com>
(cherry picked from commit 069076bbfdef30c64b33dfcdd063b1e31d65d617)
48 files changed:
Vagrantfile
group_vars/all.yml.sample
group_vars/dashboards.yml.sample
group_vars/rhcs.yml.sample
roles/ceph-dashboard/tasks/configure_dashboard.yml
roles/ceph-defaults/defaults/main.yml
roles/ceph-facts/tasks/facts.yml
roles/ceph-grafana/templates/datasources-ceph-dashboard.yml.j2
roles/ceph-node-exporter/templates/node_exporter.service.j2
roles/ceph-prometheus/templates/alertmanager.service.j2
roles/ceph-prometheus/templates/prometheus.yml.j2
site-container.yml.sample
site.yml.sample
tests/functional/add-mdss/container/vagrant_variables.yml
tests/functional/add-mdss/vagrant_variables.yml
tests/functional/add-mgrs/container/vagrant_variables.yml
tests/functional/add-mgrs/vagrant_variables.yml
tests/functional/add-mons/container/vagrant_variables.yml
tests/functional/add-mons/vagrant_variables.yml
tests/functional/add-osds/container/vagrant_variables.yml
tests/functional/add-osds/vagrant_variables.yml
tests/functional/add-rbdmirrors/container/vagrant_variables.yml
tests/functional/add-rbdmirrors/vagrant_variables.yml
tests/functional/add-rgws/container/vagrant_variables.yml
tests/functional/add-rgws/vagrant_variables.yml
tests/functional/all_daemons/container/vagrant_variables.yml
tests/functional/all_daemons/vagrant_variables.yml
tests/functional/collocation/container/vagrant_variables.yml
tests/functional/collocation/vagrant_variables.yml
tests/functional/dashboard/container/vagrant_variables.yml
tests/functional/dashboard/vagrant_variables.yml
tests/functional/infra_lv_create/vagrant_variables.yml
tests/functional/lvm-auto-discovery/container/vagrant_variables.yml
tests/functional/lvm-auto-discovery/vagrant_variables.yml
tests/functional/lvm-batch/container/vagrant_variables.yml
tests/functional/lvm-batch/vagrant_variables.yml
tests/functional/lvm-osds/container/vagrant_variables.yml
tests/functional/lvm-osds/vagrant_variables.yml
tests/functional/migrate_ceph_disk_to_ceph_volume/vagrant_variables.yml
tests/functional/ooo-collocation/vagrant_variables.yml
tests/functional/podman/vagrant_variables.yml
tests/functional/rgw-multisite/container/vagrant_variables.yml
tests/functional/rgw-multisite/vagrant_variables.yml
tests/functional/shrink_mon/container/vagrant_variables.yml
tests/functional/shrink_mon/vagrant_variables.yml
tests/functional/shrink_osd/container/vagrant_variables.yml
tests/functional/shrink_osd/vagrant_variables.yml
vagrant_variables.yml.sample