Add patches to support deployment of kolla-operations resources from the kolla-ansible container.
Subject: [PATCH 1/4] Fix redundant extra config files in grafana role
Task Check if extra configuration file exists picks up all files in {{ node_custom_config }}/grafana including those that get handled specially later on.
While prometheus.yml and provisioning.yml are best excluded from extra config , because their treatment requires more than just copying, grafana_home_dashboard.json may simply be treated as extra config, which saves the execution of two additional tasks..
Unitl now grafana dashboards were always removed and redeployed leading to a restart of the grafana services on every deployment. The task is changed to find all individual dashboards that are going to be deployed and all which are currently deployed. Dashboards only appearing in the latter group wil be removed, while dashboards in the former group will be deployed individually, leaving it to ansible to figure which changes need to be made.
This way only removal or changes to dashboards will lead to a restart of grafana containers.
Subject: [PATCH 3/4] Allow extension of grafana override paths
Subject: [PATCH 4/4] Allow extension of prometheus override paths
Add patches to support deployment of kolla-operations resources from the kolla-ansible container.
Subject: [PATCH 1/4] Fix redundant extra config files in grafana role
Task
Check if extra configuration file exists
picks up all files in{{ node_custom_config }}/grafana
including those that get handled specially later on. Whileprometheus.yml
andprovisioning.yml
are best excluded from extra config , because their treatment requires more than just copying,grafana_home_dashboard.json
may simply be treated as extra config, which saves the execution of two additional tasks..Subject: [PATCH 2/4] Improve grafana dashboard deployment
Unitl now grafana dashboards were always removed and redeployed leading to a restart of the grafana services on every deployment. The task is changed to find all individual dashboards that are going to be deployed and all which are currently deployed. Dashboards only appearing in the latter group wil be removed, while dashboards in the former group will be deployed individually, leaving it to ansible to figure which changes need to be made. This way only removal or changes to dashboards will lead to a restart of grafana containers.
Subject: [PATCH 3/4] Allow extension of grafana override paths
Subject: [PATCH 4/4] Allow extension of prometheus override paths
Part of https://github.com/osism/issues/issues/1012